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 A816CA0544; Mon, 10 Oct 2022 08:11:03 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D034442B9B; Mon, 10 Oct 2022 08:09:50 +0200 (CEST) Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1anam02on2132.outbound.protection.outlook.com [40.107.96.132]) by mails.dpdk.org (Postfix) with ESMTP id 2F96542BAB for ; Mon, 10 Oct 2022 08:09:49 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=baJgDSkvuT2HzWqvI4FXbWUu4kOCLU15DUo33mu4hCBS0FGKMsU627JqZ+65DStpfeoBHqjZonbFdxKQnhzmuHZCP/8Yneo4pgOPGL4XY/bKEItv4M3XUZpPxRZXRHSmpVX+D5fMvgbs6yt8IFoE33jLXkL1WW0sZ7tLWbkzXXnhue7bO/YxGysJxZk52C/2EFJ2r1eOLkm43hj+axeGuVzqU4riuXIOSEbtnsGbeqyAcvXfvgkK2AGef3lTB7rN5B5RZBisjZA8VhZlzTc7YmKJJLzBwIwSQ2s5rrj5O3PxUvhu1j/bsloO40CVlJZDLXrlvl3eyG4S+v2Lcfx5nQ== 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=TElK/chpKdByMo5gxQofQnISdSF130MloZAlVeN2N1U=; b=gj+BbAeu08dydcDgX7Q0PiJcI9ZQB2t0MJosd7eU4p+CQVsYkrjEpmwFg05BhHnhvOnTbpBhfEb6awJC9eMHl6Kmc430wMjMkYDw1Bwf3vn9Dw18fZ/S5VhQwd5c4DKyILGzpDKRo52LkRu5S4n4bHmTFk+uamFgXezR+lRVVcPSnoITZ4HVUe0ASseltKqPJMcA/OZU//w/XSeJDb7dKAt/q7I42c61zgfBWJexZzAxABRVxSntUNwCzcPEXc0Wcrf5zkrCNvIcIGhL3MxneP4PmwI0vSs1roFHxGauMp8/V7/gPINa/7VgOTPfqg4qxpK14REjpjrdymwyTBlrkA== 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=TElK/chpKdByMo5gxQofQnISdSF130MloZAlVeN2N1U=; b=MZ0s0aExS9YqI804vvPmk+SmmxqhFxv5XyZBQDQY7j5ZvGbVH08n2DZfSKSEHGH41f213jhqSYVYvpd53AgvCQ9XGBfRJ3/SdTxtwYwx70yfmaSY7axNzydmiuQrxRtQWM6dA9Q/Yi47Pmm39yvajKdCl7Ud3F7oHRpFtXSzkYs= 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 SN4PR13MB5296.namprd13.prod.outlook.com (2603:10b6:806:207::14) 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:09:47 +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:09:47 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He Subject: [PATCH v2 14/24] net/nfp: add the offload support of pop VLAN action Date: Mon, 10 Oct 2022 14:08:52 +0800 Message-Id: <1665382142-21684-15-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> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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_|SN4PR13MB5296:EE_ X-MS-Office365-Filtering-Correlation-Id: 772854f3-0d7d-4d53-39bd-08daaa8608b3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: XKT4RI3l+/BV4NBiEVwOfrPj7/5KrMq+/8OASB042yQbnPMKtxR9e5Lof4KWtNcDak1ijk97XJhztJUwggm87A9xMMkSqXEhbNwe7UU78FoerZm8EaI1d00MWvRIqDzhgxFd+de1/+XpIYlkp7FwzQejIy0jfZ1md3A+9fSSZk7MBXu13kaMNpLwC6UUcaz33XjoMTLUR/9nkU8bxlVzYHixm+GdqAaPCDBYRyh9/ANoIYD2sqBMDJL+YeBfEhdK/e2a7ouXIGo/5zCF+EdvXF6uNXGAz4z9Oq4+vhisqCxaq6GALWNHFhItjyaFMksDcz+SMeSFOlrAZLX63F4g6+Wig6Dwo/IKT2BWHConq3rklz2UZ2OhLyxW+SZXtYlQykMVg0NxZmiAAEt29As8FUq9Xv2mSEak3+nsWMnR3SLIo+ntQcZTx+nj1ExM6LYAiMGRi3eP5wFrOAJGhynRN2wRBVNet11Ga7d2EATed8Enew7OoDBywQXFGccxMbyjQ8fZPwgUEnlymezSgQ77acG3sOROa2yLANwIc7pi8SwoUcY5m8NE+iqj62Hhb5tgkgzWqN24g14tUrqPvjVpQk3kRtUUYCUjNh4yBAwsIUVhc1jAVsC/FtVWkHz7M52gfQWyz64fHUL7laT2CsgF/m9VNav6Xj0dznmXS9nQA9QqB485rhFg/Y4vXFjv5mZIjrW/TMnaa5qhAOD+9h09rGc7adi+Yc+g2WaRiY6H+2S8ccxvBtN7n62VixnX8xevzm42sNMRIMifcfdNIL+7QCdGC4xTE6LLLkq6rEaeq0TQNfPHeXN+AaVNhD+PX2qd 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)(366004)(39840400004)(396003)(346002)(376002)(136003)(451199015)(6916009)(316002)(2906002)(186003)(6486002)(2616005)(66476007)(6666004)(107886003)(66556008)(41300700001)(66946007)(83380400001)(8936002)(8676002)(4326008)(5660300002)(44832011)(26005)(6506007)(6512007)(52116002)(86362001)(478600001)(36756003)(38350700002)(38100700002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?VERwRXBKMkFtNk91NWVudjh1WFZuWkN4YXpoc0FxS2xuY2FudFVLL1Fxb1h0?= =?utf-8?B?K29DMTROYXJoOElUVUNDMDlRdkRvalo0Z2FYZzNZbEZsaFNTQllobFpvQjl1?= =?utf-8?B?OHpLeUVOcEtHODhYTVNuMDllaU4wQUVkZkZnMmdwRDc4TTlqaDIrWHhEZmRr?= =?utf-8?B?TFA1MEFZd0VsTFVRN3BreUQwdWR0U1h2TmFqdFhBeU5UUTNjRkRocW1yZkdR?= =?utf-8?B?cEp6N0RKczV3amdUSmtJTFZRWU5DL3NPTmhoVFQzK0NsSmlncVFuSHRQNFRs?= =?utf-8?B?OHdnSFp1UnBQL3pFZmdoOXE5a2xzUVhwUHdSbStXWEJ6aG1ycGxVMm1ldUYy?= =?utf-8?B?TUl3aVp2SnA1ZkFlSktzZndPZzUrODhvWGhhTElCdnpkYU0wQXJ6MHFaQ1Zw?= =?utf-8?B?K2FmMzVUcGd1bTh3YU8vbG5sbENRUjhzOWNqc0drU0paVGNtd0xIaGl0YURq?= =?utf-8?B?K2h2WWZ6T0ZXUmNpalR3U0V5VFpMNHVxV1B4KzNndEFYekJBOUc5YllQdW5P?= =?utf-8?B?dVo1ZWtUd1VyeCsyMFpBUTh1WFdaejlWalVaVEgyU2tBNnRtL3J2a21CSFRr?= =?utf-8?B?S2tQTVBlRzhhZTFLMTNnVHozYlpSZnF3UzZ2RGJRTHh0NTFzVzhtL1BGQlBX?= =?utf-8?B?a3IxYlJWbHZ1a1pmUnViKzBqYkd2ZzZoNGtsdlViMmJlakZLT2c3UHlXcmJm?= =?utf-8?B?TnhlT2tmMmxaenBJN2VGSDc4bk04QjJYWWFYaVpWdkN2RUdTTFZQbTIvdFlh?= =?utf-8?B?VU5uUHZHVWhVSVhMSjZRVm5iN1N4TnZpWnBicS9TSm1GRXMxZG9BK053VUxH?= =?utf-8?B?ek5zc2k3dW9EeGM2dTEwR01Ia094cGlNNEdNUnFURGlmcUlwWXNhSmNpdGdL?= =?utf-8?B?UEFMc2MzZEF1ci9yVXB4ZlVxZkFYL2REMWJjWnpEMlU1ZHFzQWNEUzVicENz?= =?utf-8?B?U0xoN2ZNVmRjN0xzMFArODJvQmlEQWpzWTErNnArSlJxNDZuODBvZThydTNt?= =?utf-8?B?MnprTjFINEtERk1NK3MwODIxNG5Pb0FJZ3FBVUwycmVNWlJuVGJUTEpMOUxl?= =?utf-8?B?eSt6bHJEVDFldTNLbFV0T2VHRlJjbjgyL3ZpZmp1cVl6bHhRek92Zld4OEU0?= =?utf-8?B?RmtBTDFPbmhaWlB6a2xZeUgxSy8yekdFcTRPNjJvMkRYSnlLNkRIdXMrTE93?= =?utf-8?B?YUpzazdqd2NYWDlUcmhuQ3R2Uyt0SnM5Y0pGbDl6UFlFUXV5VjM1OGhrUFQ3?= =?utf-8?B?YWVNU0RmdEROeER0VFJTUzkxTndUSWRNd1lNTnRlTDF6cDZRdXpJdzJ2S2tz?= =?utf-8?B?S3hZQ1o3UVljQjBKUnZHb3dCdmNhSG9ZclZyd3N4bVE1QzA4VEFNbjRBMXBr?= =?utf-8?B?cS9vQ0t6TGpzZm1wbjc3a3NNemxCeDdQQkdNZktjazIwb3NMUkxDRko0SVZT?= =?utf-8?B?MVNtczFkcGRqNGtZdC9kcnNFcUU1bFMzQWZpb2lGR3RvTXFlWTZ6YkpldHZz?= =?utf-8?B?ckI5OWVPTFhjUUNSK3E4ZlBkQ3J2VEVUaTlsS0w4V2lJTWc4SzdtNTRibXY5?= =?utf-8?B?ZnBLRlN2em83RXJaRnFCbXpTL2hIVkRXdUFhQjRtQlMvYWx1eDN3SURLZFNs?= =?utf-8?B?ODUyYW52T3hVdUV6MDhIYnNuYnl4QXFxaktySnBIa1Z5bHlSelNLZlYyKzdH?= =?utf-8?B?UWlaMjRZeHZSaGl0L2VxVlRmeWdtNHJwa1hWd2RzanlodGVTRkIyOFRtQzZq?= =?utf-8?B?SlRNY1M3R1NzdVhIUklleVIyVGNNKy9hY0NrcVNURWVPUThQVVpCUGpmWVdI?= =?utf-8?B?MmsyV3YvekU2U1plaFRHMEVuTXg0UU5FclVGQ2dlVTdkekl4eTFKb2psNXpv?= =?utf-8?B?VzY4d2ptK3VYTklQSTMxZEdrWEk2TUg1dGtBbkZkMEI4N2I5T0tJRmp1ZTFM?= =?utf-8?B?dkxVaGM4cHAvVFhZOXN6SjNFM3E1L0U1WXMvN1RFWTdjQjJjdUV2RUJhVHZz?= =?utf-8?B?YVRQSENsOXF4VExyS0RXK2YrQ3BEcUNqSEI0QlkyMXM0Z083UHFVQlFtVHFl?= =?utf-8?B?czJLV0pNYTBpYno1bm5yQnA3ejFKaW93VlN1NVNTM29iMmZVcCtrRWNmZ3NH?= =?utf-8?B?VkxKNG9KaUpBdWRzWUVUc09mWG9TUTZydUo0S1RkMjN4U0taLzAvSFY4Yy9Y?= =?utf-8?B?dXc9PQ==?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 772854f3-0d7d-4d53-39bd-08daaa8608b3 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:09:47.7617 (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: IxpiLW2DEEBsd/bfYoYVeSM2E2j8BofOaTb51cFOuLNWUH62uOsK4ysrH33nMZv7KYueAVZJp2D1mJqw6CcjhZs+CK6zi2zx5060Dbui91U= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN4PR13MB5296 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 data structure and logics, to support the offload of pop_vlan action. Signed-off-by: Chaoyong He Reviewed-by: Niklas Söderlund --- doc/guides/nics/features/nfp.ini | 1 + drivers/net/nfp/flower/nfp_flower_cmsg.h | 5 +++++ drivers/net/nfp/nfp_flow.c | 25 +++++++++++++++++++++++++ 3 files changed, 31 insertions(+) diff --git a/doc/guides/nics/features/nfp.ini b/doc/guides/nics/features/nfp.ini index 578c35e..95d1779 100644 --- a/doc/guides/nics/features/nfp.ini +++ b/doc/guides/nics/features/nfp.ini @@ -41,6 +41,7 @@ vlan = Y count = Y dec_ttl = Y drop = Y +of_pop_vlan = Y port_id = Y set_mac_dst = Y set_mac_src = Y diff --git a/drivers/net/nfp/flower/nfp_flower_cmsg.h b/drivers/net/nfp/flower/nfp_flower_cmsg.h index b61342e..4ce03da 100644 --- a/drivers/net/nfp/flower/nfp_flower_cmsg.h +++ b/drivers/net/nfp/flower/nfp_flower_cmsg.h @@ -362,6 +362,11 @@ struct nfp_fl_act_set_eth { uint8_t eth_addr[RTE_ETHER_ADDR_LEN * 2]; }; +struct nfp_fl_act_pop_vlan { + struct nfp_fl_act_head head; + rte_be16_t reserved; +}; + int nfp_flower_cmsg_mac_repr(struct nfp_app_fw_flower *app_fw_flower); int nfp_flower_cmsg_repr_reify(struct nfp_app_fw_flower *app_fw_flower, struct nfp_flower_representor *repr); diff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c index 68032b5..fb06085 100644 --- a/drivers/net/nfp/nfp_flow.c +++ b/drivers/net/nfp/nfp_flow.c @@ -618,6 +618,10 @@ struct nfp_mask_id_entry { mac_set_flag = true; } break; + case RTE_FLOW_ACTION_TYPE_OF_POP_VLAN: + PMD_DRV_LOG(DEBUG, "RTE_FLOW_ACTION_TYPE_OF_POP_VLAN detected"); + key_ls->act_size += sizeof(struct nfp_fl_act_pop_vlan); + break; default: PMD_DRV_LOG(ERR, "Action type %d not supported.", action->type); return -ENOTSUP; @@ -1266,6 +1270,22 @@ struct nfp_mask_id_entry { } } +static void +nfp_flow_action_pop_vlan(char *act_data, + struct nfp_fl_rule_metadata *nfp_flow_meta) +{ + size_t act_size; + struct nfp_fl_act_pop_vlan *pop_vlan; + + act_size = sizeof(struct nfp_fl_act_pop_vlan); + pop_vlan = (struct nfp_fl_act_pop_vlan *)act_data; + pop_vlan->head.jump_id = NFP_FL_ACTION_OPCODE_POP_VLAN; + pop_vlan->head.len_lw = act_size >> NFP_FL_LW_SIZ; + pop_vlan->reserved = 0; + + nfp_flow_meta->shortcut = rte_cpu_to_be_32(NFP_FL_SC_ACT_POPV); +} + static int nfp_flow_compile_action(__rte_unused struct nfp_flower_representor *representor, const struct rte_flow_action actions[], @@ -1328,6 +1348,11 @@ struct nfp_mask_id_entry { mac_set_flag = true; } break; + case RTE_FLOW_ACTION_TYPE_OF_POP_VLAN: + PMD_DRV_LOG(DEBUG, "Process RTE_FLOW_ACTION_TYPE_OF_POP_VLAN"); + nfp_flow_action_pop_vlan(position, nfp_flow_meta); + position += sizeof(struct nfp_fl_act_pop_vlan); + break; default: PMD_DRV_LOG(ERR, "Unsupported action type: %d", action->type); return -ENOTSUP; -- 1.8.3.1