From patchwork Tue Nov 14 01:43:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Barry Song <21cnbao@gmail.com> X-Patchwork-Id: 13454699 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 88327C4332F for ; Tue, 14 Nov 2023 01:43:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0873C6B024B; Mon, 13 Nov 2023 20:43:36 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 010526B0254; Mon, 13 Nov 2023 20:43:35 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DA4F56B0256; Mon, 13 Nov 2023 20:43: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 C4C106B024B for ; Mon, 13 Nov 2023 20:43:35 -0500 (EST) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id A26111205D7 for ; Tue, 14 Nov 2023 01:43:35 +0000 (UTC) X-FDA: 81454862790.04.41B9B01 Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) by imf29.hostedemail.com (Postfix) with ESMTP id DC410120002 for ; Tue, 14 Nov 2023 01:43:33 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=bw3yOwR9; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf29.hostedemail.com: domain of 21cnbao@gmail.com designates 209.85.210.174 as permitted sender) smtp.mailfrom=21cnbao@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1699926213; 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:references:dkim-signature; bh=XvYeDrf+ozzFMULn0fw8A2WRXHvXdagCOQktRp5fBvk=; b=yB/CaphiSQUz0+e/KXaawd+m5Ls9CipsJkBDACGEjR+Ih+fxKcWdHu54rZdjUaig8eDi0u FPZCfg+/LpouWYvDWnTMdKbRMtakrchIAIX2r6yUSwy/pjIOiTfjpTJHW6EQ4V5aXsRLdG oWAKg3FBGMZkiKXfG2fXtpoOrpOF6bg= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=bw3yOwR9; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf29.hostedemail.com: domain of 21cnbao@gmail.com designates 209.85.210.174 as permitted sender) smtp.mailfrom=21cnbao@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1699926213; a=rsa-sha256; cv=none; b=GI83fDP89d5N0i195YaILuW9VgsO7f8bMtwkp5qVXBn5Z2aTPsvwFaqykiIgw/6mTnYCcs +6ZnRCjc0IUkup5GbYrShSU1j8CmD31os8xDTVLyJRUttFLmJ/5ukbdhZ8E9y7D88t50hd osn/Be4Hbgc8j56jiNBxOi+EG7GXs78= Received: by mail-pf1-f174.google.com with SMTP id d2e1a72fcca58-6be0277c05bso4511089b3a.0 for ; Mon, 13 Nov 2023 17:43:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1699926213; x=1700531013; darn=kvack.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=XvYeDrf+ozzFMULn0fw8A2WRXHvXdagCOQktRp5fBvk=; b=bw3yOwR9F6A696t4fl4vlw00+w1A//S4iHroGlTDdHduIIepv/XW4rw/txesR/l39o MxMkX5vOTICOC+m8V9NFUKC5yxfLSoRA9JzzG6PT9Mmancge/WGMuldLZEVuYomvx9q2 HF6D8O1nTgU/E5SYjpyKNl2i+Ubtbka8xsh+oy0AFF8u5DvSEYHus9R3rAnTKfLlTc9w u30MVcbXFJwT6M9yx1pB8reTca+GNpqZY1sqXnfF/YxZU6CHZzl8WCY+qRkLlgBgw37R oyHssfxNwuIiVOrbJRPQqt+pZQ9sYUndvpisj5tENCbvM2mlYBwGPsqsG1KAz3z9F9Nq KloQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699926213; x=1700531013; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=XvYeDrf+ozzFMULn0fw8A2WRXHvXdagCOQktRp5fBvk=; b=iCi/RQEo5FFPtsvmV3kEJ5zwS353N1JNS+KYBfmZqS0In8WKSf4ewF70VbQ0eToBsD 3q9bYB7j2TA9WMsxwJepENkgL0+NsRcEOg8dwZeaYg1F9OpB3l2IuVyqwJDWNihSYza7 lXwv6R1aYKm0Fbufeqt3EPQXX7OnC+vQzJY4dNNclI5yiWYLLIE1MOXMe8VYEt4pScIA hnBMNcH4Kfgj7wAoVI9SNJHtFWkOoNOVgw5tPblZy9SvTdkCZSvriQ15urRvWBrfKmIv 9/GY7U4LnWRA8urRov7Fe38TkBSjkSXky9FyBI4Sg3UenCOJeKl8QA5chXp/a3odyqAv 5NKA== X-Gm-Message-State: AOJu0YzRkptSHhkLowxFQBemtmPdVXWYoTlQ2QjPWVjM+/Y9MxJE3odw 8bWEY5lNB8TOh6GQvKYtWlA= X-Google-Smtp-Source: AGHT+IHO4V9ddqzm/IrTX34NEc5+7RaI6Gdto0KKBHXFoI+vhYOUcp073YLBpsPgTY97VxRG80fPDw== X-Received: by 2002:a05:6a20:12ca:b0:15e:a46f:fcfc with SMTP id v10-20020a056a2012ca00b0015ea46ffcfcmr7304899pzg.21.1699926212544; Mon, 13 Nov 2023 17:43:32 -0800 (PST) Received: from barry-desktop.hub ([2407:7000:8942:5500:4df7:6a7e:83c8:9693]) by smtp.gmail.com with ESMTPSA id jd12-20020a170903260c00b001ae0152d280sm4666216plb.193.2023.11.13.17.43.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Nov 2023 17:43:32 -0800 (PST) From: Barry Song <21cnbao@gmail.com> X-Google-Original-From: Barry Song To: steven.price@arm.com, akpm@linux-foundation.org, ryan.roberts@arm.com, catalin.marinas@arm.com, will@kernel.org Cc: david@redhat.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, mhocko@suse.com, shy828301@gmail.com, v-songbaohua@oppo.com, wangkefeng.wang@huawei.com, willy@infradead.org, xiang@kernel.org, ying.huang@intel.com, yuzhao@google.com Subject: [RFC V3 PATCH] arm64: mm: swap: save and restore mte tags for large folios Date: Tue, 14 Nov 2023 14:43:13 +1300 Message-Id: <20231114014313.67232-1-v-songbaohua@oppo.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: DC410120002 X-Stat-Signature: 89mcy8cdoyn5p9d3n4brhgt81ot8fynr X-HE-Tag: 1699926213-171650 X-HE-Meta: U2FsdGVkX1+sTf7WRGHfgjY1W87cio/MxarMrrWfdGtlg6u5knNMp0lxoTPlBiZAJU1BiTi+5f0T9Nx/J/cBkuYJFTPr0g71sSjMWgo8eWG6AhEuiUfMJmkIh3EwGx2Xc5sGj0x/xEIzXGIg6YlsjWJOcS89c7IdH7ggkfB9QIWNO8Q5BmJQmghX2sn//u/n0nmPqspwkSHfmAEuKNVmY7nRIa0gqTSs75ypXJzPsZ5dWwBYcdRygNkb1mlcvxpX4tp+zsXjFOlQvBW/lRKJcLltUBI+Q1edmSuRebN39TSZmHpMNGxcOtiw1LhbyaZ4epBSfDGYaIl3soHzl70oYWPpOWBiM38nW91qzofXJU+lrSAn3w3Hza0jV0qKH/ba9dl6rdf2wSY6S+w4TIwdtmOwm/KzyoBqyf27fPFrnyv02Xl0Y/ywzjQuR/iwCR4rqLTA1vrzkoRgcwHnkvTWUThD7SUCxPMZxLrXxmYI7Ym/NKWDSP6EuOuTDxZZY2wpjcn14O6LVnzR7GLk/L6tSPcU/kM+IHwHTHIoR184KDymXXhBSlkW+bZCQZrMmedR0W9UTuc1/k0mrYlbznxpHRsT6FlhprR2SR/1nLvEMMtqZawtqWmi6p4PRymSNaAXqnS+oVnN9NyfnWyUQFnti1MoUf3nFVU2gLw2Gh2m7P6hdOclJ2/dJL1/sR9ObP0jcWi9p5+745Av+lPCL3GXQR1Y/zUSalTbbzlmq1lYPzVxgzZ/AZc2o0PJHV87ez2s4bvmjmyA3lSI3bS2jcODQhUJUq/iARiXyBES0YnCPSQIwQoz3t3yZfRVQvGPlgKOXxJb7g6ITliUhXKNxtjEIQF5vc2ZdjhD9NYXx+UHvYwQr2P9daXGihImu7FPbIKiTaekla1YaBkooKB/vY0YsRIeepy31pzX3qJVZd3XR8Dx5Ab/abBDCnxzTZDbxBvVP/fEayhIe4P2sHqqWYN FzW+LXUg S+6FLiY767gYH4KHAVzuO1XDiQZN1EApDwz2b9rIMUebG8qVOBZZDrcz/PyIXLekRPE5QEnRO+SULkfTgQgHx3ws2pBbS5LX05PVkpmp/T0Dynn2zo3PqIKrvN6CfAjqY8UwFvRwhecBP53XzmXWdZi1gopeuVIUNFjkDMEC/yaulX9tIIlI6pcOUtkfGhqrllQDxLaImBZ0g5uOLYmrlpOfRd/zo/2PQ9JzfXjWfvWnWFwEzuE4edY0Aw52v+MRP6I+NEMawPhinsQXZ4ASVgnO7QilSynvqCHL8Iry9XMolpVVSZxUmExj1xoS8nfvQgPDVyUJ/WLt80B3rcgtL9Jl88G/eDggGXoAGbxW3EP0exo2iVYws4+G5aKfHuHN8mzMACxSRBlJJjdtpIpL2MhxgRlDdZY/cEQHpWhBzpl862wTmXY5A5e8q1AnW9koooh55eZZYG13K0um61Gi+fxjPmOutWwq+SI7CfS6dmXgEFjOGMTZsdVM6FqPPXkU4wqE3 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: This patch makes MTE tags saving and restoring support large folios, then we don't need to split them into base pages for swapping out on ARM64 SoCs with MTE. arch_prepare_to_swap() should take folio rather than page as parameter because we support THP swap-out as a whole. Meanwhile, arch_swap_restore() should use page parameter rather than folio as swap-in always works at the granularity of base pages right now. arch_thp_swp_supported() is dropped since ARM64 MTE was the only one who needed it. Signed-off-by: Barry Song --- rfc v3: * move arch_swap_restore() to take page rather than folio according to the discussion with Ryan and Steven; * fix some other issues commented by Ryan rfc v2: https://lore.kernel.org/lkml/20231104093423.170054-1-v-songbaohua@oppo.com/ rfc v1: https://lore.kernel.org/lkml/20231102223643.7733-1-v-songbaohua@oppo.com/ arch/arm64/include/asm/pgtable.h | 21 ++++---------------- arch/arm64/mm/mteswap.c | 34 ++++++++++++++++++++++++++++++++ include/linux/huge_mm.h | 12 ----------- include/linux/pgtable.h | 4 ++-- mm/memory.c | 2 +- mm/page_io.c | 2 +- mm/shmem.c | 2 +- mm/swap_slots.c | 2 +- mm/swapfile.c | 2 +- 9 files changed, 45 insertions(+), 36 deletions(-) diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h index b19a8aee684c..c3eef11c1a9e 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -45,12 +45,6 @@ __flush_tlb_range(vma, addr, end, PUD_SIZE, false, 1) #endif /* CONFIG_TRANSPARENT_HUGEPAGE */ -static inline bool arch_thp_swp_supported(void) -{ - return !system_supports_mte(); -} -#define arch_thp_swp_supported arch_thp_swp_supported - /* * Outside of a few very special situations (e.g. hibernation), we always * use broadcast TLB invalidation instructions, therefore a spurious page @@ -1036,12 +1030,8 @@ static inline pmd_t pmdp_establish(struct vm_area_struct *vma, #ifdef CONFIG_ARM64_MTE #define __HAVE_ARCH_PREPARE_TO_SWAP -static inline int arch_prepare_to_swap(struct page *page) -{ - if (system_supports_mte()) - return mte_save_tags(page); - return 0; -} +#define arch_prepare_to_swap arch_prepare_to_swap +extern int arch_prepare_to_swap(struct folio *folio); #define __HAVE_ARCH_SWAP_INVALIDATE static inline void arch_swap_invalidate_page(int type, pgoff_t offset) @@ -1057,11 +1047,8 @@ static inline void arch_swap_invalidate_area(int type) } #define __HAVE_ARCH_SWAP_RESTORE -static inline void arch_swap_restore(swp_entry_t entry, struct folio *folio) -{ - if (system_supports_mte()) - mte_restore_tags(entry, &folio->page); -} +#define arch_swap_restore arch_swap_restore +extern void arch_swap_restore(swp_entry_t entry, struct page *page); #endif /* CONFIG_ARM64_MTE */ diff --git a/arch/arm64/mm/mteswap.c b/arch/arm64/mm/mteswap.c index a31833e3ddc5..75c2836e8240 100644 --- a/arch/arm64/mm/mteswap.c +++ b/arch/arm64/mm/mteswap.c @@ -68,6 +68,12 @@ void mte_invalidate_tags(int type, pgoff_t offset) mte_free_tag_storage(tags); } +static inline void __mte_invalidate_tags(struct page *page) +{ + swp_entry_t entry = page_swap_entry(page); + mte_invalidate_tags(swp_type(entry), swp_offset(entry)); +} + void mte_invalidate_tags_area(int type) { swp_entry_t entry = swp_entry(type, 0); @@ -83,3 +89,31 @@ void mte_invalidate_tags_area(int type) } xa_unlock(&mte_pages); } + +int arch_prepare_to_swap(struct folio *folio) +{ + int err; + long i; + + if (system_supports_mte()) { + long nr = folio_nr_pages(folio); + + for (i = 0; i < nr; i++) { + err = mte_save_tags(folio_page(folio, i)); + if (err) + goto out; + } + } + return 0; + +out: + while (i--) + __mte_invalidate_tags(folio_page(folio, i)); + return err; +} + +void arch_swap_restore(swp_entry_t entry, struct page *page) +{ + if (system_supports_mte()) + mte_restore_tags(entry, page); +} diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h index fa0350b0812a..f83fb8d5241e 100644 --- a/include/linux/huge_mm.h +++ b/include/linux/huge_mm.h @@ -400,16 +400,4 @@ static inline int split_folio(struct folio *folio) return split_folio_to_list(folio, NULL); } -/* - * archs that select ARCH_WANTS_THP_SWAP but don't support THP_SWP due to - * limitations in the implementation like arm64 MTE can override this to - * false - */ -#ifndef arch_thp_swp_supported -static inline bool arch_thp_swp_supported(void) -{ - return true; -} -#endif - #endif /* _LINUX_HUGE_MM_H */ diff --git a/include/linux/pgtable.h b/include/linux/pgtable.h index af7639c3b0a3..87e3140a55ca 100644 --- a/include/linux/pgtable.h +++ b/include/linux/pgtable.h @@ -897,7 +897,7 @@ static inline int arch_unmap_one(struct mm_struct *mm, * prototypes must be defined in the arch-specific asm/pgtable.h file. */ #ifndef __HAVE_ARCH_PREPARE_TO_SWAP -static inline int arch_prepare_to_swap(struct page *page) +static inline int arch_prepare_to_swap(struct folio *folio) { return 0; } @@ -914,7 +914,7 @@ static inline void arch_swap_invalidate_area(int type) #endif #ifndef __HAVE_ARCH_SWAP_RESTORE -static inline void arch_swap_restore(swp_entry_t entry, struct folio *folio) +static inline void arch_swap_restore(swp_entry_t entry, struct page *page) { } #endif diff --git a/mm/memory.c b/mm/memory.c index 1f18ed4a5497..fad238dd38e7 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -4022,7 +4022,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(entry, folio); + arch_swap_restore(entry, page); /* * 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 cb559ae324c6..0fd832474c1d 100644 --- a/mm/page_io.c +++ b/mm/page_io.c @@ -189,7 +189,7 @@ int swap_writepage(struct page *page, struct writeback_control *wbc) * Arch code may have to preserve more data than just the page * contents, e.g. memory tags. */ - ret = arch_prepare_to_swap(&folio->page); + ret = arch_prepare_to_swap(folio); if (ret) { folio_mark_dirty(folio); folio_unlock(folio); diff --git a/mm/shmem.c b/mm/shmem.c index 91e2620148b2..7d32e50da121 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -1892,7 +1892,7 @@ static int shmem_swapin_folio(struct inode *inode, pgoff_t index, * Some architectures may have to restore extra metadata to the * folio after reading from swap. */ - arch_swap_restore(swap, folio); + arch_swap_restore(swap, &folio->page); if (shmem_should_replace_folio(folio, gfp)) { error = shmem_replace_folio(&folio, gfp, info, index); diff --git a/mm/swap_slots.c b/mm/swap_slots.c index 0bec1f705f8e..2325adbb1f19 100644 --- a/mm/swap_slots.c +++ b/mm/swap_slots.c @@ -307,7 +307,7 @@ swp_entry_t folio_alloc_swap(struct folio *folio) entry.val = 0; if (folio_test_large(folio)) { - if (IS_ENABLED(CONFIG_THP_SWAP) && arch_thp_swp_supported()) + if (IS_ENABLED(CONFIG_THP_SWAP)) get_swap_pages(1, &entry, folio_nr_pages(folio)); goto out; } diff --git a/mm/swapfile.c b/mm/swapfile.c index 4bc70f459164..6450e0279e35 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -1784,7 +1784,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(entry, page_folio(page)); + arch_swap_restore(entry, page); /* See do_swap_page() */ BUG_ON(!PageAnon(page) && PageMappedToDisk(page));