From patchwork Fri Oct 7 02:18:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 117517 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 D4B7AA0093; Fri, 7 Oct 2022 04:20:43 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0DFAD42BA7; Fri, 7 Oct 2022 04:19:37 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2112.outbound.protection.outlook.com [40.107.220.112]) by mails.dpdk.org (Postfix) with ESMTP id D764042B89 for ; Fri, 7 Oct 2022 04:19:34 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=B1xfHKZnh3Tw+/4+VibLZm4aalY+S7tTuFrU1mlq2pcMkkkjrLX2ePJV5RhorQMG8zffEZHdGd9ZSO9SUBB8AISHTtjG69kLd64B9a/6c7duLDApOWDNsw4NaaGASiXAYTTXPDkk8SPIzDpso52H8kCc5aM88GhegZb+c25PGWuuHwDoU6Lgbf4HROQBD0AWuLrbxhjqqEQsYy7ZKJeHSF3Kxr/NaIEFiWxj3eRGL1BLaBO23bDdMOL19qRLdsGxAcfdUftUwKR2FcSFrtcN6a8IiddIzsBK7nq/JlI308fuqRte9w5+UV4JvipvZG7xxSQT4eS3DjiZnwsdatjwxA== 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=3au/qz3Jy0pPUMaAnEL6pPLsq+g0USTmnARjhXrnGZo=; b=Lo0fliJHXv6txsYL31Dd/X6Rbxp1DtPUiDehxaH099WNaFE75z5Bro9jGXfslhhvwG+MWylXRu7UaEb/zZXWVxz9C6n7tCwaWwYtdknBLSfcT6VrNZiV0+1SZ2kBQWOSng3xncjGYt0gSTPcCncqw86TfYOdUaM6cTkon95ud/c9Ap1RH70t/BcRZz6W8T5/Y3NAJtEIrjKrRystAnDAtECYkhdloguyG/MUinNYQeLGYChelzQ37Hh7lHyXAjsyYOursmHE0ngkTz8RhRDCxdbMAHbwgSKg3zEtZf0E2m1AGpUET6SGXpnIeZV/pUGigNxvPZrjo0C4380Isf2Xow== 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=3au/qz3Jy0pPUMaAnEL6pPLsq+g0USTmnARjhXrnGZo=; b=f4rQduwGeerho4h9fTzXQrHocNDQDkt9ddaewbA/ziIQxG1LAzvC1VJs9eo0wN2MN/9Iblq9rYYcYbcH+FLLrE8zUeJV+jJiiYWYahjod+1kgYdWi6zFv8kD6WqHWR+sxUcw9CXHZX3Lik+sJdtLK77MaZR3Og+eExTNkqlRCyY= 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:33 +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:33 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He Subject: [PATCH 12/24] net/nfp: add the offload support of set SRC MAC action Date: Fri, 7 Oct 2022 10:18:34 +0800 Message-Id: <1665109126-16201-13-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: 68d7e44c-a87e-4a02-78df-08daa80a5f84 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ZLu4ojw32fLCGWaE4llGRp7sedShsa7t2SFA6CZCyZQrlb2QZ/ijtRZWMDTF9eyTjKMQkePuPCTr2/s2hylF1C8i5Iz3v5QP6Nn6x9emO3zTdtH1H8xWoXdWLNUEdECuph2gIDxDkuraZq8sefgmi/95YqCYBCsw7qTYEhw7ddyG0mdVm623ZnA46l2//Mbipy/MefjTQvQiWdyDBrjyOxz3r/ko00UUjWtTVb5eAgnx4P3FBNUUldV+/CYs/+DYH6sVxEEz0lmDZz1adFNpIkqJg4nLlAQuDG+1uUkcVjxZ6dZYRqjLfjWO4kqmKvPcIa9jrE5Rhh5UipcYmRwdQrD5s96yNWdDCQUBhZ8C2U0+lSsI7J57cuTuz9Ddtuu0aCn7KAlDVms08l1X8w3uKSn5jqYJyJcVof711eLzPkQeplovpLXA2zmUXZrYePsFPkC2nuP1YrtshZP/0DS8TNUKmkdEdP3ji5FA8/qUrtLzIT0RSKZOQsba3AQh39k46eOlZfJct3O58NfCPlEMl+54RcgF6ZRrTRymTJ1A300Q0eNFtuxLYCylj/yelRjvWm+3ccQ9YtaCsmG46hx1mGFdgm2T/dqKwUnogj7BPLTx8F7RoSyfp4pKpKkVi53hWUnH+g79CrLaEeod7HaYMCmVTAwM8UaQdgLEdxzAfD/WJg9q1scc9veb0aiFBxUgBgp3YjyPbJkrKZhz0r4KdF3F2a5ccaSuqYhS2RhGhkwvP1GWSS9hJCQnFSJrCaLu 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?AjnU9SQIvufiJChucWMqfvtkraWm?= =?utf-8?q?BtSnBypJn9/M8NwtWGAFc7qCczTmOE00b6r1G7QtsJqWIdQoFRNIhNo378LQUVe3Y?= =?utf-8?q?8SUsnY8EAsXGoPjccVLVFExLrYHv6lXrAe8OI31/9N06kAU1EJPu/fFUjD6kCkV4L?= =?utf-8?q?tb/rJCJ9w7Us6fVlQAwrZ31QuvylDPNuaE+LP69V/nkRb9L7wRln/6+y+CKZTOhC5?= =?utf-8?q?fXT86XZm79+F1e0WeroCvGqX49XyX1Tk3eaIpMFfhUv2ZPEEDRblQx6RmPIfDQ29n?= =?utf-8?q?lmWEkNkK0ECbeJP+KmGf65u1wcwEHI5XBzFb5ctXBfYdJnqeIjxo6lu6Ly/HZcINj?= =?utf-8?q?ghYZ09haQ704bz1Q6z/VwCwhMcn3u70YlvanxjTCHdFkb+tkABTigVajRC1TjCksH?= =?utf-8?q?LSc1uvOsQ1ehA/TrothZzyNzZOXzz1zrJ79GBN7WQbPEy6YwKZ9oNDuKWIwzZVgnn?= =?utf-8?q?FwABxXmQlg0AOh4QBbsSt3g0irO/XaakyA2vgB9MQ9wq9LHp72eQyFMB6TESfyMLN?= =?utf-8?q?A+3ZttzAfGwSQ30DAZsBEqwToEET2R5YivVUtDPt2ghSafBuDXI+hq1cZeNSwkoo5?= =?utf-8?q?o3qkmDTX4YDCGTYvM2Fhnb7KuiPl+qfw1NeinQS4dstjULolKZVgN5TUpnFYH04ie?= =?utf-8?q?szfeD/hJEpo4LJRif163360BttCiN/N9JYgBDiiQeWvgpi47L646NYPROOkf+IA4b?= =?utf-8?q?Tm1uTQo4aXl8DFvFFa4qhcS+PDA6dMu41JZHkGzW9V4x0hgbcPfPDhlNOOKGhQiHE?= =?utf-8?q?ybsXFqk9ge9054Ygnx1ZFsv9L/LvtlCDL2yEsWSu1eSbUj6+xzlOnv/Zmj883FUJ5?= =?utf-8?q?qS8LYp6Uk83kZecM1l23Ujxx9T9/KrVnYNgkbKNra3Nood/TdeU/uCfIj7UtiLqNk?= =?utf-8?q?wiR/+wwr/nh4uLFwg/j4vxYRGvBCQXJILhy/Eqlmjx3ZQ4r7Y+H347THjQp+jOC8X?= =?utf-8?q?fnOuZPfM2RGRPfQleRCla4f49Nnlh1OZS52mVscy2lhepKd/XSA6j4oxrMjZtq3lc?= =?utf-8?q?43MaUXYR0UnZWdXUz2wElCOC/tDATS/UjeOmZTwdMzwwyuULH7XEyqcFVC10fyhW/?= =?utf-8?q?IJ2fsso0//P5mi2Q8Gj8yR7UQ91mxojr4Sr1rP7wWnUJTKQeS/zIfRkv2poIzef8l?= =?utf-8?q?9NlHcEyGEIYqepEePLEtfZIs9rwfq4GetzxvyP/szvEghr91O/Q9GJ+55Ejo2wFJ2?= =?utf-8?q?Bk+wDYLX1eDKdoF1OBbLveFyrBwrdK+VgweVNWr8GO456Qf2SrZ3XH2YUcAGzCbTC?= =?utf-8?q?V13dpjjFnUa3JvCvp5rfDThErbfQykZX5wZkjUB/4/cUCBJm/emjbPlyK0XshUgC9?= =?utf-8?q?SrEvWxriTO05/LkKnMtJoHqT/0+mRZM1GL5ch1oRzt4RhCdk0Py5ez22yf3gfDkSQ?= =?utf-8?q?fPc4HcFoG0TFkOQhM/4pqzrw/Q8/gynQ5YqTXl+W0jn/crxX0YM2AZCQhfHqFtTLL?= =?utf-8?q?4zwKUh/2y3w0kp9DETL6duRtWonynqj6HQJ9JXPn5XZazA9dgfrMiWgOMtW1kcwwx?= =?utf-8?q?bS7fOiuNOJeltX5wP5umeGsIeG1pmH+x4A=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 68d7e44c-a87e-4a02-78df-08daa80a5f84 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:33.3565 (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: OpaUspMHwqqTVRa/GhEUpSJ6Ou6VxKvnsexvdztDbdJAM0RF4uum1yAf4wncQmGhXV3bh3EQh1Hl9cLN06PLJ7Ir4QB30uHr9qHE9ditOEQ= 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 set source MAC 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 | 27 ++++++++++++++++++ drivers/net/nfp/nfp_flow.c | 47 ++++++++++++++++++++++++++++++++ 3 files changed, 75 insertions(+) diff --git a/doc/guides/nics/features/nfp.ini b/doc/guides/nics/features/nfp.ini index f8f2577..ab6ddab 100644 --- a/doc/guides/nics/features/nfp.ini +++ b/doc/guides/nics/features/nfp.ini @@ -42,3 +42,4 @@ count = Y dec_ttl = Y drop = Y port_id = 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 36d406f..b61342e 100644 --- a/drivers/net/nfp/flower/nfp_flower_cmsg.h +++ b/drivers/net/nfp/flower/nfp_flower_cmsg.h @@ -335,6 +335,33 @@ struct nfp_fl_act_output { rte_be32_t port; }; +/* + * ETH + * 3 2 1 + * 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | - |opcode | - |jump_id| - | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | eth_dst_47_16_mask | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | eth_dst_15_0_mask | eth_src_47_32_mask | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | eth_src_31_0_mask | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | eth_dst_47_16 | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | eth_dst_15_0 | eth_src_47_32 | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | eth_src_31_0 | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + */ +struct nfp_fl_act_set_eth { + struct nfp_fl_act_head head; + rte_be16_t reserved; + uint8_t eth_addr_mask[RTE_ETHER_ADDR_LEN * 2]; + uint8_t eth_addr[RTE_ETHER_ADDR_LEN * 2]; +}; + 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 bb445ef..431c212 100644 --- a/drivers/net/nfp/nfp_flow.c +++ b/drivers/net/nfp/nfp_flow.c @@ -573,6 +573,7 @@ struct nfp_mask_id_entry { struct nfp_fl_key_ls *key_ls) { int ret = 0; + bool mac_set_flag = false; const struct rte_flow_action *action; for (action = actions; action->type != RTE_FLOW_ACTION_TYPE_END; ++action) { @@ -603,6 +604,13 @@ struct nfp_mask_id_entry { PMD_DRV_LOG(DEBUG, "RTE_FLOW_ACTION_TYPE_PORT_ID detected"); key_ls->act_size += sizeof(struct nfp_fl_act_output); break; + case RTE_FLOW_ACTION_TYPE_SET_MAC_SRC: + PMD_DRV_LOG(DEBUG, "RTE_FLOW_ACTION_TYPE_SET_MAC_SRC detected"); + if (!mac_set_flag) { + key_ls->act_size += sizeof(struct nfp_fl_act_set_eth); + mac_set_flag = true; + } + break; default: PMD_DRV_LOG(ERR, "Action type %d not supported.", action->type); return -ENOTSUP; @@ -1221,6 +1229,36 @@ struct nfp_mask_id_entry { return 0; } +static void +nfp_flow_action_set_mac(char *act_data, + const struct rte_flow_action *action, + bool mac_src_flag, + bool mac_set_flag) +{ + size_t act_size; + struct nfp_fl_act_set_eth *set_eth; + const struct rte_flow_action_set_mac *set_mac; + + if (mac_set_flag) + set_eth = (struct nfp_fl_act_set_eth *)act_data - 1; + else + set_eth = (struct nfp_fl_act_set_eth *)act_data; + + act_size = sizeof(struct nfp_fl_act_set_eth); + set_eth->head.jump_id = NFP_FL_ACTION_OPCODE_SET_ETHERNET; + set_eth->head.len_lw = act_size >> NFP_FL_LW_SIZ; + set_eth->reserved = 0; + + set_mac = (const struct rte_flow_action_set_mac *)action->conf; + if (mac_src_flag) { + rte_memcpy(&set_eth->eth_addr[RTE_ETHER_ADDR_LEN], + set_mac->mac_addr, RTE_ETHER_ADDR_LEN); + } else { + rte_memcpy(&set_eth->eth_addr[0], + set_mac->mac_addr, RTE_ETHER_ADDR_LEN); + } +} + static int nfp_flow_compile_action(__rte_unused struct nfp_flower_representor *representor, const struct rte_flow_action actions[], @@ -1230,6 +1268,7 @@ struct nfp_mask_id_entry { char *position; char *action_data; bool drop_flag = false; + bool mac_set_flag = false; uint32_t total_actions = 0; const struct rte_flow_action *action; struct nfp_fl_rule_metadata *nfp_flow_meta; @@ -1266,6 +1305,14 @@ struct nfp_mask_id_entry { position += sizeof(struct nfp_fl_act_output); break; + case RTE_FLOW_ACTION_TYPE_SET_MAC_SRC: + PMD_DRV_LOG(DEBUG, "Process RTE_FLOW_ACTION_TYPE_SET_MAC_SRC"); + nfp_flow_action_set_mac(position, action, true, mac_set_flag); + if (!mac_set_flag) { + position += sizeof(struct nfp_fl_act_set_eth); + mac_set_flag = true; + } + break; default: PMD_DRV_LOG(ERR, "Unsupported action type: %d", action->type); return -ENOTSUP;