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 C3AA9A0555 for ; Thu, 9 Jun 2022 13:38:27 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BAEFC40A7D; Thu, 9 Jun 2022 13:38:27 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 2CCE240220 for ; Thu, 9 Jun 2022 13:38:26 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1654774705; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Gc6gxThoRTdqe/CXTvw9zAPdrnf6Zmo0iGz1qyxVJpo=; b=gvrTlSe651T25fyfEYYpDt96+JEC3T9S4qZHs6XGpR51CUkhNOQ15XC9J7dUCBWI5TyW6x v7CllLcu2+oYbZILMR8zuvIBRSU+UXhzq5u0zSJCSqR0UYL9rVMMh8+JfLBbC09jXpe/oy VAyQG8ceOoB0okW4OvNSsqEDlOw/UMw= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-646-mG0RpyYZOgekABGXPTa9qw-1; Thu, 09 Jun 2022 07:38:22 -0400 X-MC-Unique: mG0RpyYZOgekABGXPTa9qw-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 70E0E811E76; Thu, 9 Jun 2022 11:38:22 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.195.82]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4D23318EA6; Thu, 9 Jun 2022 11:38:21 +0000 (UTC) From: Kevin Traynor To: Raja Zidane Cc: Matan Azrad , Dmitry Kozlyuk , dpdk stable Subject: patch 'net/mlx5: fix Tx recovery' has been queued to stable release 21.11.2 Date: Thu, 9 Jun 2022 12:36:39 +0100 Message-Id: <20220609113701.386938-52-ktraynor@redhat.com> In-Reply-To: <20220609113701.386938-1-ktraynor@redhat.com> References: <20220609113701.386938-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 21.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 06/13/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/942307408c2fbf24d28123660dcbf851c7685005 Thanks. Kevin --- >From 942307408c2fbf24d28123660dcbf851c7685005 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 [ 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 2b6eef44a7..b113731097 100644 --- a/drivers/net/mlx5/linux/mlx5_verbs.c +++ b/drivers/net/mlx5/linux/mlx5_verbs.c @@ -95,5 +95,4 @@ mlx5_ibv_modify_qp(struct mlx5_txq_obj *obj, enum mlx5_txq_modify_type type, .port_num = dev_port, }; - int attr_mask = (IBV_QP_STATE | IBV_QP_PORT); int ret; @@ -109,8 +108,6 @@ mlx5_ibv_modify_qp(struct mlx5_txq_obj *obj, enum mlx5_txq_modify_type type, 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", -- 2.34.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-06-09 12:34:30.965613356 +0100 +++ 0052-net-mlx5-fix-Tx-recovery.patch 2022-06-09 12:34:29.768980680 +0100 @@ -1 +1 @@ -From 1485d961e2c9d77dfa4900a16b5ba70cbaa4c7ce Mon Sep 17 00:00:00 2001 +From 942307408c2fbf24d28123660dcbf851c7685005 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 1485d961e2c9d77dfa4900a16b5ba70cbaa4c7ce ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org @@ -25 +26 @@ -index b6ba21c216..67a7bec22b 100644 +index 2b6eef44a7..b113731097 100644