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 08688A0560; Tue, 18 Oct 2022 13:29:47 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A157642BAB; Tue, 18 Oct 2022 13:28:12 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2110.outbound.protection.outlook.com [40.107.223.110]) by mails.dpdk.org (Postfix) with ESMTP id 6BB2742B9C for ; Tue, 18 Oct 2022 13:28:11 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oKF9U9ruZROZdZV5vJFmbUZlTt8AWlmIzSuR4G+Ap83uc01NTMUXBNwYex9CyOhVA/JSTGhFISBeN+8RgNJPOtqSw7wFkOVlbADaPkcaRYBkVZ+1YvYNEqbYWBGxlZ/MmJwlFxrZWic1W02WNCJjpqZoBJQmhpekzQ1iA7IWYSdr5wDrW+GN4Nf7VhhvShfEbn5Z07C76p89SQe6oLcZb+wf06ps6+WRFrNNrWffxT95RZOgELHF0UanbtUcH9znfIOIm9SFKRPTQLkzZAjsPNTL97Nv60UoryIe2YtLG8gTk0wKA8eQkrf7v3eSGR9Wq7jdh5Svi5LOoVOjRBn2xA== 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=dBqpU593t1Seo6DCsSBbdEsSib9NfKo4cfo+B4obSYc=; b=lgLpksHQABw4L46xEiry2fb6DXC8oZxbjsyHh3hIRvhTakkVQAxwZt1K/IZbJVNaQTYg2kambj0hvrFRYb1LMylmrHj/jZJ5i94IxUSurIZngniDfU9mHvO+mTXIBt4ARPFx/KLxydUWjmWRfudOetvb3ZA2+nAgOLEv22cODyN/s1Ssl3roL2nmepqcILLYztmNsKXy2E41bBn0YW8MOyc2/EK0puzGb4RaKgwZoMrX8mvANY0SsQKlZrrZG6LL8s1PGe0aH8C86LRkfG//YHk5OL2vE1xkjzmCqpuvyIzgWYfhhzpJDdMtRr9jTk8NjO9sXdhGou7xf832fZsmyA== 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=dBqpU593t1Seo6DCsSBbdEsSib9NfKo4cfo+B4obSYc=; b=W5LOM6wTuNPbRbMFlt1kC9/E6Abb/a7766YRKotPfwEzmYqONH8SeIR83AHQDnIFI0FxC9ElesY+UzvWH+Y2eyZ9hKePDtXTq1CG1jGfxYCRaeEfADB7ZcpS6tqqenGQI5OdMatxvgJ52oCie2U7AZgpbENQP2lQXWc6biQs3Xc= 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 SA0PR13MB4160.namprd13.prod.outlook.com (2603:10b6:806:93::24) 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 11:28:10 +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 11:28:10 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He Subject: [PATCH v4 17/25] net/nfp: support SRC IPv4 flow action Date: Tue, 18 Oct 2022 19:27:06 +0800 Message-Id: <1666092434-10357-18-git-send-email-chaoyong.he@corigine.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1666092434-10357-1-git-send-email-chaoyong.he@corigine.com> References: <1666092434-10357-1-git-send-email-chaoyong.he@corigine.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-ClientProxiedBy: SG2PR02CA0052.apcprd02.prod.outlook.com (2603:1096:4:54::16) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|SA0PR13MB4160:EE_ X-MS-Office365-Filtering-Correlation-Id: 7fe3cb44-374b-46d6-5daa-08dab0fbd5f5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mRUgnYz95XxDq7Ifizes6zY9rwfa5mOjNsgXjIZd88stiWFsqq9Ph4Du19P0eO1Fb7cPhiEZUUzRKyU31Dzs3H3pDpnc4vpgRExkYvgiHfk2Lg9l+RnizbuGvhlwbGQ4mB/RzVTWlknbbpRtHqsQfzQfrGCmlFsn/HxLpfH1c+pex7E0pddYyUfy7uOHKUUHIMq2hZe1NLg0A87SYOpm+gbTOOZMZW/65Y/ead9n8dNSzC6QSo9SsbSnnQxo4mBG/BGlpCteV4Al9IL/ia0FqajZFzNeAUykbertHDMRgg4N7prx6TrszxohVnjZ+GE6mVrg1Tqt6GnLb/qFzsR7HpwCbVEPAbM5RSIcPM9QPfF67l3QEo0ezw2NWoLkU5bz0LC17M3HkPq5CRZQ0hnZagfoUeZxVWmw8mlWGnSayXH5qmH+XSbYPsNV1VpUzlpgEgZyuMau+jCoTMmTMtyR9pwHLqVGBOtr2qh9zqduHw2dJhjAee1FMrp5PAVQadzhHGXVADYpOgtteAj5BOyTR3w/g1uLjJNzoisOISB1fVNNAn+eTs7wTweUMH0zNU7TXJJ9wVp0hlBd4L8pxPtoE8dUVshilaSsTQc8Pg1CIyMD76V/tmhJ+OHRdViCzRMMt/nZrn+Xq57+lVRGEc9xOJQq0Zc5Mn539rTmFcW6hidM3AwZIFtjiPxZ5NXXxQo5DhQFCcRuOw7imjndvX/vE0K83xaO70sHP5Z3WLXvxZnwdAWWmysmJ9vECtMQBki8zYcqvvanj09CSKMcBRsNFehn+HCgZVoQWhZ4qiH+te7CviB3MxEHoOVOTTKI5iI6 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)(376002)(39840400004)(346002)(396003)(366004)(451199015)(6486002)(36756003)(41300700001)(4326008)(38350700002)(8676002)(66556008)(66946007)(107886003)(6506007)(6512007)(66476007)(5660300002)(2616005)(6666004)(44832011)(8936002)(26005)(478600001)(86362001)(186003)(6916009)(52116002)(83380400001)(316002)(2906002)(38100700002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?SVRUVXJoRUc1NmlQOUdocHBwb0Jqek00ZGxNTmt4WXRET0xGOFBRN2VaVkxo?= =?utf-8?B?Y3RndFNaUDBlVktIRitOTDNJMG12ZDJPdlI3TU1scjBPcFdEREVLcms3Q3pu?= =?utf-8?B?SzZ0TzFUUzVkejR6c0lTeEcyRXg0Y1d3aGxoWU9MNXRJWmdKK0xWU3BKMGNS?= =?utf-8?B?N3NYRHI2MlhJWnpHbFo4WmpwNXhqdXk3Y0h5ZVZQNHlGN0luOEVoa3BzQVNy?= =?utf-8?B?NmVFdlIyeEp3alArRndtVHVPS2QrQzJkMGhvcEhHM3ExQ1B5MUhoeUdoYnJZ?= =?utf-8?B?OUFJVWlvVmVENHFIYVhLV3p1N08rNG9yTlhXeUsyL2FoT1NMUDdoeFZnOUkz?= =?utf-8?B?UWJjOVowOU5sL2xpeFI1M01Bbk5iUXRMeWhUbzFIQUdZTElBVkhaM0Q5SnJJ?= =?utf-8?B?TzNrQ1VjRkJQSlhMbjQxQUc1TUFzSk1kNmpoeXBoOFlOOHgwelhGblpnd1po?= =?utf-8?B?ZlNIeFFxVWFqU0VjMERGTXZGb095QllHdE1pZHBoVVdvNVlPbDJTeDdkRUM3?= =?utf-8?B?NFBGUlk2K2d2ZW9wVTcwczNvQWJKVGRJdlN5MU5WaXZyeEhkYkUzV0FvcGJW?= =?utf-8?B?Z2VOcU1qSXd6bU91U256d3RQWlBrM2tRZnN1VElNTnQ0RG1UYXVURStCYjhI?= =?utf-8?B?b0o5RkEvWHB5NFpVenphNy9WTjJUVGpadXBXNFBsaVdKK2duYjl3ZHlMeUZn?= =?utf-8?B?UXl6ekx5NUU4cWFzN0wxMk5NMFZ1U1Z5bjE1cWROazgvK0tYT2FKcy9pU1RV?= =?utf-8?B?VzAxcU9sVy9VdW5Xa2ZyUzdaTHF2cjVKNldPSlNtb3ZIWGF2bUxGTzJHbnRN?= =?utf-8?B?dFYvWEVaV3VmTWs2QTlnem5xMm5aNnFPUTA3L3lBbGRIdXBuTlNOL1FFTE1C?= =?utf-8?B?T1h4bElXOXZxL1QxS1hLOTBMaTdDOHBuZ0ZkQTg0YkY5bmEzSVo4WXVIc2VR?= =?utf-8?B?WGc1Y3MzSHZGb29RMnBWd1VsZlZITnFOM2JvaXNpZ0U2TUZpNVF6SnkvZTJM?= =?utf-8?B?MmpCOGM0N3hjSnJLZ0xUTTZ3SVZaMnkvR203cWx4VWNHcVlKUEpCbEt4aVQ5?= =?utf-8?B?b2tmeHdXK3lGTW1Dd01qSnNPd3NjalNsUWRWMFFMTUhWUWlraEJnZnhVWWJ1?= =?utf-8?B?QjgzMXpLWUdhLzR3NGZoZFJQenRyalJpUktxQ3RIZFk0QlBZeW9MNFVMcklI?= =?utf-8?B?VVA3WVp2ajRiSzk3SlFSbUlvVVkrZFI5Mm9GU2ZLRml3NzY3dVB5MXY5VnYz?= =?utf-8?B?ZXRNcXgxRnhFeHlla1Y2d0hCRlg5L1UyRE1WOWRFMVUzNGFDd3g1OUozNW5x?= =?utf-8?B?S1Z4VmFpeXdZWVJvcXBydmVlZmFqbm5mZGVYdmZHL0FVUGpTK2tTaXZaZHEv?= =?utf-8?B?OW5IVVFRV08xcDZLWEs2VUh3SHpJRU13cUorMTRPQWVyRkNuTlQzclM1Qk5u?= =?utf-8?B?emhJVy9ibEhaemgzNVpvUWU3VytHUTYyY0NlRFJydGgwNlBxSlBvcjhnbVlR?= =?utf-8?B?SjZCWFlHSVo2WlJnZGUwN3o4cEJXaDhEc2pEUE9UQ2pVWUJHUEtmb1FOODcv?= =?utf-8?B?cEFqOFRWSWI1UzFxaWttSnVNU3BDZW9QRzNPV2lKQ3FkeXczVGRWYnR5cEU0?= =?utf-8?B?aHJwdGtlMlFhSW9LMVNiOUZKQ3ZMeXF0eFVraWlRa210UFBOSFZDQmFleU1j?= =?utf-8?B?Q05aMVREck5RSW1YM3ZuQ2xvWXNqOXE1WnA3OHAvZW1lbXpFeHJsVUZ3Y1dP?= =?utf-8?B?ZkcyRGkxalUvaEV4Z1g4d1BPN2oxWFlxei9kN2RQT3gzbFpFOEpJdWJEVUYr?= =?utf-8?B?dTdPcllWSzdPVWxQUFJHcWFDdHVCM1hyNnB6NThFMnNYaGFTUUorY245NXFE?= =?utf-8?B?YlUyTmFxNlBOWis1WHUycllPWVQxNTEwTjZ5a3U0ajh6SkNiOG9YUG1jUWUv?= =?utf-8?B?YU8yWllQSytyeWliNCt4Z3M4WEY3K1FLRkJDRGxjbDl4ZnB1RG1tVUdIemV4?= =?utf-8?B?TjVHcHBMMU5aQ3MrS1AzUE1nQkYwQWVoSC9BbkNxVzJMZjhRS1dDcU1RMENt?= =?utf-8?B?M045blJiSEF6SEFzSGJSZ0IwcDJXdmtBS3NETXNuZ2xyUk1jK1lINlpvWkhE?= =?utf-8?B?MlpjamZudldaeXpRMXFHL2w1OFc0bFJUMVBTcXJNYW54TzZyR0xFdjhlZy85?= =?utf-8?B?N0E9PQ==?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7fe3cb44-374b-46d6-5daa-08dab0fbd5f5 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Oct 2022 11:28:10.0503 (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: uCZWIdvGaYucP1n/no2MSEA+SH9OccvW3ZiVf0KWAITjls6arOVm+7Uj0peqpKEulDj7HjF41V4Qii8fxp4EYwGt3jqYp4ienWmMmZwS9jQ= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR13MB4160 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 IPv4 address 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 | 25 ++++++++++++++++++ drivers/net/nfp/nfp_flow.c | 45 ++++++++++++++++++++++++++++++++ 3 files changed, 71 insertions(+) diff --git a/doc/guides/nics/features/nfp.ini b/doc/guides/nics/features/nfp.ini index ba3455c..dc5c676 100644 --- a/doc/guides/nics/features/nfp.ini +++ b/doc/guides/nics/features/nfp.ini @@ -45,5 +45,6 @@ of_push_vlan = Y of_set_vlan_pcp = Y of_set_vlan_vid = Y port_id = Y +set_ipv4_src = Y set_mac_dst = 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 30a9ff5..77cb51d 100644 --- a/drivers/net/nfp/flower/nfp_flower_cmsg.h +++ b/drivers/net/nfp/flower/nfp_flower_cmsg.h @@ -374,6 +374,31 @@ struct nfp_fl_act_push_vlan { rte_be16_t vlan_tci; }; +/* + * IPv4 addrs + * 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| - | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | ipv4_saddr_mask | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | ipv4_saddr | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | ipv4_daddr_mask | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | ipv4_daddr | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + */ +struct nfp_fl_act_set_ip4_addrs { + struct nfp_fl_act_head head; + rte_be16_t reserved; + rte_be32_t ipv4_src_mask; + rte_be32_t ipv4_src; + rte_be32_t ipv4_dst_mask; + rte_be32_t ipv4_dst; +}; + 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 fecc97a..c0df617 100644 --- a/drivers/net/nfp/nfp_flow.c +++ b/drivers/net/nfp/nfp_flow.c @@ -574,6 +574,7 @@ struct nfp_mask_id_entry { { int ret = 0; bool mac_set_flag = false; + bool ip_set_flag = false; const struct rte_flow_action *action; for (action = actions; action->type != RTE_FLOW_ACTION_TYPE_END; ++action) { @@ -632,6 +633,14 @@ struct nfp_mask_id_entry { case RTE_FLOW_ACTION_TYPE_OF_SET_VLAN_PCP: PMD_DRV_LOG(DEBUG, "RTE_FLOW_ACTION_TYPE_OF_SET_VLAN_PCP detected"); break; + case RTE_FLOW_ACTION_TYPE_SET_IPV4_SRC: + PMD_DRV_LOG(DEBUG, "RTE_FLOW_ACTION_TYPE_SET_IPV4_SRC detected"); + if (!ip_set_flag) { + key_ls->act_size += + sizeof(struct nfp_fl_act_set_ip4_addrs); + ip_set_flag = true; + } + break; default: PMD_DRV_LOG(ERR, "Action type %d not supported.", action->type); return -ENOTSUP; @@ -1296,6 +1305,33 @@ struct nfp_mask_id_entry { nfp_flow_meta->shortcut = rte_cpu_to_be_32(NFP_FL_SC_ACT_POPV); } +static void +nfp_flow_action_set_ip(char *act_data, + const struct rte_flow_action *action, + bool ip_src_flag, + bool ip_set_flag) +{ + size_t act_size; + struct nfp_fl_act_set_ip4_addrs *set_ip; + const struct rte_flow_action_set_ipv4 *set_ipv4; + + if (ip_set_flag) + set_ip = (struct nfp_fl_act_set_ip4_addrs *)act_data - 1; + else + set_ip = (struct nfp_fl_act_set_ip4_addrs *)act_data; + + act_size = sizeof(struct nfp_fl_act_set_ip4_addrs); + set_ip->head.jump_id = NFP_FL_ACTION_OPCODE_SET_IPV4_ADDRS; + set_ip->head.len_lw = act_size >> NFP_FL_LW_SIZ; + set_ip->reserved = 0; + + set_ipv4 = (const struct rte_flow_action_set_ipv4 *)action->conf; + if (ip_src_flag) + set_ip->ipv4_src = set_ipv4->ipv4_addr; + else + set_ip->ipv4_dst = set_ipv4->ipv4_addr; +} + static int nfp_flow_action_push_vlan(char *act_data, const struct rte_flow_action *action) @@ -1338,6 +1374,7 @@ struct nfp_mask_id_entry { char *position; char *action_data; bool drop_flag = false; + bool ip_set_flag = false; bool mac_set_flag = false; uint32_t total_actions = 0; const struct rte_flow_action *action; @@ -1413,6 +1450,14 @@ struct nfp_mask_id_entry { action += 2; position += sizeof(struct nfp_fl_act_push_vlan); break; + case RTE_FLOW_ACTION_TYPE_SET_IPV4_SRC: + PMD_DRV_LOG(DEBUG, "Process RTE_FLOW_ACTION_TYPE_SET_IPV4_SRC"); + nfp_flow_action_set_ip(position, action, true, ip_set_flag); + if (!ip_set_flag) { + position += sizeof(struct nfp_fl_act_set_ip4_addrs); + ip_set_flag = true; + } + break; default: PMD_DRV_LOG(ERR, "Unsupported action type: %d", action->type); return -ENOTSUP; -- 1.8.3.1