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 EA413A0524 for ; Thu, 4 Feb 2021 12:37:46 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E3F77240757; Thu, 4 Feb 2021 12:37:46 +0100 (CET) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id C82DF240757 for ; Thu, 4 Feb 2021 12:37:45 +0100 (CET) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1l7cxF-0005gl-Bm; Thu, 04 Feb 2021 11:37:45 +0000 From: Christian Ehrhardt To: Liron Himi Cc: Kiran Kumar K , dpdk stable Date: Thu, 4 Feb 2021 12:29:21 +0100 Message-Id: <20210204112954.2488123-106-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210204112954.2488123-1-christian.ehrhardt@canonical.com> References: <20210204112954.2488123-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/octeontx2: fix PF flow action for Tx' has been queued to stable release 19.11.7 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/06/21. 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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/79c6f9e2a5395da0e872ce3007b2508063ee47f0 Thanks. Christian Ehrhardt --- >From 79c6f9e2a5395da0e872ce3007b2508063ee47f0 Mon Sep 17 00:00:00 2001 From: Liron Himi Date: Mon, 18 Jan 2021 12:50:31 +0200 Subject: [PATCH] net/octeontx2: fix PF flow action for Tx [ upstream commit 701f94a60afbc7c3e28766cc88afa1b5397fdfba ] pf-func is 16bit but the current reserved location used in tx action is 8bits. Moved it to bits 63-48. Fixes: 32e6aaa97c40 ("net/octeontx2: support flow parse actions") Signed-off-by: Liron Himi Reviewed-by: Kiran Kumar K --- drivers/net/octeontx2/otx2_flow_parse.c | 5 ++++- drivers/net/octeontx2/otx2_flow_utils.c | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/net/octeontx2/otx2_flow_parse.c b/drivers/net/octeontx2/otx2_flow_parse.c index 2d9a5857c0..7a7cb29fbd 100644 --- a/drivers/net/octeontx2/otx2_flow_parse.c +++ b/drivers/net/octeontx2/otx2_flow_parse.c @@ -1034,7 +1034,10 @@ otx2_flow_parse_actions(struct rte_eth_dev *dev, set_pf_func: /* Ideally AF must ensure that correct pf_func is set */ - flow->npc_action |= (uint64_t)pf_func << 4; + if (attr->egress) + flow->npc_action |= (uint64_t)pf_func << 48; + else + flow->npc_action |= (uint64_t)pf_func << 4; return 0; diff --git a/drivers/net/octeontx2/otx2_flow_utils.c b/drivers/net/octeontx2/otx2_flow_utils.c index 14625c9ad1..1adeff2563 100644 --- a/drivers/net/octeontx2/otx2_flow_utils.c +++ b/drivers/net/octeontx2/otx2_flow_utils.c @@ -940,7 +940,7 @@ otx2_flow_mcam_alloc_and_write(struct rte_flow *flow, struct otx2_mbox *mbox, req->entry_data.kw[0] |= flow_info->channel; req->entry_data.kw_mask[0] |= (BIT_ULL(12) - 1); } else { - uint16_t pf_func = (flow->npc_action >> 4) & 0xffff; + uint16_t pf_func = (flow->npc_action >> 48) & 0xffff; pf_func = htons(pf_func); req->entry_data.kw[0] |= ((uint64_t)pf_func << 32); -- 2.30.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-04 12:04:32.393541580 +0100 +++ 0106-net-octeontx2-fix-PF-flow-action-for-Tx.patch 2021-02-04 12:04:28.126789822 +0100 @@ -1 +1 @@ -From 701f94a60afbc7c3e28766cc88afa1b5397fdfba Mon Sep 17 00:00:00 2001 +From 79c6f9e2a5395da0e872ce3007b2508063ee47f0 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 701f94a60afbc7c3e28766cc88afa1b5397fdfba ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 476195d634..e9b940f6c0 100644 +index 2d9a5857c0..7a7cb29fbd 100644 @@ -23 +24 @@ -@@ -1090,7 +1090,10 @@ otx2_flow_parse_actions(struct rte_eth_dev *dev, +@@ -1034,7 +1034,10 @@ otx2_flow_parse_actions(struct rte_eth_dev *dev, @@ -36 +37 @@ -index 9a0a5f9fb4..7ed86ba742 100644 +index 14625c9ad1..1adeff2563 100644 @@ -39 +40 @@ -@@ -944,7 +944,7 @@ otx2_flow_mcam_alloc_and_write(struct rte_flow *flow, struct otx2_mbox *mbox, +@@ -940,7 +940,7 @@ otx2_flow_mcam_alloc_and_write(struct rte_flow *flow, struct otx2_mbox *mbox,