From patchwork Mon Oct 10 06:08:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 117777 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 37D6EA0544; Mon, 10 Oct 2022 08:11:11 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3210042B86; Mon, 10 Oct 2022 08:09:56 +0200 (CEST) Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1anam02on2136.outbound.protection.outlook.com [40.107.96.136]) by mails.dpdk.org (Postfix) with ESMTP id D90B640687 for ; Mon, 10 Oct 2022 08:09:53 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JMvqX8T16T7brwFno0p0O2twwGNMAO+tFV59ZrRz6KKhOjth8h7nx/zD5xTGjMgYoM46eKt3F09iK/UPfvJTS8WAXVRXbq3J5AlyYreSavQMc9w0dpdZAf7Csog6WCKD4OsZ5GYE0SmfPvwqNujgudim8iV4E+LQUIOIY9MlpKoVZUBiz5EcLqeb5ZXaD2Fr+fv4wYIYzSaDiOfJ5M1fi5GoI3Otn2pRl8OTX+yLVuWPbzrzMKXedXIGc1+xUogAczaA9pbzlApiB3IufZwNiW++ERdFUd1Ag/PlRICVLYedOjaHDawbLuAc85PsKQ8OkXeFt2TbiBOHFoWp+GQTmQ== 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=dUNtty/jKQv1SYlZqk8hxGjyDwvt5AVpHLCFLfPP1pM=; b=ABvwxSpd/7+6Pfe6GyW1rn9zGCWDXzMBqm7C/VieYyNKLTczRREkcP/K/k7G1jxLQqQXXU6MN9/A7RMaCm/tRXpE8SZ8HixVV2hc5kIL5siQf0oHUnnf/etKak1j/ZHVjUdGmRdfEK1jsFwkjThY/4PDZgq45iKStGHxwv2EofW9o8xlXwaVOthhf17OzjT6sF0uBkOpMI8lE9RjJAazMEe14B1DwOa9b6+gXudKudaBVu8sZhgtAPI76UFDU3jOMlpUuFDjQO207Ws01y8quO235NCyRlj/vlH6OogIHApJINwmzGX/fTVu4mHToWmMFuwBs/fknCcpS2k51OqtWA== 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=dUNtty/jKQv1SYlZqk8hxGjyDwvt5AVpHLCFLfPP1pM=; b=KDYPaXNtqryvKgdcLbrzGZYBjDp02vrjdV8xfdIM57SiJFjXos9fqnVrH06XuFyNMpelOJJjIrxmiCiSjwuZ9Zy2umT4JNq0WHCSzlSPYBVJIdIwLLhHmGQdb0BiPzbvBw8BJCCjf5VF9AkilPBj14CYKGeEtdIslhq2DW9oZQk= 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:49 +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:49 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He Subject: [PATCH v2 15/24] net/nfp: add the offload support of push VLAN action Date: Mon, 10 Oct 2022 14:08:53 +0800 Message-Id: <1665382142-21684-16-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_|SN4PR13MB5296:EE_ X-MS-Office365-Filtering-Correlation-Id: 36f13ae3-7c9a-40e6-aaf1-08daaa8609ec X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: KS08kdBmj7EuNwGPHiUTF9KwlW3NHssp8JQTkyTtqZ/n4oHpSOTulFY/RtdVNwnyESpKAb9Mrhcfmw7j5ivQVp88mlIWRjQi71OzEw3g8f8aUr55r5zMLuKU6a8ZYGQ/wWKhIuLTZ38qCsekq5h368fa4znujqglFft3w/4iAwSa8Osv6UVq3aMMMz0P1P+J9w/kIzUOuoEKHsPaycxJ0x68KyC+RmHmo3zSzfjjhmh1vbAHMXcNNyXDhj3eF3+QVkMfrvgaEEzK+r9mufuiCjQ9eKzVKfjtZCHoeKB0HgUl/VAPGn8cEeXk0/kd6xOKDKzRvhTJ6g/Ojz4lTOQdw7ASzJss/Wht451zqwd76B4215Pv7IYEWfMp4pAjNbUUR4tcP2OYWS6bzL1muqQyEs3lNRLUsrL20zRLN0aD/+P6sAZAp3Y/cPQJLgqmf/nfKx7TnqoLqxSRzzwaL+II17dI3ulAnTjx842dwn5taDylfN+44QWqDvk92YgY/IKSr17pfMh1rAtXxvOLijVaVf5trQa8H0iiU0fp3JxBH9kv9UhLBt6i1ByeQvMrDKb4w+utfbw1dhUGli3KT6LCNsqUOVsD1HD1qT+Vr3gXtUbSSRnyjvS4B7EF0SA76sapPr5wnrm1R+/DyVVF423w28/fOATTJ75Q8ojBmfnzA8R8dgoUgIXtbj0hlOOr8q8bhzr7REzSIDDW2lI9KiZrft7arpFqrDIqZAbGLtrMc6JBfjnsCrGmyU0fHR0XpcaV/rO7nJSjqIkcUvooYb1qp0bzZgfNC4a7sxOE6r21yKv5N5Om1677+/ZJJ9XpzoUh 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?q?1gDX6tGJ6nwVV3NAJIH+KZxNHYtm?= =?utf-8?q?0Fu3dh6dopC89jg6h0EjltqP4VUahLwnouKpZ3FcYea1bgExdxShBlpzNXgt1I8CW?= =?utf-8?q?jy7y6bE7dVcFm1uwc7qGM+FC+F0oaCZKsUj9Nzq93BTG+ik26olO7luU71rOdtFa/?= =?utf-8?q?qWfMyZd5Tu5kTN+NMW0GoCqJ8bFC4zj0yG4m4Zb+L59Go/LYz7C2nAqGPgsXk1IjL?= =?utf-8?q?wBJ4GhIpZK1d+fHKhr375c1mekQEagI2Z6q8W6gYstoZWuN5vJsBk46UtwuTYsmLu?= =?utf-8?q?7Pi7mLAcWrdA+QEzk/Mkx6/rZsorUdrqZ+qrJilzaSYUlWllwkmBjESlN2Ar2PO3M?= =?utf-8?q?SiPysRi2km9vrXW1eDtl9p7NzfeAaWVPHw26WOUyciKwcuZYrDypE4NE53qWJHlfm?= =?utf-8?q?r5DrlhmMzf6U+j8OhkaLzf1ox4d8QcKyH2LuKnVVD/hkUUcx71MOXg7tzxgCMBafk?= =?utf-8?q?hC5Th354Z1KN1Yz6p6tUyvtqClG3HtFqjypVv4VQCmqYN5sNGF+nQR+AWMS6Ra/tW?= =?utf-8?q?1gMicIzFV2r5sedaIFBYavXGGIerps3oUJgJJcnqbHwJCnME3pu4c2aeNOQpCt6Hx?= =?utf-8?q?xn646HHa056qGrzayzVf1eClEEOhIpio39A/aqNWPxf/Tqp7z7U5IyGi2NXxZwrog?= =?utf-8?q?rOAb6sKwxjkwv3EnAoG//y99K9G2ZAY4xhiIhE3uPgzhxSlW2ay/VF3idakJtWlvW?= =?utf-8?q?USM0MKouwCQnYPhj2B1IDLwY5CRzyDBycBlIbS92Urlb9L1ke5IxfMH4EmFotC9gL?= =?utf-8?q?ngUPcHNJgXYx4keueRKk9fVeXGkgW9yxUd6Uj7L7gVuZRFoF8pbcMR+6Up2vSdmqe?= =?utf-8?q?MxTgoZS7Y8dpLKtHlMUQzgF4xBxOAbr0kj99CDSZRnfu43RaIcGqTlt8J7pA+WCLz?= =?utf-8?q?jKsyXig5+BLG7RZ16kv4zmG/1U99iCxF3geCQlonI7J6IEm8L8O3hcRGxNdWbV/Bg?= =?utf-8?q?An/CK3mLgSr/MfrRXmO6VA8La3vSpr/jY/MQrbQ+sJWFCphQ9mIa4tdVYFMQ6gfFQ?= =?utf-8?q?NGDUNMbTyQWrZTOtmhEb9ns4Rty8k8/h6iBNfi1lRJLaV34Qbmo8V+8HxFJ7k88ni?= =?utf-8?q?Lrbh24Ulr7p7FEGwYjzk+boGSSs0MF97tMO/JJ7FQdV2fcJYMGIjHnPJlF3FJBtuQ?= =?utf-8?q?CvafOPgdXVZY9pd9uAR5ZSqVVKIC8eVeUrU9ppq33Fg5hFGRB5VtPK4dny49EatM5?= =?utf-8?q?4HLWO/MjHs8TW7EzIq5LFTPfzA0J3B6IleUH/zVDZ8PphGHpAI9wMtenK5DD5LXtm?= =?utf-8?q?xOY512hhvxvxzWs3qa8zKjftBU4r9boBBMvDCLMT6izYNTo1J+n/Q0qpc0Uxy8JeB?= =?utf-8?q?m+Vgxn7MHmPhiiIhYNPjZqS5X4QbLZpQTrDvqqhbTmGO84Ib67wPF94OU0NpxkKgF?= =?utf-8?q?TOYkRJDXDvFqnOGEDRXBBC2QJ6V3FTg3KsaOiujffEVDByDKGaefTfky94p9DtGNY?= =?utf-8?q?t4NuR5z1GLqQTHeQujt6Xs7dIgGFeMgifhqo9xEH890wK88zBW8tAfo68b1EJsA6G?= =?utf-8?q?SWF2edWFYCYSN2S8qQ3a29ibFX+aFnaEzQ=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 36f13ae3-7c9a-40e6-aaf1-08daaa8609ec 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:49.6364 (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: yOX2aj4xzaKNl66nW5Kg+XHqNj5+MVM2DP9WiKj6XABOpIiO2Fkylzm6VnDWdPmozDcTTiNYu4B/HegbEAh5BCuoMolNExGusVtc0/Goa0s= 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 push_vlan action. Signed-off-by: Chaoyong He Reviewed-by: Niklas Söderlund --- doc/guides/nics/features/nfp.ini | 3 ++ doc/guides/rel_notes/release_22_11.rst | 1 + drivers/net/nfp/flower/nfp_flower_cmsg.h | 7 ++++ drivers/net/nfp/nfp_flow.c | 60 ++++++++++++++++++++++++++++++++ 4 files changed, 71 insertions(+) diff --git a/doc/guides/nics/features/nfp.ini b/doc/guides/nics/features/nfp.ini index 95d1779..514e0ba 100644 --- a/doc/guides/nics/features/nfp.ini +++ b/doc/guides/nics/features/nfp.ini @@ -42,6 +42,9 @@ count = Y dec_ttl = Y drop = Y of_pop_vlan = Y +of_push_vlan = Y +of_set_vlan_pcp = Y +of_set_vlan_vid = Y port_id = Y set_mac_dst = Y set_mac_src = Y diff --git a/doc/guides/rel_notes/release_22_11.rst b/doc/guides/rel_notes/release_22_11.rst index 1a2caf4..5128c0d 100644 --- a/doc/guides/rel_notes/release_22_11.rst +++ b/doc/guides/rel_notes/release_22_11.rst @@ -167,6 +167,7 @@ New Features * Drop * TTL decrement * Set the MAC address + * POP and PUSH VLAN * **Updated NXP dpaa2 driver.** diff --git a/drivers/net/nfp/flower/nfp_flower_cmsg.h b/drivers/net/nfp/flower/nfp_flower_cmsg.h index 4ce03da..30a9ff5 100644 --- a/drivers/net/nfp/flower/nfp_flower_cmsg.h +++ b/drivers/net/nfp/flower/nfp_flower_cmsg.h @@ -367,6 +367,13 @@ struct nfp_fl_act_pop_vlan { rte_be16_t reserved; }; +struct nfp_fl_act_push_vlan { + struct nfp_fl_act_head head; + rte_be16_t reserved; + rte_be16_t vlan_tpid; + rte_be16_t vlan_tci; +}; + 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 fb06085..d66bcca 100644 --- a/drivers/net/nfp/nfp_flow.c +++ b/drivers/net/nfp/nfp_flow.c @@ -622,6 +622,16 @@ struct nfp_mask_id_entry { PMD_DRV_LOG(DEBUG, "RTE_FLOW_ACTION_TYPE_OF_POP_VLAN detected"); key_ls->act_size += sizeof(struct nfp_fl_act_pop_vlan); break; + case RTE_FLOW_ACTION_TYPE_OF_PUSH_VLAN: + PMD_DRV_LOG(DEBUG, "RTE_FLOW_ACTION_TYPE_OF_PUSH_VLAN detected"); + key_ls->act_size += sizeof(struct nfp_fl_act_push_vlan); + break; + case RTE_FLOW_ACTION_TYPE_OF_SET_VLAN_VID: + PMD_DRV_LOG(DEBUG, "RTE_FLOW_ACTION_TYPE_OF_SET_VLAN_VID detected"); + break; + case RTE_FLOW_ACTION_TYPE_OF_SET_VLAN_PCP: + PMD_DRV_LOG(DEBUG, "RTE_FLOW_ACTION_TYPE_OF_SET_VLAN_PCP detected"); + break; default: PMD_DRV_LOG(ERR, "Action type %d not supported.", action->type); return -ENOTSUP; @@ -1287,6 +1297,39 @@ struct nfp_mask_id_entry { } static int +nfp_flow_action_push_vlan(char *act_data, + const struct rte_flow_action *action) +{ + size_t act_size; + struct nfp_fl_act_push_vlan *push_vlan; + const struct rte_flow_action_of_push_vlan *push_vlan_conf; + const struct rte_flow_action_of_set_vlan_pcp *vlan_pcp_conf; + const struct rte_flow_action_of_set_vlan_vid *vlan_vid_conf; + + if (((action + 1)->type != RTE_FLOW_ACTION_TYPE_OF_SET_VLAN_PCP) || + ((action + 2)->type != RTE_FLOW_ACTION_TYPE_OF_SET_VLAN_VID)) + return -EINVAL; + + act_size = sizeof(struct nfp_fl_act_push_vlan); + push_vlan = (struct nfp_fl_act_push_vlan *)act_data; + push_vlan->head.jump_id = NFP_FL_ACTION_OPCODE_PUSH_VLAN; + push_vlan->head.len_lw = act_size >> NFP_FL_LW_SIZ; + push_vlan->reserved = 0; + + push_vlan_conf = (const struct rte_flow_action_of_push_vlan *) + action->conf; + vlan_pcp_conf = (const struct rte_flow_action_of_set_vlan_pcp *) + (action + 1)->conf; + vlan_vid_conf = (const struct rte_flow_action_of_set_vlan_vid *) + (action + 2)->conf; + push_vlan->vlan_tpid = push_vlan_conf->ethertype; + push_vlan->vlan_tci = ((vlan_pcp_conf->vlan_pcp & 0x07) << 13) | + (vlan_vid_conf->vlan_vid & 0x0fff); + + return 0; +} + +static int nfp_flow_compile_action(__rte_unused struct nfp_flower_representor *representor, const struct rte_flow_action actions[], struct rte_flow *nfp_flow) @@ -1353,6 +1396,23 @@ struct nfp_mask_id_entry { nfp_flow_action_pop_vlan(position, nfp_flow_meta); position += sizeof(struct nfp_fl_act_pop_vlan); break; + case RTE_FLOW_ACTION_TYPE_OF_PUSH_VLAN: + PMD_DRV_LOG(DEBUG, "Process RTE_FLOW_ACTION_TYPE_OF_PUSH_VLAN"); + ret = nfp_flow_action_push_vlan(position, action); + if (ret != 0) { + PMD_DRV_LOG(ERR, "Failed when process" + " RTE_FLOW_ACTION_TYPE_OF_PUSH_VLAN"); + return ret; + } + + /* + * RTE_FLOW_ACTION_TYPE_OF_SET_VLAN_PCP and + * RTE_FLOW_ACTION_TYPE_OF_SET_VLAN_VID + * have also been processed. + */ + action += 2; + position += sizeof(struct nfp_fl_act_push_vlan); + break; default: PMD_DRV_LOG(ERR, "Unsupported action type: %d", action->type); return -ENOTSUP;