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 045F8A0350 for ; Mon, 21 Feb 2022 16:40:38 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F3AF24068C; Mon, 21 Feb 2022 16:40:37 +0100 (CET) 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 2F67B40DF6 for ; Mon, 21 Feb 2022 16:40:37 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645458036; 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=yCy9Ec52XmAIU10jEfFU234G2Rrw9wZOQbzPv4LZX+s=; b=jUKMMTsT65iQYpT0ldbC56sQSP0OoSeN98bBcj2oSd808IveFy6ItHZ5ID3MMrhQUPW2TQ utHINOgq4nyrFBXXcmOI/sULHFDvFTHYk/DnPl+dOhIbuaJBNrM/d369mwYzJnq9+VY0NM jfEjzWT5OqRnOSAJaKuoPyTaGbWc1Qo= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-582-TlQadJ9dNw-jtgknFLAN4w-1; Mon, 21 Feb 2022 10:40:33 -0500 X-MC-Unique: TlQadJ9dNw-jtgknFLAN4w-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 296A91091DAA; Mon, 21 Feb 2022 15:40:32 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1E7DF7B9D9; Mon, 21 Feb 2022 15:40:30 +0000 (UTC) From: Kevin Traynor To: Bing Zhao Cc: Viacheslav Ovsiienko , dpdk stable Subject: patch 'common/mlx5: fix probing failure code' has been queued to stable release 21.11.1 Date: Mon, 21 Feb 2022 15:35:04 +0000 Message-Id: <20220221153625.152324-115-ktraynor@redhat.com> In-Reply-To: <20220221153625.152324-1-ktraynor@redhat.com> References: <20220221153625.152324-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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-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.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/26/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/bc3452d45d9e24820763ee0c16781b0ef2fa09ba Thanks. Kevin --- >From bc3452d45d9e24820763ee0c16781b0ef2fa09ba Mon Sep 17 00:00:00 2001 From: Bing Zhao Date: Mon, 17 Jan 2022 19:49:14 +0200 Subject: [PATCH] common/mlx5: fix probing failure code [ upstream commit b4a4159d4e6323dd9ccd31d11cfe42bbc1e897f6 ] While probing the device with unsupported class, the process should fail because no appropriate driver was found. After traversing all the drivers, an error value should be returned for the case. In the previous implementation, zero value indicating probing success was wrongly returned. Fixes: ad435d320473 ("common/mlx5: add bus-agnostic layer") Signed-off-by: Bing Zhao Acked-by: Viacheslav Ovsiienko --- drivers/common/mlx5/mlx5_common.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/common/mlx5/mlx5_common.c b/drivers/common/mlx5/mlx5_common.c index 185db4d004..47a541f5ef 100644 --- a/drivers/common/mlx5/mlx5_common.c +++ b/drivers/common/mlx5/mlx5_common.c @@ -645,5 +645,5 @@ drivers_probe(struct mlx5_common_device *cdev, uint32_t user_classes) uint32_t enabled_classes = 0; bool already_loaded; - int ret; + int ret = -EINVAL; TAILQ_FOREACH(driver, &drivers_list, next) { @@ -667,6 +667,8 @@ drivers_probe(struct mlx5_common_device *cdev, uint32_t user_classes) enabled_classes |= driver->drv_class; } - cdev->classes_loaded |= enabled_classes; - return 0; + if (!ret) { + cdev->classes_loaded |= enabled_classes; + return 0; + } probe_err: /* -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-21 15:22:47.107665265 +0000 +++ 0115-common-mlx5-fix-probing-failure-code.patch 2022-02-21 15:22:44.237704455 +0000 @@ -1 +1 @@ -From b4a4159d4e6323dd9ccd31d11cfe42bbc1e897f6 Mon Sep 17 00:00:00 2001 +From bc3452d45d9e24820763ee0c16781b0ef2fa09ba Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit b4a4159d4e6323dd9ccd31d11cfe42bbc1e897f6 ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org