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 E8F6EA0524 for ; Fri, 5 Feb 2021 12:19:49 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DE7F04067B; Fri, 5 Feb 2021 12:19:49 +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 11A211606BF for ; Fri, 5 Feb 2021 12:19:49 +0100 (CET) Received: by mail-wm1-f45.google.com with SMTP id o10so7661342wmc.1 for ; Fri, 05 Feb 2021 03:19:49 -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=A8E8TRHpVYi7jEnwKFt+vjV/zuGeK1+VYJQuyQlHQUk=; b=U2DkG00275fgG5Eu2KLLF1S30gdwXcBswzqeaA9ectcy9RU6gsNbybtsU/BKMpugUc e9IaPQSR6u8kgtKbAPk5gEHvcaSofw9DUP6a4/ojLghWRj2d221XZWXiXCuuBr5lI8gF ZMb9QPv4DHnIOpiKb52eBsGZOGuq/9FGcnH/S8FLSeLcV8jm3w7ils08jSZ9G0ci4Kae BVyO7IBYmr3I8c3IkPt5ify0D/rO8RKMkS8ii7zBXnclpU+qomqpI3R75wo1QdgwHsKO Jt6zA6CuAznbTKa+iOsUZhYh2hfGT639o0Eo8ATunWvtQWkdH30C8eY5iG2h2nH3M1Xd X0rQ== 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=A8E8TRHpVYi7jEnwKFt+vjV/zuGeK1+VYJQuyQlHQUk=; b=c1vF27onxsgxaezq2t9q+GieHrcqLOTvxfpRvfFPmEtKnhwe5D3NK+5BCQVS16XMiz eaTkGmU9YEUJFzB3tgJlbivUBJACX5f4k8RnEfhauU9j7CpOtN1vDtMjlTnx0qmN0Zzw RNbsOXbnDjLUslyFdfUAU4L3zGhcXPVn0XF13odh/w46nE5xkOH3H3cNHKg6yskJp29q B7KNWpq1HTyOKqd51js2YtwgI36VPppsTwkkUaXW7extvNEPxYGBHnsPRoGyhkbpzhvO hAjHupj3QxDvMl9vQkmrWBm0GszKEAzKJj4CikN3aXRQtkDmiJnlQ6N+oSLYYIU1nayv SRVA== X-Gm-Message-State: AOAM532fITSQaYkmiGOlLa1MNkmdmkp/wlwnbvanf472bzFKrneEOFd1 abLKbtJsMiCv5SxgOFknFJk= X-Google-Smtp-Source: ABdhPJz/1aXf3Ka0OiTOrp1bwTx5qdzbqJDb1+9Eq0Rm4UJYxIna9npyk27qBmpQp5pzwqSqwVuOaA== X-Received: by 2002:a05:600c:20f:: with SMTP id 15mr3193660wmi.148.1612523988855; Fri, 05 Feb 2021 03:19:48 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id h15sm12213982wrt.10.2021.02.05.03.19.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:19:48 -0800 (PST) From: luca.boccassi@gmail.com To: Tal Shnaiderman Cc: Odi Assli , Dmitry Kozlyuk , Ranjit Menon , dpdk stable Date: Fri, 5 Feb 2021 11:14:54 +0000 Message-Id: <20210205111920.1272063-8-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: ignore missing NUMA node 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/ac97254b40ded128f07313ced9cd28c89452e06e Thanks. Luca Boccassi --- >From ac97254b40ded128f07313ced9cd28c89452e06e Mon Sep 17 00:00:00 2001 From: Tal Shnaiderman Date: Sun, 13 Dec 2020 16:16:04 +0200 Subject: [PATCH] bus/pci: ignore missing NUMA node on Windows [ upstream commit ac7c98d04f2c5c8d57c4f87799a669dca9ca9605 ] On older processors, NUMA isn't bound to PCIe locality. those cases return ERROR_NOT_FOUND in response to the SetupDiGetDevicePropertyW call with DEVPKEY_Device_Numa_Node attribute. This error fails the probe process for the PCIe device. this commit will ignore such failure and will set the numa_node to 0. Fixes: b762221ac24f ("bus/pci: support Windows with bifurcated drivers") Reported-by: Odi Assli Signed-off-by: Tal Shnaiderman Tested-by: Odi Assli Acked-by: Dmitry Kozlyuk Acked-by: Ranjit Menon --- drivers/bus/pci/windows/pci.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/bus/pci/windows/pci.c b/drivers/bus/pci/windows/pci.c index fbf0785fdb..f662584528 100644 --- a/drivers/bus/pci/windows/pci.c +++ b/drivers/bus/pci/windows/pci.c @@ -235,6 +235,12 @@ get_device_resource_info(HDEVINFO dev_info, &DEVPKEY_Device_Numa_Node, &property_type, (BYTE *)&numa_node, sizeof(numa_node), NULL, 0); if (!res) { + DWORD error = GetLastError(); + if (error == ERROR_NOT_FOUND) { + /* On older CPUs, NUMA is not bound to PCIe locality. */ + dev->device.numa_node = 0; + return ERROR_SUCCESS; + } RTE_LOG_WIN32_ERR("SetupDiGetDevicePropertyW" "(DEVPKEY_Device_Numa_Node)"); return -1; -- 2.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-05 11:18:29.699636478 +0000 +++ 0008-bus-pci-ignore-missing-NUMA-node-on-Windows.patch 2021-02-05 11:18:28.586686923 +0000 @@ -1 +1 @@ -From ac7c98d04f2c5c8d57c4f87799a669dca9ca9605 Mon Sep 17 00:00:00 2001 +From ac97254b40ded128f07313ced9cd28c89452e06e Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit ac7c98d04f2c5c8d57c4f87799a669dca9ca9605 ] + @@ -16 +17,0 @@ -Cc: stable@dpdk.org