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 A00A3A04FD for ; Wed, 23 Nov 2022 19:04:45 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9BB8C42DA3; Wed, 23 Nov 2022 19:04:45 +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 317EC40E5A for ; Wed, 23 Nov 2022 19:04:44 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669226683; 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=4aObal9Ugjsbc5KKYlL+JA++e4uUwcrmdhsmz/X4be8=; b=BSncdduvT1wc5OMOispY2vadNsFZi8vpyS0JL7l7dBwqE/Z9QQFvPQe5AlotOtzMBTU04x g3uPAUUFcU88y4SvYxEu2PRmB1lFffx4zP/mKsCLrwapOVMp5C4Q2bJMiOwDRykYIWc4Cl KmyjziE420rmajRRmw55m3WtEW2EWQk= 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-100-VlZjEu2sNUmcIXxR1RufWg-1; Wed, 23 Nov 2022 13:04:40 -0500 X-MC-Unique: VlZjEu2sNUmcIXxR1RufWg-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E1AF7185A7A8; Wed, 23 Nov 2022 18:04:39 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.16]) by smtp.corp.redhat.com (Postfix) with ESMTP id E2C7E492B07; Wed, 23 Nov 2022 18:04:38 +0000 (UTC) From: Kevin Traynor To: Bing Zhao Cc: Gregory Etelson , Matan Azrad , dpdk stable Subject: patch 'bus/auxiliary: prevent device from being probed again' has been queued to stable release 21.11.3 Date: Wed, 23 Nov 2022 18:03:24 +0000 Message-Id: <20221123180413.733554-11-ktraynor@redhat.com> In-Reply-To: <20221123180413.733554-1-ktraynor@redhat.com> References: <20221123180413.733554-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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.3 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/28/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/4468cce76b42c4030f3e32aa15f9d8745a54ee2f Thanks. Kevin --- >From 4468cce76b42c4030f3e32aa15f9d8745a54ee2f Mon Sep 17 00:00:00 2001 From: Bing Zhao Date: Wed, 9 Nov 2022 16:53:56 +0200 Subject: [PATCH] bus/auxiliary: prevent device from being probed again [ upstream commit bc967149967fdf504249c3cc13d307a9c16193cc ] The device on auxiliary bus doesn't support being probed again without being removed firstly. The PMD will detect and return error for this unsupported operation. Some of the resources would be cleared wrongly. When quitting, there will be unexpected error like crash. To prevent this, the device driver will be checked before probing a device. Fixes: 1afce3086cf4 ("bus/auxiliary: introduce auxiliary bus") Signed-off-by: Bing Zhao Reviewed-by: Gregory Etelson Reviewed-by: Matan Azrad --- drivers/bus/auxiliary/auxiliary_common.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/bus/auxiliary/auxiliary_common.c b/drivers/bus/auxiliary/auxiliary_common.c index 2cf8fe672d..a6b4b3de84 100644 --- a/drivers/bus/auxiliary/auxiliary_common.c +++ b/drivers/bus/auxiliary/auxiliary_common.c @@ -114,4 +114,10 @@ rte_auxiliary_probe_one_driver(struct rte_auxiliary_driver *drv, } + if (rte_dev_is_probed(&dev->device)) { + RTE_LOG(DEBUG, EAL, "Device %s is already probed on auxiliary bus\n", + dev->device.name); + return -EEXIST; + } + iova_mode = rte_eal_iova_mode(); if ((drv->drv_flags & RTE_AUXILIARY_DRV_NEED_IOVA_AS_VA) > 0 && -- 2.38.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-23 09:55:57.371796227 +0000 +++ 0011-bus-auxiliary-prevent-device-from-being-probed-again.patch 2022-11-23 09:55:57.016149173 +0000 @@ -1 +1 @@ -From bc967149967fdf504249c3cc13d307a9c16193cc Mon Sep 17 00:00:00 2001 +From 4468cce76b42c4030f3e32aa15f9d8745a54ee2f Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit bc967149967fdf504249c3cc13d307a9c16193cc ] + @@ -16 +17,0 @@ -CC: stable@dpdk.org @@ -26 +27 @@ -index 6bb1fe7c96..ff1369353a 100644 +index 2cf8fe672d..a6b4b3de84 100644 @@ -29,2 +30,2 @@ -@@ -109,4 +109,10 @@ rte_auxiliary_probe_one_driver(struct rte_auxiliary_driver *drv, - RTE_LOG(INFO, EAL, "Device %s is not NUMA-aware\n", dev->name); +@@ -114,4 +114,10 @@ rte_auxiliary_probe_one_driver(struct rte_auxiliary_driver *drv, + }