From patchwork Fri Jul 29 06:13:44 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: 12931949 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 6DD97C00144 for ; Fri, 29 Jul 2022 06:14:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E24DE6B0073; Fri, 29 Jul 2022 02:14:29 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DAD998E0002; Fri, 29 Jul 2022 02:14:29 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C264A8E0001; Fri, 29 Jul 2022 02:14:29 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id B2B576B0073 for ; Fri, 29 Jul 2022 02:14:29 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 955961410D9 for ; Fri, 29 Jul 2022 06:14:29 +0000 (UTC) X-FDA: 79739123058.08.8C3E607 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by imf04.hostedemail.com (Postfix) with ESMTP id 13288400B8 for ; Fri, 29 Jul 2022 06:14:27 +0000 (UTC) Received: from pps.filterd (m0098399.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 26T6Buqx010462; Fri, 29 Jul 2022 06:14:17 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=fcL7bYZWocb9gTQqP8P6PPfRVSuuKAPr0DzTV/oZt58=; b=GztO+eqZ0nFqRKnpJ82jpBr73YfNGX6QwOw1nJEZIM/t0D3uwWFsIW7V61EQDutEE7cu aOo17lhySgmJby8f3eCZQZI+ERKNV7p0R2M3GUuxvNZdtHNMz/qj9xwyfwtTnLrAaXnC JK/qdmH2BY5f+Qd4sReLWRFVsPa/UxkVNrP9BGs9VUoo5hmyCIfdCJoVoNwJ+pPFeZir rSBczwOHym+vlpG1GzQTEYsqHs4xUCrYtOGg1OaaY2YJDgagdPrKh7RJPmc8XLaSQRcy NEhKXuByqdk8h/TJt/LsaWJAEqkWjNg0CTupX1oNpz9wfxaOTjTywgFM+CpyZ1obWVd+ MQ== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3hma2n01rs-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 29 Jul 2022 06:14:16 +0000 Received: from m0098399.ppops.net (m0098399.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 26T6DaBe017335; Fri, 29 Jul 2022 06:14:16 GMT Received: from ppma03dal.us.ibm.com (b.bd.3ea9.ip4.static.sl-reverse.com [169.62.189.11]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3hma2n01ra-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 29 Jul 2022 06:14:16 +0000 Received: from pps.filterd (ppma03dal.us.ibm.com [127.0.0.1]) by ppma03dal.us.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 26T65usl013504; Fri, 29 Jul 2022 06:14:15 GMT Received: from b03cxnp08026.gho.boulder.ibm.com (b03cxnp08026.gho.boulder.ibm.com [9.17.130.18]) by ppma03dal.us.ibm.com with ESMTP id 3hg9794th7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 29 Jul 2022 06:14:15 +0000 Received: from b03ledav004.gho.boulder.ibm.com (b03ledav004.gho.boulder.ibm.com [9.17.130.235]) by b03cxnp08026.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 26T6EExl42205518 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 29 Jul 2022 06:14:14 GMT Received: from b03ledav004.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 110457805C; Fri, 29 Jul 2022 06:14:14 +0000 (GMT) Received: from b03ledav004.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id BA2E17805F; Fri, 29 Jul 2022 06:14:08 +0000 (GMT) Received: from skywalker.ibmuc.com (unknown [9.43.86.244]) by b03ledav004.gho.boulder.ibm.com (Postfix) with ESMTP; Fri, 29 Jul 2022 06:14:08 +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 v12 3/8] mm/demotion: Add hotplug callbacks to handle new numa node onlined Date: Fri, 29 Jul 2022 11:43:44 +0530 Message-Id: <20220729061349.968148-4-aneesh.kumar@linux.ibm.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220729061349.968148-1-aneesh.kumar@linux.ibm.com> References: <20220729061349.968148-1-aneesh.kumar@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: agJIo3NOoyjzriwA7pazZr4q_x2_TdoS X-Proofpoint-GUID: EW8UVqzaaZsh_EHbQEsaq2LI6EaIvqBS 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-28_06,2022-07-28_02,2022-06-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 mlxscore=0 malwarescore=0 phishscore=0 bulkscore=0 clxscore=1015 impostorscore=0 suspectscore=0 mlxlogscore=999 lowpriorityscore=0 adultscore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2206140000 definitions=main-2207290023 ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=GztO+eqZ; spf=pass (imf04.hostedemail.com: domain of aneesh.kumar@linux.ibm.com designates 148.163.156.1 as permitted sender) smtp.mailfrom=aneesh.kumar@linux.ibm.com; dmarc=pass (policy=none) header.from=ibm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1659075268; a=rsa-sha256; cv=none; b=Ey/w2YSy7Bj9eyyY2slxnY3O/vuBvFltSefvnt9fpSqLGyq8NbSicm51oIz4KFXnC5XkhW Iul6Pnww81m1rSBegJJwwJbf1wzioxNrIiqRb5VZqQWYBYg+JsSGRpobM2ngDK5+7roRYd IaFu5RmRsWVZ7PaeNOyMtXJBfJWV6wg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1659075268; 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=fcL7bYZWocb9gTQqP8P6PPfRVSuuKAPr0DzTV/oZt58=; b=fhe+PDVIzwXCcf2M90nbEGP0cD7Cpqv5xEbQtfQNaPUzoXR+Qw72xpeqrGigvQ8/2yRuOX UDNI7eE8egD06zAjCpyn3nT7VbiPMx4jjvHpI/zj4sUnLkteKbZ5OL3iPQ27kE6Xio4ImA D/4AlymGyQ2sJq2YX2jawuKx8qItAbY= X-Stat-Signature: nuhukmtfbsjdnkxracnq4oetkfw914zw X-Rspamd-Queue-Id: 13288400B8 X-Rspam-User: Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=GztO+eqZ; spf=pass (imf04.hostedemail.com: domain of aneesh.kumar@linux.ibm.com designates 148.163.156.1 as permitted sender) smtp.mailfrom=aneesh.kumar@linux.ibm.com; dmarc=pass (policy=none) header.from=ibm.com X-Rspamd-Server: rspam12 X-HE-Tag: 1659075267-899687 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 abstract distance 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 | 83 ++++++++++++++++++++++++++++++++++++ 2 files changed, 84 insertions(+) diff --git a/include/linux/memory-tiers.h b/include/linux/memory-tiers.h index 6fa7b4fe6ac7..eeb4b045e631 100644 --- a/include/linux/memory-tiers.h +++ b/include/linux/memory-tiers.h @@ -12,6 +12,7 @@ */ #define MEMTIER_ADISTANCE_DRAM (1 << (MEMTIER_CHUNK_BITS + 2)) #define MEMTIER_ADISTANCE_PMEM (1 << (MEMTIER_CHUNK_BITS + 3)) +#define MEMTIER_HOTPLUG_PRIO 100 #ifdef CONFIG_NUMA #include diff --git a/mm/memory-tiers.c b/mm/memory-tiers.c index 83c13f9df245..0a7a79cad2a0 100644 --- a/mm/memory-tiers.c +++ b/mm/memory-tiers.c @@ -5,6 +5,7 @@ #include #include #include +#include #include struct memory_tier { @@ -85,6 +86,87 @@ static struct memory_tier *find_create_memory_tier(struct memory_dev_type *memty return new_memtier; } +static struct memory_tier *__node_get_memory_tier(int node) +{ + struct memory_dev_type *memtype; + + memtype = node_memory_types[node]; + if (memtype) + return memtype->memtier; + return NULL; +} + +static void init_node_memory_tier(int node) +{ + struct memory_tier *memtier; + + mutex_lock(&memory_tier_lock); + + memtier = __node_get_memory_tier(node); + if (!memtier) { + struct memory_dev_type *memtype; + + if (!node_memory_types[node]) { + node_memory_types[node] = &default_dram_type; + node_set(node, default_dram_type.nodes); + } + memtype = node_memory_types[node]; + memtier = find_create_memory_tier(memtype); + } + mutex_unlock(&memory_tier_lock); +} + +static void destroy_memory_tier(struct memory_tier *memtier) +{ + list_del(&memtier->list); + kfree(memtier); +} + +static void clear_node_memory_tier(int node) +{ + struct memory_tier *current_memtier; + + mutex_lock(&memory_tier_lock); + current_memtier = __node_get_memory_tier(node); + if (current_memtier) { + struct memory_dev_type *memtype; + + memtype = node_memory_types[node]; + node_clear(node, memtype->nodes); + if (nodes_empty(memtype->nodes)) { + list_del(&memtype->tier_sibiling); + memtype->memtier = NULL; + if (list_empty(¤t_memtier->memory_types)) + destroy_memory_tier(current_memtier); + } + } + mutex_unlock(&memory_tier_lock); +} + +static int __meminit memtier_hotplug_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 int __init memory_tier_init(void) { int node; @@ -104,6 +186,7 @@ static int __init memory_tier_init(void) mutex_unlock(&memory_tier_lock); + hotplug_memory_notifier(memtier_hotplug_callback, MEMTIER_HOTPLUG_PRIO); return 0; } subsys_initcall(memory_tier_init);