From patchwork Wed Mar 24 00:50:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Kozlyuk X-Patchwork-Id: 89721 X-Patchwork-Delegate: ferruh.yigit@amd.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 6E6DFA0A0A; Wed, 24 Mar 2021 01:50:45 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6131A140D36; Wed, 24 Mar 2021 01:50:29 +0100 (CET) Received: from mail-lj1-f182.google.com (mail-lj1-f182.google.com [209.85.208.182]) by mails.dpdk.org (Postfix) with ESMTP id 9465C140D0D for ; Wed, 24 Mar 2021 01:50:27 +0100 (CET) Received: by mail-lj1-f182.google.com with SMTP id y1so28018295ljm.10 for ; Tue, 23 Mar 2021 17:50:27 -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=lIaRHAMTOmf6rkBMkQltAkqpG2EBGK+czgi2tWT5Xuk=; b=KzBdClovhuCfymDEE/1mza563Zxyroi4HAyct2/LJu+W6FZyonJ9+kempM/3fRn1je VQb5bgQ2jAkb28fOwlqWVZtpzKD9th5Go1nRVnhZxtWkMsELjL7yBLKBfh2JLIVA+CD8 QxeelQe9yjjvDgJvcEga0hL7KRzZNm40HWp4G9DMHZ7L/8zaY7b4XhZ3kSV0gGsrHuP1 GDCuz3ZxYga3bLfIOzOwxiI98pgzJWTYOChS+m47JlaQm7YiA3/Qou47x/IAri/kfocm KzA1G0ONEImlychf+Grs0CpU+T9s6dZwUfa9rIoORzWSVQjNVIG5/6iZi3C15qQ9ST8U Q7Tw== 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=lIaRHAMTOmf6rkBMkQltAkqpG2EBGK+czgi2tWT5Xuk=; b=PNIzJdf1Yd2UM8sM93+EFyNn8A2LKoT+ngJ416g5hbGl5HS/G1Cx+a0QHVWhKNxn8C kk+xkFH9EcV13U19eJeUtrID6/mSCOgonSy+FEHAZ1R1UettRkrW9jb6WtVXfCwfxxuQ fDczFbLqoKYfNk4DcF5P2wAdgYwZkkrDUJcD2ykpwwHZDXlk0+J+WxhUyYDl/pDDW5Zl x1s1zZTQKQFtG9I/Q5h0mSxj6+O5G98+V4YtYXfiLl083KsQh26WavJI8FRJieUaWhVL 8SXIXzG+G3QPmi/88mdEXRT5XzotKUPsQt5Zfht4e2mvlp2sajfzn09mnVKqiiPyw9ST FJtA== X-Gm-Message-State: AOAM531EUu1SD5E7i32tJBFgxvyE+hNKIkjG5sP/bbz4RKWFBMPfbxp5 lHBxWzrQY+33/nqDG52EvW75ae2iQCjkt5IY X-Google-Smtp-Source: ABdhPJy1mcGsGH2TQAsiDMPGVhxAUJ3veZ/do70/GgniqB+55WWRQ2gpjoOjVOT2x32zaEZ0kaQpuQ== X-Received: by 2002:a05:651c:384:: with SMTP id e4mr334515ljp.500.1616547026789; Tue, 23 Mar 2021 17:50:26 -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.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Mar 2021 17:50:26 -0700 (PDT) From: Dmitry Kozlyuk To: dev@dpdk.org Cc: Nick Connolly , Mike Wells , Tyler Retzlaff , Dmitry Kozlyuk , Bruce Richardson , Ferruh Yigit Date: Wed, 24 Mar 2021 03:50:07 +0300 Message-Id: <20210324005008.24705-4-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 Subject: [dpdk-dev] [PATCH v3 3/3] net/pcap: build on Windows 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" Implement OS-dependent functions and enable build for Windows. Account for different library name in Windows libpcap distributions. Signed-off-by: Dmitry Kozlyuk --- config/meson.build | 3 +- doc/guides/rel_notes/release_21_05.rst | 4 + drivers/net/pcap/meson.build | 11 ++- drivers/net/pcap/pcap_ethdev.c | 4 - drivers/net/pcap/pcap_osdep.h | 5 ++ drivers/net/pcap/pcap_osdep_windows.c | 118 +++++++++++++++++++++++++ 6 files changed, 134 insertions(+), 11 deletions(-) create mode 100644 drivers/net/pcap/pcap_osdep_windows.c diff --git a/config/meson.build b/config/meson.build index 95777cf331..a15731cfc6 100644 --- a/config/meson.build +++ b/config/meson.build @@ -179,7 +179,8 @@ endif pcap_dep = dependency('libpcap', required: false, method: 'pkg-config') if not pcap_dep.found() # pcap got a pkg-config file only in 1.9.0 - pcap_dep = cc.find_library('pcap', required: false) + pcap_lib = is_windows ? 'wpcap' : 'pcap' + pcap_dep = cc.find_library(pcap_lib, required: false) endif if pcap_dep.found() and cc.has_header('pcap.h', dependencies: pcap_dep) dpdk_conf.set('RTE_PORT_PCAP', 1) diff --git a/doc/guides/rel_notes/release_21_05.rst b/doc/guides/rel_notes/release_21_05.rst index 8e686cc627..ae78273075 100644 --- a/doc/guides/rel_notes/release_21_05.rst +++ b/doc/guides/rel_notes/release_21_05.rst @@ -101,6 +101,10 @@ New Features * Added command to display Rx queue used descriptor count. ``show port (port_id) rxq (queue_id) desc used count`` +* **Enabled libpcap-based PMD on Windows.** + + A libpcap distribution, such as Npcap or WinPcap, is required to run the PMD. + Removed Items ------------- diff --git a/drivers/net/pcap/meson.build b/drivers/net/pcap/meson.build index 26b6066990..63ad3f34f0 100644 --- a/drivers/net/pcap/meson.build +++ b/drivers/net/pcap/meson.build @@ -1,18 +1,17 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation -if is_windows - build = false - reason = 'not supported on Windows' - subdir_done() -endif - if not dpdk_conf.has('RTE_PORT_PCAP') build = false reason = 'missing dependency, "libpcap"' endif + sources = files( 'pcap_ethdev.c', 'pcap_osdep_@0@.c'.format(exec_env), ) + ext_deps += pcap_dep +if is_windows + ext_deps += cc.find_library('iphlpapi', required: true) +endif diff --git a/drivers/net/pcap/pcap_ethdev.c b/drivers/net/pcap/pcap_ethdev.c index 1578de1204..875b736e97 100644 --- a/drivers/net/pcap/pcap_ethdev.c +++ b/drivers/net/pcap/pcap_ethdev.c @@ -142,10 +142,6 @@ static struct rte_eth_link pmd_link = { RTE_LOG_REGISTER(eth_pcap_logtype, pmd.net.pcap, NOTICE); -#define PMD_LOG(level, fmt, args...) \ - rte_log(RTE_LOG_ ## level, eth_pcap_logtype, \ - "%s(): " fmt "\n", __func__, ##args) - static struct queue_missed_stat* queue_missed_stat_update(struct rte_eth_dev *dev, unsigned int qid) { diff --git a/drivers/net/pcap/pcap_osdep.h b/drivers/net/pcap/pcap_osdep.h index 9de422ab8d..bf41cba982 100644 --- a/drivers/net/pcap/pcap_osdep.h +++ b/drivers/net/pcap/pcap_osdep.h @@ -7,6 +7,11 @@ #include +#define PMD_LOG(level, fmt, args...) \ + rte_log(RTE_LOG_ ## level, eth_pcap_logtype, \ + "%s(): " fmt "\n", __func__, ##args) +extern int eth_pcap_logtype; + int osdep_iface_index_get(const char *name); int osdep_iface_mac_get(const char *name, struct rte_ether_addr *mac); diff --git a/drivers/net/pcap/pcap_osdep_windows.c b/drivers/net/pcap/pcap_osdep_windows.c new file mode 100644 index 0000000000..1d398dc7ed --- /dev/null +++ b/drivers/net/pcap/pcap_osdep_windows.c @@ -0,0 +1,118 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright (c) 2021 Dmitry Kozlyuk + */ + +#include +#include +#include + +#include "pcap_osdep.h" + +/* + * Given a device name like "\Device\NPF_{GUID}" extract the "{GUID}" part. + * Return NULL if "{GUID}" part is not found. + */ +static const char * +iface_guid(const char *name) +{ + static const size_t GUID_LENGTH = 32 + 4; /* 16 hex bytes + 4 dashes */ + + const char *ob, *cb; + + ob = strchr(name, '{'); + if (ob == NULL) + return NULL; + + cb = strchr(ob, '}'); + if (cb == NULL || cb - ob != GUID_LENGTH + 1) /* + 1 opening '{' */ + return NULL; + + return ob; +} + +/* + * libpcap takes device names like "\Device\NPF_{GUID}", + * GetAdapterIndex() takes interface names like "\DEVICE\TCPIP_{GUID}". + * Try to convert, fall back to original device name. + */ +int +osdep_iface_index_get(const char *device_name) +{ + WCHAR adapter_name[MAX_ADAPTER_NAME_LENGTH]; + const char *guid; + ULONG index; + DWORD ret; + + guid = iface_guid(device_name); + if (guid != NULL) + StringCbPrintfW(adapter_name, sizeof(adapter_name), + L"\\DEVICE\\TCPIP_%S", guid); + else + StringCbPrintfW(adapter_name, sizeof(adapter_name), + L"%S", device_name); + + ret = GetAdapterIndex(adapter_name, &index); + if (ret != NO_ERROR) { + PMD_LOG(ERR, "GetAdapterIndex(%S) = %lu\n", adapter_name, ret); + return -1; + } + + return index; +} + +/* + * libpcap takes device names like "\Device\NPF_{GUID}", + * GetAdaptersAddresses() returns names in "{GUID}" form. + * Try to extract GUID from device name, fall back to original device name. + */ +int +osdep_iface_mac_get(const char *device_name, struct rte_ether_addr *mac) +{ + IP_ADAPTER_ADDRESSES *info = NULL, *cur = NULL; + ULONG size, sys_ret; + const char *adapter_name; + int ret = -1; + + sys_ret = GetAdaptersAddresses(AF_UNSPEC, 0, NULL, NULL, &size); + if (sys_ret != ERROR_BUFFER_OVERFLOW) { + PMD_LOG(ERR, "GetAdapterAddresses() = %lu, expected %lu\n", + sys_ret, ERROR_BUFFER_OVERFLOW); + return -1; + } + + info = (IP_ADAPTER_ADDRESSES *)malloc(size); + if (info == NULL) { + PMD_LOG(ERR, "Cannot allocate adapter address info\n"); + return -1; + } + + sys_ret = GetAdaptersAddresses(AF_UNSPEC, 0, NULL, info, &size); + if (sys_ret != ERROR_SUCCESS) { + PMD_LOG(ERR, "GetAdapterAddresses() = %lu\n", sys_ret); + free(info); + return -1; + } + + adapter_name = iface_guid(device_name); + if (adapter_name == NULL) + adapter_name = device_name; + + for (cur = info; cur != NULL; cur = cur->Next) { + if (strcmp(cur->AdapterName, adapter_name) == 0) { + if (cur->PhysicalAddressLength != RTE_ETHER_ADDR_LEN) { + PMD_LOG(ERR, "Physical address length: want %u, got %lu", + RTE_ETHER_ADDR_LEN, + cur->PhysicalAddressLength); + break; + } + + memcpy(mac->addr_bytes, cur->PhysicalAddress, + RTE_ETHER_ADDR_LEN); + ret = 0; + break; + } + } + + free(info); + return ret; +}