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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5BE94CD129A for ; Fri, 5 Apr 2024 00:07:18 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 47CE46B00A7; Thu, 4 Apr 2024 20:07:16 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 406CB6B00A9; Thu, 4 Apr 2024 20:07:16 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 11FE96B00AA; Thu, 4 Apr 2024 20:07:16 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id DB0B16B00A7 for ; Thu, 4 Apr 2024 20:07:15 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id AC81AA107B for ; Fri, 5 Apr 2024 00:07:15 +0000 (UTC) X-FDA: 81973538430.11.985462C Received: from mail-qk1-f172.google.com (mail-qk1-f172.google.com [209.85.222.172]) by imf21.hostedemail.com (Postfix) with ESMTP id C86181C0002 for ; Fri, 5 Apr 2024 00:07:13 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=WcXDTxjy; spf=pass (imf21.hostedemail.com: domain of horenchuang@bytedance.com designates 209.85.222.172 as permitted sender) smtp.mailfrom=horenchuang@bytedance.com; dmarc=pass (policy=quarantine) header.from=bytedance.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1712275633; a=rsa-sha256; cv=none; b=UjCjKyLSl+KYzth2oO/HceZkoKG+CkAZMl9fIVGcmYeXvQgtgiyocXjGhvJeFhTPbdzatr 4IIyDWJntGbhCdgbOBTTpy+f5jpDevHpKq8Pe6hjW512gFBB4izbqX2fBW6MX4KvreBMqU lFLPuTf8NOdQAOlGenQu7FA58IGcj7o= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=WcXDTxjy; spf=pass (imf21.hostedemail.com: domain of horenchuang@bytedance.com designates 209.85.222.172 as permitted sender) smtp.mailfrom=horenchuang@bytedance.com; dmarc=pass (policy=quarantine) header.from=bytedance.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1712275633; 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=bQdaNIkqtZaYcZaz2No7Lv3UsoB6KJKx8p/n/NpKY8s=; b=Kw486XXAvd2bT4/80Zx+OFSVIQcLXUBxpsq8XLDmFsLEXNNqbDOnIRlom18ou6tbmzXhNj pSKTCHPurbwBVO6d6z+oNamBf78/8vBytpgcFDSKef2rQldBLHDDUWpQUyc6TCMDMNNmZ6 6MtVChI5kHO5jex+mo2St2RGe7T8Ajc= Received: by mail-qk1-f172.google.com with SMTP id af79cd13be357-78a01a3012aso88514785a.2 for ; Thu, 04 Apr 2024 17:07:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1712275633; x=1712880433; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=bQdaNIkqtZaYcZaz2No7Lv3UsoB6KJKx8p/n/NpKY8s=; b=WcXDTxjyzKmRoxHLlJ4OaGzdRSXQ23iK0Zp1X98vlmSkl7OQAObNLS/W/IZcLaXVJR PHxkpLupXrdBBdfhytmGk356No4OpcrL/O+3Q5C3ouUpUcEOLTfjQruJrZqtPYcGvzht twxcnS6Tgee7KmFXyb3O3BVD0VDFliq4uvDDB7BjuBZ+CtnSVoscNZvo4Rc5F8J9Cyjw +J/ou1j6dr7nh7QVlwRwsrvMy/OOs0u+J905FggO8VdIrn/QGOcyRk+zSANCYFw8bitJ m2lq16OIT417YexIWBj6e8S6DCPmF8H3fqcO6fyaPRMqpvuLN2TbOg+2wa/CDyhm+eLl ShFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712275633; x=1712880433; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bQdaNIkqtZaYcZaz2No7Lv3UsoB6KJKx8p/n/NpKY8s=; b=qupeIDrlKmL4FeTUga6ONdTkewYevpfNTnqc2H1D6B8LKWTgn0A/bWgDUArg1bQ/+y 5gVRUbsGLd1Naqo9ZADgv/OYW7wqtCATwUpQI/aSH5GrFaevW1hQJBa/Yzmb/vysY5xU Dl/SlB8ncuUnjoYcMTYF/4ISSy36GjNGep1D0WpzcShNOldPTth3h2bst0qp4afzWQn6 fNPPLwT92J4+skYt327LKSWFZKryff+ZfyhkVWe5wICB9j+a7hsncr/D1HEjBL1HDSen Bjsqb9xR11n5apWBHBhG27/EUebQTRXdrxFhV3C7bKaaQYcmnH82GOehOZ5yvqq9Yexq z+Lw== X-Forwarded-Encrypted: i=1; AJvYcCUg4iv2TjMB7sogEPMrnnas3LAuFcuI1qX15s0Q1QHi3eR6H13p1awI3mSxCcJv0hagrJSoeeiH1POUFIMXPFQ0PqI= X-Gm-Message-State: AOJu0YzJAGcipY6EN/KGv8i1ppbNVP4u1K9q5lyL+dAEFI9AL/5yPjPt oZS2XRAEDZ+7LL1HV0KU/b6gWQ9Wq3CTbcLRunNEve7mU9OYWONbRD/dLQtk+9E= X-Google-Smtp-Source: AGHT+IHaVrcMfgZoSTOIj9tov+jFGpMHgFpeZLuchTMnvsxDYr39S3klFlyhMYGWZAw/tV8qmXpn0w== X-Received: by 2002:a05:620a:c84:b0:78a:5dac:3e59 with SMTP id q4-20020a05620a0c8400b0078a5dac3e59mr3411783qki.76.1712275632825; Thu, 04 Apr 2024 17:07:12 -0700 (PDT) Received: from n231-228-171.byted.org ([130.44.212.118]) by smtp.gmail.com with ESMTPSA id d4-20020a37c404000000b0078835bfddb8sm191433qki.84.2024.04.04.17.07.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Apr 2024 17:07:12 -0700 (PDT) From: "Ho-Ren (Jack) Chuang" To: "Jonathan Cameron" , "Huang, Ying" , "Gregory Price" , aneesh.kumar@linux.ibm.com, mhocko@suse.com, tj@kernel.org, john@jagalactic.com, "Eishan Mirakhur" , "Vinicius Tavares Petrucci" , "Ravis OpenSrc" , "Alistair Popple" , "Srinivasulu Thanneeru" , "SeongJae Park" , Dan Williams , Vishal Verma , Dave Jiang , Andrew Morton , nvdimm@lists.linux.dev, linux-cxl@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: "Ho-Ren (Jack) Chuang" , "Ho-Ren (Jack) Chuang" , "Ho-Ren (Jack) Chuang" , qemu-devel@nongnu.org, Hao Xiang Subject: [PATCH v11 2/2] memory tier: create CPUless memory tiers after obtaining HMAT info Date: Fri, 5 Apr 2024 00:07:06 +0000 Message-Id: <20240405000707.2670063-3-horenchuang@bytedance.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20240405000707.2670063-1-horenchuang@bytedance.com> References: <20240405000707.2670063-1-horenchuang@bytedance.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: C86181C0002 X-Stat-Signature: ibna19qb4gwexnbi7okss1gcpa85mc8r X-Rspam-User: X-HE-Tag: 1712275633-404716 X-HE-Meta: U2FsdGVkX18vjUdIlEcTyH9YRfIzk26fQoeRDHVjSQt5DY5Mw77DBVJUfWD8MTZAvuqgfiZ/rQVMyb4/bQNuxSXpuj7ZdccRzHLduWmQamuNHa7nCz03uni1nzul7w9dZmyt82yoQyZ7ab09XULF8/eos9FuQX4FCMcnxr9/Y4zhbg3m2QnhuD03WHE7Q5nQXoZjhNBMhNv+aIeJTooMhLKL76CTBPjyvBbtpGfKtuEUoV+Wc8AP1lweDfKw7Uai0B8ldz+eLUMcJ42ZGrmwSKuhECgHeIu9n6IGFAEIleyllDsXWGzB2ncJ/NIagfGj0bjwrwG3EHjd9DxULoFMpJJ+HSNc/HVUKDrC5su4KWcprKkL2/mowp84O/W5c5Gg/pfTBnf5SDWMTKh9TsK6cb/OuieBYWMu4aCzZmwAoyuD9IPIhz2IrZ52uFU7YsZGQS14zh6DwuvMmOt3mCqMhE7KmOHtXtT9I/kL735LlAHi8arOgg6kO5Ac5HUq27w+zPL7WgN12/l8WNx7NN8NqLriAg7QmcbeZBPCTAxqDmrrcjmuraTs59X5s/a4PJ3ST7b5DZOrhqk2ghnZLkXqYg2xq/F8h95rGuY/i8r01akmBFMwEJr+6fGuG3xmXk+eztWzo4mw7PKq5VA+bmWikq8WX8WCLRsA2LiofIJfvX59e3hWsOlsi4KmVzBTxMm0nGGJiIrWN0aKb01PtTer1j7M2rITvz8Tgr9BJcnbMtj5lB3Z01PEDot0O9UgpCyToDr4e2hJYZiTtaCLzk1DlHRmY/sAGN1OauHKdUcKI7Sfso074HQW/Pu29eQ7yU3asjnkjW4X5HVeFRMAaf+TTqPJ6q+tmwrMOAWlZAr5b8L9CiXlWPP6nHT8HLnO6vsfP2PUFa+5f1nkOWUepM17/9tZhGsH/wj4OH+c3nmDmlpCOvZ6ntbUBEr+6T8MUAJ3hzHbBAG3NbJVJQ1eDIo l3cCWzd8 IfENpJABN/5VT+dw0s/hD+3FPjOUO12SHqOGOKarN9/E7k/XUf/JA9BxRC4KCrBYuu2Vlk7nnN6xWFQh9mfALyhu+BWM5jUsTztljXfhH/E/f/iyeFS7MwTsWlad6OZ6Qtmzcqj5OaBbVoQH/clSCY5f4QXR6KAUVb3KYkgoAbhZrCHt/V2DgOci1lmEpx2HtvwMrXFR5jXeVnbXcAf3xahe65xhoLu97DdKecKMfWNQSqSwO012aLCEEXo//e6BZTq1GBA4wx1JbTn26W5Kuk5ngUiCsTFFOomCbmIEr1r1xTDzSsT+G+fojhQxakUqTIiUOyShiiwEz5nS/DH2h+X+nPkoqYiSx1Kr2p1limY70WsJM/RZ6pkC+0SvV10nFBSDBIfI/TAG2Ofq5De5SzsukuWLx9qITUwbyfk8LwM0rxiCOvHb2tok0H5S4dRmoHHgOyYqawpfYLUU4ENEnsSshDEN7QrOray/9f7+d3E2spNOHtQ1ia5Xc2iR5ghFRXpzK 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: List-Subscribe: List-Unsubscribe: The current implementation treats emulated memory devices, such as CXL1.1 type3 memory, as normal DRAM when they are emulated as normal memory (E820_TYPE_RAM). However, these emulated devices have different characteristics than traditional DRAM, making it important to distinguish them. Thus, we modify the tiered memory initialization process to introduce a delay specifically for CPUless NUMA nodes. This delay ensures that the memory tier initialization for these nodes is deferred until HMAT information is obtained during the boot process. Finally, demotion tables are recalculated at the end. * late_initcall(memory_tier_late_init); Some device drivers may have initialized memory tiers between `memory_tier_init()` and `memory_tier_late_init()`, potentially bringing online memory nodes and configuring memory tiers. They should be excluded in the late init. * Handle cases where there is no HMAT when creating memory tiers There is a scenario where a CPUless node does not provide HMAT information. If no HMAT is specified, it falls back to using the default DRAM tier. * Introduce another new lock `default_dram_perf_lock` for adist calculation In the current implementation, iterating through CPUlist nodes requires holding the `memory_tier_lock`. However, `mt_calc_adistance()` will end up trying to acquire the same lock, leading to a potential deadlock. Therefore, we propose introducing a standalone `default_dram_perf_lock` to protect `default_dram_perf_*`. This approach not only avoids deadlock but also prevents holding a large lock simultaneously. * Upgrade `set_node_memory_tier` to support additional cases, including default DRAM, late CPUless, and hot-plugged initializations. To cover hot-plugged memory nodes, `mt_calc_adistance()` and `mt_find_alloc_memory_type()` are moved into `set_node_memory_tier()` to handle cases where memtype is not initialized and where HMAT information is available. * Introduce `default_memory_types` for those memory types that are not initialized by device drivers. Because late initialized memory and default DRAM memory need to be managed, a default memory type is created for storing all memory types that are not initialized by device drivers and as a fallback. Signed-off-by: Ho-Ren (Jack) Chuang Signed-off-by: Hao Xiang Reviewed-by: "Huang, Ying" --- mm/memory-tiers.c | 94 +++++++++++++++++++++++++++++++++++------------ 1 file changed, 70 insertions(+), 24 deletions(-) diff --git a/mm/memory-tiers.c b/mm/memory-tiers.c index 516b144fd45a..6632102bd5c9 100644 --- a/mm/memory-tiers.c +++ b/mm/memory-tiers.c @@ -36,6 +36,11 @@ struct node_memory_type_map { static DEFINE_MUTEX(memory_tier_lock); static LIST_HEAD(memory_tiers); +/* + * The list is used to store all memory types that are not created + * by a device driver. + */ +static LIST_HEAD(default_memory_types); static struct node_memory_type_map node_memory_types[MAX_NUMNODES]; struct memory_dev_type *default_dram_type; @@ -108,6 +113,8 @@ static struct demotion_nodes *node_demotion __read_mostly; static BLOCKING_NOTIFIER_HEAD(mt_adistance_algorithms); +/* The lock is used to protect `default_dram_perf*` info and nid. */ +static DEFINE_MUTEX(default_dram_perf_lock); static bool default_dram_perf_error; static struct access_coordinate default_dram_perf; static int default_dram_perf_ref_nid = NUMA_NO_NODE; @@ -505,7 +512,8 @@ static inline void __init_node_memory_type(int node, struct memory_dev_type *mem static struct memory_tier *set_node_memory_tier(int node) { struct memory_tier *memtier; - struct memory_dev_type *memtype; + struct memory_dev_type *memtype = default_dram_type; + int adist = MEMTIER_ADISTANCE_DRAM; pg_data_t *pgdat = NODE_DATA(node); @@ -514,7 +522,16 @@ static struct memory_tier *set_node_memory_tier(int node) if (!node_state(node, N_MEMORY)) return ERR_PTR(-EINVAL); - __init_node_memory_type(node, default_dram_type); + mt_calc_adistance(node, &adist); + if (!node_memory_types[node].memtype) { + memtype = mt_find_alloc_memory_type(adist, &default_memory_types); + if (IS_ERR(memtype)) { + memtype = default_dram_type; + pr_info("Failed to allocate a memory type. Fall back.\n"); + } + } + + __init_node_memory_type(node, memtype); memtype = node_memory_types[node].memtype; node_set(node, memtype->nodes); @@ -652,6 +669,35 @@ void mt_put_memory_types(struct list_head *memory_types) } EXPORT_SYMBOL_GPL(mt_put_memory_types); +/* + * This is invoked via `late_initcall()` to initialize memory tiers for + * CPU-less memory nodes after driver initialization, which is + * expected to provide `adistance` algorithms. + */ +static int __init memory_tier_late_init(void) +{ + int nid; + + guard(mutex)(&memory_tier_lock); + for_each_node_state(nid, N_MEMORY) { + /* + * Some device drivers may have initialized memory tiers + * between `memory_tier_init()` and `memory_tier_late_init()`, + * potentially bringing online memory nodes and + * configuring memory tiers. Exclude them here. + */ + if (node_memory_types[nid].memtype) + continue; + + set_node_memory_tier(nid); + } + + establish_demotion_targets(); + + return 0; +} +late_initcall(memory_tier_late_init); + static void dump_hmem_attrs(struct access_coordinate *coord, const char *prefix) { pr_info( @@ -663,25 +709,19 @@ static void dump_hmem_attrs(struct access_coordinate *coord, const char *prefix) int mt_set_default_dram_perf(int nid, struct access_coordinate *perf, const char *source) { - int rc = 0; - - mutex_lock(&memory_tier_lock); - if (default_dram_perf_error) { - rc = -EIO; - goto out; - } + guard(mutex)(&default_dram_perf_lock); + if (default_dram_perf_error) + return -EIO; if (perf->read_latency + perf->write_latency == 0 || - perf->read_bandwidth + perf->write_bandwidth == 0) { - rc = -EINVAL; - goto out; - } + perf->read_bandwidth + perf->write_bandwidth == 0) + return -EINVAL; if (default_dram_perf_ref_nid == NUMA_NO_NODE) { default_dram_perf = *perf; default_dram_perf_ref_nid = nid; default_dram_perf_ref_source = kstrdup(source, GFP_KERNEL); - goto out; + return 0; } /* @@ -709,27 +749,25 @@ int mt_set_default_dram_perf(int nid, struct access_coordinate *perf, pr_info( " disable default DRAM node performance based abstract distance algorithm.\n"); default_dram_perf_error = true; - rc = -EINVAL; + return -EINVAL; } -out: - mutex_unlock(&memory_tier_lock); - return rc; + return 0; } int mt_perf_to_adistance(struct access_coordinate *perf, int *adist) { + guard(mutex)(&default_dram_perf_lock); if (default_dram_perf_error) return -EIO; - if (default_dram_perf_ref_nid == NUMA_NO_NODE) - return -ENOENT; - if (perf->read_latency + perf->write_latency == 0 || perf->read_bandwidth + perf->write_bandwidth == 0) return -EINVAL; - mutex_lock(&memory_tier_lock); + if (default_dram_perf_ref_nid == NUMA_NO_NODE) + return -ENOENT; + /* * The abstract distance of a memory node is in direct proportion to * its memory latency (read + write) and inversely proportional to its @@ -742,7 +780,6 @@ int mt_perf_to_adistance(struct access_coordinate *perf, int *adist) (default_dram_perf.read_latency + default_dram_perf.write_latency) * (default_dram_perf.read_bandwidth + default_dram_perf.write_bandwidth) / (perf->read_bandwidth + perf->write_bandwidth); - mutex_unlock(&memory_tier_lock); return 0; } @@ -855,7 +892,8 @@ static int __init memory_tier_init(void) * For now we can have 4 faster memory tiers with smaller adistance * than default DRAM tier. */ - default_dram_type = alloc_memory_type(MEMTIER_ADISTANCE_DRAM); + default_dram_type = mt_find_alloc_memory_type(MEMTIER_ADISTANCE_DRAM, + &default_memory_types); if (IS_ERR(default_dram_type)) panic("%s() failed to allocate default DRAM tier\n", __func__); @@ -865,6 +903,14 @@ static int __init memory_tier_init(void) * types assigned. */ for_each_node_state(node, N_MEMORY) { + if (!node_state(node, N_CPU)) + /* + * Defer memory tier initialization on + * CPUless numa nodes. These will be initialized + * after firmware and devices are initialized. + */ + continue; + memtier = set_node_memory_tier(node); if (IS_ERR(memtier)) /* -- Ho-Ren (Jack) Chuang