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 51A59A0093 for ; Tue, 19 May 2020 15:00:06 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 3E41E1D60D; Tue, 19 May 2020 15:00:06 +0200 (CEST) Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by dpdk.org (Postfix) with ESMTP id 91E3C1D62D for ; Tue, 19 May 2020 15:00:05 +0200 (CEST) Received: by mail-wm1-f65.google.com with SMTP id z4so2968539wmi.2 for ; Tue, 19 May 2020 06:00:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=eRQ46KVVPWnqhzO6UNezT67Fpvn/6BaE3bKy+kdRajg=; b=pTCmODbAyV6eFEH73dsGVX5TMHVST5Fqc5dyfN2k1RcPI3Qh3SoSyn/5mMFBLPM9K0 bwoP/TvdsYtn067QdrtXfsyUhxuHvq6I1oxJfIZhqPApcn8uL/oSSPf6XH/IwO0lvo14 Rv1/uV8q9j56mVSGSNrAMh2R3AuRzdr0s5rGa0abE0WzzBFleWDnPcMn1JjLzP4KktGG W8Jr1o86tz965d2ydaahjNAyaSDk7ibfOQbmhVloEpJdVEXiGuvMxlur//gg53ZgAsDY IsHd/vW07AgM1cdx0Qaa3QRJd8iGVWuX6YLsYdWug6n5TwsfstXSs4TBmLVxwvFpP+0u PYkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=eRQ46KVVPWnqhzO6UNezT67Fpvn/6BaE3bKy+kdRajg=; b=jU2f48+2+vj3/nyovs64V0ZNqmobXa31BID+NY9pPwvEPl4KryY38rUmw8Pd4RULsr uPyMPYINY7M8eft6uIUSPJy8XZ7n2Kgou+wxLVs1WSIRKq2hs6TDvjEGXrXFP6dF8aZM mgScRexvpHmEsnGI/SGICpkdKvRl1n9rY+h4SE0Il1DKA7t4A6vVRd02o3GcruWc7ZfU LeHAdUPy6ASDH1ha0Sep/uliwuIAcFfg394iiKCjHM+MjnZQvB86IU/E6y7/go8UWG9d xPZrz4ZgloZzq4ljAjnHlBM9aIXHSlSn6LJOtYK0bc8r5sjFvbVwPPAoHNJ2gXhIrhQw isTQ== X-Gm-Message-State: AOAM530TnASwUG1mZqI5geWyzqvvOFshuHEMqjFUbfALhB7TuxgeHnIT YWqPrCZvue3hz1YbFM2zMDQ= X-Google-Smtp-Source: ABdhPJyce0U69YQAfV0RErKaqDYIes3vB7o7FFyeaqovw9+ljARA9gBMRtlOMDM5k0xzb/i78gqIvQ== X-Received: by 2002:a1c:9e51:: with SMTP id h78mr5750135wme.177.1589893205258; Tue, 19 May 2020 06:00:05 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id p23sm1270971wma.17.2020.05.19.06.00.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 06:00:04 -0700 (PDT) From: luca.boccassi@gmail.com To: Somnath Kotur Cc: Gaetan Rivet , dpdk stable Date: Tue, 19 May 2020 13:54:07 +0100 Message-Id: <20200519125804.104349-57-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519125804.104349-1-luca.boccassi@gmail.com> References: <20200519125804.104349-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'bus/pci: fix devargs on probing again' has been queued to stable release 19.11.3 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 stable release 19.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 05/21/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. Thanks. Luca Boccassi --- >From 39adba3b5526554d843ea5935d63fdc7913d459a 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 740a2cdad4..71b0a3053d 100644 --- a/drivers/bus/pci/linux/pci.c +++ b/drivers/bus/pci/linux/pci.c @@ -377,6 +377,11 @@ 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.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 13:56:21.164088256 +0100 +++ 0057-bus-pci-fix-devargs-on-probing-again.patch 2020-05-19 13:56:18.287503043 +0100 @@ -1,8 +1,10 @@ -From fc67ae91ebae7c48fc27a1d24e0843c50c192459 Mon Sep 17 00:00:00 2001 +From 39adba3b5526554d843ea5935d63fdc7913d459a 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 @@ -11,7 +13,6 @@ already probed device as part of adding a representor port to OVS-DPDK. Fixes: 7e8b26650146 ("eal: fix hotplug add / remove") -Cc: stable@dpdk.org Signed-off-by: Somnath Kotur Acked-by: Gaetan Rivet