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 1A7A7A0C4B; Wed, 3 Nov 2021 01:53:55 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2DC584115D; Wed, 3 Nov 2021 01:53:08 +0100 (CET) Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) by mails.dpdk.org (Postfix) with ESMTP id 840DF41153 for ; Wed, 3 Nov 2021 01:53:05 +0100 (CET) Received: by mail-pf1-f178.google.com with SMTP id m26so662984pff.3 for ; Tue, 02 Nov 2021 17:53:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version; bh=lXyDPcu8weYPqUiEx/TyfVWLUARWfpirTwHHz4CCkkY=; b=C/9g60e3+Umg5JiOc7882TJOoVSBiL4ONQf8695ogPVNeaqumtrz21/Jmyj2U8oTHO 5I84S339ySFsdv9dx8wxmqjhaqK/Cfx9w3IMM8Uxtr38LzUBdf5JX1kIFlrkPbo0LIGH oSFp1G+oY65F7zj0/uXedXJf/kpYIOqlh7m+Q= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version; bh=lXyDPcu8weYPqUiEx/TyfVWLUARWfpirTwHHz4CCkkY=; b=qE7AKevzoRVMyAi6gw4LeTTyQyHqDJmmtlxBxswttRpu76uOkrZkDXCLdmJYSQdtUM rTL/x5hGQzqclNaQRDOspLRnK9I2/U3tkAP4jjJOiAckbnU2+zE9eA3Zlp8BfG6FcIht 2yghFIf79lpEtpnIqxkwirdSssBEzTg+eS8EP9Wsst1lLZqtn+WPvc4gWJSc8Kn1uyaD hpl66H1dbUZ0JoeJCkaZnKgWfbcVdg3+nlgl9lfrO+Gt8Azt+936kUo7QBbBLjd1W05E a8PTqyEVerXx4UIdKA4RIMuFVx8mJPS3BXEAtkNYz4C7i9XyeE6TGx1/6JgRfYUXWxEg Ixmw== X-Gm-Message-State: AOAM530T6n6WM+lSOm870rTY6gyORhWlaSkwTf8Jxq1lzXuvMpOughcG A9t4YO4AdL1gcmWqevCiHv1b5JUMHiume176ncaL+N9C7xsNupystJxXL9qG4Y75Jj0qdr21JaI 05pc2IpYbSVUMNm2MmYntqQl9iup5q247jLq9Lq9zqYFSGyOONzykM3V+iZtcmCE= X-Google-Smtp-Source: ABdhPJy7PzR8JvE0gFOTMQgIISxejrJ+2mICm2wyGYknFebKPRW+xzSiQiMuF/aq314zMOW3l9XoGw== X-Received: by 2002:aa7:924d:0:b0:47b:d390:da8d with SMTP id 13-20020aa7924d000000b0047bd390da8dmr40693559pfp.15.1635900784474; Tue, 02 Nov 2021 17:53:04 -0700 (PDT) Received: from localhost.localdomain ([192.19.224.250]) by smtp.gmail.com with ESMTPSA id k2sm323450pfu.112.2021.11.02.17.53.03 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Nov 2021 17:53:04 -0700 (PDT) From: Ajit Khaparde To: dev@dpdk.org Cc: Kishore Padmanabha , Venkat Duvvuru , Mike Baucom , Randy Schacher Date: Tue, 2 Nov 2021 17:52:38 -0700 Message-Id: <20211103005251.25524-8-ajit.khaparde@broadcom.com> X-Mailer: git-send-email 2.30.1 (Apple Git-130) In-Reply-To: <20211103005251.25524-1-ajit.khaparde@broadcom.com> References: <20211102040556.7840-1-venkatkumar.duvvuru@broadcom.com> <20211103005251.25524-1-ajit.khaparde@broadcom.com> MIME-Version: 1.0 Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha-256; boundary="0000000000002b7df905cfd7d5d9" X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: [dpdk-dev] [PATCH v4 07/20] net/bnxt: support inner IP header for GRE tunnel flows 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 Sender: "dev" --0000000000002b7df905cfd7d5d9 Content-Transfer-Encoding: 8bit From: Kishore Padmanabha This change allows adding IP header matches for GRE flows that does not specify outer IP header in the flow match pattern. Signed-off-by: Kishore Padmanabha Signed-off-by: Venkat Duvvuru Reviewed-by: Mike Baucom Reviewed-by: Randy Schacher Reviewed-by: Ajit Khaparde --- drivers/net/bnxt/tf_ulp/ulp_rte_parser.c | 7 ++++--- drivers/net/bnxt/tf_ulp/ulp_template_struct.h | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c b/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c index 40da953f06..605c29223c 100644 --- a/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c +++ b/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c @@ -1119,7 +1119,8 @@ ulp_rte_ipv4_hdr_handler(const struct rte_flow_item *item, /* Set the ipv4 header bitmap and computed l3 header bitmaps */ if (ULP_BITMAP_ISSET(hdr_bitmap->bits, BNXT_ULP_HDR_BIT_O_IPV4) || - ULP_BITMAP_ISSET(hdr_bitmap->bits, BNXT_ULP_HDR_BIT_O_IPV6)) { + ULP_BITMAP_ISSET(hdr_bitmap->bits, BNXT_ULP_HDR_BIT_O_IPV6) || + ULP_COMP_FLD_IDX_RD(params, BNXT_ULP_CF_IDX_L3_TUN)) { ULP_BITMAP_SET(hdr_bitmap->bits, BNXT_ULP_HDR_BIT_I_IPV4); ULP_COMP_FLD_IDX_WR(params, BNXT_ULP_CF_IDX_I_L3, 1); inner_flag = 1; @@ -1245,7 +1246,8 @@ ulp_rte_ipv6_hdr_handler(const struct rte_flow_item *item, /* Set the ipv6 header bitmap and computed l3 header bitmaps */ if (ULP_BITMAP_ISSET(hdr_bitmap->bits, BNXT_ULP_HDR_BIT_O_IPV4) || - ULP_BITMAP_ISSET(hdr_bitmap->bits, BNXT_ULP_HDR_BIT_O_IPV6)) { + ULP_BITMAP_ISSET(hdr_bitmap->bits, BNXT_ULP_HDR_BIT_O_IPV6) || + ULP_COMP_FLD_IDX_RD(params, BNXT_ULP_CF_IDX_L3_TUN)) { ULP_BITMAP_SET(hdr_bitmap->bits, BNXT_ULP_HDR_BIT_I_IPV6); ULP_COMP_FLD_IDX_WR(params, BNXT_ULP_CF_IDX_I_L3, 1); inner_flag = 1; @@ -2127,7 +2129,6 @@ ulp_rte_vxlan_decap_act_handler(const struct rte_flow_action *action_item BNXT_ULP_ACT_BIT_VXLAN_DECAP); /* Update computational field with tunnel decap info */ ULP_COMP_FLD_IDX_WR(params, BNXT_ULP_CF_IDX_L3_TUN_DECAP, 1); - ULP_COMP_FLD_IDX_WR(params, BNXT_ULP_CF_IDX_L3_TUN, 1); return BNXT_TF_RC_SUCCESS; } diff --git a/drivers/net/bnxt/tf_ulp/ulp_template_struct.h b/drivers/net/bnxt/tf_ulp/ulp_template_struct.h index d3bfb8c12d..7d1bc06a3e 100644 --- a/drivers/net/bnxt/tf_ulp/ulp_template_struct.h +++ b/drivers/net/bnxt/tf_ulp/ulp_template_struct.h @@ -27,7 +27,7 @@ #define BNXT_ULP_PROTO_HDR_UDP_NUM 4 #define BNXT_ULP_PROTO_HDR_TCP_NUM 9 #define BNXT_ULP_PROTO_HDR_VXLAN_NUM 4 -#define BNXT_ULP_PROTO_HDR_GRE_NUM 6 +#define BNXT_ULP_PROTO_HDR_GRE_NUM 2 #define BNXT_ULP_PROTO_HDR_ICMP_NUM 5 #define BNXT_ULP_PROTO_HDR_MAX 128 #define BNXT_ULP_PROTO_HDR_ENCAP_MAX 64 -- 2.30.1 (Apple Git-130) --0000000000002b7df905cfd7d5d9--