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 3C290A0093 for ; Thu, 17 Mar 2022 04:50:58 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2F59741152; Thu, 17 Mar 2022 04:50:58 +0100 (CET) Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by mails.dpdk.org (Postfix) with ESMTP id 232074114F; Thu, 17 Mar 2022 04:50:54 +0100 (CET) Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 22GIohwq027671; Wed, 16 Mar 2022 20:50:54 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=pfpt0220; bh=5CpvcgIV2a11ZtMzSfIoIDYRKFLj3BfDw3Atgrh526s=; b=Ftx+mzdtO/c/Lyf/daDoIYFlYfEZj4FbTMWcsRp5ounNkhXSKxdxwb0IUCoQYb80NBKY Tv0/n75qqQrZcFCun1CNUfS0unS7PetrRtck9VDEgLxw+x+ZsjPrw6KbwB0R2ww3KiSL 68Abw4wlgOdH7dKW9tK/PQ7S0rMebociLl8B8jEAnUBMZGOWPprsKFvEslJsllljx2Uw XJNCL3nMJz7HQ/h0Bo4F0PKs+AwuBfl1eGZqOYFRphv0WAP3dn28eXPizAgE1j+KbaWx 7mpQunWE3IILhnQYbi5oauy+e2kVt0+tYvwg9hnPVy/H2TBxWhBZ0B+M6LbVkVJRZeFn lA== Received: from dc5-exch01.marvell.com ([199.233.59.181]) by mx0a-0016f401.pphosted.com (PPS) with ESMTPS id 3eue23mnx2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Wed, 16 Mar 2022 20:50:54 -0700 Received: from DC5-EXCH01.marvell.com (10.69.176.38) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Wed, 16 Mar 2022 20:50:52 -0700 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Wed, 16 Mar 2022 20:50:52 -0700 Received: from localhost.localdomain (unknown [10.28.34.33]) by maili.marvell.com (Postfix) with ESMTP id 628F83F705C; Wed, 16 Mar 2022 20:50:50 -0700 (PDT) From: To: Nithin Dabilpuram , Kiran Kumar K , Sunil Kumar Kori , Satha Rao CC: , Satheesh Paul , Subject: [dpdk-dev] [PATCH 2/2] common/cnxk: fix QINQ ROC item mismatch issue Date: Thu, 17 Mar 2022 09:20:36 +0530 Message-ID: <20220317035036.2290272-2-psatheesh@marvell.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: <20220317035036.2290272-1-psatheesh@marvell.com> References: <20220317035036.2290272-1-psatheesh@marvell.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Proofpoint-GUID: D2IuZONT0mkYTepb09bTuGMlMZFRXA0E X-Proofpoint-ORIG-GUID: D2IuZONT0mkYTepb09bTuGMlMZFRXA0E X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.850,Hydra:6.0.425,FMLib:17.11.64.514 definitions=2022-03-16_09,2022-03-15_01,2022-02-23_01 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 From: Satheesh Paul ROC code is assuming presence of vlan extension headers in case of QINQ, because of this, there is incompatibility between the driver and ROC. Fixed this issue. Fixes: 4edf1246a40 ("common/cnxk: support matching VLAN existence in RTE Flow") Cc: stable@dpdk.org Signed-off-by: Satheesh Paul --- drivers/common/cnxk/roc_npc_parse.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/common/cnxk/roc_npc_parse.c b/drivers/common/cnxk/roc_npc_parse.c index b849326a19..757bff29a7 100644 --- a/drivers/common/cnxk/roc_npc_parse.c +++ b/drivers/common/cnxk/roc_npc_parse.c @@ -337,15 +337,10 @@ npc_parse_lb(struct npc_parse_state *pst) } info.len = pattern->size; } else if (pst->pattern->type == ROC_NPC_ITEM_TYPE_QINQ) { - vlan_item[0] = pst->pattern->spec; info.hw_mask = NULL; - info.len = sizeof(vlan_item[0]->hdr); + info.len = pattern->size; lt = NPC_LT_LB_STAG_QINQ; lflags = NPC_F_STAG_CTAG; - if (vlan_item[0] && vlan_item[0]->has_more_vlan) { - lflags = NPC_F_LB_L_WITH_QINQ_CTAG & - NPC_F_LB_L_WITH_QINQ_QINQ; - } } else if (pst->pattern->type == ROC_NPC_ITEM_TYPE_RAW) { raw_spec = pst->pattern->spec; if (raw_spec->relative) -- 2.25.4