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 2395CA0548 for ; Sun, 28 Nov 2021 15:56:09 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1A83B40E5A; Sun, 28 Nov 2021 15:56:09 +0100 (CET) Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1anam02on2069.outbound.protection.outlook.com [40.107.96.69]) by mails.dpdk.org (Postfix) with ESMTP id 09DF340E5A for ; Sun, 28 Nov 2021 15:56:06 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RSiy2G3Bsa0LEozBPY9bi8vcSxd5h3qmCfnIgH2IaU8SHg2C464sYuk3Y3K5o2Am3T4H7mv9BlOR6p0mGdRSM8qyBYphPhBcgCEbQ6a2M/pOWvaN+Q4vkIhecdze1rp4VclAp2cT4yWPV6HmOuZmAumGsOvcyQ6ijEDzxqerDdkwSAcZFfYZfdadpKzzTVW3Prk7g+Z+NpJm/8ifMJOOHJ40LI1uzKe4FPjMSN4HTPxQWK3/UUYIELazcbA0eS/MzvKu/TEvpeRXNKDaAtVC4IZF6PlzT1mA3gyA7w4HGkavubVPyB2gYYEpAtWEEoZI4pjkS/6pLOaCxYHSXCOTAg== 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=BqIvXnfVIR2aHoP5FSCYWTVwn9k74yeMrs1+v5rnuHY=; b=gsxKD9dgn0NGPwYfYTXQ0k3BCCicUiBdx4ZfJaRKm9fsOqwI24QPKOgqcSc+iUQ5xombVNPQwEGYn/IFCwEeEvOTExxQTj6l20fwinlht87tQK6e6q1pORWrX5in1QgQnBFZeL1QzVMlN7v6TUZReo7ngsEkCzqbdmzGKEs1UG6hltF8AVMP0qGHN+OtZS3bo0aU14gKMSsEyKDNTwr6oaBV7PLFf0bx4vZu/S9taejLIt8zoW2CPbt7kCiskm3MqWhKY3u0qVWP0wFLl5hlZK0lHNslpT659R9k6tfAsDT/Xnkn3U5ctGti1xxl4DkW64mSQlcBOu5+CLrueqVKcQ== 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=BqIvXnfVIR2aHoP5FSCYWTVwn9k74yeMrs1+v5rnuHY=; b=LuGv9tO7EBHFlKxPUPU3fVOCmXVCp+3RMfiMXn+5HEUHuAIokgalOumR1Cbi4i2+T2B7a2mhZHUs7qCG9lKB/Oyq2q0OndM/O64KisPobX2XGie3Smw6LaFYllq131pWTuytUHumUoPEzhHNdEPNd3OJV5uT9WAXC0d31y3fj73EsCpr+9UmQIl4yTGS0AA5UpbGZ7uGlRZ0EO89hYZPJPU4mATx0BuFnSFA0/6jJkjGLXlgPu3RJolHaDtGIkWOC3wFGetRvb0g5PrUaB7RQQ7f1D78F6GxsYS2t940Vd7pHkcMi1yzFKUHtAU/mysHbMoW6UhkogJsWYCrC+mz5Q== Received: from DM6PR13CA0055.namprd13.prod.outlook.com (2603:10b6:5:134::32) by BY5PR12MB3698.namprd12.prod.outlook.com (2603:10b6:a03:194::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.22; Sun, 28 Nov 2021 14:56:03 +0000 Received: from DM6NAM11FT060.eop-nam11.prod.protection.outlook.com (2603:10b6:5:134:cafe::cf) by DM6PR13CA0055.outlook.office365.com (2603:10b6:5:134::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.9 via Frontend Transport; Sun, 28 Nov 2021 14:56:03 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) 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.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 DM6NAM11FT060.mail.protection.outlook.com (10.13.173.63) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4734.22 via Frontend Transport; Sun, 28 Nov 2021 14:56:02 +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; Sun, 28 Nov 2021 14:56:01 +0000 From: Xueming Li To: Viacheslav Ovsiienko CC: Luca Boccassi , dpdk stable Subject: patch 'net/mlx5: fix Tx scheduling check' has been queued to stable release 20.11.4 Date: Sun, 28 Nov 2021 22:53:18 +0800 Message-ID: <20211128145423.3974892-15-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211128145423.3974892-1-xuemingl@nvidia.com> References: <20211110063216.2744012-1-xuemingl@nvidia.com> <20211128145423.3974892-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.5] X-ClientProxiedBy: HQMAIL101.nvidia.com (172.20.187.10) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d7edc3be-b3ab-4b0b-59f7-08d9b27f32ae X-MS-TrafficTypeDiagnostic: BY5PR12MB3698: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: GDOjTxUnuWj/JAJV4ZrejZ2uBP8m3+dUZ03ORYNFtf8AZyxzDU58X8XNtqMEwwJlrq+LE+lo3+MwbuapeXULA4ie+JIIBX6lC7hNcGZUzKIgqRfD1rjZGdiDNscXJZewQtAef2QcnfP0xinK6V9zHT8oVnzN3NGxpMdz1nsWxp2ZEg3cjqpaaw1aO3IYYU7qaupy/CqZeCQjg0GzqDw59OfTsFx+7bXOhcNjrIrbZS5NCyyXxm/QNgveOLbujM9E/LSEJVANeZtvGXfP9ISsSN4iz8qETjU6FXhqyPt6wdzCyD3EUQ/mTq4PMVhe8LaV9njS10u6c8vOWZC9mwLnHIVzmjCuFaAFZ6kegTR2amG1QP/52Yftl3xHXkEnm8MrI4B1EKdV8yajW4K+izjaPXHgLD9amQXTD5mm9wM0ZHhgv/BJaooNQ1u9yiNJL0DgZIJp8o7ffrJV0BlToaxNhGjilRVbvdyAfqcb1VOOwfjUxas1+JJrbQ82BBsj8crE5RA7GoRXDgy6v3Cwj2z6YXvwqkLbajS8eHGuq8vsrpFx9ZufXYkrT3MFUnupVXGxSi2p2rKMjgbzVhSYXxdBic3Ui69GqutS2syjGK/9EmzA//hUkxUbF/59D7O2cIqK7fh8OObe+wTF/oeizN/lhKjC3jam+DKVl6Ob6jyYJvIBQyiDjUG5/yYk9TZgHpKymOlTQtbqfBy+F69tDCRUXSEPxzucTxQ02IvARjGuUZShx0p73vJU03FT3UWRR0icTSrtGvOyzWCIWodjQXg56m48nLZtTA9PkEJ+2yPHI3pPNhbz8ilGXPI0VRYYIwGGk2cTElRQ6AqSvcAdFUuq2w== 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)(7636003)(2906002)(37006003)(83380400001)(316002)(54906003)(70586007)(6862004)(356005)(6286002)(6666004)(16526019)(70206006)(47076005)(5660300002)(4001150100001)(8676002)(336012)(82310400004)(8936002)(186003)(7696005)(2616005)(4326008)(966005)(53546011)(6636002)(36756003)(26005)(1076003)(55016003)(508600001)(426003)(86362001)(36860700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Nov 2021 14:56:02.8644 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d7edc3be-b3ab-4b0b-59f7-08d9b27f32ae 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: DM6NAM11FT060.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB3698 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 Hi, FYI, your patch has been queued to stable release 20.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/30/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/40588e9f6f1f1c5b0f4be0c504bf0f01ddd44359 Thanks. Xueming Li --- >From 40588e9f6f1f1c5b0f4be0c504bf0f01ddd44359 Mon Sep 17 00:00:00 2001 From: Viacheslav Ovsiienko Date: Wed, 10 Nov 2021 15:05:52 +0200 Subject: [PATCH] net/mlx5: fix Tx scheduling check Cc: Xueming Li [ upstream commit 11cfe349b3f17b11b6dce109f5226e89bc0a5b85 ] There was a redundant check for the enabled E-Switch, this resulted in device probing failure if the Tx scheduling was requested and E-Switch was enabled. Fixes: f17e4b4ffef9 ("net/mlx5: add Tx scheduling check on queue creation") Signed-off-by: Viacheslav Ovsiienko --- drivers/net/mlx5/linux/mlx5_os.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c index 3128fb3e5e..a0ddc90311 100644 --- a/drivers/net/mlx5/linux/mlx5_os.c +++ b/drivers/net/mlx5/linux/mlx5_os.c @@ -1579,8 +1579,7 @@ err_secondary: priv->obj_ops = ibv_obj_ops; } if (config->tx_pp && - (priv->config.dv_esw_en || - priv->obj_ops.txq_obj_new != mlx5_os_txq_obj_new)) { + priv->obj_ops.txq_obj_new != mlx5_os_txq_obj_new) { /* * HAVE_MLX5DV_DEVX_UAR_OFFSET is required to support * packet pacing and already checked above. -- 2.34.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-28 22:41:04.253284827 +0800 +++ 0014-net-mlx5-fix-Tx-scheduling-check.patch 2021-11-28 22:41:03.223542730 +0800 @@ -1 +1 @@ -From 11cfe349b3f17b11b6dce109f5226e89bc0a5b85 Mon Sep 17 00:00:00 2001 +From 40588e9f6f1f1c5b0f4be0c504bf0f01ddd44359 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 11cfe349b3f17b11b6dce109f5226e89bc0a5b85 ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -19 +21 @@ -index de880ee4c9..c29fe3d92b 100644 +index 3128fb3e5e..a0ddc90311 100644 @@ -22 +24 @@ -@@ -1727,8 +1727,7 @@ err_secondary: +@@ -1579,8 +1579,7 @@ err_secondary: @@ -27,2 +29,2 @@ -- priv->obj_ops.txq_obj_new != mlx5_txq_devx_obj_new)) { -+ priv->obj_ops.txq_obj_new != mlx5_txq_devx_obj_new) { +- priv->obj_ops.txq_obj_new != mlx5_os_txq_obj_new)) { ++ priv->obj_ops.txq_obj_new != mlx5_os_txq_obj_new) {