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 1BEABA0560; Tue, 18 Oct 2022 05:14:37 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 057E042B9F; Tue, 18 Oct 2022 05:13:24 +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 9C41942B8B for ; Tue, 18 Oct 2022 05:13:22 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dtxVfPsHswFB2E1VxKvjIIjWRhNuuVTALKdEj4M4Qac1VjWOl+ftsrosXYXWARFY2OxzyzwC2quEBRyznFJ33FV78abpA3jybWA+k6dId0uJCeM92Rk6G7vIjvJp2OyjYpCiVHxpaeOQE2yJLcuLgGSg2/1149gtGDSu6jL1u0YU4631IPJAZ+AEbTk3F5cAV4hkNK/ds5Vg0rBNne73bnyTk9VcZ/Di+QRwENt/c/iJjn3eolC3yRYVscf6bh+FTPRyY8hj/uFaQumjDOgwOXSxHhbODdyye2vqhOHmXhyKGaUPGIqBZxm7JqDh2baeUoYnfwYnIcyC/8QygYrHgQ== 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=StkkZz4KsEIOUYzpEBBS76f6Qxr3uqYvzssiV5k41p8=; b=czSPVbXZmLGjxNFdPxvbY31mTyTK7Y9tHZhiiUYYdgrlDeQCTo+q6zULvQeNZ0YbbreHznCfUTQn4VrGNsrg/7be3z4Ya/iyoyb25xKr12KiMFhvhYtzFHPC3r8Y4j9SUQZeons1MIFnuWclEtP/aM/qIlOszJdy12HeVRdIvllZ+vc2oq6u6T01sKp+K2W+djtCfkb7ZU/dKnAAL9pRwYMnpVN5g3rtSB2KrOO2/NSvHO0/uvUuvpgr+SPwdfGaj2znHGQbmVJrtjArzEdfuVHSPemz9fmCeYEyK4ReAUbC5+y8mymDrXym8kHycztFOqMnX4WZBxotaFmQAZWVkQ== 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=StkkZz4KsEIOUYzpEBBS76f6Qxr3uqYvzssiV5k41p8=; b=Ov9UpNR9+LsoqsuoZu2rgvwIaHEdeoxFBHxK7UA7dg3oxrszDvzdscTXst1H/aynCvZxEe63KOLY9bDLVC9qab5Ltm2QUu1jy5Ff4nibXWFuOQ5HoUKUUvZDVAal+HtQsYORwl/zUVQuZE3b5BI/CBJaT6UabDC8JYXUVfg3hw0= 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 DM6PR13MB3865.namprd13.prod.outlook.com (2603:10b6:5:1::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.20; Tue, 18 Oct 2022 03:13:21 +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; Tue, 18 Oct 2022 03:13:21 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He Subject: [PATCH v3 16/25] net/nfp: add the offload support of push VLAN action Date: Tue, 18 Oct 2022 11:12:23 +0800 Message-Id: <1666062752-33689-17-git-send-email-chaoyong.he@corigine.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1666062752-33689-1-git-send-email-chaoyong.he@corigine.com> References: <1666062752-33689-1-git-send-email-chaoyong.he@corigine.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-ClientProxiedBy: SI1PR02CA0010.apcprd02.prod.outlook.com (2603:1096:4:1f7::17) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|DM6PR13MB3865:EE_ X-MS-Office365-Filtering-Correlation-Id: 38ca35f6-9d3f-4089-30ce-08dab0b6b601 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2s/V0cqZXa3Hsnk00ot74aWlgO27wZYtbEUfEsrnyOmN8oqRhqPRzW6jLZVpiATvBfYeeVsyJGnMfFXfI1/eqWmIlJ/MtR/Nl/A/yfUvVW08x/xajm6AILtHqLhnfwfhsZX9+wonfmqd5Y+5WGdq2b9IoBsOS5suO1Nyv9ZbaKXLldYtjUKaKstMDax0TS2+PKpFzsuRGEJHF9AA96WHfaAFeIe6NZDjXBUtG3+ehS9yne7NnouGaHLXa9iTNXOcwG2vL2daPCpnU64vC2lMOh6ZJ66wSRzdbs6awggQRdVhY4MELcMXEu31nbmuDRm8Pw8sNNKjwKh/gblp1e2Nefs3jmSTMjziW4t2Jgyvq3hajsQQTNgjtdfre1Dndi1rfRoI6xTV48SBzK/IC+6gh8QbmaReIQtkLLqCNAMV2DUJ6MZimrpVOWODwMNU8cZdce05Q9VEo46etIGildqeT7yBPevuQW52ffTRFfXMWG8FjHvZwhe6cQkAiBJPFXAKyGhCyCHrfyc/p3oDv+KcFvEvp25cMMXygoK245EHWWSLD+vIYJq05rSGFnwoUon5Ra0eEoAzbtNSagvIgrlGDTZ7n4NIBis0VS0wKSK7VixMacBdN1kSpN7PopZwHPthTAhk1Zj1fai48XuTvNckNJDaEvLm+DT8TMixVpPMDZXWHtTHCEIUpx6Ljuore5tD5o78cEgjgDwvDFC+BTD2ZAp9GGtHkO0eKuJVeLK6OtcSjce8bi7WUv4NUl3+QC5TEE5iCkAaXHIjXaRVImoZOg== 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)(376002)(366004)(136003)(346002)(396003)(451199015)(66476007)(6916009)(36756003)(2906002)(8676002)(86362001)(38100700002)(38350700002)(44832011)(186003)(41300700001)(66946007)(66556008)(8936002)(6512007)(26005)(52116002)(107886003)(6506007)(5660300002)(316002)(4326008)(2616005)(83380400001)(6486002)(478600001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?QTlSRzRxTnFWN1VlSUNCOXhQVzlzYzhmYTk1bk12RFJnRVkrRCsvQXVwRFVx?= =?utf-8?B?Wm5KSmMvTUxwb3grMUt6c1FsWmRNSmFwb2xwci9iZXIxUm1qNnFNRjBCSGtL?= =?utf-8?B?V0lPYTV5azlTUFM2WDFGN0pxNTVMQ2pQSjVKekMxUnl1VVUzYzhqbWpIVFor?= =?utf-8?B?YmwvdXppQkVjNEtWcE9weko2emdROW42SUlTMXl2SVJ5d054eWhmMWV5TGRs?= =?utf-8?B?R1NsNVNzdFZ2Z3kvWElXQU1lY1M4eFlOUW9nM3FlOFNJdEJ3MWU0ckR6dlpq?= =?utf-8?B?blRPdUcrdm4zSVVockN1TDljZXlVYmo2YUVCblRBbHowZU1na1pBOFhFK2JO?= =?utf-8?B?TzVmaE1NME5uREtwN1BadUdiUGhBSkI2UU5qOG1jL2duTnBzM3k5V0t0N3U0?= =?utf-8?B?d2plL3F3bFJDd1RkOWJKamJjd2pjTE50NmZUUHdUOG1DWWg3UzREOVNLa1Q3?= =?utf-8?B?U3NlWVZySW0zU0tjcVNnZWY0Z2lNa2lUVDhPcUoyYmtOQS9TOWZkZkEyY3BH?= =?utf-8?B?a0tiMVhsV1FPMWZzT1RibjhqUjlpREF1amdDMG51UllySDF5b2VpVlI1cmps?= =?utf-8?B?L1NiNGVRUjVtZFJkVXdkV3VvQTZWKzNLRmhRbFk2amdXQ1FYVTF0ZGMyNzMy?= =?utf-8?B?bDg3VnRDOU0zYSs3MGlsUC9aazJmVUpIbXprL3YwVVByT2h4TzVqUExhenVS?= =?utf-8?B?YXgzSHZGVzlEejluNCtmSW1xU1pvR2lwc0xhRzlLTVZtQ1FSR0tENGY1Wm5t?= =?utf-8?B?Vk1BcW0zYm5EUG1VbFFuM2cxYVpRcU85dG1TRXBhRXBaR2hhdy9XWHVscjA0?= =?utf-8?B?K2lFN1J1ODRtRHN3NytTMWFtNmMxY1N3cDBlN296YmVhSko0OTZIczkyUGRy?= =?utf-8?B?aURUOUxjUFVLL3RPTGRGVjJUcHdBMVlWd294QWkrUks0dTV5eHY5MGZaNVFr?= =?utf-8?B?OEhHaVhuZGpLRFpBbzAzR2owdlcxWXN6RUNGZFUzNHZnbXEwUFVvQ2tVUGxl?= =?utf-8?B?YmpnNGJzUVdzcG9HZFhHbW1aMkROTFE2QUxpcXM4ODkyOURwdU1SUXFHQ0hx?= =?utf-8?B?UWYxejlGRnhwZEFua0h2NzAxMHg4cXhqUk54Rm56WU0wekJDZjBHalRzL2hm?= =?utf-8?B?eHRqWHNnQmVPSFVKSnNiak11N3V4Tk9ob1dGNGM4ZnhvR3FrVi9SWVo4MTBQ?= =?utf-8?B?bGxkSXJWMjExNitmNnZ6Qkd1OTNPTlQzSkRJZEJGVzQ3dWRKV1ZWeTlnRXRx?= =?utf-8?B?aGtWUWxxYWJLdVBzTXRVUTVWRENzbTYyWFFxcEtiOWJMeGlxak5vbzQ0b0dk?= =?utf-8?B?NVEzWmVPa29TLzN5ZXNiQ01hWEUwbGxpR2dieG5IcEVMbi94akZuSEJpUldJ?= =?utf-8?B?NlpyQjBEdHE3MGJlM1ZZbm9GdmxlSUNaTzVKeVZFQnZYcC9RanRmbHdjQ2tV?= =?utf-8?B?ZjhNU0lNT3JOdXJFVkhDTzMxVkx4RlI4T3Q0MG1GdXBBMEMxalB1cjAxckdv?= =?utf-8?B?SDcvcmNEalRwellkQ2I1MmxZa2YyaXhTN3BzNFFXbU9Ra2hyM3VNZEhhNnVm?= =?utf-8?B?Ykd1K0tMWUZTUm5BUSt0NG12a21WSVBDSW1BSnB6T2x1eVdKajZlbUJwaDFk?= =?utf-8?B?RHRDS2pkRkJTbTU3UmczUVBZRU0rQVBNNnhtRC81ME92UmxSa1N0bXJTM2NG?= =?utf-8?B?cHp3SGZlZ3VocTY4QWlOOU9FYlRyZ2lKcS9XanpnQkpLUElzcXpFcVNsMlNj?= =?utf-8?B?WFhiQjJlaGlkTDNzdVpRTU9ZZUFOUWZKRmxxUGhCWTVzR3doNXNReENyMVFM?= =?utf-8?B?bFQ3MU13UEozUXh5NWQzMlU2MlNuZ245bFY0RkNKcEM2SzBZSThqVG5xc3hC?= =?utf-8?B?dmVETnUyRU5TMG5ZN1d2Y1dVREREVkhsczh4dmhzVkFTRDJkY0VDYjc0QXF0?= =?utf-8?B?R1lxcmtmL0ZZWC9jMS9oUkFCNStUY0pyZml1ZE1pUE1ZWUFCckx6QXEvUkY1?= =?utf-8?B?Zi9lUktjd2xpeHRudkRVMXdQbmF0NGgwbmsxVitTdmJmV0RBTStJTkdKR0o0?= =?utf-8?B?NGxzT3RESVB6LzJNdDlyTm9GMTNaYTV1a1gxYmU2dkhYejZLL2U5VUV4SStw?= =?utf-8?B?bmpCZDE5TStVMFRMVHRWcXhJdk5EeU5KZlh0TGdsQ2l6VmVnN0VoaVFsWDZV?= =?utf-8?B?VUE9PQ==?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 38ca35f6-9d3f-4089-30ce-08dab0b6b601 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Oct 2022 03:13:21.1808 (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: D8eT7Va3nHFkQP6UzyeeEwdmz9KGuZupRsuaQroiWJQwESE2rr0vP1TpAS02XRKOrnNZQ0ZtqN/VzZIWCXkKODCaID5nXADrfM5tOYvYHzs= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR13MB3865 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 222996d..96e9360 100644 --- a/doc/guides/rel_notes/release_22_11.rst +++ b/doc/guides/rel_notes/release_22_11.rst @@ -179,6 +179,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 123ab5f..88bd415 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; -- 1.8.3.1