virtio_net: Introduce VIRTIO_NET_F_STANDBY feature bit

This feature bit can be used by hypervisor to indicate virtio_net device to
act as a standby for another device with the same MAC address.

VIRTIO_NET_F_STANDBY is defined as bit 62 as it is a device feature bit.

Signed-off-by: Sridhar Samudrala <sridhar.samudrala@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit 9805069d14c1b0b66b1600ea60cfc08f94841bd8)
Orabug: 28122104
Signed-off-by: Vijay Balakrishna <vijay.balakrishna@oracle.com>
Reviewed-by: Shannon Nelson <shannon.nelson@oracle.com>
Reviewed-by: Darren Kenny <darren.kenny@oracle.com>
(cherry picked from commit c4b1cdd0459d953eddac306c3a1fc88c8d631e17)
Signed-off-by: Vijay Balakrishna <vijay.balakrishna@oracle.com>
Reviewed-by: Si-Wei Liu <si-wei.liu@oracle.com>
Reviewed-by: Shannon Nelson <shannon.nelson@oracle.com>
Signed-off-by: Brian Maly <brian.maly@oracle.com>
Conflicts:
	drivers/net/virtio_net.c
(UEK4 doesn't have VIRTNET_FEATURES defined)
	include/uapi/linux/virtio_net.h
(there is an additional feature bitmap in UEK5 for virtio net which
cherry-pick inserted during merge)

Signed-off-by: Brian Maly <brian.maly@oracle.com>

diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 84da82b8555e09e3f20b16bebae7ae00ceae7b36..f5df25b5a28a9cfa130940f3ff2a41c4c6687aa0 100644 (file)
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -2058,7 +2058,7 @@ static unsigned int features[] = {
        VIRTIO_NET_F_GUEST_ANNOUNCE, VIRTIO_NET_F_MQ,
        VIRTIO_NET_F_CTRL_MAC_ADDR,
        VIRTIO_F_ANY_LAYOUT,
-       VIRTIO_NET_F_MTU,
+       VIRTIO_NET_F_MTU, VIRTIO_NET_F_STANDBY,
 };
 
 static struct virtio_driver virtio_net_driver = {

diff --git a/include/uapi/linux/virtio_net.h b/include/uapi/linux/virtio_net.h
index fb5d30aa114f13168b346e61e5a0ade91798fbc0..ba554dd267187c9200f4dc4fabd9246b91d8f5f6 100644 (file)
--- a/include/uapi/linux/virtio_net.h
+++ b/include/uapi/linux/virtio_net.h
@@ -56,6 +56,9 @@
 #define VIRTIO_NET_F_CTRL_MAC_ADDR 23  /* Set MAC address */
 #define VIRTIO_NET_F_MTU 25    /* Initial MTU advice */
 
+#define VIRTIO_NET_F_STANDBY     62    /* Act as standby for another device
+                                        * with the same MAC.
+                                        */
 #ifndef VIRTIO_NET_NO_LEGACY
 #define VIRTIO_NET_F_GSO       6       /* Host handles pkts w/ any GSO type */
 #endif /* VIRTIO_NET_NO_LEGACY */