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 1A094A0560; Tue, 18 Oct 2022 05:14:56 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9E47C42BB6; Tue, 18 Oct 2022 05:13:31 +0200 (CEST) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2130.outbound.protection.outlook.com [40.107.94.130]) by mails.dpdk.org (Postfix) with ESMTP id D0EB642BB6 for ; Tue, 18 Oct 2022 05:13:30 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dD2xUnlkJ1fCw9guzhlo4/JLxGHhwZALLwTWgr3e5gu775K8ajwby4yRljriYGiRWjjr6RZrD+2DOyF7txvJNjzo0mcnma0N2IKj+/ls9W1dfwHtHlgxXvMherQO/6/ZdIgMd6S7rBKcpAMaY9fXgt5NQhsNXpEhi4MGM4q6jUaFyMfrCY2pV5s1x2K6wQr3WTbHo7a7IuitJQkghHAu2+vyuPt4UtC8kVBmFomsC5qezAJ23/DSbrx6MxhQ9WakpJpIZWTf7z65VptWj3Xqp4njqPyUjWek7bt7yzbAC7iseA4+XXDzKnKD7A/ysiK0tnzDMo/JvRB26Dhh9XGhDA== 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=m/TqXryhm1iBEmeLiyFi76bjZ8cGoaiUsszBmV8bpWU=; b=Zcee5AxCQkgqhkg51kwlLhxm0A+qrGiA1XYNg6Fggs39KCQ+fofA4kHmQMQBd4h9FeHBJWwc3cxfP+adIei4wxiVmUNTicOgpczpuSX+LlPxg1hFfXgFxCxzeCALK6fkuoanJYt67h1nf1MmAoZcBplr4edD+p/wH0EQS12ks103Osx8twRfMSZwAlQxWX2l9uekbFy/uVtg+brM/UDixl6qzX1stkTQslVt8Sip+m7ZJQSsqzKzbvWseaQ2zu1SId1ZUZWqUi28hagiXoZhFrDJf4baCvdnZP7cRSMbuMdm0ZpRNSsfeSyvWnyp9IRIkmKgaFOH1gwBJPUqkf1mcw== 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=m/TqXryhm1iBEmeLiyFi76bjZ8cGoaiUsszBmV8bpWU=; b=NjlNUs1tAa9NJl6MW67Fr3SgrX3+jWhDDKu26UcKP1Bd6iWcuG0/QWhUVXEw8AuPXgd4sHVG6LLKRx5MaXtUTWUIjvCs6tyt9tPk8Hu9fJZ9r1to6lgANEUpb5KwP2zvUzfIzS8Bp6SPXz53e63eMJ7Cj/Ce9vzdl7P0tQPfD/o= 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:27 +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:27 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He Subject: [PATCH v3 19/25] net/nfp: add the offload support of set SRC IPv6 action Date: Tue, 18 Oct 2022 11:12:26 +0800 Message-Id: <1666062752-33689-20-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: 7b219505-9543-4d0a-0ed6-08dab0b6b976 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2tulJotG6n7vrAix8Zgz3sjydKHbbLb6YOgcZOz4Iz5qYrfEELtpsmLzUanbc8gbmaAKruuCdY67pzgtL1VmJUZKSk54RCtnUBkyysUxMZHHF2cTVdTqBkAu9zrAGG7LPBmIdWbHrIylrjIT9FeRRDF8I7y4GIASXWagPqqGb8IKZbNc/cHUok2faUQ5agD3ICPVG7Tu5IFh9QXGpc9IBG+2kpOW+s5vSgEAA2cOOnRaIv1Z8KJa4I2vsOLmEQ/hZ1ijnUjbhmPnbBLUtEHtWjfOhK8B2RA7CNzzxkO8eAL+x7a0OpUCYM8lzdK/BiBQCNANiBI/ESXY5v9vG1xd/aurvdTAlB/x6vnVvRybQh623EZl/16a/4jeiiTXk3SIUfnhF/DToZcgriEUgQfFoeDDm2BxdqdHz25BEeDOvVevijfDqRPGedpbTXP5ny/y/kXIDdfTlzY6PDcfiRgx+zDyUVObaCDSC60nwCRP8TMU0/GaVMNHaiAfi1L3h6Qv7+Gbsy1YdZ0rJLDYYqeTb75867HLV1dmm3BWY/NG/fOi8JCYmwl4Dxa4Y24/WytehGfUFIJ46aaI7Bi+T480s2OcVaRU7Wdoon/biGM2g8roSOfjEFQj1BhhD9nlu0nl9VhuBiZ/5jFHz119/piiNaxcx+/jdL5fN5bI3O3Sba9SCakEabakOlfugP75UN6Uv6OVBYdkqSvyqXFZiAzHyvizwpYj4GGcqLhkgrkf6nDFHcdHxVep5TmhjoGPN0bDlibMzDJDBXj5IscN5qTxzg== 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)(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?L0RJOXdTSTZIZ3VaQktBOGlBNk1zTisxT0FtYldXS0pWbGRyTzJjMm5rcU5B?= =?utf-8?B?NmxXUDgxaUZnNzhyMjB0ckNnR2NpbFliWlo2ZW9CVXBJN0N0ZWw0RWFEZXBw?= =?utf-8?B?QXZ3UVlBSEdHNDZJeXplZ3BiV0FVQmZpdXJ5dFZqS1ZkZE84QzRjbFFZOUUw?= =?utf-8?B?aHh1SEMvZGI5NVQvWVRkYjJSTFZPMExNVzNwUGxPNElQTUFWM2pNcGxLc1J2?= =?utf-8?B?TWRjVCtTdkZOS0Vqc1RWMUJMazdXQTBNNUZMSFBMVHlvN0QwQ0VqQ0w0UlB2?= =?utf-8?B?ZDU2Ni9PSmlvRUpQcVNpS1NFWWJ4ZVJqbWMrT3QvUUtOTXdVbnUvTkEwWC9q?= =?utf-8?B?cVowdWZuWVVyZFRCVnlJNEpJdGdaeTlrd2ttS2VrTU0ra2hZMHpONWllQVJN?= =?utf-8?B?RVhrUVYxem9Id2puSDRZMEJnV0Z2blA1dWxjNmRPWGFSSDVzYlR1R1VyQkZ5?= =?utf-8?B?NUxHTFBWWDZjdkx1RFFXbTZtaXA5YUdyLzl5WW5LQy9rSittTWFPQitzWVMx?= =?utf-8?B?SDhiVkErcS9FK0VaK2ZDS1NvVzZYc1cyL1d4THBjbGU5UWZXbnhNOEVlcXZT?= =?utf-8?B?RFhyTjlyM2xmczNpdUR4cXVWZUJQVm1jMVRYOFZwc3lsRS9Wa0FaN0xFUnIr?= =?utf-8?B?Qm16WnBYelYvN0s5SVpHbXNhczhBQVp2YzJOUXB2K29TYmt1NW05MW5nWldM?= =?utf-8?B?OE1zZjlndWVkeWtxZEc4Vmw0NkN4eU1YL0QzK3FRUE0xVU5JNEoyNnFGYVNM?= =?utf-8?B?QWl5RWxMYW0vTk4xVnh4aHIvc1JuNHJXZUZEMlRyTC9NeVh3Q2tiU1pCSEZk?= =?utf-8?B?MXJmUForeUMzRmI5aGIwNmZxdnZvckkyWWlYRUpUSDQ3UXFOYWxhdjVhNnlG?= =?utf-8?B?WTJUTTBIa0RicU12UldjZG0xOXlVdUFGQnVpdEUvdkpTdmpKbWdEN3UvOHp0?= =?utf-8?B?aTRoSjVBNEh1N0QrcEJlVXdwTUdZR09sTUd5NWowQ2lZeTZJRGtTWit1Ujho?= =?utf-8?B?S3p3a0tCTkkrd0l5WUJXNjhWSytEdzRxTjVBYjRMcm9rWHA3QzFEemJxcXlZ?= =?utf-8?B?bklSQWpjNC9JWlVZTWx2cHpMejM4Ujc1dktiTXNUSlkxUExvellmVnpqa1Q2?= =?utf-8?B?Qit1elV2bmpHdGlxZFl5SnBZOFNBQy80NWR4cDNvTDIzdVkycG9lSDY0TzZW?= =?utf-8?B?Wnl2OWxWaW5BQTlsenRkbkFHaU1rZTR1QXdCaU1zSGxSMmc5dDVjeXcwSGlL?= =?utf-8?B?aTcrSW1HU0RyRWJ5c1l6MGNVZWVHbGlMT05QbzhGU3pxc3p4TUgrd09yRWdN?= =?utf-8?B?a1FTTC9BMlprU3hzaGJhaGpMa1JHUWtsMmpZUjFCZWJYV05BaUV2ZGNCK013?= =?utf-8?B?Qzl3SENzcENRNjFWY0hucE9TbEJJdmNFdktjR3FFSkhLOE8yOUpucGxQY0t3?= =?utf-8?B?d08yWTVmaXpKNndwOEpJc3F4TEU4d0FmbDRWTnlHdmJud3p6ZDdwWHk0VlVI?= =?utf-8?B?Y3NmNzBpQ012SWJLdXJHRzMxMG5WbkRYMmI4dG9jKzI3RFh0bVhmQTZJdy9O?= =?utf-8?B?NG4xL3VvZjBLZVBWQWhBekJwMExYYzcvTHloYjVFMitjcnhPZWsweU1WaG85?= =?utf-8?B?NzVMN3NXVWFQTVJXRXJ2dVZOTzBYVkZuTXpFRDhhZEx0TitPU3ZaNmVhL1NJ?= =?utf-8?B?VWx2Vk03QTJETXlJZkVwejBBMWgxSUZzRkRpZHVmSHd4V0gxMVoyTjNWY0c3?= =?utf-8?B?bHdGVkI1bzVRUSthSjBJQm9LNFhDeVVhSHhBVzRZeitwcFFlbzBQbDhjazBK?= =?utf-8?B?bDYvbFBwUzdPMEMyUlJ6emt1TEJwT2xSZlJHaExhcEZLc3N5MXZPMXVHSTBl?= =?utf-8?B?bTE0TXV3NmJiMkRSdll5VjcySHEyUjFZaENpMVFacjFLKzBzZnREd0xrMG1C?= =?utf-8?B?UEdSS0x6NCtFa210dlN4N1NGNjkyOWhJSTNnOEtURUw1WDlwdkdNNG1YamV0?= =?utf-8?B?UlB5Y2VQa2V4ZVpiUW5wbFMxN2NobS9ZM2V2T0greURpSHd5Qjd2VFdKUEpN?= =?utf-8?B?Qm53bVdlYUNiamk0Uk1EVnI1YS9BSjVsOEk5QldJQUtxMXVsSkRuU0tYSnhz?= =?utf-8?B?ekl1VzdZemwrSG04eDlIZjhBeEErVU1GYTFXOS9RbmdCRS9xcmk3YnppQzNB?= =?utf-8?B?d0E9PQ==?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7b219505-9543-4d0a-0ed6-08dab0b6b976 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:27.1216 (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: rR5fL+r3KjmIxUKSqM76ycAP/TBof5QbnGepboVs35Lm16zCgBdNhgVxVKAf+g3ldNt2EKldX/XNkHngH6JrwxN+3R+b3Xa2KSjm5PjiHI4= 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 source IPv6 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 | 33 ++++++++++++++++++++++++++++++ drivers/net/nfp/nfp_flow.c | 35 ++++++++++++++++++++++++++++++++ 3 files changed, 69 insertions(+) diff --git a/doc/guides/nics/features/nfp.ini b/doc/guides/nics/features/nfp.ini index 14a9c18..0c04458 100644 --- a/doc/guides/nics/features/nfp.ini +++ b/doc/guides/nics/features/nfp.ini @@ -48,5 +48,6 @@ of_set_vlan_vid = Y port_id = Y set_ipv4_dst = Y set_ipv4_src = Y +set_ipv6_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 77cb51d..45e50dd 100644 --- a/drivers/net/nfp/flower/nfp_flower_cmsg.h +++ b/drivers/net/nfp/flower/nfp_flower_cmsg.h @@ -399,6 +399,39 @@ struct nfp_fl_act_set_ip4_addrs { rte_be32_t ipv4_dst; }; +/* + * IPv6 addr + * 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| - | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | ipv6_addr_127_96_mask | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | ipv6_addr_127_96 | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | ipv6_addr_95_64_mask | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | ipv6_addr_95_64 | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | ipv6_addr_63_32_mask | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | ipv6_addr_63_32 | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | ipv6_addr_31_0_mask | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | ipv6_addr_31_0 | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + */ +struct nfp_fl_act_set_ipv6_addr { + struct nfp_fl_act_head head; + rte_be16_t reserved; + struct { + rte_be32_t mask; + rte_be32_t exact; + } ipv6[4]; +}; + 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 ea086d5..2620c1b 100644 --- a/drivers/net/nfp/nfp_flow.c +++ b/drivers/net/nfp/nfp_flow.c @@ -649,6 +649,10 @@ struct nfp_mask_id_entry { ip_set_flag = true; } break; + case RTE_FLOW_ACTION_TYPE_SET_IPV6_SRC: + PMD_DRV_LOG(DEBUG, "RTE_FLOW_ACTION_TYPE_SET_IPV6_SRC detected"); + key_ls->act_size += sizeof(struct nfp_fl_act_set_ipv6_addr); + break; default: PMD_DRV_LOG(ERR, "Action type %d not supported.", action->type); return -ENOTSUP; @@ -1340,6 +1344,32 @@ struct nfp_mask_id_entry { set_ip->ipv4_dst = set_ipv4->ipv4_addr; } +static void +nfp_flow_action_set_ipv6(char *act_data, + const struct rte_flow_action *action, + bool ip_src_flag) +{ + int i; + size_t act_size; + struct nfp_fl_act_set_ipv6_addr *set_ip; + const struct rte_flow_action_set_ipv6 *set_ipv6; + + set_ip = (struct nfp_fl_act_set_ipv6_addr *)act_data; + set_ipv6 = (const struct rte_flow_action_set_ipv6 *)action->conf; + + if (ip_src_flag) + set_ip->head.jump_id = NFP_FL_ACTION_OPCODE_SET_IPV6_SRC; + else + set_ip->head.jump_id = NFP_FL_ACTION_OPCODE_SET_IPV6_DST; + + act_size = sizeof(struct nfp_fl_act_set_ipv6_addr); + set_ip->head.len_lw = act_size >> NFP_FL_LW_SIZ; + set_ip->reserved = 0; + + for (i = 0; i < 4; i++) + set_ip->ipv6[i].exact = set_ipv6->ipv6_addr[i]; +} + static int nfp_flow_action_push_vlan(char *act_data, const struct rte_flow_action *action) @@ -1474,6 +1504,11 @@ struct nfp_mask_id_entry { ip_set_flag = true; } break; + case RTE_FLOW_ACTION_TYPE_SET_IPV6_SRC: + PMD_DRV_LOG(DEBUG, "Process RTE_FLOW_ACTION_TYPE_SET_IPV6_SRC"); + nfp_flow_action_set_ipv6(position, action, true); + position += sizeof(struct nfp_fl_act_set_ipv6_addr); + break; default: PMD_DRV_LOG(ERR, "Unsupported action type: %d", action->type); return -ENOTSUP; -- 1.8.3.1