From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 091DAC33CB1 for ; Tue, 14 Jan 2020 15:16:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CF5392467D for ; Tue, 14 Jan 2020 15:16:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579015006; bh=JPREaefhIiKLK5BP73UKticDaN0pgQPRdPLg9xr/ih4=; h=Subject:To:From:Date:List-ID:From; b=rSvFUzgarZs8RECUnez2uwWE/zFlwb6VctixWicPFK2s+ZYGVtqfLDkWTSRdWvOAX +P67jzLxV7U3ciq4BMF5daZ1T2kcEVa2cfWwjazj4bkDa9kkMCGt6jllxOpHI2hIcw MLBwYSsAbAR1TWUlkG9TlZZKQu3jpnnpwWia7gVg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726971AbgANPQq (ORCPT ); Tue, 14 Jan 2020 10:16:46 -0500 Received: from mail.kernel.org ([198.145.29.99]:59848 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725904AbgANPQq (ORCPT ); Tue, 14 Jan 2020 10:16:46 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id DDF93222C4; Tue, 14 Jan 2020 15:16:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579015005; bh=JPREaefhIiKLK5BP73UKticDaN0pgQPRdPLg9xr/ih4=; h=Subject:To:From:Date:From; b=Ew+0choWxA3WLHFqicxNEe3W8OLXA6Ucl9re8JFdqovUa8/uNDLweJPOX3+JgzqMS Sd2kVV/1U2vIjvy/kAUE0OQkvs97LklL4dXAlVXi2hAfN5g7+yqPLoz5SVvVhQGHuf 3Q5wW0yRX17HGddPFoIYLqalvp6YSWmdwzCgGtGg= Subject: patch "driver core: Fix test_async_driver_probe if NUMA is disabled" added to driver-core-testing To: linux@roeck-us.net, alexander.h.duyck@linux.intel.com, gregkh@linuxfoundation.org, stable@vger.kernel.org From: Date: Tue, 14 Jan 2020 16:16:38 +0100 Message-ID: <15790149981829@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org This is a note to let you know that I've just added the patch titled driver core: Fix test_async_driver_probe if NUMA is disabled to my driver-core git tree which can be found at git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git in the driver-core-testing branch. The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.) The patch will be merged to the driver-core-next branch sometime soon, after it passes testing, and the merge window is open. If you have any questions about this process, please let me know. >From 264d25275a46fce5da501874fa48a2ae5ec571c8 Mon Sep 17 00:00:00 2001 From: Guenter Roeck Date: Wed, 27 Nov 2019 12:24:53 -0800 Subject: driver core: Fix test_async_driver_probe if NUMA is disabled Since commit 57ea974fb871 ("driver core: Rewrite test_async_driver_probe to cover serialization and NUMA affinity"), running the test with NUMA disabled results in warning messages similar to the following. test_async_driver test_async_driver.12: NUMA node mismatch -1 != 0 If CONFIG_NUMA=n, dev_to_node(dev) returns -1, and numa_node_id() returns 0. Both are widely used, so it appears risky to change return values. Augment the check with IS_ENABLED(CONFIG_NUMA) instead to fix the problem. Cc: Alexander Duyck Fixes: 57ea974fb871 ("driver core: Rewrite test_async_driver_probe to cover serialization and NUMA affinity") Signed-off-by: Guenter Roeck Cc: stable Acked-by: Alexander Duyck Link: https://lore.kernel.org/r/20191127202453.28087-1-linux@roeck-us.net Signed-off-by: Greg Kroah-Hartman --- drivers/base/test/test_async_driver_probe.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/base/test/test_async_driver_probe.c b/drivers/base/test/test_async_driver_probe.c index f4b1d8e54daf..3bb7beb127a9 100644 --- a/drivers/base/test/test_async_driver_probe.c +++ b/drivers/base/test/test_async_driver_probe.c @@ -44,7 +44,8 @@ static int test_probe(struct platform_device *pdev) * performing an async init on that node. */ if (dev->driver->probe_type == PROBE_PREFER_ASYNCHRONOUS) { - if (dev_to_node(dev) != numa_node_id()) { + if (IS_ENABLED(CONFIG_NUMA) && + dev_to_node(dev) != numa_node_id()) { dev_warn(dev, "NUMA node mismatch %d != %d\n", dev_to_node(dev), numa_node_id()); atomic_inc(&warnings); -- 2.24.1