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 46920A0560; Tue, 18 Oct 2022 05:14:44 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6A59442BAF; Tue, 18 Oct 2022 05:13:25 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2120.outbound.protection.outlook.com [40.107.220.120]) by mails.dpdk.org (Postfix) with ESMTP id 91591410E7 for ; Tue, 18 Oct 2022 05:13:24 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oICsRmRrhtve1w+jR/qK1kCiSPzi3fP4QNU1z4J8zMxqV1qLXZca5PMh5vvj67RfxW+V5rVIDjwqm+V5t0r++EnAx89WVT5MdD5U6b4eLVfbKVVhQEN7BlsB2pnEpfrZiBJpLxA3SWsr3UEIMbJ+Bo9V+cl4Iosw9ofqZIEZonlO+DExvQuxrkjT/y+KQor4x0ZZaV7oHRlQToiwNX55Qwh4/9S+RnhUreQQo0shkx/qEtnRGqR3GoNYdSfRjXVZ5ajBP10DCJSNSF18adFczKLnU7T195YRXguVonn0NleUn0EdJeBzh39HovGyJu2OX9MEW+JFkMSR4Pf+YE6OXw== 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=Ca+CwzKPO7uMdSrRsVngazbaKPaFnqvYSm+uI9FKKr0=; b=XRUUVXA2vZKeOg1D3Vt8/bNOV1Yq359qYzDWwaJjEOA/MDAlNa/0S2/jRnO2ygpszVfim8Ae9IwyTqQdKYoZ2PP2e5JfcoXYNqj1WuT2HL1CwWNvtM+oV3hHWZJzntWJ9KZT3hlM+X+CqZ6Wj1xqAgXfmQUSuNXNOxwrWrnTDq60KrFoMkuSsIJVNx/40C/3AwDIlZZkiLLT3RSQd4BbPMM/fmXoGJ2T9t3Px1/CH/lw1GQbwXUivFVLcJOlgF7MCtvQVWo1mdjZu7XkB+PDYvMJ5JllW5o70w3Y9R4cML6VCxGNwN1MLT+UXc2a0zZB0Yln0dW0IqQsQKxGgMMzVQ== 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=Ca+CwzKPO7uMdSrRsVngazbaKPaFnqvYSm+uI9FKKr0=; b=de9tDvkigCqVkBVUEZMbJm4FVwWwwI3gbc6Y5Mu+RG9qyNdQsHrZeqif4FmihW6A/sAUYasYcsj3kKxhlmG0r7N0y5YUgf9wWOez0luGW8wlVSJNCLX8Ht2eQDlOuzPMG/RMIedQkOjHLHBDRX/EhubtqsAfdF70HA58Ga3jt2c= 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 DM6PR13MB3865.namprd13.prod.outlook.com (2603:10b6:5:1::15) 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:23 +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:23 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He Subject: [PATCH v3 17/25] net/nfp: add the offload support of set SRC IPv4 action Date: Tue, 18 Oct 2022 11:12:24 +0800 Message-Id: <1666062752-33689-18-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_|DM6PR13MB3865:EE_ X-MS-Office365-Filtering-Correlation-Id: 0f2f76bf-81de-4fa7-32f9-08dab0b6b724 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: OPeBBSRWfkby2awKu8s54GdqAUT+riB6LaT6ddiUStr9DWdwkiaa/SlI0AinQaZ0YAQeRaxrJw2EYo7nQFgvEjytjGyPqQQwNu/Cofh6dMSrwllOcVdo9OlDXXYzV4poAf00laYnOudza0w6RhNUaJ65v+EQeOEKRyu5DeDDp7MuK+ouhsPF2GxjIf3dyn6+HwFdkRnCszwenEr3W8CrqUTXQaMjPPFezbn46lYlW16x+wd2MXZS4yCD31nwp/hUdIAxBfHskxD/N4e0BSmefKU+kz+eicK8Z+gUvLviBDfF3hS2rbwy9ebYrVhgK1hp3SvsZFGN92QM8Dp0gD2290QnIsBp9nTowZfFBM0+v7mCodrSz2FscSQvlPJl7Ilh2t17oojFHcjrYLlk9VD2+Vf3vAVev44qseBxVLMf8W8awEVVUhuuH6taILibar3KCG5f5ucY3krPKTiif9bjNS7F5h8PlqBoMLanT5DruTMiL7/5z9LYajIsPyoc527yV8lH2cIDbRq9ximE9R8HowipnISoct9DemEAhjxy6t1PBwSIdbI8d04bkGHQH+7UI3m9BT0Wod3eB+K2lgBTdfpFOFCvcXPLTbCSfGJ3Lo3G05t9+ZGaG+wz9LqYVHf4crKVBtyDfzNv6/5O9SBbUQuE/UHIUD636t3ifllab5T3IBLRVWmK3RqCKf5yW7YLWkLDY8JpS89iv0yzfP47v9n9sVsPwAkPm4M3yZZC7rNeeiff6JRyFkYcAYmTHIO5Jf21+VaGevzu7LKeMAcKhQ== 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)(376002)(366004)(136003)(346002)(396003)(451199015)(66476007)(6916009)(36756003)(2906002)(8676002)(86362001)(38100700002)(38350700002)(44832011)(186003)(41300700001)(66946007)(66556008)(8936002)(6512007)(26005)(52116002)(107886003)(6506007)(5660300002)(316002)(4326008)(2616005)(83380400001)(6486002)(478600001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?Ukh2SkMvQ2dIVmRzQXEvSUdQam1WdXlKZVlRZjNkNnZ0Q1JSMExVZjVRWm5U?= =?utf-8?B?U1ZtTnRZRDFwcUQ3cThmRU1MTWkzR0JBQUZKVzUzWWExZXVRcUprblpaNGxD?= =?utf-8?B?RFMrTGVtRkFQbTV5Z3FHeCtvT3ltamx5MUIra3lNUWpJMnU5TEhQcy9iekRy?= =?utf-8?B?ZWl0Vkp4emVpWC81c1p4dFY1Rk92dTNHRy9NUjc4T21tVFJLZ2tvNnRqdEVs?= =?utf-8?B?VjNXUmZyYVVqQXdQYkVBR2N1LzRYUUM5MFRPck5RK0NOR01jK3Z1WHpDV3dG?= =?utf-8?B?cVlMUWxDK2VjM3hNMGszVWZqeXQrTWh1TFc2VlY1NzM1MGw3SlA1UE1kc2Zo?= =?utf-8?B?b3I4bUhwdHJyWGVXR2YvWHAxaDl6OU1NeTAycDdyS1luWjhqUzNmL25KUUts?= =?utf-8?B?cDZiaGhQbW1MOTNYZy9JandyU3FxZisycmVwVUw4N0JPSUlkSHZBeFBsVnhZ?= =?utf-8?B?SUZ3cWt6VDBOT2JkdDhNZWJpVk40RHJ1Q1c5SEVzK012MC9ma0FBT2xiVExF?= =?utf-8?B?RkpPOU1Gc21LU0VyeXE0R1pGUGNFZlJYSkUwQ0lmSmtiRVMwN1JBSW9XcFUx?= =?utf-8?B?bzJabDhneUxYelVRbWxBbS9PY21zMGw4TWVXbllMenhlemdnSFV2WHpkb1Yw?= =?utf-8?B?K0FsOHNsWjhSSWVEc1NOUEprZHFMS2ZvY2tzaVlSK1l0bmh3V0VZRHhGNDNm?= =?utf-8?B?VUpmQlJaYm9HYW9kcm5OZDQ0TEpGSEtZVDJYcmxvcEpoWlNyM2tTa2VJTEhy?= =?utf-8?B?Rko2UW5WWDJrNE1sRURaMU8rclJGTU0zQ0I0Q0JKenhjM3g3Qk9mR2NtcUNW?= =?utf-8?B?VWViZ0pXbTdGSTB2eWRiNnZpK2d2clZoV1JCZlIzUUZycG0zaGR2RzRMUGNV?= =?utf-8?B?czZzV2ZtZnVkdWVJOGtzSmhkMENZS2pyZU80NXMvY1ArTGN5aGhod3d1Y1pL?= =?utf-8?B?bS8zVUM2K05VVVN2ZVVFZENJMnUwZzVyanUrQ2RrRjdqR082dEZScGNmQVJx?= =?utf-8?B?MGk4YkhyYkwyRUxtTVFOUFg5VGtWbDFSNG1tNk5mZDZlNkp4NGt6WGp3Tllv?= =?utf-8?B?MnlLem1iVTN2eEZnTWE1S0tMbWVUUUw2Wk40Z0ZvN3pVZjlteXd2TXBocHI2?= =?utf-8?B?UUloOUVNL29sZThjSUN2UzBxczR2Z2QraHhsYlRHNmFoMXJURkRRamsyRmZ5?= =?utf-8?B?ampvWnFic2hteXZvOXZ4N1I1S3k3bnBBVmdDUHYzbDl6V0ttSmVXZlYzek5Z?= =?utf-8?B?M0JwWTVWYnhUemVCZFpuUE93MW5uY1pzNUxUQU13ZlZDYTBNZ0pOcndxdmR5?= =?utf-8?B?ZHR3N1N4TXVubXIwN2hJU3dxdEp1MWxxa1k2OU9VRVdaVWd2SktKSkFyOElG?= =?utf-8?B?blBKMHVxOTUrVCtQK3VvUFZkSkhRdHFBTmViRFI1OGZzUjcyckVtaVZibXVz?= =?utf-8?B?enlWTFhVWTNudUNIZlBZUFYzeUlaOFJvWWw1UTUrOTZqc3RyQVFWRWlvT2xn?= =?utf-8?B?NkZid3BFWHBxdVdHZ1VCNE54NmVQRXlVMi9EemlBMlhLU1l4WG05N1BVK0tX?= =?utf-8?B?b3pSMlIrV011Qm4vWjhtNzlUN3pWS1lLdlRRUkpVRjh2anBXSnVaNkFQSjIr?= =?utf-8?B?SHgvdmlSSWNteHU0VmZkblZURERncklyKzBXL05TcnErYnVuODhJTnRtbmVB?= =?utf-8?B?Zk9IRTBBNS9uTDhvSlNkbTJMS0RXZ1kwNlJ0MEZhWjI1OFBoVWNxbEpQSElx?= =?utf-8?B?emF0TUdtQy9iK010amRuZTJ1V2JUTWRzRnVUUGxORk54cEcyaVBKN2RudzBs?= =?utf-8?B?OFVRb2U1bkRGeWQvUHlzbVpwdTdlcXdYdXhxNkJSWUc3R1daUHhGbG13MklO?= =?utf-8?B?S0pTWWQ5U2ViU2kvTTNvTXgyY2puSlNMT04vdFczVzh1b1dvU3dydFd0Tnoy?= =?utf-8?B?UVZlRjd5cHczZUw2dkRnMXFRYXFnMjRwVXRiN2xiSWtSSksvbGp6cDdEOHZw?= =?utf-8?B?eWJwT2lIQnNBUlhKcEJmbnpzRWRtOGZudGVFMnhoWmE1VGJHQzZiNEM1OE9H?= =?utf-8?B?Ujg2T1lSNEh1aFdOOXdYNnpXbTNSUHJ3bXVER3ZWYkUvd2hEU2tIQVI0dStp?= =?utf-8?B?ZnBXdFkybjFRL2FiYjR4eEw1NEtYL0lvakw1ZmpITzRrcElKWjFVS1dqSmNP?= =?utf-8?B?Q2c9PQ==?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0f2f76bf-81de-4fa7-32f9-08dab0b6b724 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:23.0579 (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: IzEG2Uy8TVMbap3iQiL5WNajpfDmV7sxhJdcjr4767MlXDJLIojhLpjWBXi8WOH5NF20JTNXdgKSt62Ozmk0riTRUIbuJeFym8BS+N80kzw= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR13MB3865 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 88bd415..4b026a0 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