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 DD35CA0544; Mon, 10 Oct 2022 08:10:52 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0F1F642B88; Mon, 10 Oct 2022 08:09:48 +0200 (CEST) Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1anam02on2093.outbound.protection.outlook.com [40.107.96.93]) by mails.dpdk.org (Postfix) with ESMTP id 1D7E742B92 for ; Mon, 10 Oct 2022 08:09:45 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Fe8/QjNT/84WLY48Ud+achPh4OmdEb2wjAzcW8gTEX1rW4mw7BWLaYt7bEA//uB+XWfe6h3nhnXoKbE1JY9VU/Qgn8fvMLhCfSxDaNqmmWhmvM+0A7jx++vOqETpUTeznjhHdVT1DqPZTBjfg5HmIfXMCUhfkzWfEPKe5FO5TAQOdDsSI7SXGCYeSBMK+ySbGpTHxTLZ8/DKdBUJ3SSF+/QxZCQles19Rl220BFOTZnL9TAKYsUzpsY03UZqsVuLP96f/zpX6rK0IiQV+BYks6xry/PUFCWhPEHIiYQ8pzyeERMnyYzhz7lVFLgwF58WgFb4hnqWCezWhMNkfbYc3Q== 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=3au/qz3Jy0pPUMaAnEL6pPLsq+g0USTmnARjhXrnGZo=; b=Kef13Z+MAKCSUcS1ymsR3raHPBnWAPg32KVHmk3WHLuh2hOMHTwJQMmEq67LeGQ41uo+iUou6riyTmvg8ZC8nZTAkK1iCPYSViCve3u/RbTHZwFGMdiVfVRBs+5MBw8ASGezfisjvWaRZ1cy95WZPZGDXLW0k7A7E2EQmvST1MTm1Vcy2lS4/tAcpd2Cp00vyvFMsma4tbrpjLqwl0HYweZVLvU76G3ZnTzHkUCS6X7EkNMKLfTLgc1s3sUZwCwkTNSF1QPqumnO+hAbKurzjI/KSp9Bg+1AJjqhXv6ss76FNlqjeUaMFkwMEw/71KVNV2BsK/zlEUyxWclpamna4w== 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=3au/qz3Jy0pPUMaAnEL6pPLsq+g0USTmnARjhXrnGZo=; b=LUHJPgV8QcUQNRjOItaCg4vwm2Ayu82HnZ8CKmFHbc7JZ+GjxZrcmzcQDqCAG2pGhpqnwKsbFRDOPrU2fdL4ZHPmh+b4aJOEv07YTg0+RmQ4v319NG59oy6i60YNjRfZJBTlqBh+L2QeNeYGlT4PSjPK1lmutScWnh8FKCvIYeI= 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 SN4PR13MB5296.namprd13.prod.outlook.com (2603:10b6:806:207::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.14; Mon, 10 Oct 2022 06:09:43 +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; Mon, 10 Oct 2022 06:09:43 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He Subject: [PATCH v2 12/24] net/nfp: add the offload support of set SRC MAC action Date: Mon, 10 Oct 2022 14:08:50 +0800 Message-Id: <1665382142-21684-13-git-send-email-chaoyong.he@corigine.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1665382142-21684-1-git-send-email-chaoyong.he@corigine.com> References: <1665382142-21684-1-git-send-email-chaoyong.he@corigine.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-ClientProxiedBy: SI2PR01CA0051.apcprd01.prod.exchangelabs.com (2603:1096:4:193::6) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|SN4PR13MB5296:EE_ X-MS-Office365-Filtering-Correlation-Id: 2ec99099-c560-4945-71f4-08daaa86065a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: A8sO46UTIwtzDUj/I4DsI9P/HxnvMO9XvRnNnFV9IC9GBPkOSGdvcfpRx/o6WC3S28xSo2cHkVVlrs/BRgvkF4W5cWStBmUYO6w1T+4K2ektya9Kn9vnkgBYeUeaawDISA9W/keR/jOjxMdOVTG8jc4gzQLawLfh+jNuhE/YpZGY9A9gdkzn34WppVzWT8oTJB5zvNooJ6vaxcZpZblkmUuoRIxdjJg7qJTSf4bHAlVC+mFFOPlTX/Qv8IssRYWbl/4Jtfgpy1qhkwtifl8VX2SWJhmqFknUBjkrL1EoFld+/r8IIvh+hK6FcQnvxlXbXRLMoV6Eys16PCq/elUxhXMNgfQO7kO4NkhNz403a4Q1SRalj8y66zuDHWho4jFNCCLVUHYyVVKTOd8Rspo//dfgvGz4bI+HlqF5Rxx4XI+IDGlBLPWyVzP3uKrA1QTgsaSjyQ5f1urI5sq0zK41aD70Yg4KrVG6d30jmmXCZxBkB8WL0yGFcw96aBMjyC9NllbJRbqzZnmhiSbvhtUNIRIHECNgcMDbhqK8+8XPcR+fWwtlYR6N68lTvv5vzDuMfLlzlQxQkDGMSB5t/SxsMNSzzoIpvgMvOZWEAqkKhXkRZInGc+3xzEhy6232vq3HPKiXxL8X0hjwT8kUiohzNukFanVV6+CBcez6HawzD/89PEp5cBn1HAfeY7KYWgKMBmqF0T9B62G4K0wBewRGcMfY4OinKzxiJBTWvSu21rEPdhl3hmGfFTwuwgppVTRoYfGJS1E4cGmDvsJsyI1h6bpwtMZjJDleNAGEVyNAjmo= 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)(366004)(39840400004)(396003)(346002)(376002)(136003)(451199015)(6916009)(316002)(2906002)(186003)(6486002)(2616005)(66476007)(6666004)(107886003)(66556008)(41300700001)(66946007)(83380400001)(8936002)(8676002)(4326008)(5660300002)(44832011)(26005)(6506007)(6512007)(52116002)(86362001)(478600001)(36756003)(38350700002)(38100700002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?RTJLbTJGcm1zRWlWN0h3R20xNy95WHhUOE8zY2xrS0RvcVVFK1p6T0dVUkk2?= =?utf-8?B?dm9hNUJLWnFwMVhhKzRMMUZIS2FNMS9Da05HSC80OU5tS1B5L3FjUzlieVRS?= =?utf-8?B?MFlId1JTRXYvTDlreE9tRy8rOXJZU0ZNTzltdU1hVXlCaER1OHdwWldUZExV?= =?utf-8?B?MmwvelZybjl6Z2lWdlNraWRJRmV3Ym5XYW1MR3BDT3B0UlZ1MjdYc1pVRzRV?= =?utf-8?B?ajhOSzlXK3hTeUFHU1RvNnBWN2h0MnFOek51dkFRWGRoSGNNT2daRlh5U1dJ?= =?utf-8?B?VkZGdnA5cE5mUENTL1ZxZ3B4VHorbTZPbEhmYklVZndXbExVang5NmNRK3Z1?= =?utf-8?B?NEhOQnBEODlnazhBdUxRN0pjVks2dlVvN2JtbmxaNHJySkNJeEM2UnhmWGNh?= =?utf-8?B?VzhIdVg0QzF6R1NsNVFla2NLNlZOckMrV0d1cm12RFdMa1BDeC9kTGhJQkRa?= =?utf-8?B?SVEzRzJVY1BOUTVvc05oSGUyOHJLTlhtcVZ4bkNsK3FCbnR2UnhBV0NlbFJU?= =?utf-8?B?ZmFaRVFZWjZUUnNmTnhpb1VTQlRxRVY1RkFXaXBpYUpobVdjY3ZMbnQ2MTYv?= =?utf-8?B?NGpqaDloOStkV1JnQ011S2tySGk2bzFnUlZrellESkpTUWMrTDBxSFozMzc0?= =?utf-8?B?YW5MNG1TNE1MUUpzd2dGWTVLTHU3OHFucmx5aXVpRHNSUERQSm9NaWVCL2U3?= =?utf-8?B?ZUxGTjFsek1WVzB5TVBISHhlSG1lUjN3ZFBwdHN5bExvRDREcWFMNjd0OEFm?= =?utf-8?B?ZzF3cE43SW5KMnVWT1VRaFZ1L3FqREFsK0l0ek1lOTA3ODZ5YlVCZG5FMHln?= =?utf-8?B?Rnl5S1RML0RzY0JRNGN3VHZFOGs5WW9CM2tHUHV1Q3Q1U2dwajdyRXh1bU8r?= =?utf-8?B?SDltTnZSdWpmMkNjdnBMbEZyME0xQzExTzE0SVlPRDdGT0JOeEVGZklrejRM?= =?utf-8?B?UURDd3lObDFML1UyR1EyWDA0S3hWT0oxNE9pT1BtQVdTZGRwRnhJU1djWDRH?= =?utf-8?B?cHlZalVuWDR5NGgxVUlQTWFEcnluaFhVcTNaM0ZYRHlIMWFScDQ5TkwxbGJs?= =?utf-8?B?VnlJamNwcXErUUNLWDRJK2hUSllBSHFPaUNxUzZFSDJXcUFLa0hwa2NUTWRW?= =?utf-8?B?Um0vWCtCaWdsM0lEVG1vdk8vTTV6Y3hURlByM0ltUXRlRE56UThFaGROZnBR?= =?utf-8?B?VzhFcGVFNVJLbG5qRUl4WVhVU3ZDOXpNVWt1eURuOFhhYUNNK0l3UXo1WUVR?= =?utf-8?B?c3RONWhCa0ZzZUs0ajlYY1YyUHMvNXo5MUp3S2tZbTZrVkNRQlBZbFNtV2pG?= =?utf-8?B?Yng2SEVCSVFQZjBMaWRIZC8rUCsxSEJFeHRJcFU1ZDZocHBUK3Q5Y0xhWFhx?= =?utf-8?B?ek5NZm0xY0l4MFR1QmdPM0s2RWU1am40VVZ3czNRazdTSG9Hd3g5ZUNrdlBL?= =?utf-8?B?U2NVcW42eGttVjd6YTNsakhmQ1hZcXVDWk1vVjl2TEhMZU9qODh3NFJ2VUF2?= =?utf-8?B?MVNoM2hILy80cURZYUErOVZrT0NWbVFseWlNb1h0dkFPbENTWk53VGtMUFRV?= =?utf-8?B?ZzB6MTdjdUp0dGE5WEZjY1dGNEh6U29HMEs1ckZZbkViTTdZMU5hNlljZUtR?= =?utf-8?B?NWVlbjNsQ2F1TEw4bkRPNkJQS2FDU3BFQ29kQkFqbkZrcjh6cU02ZFBoZy9F?= =?utf-8?B?blhia2kxM2xSdUJoNnRUQ1ZKK01vZE9NdGdQRE1HUVFJYjl1K3hXejNZLzJO?= =?utf-8?B?b3ZQbUZTTDZ3UjNEMzJqaDVWUUc3M3pwLytyaFJGYlhsL2NvNjJGWTQzeEpV?= =?utf-8?B?U0RlYktpZDBoanJwVEJzR1dPUm9Mc2ExcXk1SkFUQWFhZHppTUNSNGNjTGJm?= =?utf-8?B?YnFaNmlDSzVFSWREalJ6ZzZ4Vmx4ZUJZRkFHQWVBdjRmaHNNb2MwWXZqOXVE?= =?utf-8?B?K01JS0tvcjloOVhKQk5LYkdkZ29hQ205RHNFNWxKZlhnU0wrNlh1bDlFR0lN?= =?utf-8?B?WHZYZ1VRWUxVM1BnWGZuQTJORlB3YmpOT3RqUndKRGJzTDl0WWtuazE1Vk4w?= =?utf-8?B?YkNxYmZjVktUb1k4MHlCYnFFL25rOUNlVHJheUNrZnVKK28rd3pCUjZudHBv?= =?utf-8?B?WnZ3YWV4dDZ5TmJtQkpCS2dRQXZkSGEvNU5aSldFOXFGVU51UzluSnI4b3Ni?= =?utf-8?B?UGc9PQ==?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2ec99099-c560-4945-71f4-08daaa86065a X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Oct 2022 06:09:43.6682 (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: yOPDamw/U+ECNuoVbu4LSmY1y9Th3NTje261JkDmsntPo2lMvaxGCCAKXP+QFe+gKCRCan0tgLBAisMcoqGmcaXfc6SWse4+wbKdaTmpE5o= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN4PR13MB5296 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 bb445ef..431c212 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