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 81583A0A0E for ; Mon, 10 May 2021 18:04:12 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7701E4003E; Mon, 10 May 2021 18:04:12 +0200 (CEST) Received: from NAM02-DM3-obe.outbound.protection.outlook.com (mail-dm3nam07on2053.outbound.protection.outlook.com [40.107.95.53]) by mails.dpdk.org (Postfix) with ESMTP id 0FACD410FE for ; Mon, 10 May 2021 18:04:11 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=I5cWyjp/opd8/LQadtmjUmgqxXDwiIUCMWV5L92uayqSHpAY17v52rqI9dD1ifYyHtrl3oXfrd8lH3hIbnd5B5gCltweKJB3d/PZkr+ue4X4Vpw2sQo7uAdSVLsbxw4CNf/FXo7PJrbHO36kQxklueSTiBwAQ6pDzSnTo0B0AmT3Y36riIkbshpkhJOGo8WmuWqWi48DWj9CJrTTRdO3lacgDnh/cEn/Spx4gY1B+wa7JUayg5FfDrXd1aj0OT13XCqxukBjr1NZMuNL9Z3Znsl/2k8cGyfhBsL70ZSliclsBCDQs8PqXisJ3OUq2dzmOCuQjtIo9+KNVQnh364GPw== 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-SenderADCheck; bh=fzHyEqqxwCZh4AdR4DWEgCVnMdJLLddzVvIYceaXOUs=; b=B2Qdw+NxYnV2Ug4KovheeyuHpNvEzQrcORGEuO6XyErSriR54VPAarbegK11gNuHdPjEGskN5pQVqpOCfsqMvwfoD8ivJM0GLek8c+GIvqQ3SPGCivV4Uyrg06a2d7ay8OGDzsLC3GRm4qVlGB6cM0P/y+tbhMqO3/r04QP4ygJMfT3W7Bz8/XD0BIvkmbQzdEjDW18B7gJLWWLVwtaPKhQmOF5IFNyteK5Ied/1UVbIY+RogmWaKCgIK4eIGIoQUVav/ywysWDvTXboCXbacRLVaaTLZuR4CRoKOUk2HYE2yzIOcvOdeOuJ1ewy/TG+OpAZWBpdHIZUA/QTYP4yrw== 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=none sp=none 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=fzHyEqqxwCZh4AdR4DWEgCVnMdJLLddzVvIYceaXOUs=; b=DUlhKIN6tfk7gNxr8jTxnCjCz0wPDj81D0qoA/og0wlLBw6JUWJ9d8tUopxD0mAiFu0nte22FhQJZAAkmD9k/N0l8KK9gN9MLyySP44FCwm8/i5z37nIdvTah1p0MFvnoHCTce15/K3HbN8kf7gr+47XZiDkrxOnneG5wREzTsEbX7M8dt3KjIqMMhHJEujyJVLJYT9VtGC2ajdKrFxEuxjk+sIFk1HOtpjPo+RpSgk3oxpPFaWDfHAizlQKpP35guT3Wi2FdnqCt5Kc4W590DGLRyz6pZM84Hy9UHp66rSRsYYEv++J8FUrsP0tEmVhT+znhRUEgqwAVjFDl1rj+Q== Received: from BN6PR1701CA0013.namprd17.prod.outlook.com (2603:10b6:405:15::23) by BN6PR12MB1363.namprd12.prod.outlook.com (2603:10b6:404:1f::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.26; Mon, 10 May 2021 16:04:08 +0000 Received: from BN8NAM11FT014.eop-nam11.prod.protection.outlook.com (2603:10b6:405:15:cafe::7e) by BN6PR1701CA0013.outlook.office365.com (2603:10b6:405:15::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Mon, 10 May 2021 16:04:08 +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 BN8NAM11FT014.mail.protection.outlook.com (10.13.177.142) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4108.25 via Frontend Transport; Mon, 10 May 2021 16:04:08 +0000 Received: from nvidia.com (172.20.145.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 10 May 2021 16:04:06 +0000 From: Xueming Li To: Viacheslav Ovsiienko CC: Luca Boccassi , dpdk stable Date: Mon, 10 May 2021 23:59:19 +0800 Message-ID: <20210510160258.30982-10-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210510160258.30982-1-xuemingl@nvidia.com> References: <20210510160258.30982-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.145.6] X-ClientProxiedBy: HQMAIL111.nvidia.com (172.20.187.18) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3ed91d71-4c2b-4a8c-84a0-08d913cd3e29 X-MS-TrafficTypeDiagnostic: BN6PR12MB1363: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: EGNeJgGUX07IUfofQACLeJrSEMf5e6FaOPICWkwBOshV4CUSDi87laQVqYImICztZlt1iSswEJpCSM63LlxlFAelNwpck+YWcfdtbQqUibZL4XG3PwXYDfxnbnqpiKmwtuQh22pvMdv7u/WwWMnEpUsew7caR9ZiHMaTZ+qN7F1t08L+cZ6UQWCqhMcuTS9HP+e7TR5f8UlK/PWAjWHN8msZl6/idprySTObKgeG6MFOguxFftm1/NVWSv4rp+LbxrlTpCEOBCxJbNH4l55Sg91ESzKEQcOidSnCXWWpzh/4cMHNc9aQAbkooNZzV2v1UY0g++gmqGbADgEGw8KZ5tzW5eyXVWR9DMtFU5KHvpWEmAr2c/UB3t0E8IQV6dL8VknukFeqwzp0HqVmmpK8U6UZcrPhjmjy1Xz9Rzqt2n2uEJe1+OULJ9EnDlfPqXJUYrWbbyCDyGtDHzj3bIcqtXSld0Tt50+mJixd3XkTbSX38tZr1rrDQdckONXew9aQAPq/VHYgZoAr8CZYTgcWUXaW7UOKrx9HSm8IZX2y3dUbQH8ALHL1KhlygylvKhOEI4mP3JmVicY4vaVwnvJgRe4Ded1fK3Qkwq1SdG9rMYNWNWARaek6nsQtL7OJs+XwlKViuJ2Kim+QNad5zj00YHbnNWkyYLaq8fPTeHtrHCkZ9wLrKXv9Szy1EqDvfKJhlMjHO6nAK/5vCGq8bALcBcMlIhhDT08ls/TZ3rx5czm/3i74vrKD+Kgzy+nXDfpY+2e03G8LRKL6KSgnXxBP/w== 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)(376002)(39860400002)(396003)(136003)(346002)(36840700001)(46966006)(26005)(966005)(4326008)(356005)(7636003)(16526019)(82740400003)(6636002)(6666004)(36860700001)(336012)(83380400001)(6862004)(70206006)(53546011)(426003)(70586007)(1076003)(186003)(2616005)(2906002)(8676002)(82310400003)(7696005)(478600001)(8936002)(6286002)(55016002)(54906003)(47076005)(37006003)(5660300002)(36906005)(86362001)(316002)(36756003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2021 16:04:08.0008 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3ed91d71-4c2b-4a8c-84a0-08d913cd3e29 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: BN8NAM11FT014.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR12MB1363 Subject: [dpdk-stable] patch 'net/mlx5: fix metadata item validation for ingress flows' has been queued to stable release 20.11.2 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" Hi, FYI, your patch has been queued to stable release 20.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/12/21. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/58200ed66af5bfec99190f6e9eba6ffa4031c733 Thanks. Xueming Li --- >From 58200ed66af5bfec99190f6e9eba6ffa4031c733 Mon Sep 17 00:00:00 2001 From: Viacheslav Ovsiienko Date: Wed, 10 Feb 2021 11:30:51 +0200 Subject: [PATCH] net/mlx5: fix metadata item validation for ingress flows Cc: Luca Boccassi [ upstream commit aa1c17f1d8202a1a6e64e813103cdbe6b357b0ba ] In legacy metadata mode the metadata register B is engaged to handle the metadata item. In the ingress domain the hardware supports the register setting only, the match on register B is not supported. Due to this limitation only the SET_META action can be supported for the ingress flows, the META item should be rejected on flow validation. Fixes: 5f3541724e08 ("net/mlx5: fix flow META item validation") Signed-off-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_flow_dv.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 3fdc3ffe16..353a8df24c 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -1450,13 +1450,20 @@ flow_dv_validate_item_meta(struct rte_eth_dev *dev __rte_unused, "isn't supported"); if (reg != REG_A) nic_mask.data = priv->sh->dv_meta_mask; - } else if (attr->transfer) { - return rte_flow_error_set(error, ENOTSUP, + } else { + if (attr->transfer) + return rte_flow_error_set(error, ENOTSUP, RTE_FLOW_ERROR_TYPE_ITEM, item, "extended metadata feature " "should be enabled when " "meta item is requested " "with e-switch mode "); + if (attr->ingress) + return rte_flow_error_set(error, ENOTSUP, + RTE_FLOW_ERROR_TYPE_ITEM, item, + "match on metadata for ingress " + "is not supported in legacy " + "metadata mode"); } if (!mask) mask = &rte_flow_item_meta_mask; -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-10 23:59:26.985944800 +0800 +++ 0011-net-mlx5-fix-metadata-item-validation-for-ingress-fl.patch 2021-05-10 23:59:26.320000000 +0800 @@ -1 +1 @@ -From aa1c17f1d8202a1a6e64e813103cdbe6b357b0ba Mon Sep 17 00:00:00 2001 +From 58200ed66af5bfec99190f6e9eba6ffa4031c733 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit aa1c17f1d8202a1a6e64e813103cdbe6b357b0ba ] @@ -16 +18,0 @@ -Cc: stable@dpdk.org @@ -24 +26 @@ -index a44291a3c9..1a74d5ac2b 100644 +index 3fdc3ffe16..353a8df24c 100644 @@ -27 +29 @@ -@@ -1960,13 +1960,20 @@ flow_dv_validate_item_meta(struct rte_eth_dev *dev __rte_unused, +@@ -1450,13 +1450,20 @@ flow_dv_validate_item_meta(struct rte_eth_dev *dev __rte_unused,