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 DBF49A0093; Fri, 7 Oct 2022 04:21:47 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9A68642BC3; Fri, 7 Oct 2022 04:19:59 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2132.outbound.protection.outlook.com [40.107.220.132]) by mails.dpdk.org (Postfix) with ESMTP id 9DFCB42684 for ; Fri, 7 Oct 2022 04:19:57 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=i55cX7ORYZRu8irMkYrui85SWzA2t/8BFG5jaCAPQKeZVRFeM8a1FL373bgjyj8OVZwO8KHn/0yZFeLgUpwmV99ndcuNLmVn2/qDAPWf1CsMbSOKxPmxfphv3kQrSg/AbHFC9HmwenTe0mwhDhYxe9z7J8QRBh10ZiLhNyhuvC2M09YQWB6KtBVgshe0hlpAIDkUt0XRZyGh4JPjgP0VpvywYq31jXTlmfWq4I+eBaj4XAgXb5601BarQKFy97BsAzTpfxZXV40KPH9AmgraIL0JR281BAzwcpumb1R4v5FtOEea+OsjkG531lqXmuSCJWo4Zgp0IZTngW3i5f+c1A== 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=tFbMcAF+8dOI0igBbGQ6B5lB9Jk+IpCjrxb17ZlsAyU=; b=fgfMDypYyHfX+LQfgnPMjrYVO9sUArg04gaewGCxBJJTAG5kuMmublb8bXC1bv/G8X1ZqXQwrGFW7QKG/oVH0DRskf78YqD/zHFkk7x409XcNYf2QVTAZp7Kase5uFBK/ff7CeEy3ekk9uBuW9bX8e1rlpPLxoxdo2fPNwPosPuDvzT8sUxDWnrQhLB21iw3zsBH0Q9PjTMPQgrGK4VOaSmh2RllykqupegQxQZw0xOO6fZNc6ZGhzgPeUglxJS+XPcyxve+0+/wKhkmrtvr8A2zj1yGOCD79txVClafJfi/2VGM+xmnDYUxDEdZleIsRiUH6LqRt3J+6DWPl5L7kQ== 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=tFbMcAF+8dOI0igBbGQ6B5lB9Jk+IpCjrxb17ZlsAyU=; b=BbqqRJBqmgZO/d8bM6dH0G/pAAFOXsh/7WfpXYWrzXyg5MIx1HFFesgh6dU6f5JSayacoEoQr0pufR46/EcoMnXeym9dh4FOJlAgFgAUdW3rQx+VEhGkTFmYMVsEG8+hfkul63nmNY3ZMwmWhxwIfSxukR1cYMrw8N8Aral44fQ= 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 SA1PR13MB5465.namprd13.prod.outlook.com (2603:10b6:806:230::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5709.10; Fri, 7 Oct 2022 02:19:55 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::a192:2720:1ef8:2773]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::a192:2720:1ef8:2773%4]) with mapi id 15.20.5723.010; Fri, 7 Oct 2022 02:19:55 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He Subject: [PATCH 23/24] net/nfp: add the offload support of set IPv4 DSCP action Date: Fri, 7 Oct 2022 10:18:45 +0800 Message-Id: <1665109126-16201-24-git-send-email-chaoyong.he@corigine.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1665109126-16201-1-git-send-email-chaoyong.he@corigine.com> References: <1665109126-16201-1-git-send-email-chaoyong.he@corigine.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-ClientProxiedBy: SG2P153CA0043.APCP153.PROD.OUTLOOK.COM (2603:1096:4:c6::12) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|SA1PR13MB5465:EE_ X-MS-Office365-Filtering-Correlation-Id: cb3faa91-2a45-459b-8854-08daa80a6ccb X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: oow4TUvWkC1BOjGuCYvs1Nq0Gzoz+0h1QdPO2hgUh7mMLabe9/5Uorf3aHPi2sSO76WlcNe6UQQYVVmeyddHLawacKNRkPu1rqjQP7o3l1E9TGQsgTxwn8uo8NeP9CDpG5dpg/kBR/IiPrMhXw8mlJ/+jHxf9ngmvd7LD+/FgAiIoUjVrxN9qnhS+1Jmvl3xoxQbwu2E7TGpmSEv5oEngxgWhgpGGvtpnZUac5UDiG/BFl2gcXtFSlF/+wHjLUJAb+dKE2g1fDnSRkqM9fwTWJamgbtqsjiMzBoBgAh2r31LxMqN68CjIfHJnP7FwhtGrFa3G4dNjMC6+NVwJ7h/DbzUZb/BtdKE4i/8WNnx326TZO4jwamD1ZKaTIRT1/ChEWR6z5LhVsmUAZpfZBdJkCwu25RxVg1OfGlzfsgToCiV3Yit+NpMi0Q5Kq//t+3uGyVu3svw9hmH3SQXVE4OnYT6nPMUslWeL9Hk9s+yocqcfhI3IwSm3NiDBHhELsYL69FjorGDgXMV3wvFtkX5s8gSLA/2tEXofP/87+rngyqAw3zcmzmoYvMU1rY4YgFkI+sGiYRBqsj7GS070KL6oz7Hf+equEiBLramn3TvtOsWQj3tsHZ4pGG8QvyRCDp91na+UlyZvlsR5M997wAt8go/2Lor12ACptLSeM/ggr1xKI8EYnyU/Cwr2dRs7PEzt/Ul91jiu2BG0Ezq+hQmryIM8T7um5g/Nm3FVYqIPtYVTeppOO8ktq6+ed25tcgZ 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)(39830400003)(366004)(136003)(346002)(376002)(396003)(451199015)(36756003)(86362001)(66946007)(44832011)(38350700002)(38100700002)(8936002)(6486002)(6916009)(83380400001)(52116002)(478600001)(41300700001)(6512007)(4326008)(107886003)(26005)(2616005)(6506007)(316002)(6666004)(5660300002)(66476007)(66556008)(2906002)(186003)(8676002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?Vzc4dU9CazY5YzZOUjJLVUV2U0dDSXFmSFpLNS96T1d6Nk84NWRFRmZwY3ZK?= =?utf-8?B?M2J6THBBcGZHeUJ5TmRTN1RGYitiQ2FORUJIUjdrS0dGLzZjYnB2WWpEbkRY?= =?utf-8?B?ejA0UHlMVUxxem9pR0ZUSE9odEdKNGtHRGhDWVpseEhXNzdzdGhZMDdyOGpl?= =?utf-8?B?OUF1Y2J1Rk1HRVIzK0FjQjJocUY4RDd1Y2FCcWJ0aG5lb3lrRHFldEliQ3NW?= =?utf-8?B?S3hxYUNzaTIvVVAzQldGWEhnNHFmdE0za29ubDNVNHRPdE0yK3Y5TnF1VU5y?= =?utf-8?B?Q1hUSG4wNnd0U0NIRlZ3ZklOajMrTGRONDBsQ3NTSjRHejk3K0JvSFk0cGIz?= =?utf-8?B?K29hekNTRlZZd0N0SkFHQ2pUNE9tcWxtellZcFdIbGZGL2hHQnVQcStNZnpX?= =?utf-8?B?SU5xcVYvWXI3T0hBVGhHRkJZa2JhSUNQc1g1ZlJSUU5rN0tvQ0lLSVNTcXRO?= =?utf-8?B?SE1Oa3I5OENvWEQ1Q2tpTFdxRDZtaFZtZ3RENXpXaDYxbEg2dmo0RXhvSnJY?= =?utf-8?B?bXVGZDhBWitrOFV1RVB3RUdXS0czVGV3dWdFR2RrRUxrTFpWZUlYZExLcHcv?= =?utf-8?B?YkdKZEJ6dG5qWVVEMFBjcHAyZnU3aUhvTVlYK0N3ZG1IOVdqSkVIMFQvdjMr?= =?utf-8?B?THEvUDhreW4yTHQ4MDh3Z1dGNVVQWENHSFNTYllJUDZKWmJ1SG8vcmVHbHho?= =?utf-8?B?aThaUmlGNEcrNGQ4aEw5Y3lmclp6OXNUTEJrOUR0b2pzckhOSUVqem4zRU0y?= =?utf-8?B?Z3cvYm15MnN1Q29RMzV5TXVOWmRnenRJcDJvMmxaZUgvUDZ6TXpiUC9Ib1k3?= =?utf-8?B?OWsvM1pNN2w0dHNiQi9FUXFoTFBHbTl5ZGtQOWxEc2NxUk1Db0t6bkNFMm5p?= =?utf-8?B?OW96Y3l4aXFodTNPWmIzbXdOeFd5YWhXa0xjbi96RDJtaGs1ajFxOFdTdmZq?= =?utf-8?B?SThPNzI1ZXd1SC9RdGxnM1QxNE1taWVZSmJWTFB3bTh4OWNnSW9kQld2WVEx?= =?utf-8?B?VmtFV0hBQzhHbVBHZnRMZy9wTUF4dm12dmtET1VtWHRTdlZWbjAxck1oaEQ5?= =?utf-8?B?SWhpVll0eGVMNGRRNTRoQStkQ2lvd1pQbVRnQ2lJNFc0TnM3c2J0cUVReERL?= =?utf-8?B?RGpxZ2t4UHI3SU1LeEo3a09tUkE1VGRDajVNY04rWU9iZW14NHoxNjU4akNV?= =?utf-8?B?T0ppajk5djV0STdLKzlndmlxQ2tZbkQzbUNpOXFvSHcwaTJENmoydGVnM3J0?= =?utf-8?B?TUZsM2t2UDJ2Sjk5V0tyMGxOeUo3K2M1VHdkbG1JR1ZqRVgxWU41VEtLME5G?= =?utf-8?B?VHJTbm0wbVB1ZDJFUnVXNDZJRmE2T0J0NHhHRVJBcS8xOGtMUkVwTU5qYjhR?= =?utf-8?B?TEp6cE8xdzJ1Q2x1YzlKdWd2azNOd205RjY2ek1aektlL1hJNmJFSzdHSVpB?= =?utf-8?B?V1FlUkRlWG5KRHZNUG0rdnlnWUtlTDdRVFRHMlpPYlluWHM2MDlBdVh5cFoy?= =?utf-8?B?YnE2ZjBzT09UM2VwVWF2dFoyMDFLRlNlcC8zZmxkSmZFWkNwRDhTQytMYWsv?= =?utf-8?B?S0kwcWhaQTJuWnExeFA2TVRUL214VkdqQ3kvOWJvcmwxbkZKRlB1N1BCcVlq?= =?utf-8?B?UGc5b2Y5QVdhKzhsenVqZzZTOWNGcHJaN0YxRXkranBnMzBjb3ZEZ0hOWUNx?= =?utf-8?B?YXR1L3JwRnVGejk0UldiYU16aUFOaU5ZckJMemxyS3ZxY09yRHpQNjVnQTZK?= =?utf-8?B?RnU3d3hSd3p4V2NUV2gxMjd1alZMTit4S2F0aGk2N3pOVERyZnFnemtkT2Q5?= =?utf-8?B?NVF4V0dhemRNVFhoQWZSUVhwZjVtaHhPVHFTQUJrRnBiRUVybUZSdWZBK0Jh?= =?utf-8?B?ZS9QTTY5eGFUa1lNNjJhZVpsZHh0aXp0RXJyQnh0d3dtOGh1cWtHZU5jcWVB?= =?utf-8?B?UW1FbkdveGUxeUpvYnRhL3FKUEdXUTdDYUlYRjkvWWRZa3dqcXZtN1R0RHFm?= =?utf-8?B?UGRzV3krbVg5bUxzQm1UaXRqVDRTQSs4RUtzVHo2NWtibUNZUHgydkFQcC92?= =?utf-8?B?R1BUcjZNSWZ2eFZGNGtVNTJ6VU9NMWlJcEpSMkZTSDJGY0NzL0YrUHJ3T1lG?= =?utf-8?B?d1lsRUh6QWpnb1lXNDFSVGdUd2VvemZlY1Rib0pIRktpWHExYUJ2ekVKaDVo?= =?utf-8?B?NlE9PQ==?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: cb3faa91-2a45-459b-8854-08daa80a6ccb X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Oct 2022 02:19:55.7575 (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: tBwH0QXlfdWGn0c8tMJe5j8XO8F3noA9Go3URZCvgX+Vlifi3vSq0ZuCDaSff3TaO8KMlO/9hI9XhtkMvdmxw0YdQeVEVL8zUWY95yuqep0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR13MB5465 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 35d2bbf..26de3bf 100644 --- a/doc/guides/rel_notes/release_22_11.rst +++ b/doc/guides/rel_notes/release_22_11.rst @@ -125,6 +125,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; -- 1.8.3.1