From patchwork Thu Oct 20 02:19:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 118698 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 3EE0FA0A02; Thu, 20 Oct 2022 04:23:13 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E3E7C42CC3; Thu, 20 Oct 2022 04:21:42 +0200 (CEST) Received: from NAM04-MW2-obe.outbound.protection.outlook.com (mail-mw2nam04on2133.outbound.protection.outlook.com [40.107.101.133]) by mails.dpdk.org (Postfix) with ESMTP id AC99D42CA4 for ; Thu, 20 Oct 2022 04:21:39 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CTeqdHgCoi5JYNYLqXrzl6OORVuVtsOGXNnncqacGnIqMSaXV6VDEaUDBNa0sVBpyS5h/yBRUfWcDiYBZcLZ4FzwE66b/Mh3wJjPK/Dun92kthTYt5nPsmlyL6XZSAUCI9THt1E9e6V+HTgP6eII1EU3YH5ozHkIowSZuBF6mTZKmrPOoYGipYPZM/MjZmDH0iLdEc+qsAEq2ErHPVbMMEJ+Je8p/rscQKROpCjnU195Ma+cHifZErmNJ26NPju4z2no35PZHwLWH/0WcYfdHxyXSwQ60G3M31bxvnx0zBIM8JDgLMsW2Ncp6t8f7QTnZbE6bGEWWtbI41odBVY1rw== 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=l+lLOqk2K9ya1dp2aYSudGTRwv1UKHfio+gYtsgU8ZM=; b=WHCKcMleq3LzU0v1gaKD4712GweTAejoTFDtUQRvNqSdGuaNMffuV+tIa82NkbxDQOSZGXwducBXECIILrF/hvojlJcnYUoexG3CCqC4WTgjEg2x2ZpsxIA6J5iyNhULzg01N4PgLUvkUj4fX63d4q5JDDyN16yTbQXUhKTCMQk7f87chPDFqxC/t5AfqjZVmQfpatRdjill21wJUh9rTk+dic2K6fHBL9lXXRg1navVNLS5BAHjGmDTo6qm5kHclQQZfo7GX7z8KyF4uexY0FDAdY6z/X3vhtAzSs2HHcuCLKqicC3hfGCo3COyxhzIEFzK4lvE4I3rCIPf7Ig7TA== 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=l+lLOqk2K9ya1dp2aYSudGTRwv1UKHfio+gYtsgU8ZM=; b=vQ4MlYZ71+JdfP1K32yhIjd+XUrJCCpA3gtl4w73UulhEKEaSrx6xtcHjxgCVAMWYDIihD7tV7T7V2kwR6q3eMqs5IqOmcwD6xgXSilM5oU4DvVG9pKZ8SM8VJCZnwDxearLMDj1Z5vUSixQfMMiEeF0EL3lchLKdegSc7mJ/28= 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 CO3PR13MB5784.namprd13.prod.outlook.com (2603:10b6:303:167::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.20; Thu, 20 Oct 2022 02:21:38 +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; Thu, 20 Oct 2022 02:21:38 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He Subject: [PATCH v5 21/25] net/nfp: support TP SRC flow action Date: Thu, 20 Oct 2022 10:19:47 +0800 Message-Id: <1666232391-29152-22-git-send-email-chaoyong.he@corigine.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1666232391-29152-1-git-send-email-chaoyong.he@corigine.com> References: <1666092434-10357-1-git-send-email-chaoyong.he@corigine.com> <1666232391-29152-1-git-send-email-chaoyong.he@corigine.com> X-ClientProxiedBy: SI2PR02CA0048.apcprd02.prod.outlook.com (2603:1096:4:196::23) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|CO3PR13MB5784:EE_ X-MS-Office365-Filtering-Correlation-Id: e799fd7f-70f3-459a-df87-08dab241d120 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SE5gzH3NjQP7zWKUaYRG3AfFitPLMEhuT2UNAERRcTmevx65grH4kB13qwpyLV6lsyeEvk1zoH+T7ZSoyTWNw79ApCFKjXMAffOuuuGdpm4jko8WkPG9qHF8goV0EiaHiIFx2FG/CdTwEQee36FQHmR2eWm4d27yMCfqTmVR4VrsKrSfbs33JlQkfeYo9T+OQcPbTQSlDLV1AGqf517rANC+nNzWzpgz97jvphPie9XL8ZjAqTAlaGRElLvr/cr7Sr73ZQjBYIhiGTNg4RCkj6c0ke/B8lkeDAEc7ndGQbe5vNqMmTMWnPzDQnaPVTzwzvCVSgMheWl9ookqZ+XmVNx9G2gKu+fH2HJHGDvEVJUpGJ9SPjgb1p8r9jXi0KWBIO51VI+dYXZ4yIdjl1KolEUDfoiyL+S+YSlzyhc8Qcqu2263KuFZgiJcZ+eqS9Zu6Kg2GIsStHy5UkMSIZFBRfXMQXoqGTg/LfjGUzv+AzvAnSU8Ddfs4C2Pg4TcLUrzIpqYvY6xQ2/UodGQq5pml/aP9x5UA/8qpTJVaWYZ6ZD3eE2JYW0E6npZ7j7PsK9OwpZ8EDVsRl2NoMayYAaJCyN7dndXXWxfE6mQ8XmFFJLF19JhxgQ/YqEoqofzpM/iUz2fN08fu145qE4jROgrZUbFuwFMjXhEuUFkXKhEx98ENCgsWWZa85/ZL8UoVxS/L4aPbESwmsO1/YsGd2qqcuI0JX35xYgaxwnRDjINo3wMpqll5Kv7R7Eh9FRoWviD8sEUcn0sHQqya2gg/oECBA== 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)(136003)(346002)(396003)(39840400004)(366004)(376002)(451199015)(6916009)(44832011)(2906002)(316002)(8676002)(478600001)(41300700001)(66556008)(66476007)(6486002)(36756003)(4326008)(66946007)(5660300002)(38100700002)(8936002)(38350700002)(2616005)(6512007)(52116002)(186003)(86362001)(6506007)(6666004)(107886003)(83380400001)(26005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?5dkOmDx1rnRI0GBVUAzna2/bPmgi?= =?utf-8?q?aGLHWjyuWGAWfjMF81SQs0v/BJyPFn0xZ77Y7G8I0+TjqVfAyHfqOzqmyh/LArMrR?= =?utf-8?q?A/EU42B4COEzt1FnTSL+2/w/w68/HP36tQZlh4rj3+RHSIofdfQz2mHABZ0d2toXq?= =?utf-8?q?TB0xsI5xhILoRqWvWUP8vwC47/U3qgD62ZKG/EfDz2r46gQjeLhR1xUY4dkfDExV0?= =?utf-8?q?FCbfQWENIUjy7RRaLDvXCL07EQBwBgaSXz93XGrSQfQmI287xFgPZLqGSJsZFsgXz?= =?utf-8?q?5tN21zmj0L4q+HgASN4CO/FnMTgMk0zOW4nHl27w8ee5Qz8VfRXQkLjwW6+KCIOsU?= =?utf-8?q?sRsiBPnq9LV79Rb26NILtHmNtNaEHF2v9NK281ph4rQ67VluKvoHnhND+3xOkdR9A?= =?utf-8?q?8NE+f/o6GO1coUu3SpPgRB1dBMp/A0h64MQO2DAaFnpqkAeNuZiMECY2ZiJWSn8M9?= =?utf-8?q?6qeK0KkjVPZUWcU/6pDnskkK1eMLhLWZF9Fhok/mOrmM4izSr0/YTmiEB4W29kXYI?= =?utf-8?q?o3Tts27TG8eLTK1ek45iOr24RiOkv9BIbu2Ht0jWKbmvkWX2jX4Sdubx4S4pTjXbA?= =?utf-8?q?l9rR2Lp7zuPz+EA4C1ImA7xsW1Y9D0ePkw8KHGR6uzbLYJfOmAwRZFoSdimT98Fbm?= =?utf-8?q?FYs+P8Gpdt95M0SCJ1rVUh3b4VTx+jQcCSBdqsxBHbw49PIwfnhlI2djooVauxDzE?= =?utf-8?q?5DV/wkh658SWOiGXgV/bqlM5CsIWkQxDmDsCD/SbNEZx+kq9uTMbLrb25taypLKbx?= =?utf-8?q?+i2+OSQxp7P13us45vWFz7UQQWOwILaNvAvWKGnClCiQ38zt9ykQzKqKY17utE45e?= =?utf-8?q?kyLSCsrQjijkLLGx3eS5Mh14OHIWUr8VOyHXfBrGU7daEbPFd/eeDpH5CxSvOv+TL?= =?utf-8?q?kWSKjpNEnbzbm/GjkGbqpRRAIVm/vain5EonYyB5lY4I3ogFxLrcl2ExTNTRyfz1c?= =?utf-8?q?tfQ2ZGpu4yNEpAJMSnuWfyjsM/0OLid2pBZSKdPsPU7jvsbhL0+Tsu+32621rcbJ7?= =?utf-8?q?e6jHJlDbh9thb79BIJsXz7vAsEo0yq2lOgR6DW1N2luubWtYddn5RkHIM5+7E2Lbg?= =?utf-8?q?iSIhtgoC7GGRmxedeFaFbza4WSAFkn2So1Wj8HE5MxVLV5LfSOVVcwxp1EUrKTVPz?= =?utf-8?q?pNcCflFun26DtbHKK9tkpT45bgjEK5lAmmU5XEvker0ndphkqqU0i2d2mjfhjUj7i?= =?utf-8?q?GvfzuOG7Cq+04RmoWMgoHMWsZAr7jLW9WPfS2UNpp/4tt+Ws/EDSABOUjPYxU6kPt?= =?utf-8?q?ma2HRki6KX3lwmC+iZH1Y6vsweBBBCTRA+GH69hH8ubMQqYt+3FNpZB+NU7LBP+PH?= =?utf-8?q?5jLV79KPvk3PRtTS0PEWHn/ZSBjsuqRbuWGgo12tZmHjTY4JZjzb6kfFpyTvEBuPD?= =?utf-8?q?d+Pwx6upayFrpEhJtIVq2jgYcWIwJBObhJPTMxMhhN5hPH0Q7pSFnlOs98kCud5oH?= =?utf-8?q?22CUdmTq7ZJO1pgcMcAuPvquX7KCVzVdUOQWZyuUILIgu83K4Z6PmvFnFjQRmRIWA?= =?utf-8?q?NaJezAlShGnQCKMJIGruUNk+9Z77SHvYcg=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: e799fd7f-70f3-459a-df87-08dab241d120 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Oct 2022 02:21:38.0994 (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: TryYGq6/y9SNB606uko7OCD7L4wDx3XRM45kIEpSIZRRKccBuUeB9Y8se5WaiZnS1VHRFhr952aixQ4ck6X2tSHT3BfOdYQMG8apuoJ36Hk= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO3PR13MB5784 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 5fcece7..f3ac51c 100644 --- a/doc/guides/nics/features/nfp.ini +++ b/doc/guides/nics/features/nfp.ini @@ -50,3 +50,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 29e7b99..db05a5e 100644 --- a/drivers/net/nfp/nfp_flow.c +++ b/drivers/net/nfp/nfp_flow.c @@ -563,6 +563,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) { @@ -645,6 +646,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; @@ -1362,6 +1370,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) @@ -1405,6 +1440,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; @@ -1506,6 +1542,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;