From patchwork Fri Oct 7 02:18:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 117525 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 E12C1A0093; Fri, 7 Oct 2022 04:21:30 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7977442BCA; Fri, 7 Oct 2022 04:19:53 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2114.outbound.protection.outlook.com [40.107.220.114]) by mails.dpdk.org (Postfix) with ESMTP id 4FEAB42BBF for ; Fri, 7 Oct 2022 04:19:51 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LIyof95T9NZxLGYpJwNdqZP7lN3nd5Jx3kQ2H9i09p5PIo/NCja5Pj7F/rmdJQvEeeEMG8HLqi4Dr6LTjnuNuSd02S5acgGjOR7P9gbDNDIOLEw8lvoXDs7TB+lYnhkF38tXbp85oIDxFfnbQe6Kr/58NMJBKKlswSwdPvzZXmPmX+jx6V7hMkbui35NxK00QTowlATDy/j8t4fAAJlATw3HqOLpeOuqa2svfdLjwXkYugUfy74cDsUEObp8vgY2bQJ5ObwIyxDs5nsY0OmWx2KUkdJmwFkUDPtxYetI5dukbcObyezOfCLWLP/DQ8l7bPmaMKWPyKXJauc99nsdbA== 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=LHgulSVzepzvVDJabWwVp3Hzbwc4pfdmlMmXSCHwnuI=; b=kSl/pRm2RmnKqrat+d5yLFazZzJ7rMDNqCMaw4vYKvs5LuUx/LfCb2RJ4h0dzKFBIZ3sVNsO8qDS4DG4drR2gdreB1e+1ZAgGAXYdk5tBfDTvlNRWZhswUDv43gu+Z9RCF0u9Q9pUItVHm1Ds5kBXJsuiynLWeauTMOdiNAwh8aGen8tVcg5/2XXrUoYmo+DJO/RxiKCGvnmoi12y650ux5aUXU8cp2pVm4BC6fam8lUeZ/zJBs+XabFso2a26gxwLXk02g2EyopYMb4CgrrXQp67aDGjA1NZSC8yG6rIY9SDCaLZj/D6b+xdqplOSa2C+OHoJHO9Wqgx7fN6Uy4CQ== 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=LHgulSVzepzvVDJabWwVp3Hzbwc4pfdmlMmXSCHwnuI=; b=DrqX+BRaxzhWqDjS2NG4JHAxfNiIeqgVuDMIwuQiYSKwPkhKg2dvu1X8TSg6R6ylHH5lwV4Z/XKh0O0lrTE/pQ5al3AMX5Lvz6s/8xE7IaEBb7mWDROWMP7jJa3tCsr4RWZfy1k8ZzcRbcBJVbV97W7RQZraaRdI/j/S7NAinfs= 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:50 +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:49 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He Subject: [PATCH 20/24] net/nfp: add the offload support of set TP SRC port action Date: Fri, 7 Oct 2022 10:18:42 +0800 Message-Id: <1665109126-16201-21-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: 5921ad18-d735-4354-06e8-08daa80a6946 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WRe1DwaqmNtG4YQJYufClRxjM1AdlAlOGnF7xXZ+w9Q9KEu0O6QmpVb6oDRza2JOw1WD70olPI5dbGbZw6DBLdZNeayi0WVXpKdgRzNwtYUSsT0vHdmat5FSTL+ib7iYeGrg/NxawyKv6SD8cOhmixXD+2K7Orn+H8WofAkowYHrkK6bzVwGUMD8zJg8p9PYIMC12bqUtM3MU1FekkEu9Zm5UZyokZl1krRl43KUS/BvpdU9Sy9CCrmKMepuVzLBS7HiFqIngs102nIqntxY2LgTF2oFdE/40RdsE7oYmxgiQ/j86t5wUMFJaXNwjoOuadaCFkdwUlshoZ5g4tHt9IIJh0XKQANrJVgPGVCs3jlyYybGO7Rdfa04jW65EmmYdLCb2Tgn4HBExp7m/U0Y8UMitx9PhKO+Po3nU31RGoRXtQGe+0NWjrtywTOd63IuK23m0BkaapjdfA4kwTNiwtmMVDAWGudNg38QF6HSmRFQSkiEr/5qEktmRLxnyQQEcAqOd7o5RdhDAGrdCHxdtCqG/AuxFIw79Wh2YotgLBI/Jez/8oWdx3aSZd97ythEjjmmZMBAPQmnhoaVoiRIh3HZWecc+7kNzf6knHWf90lYve0jcCjhkC6xZyoE7aKUJZISixX/Vr8NWWgkrI66lo8epHpD4tfzGpbzsv1ps6H8ZprPkFwDHxkE8TjwUBIWEE8YSiqH+ToR3WGbiZYtL9iUb4qZKG5ozCJX5/XGpg6ChmAcz2cFTa0fnM7CU2Ke 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)(6666004)(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?UfgqkaLCorM5Y5laSwla4pQ/I9Wr?= =?utf-8?q?sV6/HIphL5KuQoOUF7GHiUvFr+KvJ5NDQ3gG/LkFWGfoRmqUNrdrcAkDyZqz38imD?= =?utf-8?q?4DMnXZuYw/GQxL1FQP8/zi4iw7DbeDaAFKVcUBUIsYbm1tgp04yudiT1OYit92oW6?= =?utf-8?q?oFp/QPLlbS0dRcq19Tdw//h+9q7ZvnP8TRo0JoM+xQLlCact8D9OTZm/hmOvgcgJx?= =?utf-8?q?Ilm3lFJfi0t275eNLZ4EzZZAx8qoXI3mT/zX4azAT4s70+jABlrSiPl+pUYozu9uT?= =?utf-8?q?aTzFWIAmfnyNNZ0XJK1IXRkhQshR7667rPPdp76xaWRT6gIib/wMvYAcZgyNIHPQs?= =?utf-8?q?AvSNMDy+2SoGNCpDCMOZQ8kH483nzPt7K0pp7DnvlC4n+wQrbiDuKo51Vs+2LOcW6?= =?utf-8?q?2hX7XbXrrsc5bY7kRq7gsznExM6L07tibnhcS0pp8bmRJhKDlAuaiN+RRH5JkuljP?= =?utf-8?q?hvhvmk96IXYT4ojW2uPEw/RE7d7kzQeLHXVlm6dBIxCjMKinAO8Bqg5w/x1q0HZf0?= =?utf-8?q?M8x+yIGny2s7HATJ4dwGwP4EpvhHYLeCK3mKbXK6MwQrPVnW4L4J8PQSgDVf/dWHZ?= =?utf-8?q?pQs/iCWBfP9r2ncyWqr84K2bGAd7bF+udiH6c6/cVcfEMsw5qdqoLfKUJXhZx3U4p?= =?utf-8?q?JlxYgSMC1TeQ4jNjnQCPJjirJJVeu1NNzpmgqEhrTS8gLgypeHEy93YeSVgSUvpDu?= =?utf-8?q?0iDHwmGETLmDVzS7/X+HDXhCnERc71v3KIwicIpTW47Uknfir8TIs/KTOFS207GGN?= =?utf-8?q?bmrBD21FXi3m7VR7omL2oTSIdLVuTopyqBE6OExZRqgzjzDTOmjDIWIEKpMPS7Rlu?= =?utf-8?q?DkHqHmwDgaP+dfUL5KsoPUc94nYg8PPoHYXmDJFBJ57zsw1+9hU6eVHG2AiSR/r1n?= =?utf-8?q?iNmxgJNaDwlgc4Ainhd3EUlo3h3m8hRrQffWB1UegaZZLdFdjoo9qPZnpl+8ARTLl?= =?utf-8?q?rvZbNCoDo9rA8RM+rPNcgUv8Jk/CkSOmKlz8nDkwobxX61jieAgJqHbd1KAlxNKRt?= =?utf-8?q?g8+vn/uhHr6miRh8eTsqXCEumKUc/wcNiF10foe4bxhrck6xJuUxTWALvX/FahRFw?= =?utf-8?q?hhdfqLIPgmyqjNvE6ENtUMP2xDlpQEKn1JAAEC+95GrArD6ZSFHWjE4D/Freow0Jf?= =?utf-8?q?ri+cboVLDYgv9FcvScJx/XXpjAxnu01zSlg/0EB4gKQVgwR0QsT60FmGHByn9eVk+?= =?utf-8?q?ANU3uSzjWmlhfj/IlNlTvcj4tMaAaUMXVfrpSGcY/9lrToeoUnOT4Qhw5n+r2owKW?= =?utf-8?q?5KaDlvwiZZQgJINzaXaiBLElYo94nFJUwIFk9LlUf+TFHWM8m9CVGDSbLyUzximJx?= =?utf-8?q?T3zyF5EKBhn9tjgRUzPjeMcp05BHt2WyS0mBCQh+k07JQ5/dMRXxSt89OEU3FlXBb?= =?utf-8?q?GV8WTk/1KAPSSZKM9I1MGUEB0Xt/brZ1izye7GGJe91v/twqH8lEhzD++sG5yZ7fK?= =?utf-8?q?76lduBb8Xsta5SQrUm9I+8637QiP7VBJql9WaUG1zhpsjSWUjvlkS2SWmNOPzWZpX?= =?utf-8?q?yWqZhWxebF2sWrQSX3dFMgDONJVWIV1Lwg=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5921ad18-d735-4354-06e8-08daa80a6946 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:49.8338 (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: qIn1yXE/Huy2XyA+OqH49ORn2jQ9NRCRsfRtz+OR/spFcsZLNhEkQMrIJVmebxbtxSsFMPIDRA30Bg43rOM73xkpqW/CwUPC8Hxes3ocN/0= 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 TP source port 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 | 21 +++++++++++++++ drivers/net/nfp/nfp_flow.c | 44 ++++++++++++++++++++++++++++++++ 3 files changed, 66 insertions(+) diff --git a/doc/guides/nics/features/nfp.ini b/doc/guides/nics/features/nfp.ini index 16fdf87..68f5b89 100644 --- a/doc/guides/nics/features/nfp.ini +++ b/doc/guides/nics/features/nfp.ini @@ -52,3 +52,4 @@ set_ipv6_dst = Y set_ipv6_src = Y set_mac_dst = Y set_mac_src = Y +set_tp_src = Y diff --git a/drivers/net/nfp/flower/nfp_flower_cmsg.h b/drivers/net/nfp/flower/nfp_flower_cmsg.h index 45e50dd..26de8b1 100644 --- a/drivers/net/nfp/flower/nfp_flower_cmsg.h +++ b/drivers/net/nfp/flower/nfp_flower_cmsg.h @@ -432,6 +432,27 @@ struct nfp_fl_act_set_ipv6_addr { } ipv6[4]; }; +/* + * TCP/UDP/SCTP + * 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| - | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | src_mask | dst_mask | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | src | dst | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + */ +struct nfp_fl_act_set_tport { + struct nfp_fl_act_head head; + rte_be16_t reserved; + rte_be16_t src_port_mask; + rte_be16_t dst_port_mask; + rte_be16_t src_port; + rte_be16_t dst_port; +}; + 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 6c53fba..96bb69d 100644 --- a/drivers/net/nfp/nfp_flow.c +++ b/drivers/net/nfp/nfp_flow.c @@ -575,6 +575,7 @@ struct nfp_mask_id_entry { int ret = 0; bool mac_set_flag = false; bool ip_set_flag = false; + bool tp_set_flag = false; const struct rte_flow_action *action; for (action = actions; action->type != RTE_FLOW_ACTION_TYPE_END; ++action) { @@ -657,6 +658,13 @@ struct nfp_mask_id_entry { PMD_DRV_LOG(DEBUG, "RTE_FLOW_ACTION_TYPE_SET_IPV6_DST detected"); key_ls->act_size += sizeof(struct nfp_fl_act_set_ipv6_addr); break; + case RTE_FLOW_ACTION_TYPE_SET_TP_SRC: + PMD_DRV_LOG(DEBUG, "RTE_FLOW_ACTION_TYPE_SET_TP_SRC detected"); + if (!tp_set_flag) { + key_ls->act_size += sizeof(struct nfp_fl_act_set_tport); + tp_set_flag = true; + } + break; default: PMD_DRV_LOG(ERR, "Action type %d not supported.", action->type); return -ENOTSUP; @@ -1374,6 +1382,33 @@ struct nfp_mask_id_entry { set_ip->ipv6[i].exact = set_ipv6->ipv6_addr[i]; } +static void +nfp_flow_action_set_tp(char *act_data, + const struct rte_flow_action *action, + bool tp_src_flag, + bool tp_set_flag) +{ + size_t act_size; + struct nfp_fl_act_set_tport *set_tp; + const struct rte_flow_action_set_tp *set_tp_conf; + + if (tp_set_flag) + set_tp = (struct nfp_fl_act_set_tport *)act_data - 1; + else + set_tp = (struct nfp_fl_act_set_tport *)act_data; + + act_size = sizeof(struct nfp_fl_act_set_tport); + set_tp->head.jump_id = NFP_FL_ACTION_OPCODE_SET_TCP; + set_tp->head.len_lw = act_size >> NFP_FL_LW_SIZ; + set_tp->reserved = 0; + + set_tp_conf = (const struct rte_flow_action_set_tp *)action->conf; + if (tp_src_flag) + set_tp->src_port = set_tp_conf->port; + else + set_tp->dst_port = set_tp_conf->port; +} + static int nfp_flow_action_push_vlan(char *act_data, const struct rte_flow_action *action) @@ -1417,6 +1452,7 @@ struct nfp_mask_id_entry { char *action_data; bool drop_flag = false; bool ip_set_flag = false; + bool tp_set_flag = false; bool mac_set_flag = false; uint32_t total_actions = 0; const struct rte_flow_action *action; @@ -1518,6 +1554,14 @@ struct nfp_mask_id_entry { nfp_flow_action_set_ipv6(position, action, false); position += sizeof(struct nfp_fl_act_set_ipv6_addr); break; + case RTE_FLOW_ACTION_TYPE_SET_TP_SRC: + PMD_DRV_LOG(DEBUG, "Process RTE_FLOW_ACTION_TYPE_SET_TP_SRC"); + nfp_flow_action_set_tp(position, action, true, tp_set_flag); + if (!tp_set_flag) { + position += sizeof(struct nfp_fl_act_set_tport); + tp_set_flag = true; + } + break; default: PMD_DRV_LOG(ERR, "Unsupported action type: %d", action->type); return -ENOTSUP;