Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1281303

[PATCH net-next V3 10/17] hv_netvsc: remove locking in netvsc_send()

From "K. Y. Srinivasan" <kys@microsoft.com>
Newsgroups linux.kernel
Subject [PATCH net-next V3 10/17] hv_netvsc: remove locking in netvsc_send()
Date 2015-12-02 00:20 +0100
Message-ID <qB2nf-7GU-7@gated-at.bofh.it> (permalink)
References <qB2nf-7GU-3@gated-at.bofh.it> <qB2nf-7GU-5@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw


From: Vitaly Kuznetsov <vkuznets@redhat.com>

Packet scheduler guarantees there won't be multiple senders for the same
queue and as we use q_idx for multi_send_data the spinlock is redundant.

Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
---
 drivers/net/hyperv/hyperv_net.h |    1 -
 drivers/net/hyperv/netvsc.c     |    8 --------
 2 files changed, 0 insertions(+), 9 deletions(-)

diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h
index a9d2bdc5..f5b2145 100644
--- a/drivers/net/hyperv/hyperv_net.h
+++ b/drivers/net/hyperv/hyperv_net.h
@@ -633,7 +633,6 @@ struct nvsp_message {
 #define RNDIS_PKT_ALIGN_DEFAULT 8
 
 struct multi_send_data {
-	spinlock_t lock; /* protect struct multi_send_data */
 	struct hv_netvsc_packet *pkt; /* netvsc pkt pending */
 	u32 count; /* counter of batched packets */
 };
diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c
index 419b055..081f14f 100644
--- a/drivers/net/hyperv/netvsc.c
+++ b/drivers/net/hyperv/netvsc.c
@@ -38,7 +38,6 @@ static struct netvsc_device *alloc_net_device(struct hv_device *device)
 {
 	struct netvsc_device *net_device;
 	struct net_device *ndev = hv_get_drvdata(device);
-	int i;
 
 	net_device = kzalloc(sizeof(struct netvsc_device), GFP_KERNEL);
 	if (!net_device)
@@ -58,9 +57,6 @@ static struct netvsc_device *alloc_net_device(struct hv_device *device)
 	net_device->max_pkt = RNDIS_MAX_PKT_DEFAULT;
 	net_device->pkt_align = RNDIS_PKT_ALIGN_DEFAULT;
 
-	for (i = 0; i < num_online_cpus(); i++)
-		spin_lock_init(&net_device->msd[i].lock);
-
 	hv_set_drvdata(device, net_device);
 	return net_device;
 }
@@ -850,7 +846,6 @@ int netvsc_send(struct hv_device *device,
 	u16 q_idx = packet->q_idx;
 	u32 pktlen = packet->total_data_buflen, msd_len = 0;
 	unsigned int section_index = NETVSC_INVALID_INDEX;
-	unsigned long flag;
 	struct multi_send_data *msdp;
 	struct hv_netvsc_packet *msd_send = NULL, *cur_send = NULL;
 	bool try_batch;
@@ -867,7 +862,6 @@ int netvsc_send(struct hv_device *device,
 	msdp = &net_device->msd[q_idx];
 
 	/* batch packets in send buffer if possible */
-	spin_lock_irqsave(&msdp->lock, flag);
 	if (msdp->pkt)
 		msd_len = msdp->pkt->total_data_buflen;
 
@@ -927,8 +921,6 @@ int netvsc_send(struct hv_device *device,
 		cur_send = packet;
 	}
 
-	spin_unlock_irqrestore(&msdp->lock, flag);
-
 	if (msd_send) {
 		m_ret = netvsc_send_pkt(msd_send, net_device);
 
-- 
1.7.4.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | NextPrevious in thread | Next in thread | Find similar | Unroll thread


Thread

[PATCH net-next V3 01/17] hv_netvsc: Resize some of the variables in hv_netvsc_packet "K. Y. Srinivasan" <kys@microsoft.com> - 2015-12-02 00:20 +0100
  [PATCH net-next V3 04/17] hv_netvsc: Eliminate rndis_msg pointer from hv_netvsc_packet structure "K. Y. Srinivasan" <kys@microsoft.com> - 2015-12-02 00:20 +0100
  [PATCH net-next V3 15/17] hv_netvsc: Eliminate xmit_more from struct hv_netvsc_packet "K. Y. Srinivasan" <kys@microsoft.com> - 2015-12-02 00:20 +0100
  [PATCH net-next V3 10/17] hv_netvsc: remove locking in netvsc_send() "K. Y. Srinivasan" <kys@microsoft.com> - 2015-12-02 00:20 +0100
  [PATCH net-next V3 08/17] hv_netvsc: Don't ask for additional head room in the skb "K. Y. Srinivasan" <kys@microsoft.com> - 2015-12-02 00:20 +0100
  [PATCH net-next V3 03/17] hv_netvsc: Eliminate the channel field in hv_netvsc_packet structure "K. Y. Srinivasan" <kys@microsoft.com> - 2015-12-02 00:20 +0100
  [PATCH net-next V3 07/17] hv_netvsc: Eliminate send_completion_ctx from struct hv_netvsc_packet "K. Y. Srinivasan" <kys@microsoft.com> - 2015-12-02 00:20 +0100
  [PATCH net-next V3 17/17] hv_netvsc: Eliminate vlan_tci from struct hv_netvsc_packet "K. Y. Srinivasan" <kys@microsoft.com> - 2015-12-02 00:20 +0100
  [PATCH ney-next V3 12/17] hv_netvsc: Eliminate send_completion_tid from struct hv_netvsc_packet "K. Y. Srinivasan" <kys@microsoft.com> - 2015-12-02 00:20 +0100
  [PATCH net-next V3 09/17] hv_netvsc: move subchannel existence check to netvsc_select_queue() "K. Y. Srinivasan" <kys@microsoft.com> - 2015-12-02 00:20 +0100
  [PATCH net-next V3 06/17] hv_netvsc: Eliminate send_completion from struct hv_netvsc_packet "K. Y. Srinivasan" <kys@microsoft.com> - 2015-12-02 00:20 +0100
  [PATCH net-next V3 05/17] hv_netvsc: Eliminatte the data field from struct hv_netvsc_packet "K. Y. Srinivasan" <kys@microsoft.com> - 2015-12-02 00:20 +0100
  [PATCH net-next V3 02/17] hv_netvsc: Rearrange the hv_negtvsc_packet to be space efficient "K. Y. Srinivasan" <kys@microsoft.com> - 2015-12-02 00:20 +0100
  [PATCH net-next V3 11/17] hv_netvsc: Eliminate page_buf from struct hv_netvsc_packet "K. Y. Srinivasan" <kys@microsoft.com> - 2015-12-02 00:20 +0100
  [PATCH net-next V3 13/17] hv_netvsc: Eliminate is_data_pkt from struct hv_netvsc_packet "K. Y. Srinivasan" <kys@microsoft.com> - 2015-12-02 00:20 +0100
  [PATCH net-next V3 14/17] hv_netvsc: Eliminate completion_func from struct hv_netvsc_packet "K. Y. Srinivasan" <kys@microsoft.com> - 2015-12-02 00:20 +0100
  [PATCH net-next V3 16/17] hv_netvsc: Eliminate status from struct hv_netvsc_packet "K. Y. Srinivasan" <kys@microsoft.com> - 2015-12-02 00:20 +0100

csiph-web