From patchwork Thu Aug 11 16:13:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 12941587 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 9FA6AC25B0C for ; Thu, 11 Aug 2022 16:13:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 35B308E0009; Thu, 11 Aug 2022 12:13:49 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 30C3A8E0002; Thu, 11 Aug 2022 12:13:49 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 10EC88E0009; Thu, 11 Aug 2022 12:13:49 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id E33E98E0002 for ; Thu, 11 Aug 2022 12:13:48 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id C3B7B1C6E8F for ; Thu, 11 Aug 2022 16:13:48 +0000 (UTC) X-FDA: 79787807736.25.4858BF5 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf18.hostedemail.com (Postfix) with ESMTP id 483351C0071 for ; Thu, 11 Aug 2022 16:13:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1660234427; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/Huxd7IPCPnmA3ZqjXCerOPqYjMrNourUX2B7v06rhc=; b=bObCE4pvgTFoFuXZVRopMaOlmcy/9JIaiHo5LGcWm/IjOmURF5LsN1v8EWNastQZBsXzoY VN1OunqfKOmft+w8uZkzEdWGY5Ayb72Ym4iPCgupz62pXg1I80yYj3USSACQMvVzypGRFk m5Di79o43UG6dtEaTeZ816SccUyq6/o= Received: from mail-io1-f72.google.com (mail-io1-f72.google.com [209.85.166.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-446-4V77nAyHNXKUHx5rH4FfHg-1; Thu, 11 Aug 2022 12:13:45 -0400 X-MC-Unique: 4V77nAyHNXKUHx5rH4FfHg-1 Received: by mail-io1-f72.google.com with SMTP id h8-20020a6bfb08000000b00684f0587d0cso5945268iog.14 for ; Thu, 11 Aug 2022 09:13:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=/Huxd7IPCPnmA3ZqjXCerOPqYjMrNourUX2B7v06rhc=; b=Jmfmy/25i8rFOuWPY4LZrqEIjCkyWhRXXfjuyP18lIW5ZocJCqguE4j55tGvMX2h2M eKdGyRvF0LIvZy0CSDurFSDm9PVFdR31a5wruJZLAaVpMpwblIyQKy8127b5fJ9XcaIz 8QrueNQnzWs88/TFEMNsexS61Uw9MIoU+xoxddb6neoWDQendd8+FJ0B+fi5Dtwj4id1 ILY4ibMdgHr3dyWsHyzSgDUJFxvDdFGSJ0RB4PLxPolDf79s2bg2Ji/Eh0CetiPfchNs S+0lbW5GvdyZr6KyVrGW8XZ643w5STT2OxFjmT10kIB0CE40PFryp2yATQt3+C6E0Yjh 5uOQ== X-Gm-Message-State: ACgBeo2WiyE/DM3TSV5Sb6e0C17CE5SyYYOna4X5/M2q9s2yBtxjP/7y 9MwgIQDY2Wns/pYF+2J8t5YYtibpqTqqt5kARpNs1AapDrVqpN9wA6auxhYP+hwyOBdRUnLPw3u f80FJMgPN40O9uiqHh9eNdLMy+sX24cercyH0sn0BRyliI/TE2DbI7MD15KrZ X-Received: by 2002:a05:6638:1301:b0:342:c20d:3b15 with SMTP id r1-20020a056638130100b00342c20d3b15mr21435jad.59.1660234424307; Thu, 11 Aug 2022 09:13:44 -0700 (PDT) X-Google-Smtp-Source: AA6agR4T6gWtzxZxHWUIVbSUYS7vdfLC8nfHajGAKsVlnVfjs8zkeYJ9u3kFIxUuxfWF4Czl1LgvQg== X-Received: by 2002:a05:6638:1301:b0:342:c20d:3b15 with SMTP id r1-20020a056638130100b00342c20d3b15mr21411jad.59.1660234424004; Thu, 11 Aug 2022 09:13:44 -0700 (PDT) Received: from localhost.localdomain (bras-base-aurron9127w-grc-35-70-27-3-10.dsl.bell.ca. [70.27.3.10]) by smtp.gmail.com with ESMTPSA id t1-20020a92ca81000000b002dd1c3c5c46sm3415429ilo.73.2022.08.11.09.13.42 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 11 Aug 2022 09:13:43 -0700 (PDT) From: Peter Xu To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Hugh Dickins , "Kirill A . Shutemov" , Alistair Popple , peterx@redhat.com, Andrea Arcangeli , Minchan Kim , Andrew Morton , David Hildenbrand , Andi Kleen , Nadav Amit , Huang Ying , Vlastimil Babka Subject: [PATCH v4 6/7] mm/swap: Cache maximum swapfile size when init swap Date: Thu, 11 Aug 2022 12:13:30 -0400 Message-Id: <20220811161331.37055-7-peterx@redhat.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220811161331.37055-1-peterx@redhat.com> References: <20220811161331.37055-1-peterx@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-type: text/plain ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1660234428; a=rsa-sha256; cv=none; b=Lcgum+F60OgVaM/aiOxwMdP7yC/MMPTuETlHF8yCqj0LofhENlsfxxJp4BvGVKRxnGzN/3 uYD2BHiA1eIunFJWz1ecPztWMFKsWuHABTcMxUg3K02oheGgnpKlnqF4vJYbUSM4Wl4NTT guiIOTFH3kukWbqaCCWvRDf3bdqbDUE= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=bObCE4pv; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf18.hostedemail.com: domain of peterx@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=peterx@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1660234428; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=/Huxd7IPCPnmA3ZqjXCerOPqYjMrNourUX2B7v06rhc=; b=C+Sddarot3JhryFDIU3eVcN4jfjVcdIzZn5CiO9SttaD8dSaWnegAbiv5YZtWP5w8EnNXB JPd3w4reKpNloecR1neBAtryY89RCWDXUMQzI4OM2PdW9Qbpm2fKbYTBgWzRyzhSaHnD0u tgb1jHaTZUiV151uK2QgdzEe3JjRZG0= X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 483351C0071 Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=bObCE4pv; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf18.hostedemail.com: domain of peterx@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=peterx@redhat.com X-Stat-Signature: nr4y8we6bhygghn8d77cbzgi11ds6spn X-Rspam-User: X-HE-Tag: 1660234428-895250 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: We used to have swapfile_maximum_size() fetching a maximum value of swapfile size per-arch. As the caller of max_swapfile_size() grows, this patch introduce a variable "swapfile_maximum_size" and cache the value of old max_swapfile_size(), so that we don't need to calculate the value every time. Caching the value in swapfile_init() is safe because when reaching the phase we should have initialized all the relevant information. Here the major arch to take care of is x86, which defines the max swapfile size based on L1TF mitigation. Here both X86_BUG_L1TF or l1tf_mitigation should have been setup properly when reaching swapfile_init(). As a reference, the code path looks like this for x86: - start_kernel - setup_arch - early_cpu_init - early_identify_cpu --> setup X86_BUG_L1TF - parse_early_param - l1tf_cmdline --> set l1tf_mitigation - check_bugs - l1tf_select_mitigation --> set l1tf_mitigation - arch_call_rest_init - rest_init - kernel_init - kernel_init_freeable - do_basic_setup - do_initcalls --> calls swapfile_init() (initcall level 4) The swapfile size only depends on swp pte format on non-x86 archs, so caching it is safe too. Since at it, rename max_swapfile_size() to arch_max_swapfile_size() because arch can define its own function, so it's more straightforward to have "arch_" as its prefix. At the meantime, export swapfile_maximum_size to replace the old usages of max_swapfile_size(). Signed-off-by: Peter Xu Reviewed-by: "Huang, Ying" --- arch/x86/mm/init.c | 2 +- include/linux/swapfile.h | 3 ++- include/linux/swapops.h | 2 +- mm/swapfile.c | 7 +++++-- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c index 82a042c03824..9121bc1b9453 100644 --- a/arch/x86/mm/init.c +++ b/arch/x86/mm/init.c @@ -1054,7 +1054,7 @@ void update_cache_mode_entry(unsigned entry, enum page_cache_mode cache) } #ifdef CONFIG_SWAP -unsigned long max_swapfile_size(void) +unsigned long arch_max_swapfile_size(void) { unsigned long pages; diff --git a/include/linux/swapfile.h b/include/linux/swapfile.h index 54078542134c..165e0bd04862 100644 --- a/include/linux/swapfile.h +++ b/include/linux/swapfile.h @@ -8,6 +8,7 @@ */ extern struct swap_info_struct *swap_info[]; extern unsigned long generic_max_swapfile_size(void); -extern unsigned long max_swapfile_size(void); +/* Maximum swapfile size supported for the arch (not inclusive). */ +extern unsigned long swapfile_maximum_size; #endif /* _LINUX_SWAPFILE_H */ diff --git a/include/linux/swapops.h b/include/linux/swapops.h index 36e462e116af..f25b566643f1 100644 --- a/include/linux/swapops.h +++ b/include/linux/swapops.h @@ -307,7 +307,7 @@ static inline bool migration_entry_supports_ad(void) * the offset large enough to cover all of them (PFN, A & D bits). */ #ifdef CONFIG_SWAP - return max_swapfile_size() >= (1UL << SWP_MIG_TOTAL_BITS); + return swapfile_maximum_size >= (1UL << SWP_MIG_TOTAL_BITS); #else /* CONFIG_SWAP */ return false; #endif /* CONFIG_SWAP */ diff --git a/mm/swapfile.c b/mm/swapfile.c index 1fdccd2f1422..3cc64399df44 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -63,6 +63,7 @@ EXPORT_SYMBOL_GPL(nr_swap_pages); /* protected with swap_lock. reading in vm_swap_full() doesn't need lock */ long total_swap_pages; static int least_priority = -1; +unsigned long swapfile_maximum_size; static const char Bad_file[] = "Bad swap file entry "; static const char Unused_file[] = "Unused swap file entry "; @@ -2816,7 +2817,7 @@ unsigned long generic_max_swapfile_size(void) } /* Can be overridden by an architecture for additional checks. */ -__weak unsigned long max_swapfile_size(void) +__weak unsigned long arch_max_swapfile_size(void) { return generic_max_swapfile_size(); } @@ -2856,7 +2857,7 @@ static unsigned long read_swap_header(struct swap_info_struct *p, p->cluster_next = 1; p->cluster_nr = 0; - maxpages = max_swapfile_size(); + maxpages = swapfile_maximum_size; last_page = swap_header->info.last_page; if (!last_page) { pr_warn("Empty swap-file\n"); @@ -3677,6 +3678,8 @@ static int __init swapfile_init(void) for_each_node(nid) plist_head_init(&swap_avail_heads[nid]); + swapfile_maximum_size = arch_max_swapfile_size(); + return 0; } subsys_initcall(swapfile_init);