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 7EB95A0562 for ; Thu, 18 Mar 2021 00:20:49 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6C421140F94; Thu, 18 Mar 2021 00:20:49 +0100 (CET) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by mails.dpdk.org (Postfix) with ESMTP id 98C4B40683; Thu, 18 Mar 2021 00:20:46 +0100 (CET) IronPort-SDR: GXv/1n9jR51KiUTtEv+F9+O02xXINCk0U3ZKqgjf/aqie136BkWglJuz2D+u1DzaeYHOuVm87J D944HkfbOIAQ== X-IronPort-AV: E=McAfee;i="6000,8403,9926"; a="168840722" X-IronPort-AV: E=Sophos;i="5.81,257,1610438400"; d="scan'208";a="168840722" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Mar 2021 16:17:33 -0700 IronPort-SDR: 8SI6BkSYTXY07QEHW0il52OGGCkpPr4DNMhikEKSSfJcl7pF5Mbjb4MDbTgUFSnmzy3nUjhSmJ kXTwlJg+kmhQ== X-IronPort-AV: E=Sophos;i="5.81,257,1610438400"; d="scan'208";a="523045806" Received: from rmenon-desk.amr.corp.intel.com (HELO [10.166.30.253]) ([10.166.30.253]) by orsmga004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Mar 2021 16:17:33 -0700 To: Thomas Monjalon , dev@dpdk.org Cc: dmitry.kozliuk@gmail.com, stable@dpdk.org, Tal Shnaiderman , Narcisa Vasile , John Alexander , Pallavi Kadam References: <20210316231153.724029-1-thomas@monjalon.net> From: Ranjit Menon Message-ID: <4cf26015-a332-5a5e-bd20-bea7658aab11@intel.com> Date: Wed, 17 Mar 2021 16:17:33 -0700 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:68.0) Gecko/20100101 Thunderbird/68.12.1 MIME-Version: 1.0 In-Reply-To: <20210316231153.724029-1-thomas@monjalon.net> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US Subject: Re: [dpdk-stable] [PATCH] bus/pci: fix Windows kernel driver categories X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi Thomas, On 3/16/2021 4:11 PM, Thomas Monjalon wrote: > In Windows probing, the value RTE_PCI_KDRV_NONE was used > instead of RTE_PCI_KDRV_UNKNOWN (mlx case), > and RTE_PCI_KDRV_NIC_UIO (FreeBSD) was re-used > instead of having a new RTE_PCI_KDRV_NET_UIO for Windows NetUIO. Shouldn't the mlx case actually remain RTE_PCI_KDRV_NONE? mlx does not require a UIO-like kernel driver...No? And NONE implies that no kernel driver is used/required. Not sure what is correct here. > While adding the new value RTE_PCI_KDRV_NET_UIO, > the enum of kernel driver categories is annotated. > > Fixes: b762221ac24f ("bus/pci: support Windows with bifurcated drivers") > Fixes: c76ec01b4591 ("bus/pci: support netuio on Windows") > Cc: stable@dpdk.org > > Signed-off-by: Thomas Monjalon > --- > drivers/bus/pci/rte_bus_pci.h | 13 +++++++------ > drivers/bus/pci/windows/pci.c | 14 +++++++------- > 2 files changed, 14 insertions(+), 13 deletions(-) > > diff --git a/drivers/bus/pci/rte_bus_pci.h b/drivers/bus/pci/rte_bus_pci.h > index fdda046515..3d009cc74b 100644 > --- a/drivers/bus/pci/rte_bus_pci.h > +++ b/drivers/bus/pci/rte_bus_pci.h > @@ -52,12 +52,13 @@ TAILQ_HEAD(rte_pci_driver_list, rte_pci_driver); > struct rte_devargs; > > enum rte_pci_kernel_driver { > - RTE_PCI_KDRV_UNKNOWN = 0, > - RTE_PCI_KDRV_IGB_UIO, > - RTE_PCI_KDRV_VFIO, > - RTE_PCI_KDRV_UIO_GENERIC, > - RTE_PCI_KDRV_NIC_UIO, > - RTE_PCI_KDRV_NONE, > + RTE_PCI_KDRV_UNKNOWN = 0, /* not listed - may be a bifurcated driver */ > + RTE_PCI_KDRV_IGB_UIO, /* igb_uio for Linux */ > + RTE_PCI_KDRV_VFIO, /* VFIO for Linux */ > + RTE_PCI_KDRV_UIO_GENERIC, /* uio_generic for Linux */ > + RTE_PCI_KDRV_NIC_UIO, /* nic_uio for FreeBSD */ > + RTE_PCI_KDRV_NONE, /* error */ > + RTE_PCI_KDRV_NET_UIO, /* NetUIO for Windows */ > }; > Any chance we can re-order the enums, so that _NONE and _UNKNOWN are at the top? This will change the value, and break code where this value was hard-coded. But how likely is that...? ranjit m. > /** > diff --git a/drivers/bus/pci/windows/pci.c b/drivers/bus/pci/windows/pci.c > index 8f906097f4..3f0ce1fb83 100644 > --- a/drivers/bus/pci/windows/pci.c > +++ b/drivers/bus/pci/windows/pci.c > @@ -38,7 +38,7 @@ rte_pci_map_device(struct rte_pci_device *dev) > * Devices that are bound to netuio are mapped at > * the bus probing stage. > */ > - if (dev->kdrv == RTE_PCI_KDRV_NIC_UIO) > + if (dev->kdrv == RTE_PCI_KDRV_NET_UIO) > return 0; > else > return -1; > @@ -207,14 +207,14 @@ get_device_resource_info(HDEVINFO dev_info, > int ret; > > switch (dev->kdrv) { > - case RTE_PCI_KDRV_NONE: > - /* mem_resource - Unneeded for RTE_PCI_KDRV_NONE */ > + case RTE_PCI_KDRV_UNKNOWN: > + /* mem_resource is unneeded */ > dev->mem_resource[0].phys_addr = 0; > 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 */ > + case RTE_PCI_KDRV_NET_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, > @@ -323,9 +323,9 @@ set_kernel_driver_type(PSP_DEVINFO_DATA device_info_data, > { > /* set kernel driver type based on device class */ > if (IsEqualGUID(&(device_info_data->ClassGuid), &GUID_DEVCLASS_NETUIO)) > - dev->kdrv = RTE_PCI_KDRV_NIC_UIO; > + dev->kdrv = RTE_PCI_KDRV_NET_UIO; > else > - dev->kdrv = RTE_PCI_KDRV_NONE; > + dev->kdrv = RTE_PCI_KDRV_UNKNOWN; > } > > static int