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 EBAA141CF8 for ; Tue, 21 Feb 2023 07:50:06 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 831C8431A6; Tue, 21 Feb 2023 07:50:04 +0100 (CET) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2102.outbound.protection.outlook.com [40.107.243.102]) by mails.dpdk.org (Postfix) with ESMTP id 96B89431A6; Tue, 21 Feb 2023 07:50:03 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lm11CPg9z7g0yE3M0v6wchLVSrbi74k2S/GxpVnyl9fKiHCLo8TszBE1v9/AAlonbuuIa3s46CxF4KKP+7buincUVxnzErNQRrZV7dpBIqJ5oVgV7K1tnL1YFv9TsRShmmFO6qxJ/U7LuaNORwDky6Q55co3Cff2R6T6E/gpOoYm0P8gPCwQQY3jsqYTPx78a7lAxDCAPAEHUOUp1jWP7pvsuz+suYTuSVazAL/5E5Fqw3Z+g54JhO2At5holKpQxsUujUieMZP4TT4FZZ52CFYGNDKwSk8YsWLqhUHxwaHNN3Hzjj7YtioRHF5y30CSHQh3KpKg8ElABQG5QslrtQ== 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=7CwuZbTNEVTEdxHvau5BXugEPtUlAPIJu+1Ed+GqX3g=; b=irB+38iy9W4hJW1UubRbUIq3Sd9Nmp56N9slsDHyJyS6WWeudAsq9HOBSoSHFRdTdu6Iody6coqlnAoStAS9tFt/HYHpGBGxgMf5+Q/cSVMl9BbkV3F/AgRSjPj6IKBlEz5asa7shvu0rbid4jH6y0/kRuvs72iQkqflPxL9AvBeGPUa+MN/2GSsyPkE/pmmlJe9mrNR2oEgc6y1dg0vEnMtEFxrHpaYg8tG63MftSCebFflYEyp8IuEsakPcXkYGC9RWZWlA4waIhjV8xdklMdeCs1gmY0Rd3RFXVdso/YUjRXP3rRViiXaLVELijqg+lOvOT0SToj0ioGqQsI7bw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com; dkim=pass header.d=corigine.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=7CwuZbTNEVTEdxHvau5BXugEPtUlAPIJu+1Ed+GqX3g=; b=rCdxTuLjcFl+6Az51pUZrYUpB72i0y+9YfEgDV2aKEgGcv+Q0Umr7IDFC/NmT+Bo45zCqMQaGXgni1F7FnklcsC/xtOfniQj8RbN9wXxuK0SS5hEexpHTEsjcQdHaonM2sexQbQlA4ZVrvSgHriwUNQrivmTZWra07UKzDqwNsg= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) by PH7PR13MB5455.namprd13.prod.outlook.com (2603:10b6:510:139::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6111.15; Tue, 21 Feb 2023 06:50:02 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::7ea4:e421:5dd5:9f4d]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::7ea4:e421:5dd5:9f4d%7]) with mapi id 15.20.6111.021; Tue, 21 Feb 2023 06:50:02 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He , stable@dpdk.org Subject: [PATCH 6/6] net/nfp: fix the set IPv4/v6 DSCP flow action Date: Tue, 21 Feb 2023 14:49:30 +0800 Message-Id: <20230221064930.3399-7-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.29.3 In-Reply-To: <20230221064930.3399-1-chaoyong.he@corigine.com> References: <20230221064930.3399-1-chaoyong.he@corigine.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-ClientProxiedBy: SI2PR02CA0049.apcprd02.prod.outlook.com (2603:1096:4:196::7) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|PH7PR13MB5455:EE_ X-MS-Office365-Filtering-Correlation-Id: d3c7333f-d82a-47fc-6971-08db13d7db17 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jQpa+KnB1Q6PTCc8oesrZMC9tAegjeEhg05N/j0Sv8NJBs6CW0xEcODtE7zyQbR/hKgieOEDCQfb0jwiDkIyYjPiCoWsM/uRtmHzTTUuBznKAzQPl4XkjsjdGTwBD6DnyTMciKoc0H3AoaUYDNUnxxOBvOVZLW4FlFUI5FaDKntwNgBhfLhmnbXtm/PuShQFWqbQjctswDdtZOa5KIL+xDhGqYY/eAr1lP8fFzLORTrrbE0g/pX3MUWy/YDwKFBaZqItf5AYxUsWKzYi24DPSnkpxq57bOu8NG8406C/Hz9TEiH7xVJJcr9SNk5WuWDENT7dpzJ0rV8Lqb2p/Hfp3fbJgSD5UO9wOSmcZGRwlDe+tbtyKRsX+e+aIPT6RDas8OfA5Qv5saDbwQv/QDxcJwvtMFzPPgy8Vs6a2zvpBtHYiy/RSiwSwnv8pkZshS0KcI6OzCkPqCXbRzsEuoquGo4QhmmjZWVsAceG6tKZeUNPqPV3OdfKtFwwxP0PFHsNYVAU/fBcthZ5S5FviMweUriJ4801u2gUFVRmxRS+Mq6yEC2LOxfUZItfJNvX3glZIRlQv0mYyjXUzTU6uNYCqYn7eTOtwL+9n15SPPGTEX4OJXKpcp3IY4rblnHoh2DtmL9VcnPwO4JMalseoktlgdKbJNE0k7yXg4KZO3TbkMbESdH5Dfnn4TMXZ+NYNMHxCm1RnQeQv0dX/0/+uNapwg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230025)(4636009)(366004)(39840400004)(376002)(136003)(396003)(346002)(451199018)(6512007)(41300700001)(450100002)(2616005)(66556008)(66946007)(316002)(8676002)(4326008)(5660300002)(8936002)(6666004)(6916009)(66476007)(26005)(478600001)(52116002)(6486002)(6506007)(186003)(83380400001)(36756003)(1076003)(86362001)(44832011)(2906002)(38100700002)(38350700002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?T2FiUVFsVkN4TEJKSTJMcTlmUEc3a0toM2VvTDRiTVRuUEtYZ3BISEMrTTlL?= =?utf-8?B?d0E0Wm9pTjJMWmluMmFSak1NTG1Lc0YyTzZFdFk5d2xRZXFzRnJxa0xJd2ZG?= =?utf-8?B?YmFGMlBBL05xdlg2Nmt0Z0NXZ2NDYjMxU1Y0cVlkZ2V0eEUrcGg3Y1lCWW1X?= =?utf-8?B?SkJCdU45cC9jYldYVmVOdEEvRTZOdjhIek1jby9HTnNBdDd6MGJpaEQrTXhX?= =?utf-8?B?cGpseFJId2RaeTlKWTE5VDAvM1BqVFZ4Z0daNjM4cHNmdmIzNUF5dXJDS2xv?= =?utf-8?B?V0FscUxjbm1FeGdmMUlpK1BRR1ljWElDTCtXRVZRQTNKQnRVUnByVFQ2OVkr?= =?utf-8?B?NG1EMGJzeXVnTnNzc3RIeXpGbkFwWHRlUmhubldRSEg2ckZXVXpkQ2xScWhh?= =?utf-8?B?RDVnMnp3bnlIeWJuMXZuTlF1WWYybVJoellhejZOTExEaGpuV1BhUzJoeFEw?= =?utf-8?B?b3dXQlZkRnVtM2RBMUEzaHV6aTArN2RXRnNlSjdzTHlqaSt6eEw3aGg5QXUw?= =?utf-8?B?MzkwRXpFMmtESTU1YitnY1JGaHUwKzQrNTVHQlhFcUtxaTg0ankyS2pjUU85?= =?utf-8?B?Y2Y1RkhwaXBaNHAxcDl4SmFCSlgwUXp2UkdOTWpiK1ArOGhVUnowdmlpY2xi?= =?utf-8?B?NXpjenkyYUk5aXljaW1OV3pvSFhESVdnM3p5eHVGdjFTVTBOekNSOGtkRFZz?= =?utf-8?B?a1NMTzNieEgzUXpPTTJwRW04a2xxS1pVcUl0V1dqZ29IeC95ZzZsclkxQ2F6?= =?utf-8?B?YnhDZEFBUlpjM2NqTGhGb3JPZ3lXS2pWWEZid1JiWnBYbXUzNTk2QTRYMTdE?= =?utf-8?B?WlduNXpENFRPVDVucjVJRllSbndoYnJlUkNleVRSM2IxQjBWeHM3Yll5WG5P?= =?utf-8?B?dWdSMXRjam4vUnFxcnFzQ3llaGVLUnVpRHZEYisxWjcyd1hrYm4yQWk4c3pQ?= =?utf-8?B?MXFWRllQMXFuK2NlT0hJSzhrREFnekxuakMwYmMrUzV3NEtJTEtGVk1uMVpS?= =?utf-8?B?WWxMVzBkUXdEcnhkK2J3RzlFeFY3SzFaWTViMUhIc2c1ZGpuTnRKY0dMTU9i?= =?utf-8?B?Q2FhZjlqMFpBN21waktlMVdXT2k1alpTbEhjeDFlVWxQQW9yOGdjVjJpbUFX?= =?utf-8?B?VGlDWVpaZ05kUlpEcVYrWWxKWjZUbmFwL2dmZmxsOWZIQVVzWmtNakY0SUxa?= =?utf-8?B?Y1VEcExVZE1yaG5IZXBQMUNOZHlvNklYTVg0Q3gwcWhwY1poVGgvR3Jja1dJ?= =?utf-8?B?cTVEQVNxQ2JNUHBZK1QwMkdUUEpScmVWTTVRQmpBNWdEdUdqS3ZtWHpJTTFy?= =?utf-8?B?RVk3ZjRNS0FWSXExOEU4djZIV09ORmx1TXh1UW1uMTBQeHFYekUydGJiK041?= =?utf-8?B?dnpIVEM1Mm9QcG1MTmd4UExIM09leVBPdVltbzBoalVXR2svZkpDdVFsVTU2?= =?utf-8?B?bHRNZ1ljN1NuaGtDaE1IcXhOc0hvc3p6ZnBvOW1scGxVajY2WWpmYjEySXNm?= =?utf-8?B?V1RSUFg3RHZvV3lkc2NiS3VudVVQYU12RUp6R1hybmFRK0o1c1JGdnlzUUZQ?= =?utf-8?B?RkFCR1AyNENUanFrc1NQdHNqN01mR0FrdUtibWM3TERSaXFTSm5rMTJCNjhY?= =?utf-8?B?Y0RGK0FvZ3hlTmptVUV5S2Fnc003YXlmck1EL3NCZXIzVzh5aGkwVnJaNWlB?= =?utf-8?B?MzQvbC9uTTQ2NnRDTkRpUU1JMkNHUFV1WHozS1p1Y3pvQWd1RXphSENiRzc3?= =?utf-8?B?RWhWekJtM0VDTFNxWEcwKy9EVGdSd0grRHQ1UFZRU3lvTHlJTkV5R0dtNFJn?= =?utf-8?B?YktmVmZvQlBRVzdodi9ka2pncGJEUnlHWWQzYnF3N1o2ZkxxUWJmUVNVZi9n?= =?utf-8?B?bWpQMHZncVR5eU1ZNjJCWHZJN0NUR3ZXMTNjT0pLQnNZWUZieDJ2VmJCYmg1?= =?utf-8?B?TjBRdEFFaHJtM0dTcjZNeGpVdzFIZ2IvbkNldjJkTTZCbW5KMERFTkkvTzdp?= =?utf-8?B?Yzl3dmYrOWlvNW9zeElVTkxWYk1YNXExaHRWa3EyT2FJR1FCbXJMUVFmSW16?= =?utf-8?B?NTJZbGswWlB2ODFkdlJDYnp6VG5yazJDRzlpUkVIdVFhN3ZNcXVrV2grT2dY?= =?utf-8?B?a2IwQzd0YzZaWUY1L1dkNjVMVDlYaDQ1Y2luZG93OFpYZUUyTVFJbjlVMnoy?= =?utf-8?B?QXc9PQ==?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: d3c7333f-d82a-47fc-6971-08db13d7db17 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Feb 2023 06:50:02.1759 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: fe128f2c-073b-4c20-818e-7246a585940c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: M4AfCTIyXkmQCzM9hcrgMvHBfeoVeZtF8CDVWDJlBm+ZU866RYzbFRNq5OPT+D66COqH4KJGWLD/6x2Rtc2HKng4rXIVfCLCAtPv4OQPDB8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR13MB5455 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 The former logic of set IPv4/v6 DSCP 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 IPv4/v6 DSCP as expected. Fixes: 9c665d70f7a7 ("net/nfp: support IPv4 DSCP flow action") Fixes: 3202b003bec1 ("net/nfp: support IPv6 DSCP flow action") Cc: stable@dpdk.org Signed-off-by: Chaoyong He Reviewed-by: Niklas Söderlund --- drivers/net/nfp/nfp_flow.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c index c6e19d8cac..c8c57bc363 100644 --- a/drivers/net/nfp/nfp_flow.c +++ b/drivers/net/nfp/nfp_flow.c @@ -2300,6 +2300,7 @@ nfp_flow_action_set_tos(char *act_data, tos_conf = (const struct rte_flow_action_set_dscp *)action->conf; ttl_tos->ipv4_tos = tos_conf->dscp; + ttl_tos->ipv4_tos_mask = 0xff; ttl_tos->reserved = 0; } @@ -2323,6 +2324,7 @@ nfp_flow_action_set_tc(char *act_data, tos_conf = (const struct rte_flow_action_set_dscp *)action->conf; tc_hl->ipv6_tc = tos_conf->dscp; + tc_hl->ipv6_tc_mask = 0xff; tc_hl->reserved = 0; } -- 2.29.3