From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 76610A0C47 for ; Tue, 26 Oct 2021 17:10:49 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6ABBA4111E; Tue, 26 Oct 2021 17:10:49 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2060.outbound.protection.outlook.com [40.107.93.60]) by mails.dpdk.org (Postfix) with ESMTP id 4F139410D5; Tue, 26 Oct 2021 17:10:47 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iYDAPP8taWmwPjybf44ByRF2mKYVwQkYwD0NrrxEzjq7w+dwYKvXTq4B9GXtnGgYfxtcXk9/eUiTVq95d5NuxnaeF9oe0LmM4GUh9jfHjb3H7He/VDQdGgS0YKFgIPX8lfuh8unHW0U/3GTsSTLXO2Qp+grMkjH0QapEcz94sCHUq4Rs7++XMqQfKaaqY2/MzwD3tvPnytXlp3/7Bjtycf7e4XzhJ5oU3ROsly35TUOhh2lzIpJ32o744nQDNHuJ78ICdpTgubhTHKkZMbaf89ChLfRn4jVQjbluKAc1JpATnS5kC3ZZt9Sg9bYm0Vslj3lDHjk7vASBznOTl+Gobg== 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=MjxHNHy3yl7jpv5vLoxeQASu9CrOyxR2OXfE6viqbvQ=; b=algbwFb230aFujPNj505lvQUX17kdHn7/bFBQ8J9NDDQNL6Jbbq1H76ZgntXswZ03AR90WB6Ukjknl8ZQk1WHCPpUxlMTtj1dFAkC5wt7HCVBLCXT+sApD68vUZCP6tSrTy5No0nrQJkSrsytOMpzS2lEHgGbIuwXO7e1eBr7zGFbmz3tKMCMGK+SISI6+sOZrVnvrojTkXXLVkUjDTcl2SIl759mVF1IYLaM6djEqmqdWKF0bdZx1n/4AAhO7B0peiFs/oxwR0q+yATonrX09Rl/p1rAAZeKGbjzsIiXtsmFj09qpY3mhyIYigzVr2gWgtIDVecIqUa4jsAtRv7bw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=quarantine 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=MjxHNHy3yl7jpv5vLoxeQASu9CrOyxR2OXfE6viqbvQ=; b=J+vHHO0kgjG63VcNYj0JlNVdGZ9CRyBgt2aFydQ+zPSM95dn1IoPUaKOz5Rayj4TLc1fQ8qRomr2j2R/24GTFLyZNkU5enFbJhwdNkxSILxy1QpdeIojxA3oJ6tmQipKTGN2xH0nAQI9zQZhz0FvoQp0Cz/3b0gfJB1sqmp9XaZu1PtlaFIq0mKB8dYOJAnOL+PnFb82aOK1H/1c1sTe2Bj/L+GeLmHqdTsotDR/eK+sKsR0bBAD7ODmY9Ytt7yDFxvKz18T4R0CsMD6eAzzDxJTuTSvBqRitWjaypwgJTL2zG6vjjQYiB0sO0vZyD5se/hcSEey7nhU2x8VdexEug== Received: from MW4PR03CA0124.namprd03.prod.outlook.com (2603:10b6:303:8c::9) by DM5PR12MB1675.namprd12.prod.outlook.com (2603:10b6:4:5::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4628.18; Tue, 26 Oct 2021 15:10:45 +0000 Received: from CO1NAM11FT054.eop-nam11.prod.protection.outlook.com (2603:10b6:303:8c:cafe::77) by MW4PR03CA0124.outlook.office365.com (2603:10b6:303:8c::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4649.14 via Frontend Transport; Tue, 26 Oct 2021 15:10:45 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; dpdk.org; dkim=none (message not signed) header.d=none;dpdk.org; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by CO1NAM11FT054.mail.protection.outlook.com (10.13.174.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4628.16 via Frontend Transport; Tue, 26 Oct 2021 15:10:45 +0000 Received: from nvidia.com (172.20.187.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Tue, 26 Oct 2021 15:10:36 +0000 From: Alexander Kozyrev To: CC: , , , Date: Tue, 26 Oct 2021 18:10:13 +0300 Message-ID: <20211026151013.1349796-1-akozyrev@nvidia.com> X-Mailer: git-send-email 2.18.2 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [172.20.187.5] X-ClientProxiedBy: HQMAIL107.nvidia.com (172.20.187.13) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7c1c6065-3bd5-436f-6916-08d99892c8f7 X-MS-TrafficTypeDiagnostic: DM5PR12MB1675: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: quS31srd/zqZL1yAo3dh6UfXVfRo6nooJVL5IetTNlsZ3KqInK5IhBcCqHJZBUg8xQdMZFpGCiNugsu3WXWguqywNYDSvyW6BRBQf61oHXNhH791UMuSlpNO7EV03JY5EnrSwxZQk8P2GmhsWM8t9JvQjzJSAtP8z1Z9ObbjITUc0E0HR5sa0baokkZ+VUbEqGSFzTsv2lmo7slqZy18Oq9iwPWIW8DKyJFcDRkDElaFhi2TkeYzMLfr6jytLiS4gmVBiy3Kz/r0GNxzct53hT/iX4qXVMP8HpBBjHJpC4hxec/eu5VpJrF8y97ORZLSF36UbHkXHVqKO1Dh96I3PE4yisVeM8JOB4iMVuoCj5ZMT4I8g5GycathSJ49XrbJOUA+VBbZPsIN1fxz4nEdKLwZvt2IJw89WzMRzzvcRQv4thmB1/jclmlvSSNprsQnauJZqSymiHn5URfJ6IlqxmhWfYTKCrVFllP3NacLYVQTJ4N1obXPFPg2RW6AmU17sxC19c+AbFOOBtJs7dpT4BaLCe/WLn21MdOgK0UJT/Q79q3yw6khJnJ4e9JTzqpne/Xrwi/Ekqfgh4IKFju/pQ7zpmeptH1MUZKqXe7uQ7WgUGcCpOUclSTn8RAq6+4VvUEwanoiRn4wE81ECYYVPMrbRPx4zfqePhUQJ/8c21XT24/fILyfwseFgGbyY1oQEmt+0/4nl8G3Yr6LsDT9rQ== X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(46966006)(36840700001)(36860700001)(5660300002)(54906003)(83380400001)(107886003)(2906002)(6286002)(1076003)(508600001)(450100002)(26005)(316002)(7636003)(8676002)(426003)(6916009)(36756003)(55016002)(356005)(47076005)(6666004)(82310400003)(70586007)(16526019)(8936002)(186003)(336012)(70206006)(2616005)(36906005)(4326008)(86362001)(7696005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Oct 2021 15:10:45.2741 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7c1c6065-3bd5-436f-6916-08d99892c8f7 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT054.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB1675 Subject: [dpdk-stable] [PATCH] net/mlx5: allow meta modifications in legacy mode X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" The MODIFY_FIELD RTE action rejects copy to/from metadata in case of the legacy mode extensive flow metadata support. It is not consistent with SET_META action that has no such restriction imposed. Registers A or B are used for META in legacy mode. Allow meta modifications in legacy mode as well. On other hand, SET_META rejects actions in case register C is not available even though it is not needed in legacy mode. Skip this check for legacy mode and allow setting META. Fixes: edf325d421 ("net/mlx5: check extended metadata for meta modification") Cc: stable@dpdk.org Signed-off-by: Alexander Kozyrev Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_flow_dv.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 9cba22ca2d..2c5cbec71b 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -3199,7 +3199,8 @@ flow_dv_validate_action_set_meta(struct rte_eth_dev *dev, uint32_t nic_mask = UINT32_MAX; int reg; - if (!mlx5_flow_ext_mreg_supported(dev)) + if (config->dv_xmeta_en != MLX5_XMETA_MODE_LEGACY && + !mlx5_flow_ext_mreg_supported(dev)) return rte_flow_error_set(error, ENOTSUP, RTE_FLOW_ERROR_TYPE_ACTION, action, "extended metadata register" @@ -4929,15 +4930,27 @@ flow_dv_validate_action_modify_field(struct rte_eth_dev *dev, "modifications of the GENEVE Network" " Identifier is not supported"); if (action_modify_field->dst.field == RTE_FLOW_FIELD_MARK || - action_modify_field->src.field == RTE_FLOW_FIELD_MARK || - action_modify_field->dst.field == RTE_FLOW_FIELD_META || - action_modify_field->src.field == RTE_FLOW_FIELD_META) { + action_modify_field->src.field == RTE_FLOW_FIELD_MARK) if (config->dv_xmeta_en == MLX5_XMETA_MODE_LEGACY || !mlx5_flow_ext_mreg_supported(dev)) return rte_flow_error_set(error, ENOTSUP, RTE_FLOW_ERROR_TYPE_ACTION, action, - "cannot modify mark or metadata without" - " extended metadata register support"); + "cannot modify mark in legacy mode" + " or without extensive registers"); + if (action_modify_field->dst.field == RTE_FLOW_FIELD_META || + action_modify_field->src.field == RTE_FLOW_FIELD_META) { + if (config->dv_xmeta_en != MLX5_XMETA_MODE_LEGACY && + !mlx5_flow_ext_mreg_supported(dev)) + return rte_flow_error_set(error, ENOTSUP, + RTE_FLOW_ERROR_TYPE_ACTION, action, + "cannot modify meta without" + " extensive registers support"); + ret = flow_dv_get_metadata_reg(dev, attr, error); + if (ret < 0 || ret == REG_NON) + return rte_flow_error_set(error, ENOTSUP, + RTE_FLOW_ERROR_TYPE_ACTION, action, + "cannot modify meta without" + " extensive registers available"); } if (action_modify_field->operation != RTE_FLOW_MODIFY_SET) return rte_flow_error_set(error, ENOTSUP, -- 2.18.2