From patchwork Wed Jul 20 02:59:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Aneesh Kumar K.V" X-Patchwork-Id: 12923296 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6ABD4C43334 for ; Wed, 20 Jul 2022 03:00:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C417D6B007B; Tue, 19 Jul 2022 23:00:14 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BEFFD6B007D; Tue, 19 Jul 2022 23:00:14 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A1BE86B007E; Tue, 19 Jul 2022 23:00:14 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 9016C6B007B for ; Tue, 19 Jul 2022 23:00:14 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 6CF05A0440 for ; Wed, 20 Jul 2022 03:00:14 +0000 (UTC) X-FDA: 79705974348.14.2EE2B25 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by imf22.hostedemail.com (Postfix) with ESMTP id EAC96C008B for ; Wed, 20 Jul 2022 03:00:13 +0000 (UTC) Received: from pps.filterd (m0098404.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 26K2gLxl002427; Wed, 20 Jul 2022 03:00:07 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=d4hY5T8h3P3yTciiyzpijA0CASBqERoWzYtXZLunFso=; b=THJC44wwLL0G9sige+dbgiZNLp4L0cZnciRBFmZa/oRkMxbHF7uCbbaMR4yH/XbECygd 7qBuMU7kMcu0dsZ9JdkBRRk9uZc07i6+fSaEuwCxzk1G3GcXW2Xk3ytiX1Uk2vINOc9j GpOn3dT6umke+NAXJ81lCMZQXLK5qen39RrmSGfZzJkoKrGdOyJYLxJpTJCvo5gLNX8N g+pYPOsan/TDOLC80GOUWvCgsR3lptZ8Pwjg0f4eJ9IWu0yfYcXspRNCWt2J4M1/c6JF +IheeiBWP/z+kXoG3fJgTrwydqQasM05pZcguhqfbPyg2sLf3eOt3r5YeRR+BQmQP9Mf bw== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3he9598cby-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 20 Jul 2022 03:00:06 +0000 Received: from m0098404.ppops.net (m0098404.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 26K2hrPc014361; Wed, 20 Jul 2022 03:00:06 GMT Received: from ppma04wdc.us.ibm.com (1a.90.2fa9.ip4.static.sl-reverse.com [169.47.144.26]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3he9598cax-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 20 Jul 2022 03:00:06 +0000 Received: from pps.filterd (ppma04wdc.us.ibm.com [127.0.0.1]) by ppma04wdc.us.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 26K2o6i3008114; Wed, 20 Jul 2022 03:00:04 GMT Received: from b03cxnp07027.gho.boulder.ibm.com (b03cxnp07027.gho.boulder.ibm.com [9.17.130.14]) by ppma04wdc.us.ibm.com with ESMTP id 3hbmy9f3ha-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 20 Jul 2022 03:00:04 +0000 Received: from b03ledav002.gho.boulder.ibm.com (b03ledav002.gho.boulder.ibm.com [9.17.130.233]) by b03cxnp07027.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 26K303DL32440782 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 20 Jul 2022 03:00:03 GMT Received: from b03ledav002.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id C7A12136053; Wed, 20 Jul 2022 03:00:03 +0000 (GMT) Received: from b03ledav002.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id A077F136059; Wed, 20 Jul 2022 02:59:56 +0000 (GMT) Received: from skywalker.ibmuc.com (unknown [9.43.15.129]) by b03ledav002.gho.boulder.ibm.com (Postfix) with ESMTP; Wed, 20 Jul 2022 02:59:56 +0000 (GMT) From: "Aneesh Kumar K.V" To: linux-mm@kvack.org, akpm@linux-foundation.org Cc: Wei Xu , Huang Ying , Yang Shi , Davidlohr Bueso , Tim C Chen , Michal Hocko , Linux Kernel Mailing List , Hesham Almatary , Dave Hansen , Jonathan Cameron , Alistair Popple , Dan Williams , Johannes Weiner , jvgediya.oss@gmail.com, "Aneesh Kumar K.V" Subject: [PATCH v10 3/8] mm/demotion: Add hotplug callbacks to handle new numa node onlined Date: Wed, 20 Jul 2022 08:29:15 +0530 Message-Id: <20220720025920.1373558-4-aneesh.kumar@linux.ibm.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220720025920.1373558-1-aneesh.kumar@linux.ibm.com> References: <20220720025920.1373558-1-aneesh.kumar@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-GUID: h8jquO0PXY5vgSZO0D5eDCWeDZAYq7iw X-Proofpoint-ORIG-GUID: VFjEaa-UFAw1Ak6cWfSa5C6JOMAjoyHJ X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.883,Hydra:6.0.517,FMLib:17.11.122.1 definitions=2022-07-19_10,2022-07-19_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=0 adultscore=0 malwarescore=0 priorityscore=1501 phishscore=0 clxscore=1015 impostorscore=0 mlxlogscore=999 bulkscore=0 lowpriorityscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2206140000 definitions=main-2207200008 ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=THJC44ww; dmarc=pass (policy=none) header.from=ibm.com; spf=pass (imf22.hostedemail.com: domain of aneesh.kumar@linux.ibm.com designates 148.163.156.1 as permitted sender) smtp.mailfrom=aneesh.kumar@linux.ibm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1658286014; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=d4hY5T8h3P3yTciiyzpijA0CASBqERoWzYtXZLunFso=; b=aUpkD8w4XRE4aljPlpDOr0keZiDp/JPBX/ZaCIboCpAipFgzjPSSVf73D9bP9fUYrTVtRj ivwccKDyN5SJpD4SVR3pkhD+x7W90jSJsGY1MvcOuit95w+O4QSdaf38Gjka7vD18sekQ2 uqQ/XujryJWs8/cn3fZtMLECZyKOB0Y= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1658286014; a=rsa-sha256; cv=none; b=T3a2y5mPOPJDlP+isqp7JM9ZwUBdUcJqBuJh8PdDVzUw1u+mjAOdxH5TjzI/m4jN2ioO2M bcfcCHBSepoQW5roALsNqnQAd3sK7bEHbbF8JAhZSPcccm8KJBkIvARHHJDVUfoaDxZDwR I5jQkSp4CsJBURRXUiMLOvArGib02RI= X-Rspamd-Queue-Id: EAC96C008B Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=THJC44ww; dmarc=pass (policy=none) header.from=ibm.com; spf=pass (imf22.hostedemail.com: domain of aneesh.kumar@linux.ibm.com designates 148.163.156.1 as permitted sender) smtp.mailfrom=aneesh.kumar@linux.ibm.com X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: odrysfzbbwqsiuc7cor37afoxc4wz1p3 X-HE-Tag: 1658286013-923051 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: If the new NUMA node onlined doesn't have a performance level assigned, the kernel adds the NUMA node to default memory tier. Signed-off-by: Aneesh Kumar K.V --- include/linux/memory-tiers.h | 1 + mm/memory-tiers.c | 75 ++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+) diff --git a/include/linux/memory-tiers.h b/include/linux/memory-tiers.h index ef380a39db3a..3d5f14d57ae6 100644 --- a/include/linux/memory-tiers.h +++ b/include/linux/memory-tiers.h @@ -14,6 +14,7 @@ #define MEMTIER_PERF_LEVEL_DRAM (1 << (MEMTIER_CHUNK_BITS + 2)) /* leave one tier below this slow pmem */ #define MEMTIER_PERF_LEVEL_PMEM (1 << MEMTIER_CHUNK_BITS) +#define MEMTIER_HOTPLUG_PRIO 100 extern bool numa_demotion_enabled; diff --git a/mm/memory-tiers.c b/mm/memory-tiers.c index 41a21cc5ae55..cc3a47ec18e4 100644 --- a/mm/memory-tiers.c +++ b/mm/memory-tiers.c @@ -5,6 +5,7 @@ #include #include #include +#include #include struct memory_tier { @@ -64,6 +65,78 @@ static struct memory_tier *find_create_memory_tier(unsigned int perf_level) return new_memtier; } +static struct memory_tier *__node_get_memory_tier(int node) +{ + struct memory_tier *memtier; + + list_for_each_entry(memtier, &memory_tiers, list) { + if (node_isset(node, memtier->nodelist)) + return memtier; + } + return NULL; +} + +static void init_node_memory_tier(int node) +{ + int perf_level; + struct memory_tier *memtier; + + mutex_lock(&memory_tier_lock); + + memtier = __node_get_memory_tier(node); + if (!memtier) { + perf_level = node_devices[node]->perf_level; + memtier = find_create_memory_tier(perf_level); + node_set(node, memtier->nodelist); + } + mutex_unlock(&memory_tier_lock); +} + +static void clear_node_memory_tier(int node) +{ + struct memory_tier *memtier; + + mutex_lock(&memory_tier_lock); + memtier = __node_get_memory_tier(node); + if (memtier) + node_clear(node, memtier->nodelist); + mutex_unlock(&memory_tier_lock); +} + +/* + * This runs whether reclaim-based migration is enabled or not, + * which ensures that the user can turn reclaim-based migration + * at any time without needing to recalculate migration targets. + */ +static int __meminit migrate_on_reclaim_callback(struct notifier_block *self, + unsigned long action, void *_arg) +{ + struct memory_notify *arg = _arg; + + /* + * Only update the node migration order when a node is + * changing status, like online->offline. + */ + if (arg->status_change_nid < 0) + return notifier_from_errno(0); + + switch (action) { + case MEM_OFFLINE: + clear_node_memory_tier(arg->status_change_nid); + break; + case MEM_ONLINE: + init_node_memory_tier(arg->status_change_nid); + break; + } + + return notifier_from_errno(0); +} + +static void __init migrate_on_reclaim_init(void) +{ + hotplug_memory_notifier(migrate_on_reclaim_callback, MEMTIER_HOTPLUG_PRIO); +} + static int __init memory_tier_init(void) { int node; @@ -96,6 +169,8 @@ static int __init memory_tier_init(void) node_property->perf_level = default_memtier_perf_level; } mutex_unlock(&memory_tier_lock); + + migrate_on_reclaim_init(); return 0; } subsys_initcall(memory_tier_init);