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 76B4FA034F for ; Wed, 10 Nov 2021 07:40:54 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 70D6A40E28; Wed, 10 Nov 2021 07:40:54 +0100 (CET) Received: from NAM04-DM6-obe.outbound.protection.outlook.com (mail-dm6nam08on2066.outbound.protection.outlook.com [40.107.102.66]) by mails.dpdk.org (Postfix) with ESMTP id 8E332410EF for ; Wed, 10 Nov 2021 07:40:53 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EHcuWjwt/8CeC0O7izEZ+hDHy5o64lM2J0Xuj0bYXqIhsOs5/CcLlI3XouJmyiN3B84ymEsP8X+TyRAgpGz1ZA9tpfvYVfw6f0BXHdyga6mfvR7I4JKLor2KPS40QGwg2HZGtBWaJCHtBX/DloBJfRGxCn9VIrUQDWAS9g07KKHFQ7cOfYnjDtPOyqj0oH8dLHmf4x+j+3R5wJjZlij0YcRsLswf0XNHYEVkANrsrNYjMWu1PPVdPL6nI1pdQ2CcDHwsqs+QC0NIsTtuEutfJgJzsHUOgN2AA/iQPlYGtwBcftmAHf1jGG1zvMB5Vv1F9Q+cETIUsRU8W2TDOuZI7g== 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=vYXhUsfVxKux6itelOnUijJ/52hD8AnCYqdb56ULdwg=; b=QFUNavNgvLNG+PNCGomYAFyxqpMvYxUnjgK5jXeOVaUOqnemA72qcXOrsLxlhlK+IC3xNfkv2WpnJxL2+OYVNf1hg6VnJmbnLn0CPwquDfgPzXGn1KiSt8MRfUOgYn5ltX5p7vLMDWgePPcXax21sYV5YtzdW1w3/jZ/OeJeDyE8TAwaJz8qmAh3PzL+HGs5P6PbGVKsr5bXrX9jytvCeePXLAN0PyXIUJRos7AAo/4nKZOJpYrkR3ALUTvCupDKaN8aKZ7r7uE+ldLkWh/+OBDaj6O8CWrgcJNKKGZ6kt4MAPTNuahreBZyWzzKmjIQW1ykWPp8Ipjea/7ZmcrGxg== 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=vYXhUsfVxKux6itelOnUijJ/52hD8AnCYqdb56ULdwg=; b=b79n8l2xXMFdyiwR6YBNdpQT7ytPnUIK3EuzVrKb7jdlDmKHraalmaYcIFHYlY4c/i66LES6Ut83DT6OPvnMwr5hbl7iN2nkXVA7En3O20kKPp0c8VGnnV6TTqIVVnjku+nNC+T66xeYWrmCWKzEAaW5OjRV6IEEDj8t4VUIGmA1ScUNaYtczWrdZwRzx+X6gbn7ewT8b1MqTx++R4tHfAFcVQtnZsE31KaIJfaKHz7LY6ZY1GMxt9H/Xfq/UUPHBy6Y9nQFHhCzVbJCROye+SsKGTW6Mki3q+9SD/BiIJSYi9ewaeOfmUDdCXFbE9QybS033qpo84LNDjooWlbkzg== Received: from DS7PR07CA0002.namprd07.prod.outlook.com (2603:10b6:5:3af::8) by PH0PR12MB5451.namprd12.prod.outlook.com (2603:10b6:510:ee::20) 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:40:51 +0000 Received: from DM6NAM11FT066.eop-nam11.prod.protection.outlook.com (2603:10b6:5:3af:cafe::5c) by DS7PR07CA0002.outlook.office365.com (2603:10b6:5:3af::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.15 via Frontend Transport; Wed, 10 Nov 2021 06:40:51 +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 DM6NAM11FT066.mail.protection.outlook.com (10.13.173.179) 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:40:51 +0000 Received: from nvidia.com (172.20.187.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Wed, 10 Nov 2021 06:40:49 +0000 From: Xueming Li To: Pallavi Kadam CC: Luca Boccassi , Vipin Varghese , Ranjit Menon , dpdk stable Date: Wed, 10 Nov 2021 14:29:23 +0800 Message-ID: <20211110063216.2744012-80-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.5] 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: ee636e68-c9e0-4f4e-68c9-08d9a41509ad X-MS-TrafficTypeDiagnostic: PH0PR12MB5451: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wRHqvbl37dviOLotDG4/10j0r0sN4qS3sen5Its2XLi+MoRXQNmFFExwetjRwJnvyZZdkW4G1hmPN97rB6k8/Ld22Z/ByTpyh/OvsLrW+uqzDrnyLj4Z5NWgAXapHS+T6kBsJjKwPlw3rVyTt+TnoiINsMqmK/5RRQfnriu71q+cX+a0Y0+BDyCLvvIxOcEv8uZtfuuEpAVZmnzC7+AOINgn9u79IN3IKakuGTPwwftzGIB4WFKNkjfO/jz5YUT0UHKytjbXqmyov2dCBMMM5MQUg+MR5cdaVxWjHN1RySXAfd8AKNvP6kjGexIvwVA2LATAm8JhzuMxvd2BmXgFAu+w8LpW264vb0O0kOQUdScuQvln0A32tCyjlLLQhDd3AidnYo2w3anTOXjufgKiNjC76XfhWbRezGLgYZJWlvXf5wt102lYu/NApR9tuj+ono7UYbA/OPnHNH4JWtqoluDUVqJngzW6iKiR1UGulcM1i0auPlfjNcTCm88OO8s9zEM9zlnptogMHftfuJMaV35PytVOzYExK1IfJ4NYmWcZxp6oKJb1CQXiKOwcNua/YDVEvJQnfg2J68L1p4HAzxTCT1SNLe7DNz4GV53poVKYL61TDf4bPJ/Q9czjzIyvNmkE1106CiPSdTJ5gqG/aQP/EO77W4J6sGhD2FhWrC07uVXp7YtMx6NR4z9wvZdHVxvOLRenaPFoooURMX6iHMY8Lmi2HpeDh3s01Wk4awOJp2QWXco/jqxipuO1XId9/2eYJNt6cwECEM6302WhjLmr4+L+pItwiGxxb+DcFOoOYSCrW9IypDxJUnvbcl0eW+0brFIvqHuVtN2AGwZGfg== 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)(36840700001)(46966006)(36860700001)(2906002)(86362001)(36756003)(4326008)(356005)(5660300002)(47076005)(55016002)(36906005)(316002)(8676002)(4001150100001)(7636003)(6286002)(966005)(426003)(54906003)(2616005)(6916009)(16526019)(508600001)(1076003)(336012)(186003)(8936002)(83380400001)(53546011)(82310400003)(26005)(70206006)(7696005)(70586007)(6666004); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Nov 2021 06:40:51.2174 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ee636e68-c9e0-4f4e-68c9-08d9a41509ad 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: DM6NAM11FT066.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR12MB5451 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/196cda0e31b1ac4a41a525f186aa5506b3654237 Thanks. Xueming Li --- >From 196cda0e31b1ac4a41a525f186aa5506b3654237 Mon Sep 17 00:00:00 2001 From: Pallavi Kadam Date: Mon, 27 Sep 2021 11:43:22 -0700 Subject: [PATCH] bus/pci: fix unknown NUMA node value on Windows Cc: Xueming Li [ upstream commit 3c6e581025109926c166bbd2f7ea678f07c3bbce ] Based on the rte_eth_dev_socket_id() documentation, set the default numa_node to -1. When the API is unsuccessful, set numa_node to 0. This change more correctly resembles the Linux code. Fixes: bf7cf1f947bd ("bus/pci: fix unknown NUMA node value on Windows") Reported-by: Vipin Varghese Signed-off-by: Pallavi Kadam Acked-by: Ranjit Menon --- 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 12a46ae370..4944c21f67 100644 --- a/drivers/bus/pci/windows/pci.c +++ b/drivers/bus/pci/windows/pci.c @@ -234,6 +234,7 @@ get_device_resource_info(HDEVINFO dev_info, } /* Get NUMA node using DEVPKEY_Device_Numa_Node */ + dev->device.numa_node = SOCKET_ID_ANY; res = SetupDiGetDevicePropertyW(dev_info, dev_info_data, &DEVPKEY_Device_Numa_Node, &property_type, (BYTE *)&numa_node, sizeof(numa_node), NULL, 0); @@ -241,7 +242,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 = SOCKET_ID_ANY; + dev->device.numa_node = 0; 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:05.579301066 +0800 +++ 0079-bus-pci-fix-unknown-NUMA-node-value-on-Windows.patch 2021-11-10 14:17:01.844079642 +0800 @@ -1 +1 @@ -From 3c6e581025109926c166bbd2f7ea678f07c3bbce Mon Sep 17 00:00:00 2001 +From 196cda0e31b1ac4a41a525f186aa5506b3654237 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 3c6e581025109926c166bbd2f7ea678f07c3bbce ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org @@ -22 +24 @@ -index 343ef6f33b..644c452c76 100644 +index 12a46ae370..4944c21f67 100644 @@ -25 +27 @@ -@@ -237,6 +237,7 @@ get_device_resource_info(HDEVINFO dev_info, +@@ -234,6 +234,7 @@ get_device_resource_info(HDEVINFO dev_info, @@ -33 +35 @@ -@@ -244,7 +245,7 @@ get_device_resource_info(HDEVINFO dev_info, +@@ -241,7 +242,7 @@ get_device_resource_info(HDEVINFO dev_info,