Received: by 2002:ab2:6857:0:b0:1ef:ffd0:ce49 with SMTP id l23csp945544lqp; Fri, 22 Mar 2024 00:04:59 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCW8b/4va2Z5KhNVgIgeByZq3hvWxSrePkc2xKiW+Tla3Yzw+tVBfkNlMpfJE1ej651QBsnNty/u5zD1bPcDWPIuF0AVb78wARIQazb4nw== X-Google-Smtp-Source: AGHT+IEmGBhSYU6wkTmPlOjJ3oQ6A0RhfVT3I11dNmw4pO+k76mSC48FdpKu3Pv4GEno9Z+YeFy7 X-Received: by 2002:a05:6358:4894:b0:17e:edfd:89bb with SMTP id pe20-20020a056358489400b0017eedfd89bbmr1514743rwc.15.1711091099646; Fri, 22 Mar 2024 00:04:59 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1711091099; cv=pass; d=google.com; s=arc-20160816; b=V2AvSLzOisn3iPYLpBe59tXGUScPiTKqBgEkzW7c/tJgIipiui6PehMD7lQxHTft25 5zfAc0jR97xSdOt3h4ST+10/x8THsBUpEOmBCUMffabPlYr7bj9vfIG7/+1ob3Oa6bGU wjzABXX09AxrEkjSeoSkZAu/H9XNzm3fkE8CL8R8ikijlTAyt84LM8q120wZJZ1hYx+V QhqqDszSeNvU0C1B+uGEAHXr385Q21Puj8mDX3zP9wMy3PcPHTnL5GIrtMolNYoXOl6r lwgtLTiM6UKJkY/esnciZyD/kN5Ebd9fkPkc52mGlzYDAwwbncxWECBNpr3HLOZLHjr7 rfXw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=m4oJ5v+nslG9mPCKKSS3iL6rhlCdTIoZrlCMIeTNwBs=; fh=ymlOwgXpc0a6VGegzpD1SGmXeICA3BcvVhCaGFJ1yVE=; b=K50QQ7j84pSK7O5JRmgc7R0TDl1vGS8t7ZlbvzjJDe1OWt/Pp3JHi8tsZDU8m3boyY 6Uf7o80ecMEPUuMve7umqKo+pi6sPD7MboScyS9fLJbmwaf4QU2pV1b2BpLR36kYrTU7 4SRas1qA3mXt5QXKHPAM0WhFjKOO7rWI9c1S3NZBDzcTHDtXWmDG5ZHIGCjg0ghzdjnp gL1/In+z1PP8XOtJ/MrtPDnE7NH4PA7nWRrCHr/pJjY6faZgoj6MMFk48+bqsqc+82qQ j+nxP2OHhQkZC3vhD2ucX8WY8wn++XsvO4XZjoB7b9yqaMhmra6/5hx7OlGvVZtr+Umg LBIA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@bytedance.com header.s=google header.b=UahfMLJn; arc=pass (i=1 spf=pass spfdomain=bytedance.com dkim=pass dkdomain=bytedance.com dmarc=pass fromdomain=bytedance.com); spf=pass (google.com: domain of linux-kernel+bounces-111045-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-111045-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=bytedance.com Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id e2-20020a635442000000b005dc9404f489si1435448pgm.338.2024.03.22.00.04.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Mar 2024 00:04:59 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-111045-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@bytedance.com header.s=google header.b=UahfMLJn; arc=pass (i=1 spf=pass spfdomain=bytedance.com dkim=pass dkdomain=bytedance.com dmarc=pass fromdomain=bytedance.com); spf=pass (google.com: domain of linux-kernel+bounces-111045-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-111045-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=bytedance.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 2DDEE2864D0 for ; Fri, 22 Mar 2024 07:04:46 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 1B6C6171CD; Fri, 22 Mar 2024 07:04:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bytedance.com header.i=@bytedance.com header.b="UahfMLJn" Received: from mail-qk1-f172.google.com (mail-qk1-f172.google.com [209.85.222.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EAE2213AC4 for ; Fri, 22 Mar 2024 07:04:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.172 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711091052; cv=none; b=S7FYZQL5yWKlWnqcI57ce8EI16xAP4KsIaMuwFWMp86kbcc/8qPa8ciicddfOeSB1kjNJ9aMs/UO987MEHk6UZG8n4WgC9QI/7Ga67f4ZtVLq3DIEB/dkv0r+FOmqDbRQyaqoxhpxeXA537FbpNHUFj+AYv1HZKtblh2/G/bDFw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711091052; c=relaxed/simple; bh=nK6w2ARsYZQnloKDAXxNKBFWkhtz+f0xH6BzYgHfcLU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=CvEt6NdonM2L9MuctTfoaaEvgOERSqZw3/mfDUNhzGnV+LwrdAqoVa63Xa2/TAIbeg1cK+gTxhG4q0/TekLYvJrQDct5hwhVMMhwMMYvXe0LYNsdShMhs8zj5FixCb24j5TWjV5N2XCiJsXFwns/V4c55phmebSJyPI8fm+G2fg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=bytedance.com; spf=pass smtp.mailfrom=bytedance.com; dkim=pass (2048-bit key) header.d=bytedance.com header.i=@bytedance.com header.b=UahfMLJn; arc=none smtp.client-ip=209.85.222.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=bytedance.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bytedance.com Received: by mail-qk1-f172.google.com with SMTP id af79cd13be357-789e6e1d96eso123403885a.3 for ; Fri, 22 Mar 2024 00:04:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1711091050; x=1711695850; darn=vger.kernel.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=m4oJ5v+nslG9mPCKKSS3iL6rhlCdTIoZrlCMIeTNwBs=; b=UahfMLJneWPE9dK9OOC0WS0hhyiUYIWGcktrABZSV94k/JPkZnwqdhsuj+YEt7w1j5 rHB8/iBUVMykHtMhcEkpoZZS3LLb9iKPESxXuFTqMbVQCdKx1mp89YwTAu7HC7GSk7rD AYyJZP/G3qKKFMgwhPKX4zyZNsdPWHPflRJBERq4+Ty2/Ch3KGYA/r3dA5SVNeXLbDGe IsY0xzIz0RfFQvn1QqadpqO/Yrosjl4gQ7rP5NgRBKHgmfEH3Fok1QLbB2V/BJLQ7c3i HUS0UMw2YALuclMkXCj2WZEr/SE87p4uvZIDq1RDcEBnYt0IUunxzuvHyflUVZdxvnYL RjTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711091050; x=1711695850; 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=m4oJ5v+nslG9mPCKKSS3iL6rhlCdTIoZrlCMIeTNwBs=; b=ZTubAwYPSCXxU7T/6+tf5yki+SAjq2/MzF6cCMI0IUtw1mIaXMl4cJRdlIa10qr60J FEdLSeUFJKLLgkbmnCzuaX/40sq7kU2SjDvIfELuKEgO6CTKZC1GLAdZ5x7smccwtkH1 g/90E3cj9fM7wCXF08jHhno/3xuhtTRrEEju1M3B6nvrFmfMTXqIWrnIfsWmSph9ngqV IPoRBBit4XKIrRSzyOtRe6rHECWsqdsWC9omgpCLdFTnsPKLIp/MGVHS8XXujMD+7s2f 66T9uCwyCsdkKBSrEofUclJ/Lm1W7NcKMEkB6i+0v6oa0gSBUiQaGftif2CNTGopGfz6 PUvQ== X-Forwarded-Encrypted: i=1; AJvYcCUvdIaWfVmE306XNYDdxka6kjSxXuhB/hZXB5eUtStspx7LRNjgHYdBexWZOT6J1DjFOCkfJQpLOkha0WU21dF0fKR7OA44zUy+GfVS X-Gm-Message-State: AOJu0YwXYejMjOjvYWrpws7IyzWYbBjvoXmZESXydAv66ngVLyY7YaP0 65jVYT4Ty43zayt7z9WK1PtqGscS1JJlIL51UyQwkzSoO89kfnIsluzWjF6YADc= X-Received: by 2002:a05:620a:1920:b0:788:41c4:4a0 with SMTP id bj32-20020a05620a192000b0078841c404a0mr1828892qkb.32.1711091049736; Fri, 22 Mar 2024 00:04:09 -0700 (PDT) Received: from n231-228-171.byted.org ([130.44.215.108]) by smtp.gmail.com with ESMTPSA id k1-20020ae9f101000000b00789fc794dbesm553974qkg.45.2024.03.22.00.04.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Mar 2024 00:04:09 -0700 (PDT) From: "Ho-Ren (Jack) Chuang" To: "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" , 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 v4 2/2] memory tier: create CPUless memory tiers after obtaining HMAT info Date: Fri, 22 Mar 2024 07:03:55 +0000 Message-Id: <20240322070356.315922-3-horenchuang@bytedance.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20240322070356.315922-1-horenchuang@bytedance.com> References: <20240322070356.315922-1-horenchuang@bytedance.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 --- mm/memory-tiers.c | 73 ++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 63 insertions(+), 10 deletions(-) diff --git a/mm/memory-tiers.c b/mm/memory-tiers.c index 974af10cfdd8..9396330fa162 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,7 @@ static struct demotion_nodes *node_demotion __read_mostly; static BLOCKING_NOTIFIER_HEAD(mt_adistance_algorithms); +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 +511,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 *mtype; + int adist = MEMTIER_ADISTANCE_DRAM; pg_data_t *pgdat = NODE_DATA(node); @@ -514,11 +521,20 @@ 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 == NULL) { + mtype = mt_find_alloc_memory_type(adist, &default_memory_types); + if (IS_ERR(mtype)) { + mtype = default_dram_type; + pr_info("Failed to allocate a memory type. Fall back.\n"); + } + } - memtype = node_memory_types[node].memtype; - node_set(node, memtype->nodes); - memtier = find_create_memory_tier(memtype); + __init_node_memory_type(node, mtype); + + mtype = node_memory_types[node].memtype; + node_set(node, mtype->nodes); + memtier = find_create_memory_tier(mtype); if (!IS_ERR(memtier)) rcu_assign_pointer(pgdat->memtier, memtier); return memtier; @@ -655,6 +671,34 @@ 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; + + mutex_lock(&memory_tier_lock); + for_each_node_state(nid, N_MEMORY) + if (!node_state(nid, N_CPU) && + node_memory_types[nid].memtype == NULL) + /* + * 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. + */ + set_node_memory_tier(nid); + + establish_demotion_targets(); + mutex_unlock(&memory_tier_lock); + + return 0; +} +late_initcall(memory_tier_late_init); + static void dump_hmem_attrs(struct access_coordinate *coord, const char *prefix) { pr_info( @@ -668,7 +712,7 @@ int mt_set_default_dram_perf(int nid, struct access_coordinate *perf, { int rc = 0; - mutex_lock(&memory_tier_lock); + mutex_lock(&default_dram_perf_lock); if (default_dram_perf_error) { rc = -EIO; goto out; @@ -716,7 +760,7 @@ int mt_set_default_dram_perf(int nid, struct access_coordinate *perf, } out: - mutex_unlock(&memory_tier_lock); + mutex_unlock(&default_dram_perf_lock); return rc; } @@ -732,7 +776,7 @@ int mt_perf_to_adistance(struct access_coordinate *perf, int *adist) perf->read_bandwidth + perf->write_bandwidth == 0) return -EINVAL; - mutex_lock(&memory_tier_lock); + mutex_lock(&default_dram_perf_lock); /* * The abstract distance of a memory node is in direct proportion to * its memory latency (read + write) and inversely proportional to its @@ -745,7 +789,7 @@ 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); + mutex_unlock(&default_dram_perf_lock); return 0; } @@ -858,7 +902,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__); @@ -868,6 +913,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