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 C74F3A0524 for ; Fri, 5 Feb 2021 12:19:48 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C19DF1606B6; Fri, 5 Feb 2021 12:19:48 +0100 (CET) Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by mails.dpdk.org (Postfix) with ESMTP id C30F71606BA for ; Fri, 5 Feb 2021 12:19:47 +0100 (CET) Received: by mail-wm1-f45.google.com with SMTP id i9so5618532wmq.1 for ; Fri, 05 Feb 2021 03:19:47 -0800 (PST) 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=chn3Gqg1inZJ/wr3sJlSA1UexrcxKJG3Y962Rk9KKio=; b=o8/IlLE3ZEPxBHb5CiJONWPWgutOW7cDXg2fL9+SgpXTukw/nPr/1e8yybxAlsX7A0 JrIJF2FohBrlOC1PJIMAvceINyVBT8TXWCoOSRsRdr5sdq90bDc38rQI2j3mNAWk3XdG c1fwTKB1CXfozEEifeNAz4R31JxJwLhByi5sQcm5of7hxvhqKYEoynRWkaaQxjIe2t09 ofYS5F55Q+lMtVvKPi9+BMJ5ID1yd+hTaHltMJ5oMLrUuGPn1WGEhxG5IG/B4nOKntnv NIfH0b1HRversQsXa6ZbBRcwGjylED84X9k9iL8L6tJVK76rEA4I4X9zVdNwYIYkmD0/ AJFA== 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=chn3Gqg1inZJ/wr3sJlSA1UexrcxKJG3Y962Rk9KKio=; b=YbzfurgcSdQdEhUWKx/4CIQrradBnzcu4BvXinrAGGz2uPNPvaGXRockR+Lbiuhkv5 IghUIpRts2QAbeKaHxVcHCUK/XCET/0B88RErYMi5GYTs9yHg9goySeLuz5XF5WLBvxe BfWFwsG2zTaCtW1Lp5jawpuNPP+kGR3FDaoyEwqRsdCjqc1X45tHlCNh6Dc3JmWeWLjy nbqsBV3vfIPcgd9o5YqpQzeRilUsD5wkAmN0P7lqMpBYqgv1P0QV5ORNBEMdUrdFYobM IQ7Q8zUssJfUbD2j/Purvu8dGSWA2k5z2ijcE6NWb35h5svoqcS9wYK5Yg8NNjr5fXCd VrOQ== X-Gm-Message-State: AOAM531DgpvbVmZaWXqxNoZ+6utufYYTtmw8I7mmEUFh5fWCzfhaeZPa RCGD+b9nuKEg63FReEAkp3Q= X-Google-Smtp-Source: ABdhPJyU4xAWKnRFat/nkgTeZyhEugD8FKREWudTjBgq2wJ5tqBh+aG+SBX2Z3v/AVvAP+5ptjO/aw== X-Received: by 2002:a1c:2094:: with SMTP id g142mr3184585wmg.101.1612523987525; Fri, 05 Feb 2021 03:19:47 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id w12sm238405wmi.4.2021.02.05.03.19.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:19:46 -0800 (PST) From: luca.boccassi@gmail.com To: Dmitry Kozlyuk Cc: dpdk stable Date: Fri, 5 Feb 2021 11:14:53 +0000 Message-Id: <20210205111920.1272063-7-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210205111920.1272063-1-luca.boccassi@gmail.com> References: <20210205111920.1272063-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'bus/pci: fix hardware ID limit on Windows' has been queued to stable release 20.11.1 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.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/07/21. 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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/5740e51b9d7fb13ccb175005d66aa9f31e0948be Thanks. Luca Boccassi --- >From 5740e51b9d7fb13ccb175005d66aa9f31e0948be Mon Sep 17 00:00:00 2001 From: Dmitry Kozlyuk Date: Fri, 11 Dec 2020 23:09:30 +0300 Subject: [PATCH] bus/pci: fix hardware ID limit on Windows [ upstream commit 6d10ddb408fd666e3e2593b6c16ddc943265d62c ] Length of hardware IDs list is limited by REGSTR_VAL_MAX_HCID_LEN [1], which is currently 1024. With the old limit of 260, obtaining the list could fail in a rare occasion of a very long result (no examples known). This also removes a bogus dependency on the maximum path length. [1]: https://docs.microsoft.com/en-us/windows-hardware/drivers/install/hardware-ids Fixes: b762221ac24f ("bus/pci: support Windows with bifurcated drivers") Signed-off-by: Dmitry Kozlyuk --- drivers/bus/pci/windows/pci.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/bus/pci/windows/pci.c b/drivers/bus/pci/windows/pci.c index 33a5fb1d83..fbf0785fdb 100644 --- a/drivers/bus/pci/windows/pci.c +++ b/drivers/bus/pci/windows/pci.c @@ -10,6 +10,7 @@ #include "pci_netuio.h" #include +#include #if defined RTE_TOOLCHAIN_GCC && (__MINGW64_VERSION_MAJOR < 8) #include @@ -303,7 +304,7 @@ pci_scan_one(HDEVINFO dev_info, PSP_DEVINFO_DATA device_info_data) { struct rte_pci_device *dev; int ret = -1; - char pci_device_info[PATH_MAX]; + char pci_device_info[REGSTR_VAL_MAX_HCID_LEN]; struct rte_pci_addr addr; struct rte_pci_id pci_id; @@ -314,7 +315,7 @@ pci_scan_one(HDEVINFO dev_info, PSP_DEVINFO_DATA device_info_data) memset(dev, 0, sizeof(*dev)); ret = get_pci_hardware_id(dev_info, device_info_data, - pci_device_info, PATH_MAX); + pci_device_info, sizeof(pci_device_info)); if (ret != 0) goto end; -- 2.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-05 11:18:29.657381043 +0000 +++ 0007-bus-pci-fix-hardware-ID-limit-on-Windows.patch 2021-02-05 11:18:28.586686923 +0000 @@ -1 +1 @@ -From 6d10ddb408fd666e3e2593b6c16ddc943265d62c Mon Sep 17 00:00:00 2001 +From 5740e51b9d7fb13ccb175005d66aa9f31e0948be Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 6d10ddb408fd666e3e2593b6c16ddc943265d62c ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org