From: Zhi Yong Wu <zwu.kernel@gmail.com>
To: netdev@vger.kernel.org
Cc: therbert@google.com, edumazet@google.com, davem@davemloft.net,
Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
Subject: [RFC PATCH net-next 3/3] virtio-net: Add accelerated RFS support
Date: Wed, 15 Jan 2014 22:20:54 +0800 [thread overview]
Message-ID: <1389795654-28381-4-git-send-email-zwu.kernel@gmail.com> (raw)
In-Reply-To: <1389795654-28381-1-git-send-email-zwu.kernel@gmail.com>
From: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
Accelerated RFS is used to select the RX queue.
Signed-off-by: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
---
drivers/net/virtio_net.c | 56 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 55 insertions(+), 1 deletions(-)
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 046421c..9f4cfa7 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -26,6 +26,7 @@
#include <linux/if_vlan.h>
#include <linux/slab.h>
#include <linux/cpu.h>
+#include <linux/cpu_rmap.h>
static int napi_weight = NAPI_POLL_WEIGHT;
module_param(napi_weight, int, 0444);
@@ -1554,6 +1555,49 @@ err:
return ret;
}
+static void virtnet_free_irq_cpu_rmap(struct virtnet_info *vi)
+{
+#ifdef CONFIG_RFS_ACCEL
+ free_irq_cpu_rmap(vi->dev->rx_cpu_rmap);
+ vi->dev->rx_cpu_rmap = NULL;
+#endif
+}
+
+static int virtnet_init_rx_cpu_rmap(struct virtnet_info *vi)
+{
+ int rc = 0;
+
+#ifdef CONFIG_RFS_ACCEL
+ struct virtio_device *vdev = vi->vdev;
+ unsigned int irq;
+ int i;
+
+ if (!vi->affinity_hint_set)
+ goto out;
+
+ vi->dev->rx_cpu_rmap = alloc_irq_cpu_rmap(vi->max_queue_pairs);
+ if (!vi->dev->rx_cpu_rmap) {
+ rc = -ENOMEM;
+ goto out;
+ }
+
+ for (i = 0; i < vi->max_queue_pairs; i++) {
+ irq = virtqueue_get_vq_irq(vdev, vi->rq[i].vq);
+ if (irq == -1)
+ goto failed;
+
+ rc = irq_cpu_rmap_add(vi->dev->rx_cpu_rmap, irq);
+ if (rc) {
+failed:
+ virtnet_free_irq_cpu_rmap(vi);
+ goto out;
+ }
+ }
+out:
+#endif
+ return rc;
+}
+
static int virtnet_probe(struct virtio_device *vdev)
{
int i, err;
@@ -1671,10 +1715,16 @@ static int virtnet_probe(struct virtio_device *vdev)
netif_set_real_num_tx_queues(dev, vi->curr_queue_pairs);
netif_set_real_num_rx_queues(dev, vi->curr_queue_pairs);
+ err = virtnet_init_rx_cpu_rmap(vi);
+ if (err) {
+ pr_debug("virtio_net: initializing rx cpu rmap failed\n");
+ goto free_vqs;
+ }
+
err = register_netdev(dev);
if (err) {
pr_debug("virtio_net: registering device failed\n");
- goto free_vqs;
+ goto free_cpu_rmap;
}
/* Last of all, set up some receive buffers. */
@@ -1714,6 +1764,8 @@ static int virtnet_probe(struct virtio_device *vdev)
free_recv_bufs:
free_receive_bufs(vi);
unregister_netdev(dev);
+free_cpu_rmap:
+ virtnet_free_irq_cpu_rmap(vi);
free_vqs:
cancel_delayed_work_sync(&vi->refill);
virtnet_del_vqs(vi);
@@ -1751,6 +1803,8 @@ static void virtnet_remove(struct virtio_device *vdev)
unregister_netdev(vi->dev);
+ virtnet_free_irq_cpu_rmap(vi);
+
remove_vq_common(vi);
if (vi->alloc_frag.page)
put_page(vi->alloc_frag.page);
--
1.7.6.5
next prev parent reply other threads:[~2014-01-15 14:21 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-15 14:20 [RFC PATCH net-next 0/3] virtio_net: add aRFS support Zhi Yong Wu
2014-01-15 14:20 ` [RFC PATCH net-next 1/3] virtio_pci: Introduce one new config api vp_get_vq_irq() Zhi Yong Wu
2014-01-15 14:20 ` [RFC PATCH net-next 2/3] virtio_net: Introduce one dummy function virtnet_filter_rfs() Zhi Yong Wu
2014-01-15 17:54 ` Tom Herbert
2014-01-16 2:45 ` Zhi Yong Wu
2014-01-15 14:20 ` Zhi Yong Wu [this message]
2014-01-16 21:31 ` [RFC PATCH net-next 3/3] virtio-net: Add accelerated RFS support Ben Hutchings
2014-01-16 22:00 ` Zhi Yong Wu
2014-01-16 23:16 ` Ben Hutchings
2014-01-17 16:54 ` Zhi Yong Wu
2014-01-17 17:20 ` Ben Hutchings
2014-01-18 4:59 ` Tom Herbert
2014-01-18 14:19 ` Ben Hutchings
2014-01-16 4:23 ` [RFC PATCH net-next 0/3] virtio_net: add aRFS support Jason Wang
2014-01-16 8:34 ` Fwd: " Zhi Yong Wu
2014-01-16 8:52 ` Stefan Hajnoczi
2014-01-16 17:12 ` Tom Herbert
2014-01-17 3:26 ` Jason Wang
2014-01-17 5:08 ` Tom Herbert
2014-01-17 6:36 ` Jason Wang
2014-01-17 16:03 ` Tom Herbert
2014-01-17 5:22 ` Stefan Hajnoczi
2014-01-17 6:45 ` Jason Wang
2014-01-20 14:36 ` Ben Hutchings
2014-01-22 13:27 ` Zhi Yong Wu
2014-01-22 18:00 ` Tom Herbert
2014-01-23 0:40 ` Zhi Yong Wu
2014-01-23 14:23 ` Michael S. Tsirkin
2014-01-17 3:04 ` Jason Wang
2014-01-20 16:49 ` Stefan Hajnoczi
2014-01-16 8:48 ` Zhi Yong Wu
2014-01-23 14:26 ` Michael S. Tsirkin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1389795654-28381-4-git-send-email-zwu.kernel@gmail.com \
--to=zwu.kernel@gmail.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=netdev@vger.kernel.org \
--cc=therbert@google.com \
--cc=wuzhy@linux.vnet.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).