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 B4D8941C2D for ; Tue, 7 Feb 2023 13:30:16 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A2E1E410DF; Tue, 7 Feb 2023 13:30:16 +0100 (CET) Received: from mail-vk1-f181.google.com (mail-vk1-f181.google.com [209.85.221.181]) by mails.dpdk.org (Postfix) with ESMTP id 787E640042; Tue, 7 Feb 2023 13:30:14 +0100 (CET) Received: by mail-vk1-f181.google.com with SMTP id i38so7771268vkd.0; Tue, 07 Feb 2023 04:30:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=pBPwTDUIMmUPk9vowhUX0m9htWyC+CPmAAnML3vtflA=; b=M7qzC36qKTKOJf1goQ44A+97Cnf8wUGea5q8+DbGf4RjQv0F/I2/iUmEWAbgKKK3bG OJqFyrfoHo/vUAcq1JozHu3fPqRzrHTXwSlJwPse1Zf06vQ+erDApl6eRPlx+HtSw6WB Da/hTe5WJ/5yA1rkbps95C7OWP//hbuVW4uJ3r7JB8YzQOwOSJ//4XZl2bLkIsVvRJnb B5FB62ts5V2YzVSaNvlD4nc1+SqxN0M7kcsQBFScM6u29OtMl3DS7b8jsBr8Pxj2F6tJ KJ0o7D13v/leFCvu7SNGy6J0oiC8eSmbws6eK8xBjdYv/LkUxtGRQsxrkVRQVbNw7gba 3e8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=pBPwTDUIMmUPk9vowhUX0m9htWyC+CPmAAnML3vtflA=; b=5a5tZ8ynfUYYKAruwW7cleEGbv0lQhmUP8GQ56OoFUob8IIYUnpHe3SiadwrD4bVJQ WlUtB9BR+3okPAiIQMRrZTTS9rhvp9vp0UbbcQUdBPHyWu+9l4zxCSGuye0ejLpW1KBh o0HGpOJmVCYw6TmuhJsURXlIUZEa6YEEG3qr1sIsPpSCtVe4b7vAC6eiKo4FxznQbfKm TkBsOkdAHdyP1dPWW+tpbJZqTNttrduG6eqkqLVd5ZUWoO6abzgOJakmV244Va945s53 z+r3sqplVBwXZIS9HIFYIrmH8b0cebtg2856r2P2XNslclBkZPQpH+H13++Qk1piW0Cg L6OA== X-Gm-Message-State: AO0yUKWa3eWIikrbQRbU6zCkK6osXBHJhi0P5Qc//PRoyL8KQSxN9Q4t i/9xEWihl26oP9x+Lb3sjWGYoMS3IIfITlESxuDjqhpLcRQ= X-Google-Smtp-Source: AK7set+W1ohPUUb5wCzExCEVOtUH39IRbfo47Tidn3qzzdJNxukLe69KHMnHfyT0OTGkwGOsb5FYE/94FPKJ6qIiJXM= X-Received: by 2002:a05:6122:1461:b0:3d5:d30f:81c2 with SMTP id r1-20020a056122146100b003d5d30f81c2mr386839vkp.14.1675773013759; Tue, 07 Feb 2023 04:30:13 -0800 (PST) MIME-Version: 1.0 References: <20230131033652.2117988-1-psatheesh@marvell.com> In-Reply-To: <20230131033652.2117988-1-psatheesh@marvell.com> From: Jerin Jacob Date: Tue, 7 Feb 2023 17:59:47 +0530 Message-ID: Subject: Re: [dpdk-dev] [PATCH] common/cnxk: fix second pass flow rule layer type To: psatheesh@marvell.com Cc: Nithin Dabilpuram , Kiran Kumar K , Sunil Kumar Kori , Satha Rao , dev@dpdk.org, stable@dpdk.org Content-Type: text/plain; charset="UTF-8" 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 On Tue, Jan 31, 2023 at 9:07 AM wrote: > > From: Satheesh Paul > > When installing flow rule for second pass packets, set the > LA LTYPE to LA_CPT_HDR. > > Fixes: 4968b362b63 ("common/cnxk: support CPT second pass flow rules") Fixes: 4968b362b639 ("common/cnxk: support CPT second pass flow rules") Applied to dpdk-next-net-mrvl/for-next-net. Thanks > Cc: stable@dpdk.org > > Signed-off-by: Satheesh Paul > Reviewed-by: Kiran Kumar K > --- > drivers/common/cnxk/roc_npc_mcam.c | 24 +++++++++++++++++------- > drivers/common/cnxk/roc_npc_mcam_dump.c | 6 ++++-- > 2 files changed, 21 insertions(+), 9 deletions(-) > > diff --git a/drivers/common/cnxk/roc_npc_mcam.c b/drivers/common/cnxk/roc_npc_mcam.c > index 312424d1c2..06f3212e8d 100644 > --- a/drivers/common/cnxk/roc_npc_mcam.c > +++ b/drivers/common/cnxk/roc_npc_mcam.c > @@ -668,22 +668,32 @@ npc_mcam_alloc_and_write(struct npc *npc, struct roc_npc_flow *flow, > npc_mcam_set_channel(flow, req, npc->channel, (BIT_ULL(12) - 1), > pst->is_second_pass_rule); > } > - /* Always match both 1st pass and 2nd pass ltypes for all rules */ > - if (!pst->is_second_pass_rule && pst->has_eth_type) { > + /* > + * 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)); > - /* Mask ltype ETHER (0x2) and CPT_HDR (0xa) */ > req->entry_data.kw[0] &= mask; > req->entry_data.kw_mask[0] &= mask; > - req->entry_data.kw[0] |= (0x2ULL << la_offset); > - req->entry_data.kw_mask[0] |= (0x7ULL << la_offset); > flow->mcam_data[0] &= mask; > flow->mcam_mask[0] &= mask; > - flow->mcam_data[0] |= (0x2ULL << la_offset); > - flow->mcam_mask[0] |= (0x7ULL << la_offset); > + 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 2aaa2ac671..40909b45e6 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", > -- > 2.35.3 >