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 0DF1BA0524 for ; Fri, 5 Feb 2021 12:37:45 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 083F54067B; Fri, 5 Feb 2021 12:37:45 +0100 (CET) Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by mails.dpdk.org (Postfix) with ESMTP id A47B1188A48 for ; Fri, 5 Feb 2021 12:37:42 +0100 (CET) Received: by mail-wr1-f45.google.com with SMTP id p15so7285976wrq.8 for ; Fri, 05 Feb 2021 03:37:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=yl7METdIH1qcEVK5/04MbEMrkNEAkZSJ7/e49RSidgo=; b=XDuPGt+htJS6lz18ZnNbZsCjayL4ZEMEcmVtuKWaOAhh8vn2uHE64c9TpErdSpYHn9 cerpbWLEsgL+WQfekz5XnSGQNl1ODc4LPmhw5zpYLYG6Cyf7BuVRXOSdUjg2Gcfz1Nm4 QvqYuXmEPxjdukGSb7chxV+z0i/qR+jX+i+kwdtG0m6tlwmqNLT3dyjLuZFSvFcRPpgu VIUXq9XO9pntUTxVZ03arT2v/SmJgeqvfZqPwtFpXHBCGAq2V8gCg5s59dUTtqIa8yvf kkFKW/VGKyTAogJJq8BYoEgfXYnmHSL9jG9lyVez7SzF3neftlNS41sUhkMYrpL2Wtx6 xfMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=yl7METdIH1qcEVK5/04MbEMrkNEAkZSJ7/e49RSidgo=; b=dhgTR+NaqCm0sWwb144rH+wB8IgPwi/beO7ubZirMKM8RsMCwwuewoULnXZ5PCaetc dO+W/1quOzeVymp4BhoOSmBpsFJKvsJjB3PckMf+ImLhpWVFf7xt4ggP7hFnZC4NP2Or t/3OIFDneBtIyWI/I/AVynXtqWooc5wCmutWwIWBE/QyjumpnFprz6h8CM5JleP4s6hk bge3NwUgeTA3pabxjC1iQ3XQ4XwvbEjJciXd828ST7NSpvIYlTNNSBBjRbgG2DKF7cMH heSPNHLUZJ/fIWrt4+xNDpuRouLj725INdWnkv4/ZrR1ZRMyKCx9YM2S7MAbe6V2wjSF aCjw== X-Gm-Message-State: AOAM5318zaAETFZ6ICqk4iE0iDEITL72jUcPgOWVHdR/B3xGc75UCsLM NOR25qWR5r4th003SZqUSxk= X-Google-Smtp-Source: ABdhPJwxTA76qbtfrkszf0alNUAkzYtoyc4tStaWCs9dJ1Ckd4PjQ2/EkBrRpPrzQsrej4wNAm9wrg== X-Received: by 2002:adf:f8c1:: with SMTP id f1mr4581006wrq.76.1612525062418; Fri, 05 Feb 2021 03:37:42 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id d13sm11563103wrx.93.2021.02.05.03.37.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:37:41 -0800 (PST) From: luca.boccassi@gmail.com To: Liron Himi Cc: Kiran Kumar K , dpdk stable Date: Fri, 5 Feb 2021 11:18:41 +0000 Message-Id: <20210205111920.1272063-235-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210205111920.1272063-1-luca.boccassi@gmail.com> References: <20210205111920.1272063-1-luca.boccassi@gmail.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 20.11.1 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 20.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 02/07/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/56aaa9bff17f21ac51eac7402a9426be5982eaac Thanks. Luca Boccassi --- >From 56aaa9bff17f21ac51eac7402a9426be5982eaac 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 476195d634..e9b940f6c0 100644 --- a/drivers/net/octeontx2/otx2_flow_parse.c +++ b/drivers/net/octeontx2/otx2_flow_parse.c @@ -1090,7 +1090,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 9a0a5f9fb4..7ed86ba742 100644 --- a/drivers/net/octeontx2/otx2_flow_utils.c +++ b/drivers/net/octeontx2/otx2_flow_utils.c @@ -944,7 +944,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.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-05 11:18:39.532833850 +0000 +++ 0235-net-octeontx2-fix-PF-flow-action-for-Tx.patch 2021-02-05 11:18:29.218698956 +0000 @@ -1 +1 @@ -From 701f94a60afbc7c3e28766cc88afa1b5397fdfba Mon Sep 17 00:00:00 2001 +From 56aaa9bff17f21ac51eac7402a9426be5982eaac Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 701f94a60afbc7c3e28766cc88afa1b5397fdfba ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org