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 7E13AA0543 for ; Tue, 21 Jun 2022 10:11:42 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8BEFA42B77; Tue, 21 Jun 2022 10:11:17 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2061.outbound.protection.outlook.com [40.107.220.61]) by mails.dpdk.org (Postfix) with ESMTP id 42A6742B77 for ; Tue, 21 Jun 2022 10:11:16 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EYjJgSKYf6aozG5qv4T0llpsXgOFwNABiWgOELFCkMCMdhLlBRnvTH4SP5LoYm3iwD+6sZl0TnS+tChTJetHTunlDVbSW5I5n4yxnQS6WcXgUBQAXxNk8spC2L7tSwCZIU1A9Fca/n5nm88BExAxkmnslCjaP4dY7NO879eFwQNFCA/x3J0Aa7i6h3x8NCN1BzV7Q4hMec3EqR7pNDda8r5T0F3oWRoiYkkZvS3MJFVUV+NgPxgow8XfMGuLSDkKU1FaSGd/3/uGt2Ihy5g55I99bcpguOnwJqPsqPiS7Co5Olsy09Co4ayQzRvIQMwj+lPo70HOEOO/OUrVHHhlXQ== 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=+zG3Cwf5WA6fgoZFoXyfys1nbE3Cj40zZ0bU7DdBrgM=; b=j9j7EU+bA1YOfqRX4p5VDvw0K4pB7xGexCUmgrw2jEiUoXrfMl+pHHGX2wDQXbnhQr0sXXz8CeSI04rTZ3U/3FVG+X8/0OBYaonYjtKn8ftXs3lKqzxLwfCtSXixybHoWRBfekJjS/L+AyRV8XpZHWqkI2FGjbd9QEgYTch5RkRT+ZpzMA2wEaxgBxQi9IWS6CCiaO6HmyUf/A+cfVVaKsumJwQuzV/ekVds8uX+nz4T7EoBEfRrkHMZXcWJpx1WYhFSmUeCT/QXClrQ5PV6/p8Rld1ionOfuzxPTOS9NU8IwFjjUbtwzHuOxGbrmpQbRenr3MUTaDumM/PF/pHPfw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 12.22.5.238) 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=+zG3Cwf5WA6fgoZFoXyfys1nbE3Cj40zZ0bU7DdBrgM=; b=LM5h7LFFfMLP9lL21CO29zV0YZAnKpBqZsHc6kVNqUZgxxxWXozLn5QzpMNkonH2VCPwdLquWOyQeuhYUK17KP+VcLc6nhUPrgJPoXDz6lXUW61Mr2UdUh/xYlvjR3jldyUfBO1ukHDxmBfjSDcviEGSH5ITGlC+FlCQpHHmdSbwmpY/1kkOh6bsZMwup5NzpxaVT04roY/ndoTbFzDywslqbwiIm4Kv/o9a/GmYax0XQwF7TP+pyAkqZ4QP7qkiFjWDZrhxgz4p4g/HIKy4jbUC02x3PRFZ5l4oe5GJFA4DKiUHaIqmpIamsjhP6rpz3MCXsqJ2RLsDJWwjD8UfwQ== Received: from MW4PR04CA0268.namprd04.prod.outlook.com (2603:10b6:303:88::33) by BYAPR12MB2741.namprd12.prod.outlook.com (2603:10b6:a03:62::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.16; Tue, 21 Jun 2022 08:11:13 +0000 Received: from CO1NAM11FT059.eop-nam11.prod.protection.outlook.com (2603:10b6:303:88:cafe::b7) by MW4PR04CA0268.outlook.office365.com (2603:10b6:303:88::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.14 via Frontend Transport; Tue, 21 Jun 2022 08:11:13 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 12.22.5.238) 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 12.22.5.238 as permitted sender) receiver=protection.outlook.com; client-ip=12.22.5.238; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (12.22.5.238) by CO1NAM11FT059.mail.protection.outlook.com (10.13.174.160) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.5353.14 via Frontend Transport; Tue, 21 Jun 2022 08:11:13 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by DRHQMAIL105.nvidia.com (10.27.9.14) with Microsoft SMTP Server (TLS) id 15.0.1497.32; Tue, 21 Jun 2022 08:11:12 +0000 Received: from nvidia.com (10.126.230.35) 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.22; Tue, 21 Jun 2022 01:11:10 -0700 From: Xueming Li To: Raja Zidane CC: Matan Azrad , Dmitry Kozlyuk , "dpdk stable" Subject: patch 'net/mlx5: fix Tx recovery' has been queued to stable release 20.11.6 Date: Tue, 21 Jun 2022 11:02:37 +0300 Message-ID: <20220621080301.2315720-92-xuemingl@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20220621080301.2315720-1-xuemingl@nvidia.com> References: <20220621080301.2315720-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.35] 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-Office365-Filtering-Correlation-Id: 9cb14450-45d9-43ea-471d-08da535d9b72 X-MS-TrafficTypeDiagnostic: BYAPR12MB2741:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3K/dwZ9COEwaxKG9SED6KV6szG1/YlNxHQmL0dtX9hu8kkZGjmHv7gzjtAMWHBaehSRcGws7Ckm4/mDlih8xGUtFnMinNGLjaXbE/rlq7nH9nt4CwCgfm9PXG8QnAOF8ZztwTCL+pDKlRRSUUdzlRT/Bc0VBcVqZUOpgbPKRrv0/7Fpco+/mX2MVymhilB5N5molEdP32KPnd7HRsULl1ARYBvnJ0GI+SDoaflaEa+i8f3tTrspLOTcvE1I9foT+dh7chAnligShZizOSnm+gBKTEEKzvg2QDlTWstmLXouCyk+V2o9jl70/dboUNGK2s9D/807DzCI1Yl8kEFefZrkL7W4MdxQ3G10ekRFdC/zkFz19RwJiZyJHhVbMDztQTv3RH/nDHsDrKqNLpL1ejGzHRE0boC1aadwN+Ve6su7ujf2e16lwcGSWrW3aUAlb/KmzCdQs0iy9jzbUCD2BsAvuTsJfsqxYK7yXCV8+UZSjaPZGH6TkUvYx50TZwUZGSAtAp5jcpEhPig5g1sFHLiGcysw2cpD+88s1LhXKJbvri7ol/jVnf8VwvAMwxcG/aEm5QIvTzYh68MZD3hP7Bb7/7aDTR+85UxR33jy1JE79TB1A0/AqjbAFjux3USs6dObwVt3mP/5upNhNv25qBxbhvoeHRV0n9kFCrPOul3jCr2ZSV1YpT/t8k11GPII7CTimTGF20I1zamN0xeXkVe7Jzlfhmb9cyX1bTyceiMc5L4JWNhhvCyZfPoHmoH7L+titektpHFE9q2lvzUKzZBeePgC2fXKS6HA5xLxbazz2hXQR3UK1ereMPtF5W1pHlgqKA0EjP1y7TIMVIOviVXCaoZLiMjP+cj7x7YVdnhI= X-Forefront-Antispam-Report: CIP:12.22.5.238; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:InfoNoRecords; CAT:NONE; SFS:(13230016)(4636009)(396003)(136003)(346002)(39860400002)(376002)(40470700004)(46966006)(36840700001)(86362001)(478600001)(6862004)(26005)(6286002)(966005)(53546011)(5660300002)(6666004)(40460700003)(7696005)(8936002)(36860700001)(356005)(82740400003)(81166007)(2906002)(55016003)(82310400005)(40480700001)(336012)(41300700001)(2616005)(1076003)(16526019)(186003)(47076005)(426003)(83380400001)(6636002)(8676002)(37006003)(4326008)(54906003)(70586007)(36756003)(316002)(70206006)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jun 2022 08:11:13.0118 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9cb14450-45d9-43ea-471d-08da535d9b72 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[12.22.5.238]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT059.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR12MB2741 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.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/23/22. 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/8048354bb7f450314c3c63a86b3fdf980e11fb43 Thanks. Xueming Li --- >From 8048354bb7f450314c3c63a86b3fdf980e11fb43 Mon Sep 17 00:00:00 2001 From: Raja Zidane Date: Wed, 18 May 2022 12:42:32 +0300 Subject: [PATCH] net/mlx5: fix Tx recovery Cc: Xueming Li [ upstream commit 1485d961e2c9d77dfa4900a16b5ba70cbaa4c7ce ] When an error occurs in Tx, and it is moved to ERROR state, it is not recoverable, during recovery it's state cannot be modified to INIT. to modify state from RESET to INIT, the port must be passed in modify attributes, and in case of ERROR to READY modification path, it was not provided. Provide port number when changing state from RESET to INIT. Fixes: 3a87b964edd3 ("net/mlx5: create Tx queues with DevX") Signed-off-by: Raja Zidane Acked-by: Matan Azrad Acked-by: Dmitry Kozlyuk --- drivers/net/mlx5/linux/mlx5_verbs.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/net/mlx5/linux/mlx5_verbs.c b/drivers/net/mlx5/linux/mlx5_verbs.c index 29e569c321..ccb6918394 100644 --- a/drivers/net/mlx5/linux/mlx5_verbs.c +++ b/drivers/net/mlx5/linux/mlx5_verbs.c @@ -134,7 +134,6 @@ mlx5_ibv_modify_qp(struct mlx5_txq_obj *obj, enum mlx5_txq_modify_type type, .qp_state = IBV_QPS_RESET, .port_num = dev_port, }; - int attr_mask = (IBV_QP_STATE | IBV_QP_PORT); int ret; if (type != MLX5_TXQ_MOD_RST2RDY) { @@ -148,10 +147,8 @@ mlx5_ibv_modify_qp(struct mlx5_txq_obj *obj, enum mlx5_txq_modify_type type, if (type == MLX5_TXQ_MOD_RDY2RST) return 0; } - if (type == MLX5_TXQ_MOD_ERR2RDY) - attr_mask = IBV_QP_STATE; mod.qp_state = IBV_QPS_INIT; - ret = mlx5_glue->modify_qp(obj->qp, &mod, attr_mask); + ret = mlx5_glue->modify_qp(obj->qp, &mod, IBV_QP_STATE | IBV_QP_PORT); if (ret) { DRV_LOG(ERR, "Cannot change Tx QP state to INIT %s", strerror(errno)); -- 2.35.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-06-21 15:37:53.334103089 +0800 +++ 0091-net-mlx5-fix-Tx-recovery.patch 2022-06-21 15:37:49.187785117 +0800 @@ -1 +1 @@ -From 1485d961e2c9d77dfa4900a16b5ba70cbaa4c7ce Mon Sep 17 00:00:00 2001 +From 8048354bb7f450314c3c63a86b3fdf980e11fb43 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 1485d961e2c9d77dfa4900a16b5ba70cbaa4c7ce ] @@ -15 +17,0 @@ -Cc: stable@dpdk.org @@ -25 +27 @@ -index b6ba21c216..67a7bec22b 100644 +index 29e569c321..ccb6918394 100644 @@ -28 +30 @@ -@@ -94,7 +94,6 @@ mlx5_ibv_modify_qp(struct mlx5_txq_obj *obj, enum mlx5_txq_modify_type type, +@@ -134,7 +134,6 @@ mlx5_ibv_modify_qp(struct mlx5_txq_obj *obj, enum mlx5_txq_modify_type type, @@ -36 +38 @@ -@@ -108,10 +107,8 @@ mlx5_ibv_modify_qp(struct mlx5_txq_obj *obj, enum mlx5_txq_modify_type type, +@@ -148,10 +147,8 @@ mlx5_ibv_modify_qp(struct mlx5_txq_obj *obj, enum mlx5_txq_modify_type type,