From patchwork Fri Oct 7 02:18:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 117529 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 AD1F2A0093; Fri, 7 Oct 2022 04:21:53 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3E12342BE3; Fri, 7 Oct 2022 04:20:01 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2106.outbound.protection.outlook.com [40.107.220.106]) by mails.dpdk.org (Postfix) with ESMTP id 617B34113D for ; Fri, 7 Oct 2022 04:19:59 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DxQi7y4j4cKXFvVBwZq+8cgKt0066KQ1cJl+HB01ARiQIs003/RO62fXAdVC5UgoXT4DDYPAWjY+Aqpiqb6jkJ1zpxaQCGouin1gBl0wjFIWFtvqWUSxOF2pq10+lg7E23BwW5M/J2/lPpKjyPRzPhJib1DHW5LeBWEy8xgUtFND2sj7DdMp3HJNMVfZWE+3FVD0WVRN4ogGj/zk6Ly2WoeR3J5Q75/zXLItAvJIbPLfN4SOyde91i+x1J9TWJyJzlnwsjBNnHnhdlMQDfv1ZZnm54MzuLbjjfllw/1b/IFK9GHNbd84af0XL8naj1AgrNN549nMhYSUqSHyMr1sfA== 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=xKz3NldIVFQdqkxWs+iCVefnoCojUgRZOxEp1tOERPA=; b=RBxgwds9Pn2o5KjmgPg13rUMbyXrv1pBBduOQ8BNXS8/l13VnrCeSJGAiJe/0IGAjCdSuNQJ/PbT4reKsgobGVIkN1DDk4GzVTmuzCAS4Tmjm9Z4GhzCU360wj5HOJ+NxFj02bqv4Q3r9G1q1Kyj1PicNtlhxz9MtSXnj7xcfNFIn0PTtNI1lHVhPjZKXouFb4U1EucDRuW9swr3TZkiyk8FtoP30miLqjI1cCvFmsOzRvUjUZKKtMYXjA+D4udEyeeed6+fLf/OxhhqbhkY6E/c6gE4gvbCrz8fkHwQ1yTdoFaM6jadisIr74StviaNz73XqpFKP1g9373cZfisvQ== 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=xKz3NldIVFQdqkxWs+iCVefnoCojUgRZOxEp1tOERPA=; b=EU+Dx6rXLclBDl4rtLZJivfUkLmQ6lwrq2J7L7icQphjWURbeH4fuD6gSnvBG3WiIi6L5ZsZEMLea1oDXR6az3k728+gYw0YgnSO+ABpM2w7np+ZjcM0rLZfawcamkW4piEKqUJmpU5Y0OG1POzzjpo4Hc7E5y3gVMFZB+4uTA4= 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:58 +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:58 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He Subject: [PATCH 24/24] net/nfp: add the offload support of set IPv6 DSCP action Date: Fri, 7 Oct 2022 10:18:46 +0800 Message-Id: <1665109126-16201-25-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: 853be3ba-1e91-406a-79be-08daa80a6e06 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: zT3VZXkxx/+CPAURWWkaVOSO5jvUzQj8MdL9TtEz1p/5PTOmb++2WoDURDOm5k6qe2HqyCdv/s9GINtyP56H01caY5xuygPt2NvDZb7I9AC6exjmqmLQ6/WSChXrsPA4gpvAkgknT5tR1MZoDIVSOE6jvqeoy8bf/ZJ50u1hL5YmGBR+TNgw0kWiGfKxtInZLNNsT98uWRZT8CcU4uIC2cE9ZxN9DUyQkxouhVMqS05XdE0Ua2fuS5GBi+q7yWkab+opvFm9vSIs236m8pU07Izc0SqYiVRFX/CIntaesOlta8MXdxBOjUM7iClOXf7YchI/dA0etQEWgD/414yI5ZXvKsKl4AI91tWErAA8zQb8CF2/ajKWLr0v+09eOsk1YD2PEV55QQiBfQ+o6OL30amQHvYWr8iLyhhPak1sK4u25N0EWsVz7kIpOk7WkZYdKCU3tdRVNk8tBQuKLxmgkohYWGybVGqxRXGnbDaXNJsu0YZ7sR29VVo6sqYjZch6g8RKnRPNtRps0fWzIQSiD2wP6dFslt0Psc+OqB5qhz8f1369tNld45+eSb10uJlh0yBanErojrMnAWADoVcetCohW9jPgeMsObWVADtlqm1vuXsGnEgK/aBquHXAwjIDh9avfL5U58qs2JTBaSXqesYXxdGiGKk0Xjj3V0N4iZWhGhZFn7JyWeho6oDKc6Z0f3aWlZY4LlZ/CRpUbTcK1Ou70rZP3ez/qLYBpW5zueZjn93m9OsbtioJkAmihbBo 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)(66574015)(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?Sxj+RXu7VUfJZtxVkylPFuqPZbr/?= =?utf-8?q?m9dFJrOTZD5TgI+pe/wCZKmt616PM8KKpmzOQUiEwe/who0lcca7UAkMK94jgKTis?= =?utf-8?q?jUvHuUSfL2sP8ingqrOvckGVxHhznVivmhrNahC1OprpvDoeuiEhb94RHVEyu0N7X?= =?utf-8?q?nTRop0vzI8DkDQ3fwZNmG5GpFeG0MvNfYRsLCA+T4Uwcgbcf63k2KO+rO6KG+oQIy?= =?utf-8?q?LoXyzAJVHgYKO0MF6raOrxpgZ6GAaFe9nhAAkl0Q6L7gQ90+aRWmh+tEOU5GIbrEJ?= =?utf-8?q?ToBwu+lpA5o1g7JFqEQUW3S4GK5vPlM9OHpAVMOUsv399KbqyFeR6NCLYWWshT1fB?= =?utf-8?q?1r2NEXypvQWLAWMzNkCFhXHaORx9jXqGJt9s4IGOkkUPwnlUVXts6u3A/YcJGZLvG?= =?utf-8?q?jvUnHdkV4X7ly1ertDzq18W12FOB5lDLIpekP3MZ+aRxkAteABDkcXH/T4BXv91ZY?= =?utf-8?q?bjCT7WHkVf1gZ/AYaa8BUxTkb+bZtYNuaY0/Z1YV2ZRdAFhTHexnrE2P5WixFCF9Z?= =?utf-8?q?UcdWpOzRZ2kEZJjMMTy2uaZZHV6kGwVE3t1cPU5wSdFFzMptE+EisX/e3Nr2UxAww?= =?utf-8?q?5Q6xAqxRpl8eKwXwXeXRwwW6ek3qBB1e3FiqpTwhp9MXIU+aYVbCPuXK+cPQk2ciR?= =?utf-8?q?/3kCV8LteCWwN9kNTNaoLXOuJgEpm9mATl568EdQZRDfKx4/TeA97NFov4/+Cxhci?= =?utf-8?q?ClpyIhHxoqWYx6840xYjcMNVqCUFg4lGHajlliARD8yTjDnU9osBOeNSV8Dv/J6HC?= =?utf-8?q?P6j9CPKkHGtZWQRRao7BNsHcJT2bNPfJ4zleF6BUPvCp67EE6kgUL978gtISerZe8?= =?utf-8?q?xZZt+OSJqdLoBiR4LthaB7bCeFpcdERW1UHh28N37iA4yoQdwPg42NEP+zXD5sezk?= =?utf-8?q?uzK2CWk8lGhTrNBnbylif7+d08G91EegV+VED6DfSiKHr+11IUZeSl8z8MjYJtuiE?= =?utf-8?q?p1vRJvoNVXAEAFcmYTXVdILosXZWkfHT1PO/IEi4rBMlgvuVljvZjYJds9sG1KTnm?= =?utf-8?q?QmY93b2/b6pxUx+4+gfOa/GmefC8jDPqcDix21u2gsnz2xoR2OHIfOCvIyPkxUYDm?= =?utf-8?q?vyddoiQczNvo8Q7t5D9uB7/IrbgWsqz6O5UORRqGE/aTIklMZeCjb9p7L5RKIx6dY?= =?utf-8?q?Pi6Y2s30u3Sgt5ILFTXZItQQ+IJbbL6Bb42WP8wY0/Yie2wrSzwSIEn7e50ITEoou?= =?utf-8?q?huzCrVySz+YV8BfKqkaVSZB/JzalyzZNYNSJAaV83FkKFHkRzoidcjFsuhtf5vISL?= =?utf-8?q?4Kc6SrX8BsrbUN7m4SCyLqWicmUHpoh/qzpl7VmbwrnNUhSZwNcPT9/uPLWQM/AWw?= =?utf-8?q?qofHksLszFUFPlaex7yjKEm+iiE2oTe4nP8eDszOWx/Mgr18uDB/j2jkNRRSPo3tO?= =?utf-8?q?LLMwUTSzXRo5hympj6vrRxNV7/97JsuHubEBETHvt3Ym2D7UdDmanWeZNCYSRU/sW?= =?utf-8?q?GCjU3cReFipI9HJhLaTJoLyzPq++tIwxgkuedNnt21CBDvyLIZcPFGG6smlZUzUdu?= =?utf-8?q?+6mZLyW7xriaBdXJI7czIi+qDH5ZWF5U4g=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 853be3ba-1e91-406a-79be-08daa80a6e06 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:57.8840 (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: xycOXpcC+9yba7ab7WrNpzaJkKaYckcL6B97HRkjzW9gW0VdbHJ0vX5x/rSTF4yomuSwH3GORwf5+300RmbEcrTIaGM2IrWGBBJt3f0VI0Q= 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 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 26de3bf..7e1a87a 100644 --- a/doc/guides/rel_notes/release_22_11.rst +++ b/doc/guides/rel_notes/release_22_11.rst @@ -125,7 +125,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 283b4b1..3f3ac4c 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;