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 4A213A0560; Tue, 18 Oct 2022 05:14:18 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 13A4042B6D; Tue, 18 Oct 2022 05:13:19 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2123.outbound.protection.outlook.com [40.107.220.123]) by mails.dpdk.org (Postfix) with ESMTP id A7A5842B83 for ; Tue, 18 Oct 2022 05:13:16 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mjHFp1KLQqeqaU/35n8zvJsFjHZwAMmpDpfLrA6ErZygWzIOuFezSJiP9jtWehqMHd1OFUYaPPmUCRIazZJotUC22Btg4OhikTn2lthKiNFstI8JGfqj4pMQoHRZBSoLf4n5h17HUzReQtGJ4kPe+A5HkYdOrfgWtlzRLfLqepXP6WdEplHyAAtBdl/maSSn9BMm/jT24aMTbyD+2uf1FaRQDCDjVP13oc1xD3Jcb28Vh+xg9fTIfgmQ0IYL3MaF78tNGfMBzAgv7Rc9lV1YRWA2oaVoy2Rv3c88OKD4MUxJR+wtfyLhRDxTBCs6fwRM6olBfI/6TTHqsllmVkYe3A== 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=090y2pAmlxD9q7Qa5IH4ZeoHoLrFAf9/AuTNj37TV2Y=; b=CE/V2sU5AqQqYiEUcfikutwlR8uXr2rAX5RZiITOLkFT3pRFiLbmTal5JPqwgGZ+7uyZhVIfucm017jOw6QxbGU71eFoJQg9/Gbtmr5jET2j48EOHD4I0qeVL10qMDg2kTeW4SFiy5dCvB5vBg6FmH/VXs4NwJr9DcL0GcgqYLoKlT8VrUR5hGu4fnosvf8EL5czU4Cx3wAWF9+r+1GvHM2Y11zRcT2Xq0sj/gH5s7ow+SCjggvwDJemfEuAK7UDq4xMRq3gqZ/2+YmNxCSbmBf03qvrJfgG9lIqtHcUgAWOlbSw4NzIEgvsQCfHykAIXV37HrtkXuPNHsL+TC/7aw== 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=090y2pAmlxD9q7Qa5IH4ZeoHoLrFAf9/AuTNj37TV2Y=; b=g6yjiPvLntOdgToQjgGQEcNsNE5uOp76tx0LrX3CxXK2e+KenbVJmvPkoXBS3oiKTjYFKQbZ6ZwI9CR/ypu4PSm25w+xOYc/f/RoLzHx0pap6nHTir3M6c5JXfKhXKPAyxxaQfo9xLczMyh1e0aH/7rEH5YASgJIqgu8XLV9LXA= 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:15 +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:15 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He Subject: [PATCH v3 13/25] net/nfp: add the offload support of set SRC MAC action Date: Tue, 18 Oct 2022 11:12:20 +0800 Message-Id: <1666062752-33689-14-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: 91cb1874-9995-4947-9123-08dab0b6b274 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: K6Sirlxj6B3PVDRsVm87efM132wrdIQkz8OrNVkwO+Ki17Wpu/Aif8Hc3Co4fIg6Z5Uvd1/tqeWCwgLxHu/h1lop0R1dm154bV2pWzaZHx7QZAPcBO7awiAvJNN/PoV+SzkK9zgrFfFf/t8XDsusUphXpN7SmfBPu19jezsXxG/2p1/oKdcIvLdy12o2uh2HbdEJ6cfljNSxVVPT0jOt7Ouau16MB+HE5AehC5kh1Y2JazLZuUERdeBpMchzdf5AV06sQzkEKbZZbZy8K2c82uRZjj17Irws7LodONOF4Fytz0+P4Yvk3WVCy+HY+aWchSWaE20QmjeR6eEkwH6bvg79ZrqhrencChgtzKEOwW8dmJ6jmNDEKND494mB0XER9M81Rb2W/tDXmXnyKIKXSy9N3ghThhIYwtwRG7G3z7kAPOpDJEHSPDdrf4bV5XTbDR1BonUgDjSjAcQfAKUfhNEqNUuqegvZpZSV4LBPC0ZSpN4ywRp5/E5dMgdxw8tbD+oOFgGsvKO2xuX+lmaCESwVr7s/ToErz0zp/AQmFNptb/NQIA5syg25UlWftomttHedQZJG1NEgSspRA+cEhmz+XVQR+bhmpiEpn1r6u22TZARfHgxlyPzxvrvAV9zbfQktl8YjnNZEl/WoeKuOUj4FQ+KvGC/vS76buRphHtWjZt9jAf9bX2aam1BD7x8CrbKqm7ytddicLhKJ0NJBK0I97mSGVYCsE3oortsUqZvMGywupOEohkGtdnKdP6ex 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)(6666004)(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?UDQ2MHAzRlpXVjZwS3J0cWZYUTJZa3pHZVFCL1FNL09qNkZSS0o0NDBIdXhF?= =?utf-8?B?N1RSTWJiQmxVQm9pc1J6dnVBL25ZQjVVM0RCNXZaL1BTdVBLdmxWbTZ3eDN3?= =?utf-8?B?WVgzMGhBVUhDZmtkRWZhTnkyQUZmVjhlbmFkVHBmbWN1NGdnR2QrY3dRZWlz?= =?utf-8?B?TGdrOEJYTWc2RGxTV3VCamxDZVMwK2l6OUNtSzQ4c0xVYWR3SG1LWjA5anlM?= =?utf-8?B?QVlnc1RzM1g2Qzl1QkxQYW9aRmtQV0poeDhLSmlGT21DUW5SRkhXWTNzc0Zi?= =?utf-8?B?RGFuVWdWWVFTQlA3QTEvZG05QmJ1bmVneFZrNDVSb0FyK3hLWUI5R3ZQd25U?= =?utf-8?B?RnRreWpmUWJEbnV0bGFjRXVoS25KdFMxeVAxdnNWUERyQWdjaG5FSWg3REhy?= =?utf-8?B?UkN4bkxIak93ckJRbzRJRi9zakppb1kxeHYzMTNaRWZuOFBrV1NoK0VjeGFt?= =?utf-8?B?L2JVRmF4Q29lZDIyaFlDMGczbXQvWS9kZlpzZmE0NnFVVm9Wd1p3eGFCZWlz?= =?utf-8?B?VkdzaFY0b1NwaVdtaUlxcTFHN0I4V3lHUGpmSmlzMkpXbTR4M0hObkliVis4?= =?utf-8?B?YVUrNkRNbHJ5UkJvSFJlaWNXSGF0S0IvSnAwbXhNSmVranVLU3VSSldVUzB6?= =?utf-8?B?VEZmd2NzVWY2bVFBb0FGVEVodUxBeWsvVUhNZmZobitmQVZJK1V5dG4vTHBV?= =?utf-8?B?Rlc5eTMzY1hCMHdHT3Vwb2RBWDFMVHJZVWliUUdaQ25XTk0yYzZoRFAxaWx5?= =?utf-8?B?czBpQWorRlZ1cEhZWUdPeE8renZQMXJWcS9TeVNUM0NybURTU0s4Mm5Ka1FK?= =?utf-8?B?QzJreWRwTXJZTkpXNWxMYjZ2TTcvOEV3MnNOMSt0UUMzY2ZtbkxJaUF1c0Ro?= =?utf-8?B?dXpJUmFTdEpNWm9wZ01lc2Q1aWRvZDhhVkVlWDFLaXFtZFRHek94bjlrakZK?= =?utf-8?B?SkhOTDUwMy92VXp3Tjd5eXp6b3RGcWV6RlRUb2lReG5tcXBjZDBNUXRXL2t0?= =?utf-8?B?dXNsTEFBNFJ5ckN2aFZEbzRYSWxBZ0tvYXRRY1czemlyTXBRL2J6bVJhdTlD?= =?utf-8?B?UG0wQk16L1dMRmxPOUhDclhLSFBIZjFscHdBYTRWajQ1RzUxTWZIbFJVa1Mv?= =?utf-8?B?QXEzbkpkd1g3RGlHV1pmM3VwcExpVGZZMHQwTWw1RnZVeWZXQm9zTG5teVZC?= =?utf-8?B?NTRhbFVXK3hlanIrekNQbHdRRWYyUlFoZXpZM3dnTXUrQTBiZExHREJiRVB6?= =?utf-8?B?QWFjZlQwVy84eVlxWW5UaGJsRWhWSEswVnlVYTZ4UmhBb2taY2svUTJaUHpG?= =?utf-8?B?RGZNM0NLV2tpalUvV1crZWxXeTVycTkvL0gvV1BvaVMvd0g0dHhLcVBEWEkv?= =?utf-8?B?T2drV3RoNmxKZzgyVzk0V01wS29KS3N1akNEc1VacnJEZ0F4TkY0K01SZFVJ?= =?utf-8?B?SThyQVFKS0xSc2JlaEtvSi9jV3VhelU0clI0WGYvZnRhYk1jR1huTHZidy9F?= =?utf-8?B?aTY3cWxyVGJteVpVL3F6NHdSa040dHFxMnJKbk5ia1NCd0VsRHJ3U0NnUWRJ?= =?utf-8?B?WHZXODJINGY4dTc1ZDh0dkRnYS9TWFV4OW5KVWd0ejhnSVJaRS9EUHhqVEFQ?= =?utf-8?B?bndPWm94VzlUN0s0QTJPL0NLejRPUWZJM3N4Rkk5Sk1JSmw3dk9vY24zUzZ0?= =?utf-8?B?N1IzczJPc2Z2WTBjbHZqQnpIcTdCWWRBTzFTWStRTWwvbzZ0bCtVRjA4ZHB0?= =?utf-8?B?ZGNQQlRPOW4wSnFCWXJSL2xBQ3VDcEpzNlQzNnNDRHZWKzNPSmdJVG9xVmZo?= =?utf-8?B?OVo2Z0dTdE5heUhZTWFNMnNTOEY3TnhFS1B1U2szdk41UHRpRWFtYm1rU3Bv?= =?utf-8?B?LzdkTVBxeEJlNDVGeWVtQThwd3hRa1dzeHdnOFgxdm15UVVTaDlsa2E0WW4v?= =?utf-8?B?L2JLT2crYmRscTlubkYzekszRVJaTXNYbVA1cmxXS1RsTVM1WGxYWW5kdFUr?= =?utf-8?B?d0QyR1d3akhlUnhVQy9adkxqZXBMQUZCMkg0UXlWSTBCczdIcVNrWVBEMW1C?= =?utf-8?B?c2lkdUhLb2lWcVRMZ0d2VDdmMWluZmpVa2lNVDRFUzYrYnZvUFZQckNOTHRQ?= =?utf-8?B?bkhnK2FPZ3c4R0YvUUUxOHNGNDJrOG9MaXY4WWlSRFFZdENUREh0VDVPSVMw?= =?utf-8?B?alE9PQ==?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 91cb1874-9995-4947-9123-08dab0b6b274 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:15.1960 (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: Nd2igijey2Y/in/nToOewS0NtlYG24GOFWek2tBU49iK16+nrAty/dLBM4Lt5tWUmRB9qxypxFhXaaUsyh2BQfDEMdG8x3ZOb/UFK083Uag= 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 MAC 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 | 27 ++++++++++++++++++ drivers/net/nfp/nfp_flow.c | 47 ++++++++++++++++++++++++++++++++ 3 files changed, 75 insertions(+) diff --git a/doc/guides/nics/features/nfp.ini b/doc/guides/nics/features/nfp.ini index f8f2577..ab6ddab 100644 --- a/doc/guides/nics/features/nfp.ini +++ b/doc/guides/nics/features/nfp.ini @@ -42,3 +42,4 @@ count = Y dec_ttl = Y drop = Y port_id = 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 36d406f..b61342e 100644 --- a/drivers/net/nfp/flower/nfp_flower_cmsg.h +++ b/drivers/net/nfp/flower/nfp_flower_cmsg.h @@ -335,6 +335,33 @@ struct nfp_fl_act_output { rte_be32_t port; }; +/* + * ETH + * 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| - | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | eth_dst_47_16_mask | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | eth_dst_15_0_mask | eth_src_47_32_mask | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | eth_src_31_0_mask | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | eth_dst_47_16 | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | eth_dst_15_0 | eth_src_47_32 | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | eth_src_31_0 | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + */ +struct nfp_fl_act_set_eth { + struct nfp_fl_act_head head; + rte_be16_t reserved; + uint8_t eth_addr_mask[RTE_ETHER_ADDR_LEN * 2]; + uint8_t eth_addr[RTE_ETHER_ADDR_LEN * 2]; +}; + 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 bae53cd..37c4b95 100644 --- a/drivers/net/nfp/nfp_flow.c +++ b/drivers/net/nfp/nfp_flow.c @@ -573,6 +573,7 @@ struct nfp_mask_id_entry { struct nfp_fl_key_ls *key_ls) { int ret = 0; + bool mac_set_flag = false; const struct rte_flow_action *action; for (action = actions; action->type != RTE_FLOW_ACTION_TYPE_END; ++action) { @@ -603,6 +604,13 @@ struct nfp_mask_id_entry { PMD_DRV_LOG(DEBUG, "RTE_FLOW_ACTION_TYPE_PORT_ID detected"); key_ls->act_size += sizeof(struct nfp_fl_act_output); break; + case RTE_FLOW_ACTION_TYPE_SET_MAC_SRC: + PMD_DRV_LOG(DEBUG, "RTE_FLOW_ACTION_TYPE_SET_MAC_SRC detected"); + if (!mac_set_flag) { + key_ls->act_size += sizeof(struct nfp_fl_act_set_eth); + mac_set_flag = true; + } + break; default: PMD_DRV_LOG(ERR, "Action type %d not supported.", action->type); return -ENOTSUP; @@ -1221,6 +1229,36 @@ struct nfp_mask_id_entry { return 0; } +static void +nfp_flow_action_set_mac(char *act_data, + const struct rte_flow_action *action, + bool mac_src_flag, + bool mac_set_flag) +{ + size_t act_size; + struct nfp_fl_act_set_eth *set_eth; + const struct rte_flow_action_set_mac *set_mac; + + if (mac_set_flag) + set_eth = (struct nfp_fl_act_set_eth *)act_data - 1; + else + set_eth = (struct nfp_fl_act_set_eth *)act_data; + + act_size = sizeof(struct nfp_fl_act_set_eth); + set_eth->head.jump_id = NFP_FL_ACTION_OPCODE_SET_ETHERNET; + set_eth->head.len_lw = act_size >> NFP_FL_LW_SIZ; + set_eth->reserved = 0; + + set_mac = (const struct rte_flow_action_set_mac *)action->conf; + if (mac_src_flag) { + rte_memcpy(&set_eth->eth_addr[RTE_ETHER_ADDR_LEN], + set_mac->mac_addr, RTE_ETHER_ADDR_LEN); + } else { + rte_memcpy(&set_eth->eth_addr[0], + set_mac->mac_addr, RTE_ETHER_ADDR_LEN); + } +} + static int nfp_flow_compile_action(__rte_unused struct nfp_flower_representor *representor, const struct rte_flow_action actions[], @@ -1230,6 +1268,7 @@ struct nfp_mask_id_entry { char *position; char *action_data; bool drop_flag = false; + bool mac_set_flag = false; uint32_t total_actions = 0; const struct rte_flow_action *action; struct nfp_fl_rule_metadata *nfp_flow_meta; @@ -1266,6 +1305,14 @@ struct nfp_mask_id_entry { position += sizeof(struct nfp_fl_act_output); break; + case RTE_FLOW_ACTION_TYPE_SET_MAC_SRC: + PMD_DRV_LOG(DEBUG, "Process RTE_FLOW_ACTION_TYPE_SET_MAC_SRC"); + nfp_flow_action_set_mac(position, action, true, mac_set_flag); + if (!mac_set_flag) { + position += sizeof(struct nfp_fl_act_set_eth); + mac_set_flag = true; + } + break; default: PMD_DRV_LOG(ERR, "Unsupported action type: %d", action->type); return -ENOTSUP; -- 1.8.3.1