From patchwork Fri Oct 7 02:18:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 117523 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 5705FA0093; Fri, 7 Oct 2022 04:21:20 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B18C342BC7; Fri, 7 Oct 2022 04:19:48 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2091.outbound.protection.outlook.com [40.107.220.91]) by mails.dpdk.org (Postfix) with ESMTP id 3F6AF42BAF for ; Fri, 7 Oct 2022 04:19:47 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dntEvnQYrDURE/8sQ+oYAeidZnv1JcOnJgcIWphCgnJYLUkX0H97I8HpIBZckgHJqJjlC/ZNUgq4dR95S2ePKTF1PZLQaa7MF4hqFYAWdF4acGgbP5/vpT6Aj8pkho9voXuKQ0fA2Lge/ZAabUo+AQlgAer5hbk+oxL5xGRpbXhlSWdfA90fyzve0wZhGxu3xRvH2BovcBV+btRRVheev8X4YD/QwpbuWu4VTy1zI4BDQ+fAwz8uwjFGFylX847dw6C3iACglsvYKI1gnK2SOWqXEchTGqwavRS2upH5rM5GoffMdncxu01dehkGFHpN1dv1BjqAjcM1uqP24Ke/sg== 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=LK0mfFjKNY62vGZvkMwwPdNmShEa43kdgeWTkadfSAY=; b=PCQ6L9t8rZeCmwQGwqmHznv1zaWOAd+VSEtIJBPWMqtd0fK71ty/JTE0gPRlxdGQ3byL367FH65/BfzleTwHQTnRlNRA915YMIoLGMoqRnxcf/AT3dxooNNBvdqyIqSzH1ViaNzlqtfaDNEvPVes51ujCO956KAc62dMtubZKgyN25apcW5GxfUyzUBs07bIeb8c6UBMa2jpHzoxoNO3GcP8v12NunZ5qFSuaSC7zRnUN2KWIcwrMbO3DV01SJPCNrF/GE/2Zxt1Yol1VytfWnBBsiYG327RZFXkLlgQm5W0xUaHc/2Uez4Q48JZf2APcp3KlkmX300x3ZCJ+PKweA== 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=LK0mfFjKNY62vGZvkMwwPdNmShEa43kdgeWTkadfSAY=; b=Qm+d0RxKSAan2WlyyMFHGC5zHP95tvTknIJV0d+7QH2rpK71eWrGVz889AkBkmZnNa3WSK3CLFcdTfes/VJZe7gWIFlx8XVu26EqXjENV5QX3FzHzvb35A4kVH79hhpBAssjfXJcyPIeNLgmxfbi9CiXBlAXXo9ojvpZn6xoWkU= 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:45 +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:45 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He Subject: [PATCH 18/24] net/nfp: add the offload support of set SRC IPv6 action Date: Fri, 7 Oct 2022 10:18:40 +0800 Message-Id: <1665109126-16201-19-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> 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: 1473fd98-4a46-47a6-d2ca-08daa80a66cd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: sGpt7TV097T2bzwuEk5ylAB5wG6N+iDffhH1IWSMcmLguFLMXlqBy/OmgpFmMZ1SV6NPrQG0ZrrLHe1iuqbArrghkW6B7/rrUZosn8sPEIXAkcxVom2oji5RkG7Io05Xlw2HZ2ZBonLVzJqz1GMgjKV42GSWIeNmawCZDgvzS6Jd1a+lnhnzl2ZKiXFB492Do8RcJr9LakxV7CZ3rBjDwrANf7YpDnMuuKnAZRKTQriCyo9j4BL/d3HhO+KFmP29RwBU7DRGTPofUg6yU+f3kCAciyFlV0SXXTACh1Zv3XWntn+klfWF3xhPV2PVeUSl0oGyyFkrpPca28rmz5JrrXKN5bzfLF6LDA60e39zQbW4WbqHvLcwNFZL5uiKWfRdkF7O3RA2lfzqgW0J9StuTGCLtLF9fOR68Eq9tOJjWMpsbVjxLSLsD8QphX0iQ4fU5a9rtu19bAb/Kr14Xc6OoTh0o6FtO+8KSUkJ+fZXtMkMZ9A/4oU8IjjIDeOyGn42noblEtL1DQsFef5nGkdBOQW5KL38ay2GJWtlAmmYQgrQhMPHISElJMineTUcPxjrzlwCvdVCbsc22bfwfGzpUqb7/3jy0y9iQbeuorhnwRS2n2z3cXGPpEGRwzEhgmeWu8Mj9VenIsC+FPjRbbfQaNvOkKW6YC7lRyPodibm4KKXnXnvh8+3fC5GlofFwQqY9themZApniOC2w7kTL0bD3Ag5JoBnDyQSLS37mf+Avxy4wpou8cZmetVjmpyVCWF 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?q?IXT8bxszM/ygWu9ZuO79wkiw93+l?= =?utf-8?q?ZLeDODhELbiEG0H4uHe+K8aYlPOxjIxOY1xEnDi6yqPTby0O1m80qa+5oHvfb5AQy?= =?utf-8?q?bdaMIo2wXnbDVyt0WSDLjiCrChQ3AUGmVb5QbWSZx1UpuUawD0MPZf7M+zNwWy/RE?= =?utf-8?q?+mOUTglaRXDj4B1AamLn+G17LG9IVTdvfR3voQPJ4vjYs9xlN8bDB+CJ71hDgzg2z?= =?utf-8?q?rLZwNXTQ1B2+4eWH0u4MMqEub+49YNXufUay6zKL1O+nIAeKYnTnVIAGKaUqLOep0?= =?utf-8?q?qbvybSHBJ6yn0lHtmZfTjH4lXllO+eR+Pu2NmDlKtxchFbhoeBg7z7Z1rMJMt4MES?= =?utf-8?q?z8kWWVR1Mm8vquGsw+oe2huKsNe5DbL9Jmmm2UXw0In4WC25hiv4YjopEiZb3vEaL?= =?utf-8?q?5VK8o5zoFcYnTos3hTclWWERdtNgVk2T7bWQwAE/dg6N+BEslkpp+Ky+sW0oqJK6w?= =?utf-8?q?+zqkrEDu/KGbHORd8749lzKWH3jmLBjC7DJDREGMMKcXXEhXaR/dUX6GrwWw9sBxh?= =?utf-8?q?zy1GtxeJyLhFGRL2lObBcBpZ0wsr6p2ZklpZWJlOoq5SpVp8JZCwfFVavORtVqkl+?= =?utf-8?q?xI0apflFnWgs8Nese0qYeG/3vjzQ33/xJQJQ/IC/VZDNzNElsxRbG8VlIzyc4MG8n?= =?utf-8?q?G9yuKfFBpMPamnjyJfx/Nh5exhjZsnGuV+kipEpIgWumcSm7ZkZoe0iBfnvGinwRZ?= =?utf-8?q?j9hkoD+d4FBFgrYFAnLzcplB8Q1vuXKJg5VzF478LfqvjXzdnJijjCvPgPRvHwuOw?= =?utf-8?q?yTKdMInwF3d2QWRNnJ0FJ9mfwgmeMwBAxxbXUd+0LRGjN4gQEnP29gRJc1t9C+Zw3?= =?utf-8?q?WG7frdhulu+CTGbkZY8kUOgLhzESuL9uYExvLsDv/isyioxusfRIOG5QGhnOBf4rD?= =?utf-8?q?iiwP0m42YdNoDuv99WyFnhvxAh0u/lySqPFnzD/wC8xGkT/hmKTuCQP2hsV87uS7n?= =?utf-8?q?17JeMntTatC81riBV/uHSk3s/1295ccMutd4BHwm9WoDR78ODgEY2JFssdPuL1xBd?= =?utf-8?q?JojaEN7L0+2Sm2gb0GKO0OH9qo2CxuaN+J65Mg2uJ29fPRczmeBiYrCXDiQKwZkVh?= =?utf-8?q?cnXPAlspHQIqp3wgXxB9/OM8M2iKr5nY1+mX67oH/+kUfJeqSeucQZ04cWKMpNf9X?= =?utf-8?q?BMHSqH8prMK1/P5Pk0NbaWzSgTRSVNyPQ7vneY14JqyBQTfPwSSqFaj1LF9dX79DJ?= =?utf-8?q?l6K1neKbHXAY9FTnB1+cabslhL/WBSSMlN6+S0tO1lXsUHMNkUloJEq3AhSEPROPM?= =?utf-8?q?V7zqkH2qQUpGz5SeqSRq2++g+guxf2PkacPdnyd7AKfqmf5fQvQkngV1Mt8xOMi+Z?= =?utf-8?q?dg6Xm7940rEmlzPiT8+/vLn6rxbOqehPCWClUjzwWU225enEtH3z1HymxNoPvcsar?= =?utf-8?q?4vrqifn0Ru2QGwhRtbnCs/hMY/nrza1ihUpEdKI4Ufz8M0vxw4/HCfehhMg7Laawy?= =?utf-8?q?JlYxNoj6ii6psFTYcinW4tFXAMb01aI32HgMCNKLunmr/zWxiKzLaZqr0W/49OSBF?= =?utf-8?q?uZSqbDPFrvWrR0w3U5LznAVgAd+4jMyQww=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1473fd98-4a46-47a6-d2ca-08daa80a66cd 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:45.6906 (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: T9ToHYW7P+vChZd0Kp+fAIp/fcjAalzB5olXWQ7grw3LZgfmJwT5kZXyimIHYXv36M7Ynrg/1iilKCu6iIasA3WZjb+F3H3EuEX7LkbcyWo= 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 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 aeaf1f4..1adc3dd 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;