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 C7C8C428F8 for ; Sun, 9 Apr 2023 17:29:34 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C2B44410EF; Sun, 9 Apr 2023 17:29:34 +0200 (CEST) Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1nam02on2073.outbound.protection.outlook.com [40.107.96.73]) by mails.dpdk.org (Postfix) with ESMTP id CDED2410EE for ; Sun, 9 Apr 2023 17:29:33 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mezTUS7riwws3qmpycpVuXP9NynsIk1VlSSkI8eXN63EpM1mG2nfCThZ7SoEcLLZ8dEdddIyEikqfzsmw6GkvPOm5rgzsDrGoDwbF3/1ors145yLpDDVhfiMkNmmZceXv4eBOsqETBKVR+J34IeUytV2aBKTLDvsxKVckoiZ9j6/41OhD+plA7Uy6XHJcsHrOji1sa1WMlAdk7bIcvjDGv2zkFZIZnj+5XDQKm7KD+ol170hfKAT6AzjzDYhe7EGxCQtAoYFKTytdoRvX0a24q2tln5tOLdny52YwT0fRJTeexvQ45jVSps2MDQDHv2tKLoqJ7lxXX6LnMFR8JIR5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ITuaPBF6XDN1CmLTSpdlUSBlim9eVMohru5upoXOJL0=; b=mhaE5Y0oQupRaimTyWe2RJtOBPjKW72X8VoFOGvOFd7Q2NSZl/I0wM8ZW+a8OKzUFnFXxPPoJdgJwKZH5SnD7dD5smUL4Ppoxja73Zqp1rzicnDe6xLW6Q2o78hfZ8QH25RvQzopzFJ1kK4l0w+IaJQPfHbU60kbStMzc3CKh1Tt+iF9engpdRiNYdGDLE2MvRJxWhxWlJhFjAAV5/dcH4gsnfd3+BVceoQ20W/C+X+h1GmP32XJ0PzeLQn627iZXw7iowyszyAb/wEZ8CHG41+Q5qZvkW2lAA7svnNY4g+o9Nsz8d0eFoZAH/scSx2QXNZmNwv7VvM/+axyb8dOEA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=corigine.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ITuaPBF6XDN1CmLTSpdlUSBlim9eVMohru5upoXOJL0=; b=Ik9soJwm3O+u3goM7rRbQk2AkLAlF1WAQgVttgGFKLMzD1ySsQg4zVbdgTBP5Jmr/dQs+a4iQ1Hea2wk5gpH/3h7OnXbK4b/PSCg03aXIVY9BBw/LeGexMM+V9jHhz68XiMbuqaCrEG42ZMXUHP91Z6RR5mM/LzwtOE7lGDQEtfVZw3oU6r5BevV1uYmm5njVJ+/bBqNm+q2n90NQ+qCi21XR7ofpvH5/dnr/BdLi5WgqlyLfy1WnybR7WTOGfGX1MLkzbnXdPYDywuAn/r1EWtaQTJbSeccGA8+IaZfyXoNC1xp/HCcmW3Y5bDRkCrfoQgzbbUHXC3CGGUnDOPAqQ== Received: from BN8PR16CA0008.namprd16.prod.outlook.com (2603:10b6:408:4c::21) by SJ0PR12MB5673.namprd12.prod.outlook.com (2603:10b6:a03:42b::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.36; Sun, 9 Apr 2023 15:29:30 +0000 Received: from BN8NAM11FT050.eop-nam11.prod.protection.outlook.com (2603:10b6:408:4c:cafe::20) by BN8PR16CA0008.outlook.office365.com (2603:10b6:408:4c::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.34 via Frontend Transport; Sun, 9 Apr 2023 15:29:29 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by BN8NAM11FT050.mail.protection.outlook.com (10.13.177.5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6298.26 via Frontend Transport; Sun, 9 Apr 2023 15:29:29 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.5; Sun, 9 Apr 2023 08:29:14 -0700 Received: from nvidia.com (10.126.231.37) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.37; Sun, 9 Apr 2023 08:29:12 -0700 From: Xueming Li To: Chaoyong He CC: =?UTF-8?q?Niklas=20S=C3=B6derlund?= , "dpdk stable" Subject: patch 'net/nfp: fix set TP flow action' has been queued to stable release 22.11.2 Date: Sun, 9 Apr 2023 23:23:50 +0800 Message-ID: <20230409152529.5308-43-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230409152529.5308-1-xuemingl@nvidia.com> References: <20230227062349.13764-1-xuemingl@nvidia.com> <20230409152529.5308-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-Originating-IP: [10.126.231.37] X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN8NAM11FT050:EE_|SJ0PR12MB5673:EE_ X-MS-Office365-Filtering-Correlation-Id: aee9574d-f8d5-4ff9-0e21-08db390f3627 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: e3qUYuyCcBAD9Y24W2z61MTeXxefvuWxyaDa+NrStCSjgcNZCJgO47K+99RqS5FcAkHAuVp6kQMIsbHfap9VeFghyjvuaIlzfBsZs+X776/bjBWSv9fckuOKGGJt6XIcfYzXioIDfFzAeaEJ58Wa9pXMeRw5EABZlQBQ7U2hIAyCdfhYq1S9p2DGnVQ93ZIGSeiUWsuD3mjaBcinfliNTUaVbAKeQSMnXwcHak3O8ZXXGykJMlaFAWn5fRjUZtOqz7SfGgqqSIIDTREhIuj9NEM1DfaQMrxPbNVqFp9sE/zRvIoWnPdZwth+AU2/6jekNIMAphG5y6yrGbsXAkrDedoV3Cm035ul00VE3LrTmJl0W+vdz4ijZB1qMCwH1Jdq1HK1cwL04hOkhTpr1ejIaMfuDp6Nv5tcFl+auu9A2kkffoU7TRA/wA3MS/b3Nv55eH7e1QedrXuPmk5R8sJA9d00NS1sg8SlQUU101E6Yj3yBHosO3iA8WE13Lf2XAmQRiGrue2W7RuJ667DqLHEnn1XHeRqvLbw0EC4/mD6ZRBkAdrB7CCfBGC/TADGcoGGkG79MigoHDdBhcZBgDjHVC5sW8FHyCgHXPsOIPo4hE1tDTFSTnq+Efj2XxS5D2hBHmQqsnkF6EH8hfq9vo4aRzM0MC6+WIGcFKGFulVORi2ZMzge7JMUW0d6bo0lR+uNiUpeZ5ECY4Xz6sWLtzsNuCchmxVmi2snf/GUs05Bm/bqUiOo9unOr1Ljv12t2bw/O6bJj1EOAxLe9CW8Kfh5hOvlvcuasjKg2VPEz8+V02+yFwebHRob+9sI1KQIX130+6J5U7ypJYu7vBizPZvFHQ== X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230028)(4636009)(376002)(346002)(396003)(136003)(39860400002)(451199021)(36840700001)(46966006)(40470700004)(55016003)(8936002)(6666004)(7696005)(40480700001)(40460700003)(966005)(5660300002)(86362001)(70586007)(70206006)(8676002)(6916009)(4326008)(478600001)(316002)(82310400005)(36860700001)(82740400003)(7636003)(356005)(54906003)(2906002)(53546011)(1076003)(26005)(2616005)(83380400001)(66574015)(47076005)(426003)(336012)(41300700001)(36756003)(186003)(16526019)(6286002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Apr 2023 15:29:29.6840 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: aee9574d-f8d5-4ff9-0e21-08db390f3627 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT050.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR12MB5673 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 22.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 04/11/23. 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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/log/?h=22.11-staging/commit/264cbadbee9a059d2f0f408e2fbc2f3b2ada2113 Thanks. Xueming Li --- >From 264cbadbee9a059d2f0f408e2fbc2f3b2ada2113 Mon Sep 17 00:00:00 2001 From: Chaoyong He Date: Tue, 21 Feb 2023 18:35:11 +0800 Subject: [PATCH] net/nfp: fix set TP flow action MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Xueming Li [ upstream commit 050851abe07671dd4ec501d4f211fc45ec0795f3 ] The former logic of set TP source/destination flow action don't consider the mask filed of control message passed to the firmware. This caused the firmware skip the set action logic, and the offloaded packets don't have the right TP as expected. Fixes: fc185097bbe6 ("net/nfp: support TP source flow action") Fixes: 87986df09d75 ("net/nfp: support TP destination flow action") Signed-off-by: Chaoyong He Reviewed-by: Niklas Söderlund --- drivers/net/nfp/nfp_flow.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c index d6ab0a1e8d..dedc2d2dc4 100644 --- a/drivers/net/nfp/nfp_flow.c +++ b/drivers/net/nfp/nfp_flow.c @@ -2179,10 +2179,13 @@ nfp_flow_action_set_tp(char *act_data, set_tp->reserved = 0; set_tp_conf = (const struct rte_flow_action_set_tp *)action->conf; - if (tp_src_flag) + if (tp_src_flag) { set_tp->src_port = set_tp_conf->port; - else + set_tp->src_port_mask = RTE_BE16(0xffff); + } else { set_tp->dst_port = set_tp_conf->port; + set_tp->dst_port_mask = RTE_BE16(0xffff); + } } static int -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-04-09 21:45:39.865085600 +0800 +++ 0042-net-nfp-fix-set-TP-flow-action.patch 2023-04-09 21:45:38.629042200 +0800 @@ -1 +1 @@ -From 050851abe07671dd4ec501d4f211fc45ec0795f3 Mon Sep 17 00:00:00 2001 +From 264cbadbee9a059d2f0f408e2fbc2f3b2ada2113 Mon Sep 17 00:00:00 2001 @@ -7,0 +8,3 @@ +Cc: Xueming Li + +[ upstream commit 050851abe07671dd4ec501d4f211fc45ec0795f3 ] @@ -16 +18,0 @@ -Cc: stable@dpdk.org @@ -25 +27 @@ -index d1fe744758..5be4c4f18a 100644 +index d6ab0a1e8d..dedc2d2dc4 100644 @@ -28 +30 @@ -@@ -2190,10 +2190,13 @@ nfp_flow_action_set_tp(char *act_data, +@@ -2179,10 +2179,13 @@ nfp_flow_action_set_tp(char *act_data,