From: wangyunjian <wangyunjian@huawei.com>
To: <dev@dpdk.org>
Cc: <thomas@monjalon.net>, <ferruh.yigit@intel.com>,
<andrew.rybchenko@oktetlabs.ru>, <stephen@networkplumber.org>,
<jerry.lilijun@huawei.com>, <xudingke@huawei.com>,
Yunjian Wang <wangyunjian@huawei.com>, <stable@dpdk.org>
Subject: [dpdk-dev] [PATCH v4] ethdev: fix data type for port id
Date: Wed, 4 Nov 2020 10:57:57 +0800 [thread overview]
Message-ID: <1604458677-34696-1-git-send-email-wangyunjian@huawei.com> (raw)
In-Reply-To: <1604308702-7744-1-git-send-email-wangyunjian@huawei.com>
From: Yunjian Wang <wangyunjian@huawei.com>
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: 5b7ba31148a8 ("ethdev: add port ownership")
Cc: stable@dpdk.org
Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
---
v4:
remove redundant compile checks
v3:
fix code styles suggested by Thomas Monjalon and Andrew Rybchenko
v2:
add RTE_BUILD_BUG_ON() check for RTE_MAX_ETHPORTS validity
---
lib/librte_ethdev/rte_ethdev.c | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c
index b12bb3854d..0af8e4d76c 100644
--- a/lib/librte_ethdev/rte_ethdev.c
+++ b/lib/librte_ethdev/rte_ethdev.c
@@ -411,7 +411,9 @@ eth_dev_is_allocated(const struct rte_eth_dev *ethdev)
static struct rte_eth_dev *
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++) {
if (rte_eth_devices[i].data != NULL &&
@@ -440,7 +442,7 @@ rte_eth_dev_allocated(const char *name)
static uint16_t
eth_dev_find_free_port(void)
{
- unsigned i;
+ uint16_t i;
for (i = 0; i < RTE_MAX_ETHPORTS; i++) {
/* 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
rte_eth_dev_get_port_by_name(const char *name, uint16_t *port_id)
{
- uint32_t pid;
+ uint16_t pid;
if (name == NULL) {
RTE_ETHDEV_LOG(ERR, "Null pointer is specified\n");
@@ -4290,7 +4292,7 @@ rte_eth_mirror_rule_reset(uint16_t port_id, uint8_t rule_id)
RTE_INIT(eth_dev_init_cb_lists)
{
- int i;
+ uint16_t i;
for (i = 0; i < RTE_MAX_ETHPORTS; i++)
TAILQ_INIT(&rte_eth_devices[i].link_intr_cbs);
@@ -4303,7 +4305,7 @@ rte_eth_dev_callback_register(uint16_t port_id,
{
struct rte_eth_dev *dev;
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;
if (!cb_fn)
@@ -4366,7 +4368,7 @@ rte_eth_dev_callback_unregister(uint16_t port_id,
int ret;
struct rte_eth_dev *dev;
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;
if (!cb_fn)
@@ -5507,7 +5509,7 @@ static struct rte_eth_dev_switch {
int
rte_eth_switch_domain_alloc(uint16_t *domain_id)
{
- unsigned int i;
+ uint16_t i;
*domain_id = RTE_ETH_DEV_SWITCH_DOMAIN_ID_INVALID;
--
2.18.1
next prev parent reply other threads:[~2020-11-04 2:58 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-26 12:24 [dpdk-dev] [PATCH] " wangyunjian
2020-10-26 12:29 ` Thomas Monjalon
2020-10-26 12:33 ` Andrew Rybchenko
2020-10-26 12:34 ` Thomas Monjalon
2020-10-27 2:46 ` wangyunjian
2020-10-27 8:47 ` Thomas Monjalon
2020-10-26 12:29 ` Andrew Rybchenko
2020-10-27 13:41 ` [dpdk-dev] [PATCH v2] " wangyunjian
2020-10-27 14:29 ` Thomas Monjalon
2020-10-29 12:18 ` wangyunjian
2020-10-29 12:40 ` Andrew Rybchenko
2020-10-29 12:43 ` Thomas Monjalon
2020-11-02 9:18 ` [dpdk-dev] [PATCH v3] " wangyunjian
2020-11-03 18:44 ` [dpdk-dev] [dpdk-stable] " Thomas Monjalon
2020-11-03 23:42 ` Stephen Hemminger
2020-11-04 1:57 ` wangyunjian
2020-11-04 2:57 ` wangyunjian [this message]
2020-11-04 3:26 ` [dpdk-dev] [PATCH v4] " Ajit Khaparde
2020-11-04 11:46 ` Ferruh Yigit
2020-11-04 13:49 ` [dpdk-dev] [dpdk-stable] " Ferruh Yigit
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1604458677-34696-1-git-send-email-wangyunjian@huawei.com \
--to=wangyunjian@huawei.com \
--cc=andrew.rybchenko@oktetlabs.ru \
--cc=dev@dpdk.org \
--cc=ferruh.yigit@intel.com \
--cc=jerry.lilijun@huawei.com \
--cc=stable@dpdk.org \
--cc=stephen@networkplumber.org \
--cc=thomas@monjalon.net \
--cc=xudingke@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).