From patchwork Fri Dec 9 13:59:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiawei Wang X-Patchwork-Id: 120720 X-Patchwork-Delegate: rasland@nvidia.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 32EBFA00C2; Fri, 9 Dec 2022 14:59:39 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CA1B4410FB; Fri, 9 Dec 2022 14:59:38 +0100 (CET) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2046.outbound.protection.outlook.com [40.107.93.46]) by mails.dpdk.org (Postfix) with ESMTP id F09EC410D7; Fri, 9 Dec 2022 14:59:36 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XVWXHLLWvCZ87ZX6ImjPGdK1HRHtmxZOBqZdEw4zqG50Jf66O2cDDk3MVCF2B7EKyuijRNIomR45KFXAUHTvUw8OwrbggdyhqRaF4dJpijFqm2Uqyht1DLmbKZeBbdrc4R7fULePhnBW1M3nH3xpnMUeqYPIEOLoqrjEcik52TuEuGAjDnD2ibj91rmjDRC7OLY+gelMet1D9ONd7gx1KlVfiKd9uU6BWiqhqHFX8uHRKIYaRs4J05iumNnupk3HkG/U2T+m7k+fruH4tn/uXHtVwAw2ddvGNSsyCsdPkkOj2spfYSz0j1XTMdFEAd0VSGNfvkARecCb+JVa4a9EyQ== 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=GQBFsRbVWj8tKiWivk4YeP3KAwKIOmlGu0zaygs1hW4=; b=XWnpW5zjYIUCydUb58oakLbbfZsQKOKD8XPkgUGOAlErNWcziw1kaY2BawILuYKaijHhEdxJWOU6JTHDQJQiU/ypWCazFZY8AeU4XOrqgH9LoeFK7lBJzpl92eNSJUdbC9zUhV5woRsfi31J5IFeSUl3hkNtKHyvsE+cXxTVisnHP2WSiaDnlV6TO8Ru9u45NFpnZItOCA9nAodr+iHOeiOUzeWptA3C+UShkN+YHzSa8CtEyrDNiqGti/gNbJC4xfMXUA8lTWgz2e3dOG+pIgpHcOWXIlBzVIlvLM2orOGHUqzTrj5mHASPvxxHUk9V6TA1Tp7cmwoVWQDEx2J/GA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=dpdk.org 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=GQBFsRbVWj8tKiWivk4YeP3KAwKIOmlGu0zaygs1hW4=; b=jtfsJxKpb9xOMH0t06jwh34oY3/17oMK40hWCvZPDsp3hYQNDPMtOEjttgkeyK5Mrl1lI7kWq7sZMnNSHolrnL0prxaDa1w4TtYcKSzPFevL8AnGQIOG37Wmi29P/GtlHrZQsQEvXJLdO5bAjI5zPEzRZuMH0O7KYzDgcfnLt8ntBTFsUCMCqk3OzgBlNsaGBvl4nun8VmHWqRh0LUX+r0DWvylk2S/OU0V/wREfptP2OB6vz18FLs8ywQCt43U8cHWeHwMOnUpT994itDmf1tRh8JWq4eg3HO/g+7r4rzzA4LMWf9TbdcEK3TbPcw22A7VSqaqA26AWezu6UK08yg== Received: from DM6PR07CA0080.namprd07.prod.outlook.com (2603:10b6:5:337::13) by PH7PR12MB6564.namprd12.prod.outlook.com (2603:10b6:510:210::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5880.18; Fri, 9 Dec 2022 13:59:35 +0000 Received: from DM6NAM11FT071.eop-nam11.prod.protection.outlook.com (2603:10b6:5:337:cafe::27) by DM6PR07CA0080.outlook.office365.com (2603:10b6:5:337::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5880.18 via Frontend Transport; Fri, 9 Dec 2022 13:59:35 +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 DM6NAM11FT071.mail.protection.outlook.com (10.13.173.48) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5901.17 via Frontend Transport; Fri, 9 Dec 2022 13:59:34 +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; Fri, 9 Dec 2022 05:59:28 -0800 Received: from nvidia.com (10.126.231.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; Fri, 9 Dec 2022 05:59:26 -0800 From: Jiawei Wang To: , , Shahaf Shuler CC: , , Jiawei Wang , Subject: [PATCH] net/mlx5: fix assert on getting register of sample flow Date: Fri, 9 Dec 2022 15:59:07 +0200 Message-ID: <20221209135907.48619-1-jiaweiw@nvidia.com> X-Mailer: git-send-email 2.18.1 MIME-Version: 1.0 X-Originating-IP: [10.126.231.37] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6NAM11FT071:EE_|PH7PR12MB6564:EE_ X-MS-Office365-Filtering-Correlation-Id: e98a8c55-c2db-4511-89fc-08dad9ed9a87 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3vDfE/BxgBj4wiNWd4ga3XrNNzRBqNfrNVj7CKv19aELu7k6fAG9bDCPalHuR7IeQFU1ctXqM4yLXOM6AYT+YoaIWxWpnTkohQx6RZRsQ2+zr/tWwQByV3KMKmYSd0Vou4tycTFMFbyn+I2A7sHoIwQC6vJj17dhaea2FgYah2RIwV2YKE1XNNvjDj9foRhkseMzFtdy4RIwNX7XAdJ1EuB4gXsJ6Vj1LbfE9juElRh1U3keUKIcn1YRrRUzER0WPVJXLgD6ZyiZD6zxCZp1uu5PYrQWNQw/NBB9BbOdyk/e1nQfJkAcDJN82m/W2qzkdI7gkZbRvT4sIKE45oKs/EHMkuyAHfOxkR3G/6OmFScdeEtxm10ji5aZUs55gOtK4zaFJtga2qvhb1sa3RQrr13hcBhllH7aCZ2cSyb53WMrznsulfTp71ztQ/yHl0wleLI3EVkSKl5E8/1I9e+RDZ1prlSjrU3uwfGgDnvM5Dt9wsGD8BapUl5+HBivGp+lxJh1NVRObv+p/oltylLMsOdEnJj4egyU4MVxU5RLkO/Y+QTHda89crXzL6Fn3ckmzM1YhmTemeIH8YDgPwDkrGsNczWlgS/aH0rNZBLXgvHT0lRuSETl85wnDfUpZUCkaBtngGOB0G6SYk5oP0s8hxbREgX4zb44S7CHN1I1YByl1LhxYkun2SXzCM4sD1tKtLbWP+h513Fk6npp4GH+fg== 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:(13230022)(4636009)(396003)(39860400002)(346002)(136003)(376002)(451199015)(46966006)(36840700001)(40470700004)(2616005)(450100002)(70586007)(70206006)(4326008)(8676002)(16526019)(2906002)(36756003)(83380400001)(7636003)(478600001)(1076003)(26005)(186003)(6286002)(82740400003)(41300700001)(6666004)(82310400005)(7696005)(8936002)(40480700001)(55016003)(86362001)(5660300002)(36860700001)(40460700003)(356005)(6636002)(47076005)(426003)(110136005)(316002)(336012)(54906003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Dec 2022 13:59:34.7990 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e98a8c55-c2db-4511-89fc-08dad9ed9a87 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: DM6NAM11FT071.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB6564 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 From: Jiawei Wang The sample flow tried to get the reserved metadata register for match implicitly, and if the reserved metadata register was invalid then back to use the application tag. The assertion failure was caused while getting register due to the reserved metadata regC is invalid on CX-5 trusted device(VF/SF). This patch adds the checking for reserved metadata register before getting the register, to avoid assertion failure. Fixes: 9a726360dd30 ("net/mlx5: fix sample flow action on trusted device") Cc: stable@dpdk.org Signed-off-by: Jiawei Wang Acked-by: Slava Ovsiienko --- drivers/net/mlx5/mlx5_flow.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index a0cf677fb0..1768ec3cdb 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -6125,13 +6125,14 @@ flow_sample_split_prep(struct rte_eth_dev *dev, /* Prepare the prefix tag action. */ append_index++; set_tag = (void *)(actions_pre + actions_n + append_index); - ret = mlx5_flow_get_reg_id(dev, MLX5_SAMPLE_ID, 0, error); /* Trust VF/SF on CX5 not supported meter so that the reserved * metadata regC is REG_NON, back to use application tag * index 0. */ - if (unlikely(ret == REG_NON)) + if (unlikely(priv->mtr_color_reg == REG_NON)) ret = mlx5_flow_get_reg_id(dev, MLX5_APP_TAG, 0, error); + else + ret = mlx5_flow_get_reg_id(dev, MLX5_SAMPLE_ID, 0, error); if (ret < 0) return ret; mlx5_ipool_malloc(priv->sh->ipool