From: Gagandeep Singh <g.singh@nxp.com>
To: dev@dpdk.org, Konstantin Ananyev <konstantin.v.ananyev@yandex.ru>,
Sean Morrissey <sean.morrissey@intel.com>
Cc: stable@dpdk.org
Subject: [PATCH 3/3] examples/l3fwd: fix maximum acceptable port ID in routes
Date: Mon, 15 Jul 2024 15:44:58 +0530 [thread overview]
Message-ID: <20240715101458.645014-3-g.singh@nxp.com> (raw)
In-Reply-To: <20240715101458.645014-1-g.singh@nxp.com>
Application is accepting routes for port ID up to UINT8_MAX
for LPM amd EM routes on parsing the given rule file, but only
up to 32 ports can be enabled as per the variable enabled_port_mask
which is defined as uint32_t.
This patch restricts the rules parsing code to accept routes for
port ID up to 31 only to avoid any unnecessary maintenance of rules
which will never be used.
Fixes: e7e6dd643092 ("examples/l3fwd: support config file for EM")
Fixes: 52def963fc1c ("examples/l3fwd: support config file for LPM/FIB")
Cc: sean.morrissey@intel.com
Cc: stable@dpdk.org
Signed-off-by: Gagandeep Singh <g.singh@nxp.com>
---
examples/l3fwd/em_route_parse.c | 6 ++++--
examples/l3fwd/lpm_route_parse.c | 6 ++++--
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/examples/l3fwd/em_route_parse.c b/examples/l3fwd/em_route_parse.c
index 8b534de5f1..65c71cd1ba 100644
--- a/examples/l3fwd/em_route_parse.c
+++ b/examples/l3fwd/em_route_parse.c
@@ -65,7 +65,8 @@ em_parse_v6_rule(char *str, struct em_rule *v)
/* protocol. */
GET_CB_FIELD(in[CB_FLD_PROTO], v->v6_key.proto, 0, UINT8_MAX, 0);
/* out interface. */
- GET_CB_FIELD(in[CB_FLD_IF_OUT], v->if_out, 0, UINT8_MAX, 0);
+ GET_CB_FIELD(in[CB_FLD_IF_OUT], v->if_out, 0,
+ (sizeof(enabled_port_mask) * CHAR_BIT) - 1, 0);
return 0;
}
@@ -102,7 +103,8 @@ em_parse_v4_rule(char *str, struct em_rule *v)
/* protocol. */
GET_CB_FIELD(in[CB_FLD_PROTO], v->v4_key.proto, 0, UINT8_MAX, 0);
/* out interface. */
- GET_CB_FIELD(in[CB_FLD_IF_OUT], v->if_out, 0, UINT8_MAX, 0);
+ GET_CB_FIELD(in[CB_FLD_IF_OUT], v->if_out, 0,
+ (sizeof(enabled_port_mask) * CHAR_BIT) - 1, 0);
return 0;
}
diff --git a/examples/l3fwd/lpm_route_parse.c b/examples/l3fwd/lpm_route_parse.c
index f27b66e838..357c12d9fe 100644
--- a/examples/l3fwd/lpm_route_parse.c
+++ b/examples/l3fwd/lpm_route_parse.c
@@ -110,7 +110,8 @@ lpm_parse_v6_rule(char *str, struct lpm_route_rule *v)
rc = lpm_parse_v6_net(in[CB_FLD_DST_ADDR], v->ip_32, &v->depth);
- GET_CB_FIELD(in[CB_FLD_IF_OUT], v->if_out, 0, UINT8_MAX, 0);
+ GET_CB_FIELD(in[CB_FLD_IF_OUT], v->if_out, 0,
+ (sizeof(enabled_port_mask) * CHAR_BIT) - 1, 0);
return rc;
}
@@ -132,7 +133,8 @@ lpm_parse_v4_rule(char *str, struct lpm_route_rule *v)
rc = parse_ipv4_addr_mask(in[CB_FLD_DST_ADDR], &v->ip, &v->depth);
- GET_CB_FIELD(in[CB_FLD_IF_OUT], v->if_out, 0, UINT8_MAX, 0);
+ GET_CB_FIELD(in[CB_FLD_IF_OUT], v->if_out, 0,
+ (sizeof(enabled_port_mask) * CHAR_BIT) - 1, 0);
return rc;
}
--
2.25.1
next prev parent reply other threads:[~2024-07-15 10:15 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-15 10:14 [PATCH 1/3] examples/l3fwd: support single route file Gagandeep Singh
2024-07-15 10:14 ` [PATCH 2/3] examples/l3fwd: fix return value on rules add Gagandeep Singh
2024-07-16 6:55 ` Hemant Agrawal
2024-07-15 10:14 ` Gagandeep Singh [this message]
2024-07-17 10:17 ` [PATCH 3/3] examples/l3fwd: fix maximum acceptable port ID in routes Konstantin Ananyev
2024-07-18 6:30 ` Gagandeep Singh
2024-07-18 10:01 ` Konstantin Ananyev
2024-07-22 3:28 ` Gagandeep Singh
2024-07-22 4:27 ` Gagandeep Singh
2024-07-23 16:22 ` Konstantin Ananyev
2024-07-24 8:02 ` Konstantin Ananyev
2024-08-02 10:13 ` Gagandeep Singh
2024-08-06 3:41 ` [v2 0/3] L3fwd changes Gagandeep Singh
2024-08-06 3:41 ` [v2 1/3] examples/l3fwd: support single route file Gagandeep Singh
2024-08-06 3:41 ` [v2 2/3] examples/l3fwd: fix return value on rules add Gagandeep Singh
2024-08-06 3:41 ` [v2 3/3] examples/l3fwd: enhance valid ports checking Gagandeep Singh
2024-11-13 19:39 ` Stephen Hemminger
2024-11-19 17:13 ` Thomas Monjalon
2024-11-20 4:07 ` Gagandeep Singh
2024-11-20 4:05 ` [v3 0/3] L3fwd changes Gagandeep Singh
2024-11-20 4:05 ` [v3 1/3] examples/l3fwd: support single route file Gagandeep Singh
2024-11-20 4:05 ` [v3 2/3] examples/l3fwd: fix return value on rules add Gagandeep Singh
2024-11-20 4:05 ` [v3 3/3] examples/l3fwd: enhance valid ports checking Gagandeep Singh
2024-11-20 11:10 ` Konstantin Ananyev
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=20240715101458.645014-3-g.singh@nxp.com \
--to=g.singh@nxp.com \
--cc=dev@dpdk.org \
--cc=konstantin.v.ananyev@yandex.ru \
--cc=sean.morrissey@intel.com \
--cc=stable@dpdk.org \
/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).