Received: by 2002:a05:6358:d09b:b0:dc:cd0c:909e with SMTP id jc27csp128019rwb; Tue, 15 Nov 2022 20:36:21 -0800 (PST) X-Google-Smtp-Source: AA0mqf6b4W8ju4LDuNi+gHKFJ5EnFCk4B1uNJgu9T7KkwEJynmBj/021BRWhSL/Dms7Uu7jq7k1J X-Received: by 2002:a63:1665:0:b0:426:9c23:9f94 with SMTP id 37-20020a631665000000b004269c239f94mr18802725pgw.105.1668573380883; Tue, 15 Nov 2022 20:36:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668573380; cv=none; d=google.com; s=arc-20160816; b=rBPFv5npItwjPVXHrCziPmXr21ppduQgWXiB+DBQHFiTz5TDLgVuAxTARQG31FIIe6 U1pLJmWlOoHSvZtHu3hs05HNvA45gK+MKtbObyOwpsPdmh65CTj3WroiOOhAeaUrM6xk nq4v6oBlcyud242EYjO6A2HIwicbIWmRFuziOx8/e2AMK2XgYydl4h5pKg2LJsn+w54P eE4dkXJ3QP6NrxFpmNjv4i0Ylt5Z6qhx2JALmbpZQVaul8oASP0KeMDAWHWvJyZv0uWG QWvWmgqduKuiJlmuZm0VSf0R5mblQj4av7/Q3ssWX+GOOjd4urauovODEXWy7RvAHdKw JPRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-disposition:mime-version:message-id :subject:cc:to:from:date:dkim-signature; bh=mxUocFvherJGTnqKrGqP9XwP0x8frYPYHY3cRrvAGko=; b=TOT2vuOavV3RvVqYhwEY8Lpry9D20qD8jW+qgWbh21PnNc+OsUrS+cm/eDZ12hEI5G deNA374atUEklQnYYQKSAhkl7I0VvikKd1t84Z+2lSw1/W3ywQyxETngouUrBVYc3yTV +9tVlR92M8BI2Oz1Z1jaHbmrIfDsKZ2jP2usXXAdBufmmpvbkR3GcPnMia0oKVKKPqrX R9oncJx446UuqSJU4mtoUMBBmaXN1lEBIJSnwcGvbNGYbwWs+lIbFmvRESYUxCWg+V7d yHWVEM1hg479Wh2+Yw9FikhNtV89Wi2Nxmg9s+KdFjsa4fkOa0Dsd9npL39Fb2cavKC3 rhfw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@163.com header.s=s110527 header.b="jOGAss/n"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=163.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s125-20020a632c83000000b0047005e8d871si13636235pgs.43.2022.11.15.20.36.09; Tue, 15 Nov 2022 20:36:20 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@163.com header.s=s110527 header.b="jOGAss/n"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=163.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231311AbiKPDwA (ORCPT + 90 others); Tue, 15 Nov 2022 22:52:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48712 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231432AbiKPDv6 (ORCPT ); Tue, 15 Nov 2022 22:51:58 -0500 Received: from m12-17.163.com (m12-17.163.com [220.181.12.17]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 7FDCDCD4 for ; Tue, 15 Nov 2022 19:51:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=Date:From:Subject:Message-ID:MIME-Version; bh=mxUoc FvherJGTnqKrGqP9XwP0x8frYPYHY3cRrvAGko=; b=jOGAss/noC4c+foei6sNY 0fRytzSt3KNXMOe2groizBwyFysrQSWHXjjFV7hryVp19I/3fiGpFgOR8GVe5P3h 3+epX4N6IiMX9C33rpND/6WQIX5TKQXNsXvkbCL381WuTk1uUrMCV1sNgjBYvq77 YenIRpO2kcEseZkMxCdCQQ= Received: from localhost (unknown [49.235.41.28]) by smtp13 (Coremail) with SMTP id EcCowAD3R5rwXXRjqLUHpw--.28813S2; Wed, 16 Nov 2022 11:50:09 +0800 (CST) Date: Wed, 16 Nov 2022 11:50:08 +0800 From: Hui Su To: Ingo Molnar , Peter Zijlstra , Juri Lelli , Vincent Guittot , Dietmar Eggemann , Steven Rostedt , Ben Segall , Mel Gorman , Daniel Bristot de Oliveira , Valentin Schneider , linux-kernel@vger.kernel.org Cc: suhui@zeku.com Subject: [PATCH] sched: use nr_cpus_node() here Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-CM-TRANSID: EcCowAD3R5rwXXRjqLUHpw--.28813S2 X-Coremail-Antispam: 1Uf129KBjvdXoW7Xry8Aw1kKry7GryrGr15urg_yoWkXrg_W3 Wrur1Fgw1vvw4IvFZrAw4xXr9Yqa48KFnakw1fKayUZryUtrZxA3s8AF95Xrn5Xws7JFZx trn0qFsxtrn8GjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IUjdcTJUUUUU== X-Originating-IP: [49.235.41.28] X-CM-SenderInfo: 5vxk3xhbnh20lho6il2tof0z/1tbivBG7bWASZ2bXgwAAsc X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org use nr_cpus_node() here Signed-off-by: Hui Su --- kernel/sched/fair.c | 2 +- kernel/sched/topology.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index e4a0b8bd941c..94e3c9169a8f 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -1805,7 +1805,7 @@ static void update_numa_stats(struct task_numa_env *env, } rcu_read_unlock(); - ns->weight = cpumask_weight(cpumask_of_node(nid)); + ns->weight = nr_cpus_node(nid); ns->node_type = numa_classify(env->imbalance_pct, ns); diff --git a/kernel/sched/topology.c b/kernel/sched/topology.c index 8739c2a5a54e..4d06ec82c61b 100644 --- a/kernel/sched/topology.c +++ b/kernel/sched/topology.c @@ -1999,7 +1999,7 @@ void sched_update_numa(int cpu, bool online) * Scheduler NUMA topology is updated when the first CPU of a * node is onlined or the last CPU of a node is offlined. */ - if (cpumask_weight(cpumask_of_node(node)) != 1) + if (nr_cpus_node(node) != 1) return; sched_reset_numa(); -- 2.34.1