From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) (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 8065A37BE9C for ; Fri, 12 Jun 2026 18:09:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.174 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781287783; cv=none; b=pJuNUZW8QlAHHNqPgsB0J44PlSUjG4CLazVvDiksiYj1WEQJH9F5AMjzadjUewtFt3k2jrKF1uIMHTlvqJw8iegE3X+om/MXF8zC5FY7RQWrP19YJuhHWcFLSOmwkqHjORU+7vgI3DNbOjJE1f9KuoBZ7zlzhYnZF50lqE9bg3s= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781287783; c=relaxed/simple; bh=ps75tk43WRR7A+fn3Uh1N3Fi9CMBti8kLyYVwSqsAeo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=mMF+UkAVHHOpKuqzvuZRJCBmY2PS62ay8Wb0RcdUrohYhjIijM6E4wQCe22SD4KVNKcav3cen7imZbzGoNllNGg284DKwjOZwFaxgqHZoCOK4sCY8W0vIltBKuxSNiZHUfsgLByuhnq0oFyKLdJHZm/XjLOGkiAy8/jmh0nnkDc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=JOBQDMjf; arc=none smtp.client-ip=209.85.214.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="JOBQDMjf" Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-2c0c2c7d45eso12062665ad.1 for ; Fri, 12 Jun 2026 11:09:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781287782; x=1781892582; 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=sy5B4Hkkhz7VX1oSnZgSOogbp7pZpM+mVFfKtzTdJuA=; b=JOBQDMjfzysbV8C4U1afKIGGc5AmbAYTIesAt6dwFjCROzEiawrAWf1aIoCC3m6vr7 e6+94rpVx72gTLX361KrpGNC5WF8+q3/0i11zH02Dr5ubvqcZ82w/VYfZd/rkjqyACJl aAs0saM6HrRZSJ2ObOG2yXttiOnrvZG5pBW5Ro9bjnfrsdAykKSCWV7xXgXco/5FEg8S +sQyAW+OxR0Z/dSw0LcQFIjjkgPcmjRcBsbOvkQKCh28Aec0qjEbmkqxIvx7Kz6ohbk9 n0NPpYfLNvyhVWWdsVDDfIckhddGJM3A1KqI8wuUqrp+4ll6dwy1A1AcdC9nHbFWQMUk bxUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781287782; x=1781892582; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=sy5B4Hkkhz7VX1oSnZgSOogbp7pZpM+mVFfKtzTdJuA=; b=gvB4VW84PtGEQhJS4e1yS8REujiYmLnfh/nkGDlMc9PpsSiZGPAVR4sbI9M6rnbrLp wbUj9VT8souV2vszgsP66MwVQBRMxPdg4q5jvJWw/JkDX7xk7HGsX4MD4gLVtEF0EeR9 yBXJhoqg3G+YzFuN5vy+z76yyPoIX+l2pgI7Xa6lfc23JlbTAYtVlKiCsKZ93mtZ3Abw +i9DCh/Ge4kahTNfMVZppE6mJ2WHonDFLMd6LCYN4RMuPfNMWsaESL5Bgwj1CbO59WUP oK0xZon5dVrcyEqabHdA1qD8PHufGpqCKnv/TFIyvpXW7HDxbnT4CxdtSHiV0/KG5YbH WjxQ== X-Forwarded-Encrypted: i=1; AFNElJ8l0kTCdcCXn/F6c7HabxcRqZZ5yY1MzdtSN3Utx0AsHwFv+s/6/9gyK2vlXs7PtborVAbn4SYllkMxf2o=@vger.kernel.org X-Gm-Message-State: AOJu0YwFk9X6QNmMQdZrgMueZm3CWd5OOjNgsR5LIJUEG5MOSFSp9oGL rW9pxeVqGkr0t4qjCKvEB7o/GrWATf0qFh0hK8em0syLP77ydpz3nYK0 X-Gm-Gg: Acq92OE0txZ4jyNQm40+kGoSqXlWSGvUmxZl4oK+W6WEC4GTCYdw4ru90XYTDdLln0k xfeWVgNXssCK9VkXMm9N8VVcjJrHjyOnYEFOQPXuE9PZLaMMyd7s6sriCRKC8DMDVm6CZ3DrHEO JIjZYKmhNn2xtAHY4L3c7Py5qyzh+COPWDdNdlb4m77L4NrEpjNbJbck7KON/8jQhv3J5WGCdkZ ONyLb9QZ+42ypY/m+PQMXPyQ2R45CKMTQ2t5zt8Qaaz+YFYidQkX7zaD+NV9Jq7VPOtofri+mez KEcCocwB1Vev1dMsEjffqahBj+9gm1kOJ0YRlrQjnXR9DT9jgirafgY+XQLw/d7mtg1YczfJMGp ta1c9xxxNVSi2PUGZqtVcMML6QAPoWBcjPmu0PTiuWtYzqTe3HGf/Yqm6R4Rhmno2JMvn0TsB/W SaIZ2Opz2N5oodsHVgdbQTOMrYOskrwvFcDpchMgcg62M= X-Received: by 2002:a17:903:32c4:b0:2c0:b6c7:2271 with SMTP id d9443c01a7336-2c4109ed38amr47426415ad.4.1781287781888; Fri, 12 Jun 2026 11:09:41 -0700 (PDT) Received: from pve-server.rlab ([49.205.216.49]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2c42f7c70easm38956975ad.25.2026.06.12.11.09.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Jun 2026 11:09:41 -0700 (PDT) From: "Ritesh Harjani (IBM)" To: linux-mm@kvack.org Cc: Madhavan Srinivasan , Michael Ellerman , Nicholas Piggin , Christophe Leroy , Andrew Morton , Chris Li , Kairui Song , Kemeng Shi , Nhat Pham , Baoquan He , Barry Song , Youngjun Park , David Hildenbrand , linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, Sayali Patil , "Ritesh Harjani (IBM)" Subject: [PATCH v3 1/3] mm, swap: make SWAPFILE_CLUSTER runtime Date: Fri, 12 Jun 2026 23:39:15 +0530 Message-Id: <1e8d7e4d0bb1377277ae8b6561d89fa0e048e7de.1781287297.git.ritesh.list@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit On PowerPC Book3S64, MMU is selected at runtime, so macros like PMD_SHIFT are effectively runtime variables in the Book3S64 code. THP swap code uses these macros to size some of its array data structures based on PMD_ORDER e.g. SWAPFILE_CLUSTER macro is used for this very purpose. Hence this patch initializes SWAPFILE_CLUSTER at runtime and also modifies swap_table and swap_memcg_table which were earlier using this macro for defining the number of table entries. Signed-off-by: Ritesh Harjani (IBM) --- mm/swap.h | 5 +++-- mm/swap_table.h | 6 ++---- mm/swapfile.c | 27 ++++++++++++++++++++++----- 3 files changed, 27 insertions(+), 11 deletions(-) diff --git a/mm/swap.h b/mm/swap.h index 77d2d14eda42..956879a69ddd 100644 --- a/mm/swap.h +++ b/mm/swap.h @@ -26,11 +26,12 @@ extern int page_cluster; #define SWAP_TABLE_HAS_ZEROFLAG ((BITS_PER_LONG - SWAP_CACHE_PFN_MARK_BITS - \ SWAP_CACHE_PFN_BITS) > SWAP_COUNT_MIN_BITS) +extern unsigned int swap_slots_in_cluster __read_mostly; +#define SWAPFILE_CLUSTER swap_slots_in_cluster + #ifdef CONFIG_THP_SWAP -#define SWAPFILE_CLUSTER HPAGE_PMD_NR #define swap_entry_order(order) (order) #else -#define SWAPFILE_CLUSTER 256 #define swap_entry_order(order) 0 #endif diff --git a/mm/swap_table.h b/mm/swap_table.h index e6613e62f8d0..90e2a7852300 100644 --- a/mm/swap_table.h +++ b/mm/swap_table.h @@ -8,16 +8,14 @@ /* A typical flat array in each cluster as swap table */ struct swap_table { - atomic_long_t entries[SWAPFILE_CLUSTER]; + DECLARE_FLEX_ARRAY(atomic_long_t, entries); }; /* For storing memcg private id */ struct swap_memcg_table { - unsigned short id[SWAPFILE_CLUSTER]; + DECLARE_FLEX_ARRAY(unsigned short, id); }; -#define SWP_TABLE_USE_PAGE (sizeof(struct swap_table) == PAGE_SIZE) - /* * A swap table entry represents the status of a swap slot on a swap * (physical or virtual) device. The swap table in each cluster is a diff --git a/mm/swapfile.c b/mm/swapfile.c index 78b49b0658ad..80846bfb5f76 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -129,6 +129,17 @@ static DEFINE_PER_CPU(struct percpu_swap_cluster, percpu_swap_cluster) = { .lock = INIT_LOCAL_LOCK(), }; +unsigned int swap_slots_in_cluster __read_mostly; +static bool swap_table_use_page __read_mostly; + +static unsigned int generic_swap_slots_in_clusters(void) +{ + if (IS_ENABLED(CONFIG_THP_SWAP)) + return HPAGE_PMD_NR; + else + return 256; +} + /* May return NULL on invalid type, caller must check for NULL return */ static struct swap_info_struct *swap_type_to_info(int type) { @@ -437,7 +448,7 @@ static void swap_cluster_free_table(struct swap_cluster_info *ci) return; rcu_assign_pointer(ci->table, NULL); - if (!SWP_TABLE_USE_PAGE) { + if (!swap_table_use_page) { kmem_cache_free(swap_table_cachep, table); return; } @@ -456,7 +467,7 @@ static int swap_cluster_alloc_table(struct swap_cluster_info *ci, gfp_t gfp) if (rcu_access_pointer(ci->table)) return 0; - if (SWP_TABLE_USE_PAGE) { + if (swap_table_use_page) { folio = folio_alloc(gfp | __GFP_ZERO, 0); if (folio) table = folio_address(folio); @@ -471,7 +482,8 @@ static int swap_cluster_alloc_table(struct swap_cluster_info *ci, gfp_t gfp) #ifdef CONFIG_MEMCG if (!mem_cgroup_disabled()) { VM_WARN_ON_ONCE(ci->memcg_table); - ci->memcg_table = kzalloc_obj(*ci->memcg_table, gfp); + ci->memcg_table = kzalloc_flex(*ci->memcg_table, id, + SWAPFILE_CLUSTER, gfp); if (!ci->memcg_table) { swap_cluster_free_table(ci); return -ENOMEM; @@ -3912,14 +3924,19 @@ static int __init swapfile_init(void) { swapfile_maximum_size = arch_max_swapfile_size(); + swap_slots_in_cluster = generic_swap_slots_in_clusters(); + swap_table_use_page = + (swap_slots_in_cluster * sizeof(atomic_long_t) == PAGE_SIZE); + /* * Once a cluster is freed, it's swap table content is read * only, and all swap cache readers (swap_cache_*) verifies * the content before use. So it's safe to use RCU slab here. */ - if (!SWP_TABLE_USE_PAGE) + if (!swap_table_use_page) swap_table_cachep = kmem_cache_create("swap_table", - sizeof(struct swap_table), + struct_size_t(struct swap_table, entries, + SWAPFILE_CLUSTER), 0, SLAB_PANIC | SLAB_TYPESAFE_BY_RCU, NULL); #ifdef CONFIG_MIGRATION -- 2.39.5