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 CBE17C47258 for ; Thu, 25 Jan 2024 16:43:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6278C6B007B; Thu, 25 Jan 2024 11:43:59 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 5B0E06B0087; Thu, 25 Jan 2024 11:43:59 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4516A8D0002; Thu, 25 Jan 2024 11:43:59 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 2E65E6B007B for ; Thu, 25 Jan 2024 11:43:59 -0500 (EST) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 0C141A0A61 for ; Thu, 25 Jan 2024 16:43:59 +0000 (UTC) X-FDA: 81718405398.27.96708FC Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf19.hostedemail.com (Postfix) with ESMTP id 450001A0007 for ; Thu, 25 Jan 2024 16:43:57 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=none; spf=pass (imf19.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=1706201037; 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=t/1X1P8QVoHQyW9paC2c7VyRn9dvBn9hTvEEdUS4Dys=; b=6XHOHUFH06SttVx/Ln3YnGqr0/AZc9LsX+l9P20yZRCmXXhr8iiOIs/defkzE1yOX/N6IV j25GpiiwSuuzbY4FPuMGQgLBQsgHnlx3uOj2206SsXpnU3TbLlZanOoamh4qUAa/Mh5NP1 Hhhg7sQ2XvM1Hf/ONf4L59/HCeGzPyQ= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1706201037; a=rsa-sha256; cv=none; b=DEaPta2m/pjGVtqp+SwRgeir3gzvQwhbPTBpT0k00yiVfHfDuMLpTW/D1wVGh4g3nHGr3e HSFPR3P9LI1GX8tpeQPR3Ukb4EAJzHAhGIeVeGdmlYeHhudVOUoUbJBUFsGbyW+g8vioiE Kk6huXXiJGekATlMZ0HwXDtj39IkefE= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=none; spf=pass (imf19.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 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 CDDEF1576; Thu, 25 Jan 2024 08:44:40 -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 DE15E3F5A1; Thu, 25 Jan 2024 08:43:50 -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 v3 12/35] mm: Call arch_swap_prepare_to_restore() before arch_swap_restore() Date: Thu, 25 Jan 2024 16:42:33 +0000 Message-Id: <20240125164256.4147-13-alexandru.elisei@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240125164256.4147-1-alexandru.elisei@arm.com> References: <20240125164256.4147-1-alexandru.elisei@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Stat-Signature: rj6cpzu1dfe6hhk6y3qcukzyp5rz1owc X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 450001A0007 X-Rspam-User: X-HE-Tag: 1706201037-294687 X-HE-Meta: U2FsdGVkX1+OeGelHmyTMgcoMyioEpq23/935GmapYBkr4tLNqOQPNm3jtL8keZmugGDmIUh74Kb25XjIYNmuhuV5oBodT/TgRb8He9nd5zVKalbTmVuRG0CyR+pNpDOhwriCgtWEW2QX4C5yXoFODc0Iwy5fBgJyqIHJ0rbKjkhHPP0ejPw5hG4PCpLmpPIbZ4BNJwikC9pYTbhlNws2MdJKMtEUGX1qaINUgiawIWYoV+ziAXU7zrOziVaYB2n4o+t4jqwbDhc4r02+QHMl4+d0Tw8ne9QTixYUMkDj06obV1nZUQ6C6AXQpHdVU71BQ+hP56ODsZrqPnpwWP8LzlfL6ZV1e59230zvsXqeLGGQxRHJ8PdLFrAOpxHxWHhfU6IgoUn150BgVN/8T0nfmVK9sI8qAKIzemZrIZdjjQMHcIR6KLusGX6E4J1mYP4auRCubO91B+o01Pwj7VOFVsKnQFDbevsuuru1uUXyBXFPfpd91M8k7naglwv0/7O9FS+magCmNrz+z6Q//XlhEH8QEIDr3rOpKDOPv6Rdu0p+e9/AOMFKVwN5+HR/HqwVpbSmt6SarV2l6XCFsiegnSRgw4tyK9LivJrMaXgYiqvEfFJQ6B3RByEdyXFm+lOGP0a8VqISD/KF0IMFaWuD9ahHBT3NMVFVvuXQs3UgwXOoTVCXeSern1EeNlz81a+i+4bFga0bNV7sRZDEM63rLY+3cy9tHr7wyux2NoABRXiDcGEQVsEqT7OJi5AoO0qy+FEGUpA0YQ8x4F+JRHz25gmbx6AgHPdHmnBv3beSs/q37SAfy+4gozVJ0/VJN/eLZQCRLczSXjQHz1MPSxsrzZg/7mGJkxnxZQzbFOl14NDUYaIW7e1pUo2N05UlF2rTv8xEum8LWMU1xUtz51x9VKWG9KzbqHA37LbkE03t98EGfuumRGCVirE1kQsGoSL4Omn9TvXFFJfx7Pxh1Q /T92oOj1 KX02ADlQ/0EAPEmyIuvzFPma4vySa8AstvwzTvlC2NOfW5OlhvOFxH9mOwrREHeKTynYWDNL3vBRjM1PA+DxEfLrFGwJilrQplXiWNXyFFHKXpna3Rk2JOQQxB9G61X+TWnknnpDXNRLbplii/3tuJ3cMxpTe1Niw6z/HDo7k/ay5HOqEAHlf1LpsYnY7mn5Sc7kHW03lSstcDSw= 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. This will be used by arm64 to allocate a buffer in memory where to temporarily save tags if tag storage is not available for the page being swapped in. Signed-off-by: Alexandru Elisei --- include/linux/pgtable.h | 7 +++++++ mm/memory.c | 4 ++++ mm/shmem.c | 9 +++++++++ mm/swapfile.c | 5 +++++ 4 files changed, 25 insertions(+) diff --git a/include/linux/pgtable.h b/include/linux/pgtable.h index 98f81ca08cbe..2d0f04042f62 100644 --- a/include/linux/pgtable.h +++ b/include/linux/pgtable.h @@ -959,6 +959,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 7e1f4849463a..8a421e168b57 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -3975,6 +3975,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 14427e9982f9..621fabc3b8c6 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -1855,6 +1855,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)); @@ -1903,6 +1904,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 556ff7347d5f..49425598f778 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -1785,6 +1785,11 @@ static int unuse_pte(struct vm_area_struct *vma, pmd_t *pmd, goto setpte; } + if (arch_swap_prepare_to_restore(entry, folio)) { + 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.43.0