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 39AD2A0560; Tue, 18 Oct 2022 05:15:28 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2FB3A42BCE; Tue, 18 Oct 2022 05:13:42 +0200 (CEST) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2127.outbound.protection.outlook.com [40.107.94.127]) by mails.dpdk.org (Postfix) with ESMTP id A74E842BCF for ; Tue, 18 Oct 2022 05:13:40 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=d5NMhZ69hQM4/YHjt/sBNySWbwoaLZI3eprmL9/hI93oOnBi8p4czn707pyXfPHcYtftXiZSotLbce+xTv4P4QBFzLwNZEpGtmkOCZEJme8DgB3jJkdTM/H2VbqzKLgJ3dhVD6srW9YTEAwhzMc+bmVMvcMQgncvCmBa6S3+FqzvwEMluHqwqHBVmS6n0Ssm5/4xJYOad6+DUNOErCPcDYajGDicZrprzFo6djZJUHZPwp/dqYJSij3xsR69Qphh1cO8xRDWxtctO/9JeprScWhMQbBIAYFQxirS2i69TEwvc4VM5vzxiY/6P82c3xTU83gqpadHOgwXUqlXeXPZPg== 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=+lF4TZd8aLUCoOM++Fm8hXI4I4AFJEmR1ob3QcOab9A=; b=S0bn2tsmeCTA6avlK2hFRLil7uF1ytDKtQWmItuWnmfpcPwrXpCQgEdfR5JgoTOGyBiaKeY4xqq1nlSeFAC7YJR+s85N9s/ONhQH9Ufzhm5dvNWC6ynTjQMEQ71giLARRuImUL8VJx5vXi+o7mYK97XS6N85vrhhRFy0ATzyWn5K7Jjn1NYNyzLJxahtnIqFJGkQws0GbFWZfKIpBDRnC/vOxG6VdzMVDvQGfJwYaTIvIFQX08sE+o6Plj/MPICiBt+SwqZcWyFY/6yojXiKSquagmGVFs9uachRZ+ooEoMc1Mo3UTqBUPesqhjEJXPCRm0dh1/QTZAe7TqdGnj7qg== 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=+lF4TZd8aLUCoOM++Fm8hXI4I4AFJEmR1ob3QcOab9A=; b=lc91ecuIyNbH/B2Ht5tf2BV5bD+dCA+6/xQ5+BsMYOX0pjEok61kK/ALn1WtWQ24/54lhasPIYlfYJpppQ8n3+OSb0FD8E4661QXFV4sqZ/pGAr71zvlMswh7IcEIIik8oOWr9ZN2yh1EH0teHCSjZyySBSLo9EKrHV7AQGOCeA= 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:39 +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:39 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He Subject: [PATCH v3 25/25] net/nfp: add the offload support of set IPv6 DSCP action Date: Tue, 18 Oct 2022 11:12:32 +0800 Message-Id: <1666062752-33689-26-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: 74326ebe-ee82-401f-c07d-08dab0b6c0ad X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hf+bYwGn6+vrdnjMgQqoZKUWMhGPenbc/CLIzE4/Ri1V/cL7QYRJf9kjMV2OZ2aVM3GxzHXXbCzKqXYdjS6dV8cdj/bhG+gHnpFNBmqUTWF22RsvdyLy6stbsKtt/f4sGYaJU5EavzMEHDkPVGKrvYmMb2FJ0Msh2OpB8Ots+lBSop0NjYh4Sbd7de81XZqyx596LHxzBNVB0fTAb4RA53zlriqpga7DPG/yJzGTuWbxP/PlDzt7h2e/0NXFOxSJMClrfctKc22zRgtaVf4LZdGdu6k9mWP/E9gI0qQKHfP+Ct2arxLbjJUFLn6X/gVjtvr0d9TkuYHraWL2EGr+MrgY155vy6CvKVRrY+FX7DWeKFmfY8sbLMIkybuCuIqQePJ0GejokEt6EJOPjpINJbvhQ/sGXKtea+dXTPROV+4PuO7TtokTYZvqxdD2GxXBePnLqwSfm5i2bi+NMgcIjgod+5o2xBVW0FgAqDYvP0FzBiwhdat/zTLqQBF5Gxmk2HQputuBeDBI/GpkZ28khfArjnaUy7OGJNkrlvATfTGiFIOlBq2WgcNXhskPNGmgBvvYeFCWEzJjAMWKIcRDdIz8C47UVriFRtV/p9Pw6S8WhnVc3y+EPwCUjeBhahk9w5TL6tPXilYbFqPjfJEDC5jRMlgLjqtk6WUqw6BZGcMB115P4B1QPXKb4LuEuiln66I0Jc4KG05l5kJY+EHB9WqDgu2NH9Z+lzEbDAzku6oacUV5r+FcnL1ty+8bNCwpYdM04QqctW3v6hl+GyCRxQ== 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)(66574015)(44832011)(316002)(52116002)(6666004)(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?TC9oUnpIbmwrOE15MmZXeWhuNXNicHBLazRtTmc1ZnFJMzAxUkZmODZ0bDgv?= =?utf-8?B?YTNHRWVHalNpWXFZUnVyeGUvcXRITnBCcUx2NVFyYmJPQlJQOUNpZTY5bU1L?= =?utf-8?B?SG9mVWhPNDhGTFFMeDFRdTdIZmJVOHl0ckh5dmorWlZpazdzd2ZDY2pENjRN?= =?utf-8?B?M09iZDlQZEY0RmEvRlpYaklKdC9MQnR3QnNjL0VXNG15cWNxNHozTnp2Wm11?= =?utf-8?B?N0pKMmhiWUdOMWExZWhDTFVXNFl4YnhsczZWOUUxOEc4R2t3ZVNBMWc3ekZr?= =?utf-8?B?bGhrT21qRnQ2Tkd5QjFwQ0xoVTJITE9LNXpCVUpkRGNrYnBOc28yQTVhM3hs?= =?utf-8?B?SGtsWEZTTnhPdHJlM1FMVmJVMjhOMTdxa21MNEEzRlIrR3B1cjlWbkpUMFFQ?= =?utf-8?B?Tkx3QkVuMUhHM041amtFOThZc1B0SVBKbG5SWkhNZTc2ajFQb1d4WndvZDdu?= =?utf-8?B?VGxMdEpjNjRCWGdIaHp1aE5HVHl3NklHeE8zT1ZYOXoyMkJlZTdUMXFNeEdO?= =?utf-8?B?NUxINUJnOHhGWjdHOWdoeWVYWmtLd1lVOFdydndEYy9SWklDSS9yajJxVmpv?= =?utf-8?B?R1VDM0RSNmYrTUJicjU4am5JUDBIM3BWV2J3QlpkTWRhYTJWekhBTzZ4bHZS?= =?utf-8?B?VmxDV2o2OFZaSGdnTUNVeVl3L0ZqbFRQSXhMOHMrK3NIWEhpeTV1OWszdUZz?= =?utf-8?B?V1lEUjlOUFRPTnRnK0psOGdjeWpxNENUME5lamxvdFhkaEN5dk9ZSXhCRnBh?= =?utf-8?B?UktBQ1dVRlBmVU9zYmN1ZDBOS2FTQ2IzS29vQ05NRStWSU5CSHlXL2N2TWVi?= =?utf-8?B?N0psc1FOYzh1M2dHOTFXeCs2NkdqaWxGNFBHbFNFbi9WR0NNMlpBbGVERitT?= =?utf-8?B?ZCtaUy9CRWZIMWV2dFVYZm1vK0ZNREhEYzNLMHBZRDFBTFN3SXVRMmVEREQ0?= =?utf-8?B?SFRmKzNFaHdiMjM3b2Yvc1hOQ20xWGZyOEtKQXlGdDZRWlN2WXZJQWs2MmM2?= =?utf-8?B?cXV2UHZaVnRxQkFSZTN1NWlWU2hhWkJ1VFVqVXVoaWwwdk5qSEptOG1JeGpi?= =?utf-8?B?SzVwZndsMG9jc1lZbmVCMGZSK2NLU0JuSEZpOGdlQ0dOQklITDBiSEtjdXFn?= =?utf-8?B?aXRiWmpaM05aMk84eE5OeXZyZk16TEdZWndsVTI1Y3lZUkJHWlhOUDJXbndQ?= =?utf-8?B?MGhWMXRRZVZSTWZVVHgrVEZtSEsvT0dEeGlycEVUem43dEtWaThJSkNhbUp0?= =?utf-8?B?b3UyRWlVREpOZzRjOWlFR2V6bE5QYnJ4K2xWMzhhL0FyT2tObi9BSHF5RFl4?= =?utf-8?B?a1NZT2g2NFpISURFK1VvQjVkeWlhWGUyUDZkbWRqU0prQ0tyUWFDQnZ6Y1lX?= =?utf-8?B?Sld0RjdSQmZVNlU1TWpRQ3V4VkZ4Z0R4ZXJBVURVV0craG55ai9FMFJKSUN6?= =?utf-8?B?cVpyQ2Q2QTNpV2lnZEJMd0pBV1JHN2VFZVRla0ZTczV5VDUrT3VKUEk0d0Jl?= =?utf-8?B?a01vL1c4eldBZjlQWFhMU1MyanowUVIxbHRTZ1RrdzY0U1hrcU85UnJsV3ZS?= =?utf-8?B?bGR0NHB5emZqR2VpOElFM0NuMHg4RStBKzY3NFFHUjlXZnY2WkkvTW84M3Ev?= =?utf-8?B?ZURRYnNNM2pTdThhTDQ1blVGOTVQcUxPUGY3UEtKSWo5OHVsNEh3cVhCZEZt?= =?utf-8?B?RVFMcDNqZWFrNjJBODRqMTczb0orOVpoRGl6a1g2OXFxVm1lUy9sRGwxUk52?= =?utf-8?B?Ujg4c1NNRUhRUno4bTBuQ2NiK3N1V0ZMWUFvMFRKOFFzQjhxckZFZFQwd3pD?= =?utf-8?B?cUJMVkdQZ3F1SXg5Z0JhdDFSWitWQVJZRHFqQlkzT2x1UUl5QUxhODRDYkFr?= =?utf-8?B?TE5OTXR6aytnWXJzYm9YS0FmcDNpaXVZbWQ2K1IrLzJ3SklJU25vZWVUT3g4?= =?utf-8?B?dk42UzYzUHlldU45L0pCOXRhbmZWQytuR1N1dVN1TFRWS09WY1RLQTRZdVh6?= =?utf-8?B?STRhU0krL2I3b1ViZFJqbmhCekJkVFM4ckVDNHBpdDJhT0ZuNnVSVlZPR2Nn?= =?utf-8?B?eDE1b3MzSkxMRGN4L2hRcHJDS0xVVEIveHNheDV0QVNxUllMQzFiTGwzOTlO?= =?utf-8?B?Um1QV2ZTb21EcHp3akNFMW9Ld0dyOURQM052Q092TXhiNmx1Mmk2clRzbVdS?= =?utf-8?B?ZFE9PQ==?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 74326ebe-ee82-401f-c07d-08dab0b6c0ad 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:39.2463 (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: HZq9fMYUKLSPjITvFZ975iKJX71JaU9V2e4d9JdefSvK0p9Tz2HeIDOD6aVDiiUXBH+9dROFVvxIfA9qY42eIkG0XIYuYmRPvJSVtBJ4ygk= 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 logics to support the offload of set IPv6 DSCP action. Signed-off-by: Chaoyong He Reviewed-by: Niklas Söderlund --- doc/guides/nics/features/nfp.ini | 1 + doc/guides/rel_notes/release_22_11.rst | 2 +- drivers/net/nfp/nfp_flow.c | 39 ++++++++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+), 1 deletion(-) diff --git a/doc/guides/nics/features/nfp.ini b/doc/guides/nics/features/nfp.ini index 7cb68b5..1ad6c2c 100644 --- a/doc/guides/nics/features/nfp.ini +++ b/doc/guides/nics/features/nfp.ini @@ -49,6 +49,7 @@ port_id = Y set_ipv4_dscp = Y set_ipv4_dst = Y set_ipv4_src = Y +set_ipv6_dscp = Y set_ipv6_dst = Y set_ipv6_src = Y set_mac_dst = Y diff --git a/doc/guides/rel_notes/release_22_11.rst b/doc/guides/rel_notes/release_22_11.rst index f06c5a1..c2bf721 100644 --- a/doc/guides/rel_notes/release_22_11.rst +++ b/doc/guides/rel_notes/release_22_11.rst @@ -183,7 +183,7 @@ New Features * Set the IP address of IPv4 and IPv6 * Set the port number * Set the TTL - * Set the DSCP of IPv4 + * Set the DSCP of IPv4 and IPv6 * **Updated NXP dpaa2 driver.** diff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c index 32076c6..823b020 100644 --- a/drivers/net/nfp/nfp_flow.c +++ b/drivers/net/nfp/nfp_flow.c @@ -698,6 +698,14 @@ struct nfp_mask_id_entry { ttl_tos_flag = true; } break; + case RTE_FLOW_ACTION_TYPE_SET_IPV6_DSCP: + PMD_DRV_LOG(DEBUG, "RTE_FLOW_ACTION_TYPE_SET_IPV6_DSCP detected"); + if (!tc_hl_flag) { + key_ls->act_size += + sizeof(struct nfp_fl_act_set_ipv6_tc_hl_fl); + tc_hl_flag = true; + } + break; default: PMD_DRV_LOG(ERR, "Action type %d not supported.", action->type); return -ENOTSUP; @@ -1544,6 +1552,29 @@ struct nfp_mask_id_entry { ttl_tos->reserved = 0; } +static void +nfp_flow_action_set_tc(char *act_data, + const struct rte_flow_action *action, + bool tc_hl_flag) +{ + size_t act_size; + struct nfp_fl_act_set_ipv6_tc_hl_fl *tc_hl; + const struct rte_flow_action_set_dscp *tos_conf; + + if (tc_hl_flag) + tc_hl = (struct nfp_fl_act_set_ipv6_tc_hl_fl *)act_data - 1; + else + tc_hl = (struct nfp_fl_act_set_ipv6_tc_hl_fl *)act_data; + + act_size = sizeof(struct nfp_fl_act_set_ipv6_tc_hl_fl); + tc_hl->head.jump_id = NFP_FL_ACTION_OPCODE_SET_IPV6_TC_HL_FL; + tc_hl->head.len_lw = act_size >> NFP_FL_LW_SIZ; + + tos_conf = (const struct rte_flow_action_set_dscp *)action->conf; + tc_hl->ipv6_tc = tos_conf->dscp; + tc_hl->reserved = 0; +} + static int nfp_flow_compile_action(__rte_unused struct nfp_flower_representor *representor, const struct rte_flow_action actions[], @@ -1700,6 +1731,14 @@ struct nfp_mask_id_entry { ttl_tos_flag = true; } break; + case RTE_FLOW_ACTION_TYPE_SET_IPV6_DSCP: + PMD_DRV_LOG(DEBUG, "Process RTE_FLOW_ACTION_TYPE_SET_IPV6_DSCP"); + nfp_flow_action_set_tc(position, action, ttl_tos_flag); + if (!tc_hl_flag) { + position += sizeof(struct nfp_fl_act_set_ipv6_tc_hl_fl); + tc_hl_flag = true; + } + break; default: PMD_DRV_LOG(ERR, "Unsupported action type: %d", action->type); return -ENOTSUP; -- 1.8.3.1