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 DD78E428F8 for ; Sun, 9 Apr 2023 17:29:07 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D7C85410EF; Sun, 9 Apr 2023 17:29:07 +0200 (CEST) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2080.outbound.protection.outlook.com [40.107.244.80]) by mails.dpdk.org (Postfix) with ESMTP id 1037F410EF for ; Sun, 9 Apr 2023 17:29:06 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Di45MxbQiumjl4vd6z70TGrRuWp6Lf1RuHXbWO1ZrCytb4/HJkaA2xn28K580AOt0MtQtWIzKvJvmiUzsCqs1q6PsA3TcDbwV5W95TiczgGVgGsKqZINN5dxJyHwaTKJGx1W05ldGU2yifa3AqFcHFSn9d4h5qf5QSgQga/6A6rXlm4AND0oqJskiFHlL4im3KiFhi+Q5gf1a80Eyd2KHydkyQXi0CNOYdNWNhth5rPRASmGE1aS7n+wmJW2YOR8KKF6ATQqe/2Vat6DHJL/xa1jggH6IzxEozqDHRtz+xPBHnHZ7LYjAu75yIWfhtpTM6Jm46PC7QVYgHXcEG/zvg== 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=ik9gLFViakQIfAw1j+bKXERBhI7/sgspjPmFEbFTlkI=; b=d5KAKDbeSXoXunkbamP1UwPJrnRIU6HdHvyi3pvI4SPaUwqQ78Lvb4hMSh/c13W4376rJqm+C7Hblfs9wPzSV2Lx/cWY4foYqa5oRyfoS1IDtypFuRm9LTiFIvHUAeKmvaS+HxNlaCzIsXrtf8vDVWFApo5wkfB8TgG9AgAl36rUC9OEfhoEjQRpInRFoqqLm+/L+33OzKBdC/R05GRTxgAp5vFttrQRbLqTLqRqhkhmUuB4kihs1f2wUuxUBW/0EpeH0dw2OfHnGk6DwG47FWJvWejYIvExpWsI1Qk+Bi312y055cVjTlqsj1wOEBR2pNgbRgnDmAD3zb21jlCWow== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) 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=ik9gLFViakQIfAw1j+bKXERBhI7/sgspjPmFEbFTlkI=; b=FyKhGZ0rSViQ3tBbO6yRaTigO6NBZ9ytCbuRyNPy9SSyw+E+7+JB67YlYgryrrchFE8B9az3iP3rU4V6wqZBPwc0dHke0ICTtavwHCDx1TAL6+6AyeXylHG/kHZbExa7X3Fq+h0W8bcINBXU/rUZrAStN1e1MuNZ8T2lAX06xQ/DK6FsHsWfgXx3pQsGlHovUEPJ+cxEcs2TJB43K3C0ExFz4Iwx+nSJIwIUhnZW2ThIOgts9+Th9+xwgm7AODFPQeQDlG02lCNpce+ttcifARb8S7f0SO0hX9/t6xA/hXEs13tU5A2S30viV3EdTVGDdjzPs9rKlMraorFwVKyRfw== Received: from DS7PR03CA0048.namprd03.prod.outlook.com (2603:10b6:5:3b5::23) by MW3PR12MB4458.namprd12.prod.outlook.com (2603:10b6:303:5d::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.38; Sun, 9 Apr 2023 15:29:04 +0000 Received: from DM6NAM11FT018.eop-nam11.prod.protection.outlook.com (2603:10b6:5:3b5:cafe::69) by DS7PR03CA0048.outlook.office365.com (2603:10b6:5:3b5::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.38 via Frontend Transport; Sun, 9 Apr 2023 15:29:03 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) 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.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by DM6NAM11FT018.mail.protection.outlook.com (10.13.172.110) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6298.20 via Frontend Transport; Sun, 9 Apr 2023 15:29:03 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) 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:28:51 -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:28:50 -0700 From: Xueming Li To: Chaoyong He CC: =?UTF-8?q?Niklas=20S=C3=B6derlund?= , "dpdk stable" Subject: patch 'net/nfp: fix set MAC flow action' has been queued to stable release 22.11.2 Date: Sun, 9 Apr 2023 23:23:47 +0800 Message-ID: <20230409152529.5308-40-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: DM6NAM11FT018:EE_|MW3PR12MB4458:EE_ X-MS-Office365-Filtering-Correlation-Id: c6ccfb29-5c5e-45f1-043d-08db390f2694 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: h5Mne4r7yJwpiY0aTDu+sLxy80IAaTnUNX90R15hbVzcqcFXZZXaNNwJZarDtiyD6FPlPGaEuKiKtApa84Kl3otDdy/Jtf3+Pt/Cu27YkvHqOMAWZFNOMSOAyxqt3K0w6P+zXPNsC+JdYOW2Z3EOrGDcDXQbg4aineWNDdnISZ7qKBuBnDos+cBCEFvhIq7WnDsCWYNx4xtPxCJRDEhIGW+4tOwaO5rgy/5g2uPnWmWvdrtphjWzGOS1Fq1EDpj0F6vt1HBDqBIPQVf1mtc65PjmKFroB5lJEG+MChp0KLbgVQ5nNIxVTc14wanX1bebXNuytpsPJzdMEoUntyPqpHUdcQrgKQcV+BY02ktrSVCVsDRfdKlbLHIiKfMh6i5C48MszPhXeyeYfrQd26sSN/HApwBmPAp2Ayn0O3GDbRRdfSr7f34YlLiMBNbzNS2jWIS99lJLlPJZ0+J0xj8rnd5nic919PgoNRYpHleKbhhd2Jgb2HqVuuSFZz3DSS4T0MGlAfc54OuUTwCJhfRZx1gqN4DgCqHyKVu/GKjkT73FKlm6n4Pq6odDaTOb21LjyWGgQVGlBldiDGzsjy08gAzJmZ+zNYzSLCc0W4xbX6p2p9vKS7BfzisG7ej24YXyyvm4oqQJAbiynAjbQcQeOi+76zt4h7lMaoQMzfWCnSmdRia3uD6aBUa4Ra4l50+S6PkvXma+gImib7Se4gQxjrNIXlIQJNNYi1ic2n+JtirymbiMWRV4bqY+8ry/t5JdqbZ5kME7izgtwhVsbktaHqFjXdI5CuIilCXv7A9xeGng3Z3gJ5jrR8+xPUb8BS1E29SdxkyraPZCtQLP9vlaXA== X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230028)(4636009)(346002)(136003)(39860400002)(376002)(396003)(451199021)(46966006)(36840700001)(40470700004)(86362001)(36756003)(316002)(41300700001)(70586007)(8676002)(4326008)(6916009)(966005)(7696005)(70206006)(54906003)(478600001)(40480700001)(55016003)(82310400005)(5660300002)(2906002)(8936002)(36860700001)(82740400003)(356005)(7636003)(16526019)(6286002)(186003)(6666004)(53546011)(1076003)(26005)(336012)(2616005)(426003)(66574015)(47076005)(83380400001)(40460700003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Apr 2023 15:29:03.6178 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c6ccfb29-5c5e-45f1-043d-08db390f2694 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.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT018.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW3PR12MB4458 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/a0a1f437b298d6b23564dfb2d8cf10f3e9a66670 Thanks. Xueming Li --- >From a0a1f437b298d6b23564dfb2d8cf10f3e9a66670 Mon Sep 17 00:00:00 2001 From: Chaoyong He Date: Tue, 21 Feb 2023 18:35:08 +0800 Subject: [PATCH] net/nfp: fix set MAC flow action MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Xueming Li [ upstream commit ba2766c4203aa7d7be733eedd8f2ee785701faac ] The former logic of set MAC source/destination address 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 MAC address as expected. Fixes: 4f6983154570 ("net/nfp: support MAC source flow action") Fixes: eecc7ca3088a ("net/nfp: support MAC destination flow action") Signed-off-by: Chaoyong He Reviewed-by: Niklas Söderlund --- drivers/net/nfp/nfp_flow.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c index b3f4861ae4..51862d73d8 100644 --- a/drivers/net/nfp/nfp_flow.c +++ b/drivers/net/nfp/nfp_flow.c @@ -2055,6 +2055,7 @@ nfp_flow_action_set_mac(char *act_data, bool mac_src_flag, bool mac_set_flag) { + uint8_t i; size_t act_size; struct nfp_fl_act_set_eth *set_eth; const struct rte_flow_action_set_mac *set_mac; @@ -2073,9 +2074,13 @@ nfp_flow_action_set_mac(char *act_data, if (mac_src_flag) { rte_memcpy(&set_eth->eth_addr[RTE_ETHER_ADDR_LEN], set_mac->mac_addr, RTE_ETHER_ADDR_LEN); + for (i = 0; i < RTE_ETHER_ADDR_LEN; i++) + set_eth->eth_addr_mask[RTE_ETHER_ADDR_LEN + i] = 0xff; } else { rte_memcpy(&set_eth->eth_addr[0], set_mac->mac_addr, RTE_ETHER_ADDR_LEN); + for (i = 0; i < RTE_ETHER_ADDR_LEN; i++) + set_eth->eth_addr_mask[i] = 0xff; } } -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-04-09 21:45:39.791852500 +0800 +++ 0039-net-nfp-fix-set-MAC-flow-action.patch 2023-04-09 21:45:38.619042200 +0800 @@ -1 +1 @@ -From ba2766c4203aa7d7be733eedd8f2ee785701faac Mon Sep 17 00:00:00 2001 +From a0a1f437b298d6b23564dfb2d8cf10f3e9a66670 Mon Sep 17 00:00:00 2001 @@ -7,0 +8,3 @@ +Cc: Xueming Li + +[ upstream commit ba2766c4203aa7d7be733eedd8f2ee785701faac ] @@ -16 +18,0 @@ -Cc: stable@dpdk.org @@ -25 +27 @@ -index 0c38925701..f373171d7e 100644 +index b3f4861ae4..51862d73d8 100644 @@ -28 +30 @@ -@@ -2066,6 +2066,7 @@ nfp_flow_action_set_mac(char *act_data, +@@ -2055,6 +2055,7 @@ nfp_flow_action_set_mac(char *act_data, @@ -36 +38 @@ -@@ -2084,9 +2085,13 @@ nfp_flow_action_set_mac(char *act_data, +@@ -2073,9 +2074,13 @@ nfp_flow_action_set_mac(char *act_data,