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 9202F42D46 for ; Sun, 25 Jun 2023 08:39:02 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8E43442D10; Sun, 25 Jun 2023 08:39:02 +0200 (CEST) Received: from NAM04-MW2-obe.outbound.protection.outlook.com (mail-mw2nam04on2071.outbound.protection.outlook.com [40.107.101.71]) by mails.dpdk.org (Postfix) with ESMTP id 3CA7440ED8 for ; Sun, 25 Jun 2023 08:39:01 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=m2YyQ/zAanC3TvY5N2cU/QaFACKbzIICn5/9/OHkd/bZRFG4bset1cHGSWMKRIF/VqzXr2nNjUvCiyHAc/0c4Lh9lQ0gd5LM9aReq56HOKAg+uRf/2rsxaB2Qg5yrOtrs3AqVO9UPpvioMIDmYORC17B2lYzmoe81dC9nvDHSNZeQSYVqpkJAINd0O2KyEFnwqlIL4fmRwWdgf/rFfAznvGoVaFnqUszs+H5arB1URKJHifttW+UA28SCq6Gv5WdzwLH4jv+BkXrQDw7krte9U/ruQ7f0KFwaybxCb4/vEOFDWn+KknKuw8cmWLNtPyRXgqYUrXrt0/oEXHa+KXxSg== 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=m6+7aV2/Pfgg8NvkYP/s2P2NxqhmhfhrHFb8bZR8ohY=; b=kMJGruAoHCcsWT3wVW1acnwn1JtN7Q8jp2bRCKDivw59rdFR7Xz7959nF7T2Z+Z/9fwDZAzQ9CyMk0JDI7M5FQm9GeX+88GbRFho8VGhzh+bP3LYDYnQPnYnxpHq50aiTqW76NtRTY0dATY1wJIXUwhYQvIhUbqjOrECb5Y9NE0A6GxXlM/f/MMvJ6PpU4fUBpjipU6GMh8tp2IPE2fep0+9TwJPI+DmRDfex5xK0XlZXrGfX9at5n5CpPZl73dZNDumYqlThZVzA/fl181/zfYsL5E/8yG9N0Yf55hB4fL10clcqt9Vw4OKkcX59z1Lvj/M7oThpZK+eM6tkqAjZg== 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=m6+7aV2/Pfgg8NvkYP/s2P2NxqhmhfhrHFb8bZR8ohY=; b=O/GrTbR/jhUbAO1rgPwNLYpEJmEitwOoHqUI4ISGJyOCDZL36Rbuu+5pS1jDqPEWaiPPm7qZghXLQ71Gd0v8EA3b5j5bXI9awJBPXNYopnM3iPedk7RrAkwnzdjd1kq3JCweprvHWeKVYWU3j9/QPeda+klNlg863gRnOXVgAbm4B/vh0q9Jn5azdeorphTUTlky3cOqkf3Ciib19lrf9Xip9IC8rXTNNwTJA75Ni/vTXjlr05b0laDl1CSFXhe1LNvnkMr34PBON7rOHjtEhZEuLtnLDS8Fd8p8PAP9UmYpqHIeuyonIk92rdGbN5yI00jnl76/WcBSIK6V3kbRdg== Received: from DS7PR07CA0013.namprd07.prod.outlook.com (2603:10b6:5:3af::19) by LV2PR12MB5752.namprd12.prod.outlook.com (2603:10b6:408:14d::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.24; Sun, 25 Jun 2023 06:38:59 +0000 Received: from DM6NAM11FT055.eop-nam11.prod.protection.outlook.com (2603:10b6:5:3af:cafe::dc) by DS7PR07CA0013.outlook.office365.com (2603:10b6:5:3af::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.33 via Frontend Transport; Sun, 25 Jun 2023 06:38:58 +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 DM6NAM11FT055.mail.protection.outlook.com (10.13.173.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6500.45 via Frontend Transport; Sun, 25 Jun 2023 06:38:58 +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; Sat, 24 Jun 2023 23:38:48 -0700 Received: from nvidia.com (10.126.230.35) 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; Sat, 24 Jun 2023 23:38:47 -0700 From: Xueming Li To: Chaoyong He CC: =?UTF-8?q?Niklas=20S=C3=B6derlund?= , "dpdk stable" Subject: patch 'net/nfp: fix VLAN push flow action' has been queued to stable release 22.11.3 Date: Sun, 25 Jun 2023 14:34:12 +0800 Message-ID: <20230625063544.11183-35-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230625063544.11183-1-xuemingl@nvidia.com> References: <20230625063544.11183-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6NAM11FT055:EE_|LV2PR12MB5752:EE_ X-MS-Office365-Filtering-Correlation-Id: 2c1fcdba-cd0b-4356-3376-08db7546db1b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 56z/n/uiFXp3REkK+rIRNTxZyPBunprYobe4LwchmdHj0LtnrU4HKBgkDn/TZh7/ds1qnRRk5SxfAHdL5tvFU2TR/vXn9YveRNqBT3XOO+kYU/G/qAyFuNwPZh5ezUJaRB9/bFRbkdvKOMPA9PjIwDPwDGCBzs9WmQiBM5SRUsI+nRrnR+YVHi0apk///LjURFg+WzhYrg0o6DW9OQ4E6dfj2g4tKP8k0szCZN8ctZQuoLrSqr7YPEtTlEdU9OjRGFQzMmtgar/elDAZKRJvxCXHF2jhMtAKxX6eU4gtic+b3Zgk0qykXVqkNIIVX/9KTPKPL+hEMd4NmQu6IL3+OUXN09rlf+3dw8wlu/5dTRnXcxAMIKzNXYTfayfiHSdd3AgTNCMMgGrZlr5E58+EMsFEtFI5aazjmpQcO9hD+1YIIGkzN8ZxYrUxILLsqua2kftih6GH9vr8AeiMeLSwl/DIL7Q5YOfrqHiYwxI+wBtFSfg7S//02/BA0dKsVF3gcGYaRGZeKkKYrKdbTyI4f4xFkXCGu750lDkcY8R5XdC1FrqXBVNinV4Ts7oHiy/iZxgq6G2pjIhp6uWBAnvCNg36sNxHr2mZFkc0lXc0e+8S6GemFwu35jZVccB5aD+//He5hZ8vB8R4RGIpRjXEJtDql4IQt2nB8zTIxIgPgoVSHrX8WqIrdCncKvRR10wyT2/bpQq2reV8MpSzQAttCS/9r8KkYqk5kGzNZbHMsToJ3fFrwjed2OwxMGZ2AIgXYYe5Fo6X3m4p9zvy3hOHSptyMKjM1vl9abp88C3OnY0= 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)(39860400002)(376002)(346002)(396003)(136003)(451199021)(46966006)(36840700001)(2906002)(7696005)(82310400005)(82740400003)(6666004)(356005)(7636003)(2616005)(83380400001)(47076005)(336012)(426003)(66574015)(1076003)(26005)(186003)(6286002)(16526019)(53546011)(966005)(36860700001)(55016003)(40480700001)(41300700001)(54906003)(86362001)(478600001)(316002)(36756003)(70586007)(70206006)(4326008)(6916009)(5660300002)(8676002)(8936002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jun 2023 06:38:58.5804 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2c1fcdba-cd0b-4356-3376-08db7546db1b 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: DM6NAM11FT055.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV2PR12MB5752 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.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/27/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/commit/?h=22.11-staging&id=acbaa6bb5dfd4e8fe128d4c8d9503d03391b3dba Thanks. Xueming Li --- >From acbaa6bb5dfd4e8fe128d4c8d9503d03391b3dba Mon Sep 17 00:00:00 2001 From: Chaoyong He Date: Fri, 12 May 2023 10:03:46 +0800 Subject: [PATCH] net/nfp: fix VLAN push flow action MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Xueming Li [ upstream commit 2581c3bb634d905d4459ea15c3f6bd02b58069d3 ] When process VLAN push flow action, the former logic perform the mask and shift operations directly on the big endian data, which cause both the pcp and VLAN id are not correct for offloaded packets. Fix it by convert the data from big endian to CPU endian before perform the mask and shift operations. Fixes: eb9277cb2fd1 ("net/nfp: support VLAN push flow action") Signed-off-by: Chaoyong He Reviewed-by: Niklas Söderlund --- drivers/net/nfp/nfp_flow.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c index 50b166786a..432e19c357 100644 --- a/drivers/net/nfp/nfp_flow.c +++ b/drivers/net/nfp/nfp_flow.c @@ -2194,6 +2194,8 @@ static int nfp_flow_action_push_vlan(char *act_data, const struct rte_flow_action *action) { + uint8_t pcp; + uint16_t vid; size_t act_size; struct nfp_fl_act_push_vlan *push_vlan; const struct rte_flow_action_of_push_vlan *push_vlan_conf; @@ -2216,9 +2218,11 @@ nfp_flow_action_push_vlan(char *act_data, (action + 1)->conf; vlan_vid_conf = (const struct rte_flow_action_of_set_vlan_vid *) (action + 2)->conf; + + vid = rte_be_to_cpu_16(vlan_vid_conf->vlan_vid) & 0x0fff; + pcp = vlan_pcp_conf->vlan_pcp & 0x07; push_vlan->vlan_tpid = push_vlan_conf->ethertype; - push_vlan->vlan_tci = ((vlan_pcp_conf->vlan_pcp & 0x07) << 13) | - (vlan_vid_conf->vlan_vid & 0x0fff); + push_vlan->vlan_tci = rte_cpu_to_be_16(vid | (pcp << 13)); return 0; } -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-06-25 14:31:59.441941700 +0800 +++ 0034-net-nfp-fix-VLAN-push-flow-action.patch 2023-06-25 14:31:58.325773900 +0800 @@ -1 +1 @@ -From 2581c3bb634d905d4459ea15c3f6bd02b58069d3 Mon Sep 17 00:00:00 2001 +From acbaa6bb5dfd4e8fe128d4c8d9503d03391b3dba Mon Sep 17 00:00:00 2001 @@ -7,0 +8,3 @@ +Cc: Xueming Li + +[ upstream commit 2581c3bb634d905d4459ea15c3f6bd02b58069d3 ] @@ -17 +19,0 @@ -Cc: stable@dpdk.org @@ -26 +28 @@ -index 41b722f4d8..fdf5c0f40e 100644 +index 50b166786a..432e19c357 100644 @@ -29 +31 @@ -@@ -2205,6 +2205,8 @@ static int +@@ -2194,6 +2194,8 @@ static int @@ -38 +40 @@ -@@ -2227,9 +2229,11 @@ nfp_flow_action_push_vlan(char *act_data, +@@ -2216,9 +2218,11 @@ nfp_flow_action_push_vlan(char *act_data,