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 0918CA0560; Tue, 18 Oct 2022 05:15:06 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 71FA642BAD; Tue, 18 Oct 2022 05:13:35 +0200 (CEST) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2101.outbound.protection.outlook.com [40.107.94.101]) by mails.dpdk.org (Postfix) with ESMTP id 9B62942BBE for ; Tue, 18 Oct 2022 05:13:32 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UY+VsRRA8LcgAzeqV6s9IyKM8yYqKBh1FCH2nT1fISTTKUIJNckpaNiosrmG4c+qZI+dscGnzvQz/YJrkNxlPlq1n/ThErF5bK7TiB2xzcV7wlyZNmKWT/fhANBdJ1KckRe+B4l5kj5zHeu76QmWkYPpFk0IHCDr7FuxPnzPct2LwyiKmiJsLTHZGMqRuF8hlpj0wOiy28HEqE8LcOd3Hig2EZA1rkQwu6JDyaoBfq9DEgx3lhBnj/s/MDZu2iNrXAL9THZdZGysJUsll373O/quqJGOw0OwZkBafzdPqrf2G1Hl5JR0Gv1VN1y2zRyXeIuXZ8ZEn92EJNoMaJ7ibA== 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=c7yqy+8H4S9pMbIjFVEyqjxR8U19LqzZ0W08lB5u9D8=; b=Uw/TbIMHfBuS/ENlCFsoz4aV4RgH0Zah56j0xiuYpzJBCR6Q1230OpqU/kIAiATKGxW/a39E8iDldVL3lCEyFuwaF3WIjSYNXkG/7oSXaWVnlaEs3On33N1l6w/BZHwU9CjfGyuACoyXR+ZTja3hxQi9xPaQ1hVysbPvyeFR16E+vzIwk1JGLCvsqrlCYRkshMNIoTUFnEomvzowiN1EfTNxxDZX56yXPpYm+JHWnjog4WGDuy6LvL3sevohmkgTVYRaDPlPjtIthmQ3EdHjyPZYkqwHeKoQNXbfXkw/CV5ccg9bN/Tn3o9e4+DWbROAHIrtv4f2BkycZQ9z+roXtQ== 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=c7yqy+8H4S9pMbIjFVEyqjxR8U19LqzZ0W08lB5u9D8=; b=ptN2a5thLzqpmJqu5l9DHpSTjgQthHNaFZquG1YR9E2N/Pegr2kYP9NQx4WiHvDo2a0btH7YHnKpYex8tG9BK12JKiV2q0rYz8OKLtJgZ8WrDz8ojIgxplBt0UB5j3IuY/2LOmUUFf1wg9hl6nqw0uOc3J31nv9a+fe0iehCquY= 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 SA0PR13MB4093.namprd13.prod.outlook.com (2603:10b6:806:92::17) 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:31 +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:31 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He Subject: [PATCH v3 21/25] net/nfp: add the offload support of set TP SRC port action Date: Tue, 18 Oct 2022 11:12:28 +0800 Message-Id: <1666062752-33689-22-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_|SA0PR13MB4093:EE_ X-MS-Office365-Filtering-Correlation-Id: d167001c-892b-4069-94ff-08dab0b6bbe4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YEvL8hvHIL4D+rZ8RuappCG694eRXZmeWv63WapnQIgeJkEQX2dM0ycM4955ZZEOv65OHKYzF7SrJzZ7CxRmawvSGfwuoIzJkXzTf1N7N9tZpF5nIvAkZhdT3JvIOu5tW78sPNDJ3VxSqIClw6N+BBGYfIMFYaXrFZk+Vkl+IIViBsR2f6DxomXWU3CPWeaGY66qVj/0526wX01+YGTaPXsLCS0VNSuzfTntG3L/gxHFS8WpsLsZImxrLrzwaCWMBNrX91VZwGkmQnl9hnpTfAnRH/E7o23khvvSpbHm9WY/6q9YoTT4pkBlUWNx+E3yARrcXx36zvOMeAdV0rlhBckjm3k2O6V1leevYJKHV2LIHGRrwKFpiOh7wmoXh+ZKwYxv7l7eGPWBidbM36RTempAzmLbI6EWAHtmLpPAtkhY9UwjfAIBMrgImV6BoQyb0zbzoFclbYg9vBxEqvmTqPSvEFVqFw9U70mpMZjGysZf5MiI9/R4xQ8tMAVOEQRBA42dzQrC/jQp4Upr3MkaoE/LiZyn89mC7LMpwtzq83iUEfct4GclCYDe4k8eVrQWiZjdDKUpO5f8GdlL+A9bAieo1PuJwsYVxWusXjmwnHO/tZwSDRZoPihFJdkEx9jD6H1KoPsNGwh/aGObVMtADLN6KPl9ia49ihcfN8wkt1DZAiHT4HIDYWBPpZXRAAaWjlhsMxxPXuqL+T4UMUI6dy/aYtTW5BajFmaCcZGm8jaQwD1zLZTuA8v2Zvrsd7eLxnVM+P/L+AeuHHoTIe90Xg== 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)(39840400004)(136003)(376002)(346002)(396003)(366004)(451199015)(2616005)(44832011)(316002)(52116002)(6666004)(5660300002)(83380400001)(6506007)(26005)(107886003)(6512007)(186003)(6486002)(66476007)(8676002)(66946007)(6916009)(41300700001)(4326008)(8936002)(66556008)(478600001)(2906002)(36756003)(86362001)(38100700002)(38350700002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?cEtRc2FRQ0IyMXpVQW5zekRtbDBvK3NCdG1na1ZkdEFYWWF2N3lNdXJOVE96?= =?utf-8?B?aDRYaWt1SkNteDNyVi9WVXJDSkExcFpzT244QWRublBRTjhUV3puYnFUM2tM?= =?utf-8?B?WTh2KzQ2NXZyM3AvVnZEc3p3UGdKTm13NWdFZGw2MDltazVXZmQ2NHVQUHo2?= =?utf-8?B?RWUvRmVZblRsQ1dwQnhlbUpLZDRSd2YxRkZ1bUs1eSttMVhsWnYxVGNjWmlO?= =?utf-8?B?cDZieHZPMHVNQzg2Y2NBMjNXQ3liam5hQm9qZlpDdW5mN2twMWhmOHVHRnVO?= =?utf-8?B?Q3YreDBzTEI1alpvTThmdE9lT2orNWVBb2ljbFl3eW5vVVhrVHlzSW0zcStO?= =?utf-8?B?OFoxYWRjM2FvaTVDcnFwUlJCdWhzekhNUWt1UlNDY0cveXRONlM0SitKZ1dR?= =?utf-8?B?V3Z6K1J6UDBWSjBaV1pBRW12UDNKbzJPL09uaDVnKzI4MWdtbEl2aFRUazVj?= =?utf-8?B?bjh0WnpTWlV1U3orc0pwekZEZ3BBK09OY3dBdndERFFXdmR2Um1WVzlPOFRw?= =?utf-8?B?WXVnZkFNRGcraW9ZTVVYM1pnSkw0QzRvOEdTNGljOEFmNHlGYmVyclFadTZG?= =?utf-8?B?ZndJbWEzQ0VtVDVPbU0xbHl4SnByODBteTBpandsbTVYSGpnUUFvMGVWSkk5?= =?utf-8?B?TXptcXJvZ0xWcmp5WUtaS2p4UUhHNzIxQ2NPUWhJZm9XcnAwOURHd0EwbEMw?= =?utf-8?B?UU5FQUVxVUpBaTd6Q2xZYStVZ0ZDSllkQVl4WkpqZStsc1VZUFp3dW91SCta?= =?utf-8?B?TDlvbk5NYllOcmVCQUVTSlp4VzRIckRpSG9iNktuVkNTWmFCZWJOWDVNbXUz?= =?utf-8?B?M0QzSWNyZ2NCNStLNnNHS3FRaXdkeVdtTmowWTNYRGFZLzUxWE5Ycllod3h3?= =?utf-8?B?dTNVL2ZGV1NJZjFZTjB1MlBpVS9SN0VEMTlIdHpKV1JTTzlNSVFab3NUVVN3?= =?utf-8?B?K0FDSmJGcVo4T1RxUnNVNnU1ZStnNVNFMndIcy95dy9qL0V3eTlQMWtEN0M3?= =?utf-8?B?SEd6all2VTROYkZieUNjalNrNVpWMFZGcjl1SmxwdVpTV2JNSHAxVjdaV1NI?= =?utf-8?B?QlZBSWcwWVRhR3BNeTJQejRXa0ZXc0pkNXRaSWsxMGYyQzdlekhSdkp3M0Rv?= =?utf-8?B?cDYwemN2RUZDT1V5WlFzR0ZPWmR5Sm9iWFJKQnY5dE5BYW43Tjl4cHFCSllp?= =?utf-8?B?VEd2ck1BQ3NreGJMbUcvOWJxOExHY2Z6dFl4ZXZoSWZia3haTXBycUpEK0lY?= =?utf-8?B?L1dRczFMcWpnakhDcW9Nc3RUMCtnN2pmK1NUZ284ZHcwYW9mQUUxSmh3dXFj?= =?utf-8?B?S3pHZFVlK3hHUll3ektGUlIvdThWNUZzYUViaEJ4Uk45K2FtVCtVUHJzNm9W?= =?utf-8?B?YkVFSGxkUHlxZXBzOUlXQjN3MHNQZUZOWlhSODIvZG9DKzhxdTcranZodVRZ?= =?utf-8?B?bkdrQ0xLRytlTnVkczhWbnE3UFlzNUtPV2NuU1lSZkVrSmRydmh2VFNSQ1or?= =?utf-8?B?YzdUM20zNTE4YXpXS3lIMWF4VlVMcXhIN01yMklqQzZKTkNJVEFGZWJPT0dw?= =?utf-8?B?a1R4N2pFdDhVQmlDQ1RCNGN5REY4T1pKbjFURWF5bXFQUC8zUU9HVHozZXNw?= =?utf-8?B?MCtOZWx6aTYzZWlVV2dQcElTa0t4aDJjeVFGT0N1SzhYM2RDdHQ2S21Sbkc1?= =?utf-8?B?Y2JpbW1hYnNWdVBpOTBkY1d4REQ3YTI0SEpnR1N3NFBsZnM2ZlRpeHZTR0tL?= =?utf-8?B?cmF5cGhrL2FBazZ5RzZFbEZYdDV4eklteHFCQk9NTVdnS2NNbVd0Vm1NbnA3?= =?utf-8?B?Zk9RUGROakMydTRSUjVWanBCWVpHN1FlMFRTVmJwdFJrYkVucnlleFpwck1a?= =?utf-8?B?U3dGa3ZXZ3NlTkgxYUVWaXAzZWQ2V2VMNUJxcXBOc01kSHZxNU9lcXg5Ulcr?= =?utf-8?B?UVhJZk5ZUG9HUVVZMk1MNUVpZVhTZytZekJJYWRGVnZQWkU2dUgzbWFJbDQ3?= =?utf-8?B?Nmt2MllLME42L1VIcWpIbWdJZnJQdjZEbGZHa3RmZ2IzMVdjeC9ZQWl0NUk0?= =?utf-8?B?ZFZENldCVHdBSjRSd1hPcy9BYlF6WGNuU3dKcllUTXZGZk1RZXdyY1hVNk1x?= =?utf-8?B?RG5pSEVyQmp1c2NlcjEwYk9rVjYvZW9vZlFTZFNnRVlQMXVWamFlYUo5ZlJG?= =?utf-8?B?VHc9PQ==?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: d167001c-892b-4069-94ff-08dab0b6bbe4 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:31.2005 (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: Gb38CEaPSl7z/vFoAqr8ZctVqgzzzRXyZpFfkUa4T94OhuRKotHlvSSLPGIFVCh1ZXJAPTfuMnkwP6PVH1387ojlJPckCj1oXMMb+oY68rI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR13MB4093 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 3561d90..20a008a 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; -- 1.8.3.1