From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 8A0B84571F; Tue, 6 Aug 2024 05:42:02 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8C0DE406BB; Tue, 6 Aug 2024 05:41:54 +0200 (CEST) Received: from DUZPR83CU001.outbound.protection.outlook.com (mail-northeuropeazon11013060.outbound.protection.outlook.com [52.101.67.60]) by mails.dpdk.org (Postfix) with ESMTP id A896A40684 for ; Tue, 6 Aug 2024 05:41:52 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ltb6wMKfvkh60FwA9UYKODkIjNfVccb1VkOfmd37xVoQuN5skFX/d5uMBji+wSaiiA+u2E/iRY/ckjzdB1UvCYUIsSbdX5VT2DAjWbOREp4WuyVE5RxSeaVdS60XirYq4bHdlzNt/a+U7hox3phqXuYksHWG18r7hENYikEzjuSxQVYbwdwh03ug9QB1807W/z6iInckqYvzRPzV9TqHRBJnPNYLR7k9pEp6rvVp5+W48RSG7DmU2iLbXJAwQibZlASvyvdrYvQ+J5D1AO6AhzOoX1GfLzpG2b+92TIjzxwTR59CQHLX73DxCAP3vRz1bfrT0xsz12Fcq9ppBaZvNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=eLnhXVHwUNPYKsUl0kLunP0Mg1f2sUykW51PKqe2zuM=; b=odD8tb2y7bE5M8J3HEzGDcQ93NNl/t3NyUIwmmA+nIPnc1EHn5trRNzd9rueSMvkgzSSC0s+qxe7UiKXNamrNd1B8cwSqfA+2NcsoJOkRonEHwBPJBnFD2JoYc8o2McEryeGGzu0N7zTLf7JhQffxCIvRi1iySmEie1UAZxkJblEP7uS5IfA320lAbguKOFWvxUljrxj6t3sVswxIiB+0QrvUjhi54aG8d87caZM/R8W5bl/YJcl9m559u6PLkSakuZlyq8wazwILXv9wzD0emzYUBGZy5jxacXNRe56Whnlg+oBN5cDokYS5tiKwG7fghlPzNxcc0ECzfPghn4urQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=eLnhXVHwUNPYKsUl0kLunP0Mg1f2sUykW51PKqe2zuM=; b=W3BB09SpdyJBD+K+zxtNCxZ2aUTme4gktCM5s4EyUq87vEmPkVSLN5jXGXCVSoYXdH6F7VV1tmnCwIER3yGqRZZvjBowbtTR+hUIxW3sCTeazykRLTisC4Z0UITSIhMqpfubT27GIxl8zS6xbl4xraI9wmNr5/gD4Y73PB+9YQwWVETHI/eu0weXG5f60u9YSBKp6khYGQVX8PXshJdikDfvXqNf4iPfS+wUd53eigMP8G92ts9MsIwEhPXibikoimVL7eVN+Rhyv5Dx2z0ytBgFQUn2TdX+I9CCxyyxuB/cuiLxdw4A09Ybkc+AXwKBh/bKSJwcAOPPbxWNYMp/zw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from PAXPR04MB8205.eurprd04.prod.outlook.com (2603:10a6:102:1c2::20) by AS8PR04MB8387.eurprd04.prod.outlook.com (2603:10a6:20b:3f7::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.11; Tue, 6 Aug 2024 03:41:51 +0000 Received: from PAXPR04MB8205.eurprd04.prod.outlook.com ([fe80::7633:884d:5973:174f]) by PAXPR04MB8205.eurprd04.prod.outlook.com ([fe80::7633:884d:5973:174f%7]) with mapi id 15.20.7828.023; Tue, 6 Aug 2024 03:41:51 +0000 From: Gagandeep Singh To: dev@dpdk.org Subject: [v2 3/3] examples/l3fwd: enhance valid ports checking Date: Tue, 6 Aug 2024 09:11:20 +0530 Message-Id: <20240806034120.3165295-4-g.singh@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240806034120.3165295-1-g.singh@nxp.com> References: <20240715101458.645014-1-g.singh@nxp.com> <20240806034120.3165295-1-g.singh@nxp.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: SG2PR02CA0112.apcprd02.prod.outlook.com (2603:1096:4:92::28) To PAXPR04MB8205.eurprd04.prod.outlook.com (2603:10a6:102:1c2::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB8205:EE_|AS8PR04MB8387:EE_ X-MS-Office365-Filtering-Correlation-Id: ff8d2a34-6e2b-4004-40b8-08dcb5c9b4ff X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|52116014|376014|366016|38350700014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?T13h8mOcVxF3XwB8AFgYtNrPaA5FEzFEkqHTQqKuSfTuanmfX3ACIp95l2oa?= =?us-ascii?Q?d2DMNmIfc/KIARyPgQXXQVkd5/Z2zvq/iseX5UB+o8NYt5enaHke/fXEAjgW?= =?us-ascii?Q?QlJmvXzfi/8x+Vrz1KJppOyqrtT8Jw5t8aW4wmBRaK4ctE3NeVJ2i1u83RkD?= =?us-ascii?Q?gKFVa3Qd86prNMFK1O9TJ4N+j//dXZuSO+TnEz470QKMCY3G1Sjvg6SqbKDQ?= =?us-ascii?Q?KSTquBF/kRQ6p5rpnmM3+F8BuflZ/0lcwbKrdDXOF/R3ngOIDSGRwyonz51g?= =?us-ascii?Q?xnqf7Pb0Aqr1RBHNZUcC/XDr/k7QTGoZ7ERLUOdJYdU7WSvmSlJfcsUa1/mI?= =?us-ascii?Q?jdpr4m0pIVcwnNA4h6daq60xRK5PzKtZeRuj7iAdupXKOs60bLGw6FMwhZbN?= =?us-ascii?Q?IFaOvSFdgELj5+24GDhPLV5VFBwBebTai6Ee/Ri3y4qlXIQlwv4zSahcpF1L?= =?us-ascii?Q?0YBnpa3eMDquG8ytBpsZQyArPI1sonTKtPShiQ401xrk5+0DVp6ZGdv9WyVB?= =?us-ascii?Q?3dQvkBYpG8htQhmnIhcUwDZrdw7EjXFkZ6Rfgvy1NSRooXwIXOPwB+t7s16n?= =?us-ascii?Q?jMiIm/5a87NK2FK7zPvJQhZqyS/7LPIGZwKU2YnlR7iCOA23fwSKvK+CcGy7?= =?us-ascii?Q?ttOkgLQChN2kvnUXQV6dJh+0R4oIFA24rj1+saTf+KqcnPPTSuzcVbKO9dCh?= =?us-ascii?Q?Na8doeUCwHw4U0XqDEiGCqiQEr2YLCVLWGmxKUdnK+d5OWxC6LNBHpaK/C5y?= =?us-ascii?Q?zdpDl74+eGkOPFHANwmo5567UbLp42fXBKPdnesptILYkCVPODUko93apC/O?= =?us-ascii?Q?tKWOPjh9Bf6shf8xp5QyzE4S7iJys3gqOMvFY8QwAYI1WIIDTPT+r7GhTV7i?= =?us-ascii?Q?kxf0itxNb+GOfPhwFfd6G+8nx4cjVc5vWdclGcVpHeB4OjgWI+BJFt3maqkk?= =?us-ascii?Q?VH6WVKre3/S6uoMAWmAejqdTcWeRi53Vl8d2gGBhZf0opopBJlRv8XbRBaNm?= =?us-ascii?Q?GqaPGt5hYsWj+ouD0j+TZDBnub306DT/PKRrx1PEnI8dR+pikusTwLi4vUUd?= =?us-ascii?Q?Z5tbhlSqDIKHRnpR15qjm0quGo75/rI08j8ojpT18WAviNDgLcojkmlcD+FJ?= =?us-ascii?Q?bLqT9y6VrXF8XEZSQVCa93e+D6lG+MatbR/Hu4k1QrIxfjHE+H/tyqeca4uc?= =?us-ascii?Q?TB/BKh8LWBOOB0B+MME3qBMmnPvLxkfAnYbdc1jCmgk3LoS6oBPAmHmnzzEl?= =?us-ascii?Q?eKKk0dyx5pcuPk13KyweAFdPKSbIGecz0WdIs++lTWy3/oKtowmRNAPNFrIs?= =?us-ascii?Q?SKTZK2ImKKUIgEtp6ybnoLyW+ovR6KFIrajMMCWJJJDQZIgtBWpoLUGiwp1y?= =?us-ascii?Q?gxmJ3mtMjEb8I3U0JLmnC6hoF4fvBfJvoGZynw1SZA2IcaD2lQ=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PAXPR04MB8205.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(1800799024)(52116014)(376014)(366016)(38350700014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?FhUu4w1hmsKR3l2Y0f1R7g2jv0C3xmo5dmIWBteI41POP5V0Dtm+Nhj/pSRo?= =?us-ascii?Q?9V7yIv/uqRvOndBdoY4ED4boWwomKHDIEaT4ol3MbLhSrSuBQJxSH1b8DWvo?= =?us-ascii?Q?qdBKpmaRpnRV/r7gg17WgtRm8Zl3dwv4ZMEI3ar7tPVYDj4zeVL39iyMFIUG?= =?us-ascii?Q?UsW1xF+zWzthxyqsk6y3VqOxcd0f1adM/pc4gUzaVPp1dVQ4bnOZ6VUk2aAr?= =?us-ascii?Q?1HYKUeENnVapJhCx9tQ5egoKXdJDM4T5/jOwDrY1rvv/A4sER1amZ9ox3jS4?= =?us-ascii?Q?xTdl1/JpPvD9dCoQfODzslx0Z/3pv0RTjRTMJJCmm5AJdusFmUFYJclinuLY?= =?us-ascii?Q?4Yls8J8WAPRlXwOciegJCx+Sevw6gWY79WP/G+rxasslXx77NPsYL2HZcAVc?= =?us-ascii?Q?TvAOVm2hIVOVYvONUCEW6lg16a2I9Bn8KOaD22f0csXhalVoVNOwcCi1hzru?= =?us-ascii?Q?UpYCt8WvUqhO+q54ILkBQ1MnSyR8muKrWpp8QAjGSTK2BzBsVxSCb9gIukpS?= =?us-ascii?Q?xkxzlPPvBtFb7NDP1TF62UOeFbsiWyYksqzj5hE/1FQQg/BxNivPJD9I5yBb?= =?us-ascii?Q?sn6zOEtqH8KhY50e6UBfd1ivdPVzUpf0WTht88nO2Wb1vEB6nNA/H/ythCVp?= =?us-ascii?Q?PDA0eZKQ3z+uoRO28Ta180a0TCTCjk0ox8okNSuwNUv2ulifQhAWv1sU0Db7?= =?us-ascii?Q?/AEG6YtnacL21o/IFHXTQG2uYrwN36QZW8lQ8gi6Gb5Jc6T03gQA5p/5hoca?= =?us-ascii?Q?vjudU/QjdEwov1WZQG6trzIfUjz1WtfuVizepvGNLBhS6/TpAySAoZg9+0ZK?= =?us-ascii?Q?Rghbj4s28dkpaCpSbP7dEXvVCmQXMm2xUFYCkuNw4e8KKvQ0Pj1uFDYR1vCM?= =?us-ascii?Q?tlaq45/5yAJvlcX29W8KIZYa+dXb9P7ecH1IgdKeCdnCYxFqszVadM6vl3rf?= =?us-ascii?Q?Ko4En4EyPXpKJalrfuX4AW6q+/xu2zw8/2BVZ6L0gypYtob5aIxHrDJKmhuE?= =?us-ascii?Q?8hfUxcDqPp2ewtYKqtxoW1RTpuHHe4wlm6pexJOH2S6v17jXysG1H2Avdh9+?= =?us-ascii?Q?xZWTpNmqJNtnODq2pC+M0u2nOAUN/gYE0oTLhj6BM95jrfMlTMMgq2YRo3vV?= =?us-ascii?Q?lwEC6HpJrgBaZ8ZeYO9oQlsrHzmoyNkDMCRm+TV5NQXjG2nGnlNMNLjWdhJw?= =?us-ascii?Q?Q5JA5iEavfvMJoLhmFGjxegAKDp5Je1u4lJE6JSLwLy5AVSC1TPQwMNYurOa?= =?us-ascii?Q?QBJ8z3suMSyVIuax45XF8AeBoGXi7Z9GCcf1g5wpxyyDmihZRABQ5aq8Ypai?= =?us-ascii?Q?rIt2RBuqR8IaYUI6MgIBw/AgOGAIRgFQTisLRnY60/KGrmqGAFdqMAw70fEq?= =?us-ascii?Q?8FVwyVz0hJGBifY6ixQNA1ycpmVNRYu0aD9VLc547BrWzQX4aXq8bzfijEcv?= =?us-ascii?Q?xYv7mbMpBrdryoXNC2tyxUTe08DoPDe6XrxLE8fE3TZOIlF8i+f0zC+z9ANi?= =?us-ascii?Q?KTt84ITZS0BLEL769Viuc/lsm5YNiCRjWNqbOeSVWHIpvxHuFwrZ8tOmxlxx?= =?us-ascii?Q?9Kn6roUDbTCb1Wmsu1o=3D?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: ff8d2a34-6e2b-4004-40b8-08dcb5c9b4ff X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB8205.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Aug 2024 03:41:51.2715 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 7BsAZLENYyJPxNN++OS33qN1vkufLq6IWERH7+9S6BMsYnV6fK2pMs+Dofg1l40O X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8387 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org The current port ID validation logic in the routes add code has two issues: - It can pass if port ID in route is 31+. - It silently skips rules with disabled or invalid port IDs This patch is: - Improving the enabled port IDs check logic. - Introducing a user option, "exit_on_failure", to control the behavior when attempting to add rules for disabled or invalid port IDs (either exit or skip) - Creating a port ID validation function for use across various setup functions Signed-off-by: Gagandeep Singh --- examples/l3fwd/em_route_parse.c | 4 +-- examples/l3fwd/l3fwd.h | 16 +++++++++ examples/l3fwd/l3fwd_em.c | 22 ++++++++---- examples/l3fwd/l3fwd_fib.c | 26 +++++++++----- examples/l3fwd/l3fwd_lpm.c | 26 +++++++++----- examples/l3fwd/l3fwd_route.h | 2 ++ examples/l3fwd/main.c | 60 +++++++++++++++++++++++++++------ 7 files changed, 122 insertions(+), 34 deletions(-) diff --git a/examples/l3fwd/em_route_parse.c b/examples/l3fwd/em_route_parse.c index 8b534de5f1..b80442d7b8 100644 --- a/examples/l3fwd/em_route_parse.c +++ b/examples/l3fwd/em_route_parse.c @@ -10,8 +10,8 @@ #include "l3fwd.h" #include "l3fwd_route.h" -static struct em_rule *em_route_base_v4; -static struct em_rule *em_route_base_v6; +struct em_rule *em_route_base_v4; +struct em_rule *em_route_base_v6; enum { CB_FLD_DST_ADDR, diff --git a/examples/l3fwd/l3fwd.h b/examples/l3fwd/l3fwd.h index 93ce652d02..d6510448a5 100644 --- a/examples/l3fwd/l3fwd.h +++ b/examples/l3fwd/l3fwd.h @@ -56,6 +56,15 @@ #define L3FWD_HASH_ENTRIES (1024*1024*1) #endif +/* Select Longest-Prefix, Exact match, Forwarding Information Base or Access Control. */ +enum L3FWD_LOOKUP_MODE { + L3FWD_LOOKUP_DEFAULT, + L3FWD_LOOKUP_LPM, + L3FWD_LOOKUP_EM, + L3FWD_LOOKUP_FIB, + L3FWD_LOOKUP_ACL +}; + struct parm_cfg { const char *rule_ipv4_name; const char *rule_ipv6_name; @@ -101,6 +110,9 @@ extern struct rte_ether_addr ports_eth_addr[RTE_MAX_ETHPORTS]; /* mask of enabled ports */ extern uint32_t enabled_port_mask; +/* Skip or exit on invalid route */ +extern bool exit_on_failure; + /* Used only in exact match mode. */ extern int ipv6; /**< ipv6 is false by default. */ extern uint32_t hash_entry_number; @@ -218,6 +230,10 @@ init_mem(uint16_t portid, unsigned int nb_mbuf); int config_port_max_pkt_len(struct rte_eth_conf *conf, struct rte_eth_dev_info *dev_info); +int +l3fwd_validate_routes_port(enum L3FWD_LOOKUP_MODE mode, uint32_t i, + bool is_ipv4); + /* Function pointers for ACL, LPM, EM or FIB functionality. */ void setup_acl(const int socketid); diff --git a/examples/l3fwd/l3fwd_em.c b/examples/l3fwd/l3fwd_em.c index 31a7e05e39..1a1b48635b 100644 --- a/examples/l3fwd/l3fwd_em.c +++ b/examples/l3fwd/l3fwd_em.c @@ -384,9 +384,14 @@ populate_ipv4_flow_into_table(const struct rte_hash *h) struct in_addr src; struct in_addr dst; - if ((1 << em_route_base_v4[i].if_out & - enabled_port_mask) == 0) - continue; + ret = l3fwd_validate_routes_port(L3FWD_LOOKUP_EM, i, true); + if (ret) { + if (exit_on_failure) + rte_exit(EXIT_FAILURE, "IDX: %d: Port ID %d in IPv4 rule is not" + " enabled\n", i, em_route_base_v4[i].if_out); + else + continue; + } entry = &em_route_base_v4[i]; convert_ipv4_5tuple(&(entry->v4_key), &newkey); @@ -436,9 +441,14 @@ populate_ipv6_flow_into_table(const struct rte_hash *h) struct em_rule *entry; union ipv6_5tuple_host newkey; - if ((1 << em_route_base_v6[i].if_out & - enabled_port_mask) == 0) - continue; + ret = l3fwd_validate_routes_port(L3FWD_LOOKUP_EM, i, false); + if (ret) { + if (exit_on_failure) + rte_exit(EXIT_FAILURE, "IDX %d: Port ID %d given in IPv6 rule is not" + " enabled\n", i, em_route_base_v6[i].if_out); + else + continue; + } entry = &em_route_base_v6[i]; convert_ipv6_5tuple(&(entry->v6_key), &newkey); diff --git a/examples/l3fwd/l3fwd_fib.c b/examples/l3fwd/l3fwd_fib.c index f38b19af3f..9e987e2031 100644 --- a/examples/l3fwd/l3fwd_fib.c +++ b/examples/l3fwd/l3fwd_fib.c @@ -670,10 +670,15 @@ setup_fib(const int socketid) for (i = 0; i < route_num_v4; i++) { struct in_addr in; - /* Skip unused ports. */ - if ((1 << route_base_v4[i].if_out & - enabled_port_mask) == 0) - continue; + /* Check for valid ports */ + ret = l3fwd_validate_routes_port(L3FWD_LOOKUP_FIB, i, true); + if (ret) { + if (exit_on_failure) + rte_exit(EXIT_FAILURE, "IDX %d: Port ID %d in IPv4 rule is not" + " enabled\n", i, route_base_v4[i].if_out); + else + continue; + } rte_eth_dev_info_get(route_base_v4[i].if_out, &dev_info); @@ -724,10 +729,15 @@ setup_fib(const int socketid) /* Populate the fib IPv6 table. */ for (i = 0; i < route_num_v6; i++) { - /* Skip unused ports. */ - if ((1 << route_base_v6[i].if_out & - enabled_port_mask) == 0) - continue; + /* Check for valid ports. */ + ret = l3fwd_validate_routes_port(L3FWD_LOOKUP_FIB, i, false); + if (ret) { + if (exit_on_failure) + rte_exit(EXIT_FAILURE, "IDX %d: Port ID %d given in IPv6 rule is not" + " enabled\n", i, route_base_v6[i].if_out); + else + continue; + } rte_eth_dev_info_get(route_base_v6[i].if_out, &dev_info); diff --git a/examples/l3fwd/l3fwd_lpm.c b/examples/l3fwd/l3fwd_lpm.c index e8fd95aae9..3193e60dc7 100644 --- a/examples/l3fwd/l3fwd_lpm.c +++ b/examples/l3fwd/l3fwd_lpm.c @@ -583,10 +583,15 @@ setup_lpm(const int socketid) for (i = 0; i < route_num_v4; i++) { struct in_addr in; - /* skip unused ports */ - if ((1 << route_base_v4[i].if_out & - enabled_port_mask) == 0) - continue; + /* Check for valid ports */ + ret = l3fwd_validate_routes_port(L3FWD_LOOKUP_LPM, i, true); + if (ret) { + if (exit_on_failure) + rte_exit(EXIT_FAILURE, "IDX: %d: Port ID %d in IPv4 rule is not" + " enabled\n", i, route_base_v4[i].if_out); + else + continue; + } rte_eth_dev_info_get(route_base_v4[i].if_out, &dev_info); @@ -627,10 +632,15 @@ setup_lpm(const int socketid) /* populate the LPM table */ for (i = 0; i < route_num_v6; i++) { - /* skip unused ports */ - if ((1 << route_base_v6[i].if_out & - enabled_port_mask) == 0) - continue; + /* Check for valid ports */ + ret = l3fwd_validate_routes_port(L3FWD_LOOKUP_LPM, i, false); + if (ret) { + if (exit_on_failure) + rte_exit(EXIT_FAILURE, "IDX %d Port ID %d given in IPv6 rule is not" + " enabled\n", i, route_base_v6[i].if_out); + else + continue; + } rte_eth_dev_info_get(route_base_v6[i].if_out, &dev_info); diff --git a/examples/l3fwd/l3fwd_route.h b/examples/l3fwd/l3fwd_route.h index 467c4d2859..681d10c6d3 100644 --- a/examples/l3fwd/l3fwd_route.h +++ b/examples/l3fwd/l3fwd_route.h @@ -82,6 +82,8 @@ struct em_rule { extern struct lpm_route_rule *route_base_v4; extern struct lpm_route_rule *route_base_v6; +extern struct em_rule *em_route_base_v4; +extern struct em_rule *em_route_base_v6; extern int route_num_v4; extern int route_num_v6; diff --git a/examples/l3fwd/main.c b/examples/l3fwd/main.c index 01b763e5ba..3cfe21da90 100644 --- a/examples/l3fwd/main.c +++ b/examples/l3fwd/main.c @@ -59,14 +59,6 @@ uint16_t nb_txd = TX_DESC_DEFAULT; /**< Ports set in promiscuous mode off by default. */ static int promiscuous_on; -/* Select Longest-Prefix, Exact match, Forwarding Information Base or Access Control. */ -enum L3FWD_LOOKUP_MODE { - L3FWD_LOOKUP_DEFAULT, - L3FWD_LOOKUP_LPM, - L3FWD_LOOKUP_EM, - L3FWD_LOOKUP_FIB, - L3FWD_LOOKUP_ACL -}; static enum L3FWD_LOOKUP_MODE lookup_mode; /* Global variables. */ @@ -88,7 +80,8 @@ xmm_t val_eth[RTE_MAX_ETHPORTS]; /* mask of enabled ports */ uint32_t enabled_port_mask; - +bool exit_on_failure; /**< Skip the route rule with invalid or */ + /**< disabled port ID */ /* Used only in exact match mode. */ int ipv6; /**< ipv6 is false by default. */ @@ -267,6 +260,43 @@ l3fwd_set_alg(const char *optarg) parm_config.alg = parse_acl_alg(optarg); } +/* This function will work only after read_config_files step */ +int +l3fwd_validate_routes_port(enum L3FWD_LOOKUP_MODE mode, uint32_t i, + bool is_ipv4) +{ + uint32_t max_port_count = (sizeof(enabled_port_mask) * CHAR_BIT); + + if (mode == L3FWD_LOOKUP_LPM || + mode == L3FWD_LOOKUP_FIB) { + if (is_ipv4) { + if (route_base_v4[i].if_out >= max_port_count || + ((1 << route_base_v4[i].if_out & + enabled_port_mask) == 0)) + return -1; + } else { + if (route_base_v6[i].if_out >= max_port_count || + ((1 << route_base_v6[i].if_out & + enabled_port_mask) == 0)) + return -1; + } + } else if (mode == L3FWD_LOOKUP_EM) { + if (is_ipv4) { + if (em_route_base_v4[i].if_out >= max_port_count || + ((1 << em_route_base_v4[i].if_out & + enabled_port_mask) == 0)) + return -1; + } else { + if (em_route_base_v6[i].if_out >= max_port_count || + ((1 << em_route_base_v6[i].if_out & + enabled_port_mask) == 0)) + return -1; + } + } + + return 0; +} + /* * Setup lookup methods for forwarding. * Currently exact-match, longest-prefix-match and forwarding information @@ -402,6 +432,7 @@ print_usage(const char *prgname) " [--parse-ptype]" " [--per-port-pool]" " [--mode]" + " [--exit-on-failure]" #ifdef RTE_LIB_EVENTDEV " [--eventq-sched]" " [--event-vector [--event-vector-size SIZE] [--event-vector-tmo NS]]" @@ -428,6 +459,8 @@ print_usage(const char *prgname) " --per-port-pool: Use separate buffer pool per port\n" " --mode: Packet transfer mode for I/O, poll or eventdev\n" " Default mode = poll\n" + " --exit-on-failure: Exit on invalid/disabled port ID given in route rule\n" + " Default action is skip the rule\n" #ifdef RTE_LIB_EVENTDEV " --eventq-sched: Event queue synchronization method\n" " ordered, atomic or parallel.\n" @@ -689,6 +722,7 @@ static const char short_options[] = #define CMD_LINE_OPT_RELAX_RX_OFFLOAD "relax-rx-offload" #define CMD_LINE_OPT_PER_PORT_POOL "per-port-pool" #define CMD_LINE_OPT_MODE "mode" +#define CMD_LINE_OPT_EXIT_ON_FAILURE "exit-on-failure" #define CMD_LINE_OPT_EVENTQ_SYNC "eventq-sched" #define CMD_LINE_OPT_EVENT_ETH_RX_QUEUES "event-eth-rxqs" #define CMD_LINE_OPT_LOOKUP "lookup" @@ -726,7 +760,8 @@ enum { CMD_LINE_OPT_LOOKUP_NUM, CMD_LINE_OPT_ENABLE_VECTOR_NUM, CMD_LINE_OPT_VECTOR_SIZE_NUM, - CMD_LINE_OPT_VECTOR_TMO_NS_NUM + CMD_LINE_OPT_VECTOR_TMO_NS_NUM, + CMD_LINE_OPT_EXIT_ON_FAILURE_NUM }; static const struct option lgopts[] = { @@ -743,6 +778,7 @@ static const struct option lgopts[] = { {CMD_LINE_OPT_DISABLE_RSS, 0, 0, CMD_LINE_OPT_DISABLE_RSS_NUM}, {CMD_LINE_OPT_PER_PORT_POOL, 0, 0, CMD_LINE_OPT_PARSE_PER_PORT_POOL}, {CMD_LINE_OPT_MODE, 1, 0, CMD_LINE_OPT_MODE_NUM}, + {CMD_LINE_OPT_EXIT_ON_FAILURE, 0, 0, CMD_LINE_OPT_EXIT_ON_FAILURE_NUM}, {CMD_LINE_OPT_EVENTQ_SYNC, 1, 0, CMD_LINE_OPT_EVENTQ_SYNC_NUM}, {CMD_LINE_OPT_EVENT_ETH_RX_QUEUES, 1, 0, CMD_LINE_OPT_EVENT_ETH_RX_QUEUES_NUM}, @@ -885,6 +921,10 @@ parse_args(int argc, char **argv) parse_mode(optarg); break; + case CMD_LINE_OPT_EXIT_ON_FAILURE_NUM: + exit_on_failure = true; + break; + #ifdef RTE_LIB_EVENTDEV case CMD_LINE_OPT_EVENTQ_SYNC_NUM: parse_eventq_sched(optarg); -- 2.25.1