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 2D157A0560; Tue, 18 Oct 2022 05:15:23 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 655864114E; Tue, 18 Oct 2022 05:13:40 +0200 (CEST) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2097.outbound.protection.outlook.com [40.107.94.97]) by mails.dpdk.org (Postfix) with ESMTP id CE85242BC8 for ; Tue, 18 Oct 2022 05:13:38 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OkzSI84XzudKes1R0GSla/ivLzvQbS9t5EPwCcd/UVSUDo3bmsDSr8dfwVnzyVoAd1ozvBzMwy0SBjJRdHZz0IlJQ1Kyaf/vCqrO/EDjYfkDiIxO7gwVCCpLLi68ZdG59rr/6XuJ/Gnw3XsFgQfS+eOgQ4qqFdL7U6cIlVU8+GxfGeguYhkUQ39TAxKVlJXRg63t0yCx2ManJh468ctuY4wn1XY5LSDu1Dc04w0a5WLgAPxAoh2LAeE5euhX0vCIm/4l5lMOy4jzcKBo4yCGALGXydD2xPpenOQERSvJsCVtpaqfKbr+hk2yGJi7VP1V/7Q0AHSVZuPHY0byWAq23g== 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=/6NsnwTZqgnOaA5NQ3vy7yWAkNGQl46pjgKBCBcVOwM=; b=NnVsxrnYtsS+55hIFavgau6JylJ4zBIBVfrK3giBwEQIsTNdwXEX4wQsSvB+qNTCqR62r6BMSRW+ZS2Vqn82g8HHLtKplhMX+eOwQIeU64cHZNe3DP9XkcETTJrMcNL9F+zAw4nmxCxz3yMqeSTsQ8enHUGxqhfkFLpwFE8JZDEaWHv1XX5T3ea983VZXAtyo64hYP9oXwqrmjl3P1No+g4U2nSV/X1agju5JyVBE32zudHrXdzQlciN5ti2VqH62iTGTURCd3/LvVDLAXWZ35Oveg3xg+TQeZWevJ5skRq3l5FTacbvX472Iv+5+W3KZSfPE1xdlTjXcR0nLyTUkg== 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=/6NsnwTZqgnOaA5NQ3vy7yWAkNGQl46pjgKBCBcVOwM=; b=aaLnHjV91Bjah40EZBDPyj1PqPsudcTc+kCOdy01/VsUU2scw69Px4UD8ND3N6Kuq7ivH1Chy4twWdjOFe31jU9QnQ0dDQ/R+JABsva/8eshAzBKPHxI1drEjoOiittDMUQTrF04DmPP2cVqbBjjU5N4MlN9Uxh23itTSsFei3M= 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 SA0PR13MB4093.namprd13.prod.outlook.com (2603:10b6:806:92::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.20; Tue, 18 Oct 2022 03:13:37 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::7c26:1a0b:2825:6f4b]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::7c26:1a0b:2825:6f4b%4]) with mapi id 15.20.5723.014; Tue, 18 Oct 2022 03:13:37 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He Subject: [PATCH v3 24/25] net/nfp: add the offload support of set IPv4 DSCP action Date: Tue, 18 Oct 2022 11:12:31 +0800 Message-Id: <1666062752-33689-25-git-send-email-chaoyong.he@corigine.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1666062752-33689-1-git-send-email-chaoyong.he@corigine.com> References: <1666062752-33689-1-git-send-email-chaoyong.he@corigine.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-ClientProxiedBy: SI1PR02CA0010.apcprd02.prod.outlook.com (2603:1096:4:1f7::17) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|SA0PR13MB4093:EE_ X-MS-Office365-Filtering-Correlation-Id: 13e79a09-75bc-486c-8543-08dab0b6bf70 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4F0x9BhmnGHZ3ajOvHqLXLQXfzP80k/bZ+msdXY9TX/X07KHaNhZ/I9i6KGAHw7CWhtBNCGqqfDWuFm+2kRGqeQ3K9D0gPP3YzczBU+Pekr0yT+ZMToAOJhYtFGz4sq68TmgqCsyrJMSFxiO91oWW7ZFdmCtv2Kyjf43OLOjsx4ZcU/Il4rcW31cDWs9IXlJwbZ5tlhFm3z8rdqVB/pFCxPseRrQ0xtbnjXlFumzlMkkwW/v9AsZQ9D1C08LmLynwYchBlEZqEhwgzKtQYw49Z3Cg3MGI5foFuyLYYrmhEJwA4gUy0PVujwRWUYTCw8xnWU2HjJe97ZtqlPIQeTcBgZFHhp5MaNShWofbRd5w3TZ+mGl1IXL8gPT/QOOlDjEThxui2odTy1ILfK3V2J/QbZwNFNDyg+mkYUwTgM39fftGim+iCrSRd3NWQpVrkyd+D8Pp1OaAoScLBS4I6RrPtFBZo3YQ03tniVgSwnGI5Rbe8jvMgisduuyeRmHE4oY9gRdMD+HZOPRsr9d5fN3jIbKTi/qgwK7D9MjfP9MUBJB3eo3oNjgCcNsP649UmSgdC2cFHWKuF1jJdil0lz9hpuSKyKFb69F7iDGICY6NgFff/Zl05J8lVyLuWEyBpYQs3AddZOdxcq3cMyBKqCN/xcZ919EJL8C+W9NrbTGG08dmfSiLWn1Ig9go2XNMrVfnU0V4S8u9lB1fTCoak7gozJNFRLXTfZb2wDm751vx67AIPuPDNVkHH2cSh+mRUQD9jJzVj5f+uqXGRRA2LajQg== 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:(13230022)(4636009)(39840400004)(136003)(376002)(346002)(396003)(366004)(451199015)(2616005)(44832011)(316002)(52116002)(6666004)(5660300002)(83380400001)(6506007)(26005)(107886003)(6512007)(186003)(6486002)(66476007)(8676002)(66946007)(6916009)(41300700001)(4326008)(8936002)(66556008)(478600001)(2906002)(36756003)(86362001)(38100700002)(38350700002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?WE5nNEtrNHhzZmNMb2N1NWN5WXhmRmU0NDY1NlhlLy9oNkxoNXhIN1FCSWZj?= =?utf-8?B?VVdMZ2NPZlVoQ1psdm4rY3RhaWtZc1pESXo3aHVmazdaSS85c2hFYzUrKzF3?= =?utf-8?B?bUl6ZVBrSW42Mjgwd3ovL0FZQ0ZBQjB0U0dVVm1xMC9wS0p3NG8reVVkWFlB?= =?utf-8?B?MEVWS01QOXlaYTdMeUlEVHlHZDliQ0hSVFFFQzJKY25wUEhYbGZIRG80MHFH?= =?utf-8?B?UXFhNUtaUG1XeVZUaGEwZ3FPb0dia1IrRnhZRCtJUjZHK3Rac1NpRFFjaUtP?= =?utf-8?B?enpORlFyL3V6RGs5b0hZV1ZsRUl0YXNLblRxeGdOUk94cFZGeUxwZnJHUjhD?= =?utf-8?B?RlhmMXcxSkI1dUVPMFJwMkdONDBYbGV0SkVNdStzcVJIUzgvcTN5U3dzTGs5?= =?utf-8?B?eStTNGZIZlZJOWhHWFQxSTEwNExnV2V2UUpPUjJJSnFXb1cvRGt3NC91bVhZ?= =?utf-8?B?dFNlVzdBMzdUK0NOUkxuUWtJdTJJUGF3WlJoMVZQYW15MWJYdGhNUUtjbklk?= =?utf-8?B?MXhtaHlkUUtzVm1SdHU0cVo2aitwWE1TUkFnaTZxV1lZa095SkpOOStGdWs1?= =?utf-8?B?Q1k5RG9KaXdmY2JWVHVsTFhmbUZKaEc2SWJ4bzJrZm1QT1laN1FaM2JBTUlC?= =?utf-8?B?NzdWNVVnWkU3R3hHaWFFWFduSGR0dDlnRFJ5Z3V5ZkpNdEQwWnN4ZXppRlNy?= =?utf-8?B?b1VreVVNRUlscDlZV2w4dlgrOVRWV2xjNnRVWGZHaVA3L0ZTV0ZaL0hXWXJN?= =?utf-8?B?UzJFbEJaV3hETDdOZmp2UTZoTDBKMHMwaG5FdS9oYndJVzVjVVVXZ0RkTXVw?= =?utf-8?B?TTM4bDFNRmFuK1B1VGpPMllmc1d6V0ZXdlQvRXgrMXNGbDZOWEhYMzFCNlJN?= =?utf-8?B?QkFUblNISEFWYm5IT05mUWlUei8zdTZUQVR3T1EvUVpmYndhNjdkdzNCRDQy?= =?utf-8?B?cUd2VEZDdnJzTlNRb2hRMnR4T0U3Y0tLbm9wV2VKYnh2WWg3aGtzR3F4cWZt?= =?utf-8?B?RnU2dWtDMG0zT0RhOUt0TStJcDk0MkFIMFB1ak1wNEpsQlc3bytZMFNGY00v?= =?utf-8?B?SlZteUtHcU1HSjRsY3BGWXNVV1BSdkc2dFFiMkdnYkthTlZ5ZjVsMzAvaFBw?= =?utf-8?B?UEhzNXRVd0pxVlBCZWw4MDh5NDNtMnFUbmsrYms2VDM5SDdWZzdDelhUU09E?= =?utf-8?B?Y3ZWOUtaOFdOR2JQZXpiVDQ2enZGS3RkeUdKcXkzbFJXMC9WNW82OTZxL0hu?= =?utf-8?B?UDdmeWQ1T0tKeWtVeEZZQTdhWUpRaE5UNXJhREVaTDdoaERXcVJuM2tqdVhK?= =?utf-8?B?cng5Y0NobUJodWVjWmh0TXdMRTdTNDhPeVVHQWhkNXpjd1V1cktxeE5maWxr?= =?utf-8?B?MitSSjh1aDdnd3BzNTlsUjdSc0pKK1llNHdFWlh5cFpIUXQ0em5aUHFSZzQ3?= =?utf-8?B?ejMwN3l6amdUSFNoaGF6VVBieUpqaThGY25lWWFWZTl1aEZyVTdWNkVYdUpK?= =?utf-8?B?bHgrcVlwMWRob251cFJpTEk0MmVKeVZTQTBoeWRuTmU4NmE1d2loVFRxVi9a?= =?utf-8?B?T2xSQ1NvVDRnSVRrVVFtdkQxWDByaE00SHgvNkpPVjF3aTdMakpoTkpWRWdU?= =?utf-8?B?V1lTM0MvdWNVZzBub1FxSVZtaG1iV0pDZllVNTNLa0FPS1dmZkVPeHF0WHd0?= =?utf-8?B?UzkzVlBlQkJ6MDZ4OUtVOEVJZnVrNlBMTWR6QXFtdVVqNGswMHo2RUwySXBx?= =?utf-8?B?QTRYY1l5M21KVTI0d2t4bjlGRFY5ZGRIcWZFck5VeExhcmpFcDV3cTN0Y291?= =?utf-8?B?eGhEdGZSRFk3QWk3UEdSc3YyMTV1LzVHQk9LdnBLWGI0YmtTTWdkWFhxOWRH?= =?utf-8?B?RVFDTHdPWkVDcURDSnpFTlNsSE5kcFlYZDRwbHFFWVJxYTdibmNsNmEzSmQr?= =?utf-8?B?Y2x6eGtxQmRzR0hoZ0MvRU8vL3hIa1N5U2JvVU91b2pXN3FZVEIybzQ0ZWxm?= =?utf-8?B?T2wyckcyQjlQZlpQRkZ1ZXZsWGxjejlUUFhUZEJPaDAzZWVwVkNxN3cvc01U?= =?utf-8?B?Zng2NEh5ZmdqMHF5UG1XWThrMFhsdGR4MXB2Vk91OGJWMFhXRGYvMXMxdjFi?= =?utf-8?B?bFdidDgwMmwxbnQrWEVqSExlTkNvN2RibkZPQ0RxdnRpSVcyVkxtcGZScXAy?= =?utf-8?B?Qmc9PQ==?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 13e79a09-75bc-486c-8543-08dab0b6bf70 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Oct 2022 03:13:37.1673 (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: iLnKc6QnlLTIE5BzOur55CqWzb3El7Dr8IPBWqgu0sEld1p+WMVfcW0r7+wrPCkKo9neZccw07fh3Gji74v3ckhFHup3Ul3ikdNC5C4hFVk= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR13MB4093 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Add the corresponding logics to support the offload of set IPv4 DSCP action. Signed-off-by: Chaoyong He Reviewed-by: Niklas Söderlund --- doc/guides/nics/features/nfp.ini | 1 + doc/guides/rel_notes/release_22_11.rst | 1 + drivers/net/nfp/nfp_flow.c | 39 ++++++++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+) diff --git a/doc/guides/nics/features/nfp.ini b/doc/guides/nics/features/nfp.ini index 2706fd2..7cb68b5 100644 --- a/doc/guides/nics/features/nfp.ini +++ b/doc/guides/nics/features/nfp.ini @@ -46,6 +46,7 @@ of_push_vlan = Y of_set_vlan_pcp = Y of_set_vlan_vid = Y port_id = Y +set_ipv4_dscp = Y set_ipv4_dst = Y set_ipv4_src = Y set_ipv6_dst = Y diff --git a/doc/guides/rel_notes/release_22_11.rst b/doc/guides/rel_notes/release_22_11.rst index 2c8e38d..f06c5a1 100644 --- a/doc/guides/rel_notes/release_22_11.rst +++ b/doc/guides/rel_notes/release_22_11.rst @@ -183,6 +183,7 @@ New Features * Set the IP address of IPv4 and IPv6 * Set the port number * Set the TTL + * Set the DSCP of IPv4 * **Updated NXP dpaa2 driver.** diff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c index 61315b1..32076c6 100644 --- a/drivers/net/nfp/nfp_flow.c +++ b/drivers/net/nfp/nfp_flow.c @@ -690,6 +690,14 @@ struct nfp_mask_id_entry { } } break; + case RTE_FLOW_ACTION_TYPE_SET_IPV4_DSCP: + PMD_DRV_LOG(DEBUG, "RTE_FLOW_ACTION_TYPE_SET_IPV4_DSCP detected"); + if (!ttl_tos_flag) { + key_ls->act_size += + sizeof(struct nfp_fl_act_set_ip4_ttl_tos); + ttl_tos_flag = true; + } + break; default: PMD_DRV_LOG(ERR, "Action type %d not supported.", action->type); return -ENOTSUP; @@ -1513,6 +1521,29 @@ struct nfp_mask_id_entry { tc_hl->reserved = 0; } +static void +nfp_flow_action_set_tos(char *act_data, + const struct rte_flow_action *action, + bool ttl_tos_flag) +{ + size_t act_size; + struct nfp_fl_act_set_ip4_ttl_tos *ttl_tos; + const struct rte_flow_action_set_dscp *tos_conf; + + if (ttl_tos_flag) + ttl_tos = (struct nfp_fl_act_set_ip4_ttl_tos *)act_data - 1; + else + ttl_tos = (struct nfp_fl_act_set_ip4_ttl_tos *)act_data; + + act_size = sizeof(struct nfp_fl_act_set_ip4_ttl_tos); + ttl_tos->head.jump_id = NFP_FL_ACTION_OPCODE_SET_IPV4_TTL_TOS; + ttl_tos->head.len_lw = act_size >> NFP_FL_LW_SIZ; + + tos_conf = (const struct rte_flow_action_set_dscp *)action->conf; + ttl_tos->ipv4_tos = tos_conf->dscp; + ttl_tos->reserved = 0; +} + static int nfp_flow_compile_action(__rte_unused struct nfp_flower_representor *representor, const struct rte_flow_action actions[], @@ -1661,6 +1692,14 @@ struct nfp_mask_id_entry { } } break; + case RTE_FLOW_ACTION_TYPE_SET_IPV4_DSCP: + PMD_DRV_LOG(DEBUG, "Process RTE_FLOW_ACTION_TYPE_SET_IPV4_DSCP"); + nfp_flow_action_set_tos(position, action, ttl_tos_flag); + if (!ttl_tos_flag) { + position += sizeof(struct nfp_fl_act_set_ip4_ttl_tos); + ttl_tos_flag = true; + } + break; default: PMD_DRV_LOG(ERR, "Unsupported action type: %d", action->type); return -ENOTSUP; -- 1.8.3.1