[dpdk-dev] [PATCH v3] pci: save list of detached devices, and re-probe during driver unload

2015-03-10 Thread Raz Amir 
Sorry for that. Will send the new patch soon

-Original Message-
From: Bruce Richardson [mailto:bruce.richard...@intel.com] 
Sent: 09 March 2015 12:28
To: Raz Amir
Cc: dev at dpdk.org
Subject: Re: [PATCH v3] pci: save list of detached devices, and re-probe
during driver unload

On Mon, Mar 09, 2015 at 10:07:29AM +0200, Raz Amir wrote:
> Hi, gentle reminder about this patch...
> 
> On Mar 4, 2015, at 1:15 PM, 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 
> ---
> lib/librte_eal/bsdapp/nic_uio/nic_uio.c | 32 
> 
> 1 file changed, 28 insertions(+), 4 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..78e4dea 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_DEVICES128
> +static device_t detached_devices[MAX_DETACHED_DEVICES] = {}; static 
> +int num_detached = 0;
> 
> struct nic_uio_softc {
>device_tdev_t;
> @@ -289,16 +292,37 @@ nic_uio_load(void)
> 
>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);
> +continue;
Since we have changed the body to be a continue statement, I think the
condition above needs to be flipped.

/Bruce

[dpdk-dev] [PATCH v3] pci: save list of detached devices, and re-probe during driver unload

2015-03-09 Thread Bruce Richardson 
On Mon, Mar 09, 2015 at 10:07:29AM +0200, Raz Amir wrote:
> Hi, gentle reminder about this patch...
> 
> On Mar 4, 2015, at 1:15 PM, 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 
> ---
> lib/librte_eal/bsdapp/nic_uio/nic_uio.c | 32 
> 1 file changed, 28 insertions(+), 4 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..78e4dea 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_DEVICES128
> +static device_t detached_devices[MAX_DETACHED_DEVICES] = {};
> +static int num_detached = 0;
> 
> struct nic_uio_softc {
>device_tdev_t;
> @@ -289,16 +292,37 @@ nic_uio_load(void)
> 
>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);
> +continue;
Since we have changed the body to be a continue statement, I think the condition
above needs to be flipped.

/Bruce

[dpdk-dev] [PATCH v3] pci: save list of detached devices, and re-probe during driver unload

2015-03-09 Thread Raz Amir 
Hi, gentle reminder about this patch...

On Mar 4, 2015, at 1:15 PM, 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 
---
lib/librte_eal/bsdapp/nic_uio/nic_uio.c | 32 
1 file changed, 28 insertions(+), 4 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..78e4dea 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_DEVICES128
+static device_t detached_devices[MAX_DETACHED_DEVICES] = {};
+static int num_detached = 0;

struct nic_uio_softc {
   device_tdev_t;
@@ -289,16 +292,37 @@ nic_uio_load(void)

   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);
+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 v3] pci: save list of detached devices, and re-probe during driver unload

2015-03-04 Thread Raz Amir 
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 | 32 
 1 file changed, 28 insertions(+), 4 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..78e4dea 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;
@@ -289,16 +292,37 @@ nic_uio_load(void)

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);
+   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