From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) (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 8C2E33242B8 for ; Fri, 19 Jun 2026 04:41:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.179 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781844087; cv=none; b=HQW9+Fsiso34vqBLIvGtRrv3kM0q7HZn8B12DIxKjXO7ocNl5pC0do5iGz9GFNmVfXXC1032q+CPAKxZwCok5TVTBZca2rIiOe3NWRIk1aenaw9eBjFEIWHUirKI3NHCJSOtgXQmeyzsPrT4fmf6KitdW2O07vtY0uXbPLqb4PY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781844087; c=relaxed/simple; bh=6yKQich0z+pLrAJAaavlwpZIu7DIGDZtT0O2pW6anv4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=qULAUHgQFcqPgZDFJD64u1MyYrFGhPwp3t5CDTfHBdWl7b+r1wChf54tKgmaifRGykg3J62WgqAIo3/huFPOy7svu5w+g12lmjLKi/DFVzZlpX8yiBtmjn1N84TIcKPcRNJLCt/WEt/xyBe555WXHOfx+RubzosI0oCPuxnzwCc= 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=l9IFuslQ; arc=none smtp.client-ip=209.85.214.179 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="l9IFuslQ" Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-2bf1f074a12so16508775ad.0 for ; Thu, 18 Jun 2026 21:41:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781844086; x=1782448886; 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=nDwlvER6qvScgrv7Fk/iPlt0cLfE/eSLJgReW67yP/A=; b=l9IFuslQYMVWlnzN6nQXqTPNDMEwZUTzZdckKrZRFWp1nJz1rREFRTRY2pfn3qpvVZ cLBXQH1SEiN289aLzah/0LOVCaTDnvrTrMlLVred+6S/WUBCKU2rt7FiUfmmkVvFabtZ A5sZCDpciC4L5k/Yk4QrXG8LgZ+9SIW+cQso4irWcw9W24xoaJVixfUcob/jeW8+6coJ aDTkGi0oZFZd3+6j+o4a2XB7SXU2hJ87bGyhr1DiJQ3cEAVL0liAQQjR3O2UHDChr1RF 6UgU5AThxhmkl7qTTqj5KsdCLgbBt0e8SMzmoLmKO4zbI8Ivdv5UAwgPW8sKmue3TXt6 TkjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781844086; x=1782448886; 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=nDwlvER6qvScgrv7Fk/iPlt0cLfE/eSLJgReW67yP/A=; b=A9sCRiqqPeNADbruCbVteVx7iNpG8FrxtReR3lv5K9QL6U7acmqRd3sK1twl6V/9HP fToyRw9Iwi8kj0BdH6A1eQIyErxLw99Zq1KucV4IXzEGFAkbzElEATAhf7IlOaQABVID JUDz1FwIz5Y1ILXQcTgzJKu+a3XF/kKqMTteBxOc6ridSE3yJq1Zo0zPsDMlahOWF/ok PMVncgPk6Aqr+nyYO7ffLTziIrR+eYbsEMR8PPeQaIQFuld96Dk3br/sPKbFyfj+T86Y NrqsGknZtDtmfW7qnYGNg+apTO9bT2Ett6PWt/AyaJTho4YyB4n3zVsbYxpgisoK7hei R/Tw== X-Forwarded-Encrypted: i=1; AFNElJ+w3IH+DLC6Dr4+Ff7XBhGyatfGVjtCuFC2AJNsV0Xgv9lGpALOlhp1LkHg0dHcYoAo06SXKsg6oVfz9uI=@vger.kernel.org X-Gm-Message-State: AOJu0YzVrDuPr436946zP8A6oLx+27nV6WXKOG+5YVH86LpzSP8GCdPt b/GJ7rF+pHjdBv5Litgc+CeHgxUef9WQeVAj8I6YZwlVdzAwqX/jVojf X-Gm-Gg: AfdE7cl8k2YaHYDJvqh8WN/aRgUTNgKb6Y72jqzQ2TROdPlCGS1gSnRzsWQXtgM6hz0 zgDWzFlq84vLUHbrdPCd/cymEtCtp4P/8ODl9f8mr3aULFimxKORxUfBT+RWjj+4fRpBVZGZhnh BlpiQ65rEktKamkuJrn+oqB3M8JdIm+FZfH0jGkLmrKKZzkAEw1tB8QTLmAaiSMLV3XlAZIA0Bg waLa+kPZzIwrqqqWpBOvYLK2VTwvx9qS+PTKfzSqaJL4ksTOPwbLbjD8ahP4B/QG7DPQMHsGn9r BbuHeZ4/IRGWLssc6Fp9wcjlYLUUatOJSDO37ZZclRr1M8l6a9ci9E43Pcri/4rYAf4wvdT9a3o rZFo2Rb+KS8DZH3Zr0l2oIyU6/FgF0Ed/vBIx8EeWRVzOy90wN2giONkRRRdF0JRoZAJDWZpnhZ 7dE0lEPrIeaF8pj8u3ht7iPQ== X-Received: by 2002:a17:903:1c1:b0:2ba:4e84:966 with SMTP id d9443c01a7336-2c718fcc7a6mr23166285ad.36.1781844085879; Thu, 18 Jun 2026 21:41:25 -0700 (PDT) Received: from pve-server.rlab ([49.205.216.49]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2c7208e5760sm8293735ad.36.2026.06.18.21.41.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Jun 2026 21:41:24 -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 v4 1/3] mm, swap: make SWAPFILE_CLUSTER runtime Date: Fri, 19 Jun 2026 10:10:57 +0530 Message-Id: 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 makes the users of SWAPFILE_CLUSTER to use this macro value 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_table.h | 6 ++---- mm/swapfile.c | 17 ++++++++++++----- 2 files changed, 14 insertions(+), 9 deletions(-) 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..4bf11c5b87eb 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -129,6 +129,8 @@ static DEFINE_PER_CPU(struct percpu_swap_cluster, percpu_swap_cluster) = { .lock = INIT_LOCAL_LOCK(), }; +static bool swap_table_use_page __ro_after_init; + /* 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 +439,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 +458,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 +473,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 +3915,18 @@ static int __init swapfile_init(void) { swapfile_maximum_size = arch_max_swapfile_size(); + swap_table_use_page = + (SWAPFILE_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