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 1F512A034F for ; Tue, 1 Mar 2022 11:44:50 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 16E89407FF; Tue, 1 Mar 2022 11:44:50 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id BCD38407FF for ; Tue, 1 Mar 2022 11:44:48 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646131488; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=bUXsCRkO54glwfcjVMU4UQBPs7Z1GDn1Xia95fwl/PA=; b=IJqS3WOSfLStNKGRtgELvUeZOtIPHpGZRaDdDwSvj3VBFr51p/1nCJ1Hxsqp7wZQCkKb22 fwVmXbMwxGH0qtCaMsXdk2qZ6ROB+stHG751kE5v+XlpnOF7CqlfecyUzqWWM8xPdoRO2i 0Vjd8LFbv8I2z12+nNBTcs/BUjUzPoY= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-547-wqS9KcBMNimUeN2NrY97yA-1; Tue, 01 Mar 2022 05:44:45 -0500 X-MC-Unique: wqS9KcBMNimUeN2NrY97yA-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 96A83186833A; Tue, 1 Mar 2022 10:44:44 +0000 (UTC) Received: from rh.Home (unknown [10.39.194.142]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8BDC06FB02; Tue, 1 Mar 2022 10:44:43 +0000 (UTC) From: Kevin Traynor To: Satheesh Paul Cc: Kiran Kumar K , dpdk stable Subject: patch 'common/cnxk: fix base rule merge' has been queued to stable release 21.11.1 Date: Tue, 1 Mar 2022 10:42:03 +0000 Message-Id: <20220301104300.334382-47-ktraynor@redhat.com> In-Reply-To: <20220301104300.334382-1-ktraynor@redhat.com> References: <20220301104300.334382-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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 21.11.1 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/06/22. 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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/e09a0094a6025aed8cbe52b1a7b27280629dbb82 Thanks. Kevin --- >From e09a0094a6025aed8cbe52b1a7b27280629dbb82 Mon Sep 17 00:00:00 2001 From: Satheesh Paul Date: Tue, 25 Jan 2022 09:47:59 +0530 Subject: [PATCH] common/cnxk: fix base rule merge [ upstream commit 0fb2b46be79a6558efd39c7a2e1d55402c958081 ] Egress rules do not have a base steering rule and the current base steering rule is applicable only for ingress rules. Hence, when creating a flow rule, merge base steering rule only for ingress rules. Fixes: f9af90807466 ("common/cnxk: add mcam utility API") Signed-off-by: Satheesh Paul Reviewed-by: Kiran Kumar K --- drivers/common/cnxk/roc_npc_mcam.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/common/cnxk/roc_npc_mcam.c b/drivers/common/cnxk/roc_npc_mcam.c index 82014a2ca0..a16ba3f7be 100644 --- a/drivers/common/cnxk/roc_npc_mcam.c +++ b/drivers/common/cnxk/roc_npc_mcam.c @@ -671,5 +671,5 @@ npc_program_mcam(struct npc *npc, struct npc_parse_state *pst, bool mcam_alloc) memcpy(pst->flow->mcam_mask, key_mask, key_len); - if (pst->is_vf) { + if (pst->is_vf && pst->flow->nix_intf == NIX_INTF_RX) { (void)mbox_alloc_msg_npc_read_base_steer_rule(npc->mbox); rc = mbox_process_msg(npc->mbox, (void *)&base_rule_rsp); -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-01 10:41:02.572041011 +0000 +++ 0047-common-cnxk-fix-base-rule-merge.patch 2022-03-01 10:41:01.326244102 +0000 @@ -1 +1 @@ -From 0fb2b46be79a6558efd39c7a2e1d55402c958081 Mon Sep 17 00:00:00 2001 +From e09a0094a6025aed8cbe52b1a7b27280629dbb82 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 0fb2b46be79a6558efd39c7a2e1d55402c958081 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index b251f643bc..7a3a8944f5 100644 +index 82014a2ca0..a16ba3f7be 100644 @@ -24,2 +25,2 @@ -@@ -753,5 +753,5 @@ npc_program_mcam(struct npc *npc, struct npc_parse_state *pst, bool mcam_alloc) - npc_set_ipv6ext_ltype_mask(pst); +@@ -671,5 +671,5 @@ npc_program_mcam(struct npc *npc, struct npc_parse_state *pst, bool mcam_alloc) + memcpy(pst->flow->mcam_mask, key_mask, key_len);