From mboxrd@z Thu Jan 1 00:00:00 1970 From: Pascal Mazon Subject: [PATCH v2 2/4] net/tap: reflect tap flags on the remote Date: Tue, 7 Mar 2017 17:38:52 +0100 Message-ID: <62e9bc135c34efc8204b5e3acb9ee7e4fa5af319.1488904606.git.pascal.mazon@6wind.com> References: Cc: dev@dpdk.org, Pascal Mazon To: keith.wiles@intel.com Return-path: Received: from proxy.6wind.com (host.76.145.23.62.rev.coltfrance.com [62.23.145.76]) by dpdk.org (Postfix) with ESMTP id 1C35C1BBE for ; Tue, 7 Mar 2017 17:39:17 +0100 (CET) In-Reply-To: List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 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 Acked-by: Olga Shern --- drivers/net/tap/rte_eth_tap.c | 36 +++++++++++++++++++++++------------- drivers/net/tap/tap.h | 2 ++ 2 files changed, 25 insertions(+), 13 deletions(-) diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c index b29cfbfb41f3..ded8bb0f18d9 100644 --- a/drivers/net/tap/rte_eth_tap.c +++ b/drivers/net/tap/rte_eth_tap.c @@ -254,7 +254,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; @@ -271,11 +271,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; } @@ -293,6 +293,7 @@ tap_link_set_flags(struct pmd_internals *pmd, short flags, int add) close(s); return 0; + } static int @@ -301,7 +302,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 @@ -310,7 +311,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 @@ -482,9 +483,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 @@ -493,9 +496,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 @@ -504,9 +509,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 @@ -515,9 +522,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 @@ -962,6 +971,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 4c4de939f1cc..9811d0b0f085 100644 --- a/drivers/net/tap/tap.h +++ b/drivers/net/tap/tap.h @@ -63,9 +63,11 @@ struct tx_queue { }; struct pmd_internals { + char remote_iface[RTE_ETH_NAME_MAX_LEN]; /* Remote netdevice name */ char name[RTE_ETH_NAME_MAX_LEN]; /* Internal Tap device name */ uint16_t nb_queues; /* Number of queues supported */ struct ether_addr eth_addr; /* Mac address of the device port */ + int remote_if_index; /* remote netdevice IF_INDEX */ int if_index; /* IF_INDEX for the port */ int nlsk_fd; /* Netlink socket fd */ int flower_support; /* 1 if kernel supports, else 0 */ -- 2.8.0.rc0