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 3DE5E43C60 for ; Thu, 7 Mar 2024 02:37:34 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B24AF42F2F; Thu, 7 Mar 2024 02:37:33 +0100 (CET) Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by mails.dpdk.org (Postfix) with ESMTP id 1A8E942F2B for ; Thu, 7 Mar 2024 02:37:32 +0100 (CET) Received: by mail-wr1-f41.google.com with SMTP id ffacd0b85a97d-33d118a181fso152173f8f.1 for ; Wed, 06 Mar 2024 17:37:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709775452; x=1710380252; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=bRf388cJZPvHBHAZlc1B4aW/SksgmjsEsFKzcU+llSQ=; b=AyHHSoPD7QS+o4EHYh59FcD/RBiuHSwQJ8n9X6OnXNX41UfY7eM8oHkX+KHKXnzSku 3W3MsdewQcG8wHpcuzq5paUMCTvTovOQCG2JaCaY33mEoCsep8IUvNny99PTeQomWWCC QAZZ4fsjv23gQMm4BGySxHXE8zBVz0Pbnv1+vlbn6sPZhvaLjhzZonhiunoSrl78DYEX ebYZlB73Y1TTm+cxX2hKR4vshgdtjcz/2ueFP+cGeyPNdABmTRF9SDbVMBmZgb69Z8BH mLPUPd6m5Yqxvv6cm1Rsz5JDVgYgxbu3Votdx/dI5vsO4zNjLDnMzyWRjHRLh3txAiOG R7dA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709775452; x=1710380252; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bRf388cJZPvHBHAZlc1B4aW/SksgmjsEsFKzcU+llSQ=; b=b7Dfg/AHrFE4jygIst8ITUpjsihbPfmzh0blTq6cVhht1YbbfQOf3s5so+IQMnyiHC U84pRAIZc5iL6O2Xf9aQPFVHBcxHMON1rvQVa+5ROMHKBm7tjBoiYFleKkVqS2tRZDz/ iAfNHADenFCrYEEJdNO+6X/eFg5MhWgCteHjite/9HQOLWRRmNi/QDuCPIpsl/C48GTK 3yNuHhRe1BXKZIRLg3BkrFYzmWBXN5ZCRQtSqOv+MiwAtxGF6/5surb3L4+vVOPkW3wv dTNM4SEtFGdydBHdA2/LqXciPGgDFv8j7mV/HBlmdE35YyL26yUCoES/IeMl5TFCV3u3 28Zg== X-Gm-Message-State: AOJu0YyoAj82SwHaPlAvfH97ISlN7h0WbVAFNsakcwWdUOmsuB8f1O2r ZXc93iBN0bKiZL/GohwQH23QQnKZ+pQ9qefYAzzc7JUMBOxrxXIN X-Google-Smtp-Source: AGHT+IEj+Zalt3eV8BobV1hW56HwVRaYmRDl+RDVCYRDzr6goXj4QvZp/T5RNqpYLz/1FNvJdX8SYg== X-Received: by 2002:adf:b609:0:b0:33e:1ee2:a946 with SMTP id f9-20020adfb609000000b0033e1ee2a946mr12392697wre.57.1709775451723; Wed, 06 Mar 2024 17:37:31 -0800 (PST) Received: from localhost ([137.220.120.171]) by smtp.gmail.com with ESMTPSA id cl5-20020a5d5f05000000b0033ce727e728sm6479017wrb.94.2024.03.06.17.37.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Mar 2024 17:37:31 -0800 (PST) From: luca.boccassi@gmail.com To: Harman Kalra Cc: dpdk stable Subject: patch 'common/cnxk: fix VLAN check for inner header' has been queued to stable release 22.11.5 Date: Thu, 7 Mar 2024 01:31:51 +0000 Message-Id: <20240307013159.1735343-94-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240307013159.1735343-1-luca.boccassi@gmail.com> References: <20240307013159.1735343-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 22.11.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/09/24. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/3294358b40031d4b4ba9eaf78f78c414b7cd8df1 Thanks. Luca Boccassi --- >From 3294358b40031d4b4ba9eaf78f78c414b7cd8df1 Mon Sep 17 00:00:00 2001 From: Harman Kalra Date: Thu, 21 Dec 2023 12:08:11 +0530 Subject: [PATCH] common/cnxk: fix VLAN check for inner header [ upstream commit 4f52aafa5901e653e536eb3126b818d78d7be1bc ] Adding the has vlan check in inner headers i.e in LF layer. If has_vlan is 0 it should be masked out while installing flow rule. Fixes: c34ea71b878d ("common/cnxk: add NPC parsing API") Signed-off-by: Harman Kalra --- drivers/common/cnxk/roc_npc_parse.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/common/cnxk/roc_npc_parse.c b/drivers/common/cnxk/roc_npc_parse.c index e695b755d7..ce66d2a7d8 100644 --- a/drivers/common/cnxk/roc_npc_parse.c +++ b/drivers/common/cnxk/roc_npc_parse.c @@ -1019,6 +1019,7 @@ npc_parse_lf(struct npc_parse_state *pst) { const struct roc_npc_item_info *pattern, *last_pattern; char hw_mask[NPC_MAX_EXTRACT_HW_LEN]; + const struct roc_npc_flow_item_eth *eth_item; struct npc_parse_item_info info; int lid, lt, lflags; int nr_vlans = 0; @@ -1035,10 +1036,12 @@ npc_parse_lf(struct npc_parse_state *pst) lt = NPC_LT_LF_TU_ETHER; lflags = 0; + eth_item = pst->pattern->spec; + /* No match support for vlan tags */ info.def_mask = NULL; info.hw_mask = NULL; - info.len = pst->pattern->size; + info.len = sizeof(eth_item->hdr); info.spec = NULL; info.mask = NULL; info.hw_hdr_len = 0; @@ -1069,12 +1072,15 @@ npc_parse_lf(struct npc_parse_state *pst) } info.hw_mask = &hw_mask; - info.len = pst->pattern->size; + info.len = sizeof(eth_item->hdr); info.hw_hdr_len = 0; npc_get_hw_supp_mask(pst, &info, lid, lt); info.spec = NULL; info.mask = NULL; + if (eth_item && eth_item->has_vlan) + pst->set_vlan_ltype_mask = true; + rc = npc_parse_item_basic(pst->pattern, &info); if (rc != 0) return rc; -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-07 01:05:42.682510098 +0000 +++ 0094-common-cnxk-fix-VLAN-check-for-inner-header.patch 2024-03-07 01:05:35.002944346 +0000 @@ -1 +1 @@ -From 4f52aafa5901e653e536eb3126b818d78d7be1bc Mon Sep 17 00:00:00 2001 +From 3294358b40031d4b4ba9eaf78f78c414b7cd8df1 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 4f52aafa5901e653e536eb3126b818d78d7be1bc ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ -index 9ceb707ebb..571d6b8e5d 100644 +index e695b755d7..ce66d2a7d8 100644 @@ -21 +22 @@ -@@ -1097,6 +1097,7 @@ npc_parse_lf(struct npc_parse_state *pst) +@@ -1019,6 +1019,7 @@ npc_parse_lf(struct npc_parse_state *pst) @@ -29 +30 @@ -@@ -1113,10 +1114,12 @@ npc_parse_lf(struct npc_parse_state *pst) +@@ -1035,10 +1036,12 @@ npc_parse_lf(struct npc_parse_state *pst) @@ -43 +44 @@ -@@ -1147,12 +1150,15 @@ npc_parse_lf(struct npc_parse_state *pst) +@@ -1069,12 +1072,15 @@ npc_parse_lf(struct npc_parse_state *pst)