[dpdk-dev] pci: Don't call probe callback if driver already loaded.

Message ID 1477432240-20406-1-git-send-email-benjamin.walker@intel.com (mailing list archive)
State Accepted, archived
Headers

Commit Message

Walker, Benjamin Oct. 25, 2016, 9:50 p.m. UTC
  If the user asks to probe multiple times, the probe
callback should only be called on devices that don't have
a driver already loaded.

This is useful if a driver is registered after the
execution of a program has started and the list of devices
needs to be re-scanned.

Signed-off-by: Ben Walker <benjamin.walker@intel.com>
---
 lib/librte_eal/common/eal_common_pci.c | 4 ++++
 1 file changed, 4 insertions(+)
  

Comments

David Marchand Oct. 27, 2016, 1:28 p.m. UTC | #1
Hello Benjamin,

On Tue, Oct 25, 2016 at 11:50 PM, Ben Walker <benjamin.walker@intel.com> wrote:
> If the user asks to probe multiple times, the probe
> callback should only be called on devices that don't have
> a driver already loaded.
>
> This is useful if a driver is registered after the
> execution of a program has started and the list of devices
> needs to be re-scanned.

Why not use the hotplug api, attaching explicitely one pci device ?


> Signed-off-by: Ben Walker <benjamin.walker@intel.com>
> ---
>  lib/librte_eal/common/eal_common_pci.c | 4 ++++
>  1 file changed, 4 insertions(+)
>
> diff --git a/lib/librte_eal/common/eal_common_pci.c b/lib/librte_eal/common/eal_common_pci.c
> index 638cd86..971ad20 100644
> --- a/lib/librte_eal/common/eal_common_pci.c
> +++ b/lib/librte_eal/common/eal_common_pci.c
> @@ -289,6 +289,10 @@ pci_probe_all_drivers(struct rte_pci_device *dev)
>         if (dev == NULL)
>                 return -1;
>
> +       /* Check if a driver is already loaded */
> +       if (dev->driver != NULL)
> +               return 0;
> +

This can do the trick, yes.

To be safe, I think we are missing a check in
rte_eal_pci_probe_one_driver() so that dev->driver is only set when
the probe function from the driver did succeed.
  
David Marchand Oct. 27, 2016, 1:30 p.m. UTC | #2
On Thu, Oct 27, 2016 at 3:28 PM, David Marchand
<david.marchand@6wind.com> wrote:
> On Tue, Oct 25, 2016 at 11:50 PM, Ben Walker <benjamin.walker@intel.com> wrote:
>> If the user asks to probe multiple times, the probe
>> callback should only be called on devices that don't have
>> a driver already loaded.
>>
>> This is useful if a driver is registered after the
>> execution of a program has started and the list of devices
>> needs to be re-scanned.
>
> Why not use the hotplug api, attaching explicitely one pci device ?

Ah, scratch that.
I've been too quick to reply.
Ok, you are loading a new driver.
  
Shreyansh Jain Nov. 2, 2016, 9:29 a.m. UTC | #3
On 10/26/2016 3:20 AM, Ben Walker wrote:
> If the user asks to probe multiple times, the probe
> callback should only be called on devices that don't have
> a driver already loaded.
>
> This is useful if a driver is registered after the
> execution of a program has started and the list of devices
> needs to be re-scanned.
>
> Signed-off-by: Ben Walker <benjamin.walker@intel.com>
> ---
>  lib/librte_eal/common/eal_common_pci.c | 4 ++++
>  1 file changed, 4 insertions(+)
>
> diff --git a/lib/librte_eal/common/eal_common_pci.c b/lib/librte_eal/common/eal_common_pci.c
> index 638cd86..971ad20 100644
> --- a/lib/librte_eal/common/eal_common_pci.c
> +++ b/lib/librte_eal/common/eal_common_pci.c
> @@ -289,6 +289,10 @@ pci_probe_all_drivers(struct rte_pci_device *dev)
>  	if (dev == NULL)
>  		return -1;
>
> +	/* Check if a driver is already loaded */
> +	if (dev->driver != NULL)
> +		return 0;
> +

In case if it is required to change the driver assigned to a device, would it mean application relies on detach(dev)->new-driver-plugged-in->attach(dev) sequence?
To me, the above change sounds fine. Though, I am not aware if there is even a use case for changing driver assigned to a device. detach()->attach() should be able to work in those cases, I think.

>  	TAILQ_FOREACH(dr, &pci_driver_list, next) {
>  		rc = rte_eal_pci_probe_one_driver(dr, dev);
>  		if (rc < 0)
>

-
Shreyansh
  
Thomas Monjalon Nov. 6, 2016, 9:59 p.m. UTC | #4
2016-10-25 14:50, Ben Walker:
> If the user asks to probe multiple times, the probe
> callback should only be called on devices that don't have
> a driver already loaded.
> 
> This is useful if a driver is registered after the
> execution of a program has started and the list of devices
> needs to be re-scanned.
> 
> Signed-off-by: Ben Walker <benjamin.walker@intel.com>

Applied, thanks
  
David Marchand Nov. 7, 2016, 9:02 a.m. UTC | #5
Hello Thomas,
On Sun, Nov 6, 2016 at 10:59 PM, Thomas Monjalon
<thomas.monjalon@6wind.com> wrote:

> 2016-10-25 14:50, Ben Walker:
>> If the user asks to probe multiple times, the probe
>> callback should only be called on devices that don't have
>> a driver already loaded.
>>
>> This is useful if a driver is registered after the
>> execution of a program has started and the list of devices
>> needs to be re-scanned.
>>
>> Signed-off-by: Ben Walker <benjamin.walker@intel.com>
>
> Applied, thanks

Can you add a follow up patch I will send shortly ?
Thanks.
  

Patch

diff --git a/lib/librte_eal/common/eal_common_pci.c b/lib/librte_eal/common/eal_common_pci.c
index 638cd86..971ad20 100644
--- a/lib/librte_eal/common/eal_common_pci.c
+++ b/lib/librte_eal/common/eal_common_pci.c
@@ -289,6 +289,10 @@  pci_probe_all_drivers(struct rte_pci_device *dev)
 	if (dev == NULL)
 		return -1;
 
+	/* Check if a driver is already loaded */
+	if (dev->driver != NULL)
+		return 0;
+
 	TAILQ_FOREACH(dr, &pci_driver_list, next) {
 		rc = rte_eal_pci_probe_one_driver(dr, dev);
 		if (rc < 0)