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 3E6A5EE4993 for ; Wed, 23 Aug 2023 13:17:40 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C2D1A280070; Wed, 23 Aug 2023 09:17:39 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BDC4128005D; Wed, 23 Aug 2023 09:17:39 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id ACBDD280070; Wed, 23 Aug 2023 09:17:39 -0400 (EDT) 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 9D8FE28005D for ; Wed, 23 Aug 2023 09:17:39 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 7907812011A for ; Wed, 23 Aug 2023 13:17:39 +0000 (UTC) X-FDA: 81155421438.18.674B16B Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf22.hostedemail.com (Postfix) with ESMTP id 98814C0005 for ; Wed, 23 Aug 2023 13:17:37 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf22.hostedemail.com: domain of alexandru.elisei@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=alexandru.elisei@arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1692796657; 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=0SsnpIoQ3y7pPNkB5bLokPAkvyjt/i+TrfRWqY2uaYQ=; b=QqHwW1+hBGijxfWXpUxGIoDqpAyfnXCrx5pZZSTWXeg9INZ9iq4euLcS7p/ZsmLuE0sh1a 1ziekHktbabHthl2s//eBHM0xpBeylRP8Rc9f/PH4xkIZj8Jtzis3MpUJL6GePDPHcG5dd GqPARp0RHdUiRsLwgHx5B5tE9IrGy8o= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf22.hostedemail.com: domain of alexandru.elisei@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=alexandru.elisei@arm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1692796657; a=rsa-sha256; cv=none; b=Ipcd0YW6WDG4T8BrDs1McY0OqZZNUtyhb6Hx2jrUdVwq6unptf4qBEsBO31hYakHylyPpo I609KPkMszhknPaVqc5mR3PRvHmZNk0ClYALdSqzlurx5IadgCjX4UgBXkGynqEakBp6Xd m1Y+eusBSjr2OROSxqJMdTXME8UYUQ4= 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 8531815BF; Wed, 23 Aug 2023 06:18:17 -0700 (PDT) Received: from e121798.cable.virginm.net (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 0FC3D3F740; Wed, 23 Aug 2023 06:17:29 -0700 (PDT) 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 32/37] mm: Call arch_swap_prepare_to_restore() before arch_swap_restore() Date: Wed, 23 Aug 2023 14:13:45 +0100 Message-Id: <20230823131350.114942-33-alexandru.elisei@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230823131350.114942-1-alexandru.elisei@arm.com> References: <20230823131350.114942-1-alexandru.elisei@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Stat-Signature: baj4uafw11wcnmr9o88a59zxopuq76zy X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 98814C0005 X-HE-Tag: 1692796657-896594 X-HE-Meta: U2FsdGVkX1/cxGePVBsBu8m4hAVLsgp8rSE7/dC3HqFJbivACelelSUIlWrDt5qkU0Bx3q3BT2nmbdwC9SDgG0i5PCgVXK+cNNyWXXXawQnZufilgf7AB8Zw2DFlGYInxcyJns5HslfguchBc7ikuST2mUyn6I5ov3utTBUq8avN5NpzxxWnq7rIgNRpAPVgg28M2lkCV9yyOW4mLldm5baSL0GEhTsl2aOBZFTXyiAXkhImkX6nojhz/WaBceSWs0+6h6XPR7NpCOrfg3wjdt814UHUUnUPfAMu75tA/amFqwVMzvIbKdqLjTq4WY75DpRoRM8Ntt41ORQ/wGiMIRQXzXahoX6aKTm2Rwv402Poc1JB65e/01S1Y7z4ceNHpIsRPQ/gDBUQ+bfkb7KC8GElZuD3UvDxLBNblLMTDtZCKL9LFqhwT5/K6TVlF4N5eeUpeWYn9llgpNO+j+rYvRhwaVz3DI66Dw6q7O1aAt/NXoqtPAlvFb+QKXnVgTxSqBzzUUszL0MQb/wFonA6W0pPgdJ28T0NLSJum2emSjoVPg72+iDpt+aQfR967Jxm+7vzUo+y29H50ImYeA51Ux4EbTxV9vfqXiIr4/1B9NCJtsKq/h04bb6zfbKcJBhF6hDC8/Lz+V4EJ4Fi7IaS5bHtQktRT9IahjisWAAlntfYeVbi2psX/FGcB1xGIL/tXNIRcoGN4JOOtEPXbE5eBj5fRsETYD7OAUlnbat6p9QhIfawXs2DcqaBuKOotU83YGJ5vwypFLuH3RKZNB9zlyDotXuhdW1P0PAc5SYptYIeVY5bN8KMVU30ZN38kL6N6bgnemUG1TYE65JqojGJW6+PvmffRo7aUUH/j6l7lDvsL2N0fZQfBxpmgff/XzzOna/MCsB0pfeBpWAjaebty4bHACMRL+2MXGdH/Hfl/GX15lY/VmjLzJsnIbI3fuCckty7ma6zUrFh9uOsJzu 3oXbcLOc iEBlWMp0erRNu7X7utnrr4ow398RDECtN116WMJRpNHW/aQcuulUsYeQ/b86W+cTzrZZFbK0D+dFiNLFLUH+0rqpV+tYPF7A8T1oCa0xrM4wxOS1FMC7CxhkAuH1uSa3lETZsZNU9uvamPeVEtXgPm2lunRLXZ5PvwVE+9CNFOtJ/UY1bPe6D/cN6vustCaRqozDylZno9DpIWno= 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: arch_swap_restore() allows an architecture to restore metadata before the page is swapped in and it's called in atomic context (with the ptl lock held). Introduce arch_swap_prepare_to_restore() to allow such architectures to perform extra work in a blocking context. Signed-off-by: Alexandru Elisei --- include/linux/pgtable.h | 7 +++++++ mm/memory.c | 11 +++++++++++ mm/shmem.c | 4 ++++ mm/swapfile.c | 4 ++++ 4 files changed, 26 insertions(+) diff --git a/include/linux/pgtable.h b/include/linux/pgtable.h index 0119ffa2c0ab..0bce12f9eaab 100644 --- a/include/linux/pgtable.h +++ b/include/linux/pgtable.h @@ -816,6 +816,13 @@ static inline void arch_swap_restore(swp_entry_t entry, struct folio *folio) } #endif +#ifndef __HAVE_ARCH_SWAP_PREPARE_TO_RESTORE +static inline int arch_swap_prepare_to_restore(swp_entry_t entry, struct folio *folio) +{ + return 0; +} +#endif + #ifndef __HAVE_ARCH_PGD_OFFSET_GATE #define pgd_offset_gate(mm, addr) pgd_offset(mm, addr) #endif diff --git a/mm/memory.c b/mm/memory.c index 6c4a6151c7b2..5f7587109ac2 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -3724,6 +3724,7 @@ vm_fault_t do_swap_page(struct vm_fault *vmf) swp_entry_t entry; pte_t pte; int locked; + int error; vm_fault_t ret = 0; void *shadow = NULL; @@ -3892,6 +3893,16 @@ vm_fault_t do_swap_page(struct vm_fault *vmf) folio_throttle_swaprate(folio, GFP_KERNEL); + /* + * Some architecture may need to perform certain operations before + * arch_swap_restore() in preemptible context (like memory allocations). + */ + error = arch_swap_prepare_to_restore(entry, folio); + if (error) { + ret = VM_FAULT_ERROR; + goto out_page; + } + /* * Back out if somebody else already faulted in this pte. */ diff --git a/mm/shmem.c b/mm/shmem.c index 0b772ec34caa..4704be6a4e9b 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -1796,6 +1796,10 @@ static int shmem_swapin_folio(struct inode *inode, pgoff_t index, } folio_wait_writeback(folio); + error = arch_swap_prepare_to_restore(swap, folio); + if (error) + 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 6d719ed5c616..387971e2c5f0 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -1756,6 +1756,10 @@ static int unuse_pte(struct vm_area_struct *vma, pmd_t *pmd, else if (unlikely(PTR_ERR(page) == -EHWPOISON)) hwposioned = true; + ret = arch_swap_prepare_to_restore(entry, folio); + if (ret) + return ret; + pte = pte_offset_map_lock(vma->vm_mm, pmd, addr, &ptl); if (unlikely(!pte || !pte_same_as_swp(ptep_get(pte), swp_entry_to_pte(entry)))) { -- 2.41.0