From patchwork Fri Oct 7 02:18:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 117519 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 E90C1A0093; Fri, 7 Oct 2022 04:20:54 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 05CBE42B9B; Fri, 7 Oct 2022 04:19:41 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2136.outbound.protection.outlook.com [40.107.220.136]) by mails.dpdk.org (Postfix) with ESMTP id EBE1442B99 for ; Fri, 7 Oct 2022 04:19:38 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=T4KlnZ3/BboR7yiVaioiDQnVpLizekOb2l/KEuBZoyLxkyxU5iZpqJCMWGHfWcUVoXy0eNt94/rsChlDAxvphCLdfMGmSwJE46tWKX/4AIvOJYUW6Q/SgwnRz92h7xu+pwGn19lFkkZ1h3Y3GTxis0PIZ2een+3H5/PiWpk5XYPi68G+M6gDs6SS+bTZbPO1fZiein9a7KHbDxK/h/RPKyk/Jd7zF9iwNBxSxMgVTIYRjkvdyddZ+xDV06Hj/8y/J8PaFbrNrxcmsrbC9zEvPFq11dBX00GVShfTveg6KtG27ZnMCTK6HwZDe4A7PRqiFTRQkM42ksh+v2bYyHT+JQ== 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=G3qwAVMK5tS7NwXNmQpNp6GOKHOM/rvuLrwYBmiyqve7RbqZw6Jja7U6Ul4HY1xZJNF+grhRWyjFMiPB8EjDf+ECwb6kHRBWTVBoniLJMreoK+YwVhm51Pl63MokUtyX3EfxYWMPX07v7kRZ30LR6LLo/9F79R6AutW0wouL4J4JM0k7RUWAGHiuVK6FugBTNZLhM39n8Z6l/vmP6E9v54D1UjGsXNY0NM/H41ZEcT9iuxzX/fFn5O7GhdK5vTmu3GrjQRaSQfHR1NmbFaSZmbKM+Ti/2zw50E20MUubLvq4Xo6x+Z6YjjO5lBi25s+pgu85tLo8RF5W9On7Ww1tcQ== 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=iKMErv8/wPeJqjXKQpI8QD9QgObl5tQZmdbeVq1vke3tBw4w5NwllUQuoC8Jq0V+rKq0WwKEN5+vJr/yUgiZRUSw3T2IDXOnaWnySy8XCNrdFnpohD2s/+3sj/oJozr2QHVRziLQJJpTZxkdtayeYMFo14h3k2quhz5sxg+vnSQ= 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:37 +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:37 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He Subject: [PATCH 14/24] net/nfp: add the offload support of pop VLAN action Date: Fri, 7 Oct 2022 10:18:36 +0800 Message-Id: <1665109126-16201-15-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> 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: ab101633-e105-4a71-e1f7-08daa80a61f2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: QgCMihEI+oLHYw3ZB47+40QmzR3uOv4y/zYXIYP4omANKWLOkohwN+LRJEWjR88q+UK8QAhMV9h1j9NfFyMpb7i8pDzjYPHAccK5fpo4vgw14Q1J5cMxy2eV7UmcmAuiSXLUeLK6KFA8LWMUbt+5KX1rMX8o34tUx/Tu7iuoF87VGWgmLrFu4tAdPf0+USWEytcYQslvRFxabJPTSMSUM40dh/7FY/61oMMVETqFDMObsUJM/VJQjYR6dmdD/csf2//ed29CwnSEfHlbm7sKwE10VkoI7cScfUYhg3XF180709twUgiWFLQDaL4RvSjLONreNPOhVVFJYdonodWapIU//UWvGOURxG9h+BE2ZyobeO2zN3dybbYtb1i2wr9E21fIMCT28wkIM+T8HMqOj+LyfAvlcyirGt2UCbpHWRht5pn5xm6ZDBjKsV5JLYyCONlYH+vyDFPBJhE5yLUZJj5g6KjleR+dj2QUh/PZ3STCFKvK/1YHEReaXwvXPBhy/eILd7F+1OsoPRe9aPEdJyWoHutCKt5f9ES8Eaun8J4T0+IqsUCiJZZUs5Ad2IqK9E+omaK6lRJ7NXWgS9FLYUHvYXATr1z44RYY205CDF8LKlqhEzrmyAg8VyuEiKdFH+d9XTWfpRfRipqJD0w9YuaFsiWu3f+IM4MWQqZ1oy337+mzjkRJN0E7rzkFLNa1WKOHDCNQkbtPDMJn0MMf7cb2nM3jyafstxlltLQMLbtDjkaFZjE8i3Ksgd+jNj61 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)(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?q?cCFDj11h2PT1CC0GgP5Wb5iKHs9a?= =?utf-8?q?Va9xSd00W1k2LTfawHRZXKHeUCHPP6dLzRi8zCBGDklOLdzXecBej4IcDPdjJbbDT?= =?utf-8?q?GMXQXF+54ejTcS8lhHJe9wNQBMk8HuwfHqUr4OAx7MkliAht+wzCmZI0OTdONVqi2?= =?utf-8?q?r+AKjQWk9tkL3gF2EVFEeMPiBmqtpcDh4sjty1jV6MGbfn16q3806/wHEA+2ZkaXh?= =?utf-8?q?YpPdETKdfCrt5+F6KZMAa8wabYpb4zbvGeP+ITe3grR6PUt/bz6cg5yokeHwdJgJj?= =?utf-8?q?2ZG0M+uwLShx6Mo12+O1lZ660QuRBelct7YU3A5ThxruxKQDKDNuVBTAZhPuNrECw?= =?utf-8?q?HeYaL0JUtHTGr6SC95x2OiPtdTL9y/9bnlcbnsoOSkHmM5t+cxmjzojRiLCsqH1vd?= =?utf-8?q?vlXTGaPCPnazN3gIFYVcBhED/mnBfn+TX7Zr+lYgNLLN07ytBskbvR4OphbQq+RRX?= =?utf-8?q?mDhTJP33G3GeLUKtKXiUm7G3KvyDUPj7JnWoK2cPv9wFWMgnozP8LdqAhzFdVTTy2?= =?utf-8?q?WLytbEkR3Lms9x13VNiGoRN7nqZ4lT5/a7mWZeXKAXn1g9BsV0gXi3dlFkyBIjiAb?= =?utf-8?q?W+g04qEoEXEGne19n2DzNDG35W/cnU6aw8eUgCOxNX0eDB3zzbd1N6sAR8KRjfjpc?= =?utf-8?q?IAac1OSocjIoYdaukiF55aB+Lsm9VeOINkblogrGhuy31K/OsjB+YX4UjQkKmmOLg?= =?utf-8?q?1cWHb2NWH3IAJaDikWgGBCLngJ1IyRvM7afTitH5Uo9Wm8b0stX4wjIhzBHWdwhum?= =?utf-8?q?o2jzgVQb19FKb1lJpLzjjTh5ED0nqDQUu3BAfFULETTQ95qlpXmywS7MaWbsTk33w?= =?utf-8?q?OELJ8vDLr6zr/7JXodcXLOosQYDxR0Oj93Q+Xj4vdAgIedK8p2FpqXNlnfopmADqN?= =?utf-8?q?EkTGrroXXlVT2hpA0C6FU8P/IqfTbDGdymPHIydEfLV8VQvBMCrdhdmqzi3uQbSaY?= =?utf-8?q?bDZkzQxJegIlJ0wwCjJZHPs92FJ8eSLhE1ggW/oBmd9m2P4E58fRSxlfP4CHOQ/dp?= =?utf-8?q?ef2m8UbfU2j6ohzx/POUCnVOf2NVqRNKitT46sqitT2BZsmZSvstRwSSiKy3KxfrZ?= =?utf-8?q?iV6f0UfSNeplAOdYwhqHa/CBqCme5z/vwPhKOGLs6S0YKNVRqxR8BnM9+H6ibBnFx?= =?utf-8?q?fwR43svtQc5/3RGX+AmtO/YGInaWED5grB6kvYb7O+2dSQdIfHbLRwxUAstgGSVjt?= =?utf-8?q?xWH4hgByvMxMCe/fMGm4enJZx1uteVS6NcAAWKjb2RV8gqqzcIN/sC+aSPzMlh5nO?= =?utf-8?q?oqSipNcTXCDZ1KuQr9leRMCqUXnu075DEKxuy5B4be4OxXwAPf5W6A8LGxGf+oMOS?= =?utf-8?q?y8MeO4tjwaUAiQGyIdDQuZ0ecVWJ+TiDeNS9LbJ0tTjNYuZdaC/Xq3qWO1sxyBgUB?= =?utf-8?q?gzD1iYM1n+ZnHbHy9InCf3uf4720xbvDIbtMX08eygnF3q9M6wPjVesZ8/8SHUqtE?= =?utf-8?q?VeG17dX0IF86spGHh2KbVm70ujjNCaG+ZfheHdHGcWC/7OXxRiUKZU2ko4ZSL+VXm?= =?utf-8?q?oqcdt96vqQ5NKn/rCJo5LRGUDev4chQSmw=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: ab101633-e105-4a71-e1f7-08daa80a61f2 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:37.5304 (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: Z7K2p35HV+Vrd3fzr4yb2q6OEjiDfw53RE61HANtQj8zOJn7zdq6rmuQrk/Au+Pa03/4E+Z3X0Y3hZJCs9PDbRV4OgYCPBdaQWujjkRKPJI= 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 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;