[dpdk-dev] [PATCH 2/4] net/tap: reflect tap flags on the remote

[Pascal Mazon <pascal.mazon@6wind.com>]

Synchronize PROMISC and ALLMULTI flags to the remote netdevice if
possible.

Leave the IFF_UP flag as it is, however.

Signed-off-by: Pascal Mazon <pascal.mazon@6wind.com>
Acked-by: Olga Shern <olgas@mellanox.com>
---
 drivers/net/tap/rte_eth_tap.c | 36 +++++++++++++++++++++++-------------
 drivers/net/tap/tap.h         |  1 +
 2 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c
index 327fefd0d3a1..c77f206b4f60 100644
--- a/drivers/net/tap/rte_eth_tap.c
+++ b/drivers/net/tap/rte_eth_tap.c
@@ -249,7 +249,7 @@ pmd_tx_burst(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
 }
 
 static int
-tap_link_set_flags(struct pmd_internals *pmd, short flags, int add)
+tap_netdev_set_flags(const char *iface, short flags, int add)
 {
 	struct ifreq ifr;
 	int err, s;
@@ -266,11 +266,11 @@ tap_link_set_flags(struct pmd_internals *pmd, short flags, int add)
 		return -1;
 	}
 	memset(&ifr, 0, sizeof(ifr));
-	snprintf(ifr.ifr_name, IFNAMSIZ, "%s", pmd->name);
+	snprintf(ifr.ifr_name, IFNAMSIZ, "%s", iface);
 	err = ioctl(s, SIOCGIFFLAGS, &ifr);
 	if (err < 0) {
 		RTE_LOG(WARNING, PMD, "Unable to get %s device flags: %s\n",
-			pmd->name, strerror(errno));
+			iface, strerror(errno));
 		close(s);
 		return -1;
 	}
@@ -288,6 +288,7 @@ tap_link_set_flags(struct pmd_internals *pmd, short flags, int add)
 	close(s);
 
 	return 0;
+
 }
 
 static int
@@ -296,7 +297,7 @@ tap_link_set_down(struct rte_eth_dev *dev)
 	struct pmd_internals *pmd = dev->data->dev_private;
 
 	dev->data->dev_link.link_status = ETH_LINK_DOWN;
-	return tap_link_set_flags(pmd, IFF_UP | IFF_NOARP, 0);
+	return tap_netdev_set_flags(pmd->name, IFF_UP | IFF_NOARP, 0);
 }
 
 static int
@@ -305,7 +306,7 @@ tap_link_set_up(struct rte_eth_dev *dev)
 	struct pmd_internals *pmd = dev->data->dev_private;
 
 	dev->data->dev_link.link_status = ETH_LINK_UP;
-	return tap_link_set_flags(pmd, IFF_UP | IFF_NOARP, 1);
+	return tap_netdev_set_flags(pmd->name, IFF_UP | IFF_NOARP, 1);
 }
 
 static int
@@ -476,9 +477,11 @@ tap_promisc_enable(struct rte_eth_dev *dev)
 	struct pmd_internals *pmd = dev->data->dev_private;
 
 	dev->data->promiscuous = 1;
-	tap_link_set_flags(pmd, IFF_PROMISC, 1);
-	if (pmd->remote_if_index)
+	tap_netdev_set_flags(pmd->name, IFF_PROMISC, 1);
+	if (pmd->remote_if_index) {
 		tap_flow_implicit_create(pmd, TAP_REMOTE_PROMISC);
+		tap_netdev_set_flags(pmd->remote_iface, IFF_PROMISC, 1);
+	}
 }
 
 static void
@@ -487,9 +490,11 @@ tap_promisc_disable(struct rte_eth_dev *dev)
 	struct pmd_internals *pmd = dev->data->dev_private;
 
 	dev->data->promiscuous = 0;
-	tap_link_set_flags(pmd, IFF_PROMISC, 0);
-	if (pmd->remote_if_index)
+	tap_netdev_set_flags(pmd->name, IFF_PROMISC, 0);
+	if (pmd->remote_if_index) {
 		tap_flow_implicit_destroy(dev, TAP_REMOTE_PROMISC);
+		tap_netdev_set_flags(pmd->remote_iface, IFF_PROMISC, 0);
+	}
 }
 
 static void
@@ -498,9 +503,11 @@ tap_allmulti_enable(struct rte_eth_dev *dev)
 	struct pmd_internals *pmd = dev->data->dev_private;
 
 	dev->data->all_multicast = 1;
-	tap_link_set_flags(pmd, IFF_ALLMULTI, 1);
-	if (pmd->remote_if_index)
+	tap_netdev_set_flags(pmd->name, IFF_ALLMULTI, 1);
+	if (pmd->remote_if_index) {
 		tap_flow_implicit_create(pmd, TAP_REMOTE_ALLMULTI);
+		tap_netdev_set_flags(pmd->remote_iface, IFF_ALLMULTI, 1);
+	}
 }
 
 static void
@@ -509,9 +516,11 @@ tap_allmulti_disable(struct rte_eth_dev *dev)
 	struct pmd_internals *pmd = dev->data->dev_private;
 
 	dev->data->all_multicast = 0;
-	tap_link_set_flags(pmd, IFF_ALLMULTI, 0);
-	if (pmd->remote_if_index)
+	tap_netdev_set_flags(pmd->name, IFF_ALLMULTI, 0);
+	if (pmd->remote_if_index) {
 		tap_flow_implicit_destroy(dev, TAP_REMOTE_ALLMULTI);
+		tap_netdev_set_flags(pmd->remote_iface, IFF_ALLMULTI, 0);
+	}
 }
 
 static void
@@ -924,6 +933,7 @@ eth_dev_tap_create(const char *name, char *tap_name, char *remote_iface)
 	 */
 	pmd->nlsk_fd = nl_init();
 	if (strlen(remote_iface)) {
+		strncpy(pmd->remote_iface, remote_iface, RTE_ETH_NAME_MAX_LEN);
 		pmd->remote_if_index = if_nametoindex(remote_iface);
 		if (!pmd->remote_if_index)
 			RTE_LOG(ERR, PMD, "Could not find %s ifindex: "
diff --git a/drivers/net/tap/tap.h b/drivers/net/tap/tap.h
index a5f83d4feea3..2afd0f9a4a58 100644
--- a/drivers/net/tap/tap.h
+++ b/drivers/net/tap/tap.h
@@ -64,6 +64,7 @@ struct tx_queue {
 
 struct pmd_internals {
 	char name[RTE_ETH_NAME_MAX_LEN]; /* Internal Tap device name */
+	char remote_iface[RTE_ETH_NAME_MAX_LEN]; /* Remote netdevice name */
 	int nlsk_fd; /* Netlink socket fd */
 	uint16_t nb_queues; /* Number of queues supported */
 	struct ether_addr eth_addr; /* Mac address of the device port */
-- 
2.8.0.rc0