From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by dpdk.org (Postfix) with ESMTP id 09A465958 for ; Sat, 1 Nov 2014 20:54:59 +0100 (CET) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP; 01 Nov 2014 13:02:34 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.07,295,1413270000"; d="scan'208";a="629571201" Received: from irvmail001.ir.intel.com ([163.33.26.43]) by orsmga002.jf.intel.com with ESMTP; 01 Nov 2014 13:04:04 -0700 Received: from sivswdev02.ir.intel.com (sivswdev02.ir.intel.com [10.237.217.46]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id sA1K43HI011014 for ; Sat, 1 Nov 2014 20:04:03 GMT Received: from sivswdev02.ir.intel.com (localhost [127.0.0.1]) by sivswdev02.ir.intel.com with ESMTP id sA1K43aA032386 for ; Sat, 1 Nov 2014 20:04:03 GMT Received: (from pdelarax@localhost) by sivswdev02.ir.intel.com with id sA1K422W032382 for dev@dpdk.org; Sat, 1 Nov 2014 20:04:02 GMT From: Pablo de Lara To: dev@dpdk.org Date: Sat, 1 Nov 2014 20:04:02 +0000 Message-Id: <1414872242-32349-1-git-send-email-pablo.de.lara.guarch@intel.com> X-Mailer: git-send-email 1.7.4.1 Subject: [dpdk-dev] [PATCH] app/test: pci_autotest test fails if there is any device bound to igb_uio driver X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Nov 2014 19:55:00 -0000 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 --- app/test/test_pci.c | 31 +++++++++++++++++++++---------- 1 files changed, 21 insertions(+), 10 deletions(-) diff --git a/app/test/test_pci.c b/app/test/test_pci.c index e834c4d..4f0169a 100644 --- a/app/test/test_pci.c +++ b/app/test/test_pci.c @@ -39,10 +39,13 @@ #include #include +#include #include #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; } -- 1.7.4.1