NAPI support for Hyper-V
Subsystems (3)
cover NAPI support for Hyper-V
These patches enable NAPI, GRO and napi_alloc_skb for Hyper-V netvsc driver.
Stephen Hemminger (5):
netvsc: don't overload variable in same function
vmbus: introduce in-place packet iterator
netvsc: implement NAPI
netvsc: enable GRO
netvsc: replace netdev_alloc_skb_ip_align with napi_alloc_skb
drivers/hv/ring_buffer.c | 94 ++++++++++++++++++++- drivers/net/hyperv/hyperv_net.h | 2 + drivers/net/hyperv/netvsc.c | 172 ++++++++++++++++++++++++-------------- drivers/net/hyperv/netvsc_drv.c | 19 ++--- drivers/net/hyperv/rndis_filter.c | 2 + include/linux/hyperv.h | 96 +++++++-------------- 6 files changed, 242 insertions(+), 143 deletions(-)
Signature · 1 line
2.11.0
PATCH 1/5 netvsc: don't overload variable in same function
There are two variables named packet in the same function. One is the metadata descriptor from host (vmpacket_descriptor) and the other is the control block in the skb used to hold metadata from send. Change name to avoid possible confusion and bugs.
--- drivers/net/hyperv/netvsc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/hyperv/netvsc.c +2 -2
@@ -600,9 +600,9 @@ static inline void netvsc_free_send_slot(struct netvsc_device *net_device,static void netvsc_send_tx_complete (struct netvsc_device *net_device,struct vmbus_channel *incoming_channel,struct hv_device *device, -struct vmpacket_descriptor *packet) +const struct vmpacket_descriptor *desc) { -struct sk_buff *skb = (struct sk_buff *)(unsigned long )packet->trans_id; +struct sk_buff *skb = (struct sk_buff *)(unsigned long )desc->trans_id;struct net_device *ndev =hv_get_drvdata (device);struct net_device_context *net_device_ctx =netdev_priv (ndev);struct vmbus_channel *channel = device->channel;
Signature · 1 line
2.11.0
PATCH 2/5 vmbus: introduce in-place packet iterator
In reply to Stephen HemmingerThis is mostly just a refactoring of previous functions (get_pkt_next_raw, put_pkt_raw and commit_rd_index) to make it easier to use for other drivers and NAPI.
--- drivers/hv/ring_buffer.c | 94 +++++++++++++++++++++++++++++++++++++++++++- drivers/net/hyperv/netvsc.c | 34 +++++----------- include/linux/hyperv.h | 96 ++++++++++++++------------------------------- 3 files changed, 133 insertions(+), 91 deletions(-)
drivers/hv/ring_buffer.c +93 -1
@@ -32,6 +32,8 @@#include "hyperv_vmbus.h" +#define VMBUS_PKT_TRAILER 8 +/* * When we write to the ring buffer, check if the host needs to * be signaled. Here is the details of this protocol:
@@ -336,6 +338,12 @@ int hv_ringbuffer_write(struct vmbus_channel *channel,return 0 ; } +static inline void +init_cached_read_index (struct hv_ring_buffer_info *rbi) +{ + rbi->cached_read_index = rbi->ring_buffer->read_index; +} +int hv_ringbuffer_read (struct vmbus_channel *channel,void *buffer,u32 buflen,u32 *buffer_actual_len,u64 *requestid,bool raw)
@@ -366,7 +374,8 @@ int hv_ringbuffer_read(struct vmbus_channel *channel,return ret; } -init_cached_read_index (channel); +init_cached_read_index (inring_info); + next_read_location =hv_get_next_read_location (inring_info); next_read_location = hv_copyfrom_ringbuffer(inring_info, &desc, sizeof(desc),
@@ -410,3 +419,86 @@ int hv_ringbuffer_read(struct vmbus_channel *channel,return ret; } + +/* +* Determine number of bytes available in ring buffer after +* the current iterator (priv_read_index) location. +* +* This is similar to hv_get_bytes_to_read but with private +* read index instead. +*/ +static u32 hv_pkt_iter_avail (const struct hv_ring_buffer_info *rbi) +{ +u32 priv_read_loc = rbi->priv_read_index; +u32 write_loc =READ_ONCE (rbi->ring_buffer->write_index); + +if (write_loc >= priv_read_loc) +return write_loc - priv_read_loc; +else +return (rbi->ring_datasize - priv_read_loc) + write_loc; +} + +/* +* Get first vmbus packet from ring buffer after read_index +* +* If ring buffer is empty, returns NULL and no other action needed. +*/ +struct vmpacket_descriptor *hv_pkt_iter_first (struct vmbus_channel *channel) +{ +struct hv_ring_buffer_info *rbi = &channel->inbound; + +/* set state for later hv_signal_on_read() */ +init_cached_read_index (rbi); + +if (hv_pkt_iter_avail (rbi) <sizeof (struct vmpacket_descriptor )) +return NULL ; + +return hv_get_ring_buffer (rbi) + rbi->priv_read_index; +} +EXPORT_SYMBOL_GPL (hv_pkt_iter_first); + +/* +* Get next vmbus packet from ring buffer. +* +* Advances the current location (priv_read_index) and checks for more +* data. If the end of the ring buffer is reached, then return NULL. +*/ +struct vmpacket_descriptor * +__hv_pkt_iter_next (struct vmbus_channel *channel, +const struct vmpacket_descriptor *desc) +{ +struct hv_ring_buffer_info *rbi = &channel->inbound; +u32 packetlen = desc->len8 <<3 ; +u32 dsize = rbi->ring_datasize; + +/* bump offset to next potential packet */ + rbi->priv_read_index += packetlen +VMBUS_PKT_TRAILER ; +if (rbi->priv_read_index >= dsize) + rbi->priv_read_index -= dsize; + +/* more data? */ +if (hv_pkt_iter_avail (rbi) <sizeof (struct vmpacket_descriptor )) +return NULL ; +else +return hv_get_ring_buffer (rbi) + rbi->priv_read_index; +} +EXPORT_SYMBOL_GPL (__hv_pkt_iter_next); + +/* +* Update host ring buffer after iterating over packets. +*/ +void hv_pkt_iter_close (struct vmbus_channel *channel) +{ +struct hv_ring_buffer_info *rbi = &channel->inbound; + +/* +* Make sure all reads are done before we update the read index since +* the writer may start writing to the read area once the read index +* is updated. +*/ +virt_rmb (); + rbi->ring_buffer->read_index = rbi->priv_read_index; + +hv_signal_on_read (channel); +} +EXPORT_SYMBOL_GPL (hv_pkt_iter_close);
drivers/net/hyperv/netvsc.c +10 -24
@@ -647,14 +647,11 @@ static void netvsc_send_tx_complete(struct netvsc_device *net_device,static void netvsc_send_completion (struct netvsc_device *net_device,struct vmbus_channel *incoming_channel,struct hv_device *device, -struct vmpacket_descriptor *packet) +const struct vmpacket_descriptor *desc) { -struct nvsp_message *nvsp_packet; +struct nvsp_message *nvsp_packet =hv_pkt_data (desc);struct net_device *ndev =hv_get_drvdata (device); - nvsp_packet = (struct nvsp_message *)((unsigned long )packet + - (packet->offset8 <<3 )); -switch (nvsp_packet->hdr.msg_type) {case NVSP_MSG_TYPE_INIT_COMPLETE :case NVSP_MSG1_TYPE_SEND_RECV_BUF_COMPLETE :
@@ -668,7 +665,7 @@ static void netvsc_send_completion(struct netvsc_device *net_device,case NVSP_MSG1_TYPE_SEND_RNDIS_PKT_COMPLETE :netvsc_send_tx_complete (net_device, incoming_channel, - device, packet); + device, desc);break ;default :
@@ -1071,9 +1068,11 @@ static void netvsc_receive(struct net_device *ndev,struct net_device_context *net_device_ctx, struct hv_device *device, struct vmbus_channel *channel, - struct vmtransfer_page_packet_header *vmxferpage_packet, + const struct vmpacket_descriptor *desc, struct nvsp_message *nvsp) { + const struct vmtransfer_page_packet_header *vmxferpage_packet + = container_of(desc, const struct vmtransfer_page_packet_header, d);char *recv_buf = net_device->recv_buf;u32 status =NVSP_STAT_SUCCESS ;int i;
@@ -1185,12 +1184,10 @@ static void netvsc_process_raw_pkt(struct hv_device *device,struct netvsc_device *net_device, struct net_device *ndev, u64 request_id, - struct vmpacket_descriptor *desc) + const struct vmpacket_descriptor *desc) { struct net_device_context *net_device_ctx = netdev_priv(ndev); -struct nvsp_message *nvmsg - = (struct nvsp_message *)((unsigned long )desc - + (desc->offset8 <<3 )); +struct nvsp_message *nvmsg =hv_pkt_data (desc);switch (desc->type) {case VM_PKT_COMP :
@@ -1199,9 +1196,7 @@ static void netvsc_process_raw_pkt(struct hv_device *device,case VM_PKT_DATA_USING_XFER_PAGES :netvsc_receive (ndev, net_device, net_device_ctx, - device, channel, - (struct vmtransfer_page_packet_header *)desc, - nvmsg); + device, channel, desc, nvmsg);break ;case VM_PKT_DATA_INBAND :
@@ -1223,7 +1218,6 @@ void netvsc_channel_cb(void *context)struct netvsc_device *net_device;struct vmpacket_descriptor *desc;struct net_device *ndev; -bool need_to_commit = false;if (channel->primary_channel !=NULL ) device = channel->primary_channel->device_obj;
@@ -1239,20 +1233,12 @@ void netvsc_channel_cb(void *context) netvsc_channel_idle(net_device, q_idx)) return; -/* commit_rd_index() -> hv_signal_on_read() needs this. */ -init_cached_read_index (channel); - -while ((desc =get_next_pkt_raw (channel)) !=NULL ) { + foreach_vmbus_pkt(desc, channel) {netvsc_process_raw_pkt (device, channel, net_device, ndev, desc->trans_id, desc); -put_pkt_raw (channel, desc); - need_to_commit = true; } -if (need_to_commit) -commit_rd_index (channel); -netvsc_chk_recv_comp (net_device, channel, q_idx); }
include/linux/hyperv.h +30 -66
120 lines not on this page · raw message
Signature · 1 line
2.11.0
PATCH 3/5 netvsc: implement NAPI
In reply to Stephen HemmingerUse NAPI (softirq), to handle receive packets and send completions. Previously this was handled by tasklet.
--- drivers/net/hyperv/hyperv_net.h | 2 + drivers/net/hyperv/netvsc.c | 140 ++++++++++++++++++++++++++------------ drivers/net/hyperv/netvsc_drv.c | 5 -- drivers/net/hyperv/rndis_filter.c | 2 + 4 files changed, 102 insertions(+), 47 deletions(-)
drivers/net/hyperv/hyperv_net.h +2 -0
@@ -196,6 +196,7 @@ int netvsc_recv_callback(struct net_device *net,const struct ndis_tcp_ip_checksum_info *csum_info, const struct ndis_pkt_8021q_info *vlan);void netvsc_channel_cb (void *context); +int netvsc_poll (struct napi_struct *napi,int budget);int rndis_filter_open (struct netvsc_device *nvdev);int rndis_filter_close (struct netvsc_device *nvdev); int rndis_filter_device_add(struct hv_device *dev,
@@ -720,6 +721,7 @@ struct net_device_context {/* Per channel data */ struct netvsc_channel {struct vmbus_channel *channel; +struct napi_struct napi;struct multi_send_data msd;struct multi_recv_comp mrc;atomic_t queue_sends;
drivers/net/hyperv/netvsc.c +98 -42
245 lines not on this page · raw message
drivers/net/hyperv/netvsc_drv.c +0 -5
@@ -690,11 +690,6 @@ int netvsc_recv_callback(struct net_device *net, ++rx_stats->multicast;u64_stats_update_end (&rx_stats->syncp); -/* -* Pass the skb back up. Network stack will deallocate the skb when it -* is done. -* TODO - use NAPI? -*/ netif_receive_skb (skb);rcu_read_unlock ();
drivers/net/hyperv/rndis_filter.c +2 -0
@@ -1012,6 +1012,8 @@ static void netvsc_sc_open(struct vmbus_channel *new_sc)if (ret ==0 ) nvscdev->chan_table[chn_index].channel = new_sc; +napi_enable (&nvscdev->chan_table[chn_index].napi); +spin_lock_irqsave (&nvscdev->sc_lock, flags); nvscdev->num_sc_offered--;spin_unlock_irqrestore (&nvscdev->sc_lock, flags);
Signature · 1 line
2.11.0
PATCH 4/5 netvsc: enable GRO
In reply to Stephen HemmingerUse GRO when receiving packets.
--- drivers/net/hyperv/netvsc_drv.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/net/hyperv/netvsc_drv.c +4 -4
@@ -642,11 +642,11 @@ int netvsc_recv_callback(struct net_device *net, {struct net_device_context *net_device_ctx =netdev_priv (net);struct netvsc_device *net_device = net_device_ctx->nvdev; +u16 q_idx = channel->offermsg.offer.sub_channel_index; +struct netvsc_channel *nvchan = &net_device->chan_table[q_idx];struct net_device *vf_netdev;struct sk_buff *skb;struct netvsc_stats *rx_stats; -u16 q_idx = channel->offermsg.offer.sub_channel_index; -if (net->reg_state !=NETREG_REGISTERED )return NVSP_STAT_FAIL ;
@@ -679,7 +679,7 @@ int netvsc_recv_callback(struct net_device *net,* on the synthetic device because modifying the VF device * statistics will not work correctly. */ - rx_stats = &net_device->chan_table[q_idx].rx_stats; + rx_stats = &nvchan->rx_stats;u64_stats_update_begin (&rx_stats->syncp); rx_stats->packets++; rx_stats->bytes += len;
@@ -690,7 +690,7 @@ int netvsc_recv_callback(struct net_device *net, ++rx_stats->multicast;u64_stats_update_end (&rx_stats->syncp); -netif_receive_skb (skb); +napi_gro_receive (&nvchan->napi, skb);rcu_read_unlock ();return 0 ;
Signature · 1 line
2.11.0
PATCH 5/5 netvsc: replace netdev_alloc_skb_ip_align with napi_alloc_skb
In reply to Stephen HemmingerGives potential performance gain.
--- drivers/net/hyperv/netvsc_drv.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/hyperv/netvsc_drv.c +4 -2
@@ -589,13 +589,14 @@ void netvsc_linkstatus_callback(struct hv_device *device_obj, }static struct sk_buff *netvsc_alloc_recv_skb (struct net_device *net, +struct napi_struct *napi,const struct ndis_tcp_ip_checksum_info *csum_info,const struct ndis_pkt_8021q_info *vlan,void *data,u32 buflen) {struct sk_buff *skb; - skb =netdev_alloc_skb_ip_align (net, buflen); + skb =napi_alloc_skb (napi, buflen);if (!skb)return skb;
@@ -664,7 +665,8 @@ int netvsc_recv_callback(struct net_device *net, net = vf_netdev;/* Allocate a skb - TODO direct I/O to pages? */ - skb =netvsc_alloc_recv_skb (net, csum_info, vlan, data, len); + skb =netvsc_alloc_recv_skb (net, &nvchan->napi, + csum_info, vlan, data, len);if (unlikely (!skb)) { ++net->stats.rx_dropped;rcu_read_unlock ();
Signature · 1 line
2.11.0
David Miller
maintainerFrom: Stephen Hemminger <[email protected]>
Date: Mon, 27 Feb 2017 10:26:46 -0800
Quoted 2 lines
These patches enable NAPI, GRO and
napi_alloc_skbfor Hyper-V netvsc driver.
Series applied to net-next.
Quoted 7 lines · On Mon, 06 Mar 2017 17:13:33 -0800 (PST) David Miller <[email protected]>…
From: Stephen Hemminger <[email protected]>
Date: Mon, 27 Feb 2017 10:26:46 -0800Quoted 2 lines
These patches enable NAPI, GRO and
napi_alloc_skbfor Hyper-V netvsc driver.Series applied to net-next.
Great, but how do we coordinate allow use of the vmbus iterator functions for storage? The way things are going that would mean waiting until 4.13 for that.