[5/8] test/kni: remove setting of PCI ID and address
Checks
Commit Message
PCI device id and address in structure rte_kni_conf are never used
in the test and kni library. So remove the related code.
Signed-off-by: Chenbo Xia <chenbo.xia@intel.com>
---
app/test/test_kni.c | 57 ---------------------------------------------
1 file changed, 57 deletions(-)
Comments
On Fri, Sep 10, 2021 at 4:38 AM Chenbo Xia <chenbo.xia@intel.com> wrote:
>
> PCI device id and address in structure rte_kni_conf are never used
> in the test and kni library. So remove the related code.
This is probably a leftover after ethtool support removal.
ea6b39b5b847 ("kni: remove ethtool support")
ee3cac929ede ("kni: remove PCI related information")
On 9/10/2021 3:23 AM, Chenbo Xia wrote:
> PCI device id and address in structure rte_kni_conf are never used
> in the test and kni library. So remove the related code.
>
> Signed-off-by: Chenbo Xia <chenbo.xia@intel.com>
Acked-by: Ferruh Yigit <ferruh.yigit@intel.com>
When/If you merge, please feel free to keep the ack.
@@ -25,7 +25,6 @@ test_kni(void)
#include <rte_string_fns.h>
#include <rte_mempool.h>
#include <rte_ethdev.h>
-#include <rte_bus_pci.h>
#include <rte_cycles.h>
#include <rte_kni.h>
@@ -424,32 +423,14 @@ test_kni_processing(uint16_t port_id, struct rte_mempool *mp)
unsigned i;
struct rte_kni *kni;
struct rte_kni_conf conf;
- struct rte_eth_dev_info info;
struct rte_kni_ops ops;
- const struct rte_pci_device *pci_dev;
- const struct rte_bus *bus = NULL;
if (!mp)
return -1;
memset(&conf, 0, sizeof(conf));
- memset(&info, 0, sizeof(info));
memset(&ops, 0, sizeof(ops));
- ret = rte_eth_dev_info_get(port_id, &info);
- if (ret != 0) {
- printf("Error during getting device (port %u) info: %s\n",
- port_id, strerror(-ret));
- return -1;
- }
-
- if (info.device)
- bus = rte_bus_find_by_device(info.device);
- if (bus && !strcmp(bus->name, "pci")) {
- pci_dev = RTE_DEV_TO_PCI(info.device);
- conf.addr = pci_dev->addr;
- conf.id = pci_dev->id;
- }
snprintf(conf.name, sizeof(conf.name), TEST_KNI_PORT);
/* core id 1 configured for kernel thread */
@@ -543,10 +524,7 @@ test_kni(void)
struct rte_kni *kni;
struct rte_mempool *mp;
struct rte_kni_conf conf;
- struct rte_eth_dev_info info;
struct rte_kni_ops ops;
- const struct rte_pci_device *pci_dev;
- const struct rte_bus *bus;
FILE *fd;
DIR *dir;
char buf[16];
@@ -634,26 +612,9 @@ test_kni(void)
fclose(fd);
/* test of allocating KNI with NULL mempool pointer */
- memset(&info, 0, sizeof(info));
memset(&conf, 0, sizeof(conf));
memset(&ops, 0, sizeof(ops));
- ret = rte_eth_dev_info_get(port_id, &info);
- if (ret != 0) {
- printf("Error during getting device (port %u) info: %s\n",
- port_id, strerror(-ret));
- return -1;
- }
-
- if (info.device)
- bus = rte_bus_find_by_device(info.device);
- else
- bus = NULL;
- if (bus && !strcmp(bus->name, "pci")) {
- pci_dev = RTE_DEV_TO_PCI(info.device);
- conf.addr = pci_dev->addr;
- conf.id = pci_dev->id;
- }
conf.group_id = port_id;
conf.mbuf_size = MAX_PACKET_SZ;
@@ -678,26 +639,8 @@ test_kni(void)
/* test of allocating KNI without a name */
memset(&conf, 0, sizeof(conf));
- memset(&info, 0, sizeof(info));
memset(&ops, 0, sizeof(ops));
- ret = rte_eth_dev_info_get(port_id, &info);
- if (ret != 0) {
- printf("Error during getting device (port %u) info: %s\n",
- port_id, strerror(-ret));
- ret = -1;
- goto fail;
- }
-
- if (info.device)
- bus = rte_bus_find_by_device(info.device);
- else
- bus = NULL;
- if (bus && !strcmp(bus->name, "pci")) {
- pci_dev = RTE_DEV_TO_PCI(info.device);
- conf.addr = pci_dev->addr;
- conf.id = pci_dev->id;
- }
conf.group_id = port_id;
conf.mbuf_size = MAX_PACKET_SZ;