From mboxrd@z Thu Jan 1 00:00:00 1970 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 9B145C54E76 for ; Sun, 19 Nov 2023 16:58:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 289576B0354; Sun, 19 Nov 2023 11:58:35 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 239826B0356; Sun, 19 Nov 2023 11:58:35 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0DA9D6B0358; Sun, 19 Nov 2023 11:58:35 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id F1FF66B0354 for ; Sun, 19 Nov 2023 11:58:34 -0500 (EST) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id C8F501603D1 for ; Sun, 19 Nov 2023 16:58:34 +0000 (UTC) X-FDA: 81475312548.05.151FD7E Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf14.hostedemail.com (Postfix) with ESMTP id 285AE100015 for ; Sun, 19 Nov 2023 16:58:32 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=none; spf=pass (imf14.hostedemail.com: domain of alexandru.elisei@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=alexandru.elisei@arm.com; dmarc=pass (policy=none) header.from=arm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1700413113; a=rsa-sha256; cv=none; b=cXhllEr6dAYnPqgAm1iCEubGettMlICKZ9Qt22HxITXs6J0nKC7cMs7d/m9hZIJuQ6lo2J OUlDmJAAW0x9LHSRfPCYqqEROZOeGjENeoTxUdtpATG5X3kMwXMjxiD2r9ob7IqmDKMQ+A 4Qf/yaHU7xVD9N3EWwLQp4OmGzZVmfI= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=none; spf=pass (imf14.hostedemail.com: domain of alexandru.elisei@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=alexandru.elisei@arm.com; dmarc=pass (policy=none) header.from=arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1700413113; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=iT5Ko/obUfRq+sIdx+EjaShutEsOIHdCwfCyz1NLVmQ=; b=B9AW7uhqLP+7cfgrvzQse2/qloosxKvWJvDTfpeOXZz7fyIUQ1VRf0oB9Wf8rfGKp+GJt6 01wptLfUZwiXgCQJtD4BwRxVKlovJwTEYGrreRsWwGpi4ks2Q4VGQRdJ1qT2RCTbNNeuOf /l0WvKc5XOxLpMKSE1/JWEQqev/ymkA= Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 87A641042; Sun, 19 Nov 2023 08:59:18 -0800 (PST) Received: from e121798.cable.virginm.net (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 40DE23F6C4; Sun, 19 Nov 2023 08:58:27 -0800 (PST) From: Alexandru Elisei To: catalin.marinas@arm.com, will@kernel.org, oliver.upton@linux.dev, maz@kernel.org, james.morse@arm.com, suzuki.poulose@arm.com, yuzenghui@huawei.com, arnd@arndb.de, akpm@linux-foundation.org, mingo@redhat.com, peterz@infradead.org, juri.lelli@redhat.com, vincent.guittot@linaro.org, dietmar.eggemann@arm.com, rostedt@goodmis.org, bsegall@google.com, mgorman@suse.de, bristot@redhat.com, vschneid@redhat.com, mhiramat@kernel.org, rppt@kernel.org, hughd@google.com Cc: pcc@google.com, steven.price@arm.com, anshuman.khandual@arm.com, vincenzo.frascino@arm.com, david@redhat.com, eugenis@google.com, kcc@google.com, hyesoo.yu@samsung.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kvmarm@lists.linux.dev, linux-fsdevel@vger.kernel.org, linux-arch@vger.kernel.org, linux-mm@kvack.org, linux-trace-kernel@vger.kernel.org Subject: [PATCH RFC v2 10/27] mm: Call arch_swap_prepare_to_restore() before arch_swap_restore() Date: Sun, 19 Nov 2023 16:57:04 +0000 Message-Id: <20231119165721.9849-11-alexandru.elisei@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231119165721.9849-1-alexandru.elisei@arm.com> References: <20231119165721.9849-1-alexandru.elisei@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 285AE100015 X-Stat-Signature: u3jc3dqou51e93ma78cwoqd9kpkas9az X-HE-Tag: 1700413112-328786 X-HE-Meta: U2FsdGVkX18cQu5V9ZBt4oQZKT0S1Y7NISXjDjPLvHxXK6pH6vPhAP6YfSC6VeUb1AL0+SZ+RuTVmkBAEoAkxvRad1S1P8gp/AaEl3kzd4RWaVBtoGyPhlp3EZgdKY5PImsbMYMQy6JJFlxxe5zX1RY6YstXchVposeDZCu20+1ASaLj2TfrG8um56dpbUlPMx/isr23JNWbTsdQymodKokn1JVQBuxWqDQqfmMclUf9tAb/oiuEibvGi9zc1vVD1GLxwLSUmvcRFUcCmnPtZUaTDkj2t6LSuFSWrTje1xp9tx/Xu1dQ54wi0V5pJdq5Xrl3yxn+GeafSsZrlXwwoRrnEvY4uhufaENLo9zslkQBqIs6yXE7uD6+oaoqiNMhPcUgIFcIlPm8rI19PPhF2IDuGDKmdxG1NdAhV89aa+5zVFmM9c0KBcTAMPVOIvRabzd6hEU2BQl6Kka9GomRbIUusQpY3ezAd+M5Ub3J5mNprUpM+blZA2Xb/LrNF27QJlU0gv9RqJbPAR4EIu4UJE/4RQJNhJuZ2fPOy90kWZtIKjTkH2wZgswCdSU0ejmM5R68p/a3utoLhPGJiMboSOQ0ZmPW5G+CjXBmHmi4z280J5dZHjGqph4TpkXPjF+tQj8T0dXj5R7pW9dF+kMKlTAHmcCLA0t05vyo7WfrXgENyBGSdGyfJyrGLHT9a+o3TgsPGhCjF/S6e1E8ZXICjlsTsQhBJgdnAK2Ir1nWlwix01LRWuvqYq1kAxN1RzRNpiBguQfunIxIVeagevqD5vYB2hwhZY8KCqIuWiWKwPASmEtCXsgQyk2LGesEMM9okQEhpADBG6YQAwbfBSsbHnhSX6bYlXr3U4C/hHXuT6guwHFNAHhOBU9xZRpool/u+PxzdlOsKBY4B7xNQ/A60r+1Dr4E59h0rvahhpGC2n+758VYu2GX/dEL8xus/lzXGI7CeASVa0nghSsND7L Xg6SjOFg hxXwDiv4Keo33tKhR19JHW3POP2t9kc1WD5OpsWzgqPcVSXFvOHb806NfuaN3yZkQY4+dXndc6SeimdQVGCA79BwhLuMewK5KFxj/lMr3EepQ6H04kToOKGn3awAsrAhAmK63kYM150+Oi+Crab7zL3KeCp2DIqeXYQUSEoIxcfgFO2GpC6/XSMIqrpySIcGYsy16lFV5mYTg8Bw= 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: List-Subscribe: List-Unsubscribe: arm64 uses arch_swap_restore() to restore saved tags before the page is swapped in and it's called in atomic context (with the ptl lock held). Introduce arch_swap_prepare_to_restore() that will allow an architecture to perform extra work during swap in and outside of a critical section. Signed-off-by: Alexandru Elisei --- include/linux/pgtable.h | 7 +++++++ mm/memory.c | 4 ++++ mm/shmem.c | 9 +++++++++ mm/swapfile.c | 7 +++++++ 4 files changed, 27 insertions(+) diff --git a/include/linux/pgtable.h b/include/linux/pgtable.h index b1001ce361ac..ffdb9b6bed6c 100644 --- a/include/linux/pgtable.h +++ b/include/linux/pgtable.h @@ -938,6 +938,13 @@ static inline void arch_swap_invalidate_area(int type) } #endif +#ifndef __HAVE_ARCH_SWAP_PREPARE_TO_RESTORE +static inline vm_fault_t arch_swap_prepare_to_restore(swp_entry_t entry, struct folio *folio) +{ + return 0; +} +#endif + #ifndef __HAVE_ARCH_SWAP_RESTORE static inline void arch_swap_restore(swp_entry_t entry, struct folio *folio) { diff --git a/mm/memory.c b/mm/memory.c index 1f18ed4a5497..e137f7673749 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -3957,6 +3957,10 @@ vm_fault_t do_swap_page(struct vm_fault *vmf) folio_throttle_swaprate(folio, GFP_KERNEL); + ret = arch_swap_prepare_to_restore(entry, folio); + if (ret) + goto out_page; + /* * Back out if somebody else already faulted in this pte. */ diff --git a/mm/shmem.c b/mm/shmem.c index 71ce5fe5c779..0449c03dbdfd 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -1840,6 +1840,7 @@ static int shmem_swapin_folio(struct inode *inode, pgoff_t index, struct swap_info_struct *si; struct folio *folio = NULL; swp_entry_t swap; + vm_fault_t ret; int error; VM_BUG_ON(!*foliop || !xa_is_value(*foliop)); @@ -1888,6 +1889,14 @@ static int shmem_swapin_folio(struct inode *inode, pgoff_t index, } folio_wait_writeback(folio); + ret = arch_swap_prepare_to_restore(swap, folio); + if (ret) { + if (fault_type) + *fault_type = ret; + error = -EINVAL; + goto unlock; + } + /* * Some architectures may have to restore extra metadata to the * folio after reading from swap. diff --git a/mm/swapfile.c b/mm/swapfile.c index 4bc70f459164..9983dffce47b 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -1746,6 +1746,7 @@ static int unuse_pte(struct vm_area_struct *vma, pmd_t *pmd, spinlock_t *ptl; pte_t *pte, new_pte, old_pte; bool hwpoisoned = PageHWPoison(page); + vm_fault_t err; int ret = 1; swapcache = page; @@ -1779,6 +1780,12 @@ static int unuse_pte(struct vm_area_struct *vma, pmd_t *pmd, goto setpte; } + err = arch_swap_prepare_to_restore(entry, page_folio(page)); + if (err) { + ret = -EINVAL; + goto out; + } + /* * Some architectures may have to restore extra metadata to the page * when reading from swap. This metadata may be indexed by swap entry -- 2.42.1