From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 1BAE4A0093 for ; Thu, 28 May 2020 18:25:00 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 144EC1DC1E; Thu, 28 May 2020 18:25:00 +0200 (CEST) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by dpdk.org (Postfix) with ESMTP id 120781DC1E for ; Thu, 28 May 2020 18:24:58 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590683098; 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=PJNYjfqG2GNNw8J5XzaHgiSf3kinVbdTuYq4myECsAU=; b=CL04V65mEuxbnH+UF1HK6unEMGvHaaEW0e5ucqbOOK+se0JCeJGcQGVWWYFMJVC2x8MgLk HHs63B+OI89BYnE1NPDJq7KferIkLzNffPDgLSJIUNbMpFGsDkUf8yG8odqWnWG0TuPxy7 Y3T0Tr4hABf0vOy2CZETpc5SS68vB6U= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-156-O-ugRfdYNa-a5DSouPI8Jg-1; Thu, 28 May 2020 12:24:54 -0400 X-MC-Unique: O-ugRfdYNa-a5DSouPI8Jg-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 B55F580183C; Thu, 28 May 2020 16:24:53 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.235]) by smtp.corp.redhat.com (Postfix) with ESMTP id D269360C05; Thu, 28 May 2020 16:24:52 +0000 (UTC) From: Kevin Traynor To: Somnath Kotur Cc: Gaetan Rivet , dpdk stable Date: Thu, 28 May 2020 17:22:14 +0100 Message-Id: <20200528162322.7863-27-ktraynor@redhat.com> In-Reply-To: <20200528162322.7863-1-ktraynor@redhat.com> References: <20200528162322.7863-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'bus/pci: fix devargs on probing again' has been queued to LTS release 18.11.9 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.9 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/03/20. 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-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/f1fdd2a09fa964765c58c681a63bd1af4a58b920 Thanks. Kevin. --- >From f1fdd2a09fa964765c58c681a63bd1af4a58b920 Mon Sep 17 00:00:00 2001 From: Somnath Kotur Date: Fri, 14 Feb 2020 12:13:53 +0530 Subject: [PATCH] bus/pci: fix devargs on probing again [ upstream commit fc67ae91ebae7c48fc27a1d24e0843c50c192459 ] As per the comments in this code section, since there is a matching device, it is now its responsibility to manage the devargs we've just inserted. But the matching device ptr's devargs is still uninitialized or not pointing to the newest dev_args that were passed as a parameter to local_dev_probe(). This is needed particularly in the case when *probe is called again* on an already probed device as part of adding a representor port to OVS-DPDK. Fixes: 7e8b26650146 ("eal: fix hotplug add / remove") Signed-off-by: Somnath Kotur Acked-by: Gaetan Rivet --- drivers/bus/pci/linux/pci.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/bus/pci/linux/pci.c b/drivers/bus/pci/linux/pci.c index 9b1c7c839a..280e779155 100644 --- a/drivers/bus/pci/linux/pci.c +++ b/drivers/bus/pci/linux/pci.c @@ -379,4 +379,9 @@ pci_scan_one(const char *dirname, const struct rte_pci_addr *addr) RTE_LOG(ERR, EAL, "Unexpected device scan at %s!\n", filename); + else if (dev2->device.devargs != + dev->device.devargs) { + rte_devargs_remove(dev2->device.devargs); + pci_name_set(dev2); + } } free(dev); -- 2.21.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-28 17:13:00.572130671 +0100 +++ 0027-bus-pci-fix-devargs-on-probing-again.patch 2020-05-28 17:12:59.087556717 +0100 @@ -1 +1 @@ -From fc67ae91ebae7c48fc27a1d24e0843c50c192459 Mon Sep 17 00:00:00 2001 +From f1fdd2a09fa964765c58c681a63bd1af4a58b920 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit fc67ae91ebae7c48fc27a1d24e0843c50c192459 ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index 740a2cdad4..71b0a3053d 100644 +index 9b1c7c839a..280e779155 100644 @@ -26 +27 @@ -@@ -378,4 +378,9 @@ pci_scan_one(const char *dirname, const struct rte_pci_addr *addr) +@@ -379,4 +379,9 @@ pci_scan_one(const char *dirname, const struct rte_pci_addr *addr)