From patchwork Sun Feb 14 01:20:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Kozlyuk X-Patchwork-Id: 87897 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 840A3A0546; Sun, 14 Feb 2021 02:20:49 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B7DCD1CC55F; Sun, 14 Feb 2021 02:20:30 +0100 (CET) Received: from mail-lj1-f169.google.com (mail-lj1-f169.google.com [209.85.208.169]) by mails.dpdk.org (Postfix) with ESMTP id 2A3291CC4DA for ; Sun, 14 Feb 2021 02:20:27 +0100 (CET) Received: by mail-lj1-f169.google.com with SMTP id e17so3626185ljl.8 for ; Sat, 13 Feb 2021 17:20:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=INuMMPX7mPyXPcRHrhvrdRfHk3dCHnteBdjEwxYTTeQ=; b=oV4Ch1zASoQjMVXI+OjeYTElocXNFfvHBZlNRCSh2L/yfsD072N0Oz4AVYqO7XwTPr cZNNxteezTqXXOeSSYlfqsBy6wMbGuTReo5XiA6BF8PDRqsvAdoxMeho2WCPJkLHfPtD u7u079XaVRIliyVBVLBLIgmsoxzjLOktWtx/Ye069FzgQhrkFno3G2aDlPA9+oyYfX36 qYZfx1sprblXy9nk+pEzx04afQb+gt9PeSTzuUopZpl6urUWYr8nMg8MQpd0EQDwtqZ4 /IYCGwCX4ZqNV126GrrdJORHKJepG/yXTY+RY6ix1cbZ8D6+fdFmBaN7V70HnPcJfEA6 PX8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=INuMMPX7mPyXPcRHrhvrdRfHk3dCHnteBdjEwxYTTeQ=; b=maJa3zm3cmL3NSoRCZCjBNbUYOlCtN+rBxAJAXcyOSIbRmM+Xi8MhoQ4FpsOGibB1g CrRRk7zoLTrZw01b+Ix3CsG6fqjiazKRiKOa7ABHBEZ0cegJ63I8h8FLJRndOX5EU/ez sgQ32uUrK6VBi1zaXVE8XA23ulj4fK3c63plvg3Sq1XbrudkKesP/ureK0RfS9dmFIx0 LXuKQvr58+b6TlJ3PS3EE63kEqp4vBCEOm+68cezufo01LsSsDUWo0CXlH+cXWmuF4iE 4wUnU947HviIXgrR/FKjQq2eueKILRja4k62tYkgGOIyK6HPprtFeLdAq44Qq2O8ixPn UODA== X-Gm-Message-State: AOAM530SL9mF0e6H+omENzO3xddr+MNGwp/QCeDEokh+vT5W3SWm6fZU 3i8KKVphRo3GBKFzGu3uuZK1s3Qg8gpQRg== X-Google-Smtp-Source: ABdhPJyIs+zcqwqsVFOnJ8fTzuxO0OhdpupMf6j+2lozjDExyf8A7IJ/dWSnIreLOdxHs7vXKs+qUA== X-Received: by 2002:a2e:984c:: with SMTP id e12mr5515528ljj.69.1613265626368; Sat, 13 Feb 2021 17:20:26 -0800 (PST) Received: from localhost.localdomain (broadband-37-110-65-23.ip.moscow.rt.ru. [37.110.65.23]) by smtp.gmail.com with ESMTPSA id h11sm2237648lfd.243.2021.02.13.17.20.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 Feb 2021 17:20:26 -0800 (PST) From: Dmitry Kozlyuk To: dev@dpdk.org Cc: Tyler Retzlaff , Mike Wells , Dmitry Kozlyuk , Ferruh Yigit Date: Sun, 14 Feb 2021 04:20:10 +0300 Message-Id: <20210214012013.23165-4-dmitry.kozliuk@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210214012013.23165-1-dmitry.kozliuk@gmail.com> References: <20210214012013.23165-1-dmitry.kozliuk@gmail.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH 3/6] net/pcap: move OS-dependent code to separate files X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" PCAP PMD queries interface information differently for Linux and FreeBSD, OS-specific code is guarded by #ifdef. In preparation to add Windows-specific part and libpcap wrapper, extract OS-independent interface and move implementations to separate files. Rename rte_eth_pcap.c to pcap_ethdev.c for consistency with the rest of DPDK. Signed-off-by: Dmitry Kozlyuk --- drivers/net/pcap/meson.build | 5 +- .../pcap/{rte_eth_pcap.c => pcap_ethdev.c} | 88 ++----------------- drivers/net/pcap/pcap_osdep.h | 17 ++++ drivers/net/pcap/pcap_osdep_freebsd.c | 59 +++++++++++++ drivers/net/pcap/pcap_osdep_linux.c | 42 +++++++++ 5 files changed, 130 insertions(+), 81 deletions(-) rename drivers/net/pcap/{rte_eth_pcap.c => pcap_ethdev.c} (95%) create mode 100644 drivers/net/pcap/pcap_osdep.h create mode 100644 drivers/net/pcap/pcap_osdep_freebsd.c create mode 100644 drivers/net/pcap/pcap_osdep_linux.c diff --git a/drivers/net/pcap/meson.build b/drivers/net/pcap/meson.build index b65d91e70..26b606699 100644 --- a/drivers/net/pcap/meson.build +++ b/drivers/net/pcap/meson.build @@ -11,5 +11,8 @@ if not dpdk_conf.has('RTE_PORT_PCAP') build = false reason = 'missing dependency, "libpcap"' endif -sources = files('rte_eth_pcap.c') +sources = files( + 'pcap_ethdev.c', + 'pcap_osdep_@0@.c'.format(exec_env), +) ext_deps += pcap_dep diff --git a/drivers/net/pcap/rte_eth_pcap.c b/drivers/net/pcap/pcap_ethdev.c similarity index 95% rename from drivers/net/pcap/rte_eth_pcap.c rename to drivers/net/pcap/pcap_ethdev.c index 176928da3..a102897e9 100644 --- a/drivers/net/pcap/rte_eth_pcap.c +++ b/drivers/net/pcap/pcap_ethdev.c @@ -6,16 +6,6 @@ #include -#include -#include -#include -#include - -#if defined(RTE_EXEC_ENV_FREEBSD) -#include -#include -#endif - #include #include @@ -25,7 +15,8 @@ #include #include #include -#include + +#include "pcap_osdep.h" #define RTE_ETH_PCAP_SNAPSHOT_LEN 65535 #define RTE_ETH_PCAP_SNAPLEN RTE_ETHER_MAX_JUMBO_FRAME_LEN @@ -1191,84 +1182,20 @@ static int eth_pcap_update_mac(const char *if_name, struct rte_eth_dev *eth_dev, const unsigned int numa_node) { -#if defined(RTE_EXEC_ENV_LINUX) void *mac_addrs; - struct ifreq ifr; - int if_fd = socket(AF_INET, SOCK_DGRAM, 0); - - if (if_fd == -1) - return -1; + struct rte_ether_addr mac; - rte_strscpy(ifr.ifr_name, if_name, sizeof(ifr.ifr_name)); - if (ioctl(if_fd, SIOCGIFHWADDR, &ifr)) { - close(if_fd); + if (osdep_iface_mac_get(if_name, &mac) < 0) return -1; - } mac_addrs = rte_zmalloc_socket(NULL, RTE_ETHER_ADDR_LEN, 0, numa_node); - if (!mac_addrs) { - close(if_fd); + if (mac_addrs == NULL) return -1; - } PMD_LOG(INFO, "Setting phy MAC for %s", if_name); + rte_memcpy(mac_addrs, mac.addr_bytes, RTE_ETHER_ADDR_LEN); eth_dev->data->mac_addrs = mac_addrs; - rte_memcpy(eth_dev->data->mac_addrs[0].addr_bytes, - ifr.ifr_hwaddr.sa_data, RTE_ETHER_ADDR_LEN); - - close(if_fd); - - return 0; - -#elif defined(RTE_EXEC_ENV_FREEBSD) - void *mac_addrs; - struct if_msghdr *ifm; - struct sockaddr_dl *sdl; - int mib[6]; - size_t len = 0; - char *buf; - - mib[0] = CTL_NET; - mib[1] = AF_ROUTE; - mib[2] = 0; - mib[3] = AF_LINK; - mib[4] = NET_RT_IFLIST; - mib[5] = if_nametoindex(if_name); - - if (sysctl(mib, 6, NULL, &len, NULL, 0) < 0) - return -1; - - if (len == 0) - return -1; - - buf = rte_malloc(NULL, len, 0); - if (!buf) - return -1; - - if (sysctl(mib, 6, buf, &len, NULL, 0) < 0) { - rte_free(buf); - return -1; - } - ifm = (struct if_msghdr *)buf; - sdl = (struct sockaddr_dl *)(ifm + 1); - - mac_addrs = rte_zmalloc_socket(NULL, RTE_ETHER_ADDR_LEN, 0, numa_node); - if (!mac_addrs) { - rte_free(buf); - return -1; - } - - PMD_LOG(INFO, "Setting phy MAC for %s", if_name); - eth_dev->data->mac_addrs = mac_addrs; - rte_memcpy(eth_dev->data->mac_addrs[0].addr_bytes, - LLADDR(sdl), RTE_ETHER_ADDR_LEN); - - rte_free(buf); - return 0; -#else - return -1; -#endif } static int @@ -1330,7 +1257,8 @@ eth_from_pcaps(struct rte_vdev_device *vdev, internals->single_iface = single_iface; if (single_iface) { - internals->if_index = if_nametoindex(rx_queues->queue[0].name); + internals->if_index = + osdep_iface_index_get(rx_queues->queue[0].name); /* phy_mac arg is applied only only if "iface" devarg is provided */ if (rx_queues->phy_mac) { diff --git a/drivers/net/pcap/pcap_osdep.h b/drivers/net/pcap/pcap_osdep.h new file mode 100644 index 000000000..46810d86f --- /dev/null +++ b/drivers/net/pcap/pcap_osdep.h @@ -0,0 +1,17 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright (c) 2021 Dmitry Kozlyuk + */ + +#ifndef _RTE_PCAP_OSDEP_ +#define _RTE_PCAP_OSDEP_ + +#include + +/* + * Interface manipulation is always OS-specific. + */ + +int osdep_iface_index_get(const char *name); +int osdep_iface_mac_get(const char *name, struct rte_ether_addr *mac); + +#endif diff --git a/drivers/net/pcap/pcap_osdep_freebsd.c b/drivers/net/pcap/pcap_osdep_freebsd.c new file mode 100644 index 000000000..20556b3e9 --- /dev/null +++ b/drivers/net/pcap/pcap_osdep_freebsd.c @@ -0,0 +1,59 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2010-2016 Intel Corporation. + * Copyright(c) 2014 6WIND S.A. + * All rights reserved. + */ + +#include +#include +#include + +#include +#include + +#include "pcap_osdep.h" + +int +osdep_iface_index_get(const char *name) +{ + return if_nametoindex(name); +} + +int +osdep_iface_mac_get(const char *if_name, struct rte_ether_addr *mac) +{ + struct if_msghdr *ifm; + struct sockaddr_dl *sdl; + int mib[6]; + size_t len = 0; + char *buf; + + mib[0] = CTL_NET; + mib[1] = AF_ROUTE; + mib[2] = 0; + mib[3] = AF_LINK; + mib[4] = NET_RT_IFLIST; + mib[5] = if_nametoindex(if_name); + + if (sysctl(mib, 6, NULL, &len, NULL, 0) < 0) + return -1; + + if (len == 0) + return -1; + + buf = rte_malloc(NULL, len, 0); + if (!buf) + return -1; + + if (sysctl(mib, 6, buf, &len, NULL, 0) < 0) { + rte_free(buf); + return -1; + } + ifm = (struct if_msghdr *)buf; + sdl = (struct sockaddr_dl *)(ifm + 1); + + rte_memcpy(mac->addr_bytes, LLADDR(sdl), RTE_ETHER_ADDR_LEN); + + rte_free(buf); + return 0; +} diff --git a/drivers/net/pcap/pcap_osdep_linux.c b/drivers/net/pcap/pcap_osdep_linux.c new file mode 100644 index 000000000..97033f57c --- /dev/null +++ b/drivers/net/pcap/pcap_osdep_linux.c @@ -0,0 +1,42 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2010-2016 Intel Corporation. + * Copyright(c) 2014 6WIND S.A. + * All rights reserved. + */ + +#include +#include +#include +#include + +#include +#include + +#include "pcap_osdep.h" + +int +osdep_iface_index_get(const char *name) +{ + return if_nametoindex(name); +} + +int +osdep_iface_mac_get(const char *if_name, struct rte_ether_addr *mac) +{ + struct ifreq ifr; + int if_fd = socket(AF_INET, SOCK_DGRAM, 0); + + if (if_fd == -1) + return -1; + + rte_strscpy(ifr.ifr_name, if_name, sizeof(ifr.ifr_name)); + if (ioctl(if_fd, SIOCGIFHWADDR, &ifr)) { + close(if_fd); + return -1; + } + + rte_memcpy(mac->addr_bytes, ifr.ifr_hwaddr.sa_data, RTE_ETHER_ADDR_LEN); + + close(if_fd); + return 0; +}