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 CE0FDA0093; Fri, 7 Oct 2022 04:21:07 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 50D6842BB9; Fri, 7 Oct 2022 04:19:45 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2105.outbound.protection.outlook.com [40.107.220.105]) by mails.dpdk.org (Postfix) with ESMTP id 0892B40DFB for ; Fri, 7 Oct 2022 04:19:43 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nedMCND8lAxPu+ZYMv1v6l53AhTkYh2791ti9FF2nm9NUORHTUa56EfJNxod2Q8vBFBshmtxU8A3KUI+VtCyiMXG9EbGDy7qSzmJsRf5ZpVQCUn1E86MM3Mpt4DbuLAWb7jDB4k6j3gMLgJpbCbKVVS6zfdQdOrLS6eyn8DMlzkZglBTmZ0pAl05aa0yWdSUymiw17OEUKjD3FEP6rVH7Pn09OPYCy+v/kU+NRKgErDnrwQDdkOWSM/8/33EtOouSnT01DxWVO42VwqqCeKa3Y/ZA+z0mXC7uYbOEeCMNcHn7FnD8K1fio/x+ljIkKLA5I3cD/qN19JsqATnL0+XzQ== 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=301h8cUW8GU15zGKVditf0EZCI0GPYW1gOPhdna3N0I=; b=OrG8eObKTBiJdYYdVPAsDvptKdSEaL+Hiec3GxgVLGgnhekzYRQu1KItzDqQTGHibvk05SEYzHN17bSFKeBIvvQMmb+5h2FHR51R3OVJOk15b0DFnHkWmYk8TMxxcz/C27aDfWbm6/uCNXSL9tzYqrqUeJASw4XmpKQ9NSBDo3Z2ccN3es2pOvM32Z/gJGjyJIeHY3T9Ko57Ohfx0bJ/qdOhh9DeuM7vLVxBvf8Lu3vO8xwg4Ib8Ezv2kJQ0Frc0MvCo5CGNqr9EKgqJYdCmiOLpM4IcM70COThy5HNFNH62pJ98D6UK61slN+Gx1OgDKg8tAgsVYf1BwlldH75Kpw== 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=301h8cUW8GU15zGKVditf0EZCI0GPYW1gOPhdna3N0I=; b=GlgnNVgyBx4JFEXBaGBfe8B+jwEJr2KzjLdSXXIrhd6EjkbniP635rejzsmvy7WAYluiJ7QqvSTVsyLGDWF0pffghsYnh7gg82btvv7Bv3+2kxb+GsF2ABatWeKzsXhKJFyEROSyfbg3cMmCqx6iG+49hlYmgvkH+fBJW2XHyec= 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:41 +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:41 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He Subject: [PATCH 16/24] net/nfp: add the offload support of set SRC IPv4 action Date: Fri, 7 Oct 2022 10:18:38 +0800 Message-Id: <1665109126-16201-17-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> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: 3b3b073a-e564-4486-3602-08daa80a644c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dmwkcrimbVxhDY1Ozy6e3G2mmtabOYWsbhWdGdt/q0fVkyDeKCT7M5gnvaQ5D2/wpNqdbDuCgj/1VJ0VOfXZTNjSRE1fwtUpyo9WMEauUZZXdgnO+wFogRVHvqlTjPV68lxUdBGPcJIUB0LgwMy4Z1wJ2uwKycZfgSjtKtktlDiImcJOkECkA5Kbdw2n96pEqdq0UlSCcKuUX/xPaLG+C1twMk4kHFjAwYk/nh5FxKJ5CVDiLdM7bnL0XGOOUGw1dvGQhhN0DBnsEzJAYCEsWvzZTwbqsup/+IxQnaeq+v542YukITrjdHl1vte+JssSQ2u1AXgXYXATDtXTAChidQhc3fhoN1CFey9xUPPkSt8u3mC1g4d/j9ByoVzNz6ID1sTmQNZwy+VyZSwcWcNg/9/YrhtqP/etDxnHqL+5feydYZJsen2L6Jf2OOMViaZzgOlLp5Q+89/pgYWS1uIqTWcUoFNpyHgWQKc1+hTDV5Ran1Hh74kZF+DsvSFwvejVvfnqwTRDZFLAAP2nX0Y5R1++2D8Sfo8/GOj18lVqH4gvDAbjGUnLSnZPLuNXzFWn2s2eOWJr/+Fvf5dmxS2vhWhq7hF0dG6aEUpQaRzToq6hZfmBYX0IJty7SWDLPtCQwqntJfUvowSufY6PHr2yw9TrIQRfsCNzg0doTQS/ACh/uNossdL8mkb1ipVtEmDlGbDwG6AMWJnrTR+wewhsp5BZi70NBIdkdRD+4E3oTlduxVvAEPAifEXumkiycrYV 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?B?S0xJT2poOHZvOXRqWHhCUHZmMUxxRGNTcCsyckxUeVJqdllOZ0ZqaUl4eTR0?= =?utf-8?B?Z2Z2Y09TbDZxLzJzeVF1Uyt0TDFaVi9kOGNVS3Fka1lpWDRwMWNscmM1SXhG?= =?utf-8?B?TU1JaE94dGN1ZGVnNnI0S0VRYWZua3FXOG12OVpEOU9DU3lqYzV5L3ZOdlha?= =?utf-8?B?UGwrU2ZOQ0E2SEtGc1VSMFhpaW8zU1dkb0U4NENaQ2MwWEwzaVJDUUEybmlz?= =?utf-8?B?TElVbURPbjdyTU9NK0hmR2hMSTJBeTZDUTZEWUNBZjVpZEVxVTgwLzY1WVJp?= =?utf-8?B?cU9QYUU0V1E2RDVWVWNEN0RLK2ZFdklLckI4eVhWWmJpRU5ON2VNTmpDQUNn?= =?utf-8?B?QlhianFLUlBnZkg3cC85TC9PQmJ5MTFGZ2RMd0h6eWI5V2dhQmw5M1VueC9W?= =?utf-8?B?cHBHM29BdFBDR0gyUkVWN0hNVmxQQ0tOei9qYXRxVWxyeFlnUUtXM1BPaDJW?= =?utf-8?B?a2k5dUtOa0xpU1djM2tMSTZ4M2Q3Z3drWVdUdlNkbGhEMjJsc1VYVXRzQzY0?= =?utf-8?B?VVQyWWlxdUVPZWlERGZrVmNuWjh4TldyNThlZVdjTGlaeGE2MmVYMnZkcEo3?= =?utf-8?B?NVk0ZzhqaERGNTNDNjVGdXJXU3VUR2ZXODZDMDV2OFR6S1lCcVd3WDRoZEpr?= =?utf-8?B?Skk2aVRmZ2s0dzQ3UFE3dzdKK0RPaHhhUmZsMlUrcTczTG9yWjAzUVhORTd0?= =?utf-8?B?aUJ0Q25mS0JVamxQNkdubUM1QmYwQ1l4QncrL0wwRHdMRDJwbXE3THUyQW9q?= =?utf-8?B?ODNjbGtMT29BRTd2MkRjcG50ZFdRbXBEc0hCcGpXZzJTRGZ4WTFtTzJ6Z2ZB?= =?utf-8?B?UjRBY2dQenZrck82SXNnOG90MWIvQm9rc1ZtTW1VM2p3bzFod0FIMlZlcHc4?= =?utf-8?B?THVneWxNL3dlWm85QXB5NE1kMEl2c2R1eTREZTZRaWVEY3hJejZDNWcwNytt?= =?utf-8?B?UEdDN3JJR0ZWZWRKaE1lT1I4V3dXRml5aWxiOVRsYkdHVmI1WjVrNFNaRUFY?= =?utf-8?B?RkY2ekQzYXdFeUZ1WTdXMzFwYmN5b04wOFI2YjIzdkhDbm9RUzJpS0xNNFJJ?= =?utf-8?B?eUJ2WVR1TUZnV0pkYWlibDgvVm9BTWxEbUZaRElRRHVYa055MUdzMTV4bXRo?= =?utf-8?B?eHNTbUxHL1dEOU1KVEoxcGlvN3FTam1nOHRvaERETVQ4ZjlBQ1liV3B2YTNU?= =?utf-8?B?czdkZE1oZXEwYWwyMUJSNWtnUjMwUTRXSnhpMHFzODluVEFkUzVpK0E0d1li?= =?utf-8?B?M2Y3dlB1YlN1V082NXZlcTBFalBaaGluTWI4T3NJN2VCekFjQVpieW1JLzBJ?= =?utf-8?B?VVlLeE1XSmJiNnpha1pYb254S3JFeEs4WGx4elUwdEhSNlg4d2t3ZkUvYVQr?= =?utf-8?B?NEljNnNVdFFYd05qTGRLM3F0QjRveUpCbEhXRGEwUzNHdHN1elkrN0F4a0Z4?= =?utf-8?B?bEs5enN2ZzlJNjNQZ3RJRUk4R2h3bmcyOU5Xem5hNVhTMXY5c3NKdmJrQ2dq?= =?utf-8?B?RmRmdnRWZVVXRlBVR3pGWCttVnF0bkpDVEorVndDZnpJd0gyN1FHZGZuUXJ3?= =?utf-8?B?QUJGcDhwMDJWSHNWb1ZIMzM5SDVJKzJWcHlWV3REbEtNVDZJcVJDLzE4YWZY?= =?utf-8?B?dHNNVnNsUFlDeHlmR3Y4aDl6Wlc0SDNKOUFybG1wbEFpNWg1ek1UWVZ4T3ZT?= =?utf-8?B?SWdlYnRidTVmb2l5R0ZiSyt2b0JqbWcvUVpTbjQxNTNrd0lVbjFMd1R3Sk9K?= =?utf-8?B?QkY1YmZEcE0wWE1RRU10MmxNZVNlUmlxaXFQNm5Hai9hVFVyWXFIT0pmOXo1?= =?utf-8?B?V2liNS9iLzRYMlJHa0ZJaExmdndBOU1qanM4ZjlVYURUb2o1cTJJSXp5VmRU?= =?utf-8?B?eDlqblJCOFRUSWZXOHFHMWRscElmNmZaM0NEaUZWTEFVcUxaeU5GRHBEa0Fk?= =?utf-8?B?UTZxdHUwazhSdG0wNmJ6c2ZRMTNVTXQ2M0Y1c0t4MTQwdDg0TDliUk1neVg3?= =?utf-8?B?WE5CcDhxYmhTdS9obWdsMjR5MXBmQWdVZCs0RGNqazdkNk5ON2FCRDl5TG9T?= =?utf-8?B?Qm1ibWloazR1REJKMlpIK2xEbk92cjlaczBRb3V0a2tRY2lyd2xaNHRIdVhJ?= =?utf-8?B?TTBpbGVseSttZVdrRGNKeTFsOU1pYTdrR3U3SmJMdGhJY0doYit3TXZPdFkz?= =?utf-8?B?MUE9PQ==?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3b3b073a-e564-4486-3602-08daa80a644c 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:41.5629 (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: XAjYuzafpBIK/MUt1DBvg4pCdg1aEyeScYAHik/Q+vviNbynp18rRb9RAHQkModX91yA7++UarBzP8tE+qs4kAa3V0KmHmjJu1va2xVVpR8= 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 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 514e0ba..8f7120b 100644 --- a/doc/guides/nics/features/nfp.ini +++ b/doc/guides/nics/features/nfp.ini @@ -46,5 +46,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 d66bcca..54f94e5 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