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 02C7DA0C45 for ; Tue, 26 Oct 2021 23:21:58 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E7E82410F1; Tue, 26 Oct 2021 23:21:57 +0200 (CEST) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2042.outbound.protection.outlook.com [40.107.244.42]) by mails.dpdk.org (Postfix) with ESMTP id EED9A407FF; Tue, 26 Oct 2021 23:21:54 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KYY4Xsutyjpzenk27MjHhyYzfoUrJ0OGGrGJ80Md8on7WIl8AoL1aEJooRA6OdIlQcBaGrQjZu8BeqWpNuK6b7CNTmapjY4oIIKWbp0MfPFoB5pIIvx9JbteOijGoj7pIr4lMQMINSOs2Z1s+O+PEjG5qZ+bp2MUfnUDR9pJf927MKKqGK2zvu6GDhwkz3+8Qcf4O62/jlraR+6ihndLusQLImC/3jBraV20Q7yXgD98cBnhX4oDwK2modTkkvFJj+bW+AirVonNq3/fB9ZoTdgnFsFgX4FhAWBFbrWXBZOZ8HYAqlttIfnc+jSdxXOuR8xIR/GCRF5/siDPAV+Now== 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=3vQymDygwPcOiAlithYfZUtBwdeWMlQ2nbp1l6cMFNw=; b=T26yCLiZqGbLVgaJfLYxU46WPBd5WHT3PzUqiLv1lnvMd7OWX8fRMnSvpMCNRajIcIm822awpwJH0TOSLsNQutXX2jhAnszNnMLzXHpRMsaXjFM01ABS3SIyU2XWKgIuivZ+CXymZLbaVrZ1fN94RzVRWNeZYmYI9rgovqlPHvC1ICpIzO35vd1z65hCDbi8N/dE8OJL4hZnjcsiRMXj7qu49mljelGkIVwfPVTCqNPxQbn7sqqb5wzefkLdC5l6YjXnBhHDgG22iyrbREgJpwwDsLoHj4GvGcEpTFejZiY1v1RUf+AwncY5Wdz50wbKPTjgYWO6va9KYGv1iJCVjA== 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=3vQymDygwPcOiAlithYfZUtBwdeWMlQ2nbp1l6cMFNw=; b=EbLsYXCNQ68zdPOMV7+P8R6Him9Vd4DY8n/xzaUmmLF1o7d6JH+i6SEFJr7phTRMW+8+XV3KLmAqhg4NQz5UZ+Zq47YB9os2V/stNXfrU68bo2NAWiXM7sQnVOSuY27Ze9FtZGU4W+uXwi0qxNH4/QeASEA2orNSu7cy9v3BzuGu0UHXm+lOztgW06L+HJjsoP7ZzoLWwacH9+E6eEHBUvDPmln0VOxygwm4Gqc1YZ+5Mq8QHl4pyZ6CkHenoFkUFH3Ne8VAwdVtxFpFfK1p+Ef8AAiOtPeBhSWNQD8pL9K1GW39ZBFNqARPXyfsz587k0B5Lf0bphyM61h3DRKvtw== Received: from BN0PR08CA0015.namprd08.prod.outlook.com (2603:10b6:408:142::31) by MN2PR12MB4606.namprd12.prod.outlook.com (2603:10b6:208:3f::10) 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 21:21:52 +0000 Received: from BN8NAM11FT032.eop-nam11.prod.protection.outlook.com (2603:10b6:408:142:cafe::a3) by BN0PR08CA0015.outlook.office365.com (2603:10b6:408:142::31) 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 21:21:52 +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 BN8NAM11FT032.mail.protection.outlook.com (10.13.177.88) 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 21:21:52 +0000 Received: from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Tue, 26 Oct 2021 21:21:43 +0000 From: Alexander Kozyrev To: CC: , , , Date: Wed, 27 Oct 2021 00:21:20 +0300 Message-ID: <20211026212120.1428868-1-akozyrev@nvidia.com> X-Mailer: git-send-email 2.18.2 In-Reply-To: <20211026151013.1349796-1-akozyrev@nvidia.com> References: <20211026151013.1349796-1-akozyrev@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL105.nvidia.com (172.20.187.12) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 20d8e28a-68a1-4a96-35df-08d998c6a14c X-MS-TrafficTypeDiagnostic: MN2PR12MB4606: 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: L0uVNvxdOd1ivj4nzhZ7t2dJtCPhdGYRSD/o1Jy4HNuAJaBJGIaqQIn7BvfZrTHKbONAD80BOxSCydbhIHqFtW3pAKnxOoOrAa+mIQTzQjNXt9KgwM+WYyGzDWh+Pnh4B3dG7DY+/Ea54G1DdHRdUZ3GnvTwYX++y4dprqUYEeyogbSiXn/XY23CqwMPOKKXVzOBfPycVj8Q98z40Rk2WKh357dEbdQyJdBKRQMrf+kOV94Plw9PzOS4RD6eCaOSwKaiGZcmriyjEzQqjPbQe+KSDPgw/COFcrDRufVI68icPTSHAxwsRnunALlv3p5IEbAkz80TAnKLTkAV2jCRooM4IpK4HIG6yQshues2PF0H/qsaoZTnsxz0E2FE9X8wQPbOcz7Xt68qAS6e7EAMkO8ru97g6BKECecdF1HiqqK0O/LZNywrXjxUazs3q56sEX9C6kCjGNQRi/y+F6Gz+Gl7wp29zEDerCma6kWg9EF7a/d+hQ0rRj7+RU0MHwqjDQAnYPHzni8itOE50m9P2uh9stP8t9lgDVpBSe7qeiqS58C2VJZ6FifWpMXFKV98/ARIJD1Kx13pZN77e4hoyVCa+Ibsg+B3x0DoC/Jb6m9nTzwkrZODboMOK2zxRr5SSQJijYdL6+pSaEXLyzXIRGyf/T6Exot5ny31v56uMb6zOwMvNUwgiDO72lh6c634tR047MbiyJbRyLmYlxDF+Q== 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)(1076003)(70586007)(6666004)(6916009)(82310400003)(336012)(36860700001)(16526019)(70206006)(26005)(7636003)(8936002)(5660300002)(2906002)(356005)(4326008)(186003)(47076005)(83380400001)(2616005)(55016002)(86362001)(107886003)(426003)(450100002)(8676002)(6286002)(36756003)(36906005)(508600001)(7696005)(316002)(54906003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Oct 2021 21:21:52.1651 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 20d8e28a-68a1-4a96-35df-08d998c6a14c 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: BN8NAM11FT032.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4606 Subject: [dpdk-stable] [PATCH v2] 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 --- v2: fixed compilation issue 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