From patchwork Mon Nov 14 21:25:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kamalakshitha Aligeri X-Patchwork-Id: 119856 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 1EA87A054D; Mon, 14 Nov 2022 22:25:48 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 017AC40DFD; Mon, 14 Nov 2022 22:25:48 +0100 (CET) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mails.dpdk.org (Postfix) with ESMTP id 71FF240150 for ; Mon, 14 Nov 2022 22:25:47 +0100 (CET) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 36BA511FB; Mon, 14 Nov 2022 13:25:53 -0800 (PST) Received: from dp6132.usa.Arm.com (dp6132.usa.arm.com [10.118.91.150]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id C75FF3F73B; Mon, 14 Nov 2022 13:25:46 -0800 (PST) From: Kamalakshitha Aligeri To: jerinj@marvell.com, thomas@monjalon.net, david.marchand@redhat.com Cc: dev@dpdk.org, nd@arm.com, Kamalakshitha Aligeri , Nathan Brown , Ruifeng Wang , Feifei Wang Subject: [PATCH 1/3] examples/l3fwd: validate ptype only for type of traffic sent Date: Mon, 14 Nov 2022 21:25:31 +0000 Message-Id: <20221114212533.2871770-1-kamalakshitha.aligeri@arm.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 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 check_ptype function is not considering the ptype of the incoming traffic. --parse-ptype flag must be provided only when the NIC does not support parsing the ptype of the incoming traffic Suggested-by: Nathan Brown Signed-off-by: Kamalakshitha Aligeri Reviewed-by: Ruifeng Wang Reviewed-by: Nathan Brown Reviewed-by: Feifei Wang --- examples/l3fwd/l3fwd_em.c | 8 +++++--- examples/l3fwd/l3fwd_lpm.c | 13 +++++++------ examples/l3fwd/main.c | 5 ++--- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/examples/l3fwd/l3fwd_em.c b/examples/l3fwd/l3fwd_em.c index a203dc9e46..682ad343d7 100644 --- a/examples/l3fwd/l3fwd_em.c +++ b/examples/l3fwd/l3fwd_em.c @@ -507,12 +507,14 @@ em_check_ptype(int portid) } } - if (ptype_l3_ipv4_ext == 0) + if (!ipv6 && !ptype_l3_ipv4_ext) { printf("port %d cannot parse RTE_PTYPE_L3_IPV4_EXT\n", portid); - if (ptype_l3_ipv6_ext == 0) + return 0; + } + if (ipv6 && !ptype_l3_ipv6_ext) { printf("port %d cannot parse RTE_PTYPE_L3_IPV6_EXT\n", portid); - if (!ptype_l3_ipv4_ext || !ptype_l3_ipv6_ext) return 0; + } if (ptype_l4_tcp == 0) printf("port %d cannot parse RTE_PTYPE_L4_TCP\n", portid); diff --git a/examples/l3fwd/l3fwd_lpm.c b/examples/l3fwd/l3fwd_lpm.c index 22d7f61a42..1ac78281f9 100644 --- a/examples/l3fwd/l3fwd_lpm.c +++ b/examples/l3fwd/l3fwd_lpm.c @@ -667,16 +667,17 @@ lpm_check_ptype(int portid) ptype_l3_ipv6 = 1; } - if (ptype_l3_ipv4 == 0) + if (!ipv6 && !ptype_l3_ipv4) { printf("port %d cannot parse RTE_PTYPE_L3_IPV4\n", portid); + return 0; + } - if (ptype_l3_ipv6 == 0) + if (ipv6 && !ptype_l3_ipv6) { printf("port %d cannot parse RTE_PTYPE_L3_IPV6\n", portid); + return 0; + } - if (ptype_l3_ipv4 && ptype_l3_ipv6) - return 1; - - return 0; + return 1; } diff --git a/examples/l3fwd/main.c b/examples/l3fwd/main.c index 5198ff30dd..71a3018036 100644 --- a/examples/l3fwd/main.c +++ b/examples/l3fwd/main.c @@ -964,12 +964,11 @@ parse_args(int argc, char **argv) } /* - * ipv6 and hash flags are valid only for - * exact match, reset them to default for + * hash flag is valid only for + * exact match, reset it to default for * longest-prefix match. */ if (lookup_mode == L3FWD_LOOKUP_LPM) { - ipv6 = 0; hash_entry_number = HASH_ENTRY_NUMBER_DEFAULT; } From patchwork Mon Nov 14 21:25:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kamalakshitha Aligeri X-Patchwork-Id: 119857 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 14E33A054D; Mon, 14 Nov 2022 22:26:02 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 06A2042C29; Mon, 14 Nov 2022 22:26:02 +0100 (CET) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mails.dpdk.org (Postfix) with ESMTP id DD31540150 for ; Mon, 14 Nov 2022 22:26:00 +0100 (CET) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id A596613D5; Mon, 14 Nov 2022 13:26:06 -0800 (PST) Received: from dp6132.usa.Arm.com (dp6132.usa.arm.com [10.118.91.150]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 492513F73B; Mon, 14 Nov 2022 13:26:00 -0800 (PST) From: Kamalakshitha Aligeri To: jerinj@marvell.com, thomas@monjalon.net, david.marchand@redhat.com Cc: dev@dpdk.org, nd@arm.com, Kamalakshitha Aligeri , Honnappa Nagarahalli Subject: [PATCH 2/3] examples/l3fwd: removed hash entry number Date: Mon, 14 Nov 2022 21:25:32 +0000 Message-Id: <20221114212533.2871770-2-kamalakshitha.aligeri@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221114212533.2871770-1-kamalakshitha.aligeri@arm.com> References: <20221114212533.2871770-1-kamalakshitha.aligeri@arm.com> MIME-Version: 1.0 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 hash_entry_number in l3fwd is not being used by both lpm and em lookup method. Removed the global variable hash_entry_number and the function that parses the hash-entry-number flag. Signed-off-by: Kamalakshitha Aligeri Reviewed-by: Honnappa Nagarahalli --- examples/l3fwd/l3fwd.h | 1 - examples/l3fwd/main.c | 37 +------------------------------------ 2 files changed, 1 insertion(+), 37 deletions(-) diff --git a/examples/l3fwd/l3fwd.h b/examples/l3fwd/l3fwd.h index ca1426a687..b55855c932 100644 --- a/examples/l3fwd/l3fwd.h +++ b/examples/l3fwd/l3fwd.h @@ -55,7 +55,6 @@ /* 32-bit has less address-space for hugepage memory, limit to 1M entries */ #define L3FWD_HASH_ENTRIES (1024*1024*1) #endif -#define HASH_ENTRY_NUMBER_DEFAULT 16 struct parm_cfg { const char *rule_ipv4_name; diff --git a/examples/l3fwd/main.c b/examples/l3fwd/main.c index 71a3018036..a4f061537e 100644 --- a/examples/l3fwd/main.c +++ b/examples/l3fwd/main.c @@ -89,7 +89,6 @@ uint32_t enabled_port_mask; /* Used only in exact match mode. */ int ipv6; /**< ipv6 is false by default. */ -uint32_t hash_entry_number = HASH_ENTRY_NUMBER_DEFAULT; struct lcore_conf lcore_conf[RTE_MAX_LCORE]; @@ -395,7 +394,6 @@ print_usage(const char *prgname) " [--eth-dest=X,MM:MM:MM:MM:MM:MM]" " [--max-pkt-len PKTLEN]" " [--no-numa]" - " [--hash-entry-num]" " [--ipv6]" " [--parse-ptype]" " [--per-port-pool]" @@ -419,7 +417,6 @@ print_usage(const char *prgname) " --eth-dest=X,MM:MM:MM:MM:MM:MM: Ethernet destination for port X\n" " --max-pkt-len PKTLEN: maximum packet length in decimal (64-9600)\n" " --no-numa: Disable numa awareness\n" - " --hash-entry-num: Specify the hash entry number in hexadecimal to be setup\n" " --ipv6: Set if running ipv6 packets\n" " --parse-ptype: Set to use software to analyze packet type\n" " --per-port-pool: Use separate buffer pool per port\n" @@ -479,22 +476,6 @@ parse_portmask(const char *portmask) return pm; } -static int -parse_hash_entry_number(const char *hash_entry_num) -{ - char *end = NULL; - unsigned long hash_en; - /* parse hexadecimal string */ - hash_en = strtoul(hash_entry_num, &end, 16); - if ((hash_entry_num[0] == '\0') || (end == NULL) || (*end != '\0')) - return -1; - - if (hash_en == 0) - return -1; - - return hash_en; -} - static int parse_config(const char *q_arg) { @@ -852,14 +833,7 @@ parse_args(int argc, char **argv) break; case CMD_LINE_OPT_HASH_ENTRY_NUM_NUM: - ret = parse_hash_entry_number(optarg); - if ((ret > 0) && (ret <= L3FWD_HASH_ENTRIES)) { - hash_entry_number = ret; - } else { - fprintf(stderr, "invalid hash entry number\n"); - print_usage(prgname); - return -1; - } + fprintf(stderr, "Hash entry number will be ignored\n"); break; case CMD_LINE_OPT_PARSE_PTYPE_NUM: @@ -963,15 +937,6 @@ parse_args(int argc, char **argv) lookup_mode = L3FWD_LOOKUP_LPM; } - /* - * hash flag is valid only for - * exact match, reset it to default for - * longest-prefix match. - */ - if (lookup_mode == L3FWD_LOOKUP_LPM) { - hash_entry_number = HASH_ENTRY_NUMBER_DEFAULT; - } - /* For ACL, update port config rss hash filter */ if (lookup_mode == L3FWD_LOOKUP_ACL) { port_conf.rx_adv_conf.rss_conf.rss_hf |= From patchwork Mon Nov 14 21:25:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kamalakshitha Aligeri X-Patchwork-Id: 119858 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 2A192A054D; Mon, 14 Nov 2022 22:26:16 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1B76C42D11; Mon, 14 Nov 2022 22:26:16 +0100 (CET) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mails.dpdk.org (Postfix) with ESMTP id CF98340150; Mon, 14 Nov 2022 22:26:14 +0100 (CET) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id A05601477; Mon, 14 Nov 2022 13:26:20 -0800 (PST) Received: from dp6132.usa.Arm.com (dp6132.usa.arm.com [10.118.91.150]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 38FD53F73B; Mon, 14 Nov 2022 13:26:14 -0800 (PST) From: Kamalakshitha Aligeri To: jerinj@marvell.com, thomas@monjalon.net, david.marchand@redhat.com Cc: dev@dpdk.org, nd@arm.com, Kamalakshitha Aligeri , stable@dpdk.org, Honnappa Nagarahalli Subject: [PATCH 3/3] doc/l3fwd: lpm supports IPv4 and IPv6 forwarding Date: Mon, 14 Nov 2022 21:25:33 +0000 Message-Id: <20221114212533.2871770-3-kamalakshitha.aligeri@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221114212533.2871770-1-kamalakshitha.aligeri@arm.com> References: <20221114212533.2871770-1-kamalakshitha.aligeri@arm.com> MIME-Version: 1.0 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 LPM based lookup supports both IPv4 and IPv6 forwarding. Fixes: 6a094e328598 ("examples/l3fwd: implement FIB lookup method") Cc: stable@dpdk.org Signed-off-by: Kamalakshitha Aligeri Reviewed-by: Honnappa Nagarahalli Reviewed-by: Ruifeng Wang --- doc/guides/sample_app_ug/l3_forward.rst | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/doc/guides/sample_app_ug/l3_forward.rst b/doc/guides/sample_app_ug/l3_forward.rst index 94b22da01e..1cc2c1dd1d 100644 --- a/doc/guides/sample_app_ug/l3_forward.rst +++ b/doc/guides/sample_app_ug/l3_forward.rst @@ -56,9 +56,8 @@ for the IPv4/IPv6 5-tuple syntax specifically. The 5-tuple syntax consists of a source IP address, a destination IP address, a source port, a destination port and a protocol identifier. -In the sample application, hash-based, FIB-based and ACL-based forwarding supports +In the sample application, hash-based, LPM-based, FIB-based and ACL-based forwarding supports both IPv4 and IPv6. -LPM-based forwarding supports IPv4 only. During the initialization phase route rules for IPv4 and IPv6 are read from rule files. Compiling the Application