From patchwork Mon Jan 30 04:52:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rongwei Liu X-Patchwork-Id: 122640 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 143B3424B9; Mon, 30 Jan 2023 05:53:45 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C869B410FB; Mon, 30 Jan 2023 05:53:41 +0100 (CET) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2049.outbound.protection.outlook.com [40.107.244.49]) by mails.dpdk.org (Postfix) with ESMTP id 3CE4740A8A for ; Mon, 30 Jan 2023 05:53:40 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WDqEhEFcRxLg3/lfnZE9OrRuuHO1Fm8YGkbCvbFOdjafgXLyuD4/ERFnyKod7VVrKOVOzG/Zq4VW2SzDJgDkG/pVaoVW0OvuSf8BZ00UWL9yLdi3T3Z6BvrxSP68t1TULAZG7d9eq0NEX97SbYy/jkNfKtF/qQ8C3dGSxB15lq0oUVrcQW9+Ck31MNCsfnPLyw8yVD+QPuZtvOMWZgB+ZnMWSyJS4Ce6OmpMQTJwG1LNeYLPYxHULqNHwb3j1D7mFWwdI+/FHU5tHsrl3djPRhXsQ/jnwI05aabKLTlvqEoQLmxEqV9VHZE54iAmasob4FOOpoesO8YRtFMdaBo+SQ== 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=0YCMmLl8HMEr/ExD04NINSeL8MzcPNdIbWKFkUGqpLo=; b=XwoMXLV73tZHsGwvtJgbyx6G0xayWkEDPkeG25gJ57iWOVOWFtgZx3MqVdnQuqogKWmQh5A9yAT9kluQjpRNJYZ15oPQ3+va81IBpzMOJUEQXGJLQdteoSPYc/Yt1CcgDtW6Z15IdYu8VC921YUY7V/eZ+QXrX8bRIfrdzYiCv+dJtDKBiAa0NrEv9+CpxpgZY6wlxz3ac6xmQ8ToAidnB2LV3pKF5JE0obnCHaoVO4bDeT/9LAUG8ThGS44WzdTbA5E4Cmnd0ai0ZiMW1Hmw+OeJRkv44njyBDW4/aXF7pr2ywI2jclfK5bRCxA/sr54rCrmmHaWrM2OW/VrNdJxQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=monjalon.net smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=0YCMmLl8HMEr/ExD04NINSeL8MzcPNdIbWKFkUGqpLo=; b=Ln704T7YAhCFz94l5fq1IOeUrdYYoMIxGSwkLqeE66MvD+vN8Jeh8qKoxoKdgMScMljrOWxz552GzZQMRHToTjSn/Jb5DL2VsgAIaqx9mpZbVGua2WuH5Rg1dR426gG1TTat758AiwOkQR8USnmUouwNJ+aQ3CgCaaS+T4I58Nt2YCShrOz6OGxtiED4NmB4ele14husVjIDXQJUAhcWes+DJ+7f1a57knAXy+5xC0H4RDpm7B2Nuh4o7zNxOR5faL8GL2zMQbUC9/bh+odhimWXPhSDk/ugQPWlzesKQ4mfQKVwx7xD8sWQ1Ur1bL8uXyoDlz/TnHs9DiWfGRit/w== Received: from MW4PR04CA0186.namprd04.prod.outlook.com (2603:10b6:303:86::11) by IA1PR12MB7686.namprd12.prod.outlook.com (2603:10b6:208:422::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.33; Mon, 30 Jan 2023 04:53:38 +0000 Received: from CO1NAM11FT042.eop-nam11.prod.protection.outlook.com (2603:10b6:303:86:cafe::ef) by MW4PR04CA0186.outlook.office365.com (2603:10b6:303:86::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.36 via Frontend Transport; Mon, 30 Jan 2023 04:53:37 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by CO1NAM11FT042.mail.protection.outlook.com (10.13.174.250) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.23 via Frontend Transport; Mon, 30 Jan 2023 04:53:37 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Sun, 29 Jan 2023 20:53:26 -0800 Received: from nvidia.com (10.126.230.37) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Sun, 29 Jan 2023 20:53:23 -0800 From: Rongwei Liu To: , , , , Aman Singh , Yuying Zhang , Ferruh Yigit , "Andrew Rybchenko" CC: , Subject: [PATCH v3 01/11] ethdev: add flex item modify field support Date: Mon, 30 Jan 2023 06:52:52 +0200 Message-ID: <20230130045302.1560006-2-rongweil@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20230130045302.1560006-1-rongweil@nvidia.com> References: <3ba49f25-52d0-fe07-02e6-22a71e0fbe13@oktetlabs.ru> <20230130045302.1560006-1-rongweil@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.230.37] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1NAM11FT042:EE_|IA1PR12MB7686:EE_ X-MS-Office365-Filtering-Correlation-Id: a00a5846-6e62-4918-77c7-08db027df2f8 X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2SJ5dz5x4hgznpMPvpoKfOoWZvIs+cOceuVu9OAjrVwvVQuUnRr4Erw900urfeazUV7sMgHU1gpK9kD6QvjuhSuFHs0FYQDAaFlGpVydhZxHBQODEMFWWNnM/x+FFUPu2MES59pndruXNXWxGgbSPVVBIwXR0aDasN5wsoFwQxX56PDe734I8fDBk9KLobpuqj4dEZwB1qazBpJ5crAQLgHjCnWexR92LrIFKN864IHUIGBX8Z9ixP4SK005infnYwscUII42tFjd3aDyjhqByv/eJwq3UVTTeE5yyHSLk/zULZJgGj9cDLrS82vOwwgv5ZjA6BamT/+/UoVgklSCiZdD00rn9xAiNlvgnKvTWbmldwx70B6/otDyspFp/Jxme/K6fkHemi7auLKzBVVxDMSULBdWSEIAzfu2D4TfDbFKolwYrizytQ1L5r1B+3GUtfy/mXiR/Ul0QmeT446NmPxbYVjgHqvJOMRXY1c61e1HmbbuPdo2i1uBCbwIhU9ggJ2g50xr8MFUpbQr0e9pZ07UUH7rB+6+GR18CGzryLwDwO6c0kUXjM9IX5Uzj/vUDPnlCPC223sJM/2C9hZKxuZMxvRFpsjAYW39NSTkurDohIYMnAuUTjkgudMyebSYQLsRlSiWD0NYvT7KgIeTKPmeTxbQNj1mEl+1bLV0ZY4EHRCYmmX5TQ9IKBIUrH3yTqT26Bw9fwdlbcP576IvZifaAddY5nZel7g+GCMexA= X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230025)(4636009)(136003)(346002)(39860400002)(396003)(376002)(451199018)(40470700004)(36840700001)(46966006)(336012)(70586007)(2616005)(70206006)(4326008)(7636003)(82740400003)(82310400005)(40460700003)(36860700001)(36756003)(86362001)(55016003)(54906003)(30864003)(110136005)(316002)(356005)(40480700001)(5660300002)(2906002)(83380400001)(426003)(8936002)(8676002)(41300700001)(47076005)(26005)(478600001)(16526019)(186003)(6666004)(1076003)(107886003)(7696005)(6286002)(21314003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jan 2023 04:53:37.1875 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a00a5846-6e62-4918-77c7-08db027df2f8 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT042.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB7686 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 flex item as modify field destination. Add "struct rte_flow_item_flex_handle *flex_handle" into "struct rte_flow_action_modify_data" as union with existed "level" member. This new member is dedicated for modifying flex item. Add flex item modify field cmdline support. Now user can use testpmd cli to specify which flex item to be modified, either source or destination. Syntax is as below: modify_field op set dst_type flex_item dst_level 0 dst_offset 16 src_type value src_value 0x123456781020 width 8 Signed-off-by: Rongwei Liu Acked-by: Ori Kam --- app/test-pmd/cmdline_flow.c | 89 ++++++++++++++++++++++++-- doc/guides/prog_guide/rte_flow.rst | 41 +++++++----- doc/guides/rel_notes/release_23_03.rst | 4 ++ lib/ethdev/rte_flow.h | 8 ++- 4 files changed, 116 insertions(+), 26 deletions(-) diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c index 88108498e0..323c07253d 100644 --- a/app/test-pmd/cmdline_flow.c +++ b/app/test-pmd/cmdline_flow.c @@ -601,10 +601,12 @@ enum index { ACTION_MODIFY_FIELD_DST_TYPE, ACTION_MODIFY_FIELD_DST_TYPE_VALUE, ACTION_MODIFY_FIELD_DST_LEVEL, + ACTION_MODIFY_FIELD_DST_LEVEL_VALUE, ACTION_MODIFY_FIELD_DST_OFFSET, ACTION_MODIFY_FIELD_SRC_TYPE, ACTION_MODIFY_FIELD_SRC_TYPE_VALUE, ACTION_MODIFY_FIELD_SRC_LEVEL, + ACTION_MODIFY_FIELD_SRC_LEVEL_VALUE, ACTION_MODIFY_FIELD_SRC_OFFSET, ACTION_MODIFY_FIELD_SRC_VALUE, ACTION_MODIFY_FIELD_SRC_POINTER, @@ -807,7 +809,8 @@ static const char *const modify_field_ids[] = { "udp_port_src", "udp_port_dst", "vxlan_vni", "geneve_vni", "gtp_teid", "tag", "mark", "meta", "pointer", "value", - "ipv4_ecn", "ipv6_ecn", "gtp_psc_qfi", "meter_color", NULL + "ipv4_ecn", "ipv6_ecn", "gtp_psc_qfi", "meter_color", + "hash_result", "flex_item", NULL }; static const char *const meter_colors[] = { @@ -2282,6 +2285,10 @@ parse_vc_modify_field_id(struct context *ctx, const struct token *token, const char *str, unsigned int len, void *buf, unsigned int size); static int +parse_vc_modify_field_level(struct context *ctx, const struct token *token, + const char *str, unsigned int len, void *buf, + unsigned int size); +static int parse_vc_action_conntrack_update(struct context *ctx, const struct token *token, const char *str, unsigned int len, void *buf, unsigned int size); @@ -5976,11 +5983,15 @@ static const struct token token_list[] = { .name = "dst_level", .help = "destination field level", .next = NEXT(action_modify_field_dst, - NEXT_ENTRY(COMMON_UNSIGNED)), - .args = ARGS(ARGS_ENTRY(struct rte_flow_action_modify_field, - dst.level)), + NEXT_ENTRY(ACTION_MODIFY_FIELD_DST_LEVEL_VALUE)), .call = parse_vc_conf, }, + [ACTION_MODIFY_FIELD_DST_LEVEL_VALUE] = { + .name = "{dst_level}", + .help = "destination field level value", + .call = parse_vc_modify_field_level, + .comp = comp_none, + }, [ACTION_MODIFY_FIELD_DST_OFFSET] = { .name = "dst_offset", .help = "destination field bit offset", @@ -6007,11 +6018,15 @@ static const struct token token_list[] = { .name = "src_level", .help = "source field level", .next = NEXT(action_modify_field_src, - NEXT_ENTRY(COMMON_UNSIGNED)), - .args = ARGS(ARGS_ENTRY(struct rte_flow_action_modify_field, - src.level)), + NEXT_ENTRY(ACTION_MODIFY_FIELD_SRC_LEVEL_VALUE)), .call = parse_vc_conf, }, + [ACTION_MODIFY_FIELD_SRC_LEVEL_VALUE] = { + .name = "{src_level}", + .help = "source field level value", + .call = parse_vc_modify_field_level, + .comp = comp_none, + }, [ACTION_MODIFY_FIELD_SRC_OFFSET] = { .name = "src_offset", .help = "source field bit offset", @@ -8477,6 +8492,66 @@ parse_vc_modify_field_id(struct context *ctx, const struct token *token, return len; } +/** Parse level for modify_field command. */ +static int +parse_vc_modify_field_level(struct context *ctx, const struct token *token, + const char *str, unsigned int len, void *buf, + unsigned int size) +{ + struct rte_flow_action_modify_field *action; + struct flex_item *fp; + uint32_t val; + struct buffer *out = buf; + char *end; + + (void)token; + (void)size; + if (ctx->curr != ACTION_MODIFY_FIELD_DST_LEVEL_VALUE && + ctx->curr != ACTION_MODIFY_FIELD_SRC_LEVEL_VALUE) + return -1; + if (!ctx->object) + return len; + action = ctx->object; + errno = 0; + val = strtoumax(str, &end, 0); + if (errno || (size_t)(end - str) != len) + return -1; + /* No need to validate action template mask value */ + if (out->args.vc.masks) { + if (ctx->curr == ACTION_MODIFY_FIELD_DST_LEVEL_VALUE) + action->dst.level = val; + else + action->src.level = val; + return len; + } + if ((ctx->curr == ACTION_MODIFY_FIELD_DST_LEVEL_VALUE && + action->dst.field == RTE_FLOW_FIELD_FLEX_ITEM) || + (ctx->curr == ACTION_MODIFY_FIELD_SRC_LEVEL_VALUE && + action->src.field == RTE_FLOW_FIELD_FLEX_ITEM)) { + if (val >= FLEX_MAX_PARSERS_NUM) { + printf("Bad flex item handle\n"); + return -1; + } + fp = flex_items[ctx->port][val]; + if (!fp) { + printf("Bad flex item handle\n"); + return -1; + } + } + if (ctx->curr == ACTION_MODIFY_FIELD_DST_LEVEL_VALUE) { + if (action->dst.field != RTE_FLOW_FIELD_FLEX_ITEM) + action->dst.level = val; + else + action->dst.flex_handle = fp->flex_handle; + } else if (ctx->curr == ACTION_MODIFY_FIELD_SRC_LEVEL_VALUE) { + if (action->src.field != RTE_FLOW_FIELD_FLEX_ITEM) + action->src.level = val; + else + action->src.flex_handle = fp->flex_handle; + } + return len; +} + /** Parse the conntrack update, not a rte_flow_action. */ static int parse_vc_action_conntrack_update(struct context *ctx, const struct token *token, diff --git a/doc/guides/prog_guide/rte_flow.rst b/doc/guides/prog_guide/rte_flow.rst index 3e6242803d..9ffd7baa7a 100644 --- a/doc/guides/prog_guide/rte_flow.rst +++ b/doc/guides/prog_guide/rte_flow.rst @@ -2905,6 +2905,9 @@ encapsulation level, from outermost to innermost (lower to higher values). For the tag array (in case of multiple tags are supported and present) ``level`` translates directly into the array index. +``flex_handle`` is used to specify the flex item pointer which is being +modified. ``flex_handle`` and ``level`` are mutually exclusive. + ``offset`` specifies the number of bits to skip from a field's start. That allows performing a partial copy of the needed part or to divide a big packet field into multiple smaller fields. Alternatively, ``offset`` allows @@ -2952,23 +2955,27 @@ value as sequence of bytes {xxx, xxx, 0x85, xxx, xxx, xxx}. .. table:: destination/source field definition - +---------------+----------------------------------------------------------+ - | Field | Value | - +===============+==========================================================+ - | ``field`` | ID: packet field, mark, meta, tag, immediate, pointer | - +---------------+----------------------------------------------------------+ - | ``level`` | encapsulation level of a packet field or tag array index | - +---------------+----------------------------------------------------------+ - | ``offset`` | number of bits to skip at the beginning | - +---------------+----------------------------------------------------------+ - | ``value`` | immediate value buffer (source field only, not | - | | applicable to destination) for RTE_FLOW_FIELD_VALUE | - | | field type | - +---------------+----------------------------------------------------------+ - | ``pvalue`` | pointer to immediate value data (source field only, not | - | | applicable to destination) for RTE_FLOW_FIELD_POINTER | - | | field type | - +---------------+----------------------------------------------------------+ + +-----------------+----------------------------------------------------------+ + | Field | Value | + +=================+==========================================================+ + | ``field`` | ID: packet field, mark, meta, tag, immediate, pointer | + +-----------------+----------------------------------------------------------+ + | ``level`` | encapsulation level of a packet field or tag array index | + +-----------------+----------------------------------------------------------+ + | ``flex_handle`` | flex item handle of a packet field | + +-----------------+----------------------------------------------------------+ + | ``offset`` | number of bits to skip at the beginning | + +-----------------+----------------------------------------------------------+ + | ``value`` | immediate value buffer (source field only, not | + | | applicable to destination) for RTE_FLOW_FIELD_VALUE | + | | field type | + | | This field is only 16 bytes, maybe not big enough for | + | | all NICs' flex item | + +-----------------+----------------------------------------------------------+ + | ``pvalue`` | pointer to immediate value data (source field only, not | + | | applicable to destination) for RTE_FLOW_FIELD_POINTER | + | | field type | + +-----------------+----------------------------------------------------------+ Action: ``CONNTRACK`` ^^^^^^^^^^^^^^^^^^^^^ diff --git a/doc/guides/rel_notes/release_23_03.rst b/doc/guides/rel_notes/release_23_03.rst index b8c5b68d6c..27d3a0e0da 100644 --- a/doc/guides/rel_notes/release_23_03.rst +++ b/doc/guides/rel_notes/release_23_03.rst @@ -55,6 +55,10 @@ New Features Also, make sure to start the actual text at the margin. ======================================================= +* ethdev: added a new field: + + - modify flex item: ``rte_flow_action_modify_data.flex_handle``. + Removed Items ------------- diff --git a/lib/ethdev/rte_flow.h b/lib/ethdev/rte_flow.h index b60987db4b..ba9f3d50a3 100644 --- a/lib/ethdev/rte_flow.h +++ b/lib/ethdev/rte_flow.h @@ -3528,6 +3528,7 @@ enum rte_flow_field_id { RTE_FLOW_FIELD_IPV6_ECN, /**< IPv6 ECN. */ RTE_FLOW_FIELD_GTP_PSC_QFI, /**< GTP QFI. */ RTE_FLOW_FIELD_METER_COLOR, /**< Meter color marker. */ + RTE_FLOW_FIELD_FLEX_ITEM, /**< Flex item. */ }; /** @@ -3541,8 +3542,11 @@ struct rte_flow_action_modify_data { RTE_STD_C11 union { struct { - /** Encapsulation level or tag index. */ - uint32_t level; + /** Encapsulation level or tag index or flex item handle. */ + union { + uint32_t level; + struct rte_flow_item_flex_handle *flex_handle; + }; /** Number of bits to skip from a field. */ uint32_t offset; }; From patchwork Mon Jan 30 04:52:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rongwei Liu X-Patchwork-Id: 122641 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 A3228424B9; Mon, 30 Jan 2023 05:53:50 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0112440EE7; Mon, 30 Jan 2023 05:53:49 +0100 (CET) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2085.outbound.protection.outlook.com [40.107.223.85]) by mails.dpdk.org (Postfix) with ESMTP id E114340A8A for ; Mon, 30 Jan 2023 05:53:46 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UrBKrrv77J0LN3CabBoxdOPJqrXZGWVn6WyDwQdeN4TwiSRoDloKo+myxN2zOL4klwlXf4WaERMM4mDc+/1ezw9q1dyCZVXzTCP3KU0PerYB3UbKsVd6oUlUvyJbkq3Qmzf0s/soq/OW9I2ugibj709GIk1VA5jhze/7CpVaZqRBkxbIX/EohffafmZq7zHN1VVngaPkfCHAVsPfru/I7yutL3zrlldwl71QKs6OAvi+IYw0ODfRe+aY0sg1JYqcwaYaoJlZ+oWNW1+YOXMecuw8lIARsjZf6y/24FrtEenEMatkHKr7rnkuS+5cdbl1nq4mk3kkOEVpbOCJDjJNBw== 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=1ToJR9kNy3RFIPhQnSpbKbtrvt/oTKSyW0jf9lQHlgU=; b=Vx2TeQYwz2FM7vGlskXp2+qQgwRE6TegKlhzukuc+bFJhjoYbWcmlwCev+SiPJ+Db7wdx9rgbrpML0Bk5clXHteL0hFQCsskogQnKm8HGdzLbr3JlGqNdeE2PzrVfO17nxXaR/Q6k0caXF2vImek+3aKyxAgsLDXXfVBUXeYyDlOx90uTT5bya4+eudOpJBD6JFWUC3aYwOJ8ofM8LxE+CSD+sGU9vpTmxfnhDuudw6xKrce3MXheN30IVSXBQ+O6ah4RC0SiYV1BikBv0amo5Gw83YWhTQJ8CH0r7uw4CbJjJwXHQHtaLReyYnGDsLH8nuuyvKFQUGt0fVPHzdb3Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=monjalon.net smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=1ToJR9kNy3RFIPhQnSpbKbtrvt/oTKSyW0jf9lQHlgU=; b=b/ZZsalZN95D/H8NgZox2gcnHmqtbYJnryREbnjZVIypwsjnMWpZfqoQP0di0QTdWnZ1u6UFGaQz4s1CyT0l3S6DmOrbNF2kZbgjZUdck1xczFIWy9C5zen/3U28hLcvswJmUIgYENeW+iyvM7QOpknWwPCjp4WFxIgQ+3YyYFPJpFXu4m1PfTXn71rI7/NRo1xbMydy9JiyV6obzBtfQnZL9oUM/HxoHoVjcUtwPqoLE6i4YWTUOq+HVZG2bh01+KCA2434PtEj6XQSg66Ny72tTjg6nsA3y5alldpxek7tIjDuo6I8fdsgTb9plyadbmSZmEVHQNtUiDFNVbWGDg== Received: from MW4P222CA0008.NAMP222.PROD.OUTLOOK.COM (2603:10b6:303:114::13) by SA0PR12MB7464.namprd12.prod.outlook.com (2603:10b6:806:24b::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.33; Mon, 30 Jan 2023 04:53:43 +0000 Received: from CO1NAM11FT012.eop-nam11.prod.protection.outlook.com (2603:10b6:303:114:cafe::21) by MW4P222CA0008.outlook.office365.com (2603:10b6:303:114::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.36 via Frontend Transport; Mon, 30 Jan 2023 04:53:43 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by CO1NAM11FT012.mail.protection.outlook.com (10.13.175.192) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.21 via Frontend Transport; Mon, 30 Jan 2023 04:53:43 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Sun, 29 Jan 2023 20:53:29 -0800 Received: from nvidia.com (10.126.230.37) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Sun, 29 Jan 2023 20:53:26 -0800 From: Rongwei Liu To: , , , , Aman Singh , Yuying Zhang CC: , Subject: [PATCH v3 02/11] app/testpmd: pass flex handle into matching mask Date: Mon, 30 Jan 2023 06:52:53 +0200 Message-ID: <20230130045302.1560006-3-rongweil@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20230130045302.1560006-1-rongweil@nvidia.com> References: <3ba49f25-52d0-fe07-02e6-22a71e0fbe13@oktetlabs.ru> <20230130045302.1560006-1-rongweil@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.230.37] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1NAM11FT012:EE_|SA0PR12MB7464:EE_ X-MS-Office365-Filtering-Correlation-Id: 062f31a0-c714-48c9-5bf7-08db027df690 X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ZEU0ickdfGJrbPMf1NPt5M+D1Mind2Hg/IUiGN7sEc/nvUR3Pitw2F3/gaKZrBfrGVvU1/V1JnlF319iKEya8k6JJDNusGlIJswu7xq43PwyPpu2phSUKsjNc+XEa37E/lDgofeJ5PPPKIrxFV6RnuXNWXV0R0JX6vDCDT4dm3Kzkq+e9KAFOjG2SNsdIeoJ5P2i7uVns5+5CKMwUDNBewIZ5l11nXytDPcFcsTdLh79FX9LSGbQsnYd3RBLcPJ6WsUj61F0iERHSVsLFqcoWz4yEFXUuSMCwykPs/oVuwAQVkljypG4eRRpLbe3O0jzkbP9bkxbUxGw6kNWgdpSFc7K9dMT6UrKKtgzsOmemfNEbfj6s8BQNP/BB8I0yu3pd/nGtJ+MCekQi2CoFAuUg2gyIGPrCVB4qaGA0wrADSTzhbrrZE22GjcOZY5pA8ujWfnnqhO2xLHV28d8Qiw/zrtpTUlt0Rha+lKhbUWfgEqFk8I9YrlmH6uWckgvtH6fp5sxrJm38JiOaFQVM9XWEZvhOPtAJghDAXs1UfW665BNBqJdetSXU9yXaNivpYn2HsZmcRbG46TpcZg+D07WBfknJRTJjyDd1VdxgLOx5+68I1XA5r3E26P7/t6hw7Zi7sM0UTq/RJsC2eAsmBhOT66/JW4jODc7iwjmwD2Gk34rRlw/BXuS6DmfJqMcSBElM8LZK4J3+NeHvH0AzGMjSA== X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230025)(4636009)(136003)(396003)(376002)(346002)(39860400002)(451199018)(36840700001)(40470700004)(46966006)(86362001)(356005)(82740400003)(36860700001)(7636003)(36756003)(4326008)(8676002)(70586007)(70206006)(41300700001)(55016003)(8936002)(54906003)(316002)(110136005)(82310400005)(40480700001)(5660300002)(2906002)(47076005)(426003)(83380400001)(336012)(2616005)(478600001)(7696005)(26005)(6286002)(16526019)(186003)(107886003)(1076003)(40460700003)(6666004); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jan 2023 04:53:43.2318 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 062f31a0-c714-48c9-5bf7-08db027df690 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT012.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR12MB7464 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 In async flow create API, there is only mask information when creating flow table but flex item handle is required to parse the HW sample information. Pass the flex item handle instead of UINT64/32_MAX to mask. Signed-off-by: Rongwei Liu Acked-by: Ori Kam --- app/test-pmd/cmdline_flow.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c index 323c07253d..f5d7a67def 100644 --- a/app/test-pmd/cmdline_flow.c +++ b/app/test-pmd/cmdline_flow.c @@ -10068,8 +10068,8 @@ parse_flex_handle(struct context *ctx, const struct token *token, } if (offset == offsetof(struct rte_flow_item_flex, handle)) { const struct flex_item *fp; - struct rte_flow_item_flex *item_flex = ctx->object; - handle = (uint16_t)(uintptr_t)item_flex->handle; + spec = ctx->object; + handle = (uint16_t)(uintptr_t)spec->handle; if (handle >= FLEX_MAX_PARSERS_NUM) { printf("Bad flex item handle\n"); return -1; @@ -10079,7 +10079,9 @@ parse_flex_handle(struct context *ctx, const struct token *token, printf("Bad flex item handle\n"); return -1; } - item_flex->handle = fp->flex_handle; + spec->handle = fp->flex_handle; + mask = spec + 2; /* spec, last, mask */ + mask->handle = fp->flex_handle; } else if (offset == offsetof(struct rte_flow_item_flex, pattern)) { handle = (uint16_t)(uintptr_t) ((struct rte_flow_item_flex *)ctx->object)->pattern; From patchwork Mon Jan 30 04:52:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rongwei Liu X-Patchwork-Id: 122642 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 C4CF8424B9; Mon, 30 Jan 2023 05:53:56 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 20E5C427E9; Mon, 30 Jan 2023 05:53:51 +0100 (CET) Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1nam02on2045.outbound.protection.outlook.com [40.107.96.45]) by mails.dpdk.org (Postfix) with ESMTP id E32F740A8A for ; Mon, 30 Jan 2023 05:53:48 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mQeIBnorMt7tz0qo78QOzFvbuXlWp7oFGA8fNlZHDh8Qh+NUg4X8caNqsRFMWkCZNTLEBdiEOyA19AlQoob3XNNzVZB0ojEYceUtjkI4xBwOxJIQE9xMMzbbWcsNAN2bUyy04kz3SrXSVt/zwiQuiaoOSmeoCo1AOAmVQphSyFSkmL71ZJshYiL7dWPdiwao+JUxvjf+OzCqgvUDSq9W3NtgyghdiLcgAPak0y7Wmh005dCrMoadrPyl/AybPcMsX3aOXSvQirgeIl3nAWq8g2vP4J1qoqw2EKm3P8j1sjka7Q9QL/DuV8kYUuXiI4zizJ3ksbYkUd5FHwUM9gAKfw== 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=5qqsKyS/2hLZfKsRr7JVQcehnXoyywT3HpAa64EQ6ek=; b=Gk7r+gEKVCCbzwjnVI2QsLO1euk/OqG34tBF3LiEt5ub7Yo8sXiLGYfE28lg26TJyh1mdg3Mn1iotzxS4tv1Vj+wmqkX8FsN5XjBgltgWmUVJKDdeEGH9MJag3oBa+K64KGRcfzI6osWUr+ldkWDCFaofkQxVYq38fj5Ua5Sjue8yQb9l4OqmvmXWQmTTRjGi3hlv+Cxe9EGdB3+hOFiZB0KhGmvXujYY/e/5Olb89d+kWuM00/XA+Xm0NvN1gsjsswQBoYGYDPHpQPF9ULuTyel/921qksxSxrxLwWD1MKbiNzWVvKNKX/cH8Z4WhzY8QDOVB2lzAdrdCwEbA2BMw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=monjalon.net smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=5qqsKyS/2hLZfKsRr7JVQcehnXoyywT3HpAa64EQ6ek=; b=dXOgvKFmV+OFakAEGVHjaMzbzmWdhuv/vlFMjWto6Y+/Q67HOBrh25L+lS2YeylywqyrAPxZ9KLT2PHfDkm437I5dJWNFY+uAuwHm1Om81S7OKMhr6jgo4M+yU8owNCRtJ6QuCNu0OeTZQnmaCCQPXfevwlzCJX3FJaxCkdWRQCX2gKgK3GjnB9tnbaKKSjwbbGU030OA+zHDXhTPC8xQOray+zuA5jXrtWaY8eL9GoTAlsCWAHBRlvYaWZDA+iGqNyxr2fnJjTEFm/UksBM5mVUFXOP4mKYYqn28XqGYFp/T8SoQboTXJN7/pMGWl9WgVAlJAR6t16+pfk5IIoMjA== Received: from MW4PR04CA0109.namprd04.prod.outlook.com (2603:10b6:303:83::24) by IA1PR12MB7733.namprd12.prod.outlook.com (2603:10b6:208:423::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.36; Mon, 30 Jan 2023 04:53:45 +0000 Received: from CO1NAM11FT028.eop-nam11.prod.protection.outlook.com (2603:10b6:303:83:cafe::e5) by MW4PR04CA0109.outlook.office365.com (2603:10b6:303:83::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.36 via Frontend Transport; Mon, 30 Jan 2023 04:53:44 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by CO1NAM11FT028.mail.protection.outlook.com (10.13.175.214) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.22 via Frontend Transport; Mon, 30 Jan 2023 04:53:44 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Sun, 29 Jan 2023 20:53:31 -0800 Received: from nvidia.com (10.126.230.37) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Sun, 29 Jan 2023 20:53:29 -0800 From: Rongwei Liu To: , , , CC: , Subject: [PATCH v3 03/11] net/mlx5: enable hws flex item create Date: Mon, 30 Jan 2023 06:52:54 +0200 Message-ID: <20230130045302.1560006-4-rongweil@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20230130045302.1560006-1-rongweil@nvidia.com> References: <3ba49f25-52d0-fe07-02e6-22a71e0fbe13@oktetlabs.ru> <20230130045302.1560006-1-rongweil@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.230.37] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1NAM11FT028:EE_|IA1PR12MB7733:EE_ X-MS-Office365-Filtering-Correlation-Id: dea881d9-e377-4f4c-76c7-08db027df723 X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VtXUmlpC3+th2x8ET2/WX/xBjTccdXg+UcTsYkRHd7XFrdXHZRVozdsl6WDOb95tGFra7QxXDx6rr0yRXMyOb9mfCyDRZiNh2mbRftC4ObiK+Vy5BpWjsZMVUmFVzvV60UAGP6owXYKXqVt4wW0iCT0Ojxt6l3Sb0/gZWwQbOObfHEyvRwEZdPMzZQAiyREysJbCN9Oib+o3y2yvk/xRprnxBANT2K5lAXXaY/P0E+Z4LMAQfceeg0htGKzY6/5f8R0divJYy0KQd5uwBKwp4v9tyEsSRpbTXgZcWvou2OEl8xrrzxs4+IWR8w4vyBpH4c8EOLz3AU5X5DIdLToRAaS6RbcztCREVpkMMQ14absPd9rV0bmNv+sQYL4sF6syi9utw2gWopGxCZj89nqmbFeUQiEFQxMILplTE9S9MS6DaN/NP4dK/wE0aEzfk9cYrg2Y8Wz/Wll4DIa+9s6r1or7z1v+D0EgTNb0PP0E1h0E36sjbcHJSv9yn83hnGTKjYhO1zJlyp0udVustQEOAFqbGPqKSqLNVtbh2OJawU/QRopM/Ab7hB4ds+V7mIgmWJ682UVobwt5DqOgKc2AtEAZJAomnl0rcYVGqPebLCn1MHCECAM2RtZ0RlS2m/5w0zzJeNkZ9c2cGknDxNXQKRJCskkz8ZDmPiotMPvJlCSkjcMbgu9VwSKD29WFgLaNQHcLUA8CNUHy4hzhm+3vqA== X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230025)(4636009)(39860400002)(136003)(346002)(376002)(396003)(451199018)(40470700004)(36840700001)(46966006)(82310400005)(2906002)(5660300002)(86362001)(47076005)(336012)(6286002)(426003)(83380400001)(8936002)(40460700003)(41300700001)(356005)(36756003)(478600001)(1076003)(26005)(6666004)(7696005)(186003)(107886003)(55016003)(82740400003)(2616005)(36860700001)(7636003)(70586007)(70206006)(4326008)(8676002)(40480700001)(54906003)(16526019)(110136005)(316002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jan 2023 04:53:44.1958 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: dea881d9-e377-4f4c-76c7-08db027df723 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT028.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB7733 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 Enable flex item create and destroy with dv_flow_en=2 Signed-off-by: Rongwei Liu Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/linux/mlx5_os.c | 27 +++++++++++++++------------ drivers/net/mlx5/mlx5_flow_hw.c | 2 ++ 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c index a71474c90a..f5b3edea99 100644 --- a/drivers/net/mlx5/linux/mlx5_os.c +++ b/drivers/net/mlx5/linux/mlx5_os.c @@ -474,10 +474,20 @@ mlx5_alloc_shared_dr(struct mlx5_priv *priv) err = mlx5_alloc_table_hash_list(priv); if (err) goto error; - if (priv->sh->config.dv_flow_en == 2) - return 0; /* The resources below are only valid with DV support. */ #ifdef HAVE_IBV_FLOW_DV_SUPPORT + /* Init shared flex parsers list, no need lcore_share */ + snprintf(s, sizeof(s), "%s_flex_parsers_list", sh->ibdev_name); + sh->flex_parsers_dv = mlx5_list_create(s, sh, false, + mlx5_flex_parser_create_cb, + mlx5_flex_parser_match_cb, + mlx5_flex_parser_remove_cb, + mlx5_flex_parser_clone_cb, + mlx5_flex_parser_clone_free_cb); + if (!sh->flex_parsers_dv) + goto error; + if (priv->sh->config.dv_flow_en == 2) + return 0; /* Init port id action list. */ snprintf(s, sizeof(s), "%s_port_id_action_list", sh->ibdev_name); sh->port_id_action_list = mlx5_list_create(s, sh, true, @@ -518,16 +528,9 @@ mlx5_alloc_shared_dr(struct mlx5_priv *priv) flow_dv_dest_array_clone_free_cb); if (!sh->dest_array_list) goto error; - /* Init shared flex parsers list, no need lcore_share */ - snprintf(s, sizeof(s), "%s_flex_parsers_list", sh->ibdev_name); - sh->flex_parsers_dv = mlx5_list_create(s, sh, false, - mlx5_flex_parser_create_cb, - mlx5_flex_parser_match_cb, - mlx5_flex_parser_remove_cb, - mlx5_flex_parser_clone_cb, - mlx5_flex_parser_clone_free_cb); - if (!sh->flex_parsers_dv) - goto error; +#else + if (priv->sh->config.dv_flow_en == 2) + return 0; #endif #ifdef HAVE_MLX5DV_DR void *domain; diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index 20c71ff7f0..44953451d5 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -8336,6 +8336,8 @@ const struct mlx5_flow_driver_ops mlx5_flow_hw_drv_ops = { .query = flow_hw_query, .get_aged_flows = flow_hw_get_aged_flows, .get_q_aged_flows = flow_hw_get_q_aged_flows, + .item_create = flow_dv_item_create, + .item_release = flow_dv_item_release, }; /** From patchwork Mon Jan 30 04:52:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rongwei Liu X-Patchwork-Id: 122643 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 923F5424B9; Mon, 30 Jan 2023 05:54:04 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 930AF42D35; Mon, 30 Jan 2023 05:53:53 +0100 (CET) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2047.outbound.protection.outlook.com [40.107.223.47]) by mails.dpdk.org (Postfix) with ESMTP id 57DC5427E9 for ; Mon, 30 Jan 2023 05:53:50 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Yf7sIznfc418WK7B6N3i8HSmCw413F1x1mb9SGOGvW8XBANH/cPyrJiQVovZJuXkFNgGTld5T8Ut54FCip1sGQd9hOZlqkNgGpupG9RaqBoOJdi9njZgsNtE9OQMxHu2z6bRcDcBpEgAW97rT1KwBwYk7BCOCwMNUp47OKCPf7YQnAFvGIxSvhhdebaNKmU/snQyp1rUoLbxd3OJx0jY7dw4eLi8ZebvKwtr4+xO1CKkHF03hr98qlVCFiCoy5xsmsQFQRCaBO7sRTePZ+z3vpIIDz5RkCazze937gGzjX1DjplLjHmpH9Duc4HzR3uh0WZPcnAwAjE/9Onrp2lYog== 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=7/IeM5CqgMtCYyadWn86pLPijtsuLy0Evfp4ysHPU+8=; b=NOwNOm3NlMy0iAo9AxuEYnbNzErljO3GOgR652Fq6BBkiY30oPd3isnQP5R7lfM61rGRsgqGPzcwVWjVG555M9pwewnZ0bqZgIgCM8gKf5syeHjTKuTWUCuQILZoINdQeCpBVxEG6wM5Bg3E/63f9bpz2quLmWv56N2ONf77y4qktcZjcea/TwUMqzQqoh9LpkUw9k1UwSiPeqdvlqqsAujRpZHBbcEkePO35KRAH8CRKvvAP03PShcSyrpxbWjdxuwm/RYbYZxmGmWSsU09LE1m3cgQcV0JsJkO6ts0ZH4nOe+egzAR6Chp/CohNk2qVn9tcylSKxIbo3t54sbfpw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=monjalon.net smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=7/IeM5CqgMtCYyadWn86pLPijtsuLy0Evfp4ysHPU+8=; b=aHACn8kBOR2VHHTkUDoPQ8wipM9w0+p+Re0JszTgD5nSGYpRy8qd/x2rfGKg8edOaXIkfXBsh7rA5sdz8ZCJxvmDq9zZSX4RR7iNVMPaYSk+7RW68kxCIggJkO5rGKkRbpiNjBESNMI1SJ79Kr8HxIT0M5nT75Q3dQYnHNnvZ29lk2SCb11kY3OgtvmzOwpaiiHT6qqUalP7cbf/bnlr7gXATXoTLbxUIszucoi/5049Mrb6YHn5G6lPFbfOV4w4xHWZHV2SWdTptMZbCJtF0JY8YTBEoaItp2jxsGLIkJeLwTl/V1ctnIGFwXl/Fcj5Y6VBO1LGE1xj4DX+NatS2w== Received: from MW4P222CA0019.NAMP222.PROD.OUTLOOK.COM (2603:10b6:303:114::24) by DS0PR12MB6392.namprd12.prod.outlook.com (2603:10b6:8:cc::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.22; Mon, 30 Jan 2023 04:53:48 +0000 Received: from CO1NAM11FT012.eop-nam11.prod.protection.outlook.com (2603:10b6:303:114:cafe::51) by MW4P222CA0019.outlook.office365.com (2603:10b6:303:114::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.36 via Frontend Transport; Mon, 30 Jan 2023 04:53:48 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by CO1NAM11FT012.mail.protection.outlook.com (10.13.175.192) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.21 via Frontend Transport; Mon, 30 Jan 2023 04:53:48 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Sun, 29 Jan 2023 20:53:33 -0800 Received: from nvidia.com (10.126.230.37) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Sun, 29 Jan 2023 20:53:31 -0800 From: Rongwei Liu To: , , , CC: , Subject: [PATCH v3 04/11] net/mlx5: add IPv6 protocol as flex item input Date: Mon, 30 Jan 2023 06:52:55 +0200 Message-ID: <20230130045302.1560006-5-rongweil@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20230130045302.1560006-1-rongweil@nvidia.com> References: <3ba49f25-52d0-fe07-02e6-22a71e0fbe13@oktetlabs.ru> <20230130045302.1560006-1-rongweil@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.230.37] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1NAM11FT012:EE_|DS0PR12MB6392:EE_ X-MS-Office365-Filtering-Correlation-Id: f8ed0b03-f088-4f8f-dbd1-08db027df988 X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jSTZwL9m9HwzP3xTK5DJ0yEeOqlE6gCyQFgVImfyIJiLztqVEuK5K8V/k7D4s/Vb//5A/tfKiC9NVglSFNN14H4SrRDcrolvzjywtUxgwpWQqmJECpf4cUA31Deo/7vdjQTPPX95wKowPMsvUBjCUSFaIomqOVvnfbKtv146nvLrAk7BpxNA00gufy7lz8sHug7sRfoDDBpcn1SILDsc3jlt+DMllQL0CdfThm+rK28R/sgoflim0x3KAPgtU9BnANAf/Pyz9Gz7QoZykNUR79+DaD/29uHbYAxUR4THbLSJPychRYC2+bhMs1foxoXWbj7Z6VoCsbN2id2rVv4JsdFS7laYGltefXdeDvPVFDC21T8oEDfMryRBxuMorB8EmLP6CZCgoy1MHmFAGkELCWPTDH1wOAcYwLNMrFMcCxT+oXX3syBnTyNFJ26hxjuPflU9bN7mDSzXITX14EqUlyqS6dVcjOwIETHiTdSOlAR8AjEJv0Okb0e2HArwzsNhVsaPQS3uPbE0VEj4U9HbiOU6sszDxzUm7zL5/QXjPH3FW6z93dZ6u7KKKeFN9jUbZXOu1AWH2I5RDDXNtoyRLTxDrEj5NLu8ZJKKi0rkCaY/yFtcoAD+Jqa7MI+O4B8SJSEGDS34hcU3MmZrNb8IWUo/XqmbwKHlZ348TYRKhaXKCC9g7KSQwniLK8GsdLyYl4MsfDk/6BiYDkrDMoM4ww== X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230025)(4636009)(136003)(396003)(346002)(39860400002)(376002)(451199018)(40470700004)(46966006)(36840700001)(47076005)(1076003)(8676002)(86362001)(40460700003)(7696005)(36756003)(82310400005)(186003)(40480700001)(356005)(36860700001)(26005)(7636003)(16526019)(8936002)(426003)(2616005)(6286002)(336012)(5660300002)(110136005)(478600001)(55016003)(107886003)(6666004)(316002)(54906003)(41300700001)(82740400003)(70206006)(70586007)(2906002)(4326008); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jan 2023 04:53:48.2158 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f8ed0b03-f088-4f8f-dbd1-08db027df988 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT012.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB6392 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 Support IPv6 protocol as new flex item input link. Signed-off-by: Rongwei Liu Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_flow_flex.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/drivers/net/mlx5/mlx5_flow_flex.c b/drivers/net/mlx5/mlx5_flow_flex.c index fb08910ddb..bec07b13c1 100644 --- a/drivers/net/mlx5/mlx5_flow_flex.c +++ b/drivers/net/mlx5/mlx5_flow_flex.c @@ -1043,6 +1043,22 @@ mlx5_flex_arc_in_udp(const struct rte_flow_item *item, return rte_be_to_cpu_16(spec->hdr.dst_port); } +static int +mlx5_flex_arc_in_ipv6(const struct rte_flow_item *item, + struct rte_flow_error *error) +{ + const struct rte_flow_item_ipv6 *spec = item->spec; + const struct rte_flow_item_ipv6 *mask = item->mask; + struct rte_flow_item_ipv6 ip = { .hdr.proto = 0xff }; + + if (memcmp(mask, &ip, sizeof(struct rte_flow_item_ipv6))) { + return rte_flow_error_set + (error, EINVAL, RTE_FLOW_ERROR_TYPE_ITEM, item, + "invalid ipv6 item mask, full mask is desired"); + } + return spec->hdr.proto; +} + static int mlx5_flex_translate_arc_in(struct mlx5_hca_flex_attr *attr, const struct rte_flow_item_flex_conf *conf, @@ -1089,6 +1105,9 @@ mlx5_flex_translate_arc_in(struct mlx5_hca_flex_attr *attr, case RTE_FLOW_ITEM_TYPE_UDP: ret = mlx5_flex_arc_in_udp(rte_item, error); break; + case RTE_FLOW_ITEM_TYPE_IPV6: + ret = mlx5_flex_arc_in_ipv6(rte_item, error); + break; default: MLX5_ASSERT(false); return rte_flow_error_set From patchwork Mon Jan 30 04:52:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rongwei Liu X-Patchwork-Id: 122648 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 67194424B9; Mon, 30 Jan 2023 05:54:40 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7AC7642F9C; Mon, 30 Jan 2023 05:54:08 +0100 (CET) Received: from NAM04-DM6-obe.outbound.protection.outlook.com (mail-dm6nam04on2078.outbound.protection.outlook.com [40.107.102.78]) by mails.dpdk.org (Postfix) with ESMTP id BDFE5410F6 for ; Mon, 30 Jan 2023 05:54:02 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=h6iR93dUCgG06skyzoCUp/QyGGtA5VC8eU2hVFWtvOsQBkio8o5haROlKDs1KJ2clL4rONrsOtIQmdPUpy64ZW5VEJiuAxHPWbD23Z795qB9Wiyz8B880KCn4+PS+hICz0o26BDKYo6pohCj4hONZKe8l8+gn5QFphlySF2ItXygYzpgTOELIgjkkUU5W9zN+1iH/bH+/wj6TkMzlJHbJEndGZyMeA0hSb2LkHBXE7Yuq8N3f+5yPr/4RGX1mjKifR0riV6V4+NtfxGiHzORz6ymz8qYwq48pXUdQDY22QMt+BnOuhHO91nTOjssbf/vSdotjkXCNvxaPi2wx6AAoA== 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=7qgLqIMGvOst5e2D1BuNaiYkhZvugLjsifGiY4w36fU=; b=RIRCT0Uh+X1nLIiAejfREHmqkBblnc1cAIg871WwB1sYFfq4vSsqrFNN+IUF094cNYkXOPXPvJmrpm2XbrWe5AS9EUO0YUh3o6/CNhmGSWucPhKc7MyznG8VS2vAdOcX8gAzCIfi1aQxnqaMRkCM20xao3xwC9Gu9UMC033AlDOdy25wHaMeYV9nlKpi/fpXw3tPt6sK5uR3WrrOepRtb4lR+M+S2/bWfd3atmTZVCxDnSXKF6E8YuxInpsDXJzeUfVMFXM7EUUm92HERG28yG1Z/zvyT7dISNMIOd1HYfthyRf8HnFqqXyGQ6PiqOsW/mELxpRT29n1KtWc4gEsfA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=monjalon.net smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=7qgLqIMGvOst5e2D1BuNaiYkhZvugLjsifGiY4w36fU=; b=OYKrXyS/SxZQclR+0dSzeKD5+IOYxDYql4npVqCFIDwQSWj3nqodIT8Lh22Rdo46f346IYfCubqp+qOmRjhvoAG0QYuW2F/u8wFfwn/Dnf3+i+32PNylvPIfH225l1gwbRNkRpXfzCBapcnP3mcHg4KMbJChetu3SriLRDtmlUapuPCq67OE6QtmKtaRT49xgXcs/S6Ato+NqLng1mtR/0Ks7dYbUSuGuL1ZstRZXY1fBmZYCcSCcxjA+K5lO2bP8cVNbtHIVxLVgfw/N0idr0tOm+20HWyLIoM/LN9L6zBnwUz1RyooHyFJE8oj6+lGs2kHMfGVJGcGRA+6xtvjNw== Received: from MW4P222CA0008.NAMP222.PROD.OUTLOOK.COM (2603:10b6:303:114::13) by CY8PR12MB7729.namprd12.prod.outlook.com (2603:10b6:930:84::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.36; Mon, 30 Jan 2023 04:53:53 +0000 Received: from CO1NAM11FT012.eop-nam11.prod.protection.outlook.com (2603:10b6:303:114:cafe::21) by MW4P222CA0008.outlook.office365.com (2603:10b6:303:114::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.36 via Frontend Transport; Mon, 30 Jan 2023 04:53:53 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by CO1NAM11FT012.mail.protection.outlook.com (10.13.175.192) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.21 via Frontend Transport; Mon, 30 Jan 2023 04:53:53 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Sun, 29 Jan 2023 20:53:36 -0800 Received: from nvidia.com (10.126.230.37) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Sun, 29 Jan 2023 20:53:34 -0800 From: Rongwei Liu To: , , , CC: , Subject: [PATCH v3 05/11] net/mlx5: adopt new flex item prm definition Date: Mon, 30 Jan 2023 06:52:56 +0200 Message-ID: <20230130045302.1560006-6-rongweil@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20230130045302.1560006-1-rongweil@nvidia.com> References: <3ba49f25-52d0-fe07-02e6-22a71e0fbe13@oktetlabs.ru> <20230130045302.1560006-1-rongweil@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.230.37] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1NAM11FT012:EE_|CY8PR12MB7729:EE_ X-MS-Office365-Filtering-Correlation-Id: f5d0cf72-4ba6-4060-b035-08db027dfcae X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: O7ZG7kL9MTCg+35iNbI7RyM5OYBYgcEAnr6qncZb0MaCQMyvjt/wnYGPqbZRJXZLEDLrcEjBLbRz+xKj8skXbjeu12ztxBmcIuObu+yF6kx5MXix/M6fG7UAiNr5yRcSuIOUkbnIRY7P4cIUpxRczrpD/ghTd+NsUL5TEGMUGClZG94iqkz7qalGgLtVFQTt+Zi6HWUsUSWZlztBEBvBS7YNwI0YvqOf+nckyR7YySH4+RRgBfqLQ7TkS2CCAAaaQR09/PMZdNz0hKoqb8nneSUlDYRp6VL518EStoMqqBShzc6tc8MQOg2+ugmLDyPyLVjeK7jxUHk94cJ/Fdea4+tMlBSrZfsAZY9t8hm7RyPJtQxiLntT4stN0FP8iPKgDcAvuQYFw12ADkQnM7CfJ5/W+LF7xBWHh9gq6NdxGNlCRqDF0QbQVTytUHthZgldOjpM/JkF4ZZFge/QsM4gNeyUs2Hac6keld2n6ccTHUbfE2Yz0i4za2Q+xQRI2DCG2xv1syGHaydVoJYpg0c6jxBEShf5VDmib1MYSVwq904zTzPQynAD45PzQScijHPWLfOoP+H0pBQorxJ6dfo33+0lxASQgAMnKODBkIVc1jxRtRjMhABBiVdwwWX4re5h7x67j8HWEHt1/cyk+Wyl8Skj12OffEIv06ZzNWj0a3Nlfd7d9eENAiRet/gxYbm8GJfnLz9+lVKnxtEWdVH15g== X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230025)(4636009)(136003)(396003)(39860400002)(376002)(346002)(451199018)(46966006)(36840700001)(40470700004)(478600001)(7696005)(36860700001)(426003)(47076005)(83380400001)(356005)(86362001)(82740400003)(40480700001)(7636003)(55016003)(82310400005)(186003)(6286002)(16526019)(336012)(2616005)(36756003)(26005)(40460700003)(6666004)(107886003)(110136005)(54906003)(5660300002)(316002)(8936002)(70586007)(70206006)(4326008)(8676002)(41300700001)(2906002)(1076003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jan 2023 04:53:53.4969 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f5d0cf72-4ba6-4060-b035-08db027dfcae X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT012.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR12MB7729 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 Per newest PRM definition, sample_id stands for 3 parts of information instead of single uint32_t id: sample_id + modify_filed_id + format_select_dw. Also new FW capability bits have been introduces to identify the new capability. Signed-off-by: Rongwei Liu Acked-by: Viacheslav Ovsiienko --- drivers/common/mlx5/mlx5_devx_cmds.c | 14 +++++++++++--- drivers/common/mlx5/mlx5_devx_cmds.h | 7 ++++++- drivers/common/mlx5/mlx5_prm.h | 28 ++++++++++++++++++++++++++-- drivers/net/mlx5/mlx5.c | 15 +++++++++++---- drivers/net/mlx5/mlx5.h | 3 ++- drivers/net/mlx5/mlx5_flow_flex.c | 14 +++++++++++--- 6 files changed, 67 insertions(+), 14 deletions(-) diff --git a/drivers/common/mlx5/mlx5_devx_cmds.c b/drivers/common/mlx5/mlx5_devx_cmds.c index e3a4927d0f..1f65ea7dcb 100644 --- a/drivers/common/mlx5/mlx5_devx_cmds.c +++ b/drivers/common/mlx5/mlx5_devx_cmds.c @@ -607,7 +607,8 @@ mlx5_devx_cmd_query_hca_vdpa_attr(void *ctx, int mlx5_devx_cmd_query_parse_samples(struct mlx5_devx_obj *flex_obj, - uint32_t ids[], uint32_t num) + struct mlx5_ext_sample_id ids[], + uint32_t num, uint8_t *anchor) { uint32_t in[MLX5_ST_SZ_DW(general_obj_in_cmd_hdr)] = {0}; uint32_t out[MLX5_ST_SZ_DW(create_flex_parser_out)] = {0}; @@ -636,6 +637,7 @@ mlx5_devx_cmd_query_parse_samples(struct mlx5_devx_obj *flex_obj, (void *)flex_obj); return -rte_errno; } + *anchor = MLX5_GET(parse_graph_flex, flex, head_anchor_id); for (i = 0; i < MLX5_GRAPH_NODE_SAMPLE_NUM; i++) { void *s_off = (void *)((char *)sample + i * MLX5_ST_SZ_BYTES(parse_graph_flow_match_sample)); @@ -645,8 +647,8 @@ mlx5_devx_cmd_query_parse_samples(struct mlx5_devx_obj *flex_obj, flow_match_sample_en); if (!en) continue; - ids[idx++] = MLX5_GET(parse_graph_flow_match_sample, s_off, - flow_match_sample_field_id); + ids[idx++].id = MLX5_GET(parse_graph_flow_match_sample, s_off, + flow_match_sample_field_id); } if (num != idx) { rte_errno = EINVAL; @@ -794,6 +796,12 @@ mlx5_devx_cmd_query_hca_parse_graph_node_cap max_num_arc_out); attr->max_num_sample = MLX5_GET(parse_graph_node_cap, hcattr, max_num_sample); + attr->anchor_en = MLX5_GET(parse_graph_node_cap, hcattr, anchor_en); + attr->ext_sample_id = MLX5_GET(parse_graph_node_cap, hcattr, ext_sample_id); + attr->sample_tunnel_inner2 = MLX5_GET(parse_graph_node_cap, hcattr, + sample_tunnel_inner2); + attr->zero_size_supported = MLX5_GET(parse_graph_node_cap, hcattr, + zero_size_supported); attr->sample_id_in_out = MLX5_GET(parse_graph_node_cap, hcattr, sample_id_in_out); attr->max_base_header_length = MLX5_GET(parse_graph_node_cap, hcattr, diff --git a/drivers/common/mlx5/mlx5_devx_cmds.h b/drivers/common/mlx5/mlx5_devx_cmds.h index c94b9eac06..5b33010155 100644 --- a/drivers/common/mlx5/mlx5_devx_cmds.h +++ b/drivers/common/mlx5/mlx5_devx_cmds.h @@ -114,6 +114,10 @@ struct mlx5_hca_flex_attr { uint8_t max_num_arc_out; uint8_t max_num_sample; uint8_t max_num_prog_sample:5; /* From HCA CAP 2 */ + uint8_t anchor_en:1; + uint8_t ext_sample_id:1; + uint8_t sample_tunnel_inner2:1; + uint8_t zero_size_supported:1; uint8_t sample_id_in_out:1; uint16_t max_base_header_length; uint8_t max_sample_base_offset; @@ -706,7 +710,8 @@ int mlx5_devx_cmd_modify_tir(struct mlx5_devx_obj *tir, struct mlx5_devx_modify_tir_attr *tir_attr); __rte_internal int mlx5_devx_cmd_query_parse_samples(struct mlx5_devx_obj *flex_obj, - uint32_t ids[], uint32_t num); + struct mlx5_ext_sample_id ids[], + uint32_t num, uint8_t *anchor); __rte_internal struct mlx5_devx_obj * diff --git a/drivers/common/mlx5/mlx5_prm.h b/drivers/common/mlx5/mlx5_prm.h index 3790dc84b8..ce6cd98fd7 100644 --- a/drivers/common/mlx5/mlx5_prm.h +++ b/drivers/common/mlx5/mlx5_prm.h @@ -1893,7 +1893,11 @@ struct mlx5_ifc_parse_graph_node_cap_bits { u8 max_num_arc_in[0x08]; u8 max_num_arc_out[0x08]; u8 max_num_sample[0x08]; - u8 reserved_at_78[0x07]; + u8 reserved_at_78[0x03]; + u8 anchor_en[0x1]; + u8 ext_sample_id[0x1]; + u8 sample_tunnel_inner2[0x1]; + u8 zero_size_supported[0x1]; u8 sample_id_in_out[0x1]; u8 max_base_header_length[0x10]; u8 reserved_at_90[0x08]; @@ -1903,6 +1907,24 @@ struct mlx5_ifc_parse_graph_node_cap_bits { u8 header_length_mask_width[0x08]; }; +/* ext_sample_id structure, see PRM Table: Flow Match Sample ID Format. */ +struct mlx5_ext_sample_id { + union { + struct { +#if RTE_BYTE_ORDER == RTE_LITTLE_ENDIAN + uint32_t format_select_dw:8; + uint32_t modify_field_id:12; + uint32_t sample_id:12; +#else + uint32_t sample_id:12; + uint32_t modify_field_id:12; + uint32_t format_select_dw:8; +#endif + }; + uint32_t id; + }; +}; + struct mlx5_ifc_flow_table_prop_layout_bits { u8 ft_support[0x1]; u8 flow_tag[0x1]; @@ -4522,7 +4544,9 @@ struct mlx5_ifc_parse_graph_flex_bits { u8 header_length_mode[0x4]; u8 header_length_field_offset[0x10]; u8 next_header_field_offset[0x10]; - u8 reserved_at_160[0x1b]; + u8 reserved_at_160[0x12]; + u8 head_anchor_id[0x6]; + u8 reserved_at_178[0x3]; u8 next_header_field_size[0x5]; u8 header_length_field_mask[0x20]; u8 reserved_at_224[0x20]; diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c index b8643cebdd..0b97c4e78d 100644 --- a/drivers/net/mlx5/mlx5.c +++ b/drivers/net/mlx5/mlx5.c @@ -964,11 +964,13 @@ int mlx5_flex_parser_ecpri_alloc(struct rte_eth_dev *dev) { struct mlx5_priv *priv = dev->data->dev_private; + struct mlx5_hca_flex_attr *attr = &priv->sh->cdev->config.hca_attr.flex; struct mlx5_ecpri_parser_profile *prf = &priv->sh->ecpri_parser; struct mlx5_devx_graph_node_attr node = { .modify_field_select = 0, }; - uint32_t ids[8]; + struct mlx5_ext_sample_id ids[8]; + uint8_t anchor_id; int ret; if (!priv->sh->cdev->config.hca_attr.parse_graph_flex_node) { @@ -1004,15 +1006,20 @@ mlx5_flex_parser_ecpri_alloc(struct rte_eth_dev *dev) return (rte_errno == 0) ? -ENODEV : -rte_errno; } prf->num = 2; - ret = mlx5_devx_cmd_query_parse_samples(prf->obj, ids, prf->num); + ret = mlx5_devx_cmd_query_parse_samples(prf->obj, ids, prf->num, &anchor_id); if (ret) { DRV_LOG(ERR, "Failed to query sample IDs."); return (rte_errno == 0) ? -ENODEV : -rte_errno; } prf->offset[0] = 0x0; prf->offset[1] = sizeof(uint32_t); - prf->ids[0] = ids[0]; - prf->ids[1] = ids[1]; + if (attr->ext_sample_id) { + prf->ids[0] = ids[0].sample_id; + prf->ids[1] = ids[1].sample_id; + } else { + prf->ids[0] = ids[0].id; + prf->ids[1] = ids[1].id; + } return 0; } diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h index 16b33e1548..83fb316ad8 100644 --- a/drivers/net/mlx5/mlx5.h +++ b/drivers/net/mlx5/mlx5.h @@ -1307,9 +1307,10 @@ struct mlx5_lag { struct mlx5_flex_parser_devx { struct mlx5_list_entry entry; /* List element at the beginning. */ uint32_t num_samples; + uint8_t anchor_id; void *devx_obj; struct mlx5_devx_graph_node_attr devx_conf; - uint32_t sample_ids[MLX5_GRAPH_NODE_SAMPLE_NUM]; + struct mlx5_ext_sample_id sample_ids[MLX5_GRAPH_NODE_SAMPLE_NUM]; }; /* Pattern field descriptor - how to translate flex pattern into samples. */ diff --git a/drivers/net/mlx5/mlx5_flow_flex.c b/drivers/net/mlx5/mlx5_flow_flex.c index bec07b13c1..24b7226ee6 100644 --- a/drivers/net/mlx5/mlx5_flow_flex.c +++ b/drivers/net/mlx5/mlx5_flow_flex.c @@ -226,15 +226,18 @@ mlx5_flex_flow_translate_item(struct rte_eth_dev *dev, void *misc4_m = MLX5_ADDR_OF(fte_match_param, matcher, misc_parameters_4); void *misc4_v = MLX5_ADDR_OF(fte_match_param, key, misc_parameters_4); + struct mlx5_priv *priv = dev->data->dev_private; + struct mlx5_hca_flex_attr *attr = &priv->sh->cdev->config.hca_attr.flex; struct mlx5_flex_item *tp; uint32_t i, pos = 0; + uint32_t sample_id; RTE_SET_USED(dev); MLX5_ASSERT(item->spec && item->mask); spec = item->spec; mask = item->mask; tp = (struct mlx5_flex_item *)spec->handle; - MLX5_ASSERT(mlx5_flex_index(dev->data->dev_private, tp) >= 0); + MLX5_ASSERT(mlx5_flex_index(priv, tp) >= 0); for (i = 0; i < tp->mapnum; i++) { struct mlx5_flex_pattern_field *map = tp->map + i; uint32_t id = map->reg_id; @@ -257,9 +260,13 @@ mlx5_flex_flow_translate_item(struct rte_eth_dev *dev, MLX5_ASSERT(id < num_samples); id += num_samples; } + if (attr->ext_sample_id) + sample_id = tp->devx_fp->sample_ids[id].sample_id; + else + sample_id = tp->devx_fp->sample_ids[id].id; mlx5_flex_set_match_sample(misc4_m, misc4_v, def, msk & def, val & msk & def, - tp->devx_fp->sample_ids[id], id); + sample_id, id); pos += map->width; } } @@ -1317,7 +1324,8 @@ mlx5_flex_parser_create_cb(void *list_ctx, void *ctx) /* Query the firmware assigned sample ids. */ ret = mlx5_devx_cmd_query_parse_samples(fp->devx_obj, fp->sample_ids, - fp->num_samples); + fp->num_samples, + &fp->anchor_id); if (ret) goto error; DRV_LOG(DEBUG, "DEVx flex parser %p created, samples num: %u", From patchwork Mon Jan 30 04:52:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rongwei Liu X-Patchwork-Id: 122646 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 8C6E7424B9; Mon, 30 Jan 2023 05:54:24 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5DFB642D3B; Mon, 30 Jan 2023 05:54:04 +0100 (CET) Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam02on2085.outbound.protection.outlook.com [40.107.212.85]) by mails.dpdk.org (Postfix) with ESMTP id 6734340EE2 for ; Mon, 30 Jan 2023 05:54:00 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fhYS2tuNqOvX0ydn1G76qWDSfNN0spEeaGCzacCIX1HnqGhccLjQe9lKx+I7Elf2Qp06iSaAhy5YioB+Yg57Jf5/o/gscEqwSO2fTXMJ+DG0wLS33OMHmwHZdhH0YghGBPp82XezIofk+6GU3l+wRH39XaQQRdIWjXA/JrTtTnF383lY7kqkeisMB/FXWRYQ9sSYsDRW5BxG7rulSBs2zlskb4rxh5by3V1KOCvv6K4GMQuYknMBpT2WOMaQU4cgwNYJs7pTFA9amQFnc2hoxLg2vyOu3szgtn6tPVsY2iuvBnozBPGZn1p+Dts6SVWnIxZTUP5INxwIfgqn9fj/cw== 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=JovjHQd3dSx5M3Y2dEF3nd0KWRf0rq4tANKwrDOMhMs=; b=P6E7OvKmd9MdDbJHuK19TtE6zcOX8a3wMqqxaZVS9gI8CWcxiGg9KOs/xlSiWS2ryG17SsnElePdiSFGToqmEK3OcLbB5qR6Vs4xW/5QsxvGgVtsTu5GiZx4jBFWo9exS8xWovpD74ntwgVv6jM9srrSzcWBxV9GS/gjirv3dHVoHwamxyVrBQbdB62RoMLw8lKrZCuD3D066o05cs2CNaDzvExkZICpn8jKwiKKFHc2sM2Y2AcmoFLx3Tvo4KUmUJiAwLYlqOC5Ryi9r8e67vz7vK611FDdz7cMkCddET0ql+UZ/M1t3g+5yOfWu08Pnjky/9/cXza7y7flS6RWZA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=monjalon.net smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=JovjHQd3dSx5M3Y2dEF3nd0KWRf0rq4tANKwrDOMhMs=; b=IjcgdR0WAg08n1UuZXKYRmY1obYg1nO1ys0OQMwKCMXZVwBSJMaVwNyeV4mmVU8xY5ROt8m2/oFP3grfj7Z+owK+KzzhLU2duFrYlJMckkycFJBe12wkP1NFVRx9/sS6TDkcenS3se4w75y5V8uQBXKmFx6Cm/IoMZs6UtfHoSu6xHLALc+T3+xguDcIeXnvTkklLcX50aB6KlU4GP89a2uv+N0cQRUVQmUCFEbEfu5iAjlhtxgAm8Z4+19gEx/uxWGPmXtoXd7HVoYpn30xJGz8fr5riGjWUQ6Rba1ZwJ1g7A5ggqWcY+ihbxE9Id1ps+evfiGLW5I1NNlCUHX9mA== Received: from MW4P220CA0017.NAMP220.PROD.OUTLOOK.COM (2603:10b6:303:115::22) by MW4PR12MB7466.namprd12.prod.outlook.com (2603:10b6:303:212::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.36; Mon, 30 Jan 2023 04:53:58 +0000 Received: from CO1NAM11FT020.eop-nam11.prod.protection.outlook.com (2603:10b6:303:115:cafe::7b) by MW4P220CA0017.outlook.office365.com (2603:10b6:303:115::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.36 via Frontend Transport; Mon, 30 Jan 2023 04:53:58 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by CO1NAM11FT020.mail.protection.outlook.com (10.13.174.149) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.21 via Frontend Transport; Mon, 30 Jan 2023 04:53:58 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Sun, 29 Jan 2023 20:53:38 -0800 Received: from nvidia.com (10.126.230.37) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Sun, 29 Jan 2023 20:53:36 -0800 From: Rongwei Liu To: , , , CC: , , Alex Vesker Subject: [PATCH v3 06/11] net/mlx5/hws: add hws flex item matching support Date: Mon, 30 Jan 2023 06:52:57 +0200 Message-ID: <20230130045302.1560006-7-rongweil@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20230130045302.1560006-1-rongweil@nvidia.com> References: <3ba49f25-52d0-fe07-02e6-22a71e0fbe13@oktetlabs.ru> <20230130045302.1560006-1-rongweil@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.230.37] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1NAM11FT020:EE_|MW4PR12MB7466:EE_ X-MS-Office365-Filtering-Correlation-Id: eeeacf3d-d1f9-4b15-76e3-08db027dff6f X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kEr9mGoJtzajqlBUcCxP88sUAYEKuXEk4I28VpdCaTHdSl/5rUzju57rr+2pclahESS5ojDTZatBB7hA6ZIwwdIQsnWdeNxLiypRwIScsOeSOQ9zjmLs4QObWpBq3pNLqVYgqFajtjn9edQhp3O6aZq3kvQTHxU3rc8n53PktcglvLMhLYBNY+KMkWcXc2UVO7nQe77vzh2SRTPGL2AeDSydfxedy+LftFOIO3j4Q61RFGpeHtqRrmUwA5nc1ak4L2q4vfAVUp30pNd5E19e5XQPJ12Gmded39Q1o6gOc6MABbv+UnMGrCBaXSAhySRCVnK3j+WqInt5n3uUlWDgGMtZWzczMBEKZQK4Z8arvJo9AuXKII5Qyor9vwoJ0u2FzehlbN3IfMseWqXrGhepYpytN5xYWs0sOD9EgM7a0vflsgZXnt+fHpFqW66gtqtu2yAKxq+YPZXavNz+8Up2Bg9X1HQOeu+FzgaxoKEqG5nzcmT13OWtDGc+NYInE9v/KToUoMVltOVHduq8/ZGkY24mpdalV8xVblW0S5WEQbJw3blalSEdx1chEHJtBzO004cnbw3QmAtrkeEmjBF8XlFkIdiJX2vI7IXLN2PRpzS/I2N6SrRj6kp2uGX9YqV14vuyJTKfBd/RoG3EBgYk29J8tH8KXrdiOrI1Uyc3xXvyakYc12j4/uj8HCmE43ODK+9Ig0obWf8M7jZ1sNff9w== X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230025)(4636009)(39860400002)(136003)(346002)(376002)(396003)(451199018)(40470700004)(36840700001)(46966006)(82310400005)(2906002)(5660300002)(86362001)(47076005)(336012)(6286002)(426003)(83380400001)(8936002)(40460700003)(30864003)(41300700001)(356005)(36756003)(478600001)(1076003)(26005)(6666004)(7696005)(186003)(107886003)(55016003)(82740400003)(2616005)(36860700001)(7636003)(70586007)(70206006)(4326008)(8676002)(40480700001)(54906003)(16526019)(110136005)(316002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jan 2023 04:53:58.1157 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: eeeacf3d-d1f9-4b15-76e3-08db027dff6f X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT020.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR12MB7466 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 Support flex item matching in hws and syntax follows sws exactly. Flex item should be created in advance and follow current json mapping logic. Signed-off-by: Rongwei Liu Reviewed-by: Alex Vesker Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/hws/mlx5dr_definer.c | 83 ++++++++++++++++++ drivers/net/mlx5/mlx5.c | 2 +- drivers/net/mlx5/mlx5.h | 6 ++ drivers/net/mlx5/mlx5_flow.h | 1 + drivers/net/mlx5/mlx5_flow_dv.c | 2 +- drivers/net/mlx5/mlx5_flow_flex.c | 116 ++++++++++++++++++++++---- drivers/net/mlx5/mlx5_flow_hw.c | 48 ++++++++++- 7 files changed, 239 insertions(+), 19 deletions(-) diff --git a/drivers/net/mlx5/hws/mlx5dr_definer.c b/drivers/net/mlx5/hws/mlx5dr_definer.c index 6b98eb8c96..a6378afb10 100644 --- a/drivers/net/mlx5/hws/mlx5dr_definer.c +++ b/drivers/net/mlx5/hws/mlx5dr_definer.c @@ -293,6 +293,43 @@ mlx5dr_definer_integrity_set(struct mlx5dr_definer_fc *fc, DR_SET(tag, ok1_bits, fc->byte_off, fc->bit_off, fc->bit_mask); } +static void +mlx5dr_definer_flex_parser_set(struct mlx5dr_definer_fc *fc, + const void *item, + uint8_t *tag, bool is_inner) +{ + const struct rte_flow_item_flex *flex = item; + uint32_t byte_off, val, idx; + int ret; + + val = 0; + byte_off = MLX5_BYTE_OFF(definer_hl, flex_parser.flex_parser_0); + idx = fc->fname - MLX5DR_DEFINER_FNAME_FLEX_PARSER_0; + byte_off -= idx * sizeof(uint32_t); + ret = mlx5_flex_get_parser_value_per_byte_off(flex, flex->handle, byte_off, + false, is_inner, &val); + if (ret == -1 || !val) + return; + + DR_SET(tag, val, fc->byte_off, 0, fc->bit_mask); +} + +static void +mlx5dr_definer_flex_parser_inner_set(struct mlx5dr_definer_fc *fc, + const void *item, + uint8_t *tag) +{ + mlx5dr_definer_flex_parser_set(fc, item, tag, true); +} + +static void +mlx5dr_definer_flex_parser_outer_set(struct mlx5dr_definer_fc *fc, + const void *item, + uint8_t *tag) +{ + mlx5dr_definer_flex_parser_set(fc, item, tag, false); +} + static void mlx5dr_definer_gre_key_set(struct mlx5dr_definer_fc *fc, const void *item_spec, @@ -1465,6 +1502,47 @@ mlx5dr_definer_conv_item_meter_color(struct mlx5dr_definer_conv_data *cd, return 0; } +static int +mlx5dr_definer_conv_item_flex_parser(struct mlx5dr_definer_conv_data *cd, + struct rte_flow_item *item, + int item_idx) +{ + uint32_t base_off = MLX5_BYTE_OFF(definer_hl, flex_parser.flex_parser_0); + const struct rte_flow_item_flex *v, *m; + enum mlx5dr_definer_fname fname; + struct mlx5dr_definer_fc *fc; + uint32_t i, mask, byte_off; + bool is_inner = cd->tunnel; + int ret; + + m = item->mask; + v = item->spec; + mask = 0; + for (i = 0; i < MLX5_GRAPH_NODE_SAMPLE_NUM; i++) { + byte_off = base_off - i * sizeof(uint32_t); + ret = mlx5_flex_get_parser_value_per_byte_off(m, v->handle, byte_off, + true, is_inner, &mask); + if (ret == -1) { + rte_errno = EINVAL; + return rte_errno; + } + + if (!mask) + continue; + + fname = MLX5DR_DEFINER_FNAME_FLEX_PARSER_0; + fname += (enum mlx5dr_definer_fname)i; + fc = &cd->fc[fname]; + fc->byte_off = byte_off; + fc->item_idx = item_idx; + fc->tag_set = cd->tunnel ? &mlx5dr_definer_flex_parser_inner_set : + &mlx5dr_definer_flex_parser_outer_set; + fc->tag_mask_set = &mlx5dr_definer_ones_set; + fc->bit_mask = mask; + } + return 0; +} + static int mlx5dr_definer_conv_items_to_hl(struct mlx5dr_context *ctx, struct mlx5dr_match_template *mt, @@ -1581,6 +1659,11 @@ mlx5dr_definer_conv_items_to_hl(struct mlx5dr_context *ctx, ret = mlx5dr_definer_conv_item_meter_color(&cd, items, i); item_flags |= MLX5_FLOW_ITEM_METER_COLOR; break; + case RTE_FLOW_ITEM_TYPE_FLEX: + ret = mlx5dr_definer_conv_item_flex_parser(&cd, items, i); + item_flags |= cd.tunnel ? MLX5_FLOW_ITEM_INNER_FLEX : + MLX5_FLOW_ITEM_OUTER_FLEX; + break; default: DR_LOG(ERR, "Unsupported item type %d", items->type); rte_errno = ENOTSUP; diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c index 0b97c4e78d..8297129bd1 100644 --- a/drivers/net/mlx5/mlx5.c +++ b/drivers/net/mlx5/mlx5.c @@ -1034,7 +1034,7 @@ static void mlx5_flex_parser_ecpri_release(struct rte_eth_dev *dev) { struct mlx5_priv *priv = dev->data->dev_private; - struct mlx5_ecpri_parser_profile *prf = &priv->sh->ecpri_parser; + struct mlx5_ecpri_parser_profile *prf = &priv->sh->ecpri_parser; if (prf->obj) mlx5_devx_cmd_destroy(prf->obj); diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h index 83fb316ad8..2cc3959d01 100644 --- a/drivers/net/mlx5/mlx5.h +++ b/drivers/net/mlx5/mlx5.h @@ -2243,6 +2243,12 @@ void mlx5_flex_item_port_cleanup(struct rte_eth_dev *dev); void mlx5_flex_flow_translate_item(struct rte_eth_dev *dev, void *matcher, void *key, const struct rte_flow_item *item, bool is_inner); +int mlx5_flex_get_sample_id(const struct mlx5_flex_item *tp, + uint32_t idx, uint32_t *pos, + bool is_inner, uint32_t *def); +int mlx5_flex_get_parser_value_per_byte_off(const struct rte_flow_item_flex *item, + void *flex, uint32_t byte_off, + bool is_mask, bool tunnel, uint32_t *value); int mlx5_flex_acquire_index(struct rte_eth_dev *dev, struct rte_flow_item_flex_handle *handle, bool acquire); diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h index e376dcae93..c8761c4e5a 100644 --- a/drivers/net/mlx5/mlx5_flow.h +++ b/drivers/net/mlx5/mlx5_flow.h @@ -1225,6 +1225,7 @@ struct rte_flow_pattern_template { * tag pattern item for representor matching. */ bool implicit_tag; + uint8_t flex_item; /* flex item index. */ }; /* Flow action template struct. */ diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 7ca909999b..284f18da11 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -10588,7 +10588,7 @@ flow_dv_translate_item_flex(struct rte_eth_dev *dev, void *matcher, void *key, (const struct rte_flow_item_flex *)item->spec; int index = mlx5_flex_acquire_index(dev, spec->handle, false); - MLX5_ASSERT(index >= 0 && index <= (int)(sizeof(uint32_t) * CHAR_BIT)); + MLX5_ASSERT(index >= 0 && index < (int)(sizeof(uint32_t) * CHAR_BIT)); if (index < 0) return; if (!(dev_flow->handle->flex_item & RTE_BIT32(index))) { diff --git a/drivers/net/mlx5/mlx5_flow_flex.c b/drivers/net/mlx5/mlx5_flow_flex.c index 24b7226ee6..aa317fc958 100644 --- a/drivers/net/mlx5/mlx5_flow_flex.c +++ b/drivers/net/mlx5/mlx5_flow_flex.c @@ -198,6 +198,99 @@ mlx5_flex_set_match_sample(void *misc4_m, void *misc4_v, } #undef SET_FP_MATCH_SAMPLE_ID } + +/** + * Get the flex parser sample id and corresponding mask + * per shift and width information. + * + * @param[in] tp + * Mlx5 flex item sample mapping handle. + * @param[in] idx + * Mapping index. + * @param[in, out] pos + * Where to search the value and mask. + * @param[in] is_inner + * For inner matching or not. + * @param[in, def] def + * Mask generated by mapping shift and width. + * + * @return + * 0 on success, -1 to ignore. + */ +int +mlx5_flex_get_sample_id(const struct mlx5_flex_item *tp, + uint32_t idx, uint32_t *pos, + bool is_inner, uint32_t *def) +{ + const struct mlx5_flex_pattern_field *map = tp->map + idx; + uint32_t id = map->reg_id; + + *def = (RTE_BIT64(map->width) - 1) << map->shift; + /* Skip placeholders for DUMMY fields. */ + if (id == MLX5_INVALID_SAMPLE_REG_ID) { + *pos += map->width; + return -1; + } + MLX5_ASSERT(map->width); + MLX5_ASSERT(id < tp->devx_fp->num_samples); + if (tp->tunnel_mode == FLEX_TUNNEL_MODE_MULTI && is_inner) { + uint32_t num_samples = tp->devx_fp->num_samples / 2; + + MLX5_ASSERT(tp->devx_fp->num_samples % 2 == 0); + MLX5_ASSERT(id < num_samples); + id += num_samples; + } + return id; +} + +/** + * Get the flex parser mapping value per definer format_select_dw. + * + * @param[in] item + * Rte flex item pointer. + * @param[in] flex + * Mlx5 flex item sample mapping handle. + * @param[in] byte_off + * Mlx5 flex item format_select_dw. + * @param[in] is_mask + * Spec or mask. + * @param[in] tunnel + * Tunnel mode or not. + * @param[in, def] value + * Value calculated for this flex parser, either spec or mask. + * + * @return + * 0 on success, -1 for error. + */ +int +mlx5_flex_get_parser_value_per_byte_off(const struct rte_flow_item_flex *item, + void *flex, uint32_t byte_off, + bool is_mask, bool tunnel, uint32_t *value) +{ + struct mlx5_flex_pattern_field *map; + struct mlx5_flex_item *tp = flex; + uint32_t def, i, pos, val; + int id; + + *value = 0; + for (i = 0, pos = 0; i < tp->mapnum && pos < item->length * CHAR_BIT; i++) { + map = tp->map + i; + id = mlx5_flex_get_sample_id(tp, i, &pos, tunnel, &def); + if (id == -1) + continue; + if (id >= (int)tp->devx_fp->num_samples || id >= MLX5_GRAPH_NODE_SAMPLE_NUM) + return -1; + if (byte_off == tp->devx_fp->sample_ids[id].format_select_dw * sizeof(uint32_t)) { + val = mlx5_flex_get_bitfield(item, pos, map->width, map->shift); + if (is_mask) + val &= RTE_BE32(def); + *value |= val; + } + pos += map->width; + } + return 0; +} + /** * Translate item pattern into matcher fields according to translation * array. @@ -240,26 +333,17 @@ mlx5_flex_flow_translate_item(struct rte_eth_dev *dev, MLX5_ASSERT(mlx5_flex_index(priv, tp) >= 0); for (i = 0; i < tp->mapnum; i++) { struct mlx5_flex_pattern_field *map = tp->map + i; - uint32_t id = map->reg_id; - uint32_t def = (RTE_BIT64(map->width) - 1) << map->shift; - uint32_t val, msk; + uint32_t val, msk, def; + int id = mlx5_flex_get_sample_id(tp, i, &pos, is_inner, &def); - /* Skip placeholders for DUMMY fields. */ - if (id == MLX5_INVALID_SAMPLE_REG_ID) { - pos += map->width; + if (id == -1) continue; - } + MLX5_ASSERT(id < (int)tp->devx_fp->num_samples); + if (id >= (int)tp->devx_fp->num_samples || + id >= MLX5_GRAPH_NODE_SAMPLE_NUM) + return; val = mlx5_flex_get_bitfield(spec, pos, map->width, map->shift); msk = mlx5_flex_get_bitfield(mask, pos, map->width, map->shift); - MLX5_ASSERT(map->width); - MLX5_ASSERT(id < tp->devx_fp->num_samples); - if (tp->tunnel_mode == FLEX_TUNNEL_MODE_MULTI && is_inner) { - uint32_t num_samples = tp->devx_fp->num_samples / 2; - - MLX5_ASSERT(tp->devx_fp->num_samples % 2 == 0); - MLX5_ASSERT(id < num_samples); - id += num_samples; - } if (attr->ext_sample_id) sample_id = tp->devx_fp->sample_ids[id].sample_id; else diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index 44953451d5..742b0b0d43 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -4331,6 +4331,36 @@ flow_hw_set_vlan_vid_construct(struct rte_eth_dev *dev, &modify_action); } +static int +flow_hw_flex_item_acquire(struct rte_eth_dev *dev, + struct rte_flow_item_flex_handle *handle, + uint8_t *flex_item) +{ + int index = mlx5_flex_acquire_index(dev, handle, false); + + MLX5_ASSERT(index >= 0 && index < (int)(sizeof(uint32_t) * CHAR_BIT)); + if (index < 0) + return -1; + if (!(*flex_item & RTE_BIT32(index))) { + /* Don't count same flex item again. */ + if (mlx5_flex_acquire_index(dev, handle, true) != index) + MLX5_ASSERT(false); + *flex_item |= (uint8_t)RTE_BIT32(index); + } + return 0; +} + +static void +flow_hw_flex_item_release(struct rte_eth_dev *dev, uint8_t *flex_item) +{ + while (*flex_item) { + int index = rte_bsf32(*flex_item); + + mlx5_flex_release_index(dev, index); + *flex_item &= ~(uint8_t)RTE_BIT32(index); + } +} + /** * Create flow action template. * @@ -4732,6 +4762,7 @@ flow_hw_pattern_validate(struct rte_eth_dev *dev, case RTE_FLOW_ITEM_TYPE_ICMP: case RTE_FLOW_ITEM_TYPE_ICMP6: case RTE_FLOW_ITEM_TYPE_CONNTRACK: + case RTE_FLOW_ITEM_TYPE_FLEX: break; case RTE_FLOW_ITEM_TYPE_INTEGRITY: /* @@ -4809,6 +4840,7 @@ flow_hw_pattern_template_create(struct rte_eth_dev *dev, .mask = &tag_m, .last = NULL }; + unsigned int i = 0; if (flow_hw_pattern_validate(dev, attr, items, error)) return NULL; @@ -4868,6 +4900,19 @@ flow_hw_pattern_template_create(struct rte_eth_dev *dev, it->implicit_tag = true; mlx5_free(copied_items); } + for (i = 0; items[i].type != RTE_FLOW_ITEM_TYPE_END; ++i) { + if (items[i].type == RTE_FLOW_ITEM_TYPE_FLEX) { + const struct rte_flow_item_flex *spec = + (const struct rte_flow_item_flex *)items[i].spec; + struct rte_flow_item_flex_handle *handle = spec->handle; + + if (flow_hw_flex_item_acquire(dev, handle, &it->flex_item)) { + claim_zero(mlx5dr_match_template_destroy(it->mt)); + mlx5_free(it); + return NULL; + } + } + } __atomic_fetch_add(&it->refcnt, 1, __ATOMIC_RELAXED); LIST_INSERT_HEAD(&priv->flow_hw_itt, it, next); return it; @@ -4887,7 +4932,7 @@ flow_hw_pattern_template_create(struct rte_eth_dev *dev, * 0 on success, a negative errno value otherwise and rte_errno is set. */ static int -flow_hw_pattern_template_destroy(struct rte_eth_dev *dev __rte_unused, +flow_hw_pattern_template_destroy(struct rte_eth_dev *dev, struct rte_flow_pattern_template *template, struct rte_flow_error *error __rte_unused) { @@ -4900,6 +4945,7 @@ flow_hw_pattern_template_destroy(struct rte_eth_dev *dev __rte_unused, "item template in using"); } LIST_REMOVE(template, next); + flow_hw_flex_item_release(dev, &template->flex_item); claim_zero(mlx5dr_match_template_destroy(template->mt)); mlx5_free(template); return 0; From patchwork Mon Jan 30 04:52:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rongwei Liu X-Patchwork-Id: 122644 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 12B7E424B9; Mon, 30 Jan 2023 05:54:11 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1959D42D51; Mon, 30 Jan 2023 05:54:00 +0100 (CET) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2054.outbound.protection.outlook.com [40.107.243.54]) by mails.dpdk.org (Postfix) with ESMTP id B4C8242D29 for ; Mon, 30 Jan 2023 05:53:58 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=J7Z8LM573YagDkdqNrwzM0yaejsc8Jhg07BQc8R9XUT9DV0YwkPuUXA3m4mE+KzFLbMp6Wan5NulNfc4yLRG1Tzn4zjzBQDkgqc+jr9Nj4gqkVtBH+CWAeKj35qtcNKWqIALFKltpC3mGs97R0yMShfWHAXtngECSUHqkHeSwHWciPThVMBCkfz3Npd9tInk83IWY/LIWoZcPTW1oUIOHxnIlzz6QNlblyTh/P2rMNCO7xWgTxGZS3DRRyAxmzpzV0gIxh+gOT5XP8y4yTCDi+XbUYleYm7FtbW5uMIzAMvFbIDJ9nyXqB9KCczzlArHPRBJZBIJyOAbn+hPoEOCWg== 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=MrWtwZVWkGTYzmtix6QbsusLzxU6flqfhA9QbPO+mbE=; b=R7CXd9BJyyDd1r9H1etu8STfuHuGz+32Hqhr81ThyaD0ooOIuR8mM4Zh7YkTdQbpFXMAjHMMQX2JMHw/IDEWNt4MqEl7iADURJsPDPQvksgFnSLnxeMJSbLG1iLyiVL49IwbR2Vq6zJT6N3HyVUSqSRrVEbGArdBIBGSbXQ7sBkAaNfODOACW9bBjx5aKL80J1ADcUrN1ASuiPYIAA0d3RzusoqpElcHCGmC/yfIy4iKzXqFX54aLXErvhCZIJO1SolDNtAJbZO/2OoKckPTvngi2yUvnZkLm94tpbr8I9M0fcTAEU+fCHlPvO10z3ZrxNkwrEJ6O9CX+eCJd/9KTw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=monjalon.net smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=MrWtwZVWkGTYzmtix6QbsusLzxU6flqfhA9QbPO+mbE=; b=FjElMdpB0nz5tXCEKLektLvZewbNyUy2/gn5LXX/FyW8olAS40zi+ZTW9UlwytXI9FA5k8m4YTc77OdZZUhzEIrd+uDpVCJkbWX8KaTFSVhS5V5xyiGzOm4U1cPUmtjbdbibM8KCxo+bBtfpB8/2sK2fIMnFzWX2enjYOmdPF+v7dbGI53xPhnD8zNZhIT0GQ2cKbJLii2yuqtn+/ZDj82R2yyT6QWvk2+fTNVfW3RQ7PR5JClYWw1mXtTaB3+YDwSQc9OSPKK8TNtW1pyfwljsg0mW7PBs9spgmD+r7dizyykgOy8yDYFQ6IChKLNA8RZPPU/XJBBF4tNAYE4XMzg== Received: from MW2PR16CA0043.namprd16.prod.outlook.com (2603:10b6:907:1::20) by PH7PR12MB6978.namprd12.prod.outlook.com (2603:10b6:510:1b8::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.36; Mon, 30 Jan 2023 04:53:55 +0000 Received: from CO1NAM11FT070.eop-nam11.prod.protection.outlook.com (2603:10b6:907:1:cafe::26) by MW2PR16CA0043.outlook.office365.com (2603:10b6:907:1::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.36 via Frontend Transport; Mon, 30 Jan 2023 04:53:55 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by CO1NAM11FT070.mail.protection.outlook.com (10.13.175.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.17 via Frontend Transport; Mon, 30 Jan 2023 04:53:55 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Sun, 29 Jan 2023 20:53:41 -0800 Received: from nvidia.com (10.126.230.37) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Sun, 29 Jan 2023 20:53:39 -0800 From: Rongwei Liu To: , , , CC: , Subject: [PATCH v3 07/11] net/mlx5: add flex item modify field implementation Date: Mon, 30 Jan 2023 06:52:58 +0200 Message-ID: <20230130045302.1560006-8-rongweil@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20230130045302.1560006-1-rongweil@nvidia.com> References: <3ba49f25-52d0-fe07-02e6-22a71e0fbe13@oktetlabs.ru> <20230130045302.1560006-1-rongweil@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.230.37] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1NAM11FT070:EE_|PH7PR12MB6978:EE_ X-MS-Office365-Filtering-Correlation-Id: 1383a583-26d3-4ea8-6ce5-08db027dfd8c X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: N8j2q2VuzorcOGMj6oK0PSvlKqC14SWRWn28rnH37VTAd9gbKKQ33/lTAu+ImMh7aW/QgsQaGGbJxB+DS6p3UgLKUUpMvusX5GEqB4ThzhJe1ubd009u9E5yJG1UVuwUNOqdadv8YUsRNoDBK7KVHoSuMIcJkLGI/aJFn15udi8vyIcbjhL5Ia0FzCXp84iT1cK4T1HpwKX6zazxq/UfLVZ9X1YObbZMQtTyZE+cr1dQj2XmBMHxcOeiN5POQkB+K2pRYFwb9Wmvu30NSpQ96rMyQET9YyKxxgjhUbh+UzzpHh83j8YMJtYY75wsCxTHWPnWIHLKi+8tbte4n3G+3iB5CF2ssQvJQnqPlszdgL2WSB/qMpqivjbtR1lJFYDBUSt4psf2cBqo12uQC8eARXgNT8HVYj5abf0MbuqbHXma/Y7aM1Pj/+8Ao927vuWIkWy5Q8uGF9m8eJiewYG/kEYVG+6KIpKyoas5Rt4t9OEr0qKryZ5Hx+NRARkA4vuYdNrcZZrHmRnG6CTfCMmS59UlalFZgUB1PdYqhyE3ox3zcy3Ro+yIWxfi/W6An1PCx9AAiX+FK7Faf38ZoPFMIq7ho02dxmT98pzDcG2wWnkiAzHFUEn8SMruxe7xPpsdXA+R23IP0BYA9COO1BlPvPXhxFDUWri4Az01B71+c48uWK2UhMHaf3JTDFawvY4XF+n/3ftPiSNBoEBkjNg53Q== X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230025)(4636009)(39860400002)(136003)(346002)(376002)(396003)(451199018)(40470700004)(36840700001)(46966006)(82310400005)(2906002)(5660300002)(86362001)(47076005)(336012)(6286002)(426003)(83380400001)(8936002)(40460700003)(41300700001)(356005)(36756003)(478600001)(1076003)(26005)(6666004)(7696005)(186003)(107886003)(55016003)(82740400003)(2616005)(36860700001)(7636003)(70586007)(70206006)(4326008)(8676002)(40480700001)(54906003)(16526019)(110136005)(316002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jan 2023 04:53:55.0125 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1383a583-26d3-4ea8-6ce5-08db027dfd8c X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT070.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB6978 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 flex item modify field HWS implementation. The minimum modify boundary is one byte. Signed-off-by: Rongwei Liu Acked-by: Viacheslav Ovsiienko --- drivers/common/mlx5/mlx5_prm.h | 1 + drivers/net/mlx5/mlx5_flow.h | 3 + drivers/net/mlx5/mlx5_flow_dv.c | 165 +++++++++++++++++++++++++++++--- drivers/net/mlx5/mlx5_flow_hw.c | 14 ++- 4 files changed, 170 insertions(+), 13 deletions(-) diff --git a/drivers/common/mlx5/mlx5_prm.h b/drivers/common/mlx5/mlx5_prm.h index ce6cd98fd7..0c2a516e9d 100644 --- a/drivers/common/mlx5/mlx5_prm.h +++ b/drivers/common/mlx5/mlx5_prm.h @@ -759,6 +759,7 @@ enum mlx5_modification_field { MLX5_MODI_OUT_IP_ECN = 0x73, MLX5_MODI_TUNNEL_HDR_DW_1 = 0x75, MLX5_MODI_GTPU_FIRST_EXT_DW_0 = 0x76, + MLX5_MODI_INVALID = INT_MAX, }; /* Total number of metadata reg_c's. */ diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h index c8761c4e5a..c71fa1c0ad 100644 --- a/drivers/net/mlx5/mlx5_flow.h +++ b/drivers/net/mlx5/mlx5_flow.h @@ -1080,6 +1080,8 @@ struct field_modify_info { uint32_t size; /* Size of field in protocol header, in bytes. */ uint32_t offset; /* Offset of field in protocol header, in bytes. */ enum mlx5_modification_field id; + uint32_t shift; + uint8_t is_flex; /* Temporary indicator for flex item modify filed WA. */ }; /* HW steering flow attributes. */ @@ -1244,6 +1246,7 @@ struct rte_flow_actions_template { uint16_t mhdr_off; /* Offset of DR modify header action. */ uint32_t refcnt; /* Reference counter. */ uint16_t rx_cpy_pos; /* Action position of Rx metadata to be copied. */ + uint8_t flex_item; /* flex item index. */ }; /* Jump action struct. */ diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 284f18da11..92a5914d4b 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -414,10 +414,15 @@ flow_dv_convert_modify_action(struct rte_flow_item *item, ++field; continue; } - /* Deduce actual data width in bits from mask value. */ - off_b = rte_bsf32(mask) + carry_b; - size_b = sizeof(uint32_t) * CHAR_BIT - - off_b - __builtin_clz(mask); + if (type == MLX5_MODIFICATION_TYPE_COPY && field->is_flex) { + off_b = 32 - field->shift + carry_b - field->size * CHAR_BIT; + size_b = field->size * CHAR_BIT - carry_b; + } else { + /* Deduce actual data width in bits from mask value. */ + off_b = rte_bsf32(mask) + carry_b; + size_b = sizeof(uint32_t) * CHAR_BIT - + off_b - __builtin_clz(mask); + } MLX5_ASSERT(size_b); actions[i] = (struct mlx5_modification_cmd) { .action_type = type, @@ -437,40 +442,46 @@ flow_dv_convert_modify_action(struct rte_flow_item *item, * Destination field overflow. Copy leftovers of * a source field to the next destination field. */ - carry_b = 0; if ((size_b > dcopy->size * CHAR_BIT - dcopy->offset) && dcopy->size != 0) { actions[i].length = dcopy->size * CHAR_BIT - dcopy->offset; - carry_b = actions[i].length; + carry_b += actions[i].length; next_field = false; + } else { + carry_b = 0; } /* * Not enough bits in a source filed to fill a * destination field. Switch to the next source. */ if ((size_b < dcopy->size * CHAR_BIT - dcopy->offset) && - (size_b == field->size * CHAR_BIT - off_b)) { - actions[i].length = - field->size * CHAR_BIT - off_b; + ((size_b == field->size * CHAR_BIT - off_b) || + field->is_flex)) { + actions[i].length = size_b; dcopy->offset += actions[i].length; next_dcopy = false; } - if (next_dcopy) - ++dcopy; } else { MLX5_ASSERT(item->spec); data = flow_dv_fetch_field((const uint8_t *)item->spec + field->offset, field->size); /* Shift out the trailing masked bits from data. */ data = (data & mask) >> off_b; + if (field->is_flex) + actions[i].offset = 32 - field->shift - field->size * CHAR_BIT; actions[i].data1 = rte_cpu_to_be_32(data); } /* Convert entire record to expected big-endian format. */ actions[i].data0 = rte_cpu_to_be_32(actions[i].data0); + if ((type != MLX5_MODIFICATION_TYPE_COPY || + dcopy->id != (enum mlx5_modification_field)UINT32_MAX) && + field->id != (enum mlx5_modification_field)UINT32_MAX) + ++i; + if (next_dcopy && type == MLX5_MODIFICATION_TYPE_COPY) + ++dcopy; if (next_field) ++field; - ++i; } while (field->size); if (resource->actions_num == i) return rte_flow_error_set(error, EINVAL, @@ -1421,6 +1432,131 @@ flow_modify_info_mask_32_masked(uint32_t length, uint32_t off, uint32_t post_mas return rte_cpu_to_be_32(mask & post_mask); } +static void +mlx5_modify_flex_item(const struct rte_eth_dev *dev, + const struct mlx5_flex_item *flex, + const struct rte_flow_action_modify_data *data, + struct field_modify_info *info, + uint32_t *mask, uint32_t width) +{ + struct mlx5_priv *priv = dev->data->dev_private; + struct mlx5_hca_flex_attr *attr = &priv->sh->cdev->config.hca_attr.flex; + uint32_t i, j; + int id = 0; + uint32_t pos = 0; + const struct mlx5_flex_pattern_field *map; + uint32_t offset = data->offset; + uint32_t width_left = width; + uint32_t def; + uint32_t cur_width = 0; + uint32_t tmp_ofs; + uint32_t idx = 0; + struct field_modify_info tmp; + int tmp_id; + + if (!attr->ext_sample_id) { + DRV_LOG(ERR, "FW doesn't support modify field with flex item."); + return; + } + /* + * search for the mapping instance until Accumulated width is no + * less than data->offset. + */ + for (i = 0; i < flex->mapnum; i++) { + if (flex->map[i].width + pos > data->offset) + break; + pos += flex->map[i].width; + } + if (i >= flex->mapnum) + return; + tmp_ofs = pos < data->offset ? data->offset - pos : 0; + for (j = i; i < flex->mapnum && width_left > 0; ) { + map = flex->map + i; + id = mlx5_flex_get_sample_id(flex, i, &pos, false, &def); + if (id == -1) { + i++; + /* All left length is dummy */ + if (pos >= data->offset + width) + return; + cur_width = map->width; + /* One mapping instance covers the whole width. */ + } else if (pos + map->width >= (data->offset + width)) { + cur_width = width_left; + } else { + cur_width = cur_width + map->width - tmp_ofs; + pos += map->width; + /* + * Continue to search next until: + * 1. Another flex parser ID. + * 2. Width has been covered. + */ + for (j = i + 1; j < flex->mapnum; j++) { + tmp_id = mlx5_flex_get_sample_id(flex, j, &pos, false, &def); + if (tmp_id == -1) { + i = j; + pos -= flex->map[j].width; + break; + } + if (id >= (int)flex->devx_fp->num_samples || + id >= MLX5_GRAPH_NODE_SAMPLE_NUM || + tmp_id >= (int)flex->devx_fp->num_samples || + tmp_id >= MLX5_GRAPH_NODE_SAMPLE_NUM) + return; + if (flex->devx_fp->sample_ids[id].id != + flex->devx_fp->sample_ids[tmp_id].id || + flex->map[j].shift != flex->map[j - 1].width + + flex->map[j - 1].shift) { + i = j; + break; + } + if ((pos + flex->map[j].width) >= (data->offset + width)) { + cur_width = width_left; + break; + } + pos += flex->map[j].width; + cur_width += flex->map[j].width; + } + } + if (cur_width > width_left) + cur_width = width_left; + else if (cur_width < width_left && (j == flex->mapnum || i == flex->mapnum)) + return; + + MLX5_ASSERT(id < (int)flex->devx_fp->num_samples); + if (id >= (int)flex->devx_fp->num_samples || id >= MLX5_GRAPH_NODE_SAMPLE_NUM) + return; + /* Use invalid entry as placeholder for DUMMY mapping. */ + info[idx] = (struct field_modify_info){cur_width / CHAR_BIT, offset / CHAR_BIT, + id == -1 ? MLX5_MODI_INVALID : + (enum mlx5_modification_field) + flex->devx_fp->sample_ids[id].modify_field_id, + map->shift + tmp_ofs, 1}; + offset += cur_width; + width_left -= cur_width; + if (!mask) { + info[idx].offset = (32 - cur_width - map->shift - tmp_ofs); + info[idx].size = cur_width / CHAR_BIT + info[idx].offset / CHAR_BIT; + } + cur_width = 0; + tmp_ofs = 0; + idx++; + } + if (unlikely(width_left > 0)) { + MLX5_ASSERT(false); + return; + } + if (mask) + memset(mask, 0xff, data->offset / CHAR_BIT + width / CHAR_BIT); + /* Re-order the info to follow IPv6 address. */ + for (i = 0; i < idx / 2; i++) { + tmp = info[i]; + MLX5_ASSERT(info[i].id); + MLX5_ASSERT(info[idx - 1 - i].id); + info[i] = info[idx - 1 - i]; + info[idx - 1 - i] = tmp; + } +} + void mlx5_flow_field_id_to_modify_info (const struct rte_flow_action_modify_data *data, @@ -1883,6 +2019,11 @@ mlx5_flow_field_id_to_modify_info info[idx].offset = data->offset; } break; + case RTE_FLOW_FIELD_FLEX_ITEM: + MLX5_ASSERT(data->flex_handle != NULL && !(data->offset & 0x7)); + mlx5_modify_flex_item(dev, (const struct mlx5_flex_item *)data->flex_handle, + data, info, mask, width); + break; case RTE_FLOW_FIELD_POINTER: case RTE_FLOW_FIELD_VALUE: default: diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index 742b0b0d43..2e263880d7 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -4550,6 +4550,17 @@ flow_hw_actions_template_create(struct rte_eth_dev *dev, at->actions[i].conf = actions->conf; at->masks[i].conf = masks->conf; } + if (actions->type == RTE_FLOW_ACTION_TYPE_MODIFY_FIELD) { + const struct rte_flow_action_modify_field *info = actions->conf; + + if ((info->dst.field == RTE_FLOW_FIELD_FLEX_ITEM && + flow_hw_flex_item_acquire(dev, info->dst.flex_handle, + &at->flex_item)) || + (info->src.field == RTE_FLOW_FIELD_FLEX_ITEM && + flow_hw_flex_item_acquire(dev, info->src.flex_handle, + &at->flex_item))) + goto error; + } } at->tmpl = flow_hw_dr_actions_template_create(at); if (!at->tmpl) @@ -4581,7 +4592,7 @@ flow_hw_actions_template_create(struct rte_eth_dev *dev, * 0 on success, a negative errno value otherwise and rte_errno is set. */ static int -flow_hw_actions_template_destroy(struct rte_eth_dev *dev __rte_unused, +flow_hw_actions_template_destroy(struct rte_eth_dev *dev, struct rte_flow_actions_template *template, struct rte_flow_error *error __rte_unused) { @@ -4594,6 +4605,7 @@ flow_hw_actions_template_destroy(struct rte_eth_dev *dev __rte_unused, "action template in using"); } LIST_REMOVE(template, next); + flow_hw_flex_item_release(dev, &template->flex_item); if (template->tmpl) mlx5dr_action_template_destroy(template->tmpl); mlx5_free(template); From patchwork Mon Jan 30 04:52:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rongwei Liu X-Patchwork-Id: 122645 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 D068E424B9; Mon, 30 Jan 2023 05:54:17 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4909142D29; Mon, 30 Jan 2023 05:54:03 +0100 (CET) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2052.outbound.protection.outlook.com [40.107.223.52]) by mails.dpdk.org (Postfix) with ESMTP id DA656410F6 for ; Mon, 30 Jan 2023 05:53:59 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=daPR6XBlBIBg2vJvmPeQWy1Im8jNwD7IZclVyuxPWAmKTwvet3kJ+LkpjLCz/X31nCHSbCLhZSrFuFNX+pAh6BqlyRb942qpMk9ZpwJIaRYxuJQj9TFcli7GZ03kiQKIlkEKmrjTMmInmj3m1rlnvX6bOwwINe+EBA45NhJNtK5I/97eg8A5dqHJN6fhhCVF11XdJrEGbgREIKNVpEFgV7YCAEfliiKESWIC6rjVj1E+VrcB9xqMLL//gwKWmFVX72NUsQYa2OboL8iWCa5svFGWIKnlQg/OT38oz4GJ2IWmdTYFEiQhWlHhzqkp7FR0LygD82JhGODQZnGlsGSP5w== 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=VeGliKw6wGEMuT4JdUBri4FswK1WamMMF9gm/ptqRr8=; b=TbjfSJBETZ0hSgu/wzBcf0wtA0PY8AUmae3PHwwLifj2sLyMGK51yWljZTYqnznQ2E/7d3v1heg6uzlxIF2VESvdsPu0WgikntYyxhRdWkfz6xrXQ6/fkSgA7u03xThC0hSWs/I0YaJYtfhY00S1rfswBOs4a+PzY44Cs29JgdVjUMBQHvdeltVOfUPHvQ2O8McVNdpgzm1ZYS1UrPPP/+e9+FcRXrfpux06EWh20CMvKfUrK6x1+1GW1eV9tGW7/8Q5cnD0xT7vws/9aOFMDLlWEL/73oMf+8V32VPJK2itoBsqw1oJO6Kd46RBAZkzEJbACJpfAZBeBwojzSDJ1Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=monjalon.net smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=VeGliKw6wGEMuT4JdUBri4FswK1WamMMF9gm/ptqRr8=; b=JUbq7eriwz2PQ8uTosZsB8MR1Zum9yUUxrxaI58b8LnSjtiSMuDmQGU1KQBhCGs5w0gtx+15hM9ND5MhmgqVVEHFXvl45SuFxXQEQ1/Xg9d4M3+KvTTYiomyYLqqV//PnqsEqCyuSvENsbtBc++1fHfZrJUcXOwo0uxYakGEPPCEGLsWZYiJKEzG3T12/3MPZ3WYOBhQv4vH2/led3hClGa4HXipulpoLsAIFAzFJ8rdBAVCm2WnN8oxYIj9pyXgFJaoKkiin12nRvY25n8T231XcrjOViq+DN4Pxsv0UmRWjZhYHu7LokK72QL+UzGRyQ+QTUqVb536w5cfhfkf2A== Received: from MW4PR03CA0262.namprd03.prod.outlook.com (2603:10b6:303:b4::27) by PH7PR12MB5855.namprd12.prod.outlook.com (2603:10b6:510:1d6::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.33; Mon, 30 Jan 2023 04:53:58 +0000 Received: from CO1NAM11FT038.eop-nam11.prod.protection.outlook.com (2603:10b6:303:b4:cafe::58) by MW4PR03CA0262.outlook.office365.com (2603:10b6:303:b4::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.36 via Frontend Transport; Mon, 30 Jan 2023 04:53:57 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by CO1NAM11FT038.mail.protection.outlook.com (10.13.174.231) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.36 via Frontend Transport; Mon, 30 Jan 2023 04:53:57 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Sun, 29 Jan 2023 20:53:43 -0800 Received: from nvidia.com (10.126.230.37) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Sun, 29 Jan 2023 20:53:41 -0800 From: Rongwei Liu To: , , , CC: , , Dariusz Sosnowski Subject: [PATCH v3 08/11] net/mlx5: return error for sws modify field Date: Mon, 30 Jan 2023 06:52:59 +0200 Message-ID: <20230130045302.1560006-9-rongweil@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20230130045302.1560006-1-rongweil@nvidia.com> References: <3ba49f25-52d0-fe07-02e6-22a71e0fbe13@oktetlabs.ru> <20230130045302.1560006-1-rongweil@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.230.37] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1NAM11FT038:EE_|PH7PR12MB5855:EE_ X-MS-Office365-Filtering-Correlation-Id: 9917e5d2-e19d-47a1-d289-08db027dfefd X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: I0ADr5PsQBhtJpBvWUenAp8cslwSoQdwEyTYSophK6arFDMRjhf3u0ChbKi67/0uhC6IS5A55S4WnDdc2rP7FRA0NNqghnPyL2wTzCK1KwGeuYUSAVKJKzn3yJEBIGmu+vCCQpKJt+tCnSd8x4bVsmx6qftmLg6B2kuhF3vLLsDiQPSYS0oromwZ5sEnLGWqnIfU5Yewh1wY9C2lWN3he+vLTlbHVRNS2N8mCTIwiMBQgndOjcKoXH2cax3jKmdiwUO7rQ/vOQlUBjJ5cbUwgK+PCCFebjJ7Lz+sAAlZIhIOUYO5nVkV20zsNem+62ICa227OPNnGhS0g6mF/U8DH19CPbwQB0S6EdFCwJ4nzNXzZxdmhaTiFVKUPxj8sxcLj4WtD3sqbiV0bJM7RhvcO6QdjSiQA7lgVCv/a8MtdkdoiWIpQlRmwSRb1dFwxsSyIC0UWnC2CUZQ7F4CiZkEWcTMMVkufUHtgdBh1ZCtmpac7MD9UOnsXpnqPp+JakPM5etH4c736VKVvAH5Ug2dwDJy5KUzArvYtwFE7rZw9MoHh7hgyEsFin1dF6yQHHJwWyqcXS5hZNNSstcEMcdjApQhw3r4LdnjYFCuEricbPJ+rKHrRsLuu0yiEezXzooP714HqC1Hmc5sCOiCbjfGRdO/1b+K+IFzHN+pZSHeaOqdyOptoB2CZj/I2oP4rctZqZeEH1vJFH6WHF90ymduuA== X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230025)(4636009)(39860400002)(376002)(346002)(396003)(136003)(451199018)(40470700004)(36840700001)(46966006)(356005)(86362001)(82310400005)(36756003)(41300700001)(2906002)(54906003)(7696005)(110136005)(6666004)(478600001)(107886003)(2616005)(8936002)(55016003)(40480700001)(5660300002)(316002)(4326008)(70206006)(70586007)(8676002)(83380400001)(7636003)(82740400003)(26005)(36860700001)(6286002)(16526019)(186003)(1076003)(40460700003)(47076005)(426003)(336012); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jan 2023 04:53:57.4334 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9917e5d2-e19d-47a1-d289-08db027dfefd X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT038.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB5855 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 Return unsupported error message when application tries to modify flex item field. Validation of packet modifications actions for SW Steering checked if either source or destination field of MODIFY_FIELD action was a flex item. When DEC_TTL action is used, DEC_TTL action does not have any action configuration and dereferencing source or destination field is invalid, so validation of source and destination field types should be moved to MODIFY_FIELD specific validation function, then field types are validated if and only if action type is MODIFY_FIELD. Signed-off-by: Dariusz Sosnowski Signed-off-by: Rongwei Liu Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_flow_dv.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 92a5914d4b..a7c0d5bf17 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -4828,6 +4828,7 @@ flow_dv_validate_action_modify_hdr(const uint64_t action_flags, return rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ACTION_CONF, NULL, "action configuration not set"); + if (action_flags & MLX5_FLOW_ACTION_ENCAP) return rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ACTION, NULL, @@ -5153,17 +5154,21 @@ flow_dv_validate_action_modify_field(struct rte_eth_dev *dev, struct mlx5_hca_attr *hca_attr = &priv->sh->cdev->config.hca_attr; const struct rte_flow_action_modify_field *action_modify_field = action->conf; - uint32_t dst_width = mlx5_flow_item_field_width(dev, - action_modify_field->dst.field, - -1, attr, error); - uint32_t src_width = mlx5_flow_item_field_width(dev, - action_modify_field->src.field, - dst_width, attr, error); + uint32_t dst_width, src_width; ret = flow_dv_validate_action_modify_hdr(action_flags, action, error); if (ret) return ret; - + if (action_modify_field->src.field == RTE_FLOW_FIELD_FLEX_ITEM || + action_modify_field->dst.field == RTE_FLOW_FIELD_FLEX_ITEM) + return rte_flow_error_set(error, ENOTSUP, + RTE_FLOW_ERROR_TYPE_ACTION, action, + "flex item fields modification" + " is not supported"); + dst_width = mlx5_flow_item_field_width(dev, action_modify_field->dst.field, + -1, attr, error); + src_width = mlx5_flow_item_field_width(dev, action_modify_field->src.field, + dst_width, attr, error); if (action_modify_field->width == 0) return rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ACTION, action, From patchwork Mon Jan 30 04:53:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rongwei Liu X-Patchwork-Id: 122647 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 0D6A6424B9; Mon, 30 Jan 2023 05:54:31 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8742241151; Mon, 30 Jan 2023 05:54:05 +0100 (CET) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2088.outbound.protection.outlook.com [40.107.223.88]) by mails.dpdk.org (Postfix) with ESMTP id B717C42D29 for ; Mon, 30 Jan 2023 05:54:01 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=H9SZ4X8uobT6PD9l3Pp6RNNkMjadBSNHXFll8RldXy/UJFRCqAEyjAxZVklMw861S04jY4EE/C2FRSwvcOL2WLkKX2ZMaRn5SfIkERqwGRndMyqQn9TRAg2bSKf+sdbUiDjJRba+n5mNCrSBnQL4pEkgABcEL29tpNEH+zVZkZMzBi3ftubbB7+XXxcb3wnnaSEMuDG5/NfsZnNNLsyQz5IBZSVLAq4cXMpqD/768Q+Sa9Gzb4j8yOOZGCNZX53/FIvspvpeCSgjHk3aQ6ehPH4Tslb0AZ76fUe/P4O4i4N3gH/wfKBqdhd8Ev50/03hYeoYKuKujNIc8O7oQhu2Xw== 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=p+q+vrNiX6zn3xxx6pBtNu5+Q90OHYv6uY61JVIWMbM=; b=YfCf7bAzRbK8Yon9meNBJj604cfuM5BwsCT7FE/arrDPSfs7qEMYZ9YY86+I6ko8rZqBf3KMZnVrVfHDb5hE2aGn50JlhIwRUuHtWb8y8A4P3DVsg6PF9QPEzWnWFFoIaE35l3PE4rLcfiTQsBZpwQop5cBZ0UIy/X8QybBvgkVDHahMkA0ywj/LGEGtI7V0pyESXiyD29DTGjkjMjieKElBYpjARfK741l/XyOAUKlNnFyBTd/ocEywbRHJxpPH5dRMwg5ew79SmHLseIfC5uPSLscYU6SSJTpbdzsHU5+gcYxMAUql3C63K0SXFGoXNKJjTiu6JNSKIz2PcsvK8A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=monjalon.net smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=p+q+vrNiX6zn3xxx6pBtNu5+Q90OHYv6uY61JVIWMbM=; b=U3Y7ONmsbkOU0PxNTGoxNn11PcwB1ve0OxbJFIxvZk2DQteHpcKpTZuVrlcPqF5yNU4NNyAekv4lU8OM/CBdQjXhqigKoTbE9f3bkWLwUu7X9qQPCs0oWk2p9KOJNRHJyZMqdBebkjaQPPV3++O+miciAaJjqu0JQKETaMtmwGpX631y8g/smZPo5rTRA32kGIvfMRUSkzIDUftGA5SR8Jt/4C+J0JaeRuYujaXQ9Yexfwm2VNnhwKdSubIbCsPymXpvipsIR2SAFoZiBOxXEV21Lt4ZEzuFfUKq3ku6VSBst3OLMIDJGY4XAdiOATVoTIFMlhWhnYsKogQlinyh5Q== Received: from MW2PR16CA0061.namprd16.prod.outlook.com (2603:10b6:907:1::38) by SJ0PR12MB8089.namprd12.prod.outlook.com (2603:10b6:a03:4eb::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.33; Mon, 30 Jan 2023 04:54:00 +0000 Received: from CO1NAM11FT070.eop-nam11.prod.protection.outlook.com (2603:10b6:907:1:cafe::35) by MW2PR16CA0061.outlook.office365.com (2603:10b6:907:1::38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.36 via Frontend Transport; Mon, 30 Jan 2023 04:54:00 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by CO1NAM11FT070.mail.protection.outlook.com (10.13.175.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.17 via Frontend Transport; Mon, 30 Jan 2023 04:54:00 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Sun, 29 Jan 2023 20:53:46 -0800 Received: from nvidia.com (10.126.230.37) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Sun, 29 Jan 2023 20:53:44 -0800 From: Rongwei Liu To: , , , , Aman Singh , Yuying Zhang CC: , Subject: [PATCH v3 09/11] app/testpmd: raw encap with flex item support Date: Mon, 30 Jan 2023 06:53:00 +0200 Message-ID: <20230130045302.1560006-10-rongweil@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20230130045302.1560006-1-rongweil@nvidia.com> References: <3ba49f25-52d0-fe07-02e6-22a71e0fbe13@oktetlabs.ru> <20230130045302.1560006-1-rongweil@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.230.37] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1NAM11FT070:EE_|SJ0PR12MB8089:EE_ X-MS-Office365-Filtering-Correlation-Id: dc7ca2dd-4d61-48ae-81ec-08db027e008e X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +E8QyYxnos6Ge12FGSc0M97eEPWwepuucItbButR5BWxZLJLJkp6bJe1VilRF00rl4vTcP/A5K6kpIEfuzKEVi7ONwHi7HfCCOl1wGGzZ7+UXXkNC6gy60JtaVA/Vc0duEjpjZJzJyrPnqRo9nC3iV7Uh4NaozoXtxlDMu4ybk9gOv8CDMAdJLNx6sEWMv/SP/F5f/w0NAyo8OJZbvc3eNsso8omu/UwlKxLlmUXhXHRTn1YzO/yiMvFGueD1cuIOHFaCdd9uSpZVN/9GuA+tVkh0X59Hh9IE0xNfxtZm5NeRvAghDzQ3FflV+7PFixXwnG27qk9vX9Y8HceqzV8nKhE6w3G4X5X2NQDLGH9AIN5HOjY6nuTj66axHlTni4ECjjV4SVfLGqHyAjQNReEAJdafOHipFTR3HiKIgG6qzkW7ExVmuqZlPdwIGp/NAeKUbuPyXxWd0u9Q6mpozosBrY074lxxN+PdnMUGw8WoCLvKT4ZQ6dq/VUPjpH1Ycd79Zzg6CxQ+q9KgMNHDC6nllp4+TKZV/2XuqJDtP71hpC3ZanRylhamei3k2L9y2+DQ6Yzw/bv5UimGxDXppleR5V4XYFWMnsuaF4ONBErjmGOWaUyc7jP46nrjiuQ0TIW0tMs1fDilcL6RJBX/sQYgBA/SgIoSuatPzEHn2JZYviAQ4M/Hb6yEdU9vOP9rQRYLGjc08oaWk9T0B+zqQ9ofQ== X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230025)(4636009)(39860400002)(376002)(346002)(396003)(136003)(451199018)(40470700004)(36840700001)(46966006)(356005)(86362001)(82310400005)(36756003)(41300700001)(2906002)(54906003)(7696005)(110136005)(6666004)(478600001)(107886003)(2616005)(8936002)(55016003)(40480700001)(5660300002)(316002)(4326008)(70206006)(70586007)(8676002)(83380400001)(7636003)(82740400003)(26005)(36860700001)(6286002)(16526019)(186003)(1076003)(40460700003)(47076005)(426003)(336012); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jan 2023 04:54:00.0437 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: dc7ca2dd-4d61-48ae-81ec-08db027e008e X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT070.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR12MB8089 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 Application should retrieve raw_encap buffer from spec->pattern if it is flex item. Signed-off-by: Rongwei Liu Acked-by: Ori Kam --- app/test-pmd/cmdline_flow.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c index f5d7a67def..50c8ec5594 100644 --- a/app/test-pmd/cmdline_flow.c +++ b/app/test-pmd/cmdline_flow.c @@ -11193,6 +11193,7 @@ cmd_set_raw_parsed(const struct buffer *in) uint16_t proto = 0; uint16_t idx = in->port; /* We borrow port field as index */ int gtp_psc = -1; /* GTP PSC option index. */ + const void *src_spec; if (in->command == SET_SAMPLE_ACTIONS) return cmd_set_raw_parsed_sample(in); @@ -11216,6 +11217,7 @@ cmd_set_raw_parsed(const struct buffer *in) item = in->args.vc.pattern + i; if (item->spec == NULL) item->spec = flow_item_default_mask(item); + src_spec = item->spec; switch (item->type) { case RTE_FLOW_ITEM_TYPE_ETH: size = sizeof(struct rte_ether_hdr); @@ -11343,9 +11345,13 @@ cmd_set_raw_parsed(const struct buffer *in) size = sizeof(struct rte_flow_item_pfcp); break; case RTE_FLOW_ITEM_TYPE_FLEX: - size = item->spec ? - ((const struct rte_flow_item_flex *) - item->spec)->length : 0; + if (item->spec != NULL) { + size = ((const struct rte_flow_item_flex *)item->spec)->length; + src_spec = ((const struct rte_flow_item_flex *)item->spec)->pattern; + } else { + size = 0; + src_spec = NULL; + } break; case RTE_FLOW_ITEM_TYPE_GRE_OPTION: size = 0; @@ -11378,12 +11384,14 @@ cmd_set_raw_parsed(const struct buffer *in) fprintf(stderr, "Error - Not supported item\n"); goto error; } - *total_size += size; - rte_memcpy(data_tail - (*total_size), item->spec, size); - /* update some fields which cannot be set by cmdline */ - update_fields((data_tail - (*total_size)), item, - upper_layer); - upper_layer = proto; + if (size) { + *total_size += size; + rte_memcpy(data_tail - (*total_size), src_spec, size); + /* update some fields which cannot be set by cmdline */ + update_fields((data_tail - (*total_size)), item, + upper_layer); + upper_layer = proto; + } } if (verbose_level & 0x1) printf("total data size is %zu\n", (*total_size)); From patchwork Mon Jan 30 04:53:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rongwei Liu X-Patchwork-Id: 122649 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 9659C424B9; Mon, 30 Jan 2023 05:54:46 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B406A42FAA; Mon, 30 Jan 2023 05:54:09 +0100 (CET) Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1nam02on2044.outbound.protection.outlook.com [40.107.96.44]) by mails.dpdk.org (Postfix) with ESMTP id 1AB7D42D42 for ; Mon, 30 Jan 2023 05:54:06 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OKCJD4ODPHZGNySAIAiNvBzTeIPQYO7wnKJoOLMJGD5/JnqgAe88WkEkPNeg/y1ynyknOsynFLJhWlZLp6/9lOqUSlcjz09Y/kFe0uvm0YjIwjZepydT8Sr2h8pjXFURLNtDQXVjcn64TmcKhuzeDtELdVK/4aRQTLfENbrFcAHz8pU8AVbbGAIa1UvfPoJKd7BAb/1uv6nRl39ZbHcOB8tWOPTsfUd8AtFlL4Als0brI/tmmF5TUNDXMAwrL4CLVhBkFg/wXOVAveWsdey/D+dkxQsgzjZp3BvosDKgMog3j3G1XT61h1q9yvg9JZnWuQuco4xG7iocXAYJ9AI0fg== 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=FzP8xxqzhjd0uASvUPY2yNBvgch9BTwzMlOaCYfGnL0=; b=P9XT7Sh4ZufohHAyC9nPnL5Z4h0Wk/wevJz1hixI2KLRQJn7uvy8PoNXomNOlEFFApGmhHPebA/M9aVIfOZEMEeQ6bgGTm5kAgOD55zyHIpsuYdVRCAgATj+/kUguum49ibSbs80OaI4VO2O7D6cdX/MYOqHg+V9V53Px5rUPIOImBfwze6tyqUakGe6ECLPjpDiKXiMTc9Xh6sFxBy9Qy58z4zOGq61NHX4600mibOf15+B5Wz4JgxvhA0e1nILNyuzRnyvK6/TYZcz7FQX3DloFEcZmEGe5LMxqJTpDpcn5AuREEJFYxmy/igtc8S8OD4PAlRkaOr4ud1+gskaSA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=monjalon.net smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=FzP8xxqzhjd0uASvUPY2yNBvgch9BTwzMlOaCYfGnL0=; b=UPaSXfd+sRIrEQI6kR8mkRSh0r47Fg7UrhHccakmh54SIsp5vw0O3qqMkt6RXcnY1pkv0SflbhsmGrAhSmnxXAoQO0OfQRSWthGWQXywE76tydCtTaE2NfcQ3vsURTPdh/X8gpz4h1fcjcJ+qt3ZuLCw5aysImSPEcNYMT+WTP0fPmLyod7vd77I0EcRySvHoavfpwnvN75PegaioU1xKZv7P3iKlqhgqqAIIhZ+GYproJkCcm+Zj0Qvm8AFfImNdj4UZlm6cFkTCZ+nBsXKIFwBXpatZxN1eosA3kp4npSGZTBVtRsaSxA+pm2fKsUChJTKHaq/qtWOy5VZs1yGgg== Received: from MW2PR16CA0069.namprd16.prod.outlook.com (2603:10b6:907:1::46) by DS0PR12MB6485.namprd12.prod.outlook.com (2603:10b6:8:c6::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.36; Mon, 30 Jan 2023 04:54:02 +0000 Received: from CO1NAM11FT070.eop-nam11.prod.protection.outlook.com (2603:10b6:907:1:cafe::2d) by MW2PR16CA0069.outlook.office365.com (2603:10b6:907:1::46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.36 via Frontend Transport; Mon, 30 Jan 2023 04:54:02 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by CO1NAM11FT070.mail.protection.outlook.com (10.13.175.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.17 via Frontend Transport; Mon, 30 Jan 2023 04:54:02 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Sun, 29 Jan 2023 20:53:49 -0800 Received: from nvidia.com (10.126.230.37) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Sun, 29 Jan 2023 20:53:46 -0800 From: Rongwei Liu To: , , , CC: , Subject: [PATCH v3 10/11] doc/mlx5: update mlx5 doc Date: Mon, 30 Jan 2023 06:53:01 +0200 Message-ID: <20230130045302.1560006-11-rongweil@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20230130045302.1560006-1-rongweil@nvidia.com> References: <3ba49f25-52d0-fe07-02e6-22a71e0fbe13@oktetlabs.ru> <20230130045302.1560006-1-rongweil@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.230.37] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1NAM11FT070:EE_|DS0PR12MB6485:EE_ X-MS-Office365-Filtering-Correlation-Id: f43f8da0-8196-44af-57e2-08db027e01ef X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qoF+SIoWJw0L4/v4M7bUTATgwQrNoRzEm3NGS8LbrTDyXZnNTpUyuaRgFw5CDL03+EH4EiUCmKL59EWxG4CEbjBgwgHICnb1rq9hBhrISVmCnxJdYyBJmBasDq6KRCunJbqD/2s+JMyzSryuodmUcZyZPp5dyTgn9KMezsIpCzwi6Xq4wkGy+np4h+A3ZByesG0mn30eJq0TyLRkiW0/O6AXoIzdS102KeAQg+EouNiUE+C79AUwAFDUWU/JI/OdSWOcQKjB1Fyd0K5J0CofAj5yt+ARzKRhaA9FgXJqkuqv7CZbpK/uFKBd6vjH2DoJmy7+3DTuc8Ob7GZwnJywoGX+WhJZqFfkqINcOAY8ynZL1j2mezKXZbKqz/8STYYgbeXH+Lq6+j2JQ9mrJVLEEkOzwTEe6XENI0lbTVaMDW6A5WzptJ0pXn/ucYYKJPfPBLzw1mMVpisWW5XAlQEMROfjCkrpbdqxZvIBOxeAHmqAsvcuWL+tjh8PU7wH3t0Ri6cpjApxXLlEXkK1Be1M73XBLToEhb9xe04iHnRNR+qnQOfo9d8gI4zwJ2yXxABaALlqyfr1jnnSCWEPWcJ7HkJjE733RqEwSJvrbIj24lguXjJBv6h9j5AbP80pt76753knq2jmhj3+u5UGDiRvTWwkvFlYyMDquwsbj21BVErEZXWCCSmSKYfZkAY0VtwaRPzuBpegIKq9hQyQzmKJjw== X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230025)(4636009)(136003)(396003)(39860400002)(376002)(346002)(451199018)(46966006)(36840700001)(40470700004)(478600001)(7696005)(36860700001)(426003)(47076005)(83380400001)(356005)(86362001)(82740400003)(40480700001)(7636003)(55016003)(82310400005)(186003)(6286002)(16526019)(336012)(2616005)(36756003)(26005)(40460700003)(6666004)(107886003)(110136005)(54906003)(5660300002)(316002)(8936002)(70586007)(70206006)(4326008)(8676002)(41300700001)(2906002)(1076003)(4744005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jan 2023 04:54:02.3561 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f43f8da0-8196-44af-57e2-08db027e01ef X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT070.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB6485 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 flex item matching and modify field feature into mlx5 documents. Signed-off-by: Rongwei Liu Acked-by: Ori Kam --- doc/guides/nics/mlx5.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst index b23ca35b8f..a2634c378f 100644 --- a/doc/guides/nics/mlx5.rst +++ b/doc/guides/nics/mlx5.rst @@ -106,7 +106,7 @@ Features - Sub-Function representors. - Sub-Function. - Matching on represented port. - +- Modify flex item field. Limitations ----------- From patchwork Mon Jan 30 04:53:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rongwei Liu X-Patchwork-Id: 122650 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 E9C3C424B9; Mon, 30 Jan 2023 05:54:51 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0B28442F90; Mon, 30 Jan 2023 05:54:12 +0100 (CET) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2045.outbound.protection.outlook.com [40.107.223.45]) by mails.dpdk.org (Postfix) with ESMTP id A461242FA4 for ; Mon, 30 Jan 2023 05:54:09 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ETOmFCaJglstCvgAbJW/2tL1cW8UB7HjBFW3LZpJHbGOA7oi51gQ4hlTH9TO+e8Kmf6zoDLxIzI5ZTO/joNiQ/jrp5Gdqo3Mc/M/VTNRXXLIA8di6lcP5ouxLh3tCkFmg2y+SdnEjzpe0U/The5St7KL5mBcJ6VHPupzXEP6njyFi47ufccETDL66RLaUZzEBiYeMDEtftG6g2ZlfHts5dheZi56uKl3bp6FBxFtnBFvTf/pAs8dLwz4PDwaYNmAzgavkHQDrIhFCekiECq4baiC3reuBEEKPtgo3Uws0ccxIutQHF0D0cJ3enRpp7QE1+8QbJvcCoS+wUbss4w9sg== 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=ejuPtJkC/h+fkCcrXd80wrbv0nVl7fvZdPYYpPV29aY=; b=m5HbGxMjeV809xI3BSu6B9ABMaHiW2QlXyyep/mhSsB/HpX1s6ER+OYf/7GQDFXllwlnZLcymhymccZA1VA8be4cLDrNgC/+/M5gpMDG9gTeEwwlqSn+emC/XO/a/8177NFtIi8usbCuS8HNeFJT+OLRiXgRb8lh3qmkjM6DeGdmzSEZJRcHDsCOu7tO3kWMa49b7yXoHxj/diPGalrsuStYCU94mrfcuaUP2juJ7BJKR0jxeUlFHDSVME0Hh3Zl84JLvj8bIC8wuIlNqXd0hTHmHlqvVZ5NrgEP/0FRSOw4a4vihOo2YT/nx2LjBlciJMp7VyKDKxJkb/gHWD+c1A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=monjalon.net smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ejuPtJkC/h+fkCcrXd80wrbv0nVl7fvZdPYYpPV29aY=; b=AnLoU9yz+tizyiFJE+w4H2aXAxfn9OlMkpFx4j0PYp5tE3HQLnf81ehr7eQwv8C3VFcD7pBnKugE1ki/gVmBWyPSsHppIFUwXyES+fAjLkKQAPdu0LjaNnD00C0nqkpGQOgToFu4hbYzKZ09A1c66ACJkLSsQuv1PlIfofL1M0Gv6SElU+D0XnRNsOhezW5Kpe3xbGdeSCizW9mhG04pPuwzd3FMMDbBCjMh+e7smkrmwqp5bdRnWYzCozws4isU/DXL9Rm55iSGW8Adj39gNq1lCV7jeSumkAAPa1AneUOnzNRIrlvBv/Ri2K8M1iF8EMuYThNjaD4eG+RF29hdPA== Received: from MW4PR03CA0256.namprd03.prod.outlook.com (2603:10b6:303:b4::21) by SJ0PR12MB5504.namprd12.prod.outlook.com (2603:10b6:a03:3ad::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.36; Mon, 30 Jan 2023 04:54:08 +0000 Received: from CO1NAM11FT026.eop-nam11.prod.protection.outlook.com (2603:10b6:303:b4:cafe::ce) by MW4PR03CA0256.outlook.office365.com (2603:10b6:303:b4::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.36 via Frontend Transport; Mon, 30 Jan 2023 04:54:07 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by CO1NAM11FT026.mail.protection.outlook.com (10.13.175.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.22 via Frontend Transport; Mon, 30 Jan 2023 04:54:07 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Sun, 29 Jan 2023 20:53:51 -0800 Received: from nvidia.com (10.126.230.37) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Sun, 29 Jan 2023 20:53:49 -0800 From: Rongwei Liu To: , , , , Aman Singh , Yuying Zhang CC: , Subject: [PATCH v3 11/11] app/testpmd: adjust cleanup sequence when quitting Date: Mon, 30 Jan 2023 06:53:02 +0200 Message-ID: <20230130045302.1560006-12-rongweil@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20230130045302.1560006-1-rongweil@nvidia.com> References: <3ba49f25-52d0-fe07-02e6-22a71e0fbe13@oktetlabs.ru> <20230130045302.1560006-1-rongweil@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.230.37] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1NAM11FT026:EE_|SJ0PR12MB5504:EE_ X-MS-Office365-Filtering-Correlation-Id: bb5c1aa9-cc12-4309-54ac-08db027e0510 X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: J37FTpEtgspJawplAJV5u35mAppSCIdu21+i95nDqx4RSZlAM+oXMFrg9lBQ2NA6SwHk4MpwS6nKe1gx5cLOVC4xMFGD5BfMBMxO2KI3txAuc32EgZ2bnHrC+u9nwQaXrPTVbgaK9BLQV0fsCJNPPwQC35rPDWgoeD6LKNq/IoZu9oQIgfKRpEGpHqhi1/8E38s1nUjamGZVBoAo1F+gO7J7dLH02+0UTGVu+p13U9U06XMk67RJvfEfrfasCjco+iQvj2rjFfN13hfSS6TFxKUOLI220co9+0/Y+Veu2LQKGRwmpRRX+4LeZXZ7jLGm9q52qKj4NvmJjKtf1q7A9ybgggLOxcTCvrZcU6X1mI/Hi6s1gCh2zQDM3u3dNt7rdx12epSjyviqP6BXsGzMadItjoMFcF71YEYFqyGdK3MF6W5poiTaoAbdKlbSwLLAX4E0p4WQN3aBXNK3uMV6hMxMiMagEZ5xDRiwjmMvRvCVAevdYcij7ZxQ59nPq2mhg93XfExL+c2xVhspQ39Q8HPAoVKXc9Vh7ruAIAxI4FxKN4fpQH3TP7sOw+W0M7s5Ai2QX9YVueJKYr8m22dU2UY9WfR0yPdXLydTZr+YaiVFQX08mP/exa7HWjsvf3JgYD8BbV1Khldtes12jfFfaEImk9jzErZ0CCt6gYPw3EHxBnY2QPoRo9GlcnA7/LWKMHTOev0PFDmvLnvWNX0KDg== X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230025)(4636009)(136003)(39860400002)(376002)(396003)(346002)(451199018)(40470700004)(46966006)(36840700001)(36756003)(54906003)(110136005)(316002)(70586007)(4326008)(8676002)(70206006)(8936002)(41300700001)(5660300002)(36860700001)(86362001)(356005)(82740400003)(7636003)(107886003)(6666004)(1076003)(186003)(26005)(16526019)(6286002)(4744005)(336012)(55016003)(82310400005)(2906002)(40460700003)(40480700001)(47076005)(478600001)(7696005)(83380400001)(426003)(2616005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jan 2023 04:54:07.5585 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: bb5c1aa9-cc12-4309-54ac-08db027e0510 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT026.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR12MB5504 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 If flex item is referenced in async flow either by pattern template or action template, currently testpmd complains "flex item has flow references". Flex items should be flushed after async flow resources cleanup. Signed-off-by: Rongwei Liu Acked-by: Ori Kam --- app/test-pmd/testpmd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c index 134d79a555..e35f7a0e7a 100644 --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c @@ -3298,10 +3298,10 @@ flush_port_owned_resources(portid_t pi) { mcast_addr_pool_destroy(pi); port_flow_flush(pi); - port_flex_item_flush(pi); port_flow_template_table_flush(pi); port_flow_pattern_template_flush(pi); port_flow_actions_template_flush(pi); + port_flex_item_flush(pi); port_action_handle_flush(pi); }