From patchwork Mon Oct 10 06:09:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 117785 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6C8FFA0544; Mon, 10 Oct 2022 08:12:01 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B658042BD5; Mon, 10 Oct 2022 08:10:08 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2100.outbound.protection.outlook.com [40.107.236.100]) by mails.dpdk.org (Postfix) with ESMTP id 0D57442B71 for ; Mon, 10 Oct 2022 08:10:07 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=O2Y2vAG69Wg4Nfn7rhuFgVCohgqrxNEkzeVG16nzPaMM4+flIQOq2pIcxSMK2eMj1j/i9FFacBVn9lofRC0jkSJUJDy8erUXN04QNtkAsNMRaJ9zjt8nT4OiyQrC7D1xCNfwqBLRpsIy/7RQhtDh/y/v6Y4nNwkT81HfrnNGo1rfow/y8+uX9KyCoMF6fBnQ1GOSPCuAVLxXkGZjb0q+Fdjr8ftjDnFN1HPnOykoibPUr/obbQYMkjbIjy8uhhyI+LZd402yMZw+imIUuVqoun/wgpXzenGfirkPTyQZTcMFCw6wSkLVcqKDmGpeoQBCSjVceH/0goC04Sr/HjjCXw== 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=mU7NfEkG+vcoSF0/UJGGcRgfMfyGrYU2HDoWD2iGmiU=; b=OAxfFvQT9pjbek21dAkYIYPLz1hsU31L6lAtcN7OAiaCW/Lzb0erunVT4zrgTxcSrjotG7G3P27uWv8fLJvhr7wvut/o9sb2a2gcymQRIJO7wbjSwLC1NGLCG3An4qXCtGCRQNHx32vVVXiSzyj4KmEWHbsa68GpnIuHynFQ37Z2+yLcfSEyF+BspGcIejA8WE6ziRyf36QBx46nW4WT0MuCnZyuVAc6qeMLrLF62Vt/qWU+UPwthGkhYU3OWY3G6K3T/fxlL2sukaVWPICcckKGBwzZDasgCoJVs+ShVI+CXeqmC4blAxZm2+jRyG1t3Mobuu7HYu0X5lOqSA3otg== 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=mU7NfEkG+vcoSF0/UJGGcRgfMfyGrYU2HDoWD2iGmiU=; b=UK/Xfq3CiblfKORobpscLHRPyBchsIc7e5et4DlHZRXauUnzeYtDwhHJBvQTP3fB6T5XNoKOZ6d8IrEjr2BtNHMkX4kvzcdQdpp9gjbKqG/I1GuU+z71dJQaFDXN6Gxo9kJV8jQ1Vk5S1fOzHnUuWuhp12q6kr9dlyqDGPNdpUE= 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 CH2PR13MB3877.namprd13.prod.outlook.com (2603:10b6:610:91::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.14; Mon, 10 Oct 2022 06:10:05 +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; Mon, 10 Oct 2022 06:10:05 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He Subject: [PATCH v2 23/24] net/nfp: add the offload support of set IPv4 DSCP action Date: Mon, 10 Oct 2022 14:09:01 +0800 Message-Id: <1665382142-21684-24-git-send-email-chaoyong.he@corigine.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1665382142-21684-1-git-send-email-chaoyong.he@corigine.com> References: <1665382142-21684-1-git-send-email-chaoyong.he@corigine.com> X-ClientProxiedBy: SI2PR01CA0051.apcprd01.prod.exchangelabs.com (2603:1096:4:193::6) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|CH2PR13MB3877:EE_ X-MS-Office365-Filtering-Correlation-Id: c8ac8754-c430-4b00-352f-08daaa861380 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: CqvNK8KmUTNLLAfnsLTnS9uZF5kpEXA6btOgFxl53qylLolKu2A6C7N8x5nFPrLg+SsGsjnDdvO+rSo/rrubMethdgSGL9ijlRKjXgIYDeLu3WROuwSKtv2dudHQG4Mv8jw4/+QrSnCpxRWILSuGSiExOpX4Bqoff26VaSYiKsBsZJsELqEcnNhTq5JNgwd/RKfNNyRJlZDjX5xf+b+QbAK3bZd8AI5Cq9fs077cHX31hB0XD+06jqRC6oV3cjCpXAkRBcvMFAgLIStLMJohOoyzrL5Lbfv/P0ox74Q9WV6SWqYC4TvgpJYeSNz4WMixYWxDw8TEY7CyCY3IEcwQXmE1gqJzPh1eWg30eTWiabhzYi3v7Z9FCnO947LFlmOu9Gfthv5LOzNaJWhcZjky4gYF6L7N8fGQHX2qbLZVwba4C9Ii6Yh+ua2/+Jx23nIU/yxRufN3dwrZ2a3gr9pr8r6nNkVs1J2UIpx85fxCwS/vg1CgB7+7YcKB9tZWYgDEWA65Oyefn3vdM958zENQo5I+JIG4R+576DdmvlgbEMU5/BsDdSm4ffxkB006yMbwNK1bxETuKkmVXN+bAXy8jAU8iYQcxTIXyTLgDiLyTsebIcm3izdBpy2QEmSTTeopKhyTKnvNfT0x9Efk02ZId6V3+2BvvHtA0oY4nMstzuUebTpc7kmgA6OKK1z84TzbYryr5T9mNxMuxlR+74Fx4Zb2Z91vo1Xrjn6SW9xKiqBfOS6+zfNQMyV0WdW2Mef1pH3ppeaR4BIGhvU6rtoUBIRpnUKPObgQRAbnPmF61A6LTE1aCR8I+Hl0eWOl841x 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)(136003)(376002)(366004)(39830400003)(346002)(396003)(451199015)(36756003)(4326008)(2906002)(8936002)(44832011)(5660300002)(41300700001)(83380400001)(6666004)(52116002)(2616005)(107886003)(26005)(6512007)(86362001)(8676002)(66476007)(66556008)(6486002)(478600001)(6916009)(66946007)(316002)(6506007)(38350700002)(186003)(38100700002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?/BvsxwNSSmSnLywA3WglJamWd9HO?= =?utf-8?q?RVJ54T8lZVWNuFX3CAbft9uabaf4T5hY8ReilIVcu9oB3FnAqgPCImONzGtU4cWtQ?= =?utf-8?q?Wjw16cICk2BJhONCOWZUt9k4nTAD5/EVbFxdSgXcHxwlnOCWPebHNkcLsIqoa9Sle?= =?utf-8?q?npKCl8R+jF0sLGprxlKB6pi+nTVLSqJBOPCo2q83fkzFzTbLql9uluoSGYTCYz4OA?= =?utf-8?q?qIGM4B6SWFmRqdXZ97FZhxl9ZtgUfY/uft7+dPvtdPpnQteEHhhudN7n3zmaLCoa6?= =?utf-8?q?xQ617S2tm+hOxdyo1BRjLEmoSIB6fX4DAgnp0sVOa5efmYeh2rQT/VLQjmWyBcZ0N?= =?utf-8?q?hqsWKlvZVqRY8EPK91Q64lE8bNF2KUuXi/grSHZEimNe422VYuELJ6MQIOEjBWqfj?= =?utf-8?q?lC7S1w6R0GO2yBMeOa/m7mcF9LxHo9N2YDdMoMf9njRI++33wmZYhIKAz+C89+kGJ?= =?utf-8?q?x6vydD2rWfzPaPN6EorBhk3LVnJeDugidwcsNRIqkI4e92+93B6mKDHyQC5RtkZYf?= =?utf-8?q?Y//5sVVL5KrqOi6HzhpAwoPRAwo8ZHQIJdfuq/UZ+M6wtfcIzJGM/bay7QP2tJR9U?= =?utf-8?q?FsCdNwxWhbTk2f9Ik8WZp7mRwWqVoPbgqoEF2nUVkoOx44oA2zPmxGiIy9iWlpOO8?= =?utf-8?q?lebW0OIbKyRR235gHoFgVaYBBF0nrQfaJ77UCMxBpN1qJZjeXGpr75fElDymgjybO?= =?utf-8?q?FSPCh2IjoQGa0J/PaFgG9ot+wBwLw8HLVHnuetuuSV3viMQhq6wNDyM9JwUgzpi2O?= =?utf-8?q?RhxtLUlPwtkTevz/tSVSuE+lFu4GO0lS20iJFn4ngrdg1EiTVXu4Nsdsbrn/Q+wiq?= =?utf-8?q?Ixm06n7YBVPwS5HoikSFUZ8z/M3tjw4cXU4Drm6kL+KOF4pKFZ1yvjQUKzJ2cj7/S?= =?utf-8?q?4voowRplQmsfHw6T+J5AeUYHJ0acgk3W+CkvN49hsHJxjVwr8NjBjlplKsdVlPIRn?= =?utf-8?q?Y4bZ0yN55axYs5Q07sgAiYq4UlKGNDlqMgB4pcyZE/uKQ1Gm+SnVTi/qNe8zyD1mW?= =?utf-8?q?hGPfg7arewWK8PqnNbtYvAww78BUczEdWpj4c0uL7jCJjNkqSJMYAxNmbnrqeLQFS?= =?utf-8?q?SyHWYqNsPauoyjsvcVpNNMQG7mKvMg3D/Sx+hakz2AQIKWc2DOj4meMXw5mXZdMa9?= =?utf-8?q?ycUz3nOgV5s3o+XkbKndc4NFweI/IVrMkHzAnmfy0l8UgWJGnKtAeIPw28Tq2ba+v?= =?utf-8?q?qv1PQRGZ0ne8XKYR0WAyexz8zOSlIs5Do6lNUYyNV1hlYGjzkkoJpbNDmrQ6qdd5D?= =?utf-8?q?MZeLn9uygYBsYCSgLcL6yQ+1T7wMTNfeKKKdkGTrIha4edx/EYLDtjY1xNlxtXJKi?= =?utf-8?q?v5gpXNwDiYtc8HPiN5Tm5hkqkSF3yOKiXEjLYKcwNBz8I+gx/+G3hTmJGPETuecNn?= =?utf-8?q?fQGs9ROrL8Xrh5wIus/xXElNwTxi0KCgN6YiH6pyaZswG7j5MiyOKeKyhoJ2Y5FWn?= =?utf-8?q?kUzcpyxMHvJBBpuh0h7sRwZ5byI7sUP9UcFYw9ayyJ8PbBzPaGeQhNHcn+NvEMo7D?= =?utf-8?q?7ddCzZ2ATrfZpQADZXEpS9NGlTdIWhAJMg=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: c8ac8754-c430-4b00-352f-08daaa861380 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Oct 2022 06:10:05.8822 (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: uXFLzIZzi2itdthysvoH8J9IOdh6pcltNGnwQUQ/580+Dc1y0oPF+UnIIpMkUJNCkit0qPySm/xkJnQ+v1eEPrisXXtSUI1/tZKC8pKKSbE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR13MB3877 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 121094e..8e19f18 100644 --- a/doc/guides/rel_notes/release_22_11.rst +++ b/doc/guides/rel_notes/release_22_11.rst @@ -171,6 +171,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 928f909..283b4b1 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;