From nobody Wed Dec 17 06:13:38 2025 Received: from fanzine2.igalia.com (fanzine2.igalia.com [213.97.179.56]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 92F522BE639 for ; Fri, 5 Dec 2025 23:18:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=213.97.179.56 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764976688; cv=none; b=YTpnL5nitNQK4nQFHp3S3ipF1Jqzrd34RkvMuXS6SWPtxTEZQ6m3S5FOCI0ph6O7pJBEDR429e9RyHxXq9eNHnrf7BVS9YCeaT/xeh0FnB8KC/fBVlOANfcgpH6MVrTuRe/4RCN+zGnNmCBx/132dZlqjyQ3G/dKdApVKphZWKk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764976688; c=relaxed/simple; bh=Gl2pQcxfdrpasi1iMuFBEaew5NxcBwl5P2Z4OihVUGM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XWT02CT73uN0oXvFt1pIwIOl42Y67+v9+XlXxZfwNV1+jNSK1Q6xa+VUosCO+gpCBhi6JQ7kxUt1Xc5e7FtDsRvwdb9mMlt+0xGkGmoApctqRhNxZGNKhKJQDR5h91ROa+ViDvdKj0FbWhtENQtyixeZHifanJdJGFxJ3t595N4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=igalia.com; spf=pass smtp.mailfrom=igalia.com; dkim=pass (2048-bit key) header.d=igalia.com header.i=@igalia.com header.b=C7VM/kX4; arc=none smtp.client-ip=213.97.179.56 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=igalia.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=igalia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=igalia.com header.i=@igalia.com header.b="C7VM/kX4" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=ncR7zo6O4wM7dieNg4YaVMgDB/FRmYb+PM5XOoEML4w=; b=C7VM/kX4Z1GDZPeEFpANwu8M7s YGUKDqTs/z6yCu3N5z4MRfogDhl3scwtJSlSPWfviS8bVmnjERPsQMBe1G2lEV8H9n8HhJXxUWBy7 fwAoEbsDb07dZUDlPNJEtxSgJVhLPVowpa2xRfpAGplGdr3fIvX5NldwkEsSpfHhOmWlJ02BfC6gQ /JRkhF9hO+6oDKApbSy9/3ssvwOb1XNgKZeoToaaJGhctUM7DehUKPnJTQPMygkXkeqm1trMiPjgD QCug1kQ9Aqc4NE3qc1fA645nAW5Ef1Bys4mObsqoxpwehNu7eBnFRWEvF81lVF2Gd6rdkPTx8Bmd7 HjD5Z8Ww==; Received: from 186-249-144-101.shared.desktop.com.br ([186.249.144.101] helo=t470) by fanzine2.igalia.com with esmtpsa (Cipher TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim) id 1vRf3n-009H1j-5d; Sat, 06 Dec 2025 00:17:59 +0100 From: Mauricio Faria de Oliveira To: Andrew Morton , David Hildenbrand Cc: Lorenzo Stoakes , Michal Hocko , Vlastimil Babka , Oscar Salvador , linux-mm@kvack.org, linux-kernel@vger.kernel.org, kernel-dev@igalia.com Subject: [PATCH RFC 8/9] mm: call arch-specific swap hooks from generic swap hooks Date: Fri, 5 Dec 2025 20:17:20 -0300 Message-ID: <20251205231721.104505-9-mfo@igalia.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251205231721.104505-1-mfo@igalia.com> References: <20251205231721.104505-1-mfo@igalia.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add generic swap hooks that just call the arch-specific ones (e.g., arm64). Signed-off-by: Mauricio Faria de Oliveira --- include/linux/pgtable.h | 20 ++++++++++++++++++++ mm/memory.c | 2 +- mm/page_io.c | 2 +- mm/shmem.c | 2 +- mm/swapfile.c | 6 +++--- 5 files changed, 26 insertions(+), 6 deletions(-) diff --git a/include/linux/pgtable.h b/include/linux/pgtable.h index 652f287c1ef6..23d30afe439e 100644 --- a/include/linux/pgtable.h +++ b/include/linux/pgtable.h @@ -1220,6 +1220,26 @@ static inline void arch_swap_restore(swp_entry_t ent= ry, struct folio *folio) } #endif =20 +static inline int hook_prepare_to_swap(struct folio *folio) +{ + return arch_prepare_to_swap(folio); +} + +static inline void hook_swap_invalidate_page(int type, pgoff_t offset) +{ + arch_swap_invalidate_page(type, offset); +} + +static inline void hook_swap_invalidate_area(int type) +{ + arch_swap_invalidate_area(type); +} + +static inline void hook_swap_restore(swp_entry_t entry, struct folio *foli= o) +{ + arch_swap_restore(entry, folio); +} + #ifndef __HAVE_ARCH_MOVE_PTE #define move_pte(pte, old_addr, new_addr) (pte) #endif diff --git a/mm/memory.c b/mm/memory.c index 2a55edc48a65..6a5a5bd3eeed 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -4945,7 +4945,7 @@ vm_fault_t do_swap_page(struct vm_fault *vmf) * when reading from swap. This metadata may be indexed by swap entry * so this must be called before swap_free(). */ - arch_swap_restore(folio_swap(entry, folio), folio); + hook_swap_restore(folio_swap(entry, folio), folio); =20 /* * Remove the swap entry and conditionally try to free up the swapcache. diff --git a/mm/page_io.c b/mm/page_io.c index 3c342db77ce3..b62c53a86a59 100644 --- a/mm/page_io.c +++ b/mm/page_io.c @@ -248,7 +248,7 @@ int swap_writeout(struct folio *folio, struct swap_iocb= **swap_plug) * Arch code may have to preserve more data than just the page * contents, e.g. memory tags. */ - ret =3D arch_prepare_to_swap(folio); + ret =3D hook_prepare_to_swap(folio); if (ret) { folio_mark_dirty(folio); goto out_unlock; diff --git a/mm/shmem.c b/mm/shmem.c index 3f194c9842a8..ef53c14156fb 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -2395,7 +2395,7 @@ static int shmem_swapin_folio(struct inode *inode, pg= off_t index, * Some architectures may have to restore extra metadata to the * folio after reading from swap. */ - arch_swap_restore(folio_swap(swap, folio), folio); + hook_swap_restore(folio_swap(swap, folio), folio); =20 if (shmem_should_replace_folio(folio, gfp)) { error =3D shmem_replace_folio(&folio, gfp, info, index, vma); diff --git a/mm/swapfile.c b/mm/swapfile.c index 46d2008e4b99..e156f5cb6e9f 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -1270,7 +1270,7 @@ static void swap_range_free(struct swap_info_struct *= si, unsigned long offset, else swap_slot_free_notify =3D NULL; while (offset <=3D end) { - arch_swap_invalidate_page(si->type, offset); + hook_swap_invalidate_page(si->type, offset); if (swap_slot_free_notify) swap_slot_free_notify(si->bdev, offset); offset++; @@ -2196,7 +2196,7 @@ static int unuse_pte(struct vm_area_struct *vma, pmd_= t *pmd, * when reading from swap. This metadata may be indexed by swap entry * so this must be called before swap_free(). */ - arch_swap_restore(folio_swap(entry, folio), folio); + hook_swap_restore(folio_swap(entry, folio), folio); =20 dec_mm_counter(vma->vm_mm, MM_SWAPENTS); inc_mm_counter(vma->vm_mm, MM_ANONPAGES); @@ -2931,7 +2931,7 @@ SYSCALL_DEFINE1(swapoff, const char __user *, special= file) p->cluster_info =3D NULL; spin_unlock(&p->lock); spin_unlock(&swap_lock); - arch_swap_invalidate_area(p->type); + hook_swap_invalidate_area(p->type); zswap_swapoff(p->type); mutex_unlock(&swapon_mutex); kfree(p->global_cluster); --=20 2.51.0