From mboxrd@z Thu Jan 1 00:00:00 1970 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 1B6C52B94 for ; Fri, 3 Mar 2017 10:46:32 +0100 (CET) Received: from 6wind.com (unknown [10.16.0.184]) by proxy.6wind.com (Postfix) with SMTP id E067E24B2F; Fri, 3 Mar 2017 10:46:20 +0100 (CET) Received: by 6wind.com (sSMTP sendmail emulation); Fri, 03 Mar 2017 10:46:18 +0100 From: Pascal Mazon To: keith.wiles@intel.com Cc: dev@dpdk.org, Pascal Mazon Date: Fri, 3 Mar 2017 10:46:08 +0100 Message-Id: <246d1afeb64cec0019ab1a4b5934d3b2cb55e696.1488534161.git.pascal.mazon@6wind.com> X-Mailer: git-send-email 2.8.0.rc0 In-Reply-To: References: Subject: [dpdk-dev] [PATCH 1/6] net/tap: add MAC address management ops X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 09:46:32 -0000 Set a random MAC address when probing the device, as to not leave an empty MAC in pmd->eth_addr. This MAC will be set on the tap netdevice as soon as it's been created using tun_alloc(). As the tap_mac_add() function depend on the fd in the first rxq, move code from tun_alloc() to tap_setup_queue(), after it's been set. Signed-off-by: Pascal Mazon --- doc/guides/nics/features/tap.ini | 1 + drivers/net/tap/rte_eth_tap.c | 88 ++++++++++++++++++++++++++++++++++------ 2 files changed, 76 insertions(+), 13 deletions(-) diff --git a/doc/guides/nics/features/tap.ini b/doc/guides/nics/features/tap.ini index f4aca6921ddc..d9b47a003654 100644 --- a/doc/guides/nics/features/tap.ini +++ b/doc/guides/nics/features/tap.ini @@ -9,6 +9,7 @@ Jumbo frame = Y Promiscuous mode = Y Allmulticast mode = Y Basic stats = Y +Unicast MAC filter = Y Other kdrv = Y ARMv7 = Y ARMv8 = Y diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c index 14c345f07afa..994c8be701c8 100644 --- a/drivers/net/tap/rte_eth_tap.c +++ b/drivers/net/tap/rte_eth_tap.c @@ -63,6 +63,8 @@ #define RTE_PMD_TAP_MAX_QUEUES 1 #endif +#define RTE_PMD_TAP_MAX_MAC_ADDRS 1 + static struct rte_vdev_driver pmd_tap_drv; static const char *valid_arguments[] = { @@ -118,7 +120,7 @@ struct pmd_internals { * supplied name. */ static int -tun_alloc(struct pmd_internals *pmd, uint16_t qid) +tun_alloc(struct pmd_internals *pmd) { struct ifreq ifr; #ifdef IFF_MULTI_QUEUE @@ -176,16 +178,6 @@ tun_alloc(struct pmd_internals *pmd, uint16_t qid) goto error; } - if (qid == 0) { - if (ioctl(fd, SIOCGIFHWADDR, &ifr) == -1) { - RTE_LOG(ERR, PMD, "ioctl failed (SIOCGIFHWADDR) (%s)\n", - ifr.ifr_name); - goto error; - } - - rte_memcpy(&pmd->eth_addr, ifr.ifr_hwaddr.sa_data, ETH_ALEN); - } - return fd; error: @@ -365,7 +357,7 @@ tap_dev_info(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) struct pmd_internals *internals = dev->data->dev_private; dev_info->if_index = internals->if_index; - dev_info->max_mac_addrs = 1; + dev_info->max_mac_addrs = RTE_PMD_TAP_MAX_MAC_ADDRS; dev_info->max_rx_pktlen = (uint32_t)ETHER_MAX_VLAN_FRAME_LEN; dev_info->max_rx_queues = internals->nb_queues; dev_info->max_tx_queues = internals->nb_queues; @@ -502,6 +494,69 @@ tap_allmulti_disable(struct rte_eth_dev *dev) tap_link_set_flags(pmd, IFF_ALLMULTI, 0); } +static void +tap_mac_remove(struct rte_eth_dev *dev __rte_unused, + uint32_t index __rte_unused) +{ + /* + * A single MAC is authorized on the device and it's not possible to + * leave the device without a MAC. Don't do anything, then. + */ +} + +static void +tap_mac_add(struct rte_eth_dev *dev, struct ether_addr *mac_addr, + uint32_t index, uint32_t vmdq __rte_unused) +{ + struct pmd_internals *internals = dev->data->dev_private; + int fd = internals->rxq[0].fd; + struct ifreq ifr; + + if (index > RTE_PMD_TAP_MAX_MAC_ADDRS - 1) { + RTE_LOG(ERR, PMD, + "%s: can't set MAC address: index %d > max %d\n", + dev->data->name, index, RTE_PMD_TAP_MAX_MAC_ADDRS - 1); + return; + } + if (is_zero_ether_addr(mac_addr)) { + RTE_LOG(ERR, PMD, + "%s: can't set an empty MAC address.\n", + dev->data->name); + return; + } + if (fd < 0) { + RTE_LOG(ERR, PMD, + "%s: can't set MAC address: device does not exist.\n", + dev->data->name); + return; + } + memset(&ifr, 0, sizeof(struct ifreq)); + if (ioctl(fd, SIOCGIFHWADDR, &ifr) == -1) { + RTE_LOG(ERR, PMD, "%s: couldn't get current MAC address (%s)\n", + dev->data->name, strerror(errno)); + return; + } + rte_memcpy(ifr.ifr_hwaddr.sa_data, mac_addr, ETHER_ADDR_LEN); + if (ioctl(fd, SIOCSIFHWADDR, &ifr) == -1) { + RTE_LOG(ERR, PMD, "%s: couldn't set current MAC address (%s)\n", + dev->data->name, strerror(errno)); + return; + } + rte_memcpy(&dev->data->mac_addrs[index], mac_addr, ETHER_ADDR_LEN); +} + +static void +tap_mac_set(struct rte_eth_dev *dev, struct ether_addr *mac_addr) +{ + if (is_zero_ether_addr(mac_addr)) { + RTE_LOG(ERR, PMD, "%s: can't set an empty MAC address\n", + dev->data->name); + return; + } + tap_mac_remove(dev, 0); + tap_mac_add(dev, mac_addr, 0, 0); +} + static int tap_setup_queue(struct rte_eth_dev *dev, struct pmd_internals *internals, @@ -518,7 +573,7 @@ tap_setup_queue(struct rte_eth_dev *dev, if (fd < 0) { RTE_LOG(INFO, PMD, "Add queue to TAP %s for qid %d\n", pmd->name, qid); - fd = tun_alloc(pmd, qid); + fd = tun_alloc(pmd); if (fd < 0) { RTE_LOG(ERR, PMD, "tun_alloc(%s, %d) failed\n", pmd->name, qid); @@ -530,6 +585,9 @@ tap_setup_queue(struct rte_eth_dev *dev, rx->fd = fd; tx->fd = fd; + if (qid == 0) + tap_mac_set(dev, &pmd->eth_addr); + return fd; } @@ -636,6 +694,9 @@ static const struct eth_dev_ops ops = { .promiscuous_disable = tap_promisc_disable, .allmulticast_enable = tap_allmulti_enable, .allmulticast_disable = tap_allmulti_disable, + .mac_addr_remove = tap_mac_remove, + .mac_addr_add = tap_mac_add, + .mac_addr_set = tap_mac_set, .stats_get = tap_stats_get, .stats_reset = tap_stats_reset, }; @@ -681,6 +742,7 @@ eth_dev_tap_create(const char *name, char *tap_name) data->drv_name = pmd_tap_drv.driver.name; data->numa_node = numa_node; + eth_random_addr((uint8_t *)&pmd->eth_addr); data->dev_link = pmd_link; data->mac_addrs = &pmd->eth_addr; data->nb_rx_queues = pmd->nb_queues; -- 2.8.0.rc0