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 A417041D8F for ; Mon, 27 Feb 2023 10:37:27 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7B05040A7D; Mon, 27 Feb 2023 10:37:27 +0100 (CET) Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by mails.dpdk.org (Postfix) with ESMTP id D78AA400D5 for ; Mon, 27 Feb 2023 10:37:25 +0100 (CET) Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 31R2Vc6C024016 for ; Mon, 27 Feb 2023 01:37:25 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : mime-version : content-transfer-encoding : content-type; s=pfpt0220; bh=QTSzCRo3nPlVKKftZQVZ/aLEqbQKldOkfCzOIWTLFoQ=; b=WSi7ylCkCQ4qccgXyWRy6rX8XDy6GxHiaBiE9Mrqq7jG7KVHCLCODAkWmUQFY/HWvPzU jgzkRnJukqJWQqhT610KPMoykjv3f619zCYIIcKMPBjFmAJsjq1q0EGA2/TnWeeorSmS GLz6qchznN2MtF+NAFRE/qnsSheOtbY4DcJNxijZFkV6nCE5eXFc17vUnbmf5O7Pnm0K tc0AnX6Ig816HEA5xHArRuMjAozxuc5Ev7+mL8pjNBzTjMfGVjLuDwr2XvnMFWZhsHQK g3DqmnboDVF3i+RAANSGyTRfveVMUhVEWQEfloQ1MipT0e7itqR+sD3DCgZqH6MAZf+n hQ== Received: from dc5-exch01.marvell.com ([199.233.59.181]) by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 3nyjqtq348-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Mon, 27 Feb 2023 01:37:25 -0800 Received: from DC5-EXCH02.marvell.com (10.69.176.39) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server (TLS) id 15.0.1497.42; Mon, 27 Feb 2023 01:37:22 -0800 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server id 15.0.1497.42 via Frontend Transport; Mon, 27 Feb 2023 01:37:22 -0800 Received: from satheeshpaullabpc.. (unknown [10.28.34.33]) by maili.marvell.com (Postfix) with ESMTP id A241F3F705D; Mon, 27 Feb 2023 01:37:20 -0800 (PST) From: To: Nithin Dabilpuram , Kiran Kumar K , Sunil Kumar Kori , Satha Rao CC: , Satheesh Paul Subject: [PATCH 22.11] common/cnxk: fix second pass flow rule layer type Date: Mon, 27 Feb 2023 15:07:17 +0530 Message-ID: <20230227093717.3942532-1-psatheesh@marvell.com> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Proofpoint-ORIG-GUID: rHyS7N6cOh9vJpeCdwKW7si9GqG6DRMu X-Proofpoint-GUID: rHyS7N6cOh9vJpeCdwKW7si9GqG6DRMu X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.170.22 definitions=2023-02-26_22,2023-02-24_01,2023-02-09_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 When installing flow rule for second pass packets, set the LA LTYPE to LA_CPT_HDR. Fixes: 4968b362b639 ("common/cnxk: support CPT second pass flow rules") Cc: stable@dpdk.org [ upstream commit a0c837ad1fb5b6a8b10a284ffeb5f9e31bd8ff00 ] Signed-off-by: Satheesh Paul --- drivers/common/cnxk/roc_npc_mcam.c | 39 +++++++++++++++++++++---- drivers/common/cnxk/roc_npc_mcam_dump.c | 6 ++-- drivers/common/cnxk/roc_npc_parse.c | 1 + drivers/common/cnxk/roc_npc_priv.h | 1 + 4 files changed, 39 insertions(+), 8 deletions(-) diff --git a/drivers/common/cnxk/roc_npc_mcam.c b/drivers/common/cnxk/roc_npc_mcam.c index a725cabc57..7e1599e606 100644 --- a/drivers/common/cnxk/roc_npc_mcam.c +++ b/drivers/common/cnxk/roc_npc_mcam.c @@ -551,6 +551,8 @@ npc_mcam_alloc_and_write(struct npc *npc, struct roc_npc_flow *flow, struct idev_cfg *idev; uint16_t pf_func = 0; uint16_t ctr = ~(0); + uint32_t la_offset; + uint64_t mask; int rc, idx; int entry; @@ -617,17 +619,42 @@ npc_mcam_alloc_and_write(struct npc *npc, struct roc_npc_flow *flow, flow->npc_action &= ~(GENMASK(19, 4)); flow->npc_action |= (uint64_t)pf_func << 4; - npc_mcam_set_channel(flow, req, inl_dev->channel, - inl_dev->chan_mask, false); + npc_mcam_set_channel(flow, req, inl_dev->channel, inl_dev->chan_mask, + false); } else if (npc->is_sdp_link) { - npc_mcam_set_channel(flow, req, npc->sdp_channel, - npc->sdp_channel_mask, + npc_mcam_set_channel(flow, req, npc->sdp_channel, npc->sdp_channel_mask, pst->is_second_pass_rule); } else { - npc_mcam_set_channel(flow, req, npc->channel, - (BIT_ULL(12) - 1), + npc_mcam_set_channel(flow, req, npc->channel, (BIT_ULL(12) - 1), pst->is_second_pass_rule); } + /* + * For second pass rule, set LA LTYPE to CPT_HDR. + * For all other rules, set LA LTYPE to match both 1st pass and 2nd pass ltypes. + */ + if (pst->is_second_pass_rule || (!pst->is_second_pass_rule && pst->has_eth_type)) { + la_offset = __builtin_popcount(npc->keyx_supp_nmask[flow->nix_intf] & + ((1ULL << 9 /* LA offset */) - 1)); + la_offset *= 4; + + mask = ~((0xfULL << la_offset)); + req->entry_data.kw[0] &= mask; + req->entry_data.kw_mask[0] &= mask; + flow->mcam_data[0] &= mask; + flow->mcam_mask[0] &= mask; + if (pst->is_second_pass_rule) { + req->entry_data.kw[0] |= ((uint64_t)NPC_LT_LA_CPT_HDR) << la_offset; + req->entry_data.kw_mask[0] |= (0xFULL << la_offset); + flow->mcam_data[0] |= ((uint64_t)NPC_LT_LA_CPT_HDR) << la_offset; + flow->mcam_mask[0] |= (0xFULL << la_offset); + } else { + /* Mask ltype ETHER (0x2) and CPT_HDR (0xa) */ + req->entry_data.kw[0] |= (0x2ULL << la_offset); + req->entry_data.kw_mask[0] |= (0x7ULL << la_offset); + flow->mcam_data[0] |= (0x2ULL << la_offset); + flow->mcam_mask[0] |= (0x7ULL << la_offset); + } + } } else { uint16_t pf_func = (flow->npc_action >> 4) & 0xffff; diff --git a/drivers/common/cnxk/roc_npc_mcam_dump.c b/drivers/common/cnxk/roc_npc_mcam_dump.c index fe57811a84..cc1599ef33 100644 --- a/drivers/common/cnxk/roc_npc_mcam_dump.c +++ b/drivers/common/cnxk/roc_npc_mcam_dump.c @@ -69,8 +69,10 @@ static const char *const ltype_str[NPC_MAX_LID][NPC_MAX_LT] = { [NPC_LID_LA][NPC_LT_LA_IH_NIX_ETHER] = "LA_IH_NIX_ETHER", [NPC_LID_LA][NPC_LT_LA_HIGIG2_ETHER] = "LA_HIGIG2_ETHER", [NPC_LID_LA][NPC_LT_LA_IH_NIX_HIGIG2_ETHER] = "LA_IH_NIX_HIGIG2_ETHER", - [NPC_LID_LA][NPC_LT_LA_CUSTOM_PRE_L2_ETHER] = - "NPC_LT_LA_CUSTOM_PRE_L2_ETHER", + [NPC_LID_LA][NPC_LT_LA_CUSTOM_L2_90B_ETHER] = "LA_CUSTOM_L2_90B_ETHER", + [NPC_LID_LA][NPC_LT_LA_CPT_HDR] = "LA_CPT_HDR", + [NPC_LID_LA][NPC_LT_LA_CUSTOM_L2_24B_ETHER] = "LA_CUSTOM_L2_24B_ETHER", + [NPC_LID_LA][NPC_LT_LA_CUSTOM_PRE_L2_ETHER] = "NPC_LT_LA_CUSTOM_PRE_L2_ETHER", [NPC_LID_LB][0] = "NONE", [NPC_LID_LB][NPC_LT_LB_CTAG] = "LB_CTAG", [NPC_LID_LB][NPC_LT_LB_STAG_QINQ] = "LB_STAG_QINQ", diff --git a/drivers/common/cnxk/roc_npc_parse.c b/drivers/common/cnxk/roc_npc_parse.c index ff00c746d6..947e1ec53d 100644 --- a/drivers/common/cnxk/roc_npc_parse.c +++ b/drivers/common/cnxk/roc_npc_parse.c @@ -193,6 +193,7 @@ npc_parse_la(struct npc_parse_state *pst) if (pst->pattern->type != ROC_NPC_ITEM_TYPE_ETH) return 0; + pst->has_eth_type = true; eth_item = pst->pattern->spec; lid = NPC_LID_LA; diff --git a/drivers/common/cnxk/roc_npc_priv.h b/drivers/common/cnxk/roc_npc_priv.h index 1a597280d1..09a727b13e 100644 --- a/drivers/common/cnxk/roc_npc_priv.h +++ b/drivers/common/cnxk/roc_npc_priv.h @@ -196,6 +196,7 @@ struct npc_parse_state { bool set_vlan_ltype_mask; bool set_ipv6ext_ltype_mask; bool is_second_pass_rule; + bool has_eth_type; }; enum npc_kpu_parser_flag { -- 2.35.3