All of lore.kernel.org
 help / color / mirror / Atom feed
From: Sridhar Samudrala <sridhar.samudrala@intel.com>
To: mst@redhat.com, stephen@networkplumber.org, davem@davemloft.net,
	netdev@vger.kernel.org,
	virtualization@lists.linux-foundation.org,
	virtio-dev@lists.oasis-open.org, jesse.brandeburg@intel.com,
	alexander.h.duyck@intel.com, kubakici@wp.pl,
	sridhar.samudrala@intel.com, jasowang@redhat.com,
	loseweigh@gmail.com, jiri@resnulli.us, aaron.f.brown@intel.com
Subject: [PATCH net-next v9 3/4] virtio_net: Extend virtio to use VF datapath when available
Date: Fri, 27 Apr 2018 10:06:59 -0700	[thread overview]
Message-ID: <1524848820-42258-4-git-send-email-sridhar.samudrala__37687.4125250199$1524848716$gmane$org@intel.com> (raw)
In-Reply-To: <1524848820-42258-1-git-send-email-sridhar.samudrala@intel.com>

This patch enables virtio_net to switch over to a VF datapath when a VF
netdev is present with the same MAC address. It allows live migration
of a VM with a direct attached VF without the need to setup a bond/team
between a VF and virtio net device in the guest.

The hypervisor needs to enable only one datapath at any time so that
packets don't get looped back to the VM over the other datapath. When a VF
is plugged, the virtio datapath link state can be marked as down. The
hypervisor needs to unplug the VF device from the guest on the source host
and reset the MAC filter of the VF to initiate failover of datapath to
virtio before starting the migration. After the migration is completed,
the destination hypervisor sets the MAC filter on the VF and plugs it back
to the guest to switch over to VF datapath.

It uses the generic failover framework that provides 2 functions to create
and destroy a master failover netdev. When STANDBY feature is enabled, an
additional netdev(failover netdev) is created that acts as a master device
and tracks the state of the 2 lower netdevs. The original virtio_net netdev
is marked as 'standby' netdev and a passthru device with the same MAC is
registered as 'primary' netdev.

This patch is based on the discussion initiated by Jesse on this thread.
https://marc.info/?l=linux-virtualization&m=151189725224231&w=2

Signed-off-by: Sridhar Samudrala <sridhar.samudrala@intel.com>
---
 drivers/net/Kconfig      |  1 +
 drivers/net/virtio_net.c | 35 ++++++++++++++++++++++++++++++++++-
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 891846655000..c4995625d9b1 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -331,6 +331,7 @@ config VETH
 config VIRTIO_NET
 	tristate "Virtio network driver"
 	depends on VIRTIO
+	select NET_FAILOVER
 	---help---
 	  This is the virtual network driver for virtio.  It can be used with
 	  QEMU based VMMs (like KVM or Xen).  Say Y or M.
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 51a085b1a242..c326ee5344c0 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -30,8 +30,11 @@
 #include <linux/cpu.h>
 #include <linux/average.h>
 #include <linux/filter.h>
+#include <linux/netdevice.h>
+#include <linux/pci.h>
 #include <net/route.h>
 #include <net/xdp.h>
+#include <net/net_failover.h>
 
 static int napi_weight = NAPI_POLL_WEIGHT;
 module_param(napi_weight, int, 0444);
@@ -210,6 +213,9 @@ struct virtnet_info {
 	u32 speed;
 
 	unsigned long guest_offloads;
+
+	/* failover when STANDBY feature enabled */
+	struct net_failover *failover;
 };
 
 struct padded_vnet_hdr {
@@ -2306,6 +2312,22 @@ static int virtnet_xdp(struct net_device *dev, struct netdev_bpf *xdp)
 	}
 }
 
+static int virtnet_get_phys_port_name(struct net_device *dev, char *buf,
+				      size_t len)
+{
+	struct virtnet_info *vi = netdev_priv(dev);
+	int ret;
+
+	if (!virtio_has_feature(vi->vdev, VIRTIO_NET_F_STANDBY))
+		return -EOPNOTSUPP;
+
+	ret = snprintf(buf, len, "_sby");
+	if (ret >= len)
+		return -EOPNOTSUPP;
+
+	return 0;
+}
+
 static const struct net_device_ops virtnet_netdev = {
 	.ndo_open            = virtnet_open,
 	.ndo_stop   	     = virtnet_close,
@@ -2323,6 +2345,7 @@ static const struct net_device_ops virtnet_netdev = {
 	.ndo_xdp_xmit		= virtnet_xdp_xmit,
 	.ndo_xdp_flush		= virtnet_xdp_flush,
 	.ndo_features_check	= passthru_features_check,
+	.ndo_get_phys_port_name	= virtnet_get_phys_port_name,
 };
 
 static void virtnet_config_changed_work(struct work_struct *work)
@@ -2876,10 +2899,16 @@ static int virtnet_probe(struct virtio_device *vdev)
 
 	virtnet_init_settings(dev);
 
+	if (virtio_has_feature(vdev, VIRTIO_NET_F_STANDBY)) {
+		err = net_failover_create(vi->dev, &vi->failover);
+		if (err)
+			goto free_vqs;
+	}
+
 	err = register_netdev(dev);
 	if (err) {
 		pr_debug("virtio_net: registering device failed\n");
-		goto free_vqs;
+		goto free_failover;
 	}
 
 	virtio_device_ready(vdev);
@@ -2916,6 +2945,8 @@ static int virtnet_probe(struct virtio_device *vdev)
 	vi->vdev->config->reset(vdev);
 
 	unregister_netdev(dev);
+free_failover:
+	net_failover_destroy(vi->failover);
 free_vqs:
 	cancel_delayed_work_sync(&vi->refill);
 	free_receive_page_frags(vi);
@@ -2950,6 +2981,8 @@ static void virtnet_remove(struct virtio_device *vdev)
 
 	unregister_netdev(vi->dev);
 
+	net_failover_destroy(vi->failover);
+
 	remove_vq_common(vi);
 
 	free_netdev(vi->dev);
-- 
2.14.3

  parent reply	other threads:[~2018-04-27 17:06 UTC|newest]

Thread overview: 92+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-04-27 17:06 [PATCH net-next v9 0/4] Enable virtio_net to act as a standby for a passthru device Sridhar Samudrala
2018-04-27 17:06 ` [virtio-dev] " Sridhar Samudrala
2018-04-27 17:06 ` [PATCH net-next v9 1/4] virtio_net: Introduce VIRTIO_NET_F_STANDBY feature bit Sridhar Samudrala
2018-04-27 17:06   ` [virtio-dev] " Sridhar Samudrala
2018-04-28  7:50   ` Jiri Pirko
2018-04-28  7:50   ` Jiri Pirko
2018-04-30  2:47     ` Samudrala, Sridhar
2018-04-30  2:47       ` [virtio-dev] " Samudrala, Sridhar
2018-04-30  7:03       ` Jiri Pirko
2018-04-30 19:14         ` Samudrala, Sridhar
2018-04-30 19:14         ` Samudrala, Sridhar
2018-04-30 19:14           ` [virtio-dev] " Samudrala, Sridhar
2018-04-30  2:47     ` Samudrala, Sridhar
2018-04-27 17:06 ` Sridhar Samudrala
2018-04-27 17:06 ` [PATCH net-next v9 2/4] net: Introduce generic failover module Sridhar Samudrala
2018-04-27 17:06 ` Sridhar Samudrala
2018-04-27 17:06   ` [virtio-dev] " Sridhar Samudrala
2018-04-27 17:53   ` Jiri Pirko
2018-04-27 17:53   ` Jiri Pirko
2018-04-28  8:15   ` Jiri Pirko
2018-04-30  2:47     ` Samudrala, Sridhar
2018-04-30  2:47       ` [virtio-dev] " Samudrala, Sridhar
2018-04-30  2:47     ` Samudrala, Sridhar
2018-04-28  8:15   ` Jiri Pirko
2018-04-28  9:06   ` Jiri Pirko
2018-04-30  3:03     ` Samudrala, Sridhar
2018-04-30  3:03       ` [virtio-dev] " Samudrala, Sridhar
2018-04-30  3:03     ` Samudrala, Sridhar
2018-05-02 16:15     ` Jiri Pirko
2018-05-02 17:51       ` Samudrala, Sridhar
2018-05-02 17:51       ` Samudrala, Sridhar
2018-05-02 17:51         ` [virtio-dev] " Samudrala, Sridhar
2018-05-02 20:30         ` Michael S. Tsirkin
2018-05-02 20:30         ` Michael S. Tsirkin
2018-05-02 20:30           ` [virtio-dev] " Michael S. Tsirkin
2018-05-02 21:36           ` Samudrala, Sridhar
2018-05-02 21:36             ` [virtio-dev] " Samudrala, Sridhar
2018-05-02 21:39         ` Jiri Pirko
2018-05-02 21:39         ` Jiri Pirko
2018-05-02 21:39         ` Jiri Pirko
2018-05-02 21:39         ` Jiri Pirko
2018-05-02 16:15     ` Jiri Pirko
2018-04-27 17:06 ` Sridhar Samudrala [this message]
2018-04-27 17:06 ` [PATCH net-next v9 3/4] virtio_net: Extend virtio to use VF datapath when available Sridhar Samudrala
2018-04-27 17:06   ` [virtio-dev] " Sridhar Samudrala
2018-04-28  8:24   ` Jiri Pirko
2018-04-30  3:00     ` Samudrala, Sridhar
2018-04-30  3:00       ` [virtio-dev] " Samudrala, Sridhar
2018-04-30  7:12       ` Jiri Pirko
2018-04-30  7:12       ` Jiri Pirko
2018-04-30 19:26         ` Samudrala, Sridhar
2018-04-30 19:26           ` [virtio-dev] " Samudrala, Sridhar
2018-05-01  7:33           ` Jiri Pirko
2018-05-01  7:33           ` Jiri Pirko
2018-04-30 19:26         ` Samudrala, Sridhar
2018-04-30  3:00     ` Samudrala, Sridhar
2018-04-28  9:42   ` Jiri Pirko
2018-04-28  9:42   ` Jiri Pirko
2018-04-29  8:56     ` Siwei Liu
2018-04-29  8:56     ` Siwei Liu
2018-04-29  8:56       ` [virtio-dev] " Siwei Liu
2018-04-29 13:45       ` Jiri Pirko
2018-04-29 13:45       ` Jiri Pirko
2018-04-30  4:16     ` Samudrala, Sridhar
2018-04-30  4:16     ` Samudrala, Sridhar
2018-04-30  4:16       ` [virtio-dev] " Samudrala, Sridhar
2018-04-30  7:20       ` Jiri Pirko
2018-05-02  0:20         ` Samudrala, Sridhar
2018-05-02  0:20         ` Samudrala, Sridhar
2018-05-02  0:20           ` [virtio-dev] " Samudrala, Sridhar
2018-05-02  7:50           ` Jiri Pirko
2018-05-02  7:50           ` Jiri Pirko
2018-05-02 15:34             ` Samudrala, Sridhar
2018-05-02 15:34             ` Samudrala, Sridhar
2018-05-02 15:34               ` [virtio-dev] " Samudrala, Sridhar
2018-05-02 16:05               ` Jiri Pirko
2018-05-02 15:47             ` Michael S. Tsirkin
2018-05-02 15:47               ` [virtio-dev] " Michael S. Tsirkin
2018-05-02 16:04               ` Jiri Pirko
2018-05-02 16:04               ` Jiri Pirko
2018-05-02 15:47             ` Michael S. Tsirkin
2018-04-30  7:20       ` Jiri Pirko
2018-04-27 17:07 ` [PATCH net-next v9 4/4] netvsc: refactor notifier/event handling code to use the failover framework Sridhar Samudrala
2018-04-27 17:07 ` Sridhar Samudrala
2018-04-27 17:07   ` [virtio-dev] " Sridhar Samudrala
2018-04-27 17:45 ` [PATCH net-next v9 0/4] Enable virtio_net to act as a standby for a passthru device Jiri Pirko
2018-04-27 17:45 ` Jiri Pirko
2018-04-27 17:53   ` Samudrala, Sridhar
2018-04-27 17:53   ` Samudrala, Sridhar
2018-04-27 17:53     ` [virtio-dev] " Samudrala, Sridhar
2018-04-27 19:38     ` Jiri Pirko
2018-04-27 19:38     ` Jiri Pirko

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='1524848820-42258-4-git-send-email-sridhar.samudrala__37687.4125250199$1524848716$gmane$org@intel.com' \
    --to=sridhar.samudrala@intel.com \
    --cc=aaron.f.brown@intel.com \
    --cc=alexander.h.duyck@intel.com \
    --cc=davem@davemloft.net \
    --cc=jasowang@redhat.com \
    --cc=jesse.brandeburg@intel.com \
    --cc=jiri@resnulli.us \
    --cc=kubakici@wp.pl \
    --cc=loseweigh@gmail.com \
    --cc=mst@redhat.com \
    --cc=netdev@vger.kernel.org \
    --cc=stephen@networkplumber.org \
    --cc=virtio-dev@lists.oasis-open.org \
    --cc=virtualization@lists.linux-foundation.org \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.