From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id A8F12A04DD; Mon, 21 Sep 2020 23:12:47 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E03721D904; Mon, 21 Sep 2020 23:12:46 +0200 (CEST) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by dpdk.org (Postfix) with ESMTP id 3131D1D8F0 for ; Mon, 21 Sep 2020 23:12:45 +0200 (CEST) IronPort-SDR: hVgLCSHrX2WSx+O0QzTS+m1t+Qz5trsLkJJAbWL77CLKrajvxJS+51r6qDRyo6JMMBU/svzpSd uwl5UONTL7Xw== X-IronPort-AV: E=McAfee;i="6000,8403,9751"; a="245316408" X-IronPort-AV: E=Sophos;i="5.77,288,1596524400"; d="scan'208";a="245316408" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Sep 2020 14:12:42 -0700 IronPort-SDR: HaajKKGKiQ59V0q50r805gDW09JAGfOd7dOt0qaBVMDmGR4shYiRVWJcFPZl6naWIRjWQ0j0xi Q45Dh2nHq7mw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,288,1596524400"; d="scan'208";a="382103084" Received: from win-dpdk-pallavi.jf.intel.com (HELO localhost.localdomain) ([10.166.188.111]) by orsmga001.jf.intel.com with ESMTP; 21 Sep 2020 14:12:41 -0700 From: Pallavi Kadam To: dev@dpdk.org, thomas@monjalon.net Cc: ranjit.menon@intel.com, John.Alexander@datapath.co.uk, dmitry.kozliuk@gmail.com, Narcisa.Vasile@microsoft.com, talshn@nvidia.com, pallavi.kadam@intel.com Date: Mon, 21 Sep 2020 14:08:39 -0700 Message-Id: <20200921210839.18520-1-pallavi.kadam@intel.com> X-Mailer: git-send-email 2.18.0.windows.1 In-Reply-To: <20200915232803.880-1-pallavi.kadam@intel.com> References: <20200915232803.880-1-pallavi.kadam@intel.com> Subject: [dpdk-dev] [PATCH v3] bus/pci: netuio interface for windows 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" This patch adds implementations to probe PCI devices bound to netuio with the help of "netuio" class device changes. Now Windows will support both "netuio" and "net" device class and can set kernel driver type based on the device class selection. Note: Few definitions and structures have been copied from netuio_interface.h file from ("[v3] windows/netuio: add Windows NetUIO kernel driver") series and this will be fixed once the exact path for netuio source code is known. v3 changes: Removed the casts v2 changes: - Moved all netuio specific definitions and functions to pci_netuio.c and pci_netuio.h files - Added a single function call to scan all the devices Signed-off-by: John Alexander Signed-off-by: Pallavi Kadam Reviewed-by: Ranjit Menon --- drivers/bus/pci/meson.build | 3 +- drivers/bus/pci/windows/pci.c | 50 +++++--- drivers/bus/pci/windows/pci_netuio.c | 164 +++++++++++++++++++++++++++ drivers/bus/pci/windows/pci_netuio.h | 60 ++++++++++ 4 files changed, 261 insertions(+), 16 deletions(-) create mode 100644 drivers/bus/pci/windows/pci_netuio.c create mode 100644 drivers/bus/pci/windows/pci_netuio.h diff --git a/drivers/bus/pci/meson.build b/drivers/bus/pci/meson.build index b649a17c2..977800495 100644 --- a/drivers/bus/pci/meson.build +++ b/drivers/bus/pci/meson.build @@ -18,7 +18,8 @@ if is_freebsd includes += include_directories('bsd') endif if is_windows - sources += files('windows/pci.c') + sources += files('windows/pci.c', + 'windows/pci_netuio.c') includes += include_directories('windows') endif diff --git a/drivers/bus/pci/windows/pci.c b/drivers/bus/pci/windows/pci.c index 9e5c8fafb..d36212084 100644 --- a/drivers/bus/pci/windows/pci.c +++ b/drivers/bus/pci/windows/pci.c @@ -8,6 +8,7 @@ #include #include "private.h" +#include "pci_netuio.h" #include @@ -209,6 +210,7 @@ get_device_resource_info(HDEVINFO dev_info, DEVPROPTYPE property_type; DWORD numa_node; BOOL res; + int ret; switch (dev->kdrv) { case RTE_PCI_KDRV_NONE: @@ -228,6 +230,18 @@ get_device_resource_info(HDEVINFO dev_info, dev->mem_resource[0].len = 0; dev->mem_resource[0].addr = NULL; break; + case RTE_PCI_KDRV_NIC_UIO: + /* get device info from netuio kernel driver */ + ret = get_netuio_device_info(dev_info, dev_info_data, dev); + if (ret != 0) { + RTE_LOG(DEBUG, EAL, + "Could not retrieve device info for PCI device " + PCI_PRI_FMT, + dev->addr.domain, dev->addr.bus, + dev->addr.devid, dev->addr.function); + return ret; + } + break; default: /* kernel driver type is unsupported */ RTE_LOG(DEBUG, EAL, @@ -286,13 +300,14 @@ parse_pci_hardware_id(const char *buf, struct rte_pci_id *pci_id) } static void -get_kernel_driver_type(struct rte_pci_device *dev) +set_kernel_driver_type(PSP_DEVINFO_DATA device_info_data, + struct rte_pci_device *dev) { - /* - * If another kernel driver is supported the relevant checking - * functions should be here - */ - dev->kdrv = RTE_PCI_KDRV_NONE; + /* set kernel driver type based on device class */ + if (IsEqualGUID(&(device_info_data->ClassGuid), &GUID_DEVCLASS_NETUIO)) + dev->kdrv = RTE_PCI_KDRV_NIC_UIO; + else + dev->kdrv = RTE_PCI_KDRV_NONE; } static int @@ -335,7 +350,7 @@ pci_scan_one(HDEVINFO dev_info, PSP_DEVINFO_DATA device_info_data) pci_name_set(dev); - get_kernel_driver_type(dev); + set_kernel_driver_type(device_info_data, dev); /* get resources */ if (get_device_resource_info(dev_info, device_info_data, dev) @@ -391,8 +406,8 @@ rte_pci_scan(void) if (!rte_eal_has_pci()) return 0; - dev_info = SetupDiGetClassDevs(&GUID_DEVCLASS_NET, TEXT("PCI"), NULL, - DIGCF_PRESENT); + dev_info = SetupDiGetClassDevs(NULL, TEXT("PCI"), NULL, + DIGCF_PRESENT | DIGCF_ALLCLASSES); if (dev_info == INVALID_HANDLE_VALUE) { RTE_LOG_WIN32_ERR("SetupDiGetClassDevs(pci_scan)"); RTE_LOG(ERR, EAL, "Unable to enumerate PCI devices.\n"); @@ -405,12 +420,17 @@ rte_pci_scan(void) while (SetupDiEnumDeviceInfo(dev_info, device_index, &device_info_data)) { device_index++; - ret = pci_scan_one(dev_info, &device_info_data); - if (ret == ERROR_SUCCESS) - found_device++; - else if (ret != ERROR_CONTINUE) - goto end; - + /* we only want to enumerate netuio & net class devices */ + if (IsEqualGUID(&(device_info_data.ClassGuid), + &GUID_DEVCLASS_NETUIO) || + IsEqualGUID(&(device_info_data.ClassGuid), + &GUID_DEVCLASS_NET)) { + ret = pci_scan_one(dev_info, &device_info_data); + if (ret == ERROR_SUCCESS) + found_device++; + else if (ret != ERROR_CONTINUE) + goto end; + } memset(&device_info_data, 0, sizeof(SP_DEVINFO_DATA)); device_info_data.cbSize = sizeof(SP_DEVINFO_DATA); } diff --git a/drivers/bus/pci/windows/pci_netuio.c b/drivers/bus/pci/windows/pci_netuio.c new file mode 100644 index 000000000..fe9a69673 --- /dev/null +++ b/drivers/bus/pci/windows/pci_netuio.c @@ -0,0 +1,164 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2020 Intel Corporation + */ + +#include +#include +#include +#include + +#include "private.h" +#include "pci_netuio.h" + +#include + +#ifdef RTE_TOOLCHAIN_GCC +#include +DEFINE_DEVPROPKEY(DEVPKEY_Device_Numa_Node, 0x540b947e, 0x8b40, 0x45bc, + 0xa8, 0xa2, 0x6a, 0x0b, 0x89, 0x4c, 0xbd, 0xa2, 3); +#endif + +static int +send_ioctl(HANDLE f, DWORD ioctl, + void *in_buf, DWORD in_buf_size, void *out_buf, DWORD out_buf_size) +{ + BOOL res; + DWORD bytes_ret = 0; + + res = DeviceIoControl(f, ioctl, in_buf, in_buf_size, + out_buf, out_buf_size, &bytes_ret, NULL); + if (!res) { + RTE_LOG_WIN32_ERR("DeviceIoControl:IOCTL query failed"); + return -1; + } + + return ERROR_SUCCESS; +} + +/* + * get device resource information by sending ioctl to netuio driver + */ +int +get_netuio_device_info(HDEVINFO dev_info, PSP_DEVINFO_DATA dev_info_data, + struct rte_pci_device *dev) +{ + int ret = -1; + BOOL res; + DWORD required_size = 0; + TCHAR dev_instance_id[MAX_DEVICENAME_SZ]; + HANDLE netuio = INVALID_HANDLE_VALUE; + HDEVINFO di_set = INVALID_HANDLE_VALUE; + SP_DEVICE_INTERFACE_DATA dev_ifx_data = { 0 }; + PSP_DEVICE_INTERFACE_DETAIL_DATA dev_ifx_detail = NULL; + struct device_info hw_info = { 0 }; + unsigned int idx; + DEVPROPTYPE property_type; + DWORD numa_node; + + /* obtain the driver interface for this device */ + res = SetupDiGetDeviceInstanceId(dev_info, dev_info_data, + dev_instance_id, sizeof(dev_instance_id), &required_size); + if (!res) { + RTE_LOG_WIN32_ERR("SetupDiGetDeviceInstanceId"); + return -1; + } + + /* obtain the device information set */ + di_set = SetupDiGetClassDevs(&GUID_DEVINTERFACE_NETUIO, dev_instance_id, + NULL, DIGCF_PRESENT | DIGCF_DEVICEINTERFACE); + if (di_set == INVALID_HANDLE_VALUE) { + RTE_LOG_WIN32_ERR("SetupDiGetClassDevs(device information set)"); + return -1; + } + + dev_ifx_data.cbSize = sizeof(SP_DEVICE_INTERFACE_DATA); + + /* enumerate the netUIO interfaces for this device information set */ + res = SetupDiEnumDeviceInterfaces(di_set, 0, &GUID_DEVINTERFACE_NETUIO, + 0, &dev_ifx_data); + if (!res) { + RTE_LOG_WIN32_ERR("SetupDiEnumDeviceInterfaces: no device interface"); + goto end; + } + + /* request and allocate required size for the device interface detail */ + required_size = 0; + res = SetupDiGetDeviceInterfaceDetail(di_set, &dev_ifx_data, NULL, 0, + &required_size, NULL); + if (!res) { + /* ERROR_INSUFFICIENT_BUFFER is expected */ + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) { + RTE_LOG_WIN32_ERR("SetupDiGetDeviceInterfaceDetail"); + goto end; + } + } + + dev_ifx_detail = malloc(required_size); + if (!dev_ifx_detail) { + RTE_LOG(ERR, EAL, "Could not allocate memory for dev interface.\n"); + goto end; + } + dev_ifx_detail->cbSize = sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA); + + res = SetupDiGetDeviceInterfaceDetail(di_set, &dev_ifx_data, + dev_ifx_detail, required_size, NULL, NULL); + if (!res) { + RTE_LOG_WIN32_ERR("SetupDiGetDeviceInterfaceDetail"); + goto end; + } + + /* open the kernel driver */ + netuio = CreateFile(dev_ifx_detail->DevicePath, + GENERIC_READ | GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, + OPEN_EXISTING, + FILE_ATTRIBUTE_NORMAL, + NULL); + if (netuio == INVALID_HANDLE_VALUE) { + RTE_LOG_WIN32_ERR("CreateFile"); + RTE_LOG(ERR, EAL, "Unable to open driver file \"%s\".\n", + dev_ifx_detail->DevicePath); + goto end; + } + + /* send ioctl to retrieve device information */ + if (send_ioctl(netuio, IOCTL_NETUIO_MAP_HW_INTO_USERMODE, NULL, 0, + &hw_info, sizeof(hw_info)) != ERROR_SUCCESS) { + RTE_LOG(ERR, EAL, "Unable to send ioctl to driver.\n"); + goto end; + } + + /* set relevant values into the dev structure */ + for (idx = 0; idx < PCI_MAX_RESOURCE; idx++) { + dev->mem_resource[idx].phys_addr = + hw_info.hw[idx].phys_addr.QuadPart; + dev->mem_resource[idx].addr = + hw_info.hw[idx].user_mapped_virt_addr; + dev->mem_resource[idx].len = hw_info.hw[idx].size; + } + + /* get NUMA node using DEVPKEY_Device_Numa_Node */ + res = SetupDiGetDevicePropertyW(dev_info, dev_info_data, + &DEVPKEY_Device_Numa_Node, &property_type, + (BYTE *)&numa_node, sizeof(numa_node), NULL, 0); + if (!res) { + RTE_LOG_WIN32_ERR( + "SetupDiGetDevicePropertyW(DEVPKEY_Device_Numa_Node)"); + goto end; + } + dev->device.numa_node = numa_node; + + ret = ERROR_SUCCESS; +end: + if (netuio != INVALID_HANDLE_VALUE) + CloseHandle(netuio); + + if (dev_ifx_detail) + free(dev_ifx_detail); + + if (di_set != INVALID_HANDLE_VALUE) + SetupDiDestroyDeviceInfoList(di_set); + + return ret; +} diff --git a/drivers/bus/pci/windows/pci_netuio.h b/drivers/bus/pci/windows/pci_netuio.h new file mode 100644 index 000000000..94a353a40 --- /dev/null +++ b/drivers/bus/pci/windows/pci_netuio.h @@ -0,0 +1,60 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2020 Intel Corporation + */ + +#ifndef _PCI_NETUIO_H_ +#define _PCI_NETUIO_H_ + +/* GUID definition for device class netUIO */ +DEFINE_GUID(GUID_DEVCLASS_NETUIO, 0x78912bc1, 0xcb8e, 0x4b28, + 0xa3, 0x29, 0xf3, 0x22, 0xeb, 0xad, 0xbe, 0x0f); + +/* GUID definition for the netuio device interface */ +DEFINE_GUID(GUID_DEVINTERFACE_NETUIO, 0x08336f60, 0x0679, 0x4c6c, + 0x85, 0xd2, 0xae, 0x7c, 0xed, 0x65, 0xff, 0xf7); + +/* IOCTL code definitions */ +#define IOCTL_NETUIO_MAP_HW_INTO_USERMODE \ + CTL_CODE(FILE_DEVICE_NETWORK, 51, METHOD_BUFFERED, \ + FILE_READ_ACCESS | FILE_WRITE_ACCESS) + +#define MAX_DEVICENAME_SZ 255 + +#pragma pack(push) +#pragma pack(8) +struct mem_region { + UINT64 size; /* memory region size */ + LARGE_INTEGER phys_addr; /* physical address of the memory region */ + PVOID virt_addr; /* virtual address of the memory region */ + PVOID user_mapped_virt_addr; /* virtual address of the region mapped */ + /* into user process context */ +}; + +#define PCI_MAX_BAR 6 + +struct device_info { + struct mem_region hw[PCI_MAX_BAR]; + USHORT reserved; +}; +#pragma pack(pop) + +/** + * Get device resource information by sending ioctl to netuio driver + * + * This function is private to EAL. + * + * @param dev_info + * HDEVINFO handle to device information set + * @param dev_info_data + * SP_DEVINFO_DATA structure holding information about this enumerated device + * @param dev + * PCI device context for this device + * @return + * - 0 on success. + * - negative on error. + */ +int +get_netuio_device_info(HDEVINFO dev_info, PSP_DEVINFO_DATA dev_info_data, + struct rte_pci_device *dev); + +#endif /* _PCI_NETUIO_H_ */ -- 2.18.0.windows.1