From patchwork Tue Aug 9 22:00:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 12939969 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 53D2EC19F2D for ; Tue, 9 Aug 2022 22:01:18 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 59F7A8E0009; Tue, 9 Aug 2022 18:01:14 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4FF328E0007; Tue, 9 Aug 2022 18:01:14 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3516D8E0009; Tue, 9 Aug 2022 18:01:14 -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 181638E0007 for ; Tue, 9 Aug 2022 18:01:14 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id E2DF1141212 for ; Tue, 9 Aug 2022 22:01:13 +0000 (UTC) X-FDA: 79781425626.30.06CBCA5 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf06.hostedemail.com (Postfix) with ESMTP id 67B38180166 for ; Tue, 9 Aug 2022 22:01:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1660082472; 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=QP8/u5AChrIXiwIzqFnG/IHURDZ5n0i12x48YvKEviU=; b=h1CbR7yHaD22366O//ft4s+Xv1/ab9TFFcnCwrzihvwvFPSdxd5agLClY2CyQKAkrEsPVZ K9WM6ouhbn0dS3pfEvNVPDdxyPMuNTTvtUUMTA4hsONx2K0VsEJq+kkKfcTQw49oPRs9z/ aT+o6H7apbMG6qhMiLQTIOMAemDOTdg= Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-640-Yb5E4k9LOeWtGEm_ScSKIw-1; Tue, 09 Aug 2022 18:01:12 -0400 X-MC-Unique: Yb5E4k9LOeWtGEm_ScSKIw-1 Received: by mail-qk1-f199.google.com with SMTP id m17-20020a05620a291100b006b6590830feso11236738qkp.13 for ; Tue, 09 Aug 2022 15:01:12 -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=QP8/u5AChrIXiwIzqFnG/IHURDZ5n0i12x48YvKEviU=; b=gC2ofxMIrrBUK5OeCRDYMLyF0wgaLuPxd5qc72M0SG2anKRnhvh4v1T1G4hHVawMTM LoJ5Ij2GQ7J3bQ74QWu9JuKuTcHVDY5WobDbRMLwgIyQQqKfreOqjJAn623GrHgXY+nF Im7B5SW9tGdDavoBQ7nUWIqKKAHflMoJTItPlY8l9JKdkbba3EN4iH5n9Dd+cKI2FLWf irzCOxbWbxkFHXVmoQslHfuPkk8ISaY/LSVgTa4RmcjoWd/EMIsSW9OM4ABt3iMwlInz 7zNKhkQcjeor1oK+wz2AZhDmzlEhMqO1e8xtho/xbNphirVPONtqWdOZl3Cg2O9TuH4q bjkQ== X-Gm-Message-State: ACgBeo1j1N1UbSurojqWdhMeqyBUFMKYDzHzZ8x7oVCdXTt/Jdm0PSrd qbhRtXfSCyZ8guhBVuzKPNFYOVJVWPXzucYOmjTJ598K9dDHNWqSdY59bNgyYQy/LK3OuJSJWx0 9zpXnrYjo1hjEBhUWVQB2R1Ldp9npgE6aFDX1DE5+sya6/ygoirtWVsVx99dF X-Received: by 2002:a05:622a:184:b0:31e:d9a2:1e7 with SMTP id s4-20020a05622a018400b0031ed9a201e7mr21769890qtw.600.1660082471440; Tue, 09 Aug 2022 15:01:11 -0700 (PDT) X-Google-Smtp-Source: AA6agR6rCoAdukBJ919s0iooFl+Su6+6WLl8fX28qz4Ljb6jLzuDkULdmT6xOGx8775yUr2wJWOu3Q== X-Received: by 2002:a05:622a:184:b0:31e:d9a2:1e7 with SMTP id s4-20020a05622a018400b0031ed9a201e7mr21769841qtw.600.1660082471059; Tue, 09 Aug 2022 15:01:11 -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 b16-20020a05622a021000b0031eddc83560sm10563383qtx.90.2022.08.09.15.01.09 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 09 Aug 2022 15:01:10 -0700 (PDT) From: Peter Xu To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: peterx@redhat.com, Minchan Kim , David Hildenbrand , Nadav Amit , Andrew Morton , Hugh Dickins , Vlastimil Babka , Andrea Arcangeli , Andi Kleen , Huang Ying , "Kirill A . Shutemov" Subject: [PATCH v3 6/7] mm/swap: Cache maximum swapfile size when init swap Date: Tue, 9 Aug 2022 18:00:59 -0400 Message-Id: <20220809220100.20033-7-peterx@redhat.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220809220100.20033-1-peterx@redhat.com> References: <20220809220100.20033-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=1660082473; a=rsa-sha256; cv=none; b=cwhi737gHnOHWFEq0QrmyOtNziY/VP482eRSgthaBnh0oi13oUNx/T7GGwWEInEdna/q2S KpcyUjKeXhCZ029ZCcPejCOinZJk2Rvy5iLnjbZAKSo6fS0+AbPvH2M9zK6wAPbn8hqMCQ CIgIvqeCQjIb2peXomR7KrVodVW5VWs= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=h1CbR7yH; spf=pass (imf06.hostedemail.com: domain of peterx@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=peterx@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1660082473; 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=QP8/u5AChrIXiwIzqFnG/IHURDZ5n0i12x48YvKEviU=; b=BtbEwlcpCd3Iqafq78Ub+7r5tPvyRxw7YLaAc2+iHb2r7sf2jnPuVcp3d2y1QW3x79XK6n s4BHO+Ic6Z7jJ0TO6c3F40DPszPJNOZtCGXQEnHj1dNZsvsrt2OSgT+BhkECgXcZB/B5hr EXa3ULWjL0hGvSJeIMOslrPPfSR1g9I= X-Stat-Signature: oisjn19ns8bwzb471mmrnzghnwhpjzpw X-Rspamd-Queue-Id: 67B38180166 Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=h1CbR7yH; spf=pass (imf06.hostedemail.com: domain of peterx@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=peterx@redhat.com; dmarc=pass (policy=none) header.from=redhat.com X-Rspam-User: X-Rspamd-Server: rspam01 X-HE-Tag: 1660082473-395599 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 look after is x86, which defines the max 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, keep the swapfile_maximum_size() function to fetch the value from the cache initialized in swapfile_init(). Signed-off-by: Peter Xu --- arch/x86/mm/init.c | 2 +- mm/swapfile.c | 10 +++++++++- 2 files changed, 10 insertions(+), 2 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/mm/swapfile.c b/mm/swapfile.c index 1fdccd2f1422..794fa37bd0c3 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; +static unsigned long swapfile_maximum_size; static const char Bad_file[] = "Bad swap file entry "; static const char Unused_file[] = "Unused swap file entry "; @@ -2816,11 +2817,16 @@ 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(); } +unsigned long max_swapfile_size(void) +{ + return swapfile_maximum_size; +} + static unsigned long read_swap_header(struct swap_info_struct *p, union swap_header *swap_header, struct inode *inode) @@ -3677,6 +3683,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);