[dpdk-dev] [PATCH] bus/pci: fix probing for non-netuio bound devices

[dpdk-dev] [PATCH] bus/pci: fix probing for non-netuio bound devices

[Pallavi Kadam]

Implement rte_pci_map_device() to distinguish between the devices bound
to netuio and NDIS devices.
Only return success for the netuio devices.

Suggested-by: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
Signed-off-by: Pallavi Kadam <pallavi.kadam@intel.com>
Reviewed-by: Ranjit Menon <ranjit.menon@intel.com>
---
 drivers/bus/pci/windows/pci.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/drivers/bus/pci/windows/pci.c b/drivers/bus/pci/windows/pci.c
index f66258452..16edaa769 100644
--- a/drivers/bus/pci/windows/pci.c
+++ b/drivers/bus/pci/windows/pci.c
@@ -23,20 +23,19 @@ DEFINE_DEVPROPKEY(DEVPKEY_Device_Numa_Node, 0x540b947e, 0x8b40, 0x45bc,
  * the registry hive for PCI devices.
  */
 
-/* The functions below are not implemented on Windows,
+/* Some of the functions below are not implemented on Windows,
  * but need to be defined for compilation purposes
  */
 
 /* Map pci device */
 int
-rte_pci_map_device(struct rte_pci_device *dev __rte_unused)
+rte_pci_map_device(struct rte_pci_device *dev)
 {
-	/* This function is not implemented on Windows.
-	 * We really should short-circuit the call to these functions by
-	 * clearing the RTE_PCI_DRV_NEED_MAPPING flag
-	 * in the rte_pci_driver flags.
-	 */
-	return 0;
+	/* Only return success for devices bound to netuio */
+	if (dev->kdrv == RTE_PCI_KDRV_NIC_UIO)
+		return 0;
+	else
+		return -EINVAL;
 }
 
 /* Unmap pci device */
-- 
2.18.0.windows.1

Re: [dpdk-dev] [PATCH] bus/pci: fix probing for non-netuio bound devices

[Tal Shnaiderman]

> Subject: [PATCH] bus/pci: fix probing for non-netuio bound devices
> 
> External email: Use caution opening links or attachments
> 
> 
> Implement rte_pci_map_device() to distinguish between the devices bound
> to netuio and NDIS devices.
> Only return success for the netuio devices.
> 
> Suggested-by: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
> Signed-off-by: Pallavi Kadam <pallavi.kadam@intel.com>
> Reviewed-by: Ranjit Menon <ranjit.menon@intel.com>
> ---
>  drivers/bus/pci/windows/pci.c | 15 +++++++--------
>  1 file changed, 7 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/bus/pci/windows/pci.c b/drivers/bus/pci/windows/pci.c
> index f66258452..16edaa769 100644
> --- a/drivers/bus/pci/windows/pci.c
> +++ b/drivers/bus/pci/windows/pci.c
> @@ -23,20 +23,19 @@
> DEFINE_DEVPROPKEY(DEVPKEY_Device_Numa_Node, 0x540b947e, 0x8b40,
> 0x45bc,
>   * the registry hive for PCI devices.
>   */
> 
> -/* The functions below are not implemented on Windows,
> +/* Some of the functions below are not implemented on Windows,
>   * but need to be defined for compilation purposes
>   */
> 
>  /* Map pci device */
>  int
> -rte_pci_map_device(struct rte_pci_device *dev __rte_unused)
> +rte_pci_map_device(struct rte_pci_device *dev)
>  {
> -       /* This function is not implemented on Windows.
> -        * We really should short-circuit the call to these functions by
> -        * clearing the RTE_PCI_DRV_NEED_MAPPING flag
> -        * in the rte_pci_driver flags.
> -        */
> -       return 0;
> +       /* Only return success for devices bound to netuio */

Maybe extend this comment to mention where the mapping is actually done?

> +       if (dev->kdrv == RTE_PCI_KDRV_NIC_UIO)
> +               return 0;
> +       else
> +               return -EINVAL;	

The function should return -1 here to match the behavior with other OS implementations.

>  }
> 
>  /* Unmap pci device */
> --
> 2.18.0.windows.1

Re: [dpdk-dev] [PATCH] bus/pci: fix probing for non-netuio bound devices

[Kadam, Pallavi]

On 2/9/2021 10:00 PM, Tal Shnaiderman wrote:
>> Subject: [PATCH] bus/pci: fix probing for non-netuio bound devices
>>
>> External email: Use caution opening links or attachments
>>
>>
>> Implement rte_pci_map_device() to distinguish between the devices bound
>> to netuio and NDIS devices.
>> Only return success for the netuio devices.
>>
>> Suggested-by: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
>> Signed-off-by: Pallavi Kadam <pallavi.kadam@intel.com>
>> Reviewed-by: Ranjit Menon <ranjit.menon@intel.com>
>> ---
>>   drivers/bus/pci/windows/pci.c | 15 +++++++--------
>>   1 file changed, 7 insertions(+), 8 deletions(-)
>>
>> diff --git a/drivers/bus/pci/windows/pci.c b/drivers/bus/pci/windows/pci.c
>> index f66258452..16edaa769 100644
>> --- a/drivers/bus/pci/windows/pci.c
>> +++ b/drivers/bus/pci/windows/pci.c
>> @@ -23,20 +23,19 @@
>> DEFINE_DEVPROPKEY(DEVPKEY_Device_Numa_Node, 0x540b947e, 0x8b40,
>> 0x45bc,
>>    * the registry hive for PCI devices.
>>    */
>>
>> -/* The functions below are not implemented on Windows,
>> +/* Some of the functions below are not implemented on Windows,
>>    * but need to be defined for compilation purposes
>>    */
>>
>>   /* Map pci device */
>>   int
>> -rte_pci_map_device(struct rte_pci_device *dev __rte_unused)
>> +rte_pci_map_device(struct rte_pci_device *dev)
>>   {
>> -       /* This function is not implemented on Windows.
>> -        * We really should short-circuit the call to these functions by
>> -        * clearing the RTE_PCI_DRV_NEED_MAPPING flag
>> -        * in the rte_pci_driver flags.
>> -        */
>> -       return 0;
>> +       /* Only return success for devices bound to netuio */
> Maybe extend this comment to mention where the mapping is actually done?

Modified the comment in v2.

>
>> +       if (dev->kdrv == RTE_PCI_KDRV_NIC_UIO)
>> +               return 0;
>> +       else
>> +               return -EINVAL;	
> The function should return -1 here to match the behavior with other OS implementations.

Replaced the return value in v2.

Thanks.

>
>>   }
>>
>>   /* Unmap pci device */
>> --
>> 2.18.0.windows.1

[dpdk-dev] [PATCH v2] bus/pci: fix probing for non-netuio bound devices

[Pallavi Kadam]

Implement rte_pci_map_device() to distinguish between the devices bound
to netuio and NDIS devices.
Only return success for the netuio devices.

v2 changes:
	- Extended the comment to mention about mapping
	- replaced the return errno value with -1

Suggested-by: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
Signed-off-by: Pallavi Kadam <pallavi.kadam@intel.com>
Reviewed-by: Ranjit Menon <ranjit.menon@intel.com>
---
 drivers/bus/pci/windows/pci.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/drivers/bus/pci/windows/pci.c b/drivers/bus/pci/windows/pci.c
index f66258452..00e7849b0 100644
--- a/drivers/bus/pci/windows/pci.c
+++ b/drivers/bus/pci/windows/pci.c
@@ -23,20 +23,22 @@ DEFINE_DEVPROPKEY(DEVPKEY_Device_Numa_Node, 0x540b947e, 0x8b40, 0x45bc,
  * the registry hive for PCI devices.
  */
 
-/* The functions below are not implemented on Windows,
+/* Some of the functions below are not implemented on Windows,
  * but need to be defined for compilation purposes
  */
 
 /* Map pci device */
 int
-rte_pci_map_device(struct rte_pci_device *dev __rte_unused)
+rte_pci_map_device(struct rte_pci_device *dev)
 {
-	/* This function is not implemented on Windows.
-	 * We really should short-circuit the call to these functions by
-	 * clearing the RTE_PCI_DRV_NEED_MAPPING flag
-	 * in the rte_pci_driver flags.
+	/* Only return success for devices bound to netuio.
+	 * Devices that are bound to netuio are mapped at
+	 * the bus probing stage.
 	 */
-	return 0;
+	if (dev->kdrv == RTE_PCI_KDRV_NIC_UIO)
+		return 0;
+	else
+		return -1;
 }
 
 /* Unmap pci device */
-- 
2.18.0.windows.1

Re: [dpdk-dev] [PATCH v2] bus/pci: fix probing for non-netuio bound devices

[Tal Shnaiderman]

> Subject: [PATCH v2] bus/pci: fix probing for non-netuio bound devices
> 
> External email: Use caution opening links or attachments
> 
> 
> Implement rte_pci_map_device() to distinguish between the devices bound
> to netuio and NDIS devices.
> Only return success for the netuio devices.
> 
> v2 changes:
>         - Extended the comment to mention about mapping
>         - replaced the return errno value with -1
> 
> Suggested-by: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
> Signed-off-by: Pallavi Kadam <pallavi.kadam@intel.com>
> Reviewed-by: Ranjit Menon <ranjit.menon@intel.com>
> ---
>  drivers/bus/pci/windows/pci.c | 16 +++++++++-------
>  1 file changed, 9 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/bus/pci/windows/pci.c b/drivers/bus/pci/windows/pci.c
> index f66258452..00e7849b0 100644
> --- a/drivers/bus/pci/windows/pci.c
> +++ b/drivers/bus/pci/windows/pci.c
> @@ -23,20 +23,22 @@
> DEFINE_DEVPROPKEY(DEVPKEY_Device_Numa_Node, 0x540b947e, 0x8b40,
> 0x45bc,
>   * the registry hive for PCI devices.
>   */
> 
> -/* The functions below are not implemented on Windows,
> +/* Some of the functions below are not implemented on Windows,
>   * but need to be defined for compilation purposes
>   */
> 
>  /* Map pci device */
>  int
> -rte_pci_map_device(struct rte_pci_device *dev __rte_unused)
> +rte_pci_map_device(struct rte_pci_device *dev)
>  {
> -       /* This function is not implemented on Windows.
> -        * We really should short-circuit the call to these functions by
> -        * clearing the RTE_PCI_DRV_NEED_MAPPING flag
> -        * in the rte_pci_driver flags.
> +       /* Only return success for devices bound to netuio.
> +        * Devices that are bound to netuio are mapped at
> +        * the bus probing stage.
>          */
> -       return 0;
> +       if (dev->kdrv == RTE_PCI_KDRV_NIC_UIO)
> +               return 0;
> +       else
> +               return -1;
>  }
> 
>  /* Unmap pci device */
> --
> 2.18.0.windows.1

Acked-by: Tal Shnaiderman <talshn@nvidia.com>

Re: [dpdk-dev] [PATCH v2] bus/pci: fix probing for non-netuio bound devices

[Thomas Monjalon]

> > Implement rte_pci_map_device() to distinguish between the devices bound
> > to netuio and NDIS devices.
> > Only return success for the netuio devices.
> > 
> > v2 changes:
> >         - Extended the comment to mention about mapping
> >         - replaced the return errno value with -1

The changelog should be below the line "---"
so it is skipped when applying the patch.

Missing 'Fixes' tag:
Fixes: c76ec01b4591 ("bus/pci: support netuio on Windows")
Cc: stable@dpdk.org

> > Suggested-by: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
> > Signed-off-by: Pallavi Kadam <pallavi.kadam@intel.com>
> > Reviewed-by: Ranjit Menon <ranjit.menon@intel.com>
> 
> Acked-by: Tal Shnaiderman <talshn@nvidia.com>

Applied, thanks

Re: [dpdk-dev] [PATCH v2] bus/pci: fix probing for non-netuio bound devices

[Kadam, Pallavi]

On 3/16/2021 4:20 AM, Thomas Monjalon wrote:
>>> Implement rte_pci_map_device() to distinguish between the devices bound
>>> to netuio and NDIS devices.
>>> Only return success for the netuio devices.
>>>
>>> v2 changes:
>>>          - Extended the comment to mention about mapping
>>>          - replaced the return errno value with -1
> The changelog should be below the line "---"
> so it is skipped when applying the patch.
Thanks, Thomas. Will keep this in mind.
>
> Missing 'Fixes' tag:
> Fixes: c76ec01b4591 ("bus/pci: support netuio on Windows")
> Cc: stable@dpdk.org
>
>>> Suggested-by: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
>>> Signed-off-by: Pallavi Kadam <pallavi.kadam@intel.com>
>>> Reviewed-by: Ranjit Menon <ranjit.menon@intel.com>
>> Acked-by: Tal Shnaiderman <talshn@nvidia.com>
> Applied, thanks
>
>

Re: [dpdk-dev] [PATCH v2] bus/pci: fix probing for non-netuio bound devices

[Narcisa Ana Maria Vasile]

On Wed, Feb 10, 2021 at 12:36:54PM -0800, Pallavi Kadam wrote:
> Implement rte_pci_map_device() to distinguish between the devices bound
> to netuio and NDIS devices.
> Only return success for the netuio devices.
> 
> v2 changes:
> 	- Extended the comment to mention about mapping
> 	- replaced the return errno value with -1
> 
> Suggested-by: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
> Signed-off-by: Pallavi Kadam <pallavi.kadam@intel.com>
> Reviewed-by: Ranjit Menon <ranjit.menon@intel.com>
> ---

Tested-by: Narcisa Vasile <navsile@linux.microsoft.com>
Acked-by: Narcisa Vasile <navasile@linux.microsoft.com>

Re: [dpdk-dev] [PATCH] bus/pci: fix probing for non-netuio bound devices

[Narcisa Ana Maria Vasile]

On Tue, Feb 09, 2021 at 05:40:08PM -0800, Pallavi Kadam wrote:
> Implement rte_pci_map_device() to distinguish between the devices bound
> to netuio and NDIS devices.
> Only return success for the netuio devices.
> 
> Suggested-by: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
> Signed-off-by: Pallavi Kadam <pallavi.kadam@intel.com>
> Reviewed-by: Ranjit Menon <ranjit.menon@intel.com>
> ---
>  drivers/bus/pci/windows/pci.c | 15 +++++++--------
>  1 file changed, 7 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/bus/pci/windows/pci.c b/drivers/bus/pci/windows/pci.c

Tested-by: Narcisa Vasile <navasile@linux.microsoft.com>
Acked-by: Narcisa Vasile <navasile@linux.microsoft.com>