From fa8cc60774a7167823f63997ab669b7f39c11af4 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Wed, 10 Jun 2015 15:06:25 -0700 Subject: [PATCH] bonding: fix name and port validation Cleanup the code in bonding that checks ports. * Use standard rte_eth_dev_is_valid_port * Change name of driver string to avoid variable namespace conflicts * Get rid of unnecessary string comparison stuff. A simple pointer check is enough here. * Get rid of unnecessary assignment of driver_name, it is already done by common code. * Don't generate unnecessary log messages on error. Signed-off-by: Stephen Hemminger Acked-by: Declan Doherty --- drivers/net/bonding/rte_eth_bond_api.c | 47 +++++----------------- drivers/net/bonding/rte_eth_bond_pmd.c | 1 - drivers/net/bonding/rte_eth_bond_private.h | 4 +- 3 files changed, 11 insertions(+), 41 deletions(-) diff --git a/drivers/net/bonding/rte_eth_bond_api.c b/drivers/net/bonding/rte_eth_bond_api.c index d810ec46fc..f6026582cb 100644 --- a/drivers/net/bonding/rte_eth_bond_api.c +++ b/drivers/net/bonding/rte_eth_bond_api.c @@ -45,59 +45,30 @@ #define DEFAULT_POLLING_INTERVAL_10_MS (10) int -valid_bonded_ethdev(struct rte_eth_dev *eth_dev) +valid_bonded_ethdev(const struct rte_eth_dev *eth_dev) { - size_t len; - /* Check valid pointer */ - if (eth_dev->driver->pci_drv.name == NULL || driver_name == NULL) - return -1; - - /* Check string lengths are equal */ - len = strlen(driver_name); - if (strlen(eth_dev->driver->pci_drv.name) != len) - return -1; - - /* Compare strings */ - return strncmp(eth_dev->driver->pci_drv.name, driver_name, len); -} - -int -valid_port_id(uint8_t port_id) -{ - /* Verify that port id is valid */ - int ethdev_count = rte_eth_dev_count(); - if (port_id >= ethdev_count) { - RTE_BOND_LOG(ERR, "Port Id %d is greater than rte_eth_dev_count %d", - port_id, ethdev_count); + if (eth_dev->driver->pci_drv.name == NULL) return -1; - } - return 0; + /* return 0 if driver name matches */ + return eth_dev->driver->pci_drv.name != pmd_bond_driver_name; } int valid_bonded_port_id(uint8_t port_id) { - /* Verify that port id's are valid */ - if (valid_port_id(port_id)) + if (!rte_eth_dev_is_valid_port(port_id)) return -1; - /* Verify that bonded_port_id refers to a bonded port */ - if (valid_bonded_ethdev(&rte_eth_devices[port_id])) { - RTE_BOND_LOG(ERR, "Specified port Id %d is not a bonded eth_dev device", - port_id); - return -1; - } - - return 0; + return valid_bonded_ethdev(&rte_eth_devices[port_id]); } int valid_slave_port_id(uint8_t port_id) { /* Verify that port id's are valid */ - if (valid_port_id(port_id)) + if (!rte_eth_dev_is_valid_port(port_id)) return -1; /* Verify that port_id refers to a non bonded port */ @@ -192,7 +163,7 @@ number_of_sockets(void) return ++sockets; } -const char *driver_name = "Link Bonding PMD"; +const char *pmd_bond_driver_name = "Link Bonding PMD"; int rte_eth_bond_create(const char *name, uint8_t mode, uint8_t socket_id) @@ -259,7 +230,7 @@ rte_eth_bond_create(const char *name, uint8_t mode, uint8_t socket_id) } pci_dev->numa_node = socket_id; - pci_drv->name = driver_name; + pci_drv->name = pmd_bond_driver_name; pci_dev->driver = pci_drv; eth_dev->driver = eth_drv; diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c index 989e878eef..9cafe65fd9 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c @@ -1565,7 +1565,6 @@ bond_ethdev_info(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) { struct bond_dev_private *internals = dev->data->dev_private; - dev_info->driver_name = driver_name; dev_info->max_mac_addrs = 1; dev_info->max_rx_pktlen = (uint32_t)2048; diff --git a/drivers/net/bonding/rte_eth_bond_private.h b/drivers/net/bonding/rte_eth_bond_private.h index 45e5c657a1..c531e878c3 100644 --- a/drivers/net/bonding/rte_eth_bond_private.h +++ b/drivers/net/bonding/rte_eth_bond_private.h @@ -62,7 +62,7 @@ extern const char *pmd_bond_init_valid_arguments[]; -extern const char *driver_name; +extern const char *pmd_bond_driver_name; /** Port Queue Mapping Structure */ struct bond_rx_queue { @@ -162,7 +162,7 @@ struct bond_dev_private { extern struct eth_dev_ops default_dev_ops; int -valid_bonded_ethdev(struct rte_eth_dev *eth_dev); +valid_bonded_ethdev(const struct rte_eth_dev *eth_dev); /* Search given slave array to find possition of given id. * Return slave pos or slaves_count if not found. */ -- 2.20.1