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 3D751A034F for ; Wed, 10 Nov 2021 07:39:48 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 311494014D; Wed, 10 Nov 2021 07:39:48 +0100 (CET) Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam08on2052.outbound.protection.outlook.com [40.107.100.52]) by mails.dpdk.org (Postfix) with ESMTP id 5CAE940142 for ; Wed, 10 Nov 2021 07:39:47 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=f41hvFjN4zBoXyDHaN6VnhNR+zeXRZKb4Nij00oSRXpQvTlGTmWHJ3ObopSEUIHVMb0ksleD4N1dczMK26RHqCkZ930IDHnHJMOI4mvEnDpV8vTI92dZj02E0aCJg5DIcFQ27pKJJFHR6Le0VWWwEf20OhbD5AyAq039K+dDC5E3QDOHrrU30tYGG1it/1a63qa0zxxdhvuVUTk4/slkp0GlilJeMiFrbK4ioUAEGtrmeX5nk6DdzQADk46SgUHb2dBuzsGLAlbuKIOai2XD34uS3YvM9pRnwdRdkpEO/A9mlF7mdxHPUFH7ayK90F+5bjbN5CLJdW/aOgBejt+EWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=qw9r1rA+GHwa6DUFYHxBoRw/VojjWXmB9waTIOW5pgU=; b=hRKm7espq3aoMIIlgnXGThpht+vH+UTe7W9Ri5BrA1Kdnnsz7VM76oXrh+y34+WKRrVeZSvY3a6/7xwatkMe/QVmegTPhr4NKr5ZlV/cJxQloyMqs/XNPWMtXQ5q4EMjp0YGKqSB9+zlhClf8SuYxv9F6aPoY8wAKFvXgPvF9WCv9kSoNjPzT/4Om9U9fidJMgDQ+YqxqEva6hjBdiQR5jMH3Vte/KspvenhRCBlT2cR/7m/AT6yPBIGTKQ1jFisLepqLy91oqnDSAk0Mk4SpJfHRWacKYavGPSgcnzArCyd7IHxE8ZQgBiNhxsOsPTnmQolw+p5mo2FdBUEiqr2yg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=qw9r1rA+GHwa6DUFYHxBoRw/VojjWXmB9waTIOW5pgU=; b=gEb676CTqsOfMYsCz+IudetZvNsz1x5oC80Ru1QUw85gpSq5KkSZsKk1Hacp+55rzlqoAHQQLFwpuAltoMR2rT7ubH61VHR1sRcmae5vb7WdEaZg7venXQ3yzn3ZYYOgE9E0a0dlWEBC9DgVbmFBXwC1/Yw9PSv5Mc1aM/5lDIkJIbSaDRVEEvhz6JLsnkhLi8qGd1hOKCE77xM/8J8rU1k5QQFm8oOziPo2tpk7Iz/q4Ue1a1M78Ye98XxBgpDFs/jaaQyiB0QvJbW+fqk35y/HwDL4hcrW6+rcy/0J4pd8fxHwdi3WDhkLr+TLadAmXseccz7NSwKHz4/Oaeaizg== Received: from DM6PR08CA0039.namprd08.prod.outlook.com (2603:10b6:5:1e0::13) by DM6PR12MB4580.namprd12.prod.outlook.com (2603:10b6:5:2a8::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.16; Wed, 10 Nov 2021 06:39:44 +0000 Received: from DM6NAM11FT018.eop-nam11.prod.protection.outlook.com (2603:10b6:5:1e0:cafe::6d) by DM6PR08CA0039.outlook.office365.com (2603:10b6:5:1e0::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.11 via Frontend Transport; Wed, 10 Nov 2021 06:39:44 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by DM6NAM11FT018.mail.protection.outlook.com (10.13.172.110) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4690.15 via Frontend Transport; Wed, 10 Nov 2021 06:39:43 +0000 Received: from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Wed, 10 Nov 2021 06:39:38 +0000 From: Xueming Li To: Pallavi Kadam CC: Luca Boccassi , Vipin Varghese , Tal Shnaiderman , dpdk stable Date: Wed, 10 Nov 2021 14:29:09 +0800 Message-ID: <20211110063216.2744012-66-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211110063216.2744012-1-xuemingl@nvidia.com> References: <20211110063216.2744012-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL101.nvidia.com (172.20.187.10) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0099f878-7e36-4b59-571a-08d9a414e192 X-MS-TrafficTypeDiagnostic: DM6PR12MB4580: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: O0qxkBSH/ZY3yJeWwDz6OCP2CUbKRKLgSQHhFALng7hdnb0B3yQaMUuyNlvGE8QBWb0yKy3o0dMm7B6aogBuUIKJzx49cUFvIHNOpVn+8Lr8D8nwStAxLkTuGJdOFVk6+K0dyWA/xNShJOq1xgRbevomFQW7nbv2Awo3sX+vnALzXKlDg2NImHMaaNncQje/0gthTl1CGh6lePq2GMOj42/780WsDRQPnzr/ixX42ERegm/gDf4wjf5otEy4lUzmg3hqtWZStq8eLbZW9/k+IdwBq0x/zYGJzWUhbRkL60vWR83jjmaQYS3vFO16ToLk+ynThf+2bBdrJ7etZnRXeYn5QADsqej0EOqzu7rkW8slPsX8S6J5giN7TQ1Sg0UNdw8vhwiyTfD7h0NO38x5eQpKPJOX9qMMf5eUSWIbPZtyu1+NieKwFRYa34mzzOEfxZ+/DgzDiOfy6jSP3s80ushTVt3CAXQSV/Uefre1AyEuOqg0AzcnMKLqcf7yCOmgCst1djfY5PQtZc6YzuzNULwJzuoHjPwfMaVkthVa+fWyM0z3CyTkxBmmObe6l2swkkpOelczTi1ca3uEX0fuvlG0rhdyjt+TDK8qVi5HAuZGS+AkczxcIh7kRzJ+dobtzkogX18bxrfz9InzjXDgkcp+O15tZd0cv/GpqDeERJmvVVdD/VjrO0YaVjYSnbYhxZbnF2eT9sEYqtoDcHEUqMIqgtuF2VtEPWW7HFiy/6U5+ETNPvQzfIanvCWGDsYL5f5PAKgL9ifWfJP+v/0R5W6IE1C4FQsxQRqhZCqGXcaj6jgOFFd9jnmTl2LWReSW2iV7+c1LKuqS69m6EEjFcw== X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(46966006)(36840700001)(7636003)(5660300002)(186003)(356005)(2616005)(426003)(26005)(7696005)(336012)(8676002)(70586007)(55016002)(70206006)(47076005)(53546011)(16526019)(6916009)(8936002)(36756003)(54906003)(508600001)(83380400001)(4326008)(6666004)(82310400003)(4001150100001)(2906002)(6286002)(316002)(966005)(86362001)(1076003)(36860700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Nov 2021 06:39:43.9301 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0099f878-7e36-4b59-571a-08d9a414e192 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT018.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4580 Subject: [dpdk-stable] patch 'bus/pci: fix unknown NUMA node value on Windows' has been queued to stable release 20.11.4 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.4 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/12/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/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/2a5a4216585632e05be9ddfcd55bc7b9d98e7d39 Thanks. Xueming Li --- >From 2a5a4216585632e05be9ddfcd55bc7b9d98e7d39 Mon Sep 17 00:00:00 2001 From: Pallavi Kadam Date: Wed, 22 Sep 2021 14:19:06 -0700 Subject: [PATCH] bus/pci: fix unknown NUMA node value on Windows Cc: Xueming Li [ upstream commit bf7cf1f947bd18aa1b9673ea4188a5802741d05a ] On older CPUs, currently numa_node returns value only for socket 0. Instead, application should be able to make correct decision and also to keep consistent with the Linux code, replace the return value to -1. Fixes: ac7c98d04f2c ("bus/pci: ignore missing NUMA node on Windows") Reported-by: Vipin Varghese Signed-off-by: Pallavi Kadam Acked-by: Tal Shnaiderman --- drivers/bus/pci/windows/pci.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/bus/pci/windows/pci.c b/drivers/bus/pci/windows/pci.c index ad9d65efd8..12a46ae370 100644 --- a/drivers/bus/pci/windows/pci.c +++ b/drivers/bus/pci/windows/pci.c @@ -5,6 +5,7 @@ #include #include #include +#include #include "private.h" #include "pci_netuio.h" @@ -240,7 +241,7 @@ get_device_resource_info(HDEVINFO dev_info, DWORD error = GetLastError(); if (error == ERROR_NOT_FOUND) { /* On older CPUs, NUMA is not bound to PCIe locality. */ - dev->device.numa_node = 0; + dev->device.numa_node = SOCKET_ID_ANY; return ERROR_SUCCESS; } RTE_LOG_WIN32_ERR("SetupDiGetDevicePropertyW" -- 2.33.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-10 14:17:04.979479110 +0800 +++ 0065-bus-pci-fix-unknown-NUMA-node-value-on-Windows.patch 2021-11-10 14:17:01.824079806 +0800 @@ -1 +1 @@ -From bf7cf1f947bd18aa1b9673ea4188a5802741d05a Mon Sep 17 00:00:00 2001 +From 2a5a4216585632e05be9ddfcd55bc7b9d98e7d39 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit bf7cf1f947bd18aa1b9673ea4188a5802741d05a ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org @@ -22 +24 @@ -index d39a7748b8..343ef6f33b 100644 +index ad9d65efd8..12a46ae370 100644 @@ -33 +35 @@ -@@ -243,7 +244,7 @@ get_device_resource_info(HDEVINFO dev_info, +@@ -240,7 +241,7 @@ get_device_resource_info(HDEVINFO dev_info,