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

ethdev: fix data type for port id

Browse Source 
The ethdev port id is 16 bits now. This patch fixes the data type
of the variable for 'pid', which changing from uint32_t to uint16_t.

RTE_MAX_ETHPORTS is the maximum number of ports, which customized by
the user. To avoid 16-bit unsigned integer overflow, the valid value
of RTE_MAX_ETHPORTS should be set from 0 to UINT16_MAX, and it is
safer to cut one more port from space.

So we use RTE_BUILD_BUG_ON() to ensure that RTE_MAX_ETHPORTS is less
to UINT16_MAX.

Fixes: 5b7ba31148 ("ethdev: add port ownership")
Cc: stable@dpdk.org

Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
Acked-by: Ajit Khaparde <ajit.khaparde@broadcom.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
This commit is contained in:
Yunjian Wang 2020-11-04 10:57:57 +08:00 committed by Ferruh Yigit
parent 6fda724378
commit 4bb02a6f5b
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/librte_ethdev/rte_ethdev.c
View File

@ -411,7 +411,9 @@ eth_dev_is_allocated(const struct rte_eth_dev *ethdev)
static struct rte_eth_dev * static struct rte_eth_dev *
eth_dev_allocated(const char *name) eth_dev_allocated(const char *name)
{ {
unsigned i; uint16_t i;
RTE_BUILD_BUG_ON(RTE_MAX_ETHPORTS >= UINT16_MAX);
for (i = 0; i < RTE_MAX_ETHPORTS; i++) { for (i = 0; i < RTE_MAX_ETHPORTS; i++) {
if (rte_eth_devices[i].data != NULL && if (rte_eth_devices[i].data != NULL &&
@ -440,7 +442,7 @@ rte_eth_dev_allocated(const char *name)
static uint16_t static uint16_t
eth_dev_find_free_port(void) eth_dev_find_free_port(void)
{ {
unsigned i; uint16_t i;
for (i = 0; i < RTE_MAX_ETHPORTS; i++) { for (i = 0; i < RTE_MAX_ETHPORTS; i++) {
/* Using shared name field to find a free port. */ /* Using shared name field to find a free port. */
@ -816,7 +818,7 @@ rte_eth_dev_get_name_by_port(uint16_t port_id, char *name)
int int
rte_eth_dev_get_port_by_name(const char *name, uint16_t *port_id) rte_eth_dev_get_port_by_name(const char *name, uint16_t *port_id)
{ {
uint32_t pid; uint16_t pid;
if (name == NULL) { if (name == NULL) {
RTE_ETHDEV_LOG(ERR, "Null pointer is specified\n"); RTE_ETHDEV_LOG(ERR, "Null pointer is specified\n");
@ -4293,7 +4295,7 @@ rte_eth_mirror_rule_reset(uint16_t port_id, uint8_t rule_id)
RTE_INIT(eth_dev_init_cb_lists) RTE_INIT(eth_dev_init_cb_lists)
{ {
int i; uint16_t i;
for (i = 0; i < RTE_MAX_ETHPORTS; i++) for (i = 0; i < RTE_MAX_ETHPORTS; i++)
TAILQ_INIT(&rte_eth_devices[i].link_intr_cbs); TAILQ_INIT(&rte_eth_devices[i].link_intr_cbs);
@ -4306,7 +4308,7 @@ rte_eth_dev_callback_register(uint16_t port_id,
{ {
struct rte_eth_dev *dev; struct rte_eth_dev *dev;
struct rte_eth_dev_callback *user_cb; struct rte_eth_dev_callback *user_cb;
uint32_t next_port; /* size is 32-bit to prevent loop wrap-around */ uint16_t next_port;
uint16_t last_port; uint16_t last_port;
if (!cb_fn) if (!cb_fn)
@ -4369,7 +4371,7 @@ rte_eth_dev_callback_unregister(uint16_t port_id,
int ret; int ret;
struct rte_eth_dev *dev; struct rte_eth_dev *dev;
struct rte_eth_dev_callback *cb, *next; struct rte_eth_dev_callback *cb, *next;
uint32_t next_port; /* size is 32-bit to prevent loop wrap-around */ uint16_t next_port;
uint16_t last_port; uint16_t last_port;
if (!cb_fn) if (!cb_fn)
@ -5426,7 +5428,7 @@ static struct rte_eth_dev_switch {
int int
rte_eth_switch_domain_alloc(uint16_t *domain_id) rte_eth_switch_domain_alloc(uint16_t *domain_id)
{ {
unsigned int i; uint16_t i;
*domain_id = RTE_ETH_DEV_SWITCH_DOMAIN_ID_INVALID; *domain_id = RTE_ETH_DEV_SWITCH_DOMAIN_ID_INVALID;