[dpdk-dev] [PATCH v4] pci: save list of detached devices, and re-probe during driver unload
Added code that saves the pointers to the detached devices, during
driver loading, and during driver unloading, go over the list,
and re-attach them by calling device_probe_and_attach
on each device.
Signed-off-by: Raz Amir
---
lib/librte_eal/bsdapp/nic_uio/nic_uio.c | 34 -
1 file changed, 29 insertions(+), 5 deletions(-)
diff --git a/lib/librte_eal/bsdapp/nic_uio/nic_uio.c
b/lib/librte_eal/bsdapp/nic_uio/nic_uio.c
index 5ae8560..7a4ed5d 100644
--- a/lib/librte_eal/bsdapp/nic_uio/nic_uio.c
+++ b/lib/librte_eal/bsdapp/nic_uio/nic_uio.c
@@ -55,6 +55,9 @@ __FBSDID("$FreeBSD$");
#define MAX_BARS (PCIR_MAX_BAR_0 + 1)
+#define MAX_DETACHED_DEVICES 128
+static device_t detached_devices[MAX_DETACHED_DEVICES] = {};
+static int num_detached = 0;
struct nic_uio_softc {
device_tdev_t;
@@ -288,17 +291,38 @@ nic_uio_load(void)
function = strtol(token, NULL, 10);
dev = pci_find_bsf(bus, device, function);
- if (dev != NULL)
- for (i = 0; i < NUM_DEVICES; i++)
- if (pci_get_vendor(dev) == devices[i].vend &&
- pci_get_device(dev) ==
devices[i].dev)
- device_detach(dev);
+ if (dev == NULL)
+ continue;
+
+ for (i = 0; i < NUM_DEVICES; i++)
+ if (pci_get_vendor(dev) == devices[i].vend &&
+ pci_get_device(dev) == devices[i].dev) {
+ if (num_detached <
MAX_DETACHED_DEVICES) {
+ printf("nic_uio_load:
detaching and storing dev=%p\n", dev);
+
detached_devices[num_detached++] = dev;
+ }
+ else
+ printf("nic_uio_load:
reached MAX_DETACHED_DEVICES=%d. dev=%p won't be reattached\n",
+
MAX_DETACHED_DEVICES, dev);
+ device_detach(dev);
+ }
}
}
static void
nic_uio_unload(void)
{
+ int i;
+ printf("nic_uio_unload: entered ... \n");
+
+ for (i = 0; i < num_detached; i++) {
+ printf("nic_uio_unload: calling to device_probe_and_attach for
dev=%p...\n",
+ detached_devices[i]);
+ device_probe_and_attach(detached_devices[i]);
+ printf("nic_uio_unload: done.\n");
+ }
+
+ printf("nic_uio_unload: leaving ... \n");
}
static int
--
2.1.2
[dpdk-dev] [PATCH v4] pci: save list of detached devices, and re-probe during driver unload
Added code that saves the pointers to the detached devices, during
driver loading, and during driver unloading, go over the list,
and re-attach them by calling device_probe_and_attach
on each device.
Signed-off-by: Raz Amir
---
lib/librte_eal/bsdapp/nic_uio/nic_uio.c | 34 -
1 file changed, 29 insertions(+), 5 deletions(-)
diff --git a/lib/librte_eal/bsdapp/nic_uio/nic_uio.c
b/lib/librte_eal/bsdapp/nic_uio/nic_uio.c
index 5ae8560..7a4ed5d 100644
--- a/lib/librte_eal/bsdapp/nic_uio/nic_uio.c
+++ b/lib/librte_eal/bsdapp/nic_uio/nic_uio.c
@@ -55,6 +55,9 @@ __FBSDID("$FreeBSD$");
#define MAX_BARS (PCIR_MAX_BAR_0 + 1)
+#define MAX_DETACHED_DEVICES 128
+static device_t detached_devices[MAX_DETACHED_DEVICES] = {};
+static int num_detached = 0;
struct nic_uio_softc {
device_tdev_t;
@@ -288,17 +291,38 @@ nic_uio_load(void)
function = strtol(token, NULL, 10);
dev = pci_find_bsf(bus, device, function);
- if (dev != NULL)
- for (i = 0; i < NUM_DEVICES; i++)
- if (pci_get_vendor(dev) == devices[i].vend &&
- pci_get_device(dev) ==
devices[i].dev)
- device_detach(dev);
+ if (dev == NULL)
+ continue;
+
+ for (i = 0; i < NUM_DEVICES; i++)
+ if (pci_get_vendor(dev) == devices[i].vend &&
+ pci_get_device(dev) == devices[i].dev) {
+ if (num_detached <
MAX_DETACHED_DEVICES) {
+ printf("nic_uio_load:
detaching and storing dev=%p\n", dev);
+
detached_devices[num_detached++] = dev;
+ }
+ else
+ printf("nic_uio_load:
reached MAX_DETACHED_DEVICES=%d. dev=%p won't be reattached\n",
+
MAX_DETACHED_DEVICES, dev);
+ device_detach(dev);
+ }
}
}
static void
nic_uio_unload(void)
{
+ int i;
+ printf("nic_uio_unload: entered ... \n");
+
+ for (i = 0; i < num_detached; i++) {
+ printf("nic_uio_unload: calling to device_probe_and_attach for
dev=%p...\n",
+ detached_devices[i]);
+ device_probe_and_attach(detached_devices[i]);
+ printf("nic_uio_unload: done.\n");
+ }
+
+ printf("nic_uio_unload: leaving ... \n");
}
static int
--
2.1.2
[dpdk-dev] [PATCH v4] pci: save list of detached devices, and re-probe during driver unload
On Thu, Mar 05, 2015 at 06:24:23PM +0200, Raz Amir wrote:
> Added code that saves the pointers to the detached devices, during
> driver loading, and during driver unloading, go over the list,
> and re-attach them by calling device_probe_and_attach
> on each device.
>
> Signed-off-by: Raz Amir
Acked-by: Bruce Richardson
> ---
> lib/librte_eal/bsdapp/nic_uio/nic_uio.c | 34
> -
> 1 file changed, 29 insertions(+), 5 deletions(-)
>
> diff --git a/lib/librte_eal/bsdapp/nic_uio/nic_uio.c
> b/lib/librte_eal/bsdapp/nic_uio/nic_uio.c
> index 5ae8560..7a4ed5d 100644
> --- a/lib/librte_eal/bsdapp/nic_uio/nic_uio.c
> +++ b/lib/librte_eal/bsdapp/nic_uio/nic_uio.c
> @@ -55,6 +55,9 @@ __FBSDID("$FreeBSD$");
>
> #define MAX_BARS (PCIR_MAX_BAR_0 + 1)
>
> +#define MAX_DETACHED_DEVICES 128
> +static device_t detached_devices[MAX_DETACHED_DEVICES] = {};
> +static int num_detached = 0;
>
> struct nic_uio_softc {
> device_tdev_t;
> @@ -288,17 +291,38 @@ nic_uio_load(void)
> function = strtol(token, NULL, 10);
>
> dev = pci_find_bsf(bus, device, function);
> - if (dev != NULL)
> - for (i = 0; i < NUM_DEVICES; i++)
> - if (pci_get_vendor(dev) == devices[i].vend &&
> - pci_get_device(dev) ==
> devices[i].dev)
> - device_detach(dev);
> + if (dev == NULL)
> + continue;
> +
> + for (i = 0; i < NUM_DEVICES; i++)
> + if (pci_get_vendor(dev) == devices[i].vend &&
> + pci_get_device(dev) == devices[i].dev) {
> + if (num_detached <
> MAX_DETACHED_DEVICES) {
> + printf("nic_uio_load:
> detaching and storing dev=%p\n", dev);
> +
> detached_devices[num_detached++] = dev;
> + }
> + else
> + printf("nic_uio_load:
> reached MAX_DETACHED_DEVICES=%d. dev=%p won't be reattached\n",
> +
> MAX_DETACHED_DEVICES, dev);
> + device_detach(dev);
> + }
> }
> }
>
> static void
> nic_uio_unload(void)
> {
> + int i;
> + printf("nic_uio_unload: entered ... \n");
> +
> + for (i = 0; i < num_detached; i++) {
> + printf("nic_uio_unload: calling to device_probe_and_attach for
> dev=%p...\n",
> + detached_devices[i]);
> + device_probe_and_attach(detached_devices[i]);
> + printf("nic_uio_unload: done.\n");
> + }
> +
> + printf("nic_uio_unload: leaving ... \n");
> }
>
> static int
> --
> 2.1.2
>
[dpdk-dev] [PATCH v4] pci: save list of detached devices, and re-probe during driver unload
Thank you.
Can you tell when will the patch be pushed to the source code?
-Original Message-
From: Bruce Richardson [mailto:bruce.richard...@intel.com]
Sent: 11 March 2015 12:26
To: Raz Amir
Cc: dev at dpdk.org
Subject: Re: [dpdk-dev] [PATCH v4] pci: save list of detached devices, and
re-probe during driver unload
On Thu, Mar 05, 2015 at 06:24:23PM +0200, Raz Amir wrote:
> Added code that saves the pointers to the detached devices, during
> driver loading, and during driver unloading, go over the list, and
> re-attach them by calling device_probe_and_attach on each device.
>
> Signed-off-by: Raz Amir
Acked-by: Bruce Richardson
> ---
> lib/librte_eal/bsdapp/nic_uio/nic_uio.c | 34
> -
> 1 file changed, 29 insertions(+), 5 deletions(-)
>
> diff --git a/lib/librte_eal/bsdapp/nic_uio/nic_uio.c
> b/lib/librte_eal/bsdapp/nic_uio/nic_uio.c
> index 5ae8560..7a4ed5d 100644
> --- a/lib/librte_eal/bsdapp/nic_uio/nic_uio.c
> +++ b/lib/librte_eal/bsdapp/nic_uio/nic_uio.c
> @@ -55,6 +55,9 @@ __FBSDID("$FreeBSD$");
>
> #define MAX_BARS (PCIR_MAX_BAR_0 + 1)
>
> +#define MAX_DETACHED_DEVICES 128
> +static device_t detached_devices[MAX_DETACHED_DEVICES] = {}; static
> +int num_detached = 0;
>
> struct nic_uio_softc {
> device_tdev_t;
> @@ -288,17 +291,38 @@ nic_uio_load(void)
> function = strtol(token, NULL, 10);
>
> dev = pci_find_bsf(bus, device, function);
> - if (dev != NULL)
> - for (i = 0; i < NUM_DEVICES; i++)
> - if (pci_get_vendor(dev) == devices[i].vend
&&
> - pci_get_device(dev) ==
devices[i].dev)
> - device_detach(dev);
> + if (dev == NULL)
> + continue;
> +
> + for (i = 0; i < NUM_DEVICES; i++)
> + if (pci_get_vendor(dev) == devices[i].vend &&
> + pci_get_device(dev) ==
devices[i].dev) {
> + if (num_detached <
MAX_DETACHED_DEVICES) {
> +
printf("nic_uio_load: detaching and storing dev=%p\n", dev);
> +
detached_devices[num_detached++] = dev;
> + }
> + else
> +
printf("nic_uio_load: reached MAX_DETACHED_DEVICES=%d. dev=%p won't be
reattached\n",
> +
MAX_DETACHED_DEVICES, dev);
> + device_detach(dev);
> + }
> }
> }
>
> static void
> nic_uio_unload(void)
> {
> + int i;
> + printf("nic_uio_unload: entered ... \n");
> +
> + for (i = 0; i < num_detached; i++) {
> + printf("nic_uio_unload: calling to device_probe_and_attach
for dev=%p...\n",
> + detached_devices[i]);
> + device_probe_and_attach(detached_devices[i]);
> + printf("nic_uio_unload: done.\n");
> + }
> +
> + printf("nic_uio_unload: leaving ... \n");
> }
>
> static int
> --
> 2.1.2
>
[dpdk-dev] [PATCH v4] pci: save list of detached devices, and re-probe during driver unload
Hi,
2015-03-12 14:24, Raz Amir:
> Thank you.
> Can you tell when will the patch be pushed to the source code?
This is changing the behaviour. I think we should keep it for 2.1 and check if
some docs must be updated in the meantime.
Then we should look at general behaviour for binding/unbinding devices in DPDK.
I feel it would be better to have a common behaviour with BSD, Linux UIO,
Linux VFIO, etc.
> -Original Message-
> From: Bruce Richardson [mailto:bruce.richardson at intel.com]
> Sent: 11 March 2015 12:26
> To: Raz Amir
> Cc: dev at dpdk.org
> Subject: Re: [dpdk-dev] [PATCH v4] pci: save list of detached devices, and
> re-probe during driver unload
>
> On Thu, Mar 05, 2015 at 06:24:23PM +0200, Raz Amir wrote:
> > Added code that saves the pointers to the detached devices, during
> > driver loading, and during driver unloading, go over the list, and
> > re-attach them by calling device_probe_and_attach on each device.
> >
> > Signed-off-by: Raz Amir
> Acked-by: Bruce Richardson
>
> > ---
> > lib/librte_eal/bsdapp/nic_uio/nic_uio.c | 34
> > -
> > 1 file changed, 29 insertions(+), 5 deletions(-)
> >
> > diff --git a/lib/librte_eal/bsdapp/nic_uio/nic_uio.c
> > b/lib/librte_eal/bsdapp/nic_uio/nic_uio.c
> > index 5ae8560..7a4ed5d 100644
> > --- a/lib/librte_eal/bsdapp/nic_uio/nic_uio.c
> > +++ b/lib/librte_eal/bsdapp/nic_uio/nic_uio.c
> > @@ -55,6 +55,9 @@ __FBSDID("$FreeBSD$");
> >
> > #define MAX_BARS (PCIR_MAX_BAR_0 + 1)
> >
> > +#define MAX_DETACHED_DEVICES 128
> > +static device_t detached_devices[MAX_DETACHED_DEVICES] = {}; static
> > +int num_detached = 0;
> >
> > struct nic_uio_softc {
> > device_tdev_t;
> > @@ -288,17 +291,38 @@ nic_uio_load(void)
> > function = strtol(token, NULL, 10);
> >
> > dev = pci_find_bsf(bus, device, function);
> > - if (dev != NULL)
> > - for (i = 0; i < NUM_DEVICES; i++)
> > - if (pci_get_vendor(dev) == devices[i].vend
> &&
> > - pci_get_device(dev) ==
> devices[i].dev)
> > - device_detach(dev);
> > + if (dev == NULL)
> > + continue;
> > +
> > + for (i = 0; i < NUM_DEVICES; i++)
> > + if (pci_get_vendor(dev) == devices[i].vend &&
> > + pci_get_device(dev) ==
> devices[i].dev) {
> > + if (num_detached <
> MAX_DETACHED_DEVICES) {
> > +
> printf("nic_uio_load: detaching and storing dev=%p\n", dev);
> > +
> detached_devices[num_detached++] = dev;
> > + }
> > + else
> > +
> printf("nic_uio_load: reached MAX_DETACHED_DEVICES=%d. dev=%p won't be
> reattached\n",
> > +
> MAX_DETACHED_DEVICES, dev);
> > + device_detach(dev);
> > + }
> > }
> > }
> >
> > static void
> > nic_uio_unload(void)
> > {
> > + int i;
> > + printf("nic_uio_unload: entered ... \n");
> > +
> > + for (i = 0; i < num_detached; i++) {
> > + printf("nic_uio_unload: calling to device_probe_and_attach
> for dev=%p...\n",
> > + detached_devices[i]);
> > + device_probe_and_attach(detached_devices[i]);
> > + printf("nic_uio_unload: done.\n");
> > + }
> > +
> > + printf("nic_uio_unload: leaving ... \n");
> > }
> >
> > static int
> > --
> > 2.1.2
> >
>
[dpdk-dev] [PATCH v4] pci: save list of detached devices, and re-probe during driver unload
This patch received no more comment about a common BSD/Linux behaviour. Maybe that some documentation is needed. 2015-03-16 17:29, Thomas Monjalon: > Hi, > > 2015-03-12 14:24, Raz Amir: > > Thank you. > > Can you tell when will the patch be pushed to the source code? > > This is changing the behaviour. I think we should keep it for 2.1 and check if > some docs must be updated in the meantime. > Then we should look at general behaviour for binding/unbinding devices in > DPDK. > I feel it would be better to have a common behaviour with BSD, Linux UIO, > Linux VFIO, etc. > > > -Original Message- > > From: Bruce Richardson [mailto:bruce.richardson at intel.com] > > Sent: 11 March 2015 12:26 > > To: Raz Amir > > Cc: dev at dpdk.org > > Subject: Re: [dpdk-dev] [PATCH v4] pci: save list of detached devices, and > > re-probe during driver unload > > > > On Thu, Mar 05, 2015 at 06:24:23PM +0200, Raz Amir wrote: > > > Added code that saves the pointers to the detached devices, during > > > driver loading, and during driver unloading, go over the list, and > > > re-attach them by calling device_probe_and_attach on each device. > > > > > > Signed-off-by: Raz Amir > > Acked-by: Bruce Richardson Applied, thanks
