d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

app/test: fix pci registration

Browse Source 
Since commit a155d430119 ("support link bonding device initialization"),
rte_eal_pci_probe() is called in rte_eal_init().
pci_autotest called it to bind devices to the test_driver and test_driver2.
Therefore, the function is called twice and devices already allocated
will cause the test fail.

This patch solves that issue, unregistering all previous drivers before
calling rte_eal_pci_probe() for the first time, so DPDK does not try
to allocate data for the devices, binding them to their previous
drivers again.

Signed-off-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
This commit is contained in:
Pablo de Lara 2014-11-01 20:04:02 +00:00 committed by Thomas Monjalon
parent b600409890
commit eea0730f18
1 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
app/test/test_pci.c
View File

@ -39,10 +39,13 @@
#include <rte_interrupts.h>
#include <rte_pci.h>
#include <rte_ethdev.h>
#include <rte_devargs.h>
#include "test.h"
/* Generic maximum number of drivers to have room to allocate all drivers */
#define NUM_MAX_DRIVERS 256
/*
* PCI test
@ -57,7 +60,6 @@
int test_pci_run = 0; /* value checked by the multiprocess test */
static unsigned pci_dev_count;
static unsigned driver_registered = 0;
static int my_driver_init(struct rte_pci_driver *dr,
struct rte_pci_device *dev);
@ -150,15 +152,22 @@ int
test_pci(void)
{
struct rte_devargs_list save_devargs_list;
struct rte_pci_driver *dr = NULL;
struct rte_pci_driver *save_pci_driver_list[NUM_MAX_DRIVERS];
unsigned i, num_drivers = 0;
printf("Dump all devices\n");
rte_eal_pci_dump(stdout);
if (driver_registered == 0) {
rte_eal_pci_register(&my_driver);
rte_eal_pci_register(&my_driver2);
driver_registered = 1;
/* Unregister all previous drivers */
TAILQ_FOREACH(dr, &pci_driver_list, next) {
rte_eal_pci_unregister(dr);
save_pci_driver_list[num_drivers++] = dr;
}
rte_eal_pci_register(&my_driver);
rte_eal_pci_register(&my_driver2);
pci_dev_count = 0;
printf("Scan bus\n");
rte_eal_pci_probe();
@ -187,11 +196,13 @@ test_pci(void)
}
test_pci_run = 1;
if (driver_registered == 1) {
rte_eal_pci_unregister(&my_driver);
rte_eal_pci_unregister(&my_driver2);
driver_registered = 0;
}
rte_eal_pci_unregister(&my_driver);
rte_eal_pci_unregister(&my_driver2);
/* Restore original driver list */
for (i = 0; i < num_drivers; i++)
rte_eal_pci_register(save_pci_driver_list[i]);
return 0;
}