From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 06CB5A0A0A; Wed, 24 Mar 2021 01:50:39 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2EEE8140D1B; Wed, 24 Mar 2021 01:50:28 +0100 (CET) Received: from mail-lf1-f47.google.com (mail-lf1-f47.google.com [209.85.167.47]) by mails.dpdk.org (Postfix) with ESMTP id A6C0B140D03 for ; Wed, 24 Mar 2021 01:50:26 +0100 (CET) Received: by mail-lf1-f47.google.com with SMTP id a198so29388897lfd.7 for ; Tue, 23 Mar 2021 17:50:26 -0700 (PDT) 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=z0MWg2nvbT22ZlKXv1mTihokDMioWHyioQ7vEmvx6CQ=; b=oogcd8P/i44/mu8whxZ31jxJ/W5u7u7yJXvtjILLGY4Sh5dtQtgFZunxlj5UPQvTxA wuNo7qQsvFX7BZQqm3NJXJ8lcSB7AkTPH9A02Q3nyHg6JmPErnhZtxACsJc3Bnl6MkGM oglJGnujHOCEG0Cg0gVEvTVwrB/jou0b8N99/xnlMVzOCca9JtJnZ2wwvXomCn8kXd5+ 7Ba4FRAlMfOLTNIUSreAc1b5IgkaYHhQbitO8/HEhEep+FazCdrIzxOR/FtGnKBjTW/x yH7L3IdWnEHsYW0KLI9bVGC7rzZNhDmwWBuQnjcj7bWZihPh/u4XB8YYF870iVKJ9QyP fObg== 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=z0MWg2nvbT22ZlKXv1mTihokDMioWHyioQ7vEmvx6CQ=; b=gMLMOI5yXoGGsK7p4o7LIEVu6Ct9wDL/bX/VL772qM3dZvYPOejqsHFywsisvYeTQI Jwm0BQYyIwa663sUaYcwToyqwJQS/AnLLxLjwgmbLqc18e5UJVkgORj2/4v7eGSJl8Ti 8ET735wdZ2ybJreXhJdzMm3YYitlMSKNBL7a1cC3Jts2w9hOkEbWc6l0gYryX+2kyAaU qlBv6TfuS9ddaPE/yydCRyMzSUR7fJVdy5aOLqphLxjOk8NPfWB6SI2RReNkjAhgshH0 Jv4gA8TaNtuDHEpiRNktw3IH9J2I9eY8Rt1CK8WQSSXvxhoJGCtajhaaZRqen+9+GtVA L6Og== X-Gm-Message-State: AOAM533G99+okyH7OR+Wuk9kAhhh7oLMe4M7ilq0T1oY0TD5Kf3Tofrt rF39rpm/B8wuYXQlvtn+3yL+EL8b//LzzQZ2 X-Google-Smtp-Source: ABdhPJyXczdVHGBEDIMC6xBY53Q5cMjflFbT5UlhpOcJHhRSZPTE/3DyFkCEX6XQyU+gRDU24nxS0g== X-Received: by 2002:a19:ed03:: with SMTP id y3mr386283lfy.394.1616547025845; Tue, 23 Mar 2021 17:50:25 -0700 (PDT) Received: from localhost.localdomain (broadband-37-110-65-23.ip.moscow.rt.ru. [37.110.65.23]) by smtp.gmail.com with ESMTPSA id q12sm89794ljj.49.2021.03.23.17.50.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Mar 2021 17:50:25 -0700 (PDT) From: Dmitry Kozlyuk To: dev@dpdk.org Cc: Nick Connolly , Mike Wells , Tyler Retzlaff , Dmitry Kozlyuk , Ferruh Yigit Date: Wed, 24 Mar 2021 03:50:06 +0300 Message-Id: <20210324005008.24705-3-dmitry.kozliuk@gmail.com> X-Mailer: git-send-email 2.29.3 In-Reply-To: <20210324005008.24705-1-dmitry.kozliuk@gmail.com> References: <20210214021616.26970-1-dmitry.kozliuk@gmail.com> <20210324005008.24705-1-dmitry.kozliuk@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v3 2/3] 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. This PMD also depends on POSIX bits, namely gettimeofday() and NAME_MAX. Move OS-dependent code to separate files. Replace POSIX bits with DPDK equivalents. Rename rte_eth_pcap.c to pcap_ethdev.c, like it is in most other PMDs. Signed-off-by: Dmitry Kozlyuk Reviewed-by: Ferruh Yigit --- drivers/net/pcap/meson.build | 5 +- .../pcap/{rte_eth_pcap.c => pcap_ethdev.c} | 105 ++++-------------- drivers/net/pcap/pcap_osdep.h | 13 +++ drivers/net/pcap/pcap_osdep_freebsd.c | 59 ++++++++++ drivers/net/pcap/pcap_osdep_linux.c | 42 +++++++ 5 files changed, 137 insertions(+), 87 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 b65d91e70a..26b6066990 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 28a5027315..1578de1204 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,9 @@ #include #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 @@ -46,7 +38,7 @@ #define RTE_PMD_PCAP_MAX_QUEUES 16 static char errbuf[PCAP_ERRBUF_SIZE]; -static struct timeval start_time; +static struct timespec start_time; static uint64_t start_cycles; static uint64_t hz; static uint8_t iface_idx; @@ -354,17 +346,21 @@ eth_null_rx(void *queue __rte_unused, #define NSEC_PER_SEC 1000000000L +/* + * This function stores nanoseconds in `tv_usec` field of `struct timeval`, + * because `ts` goes directly to nanosecond-precision dump. + */ static inline void calculate_timestamp(struct timeval *ts) { uint64_t cycles; - struct timeval cur_time; + struct timespec cur_time; cycles = rte_get_timer_cycles() - start_cycles; cur_time.tv_sec = cycles / hz; - cur_time.tv_usec = (cycles % hz) * NSEC_PER_SEC / hz; + cur_time.tv_nsec = (cycles % hz) * NSEC_PER_SEC / hz; ts->tv_sec = start_time.tv_sec + cur_time.tv_sec; - ts->tv_usec = start_time.tv_usec + cur_time.tv_usec; + ts->tv_usec = start_time.tv_nsec + cur_time.tv_nsec; if (ts->tv_usec >= NSEC_PER_SEC) { ts->tv_usec -= NSEC_PER_SEC; ts->tv_sec += 1; @@ -883,7 +879,7 @@ eth_rx_queue_setup(struct rte_eth_dev *dev, if (internals->infinite_rx) { struct pmd_process_private *pp; - char ring_name[NAME_MAX]; + char ring_name[RTE_RING_NAMESIZE]; static uint32_t ring_number; uint64_t pcap_pkt_count = 0; struct rte_mbuf *bufs[1]; @@ -1261,84 +1257,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 @@ -1400,7 +1332,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) { @@ -1453,7 +1386,7 @@ pmd_pcap_probe(struct rte_vdev_device *dev) name = rte_vdev_device_name(dev); PMD_LOG(INFO, "Initializing pmd_pcap for %s", name); - gettimeofday(&start_time, NULL); + timespec_get(&start_time, TIME_UTC); start_cycles = rte_get_timer_cycles(); hz = rte_get_timer_hz(); diff --git a/drivers/net/pcap/pcap_osdep.h b/drivers/net/pcap/pcap_osdep.h new file mode 100644 index 0000000000..9de422ab8d --- /dev/null +++ b/drivers/net/pcap/pcap_osdep.h @@ -0,0 +1,13 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright (c) 2021 Dmitry Kozlyuk + */ + +#ifndef _RTE_PCAP_OSDEP_ +#define _RTE_PCAP_OSDEP_ + +#include + +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 0000000000..20556b3e92 --- /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 0000000000..97033f57c5 --- /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; +} -- 2.29.3