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 94FE6EE49A3 for ; Wed, 23 Aug 2023 13:16:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 26837280040; Wed, 23 Aug 2023 09:16:27 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1F0CB900035; Wed, 23 Aug 2023 09:16:27 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0B914280040; Wed, 23 Aug 2023 09:16:27 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id EFB8A900035 for ; Wed, 23 Aug 2023 09:16:26 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id B45C280114 for ; Wed, 23 Aug 2023 13:16:26 +0000 (UTC) X-FDA: 81155418372.11.1FB3F7C Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf29.hostedemail.com (Postfix) with ESMTP id DDC02120024 for ; Wed, 23 Aug 2023 13:16:24 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=none; spf=pass (imf29.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=1692796585; 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=Epfbq3/qTmsKFVi06SipgNFOGiN49JPuFxN4Fsx+vdw=; b=bH96fv/xSHKrLiI2p+ZzETOJ0sTuEX5sR8csqH2pY/7L7r5GNzyEbf+7nl9SrD/JJkeicR YjVMej3i6MuzLdtV/rWXuMXsPYNeo7OanUKUn/dZutxysRGSyUes6tcLKlWH7fcE7mxUB7 pgGRkSLJRnKJuBYMrpyQInEtqdYp3tI= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1692796585; a=rsa-sha256; cv=none; b=38ctmSfqm71F25IqsB5Ia5r2uLwUF14zq+UjlH27PXLdNXCf89Hk9sL8Xj0wmEEhh1qrIr UFHKPkGmOxh656b9NPMs+rnXuCmPGUAFWqLl2cBG2e/xtWzTuOM7rO0CMu18F8CaMPi9YT 7Np8rSu+ZBiCQW9CSsVIs6cy7qMVu7Y= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=none; spf=pass (imf29.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 C95B2168F; Wed, 23 Aug 2023 06:17:03 -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 B4A793F740; Wed, 23 Aug 2023 06:16:16 -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 21/37] mm: khugepaged: Handle metadata-enabled VMAs Date: Wed, 23 Aug 2023 14:13:34 +0100 Message-Id: <20230823131350.114942-22-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-Rspamd-Queue-Id: DDC02120024 X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: z35it518r3xs199ffz7bycffs8ykrxcg X-HE-Tag: 1692796584-63618 X-HE-Meta: U2FsdGVkX18RjS6MGjOBbNUw7Qr42PeM0H2GdKG4mzXYXnLRMyBJM7JKa9+En0gzWc8ZG6qLRPgPrC3sbvuAVVITDfTQtvnf3+IccDtLtMkiM9MTGJzjF484fTNFUA5+fHOgZee/+zPB8A7c1DjL92KpUj97OKPUF0z/mW99nKu2NzrebvlU4DsN5BTS5nIxYKzpGxH7qERkeFVX897MxnCuTN2x3HZC3tgtt+3yPFZmMCbp8sovNYlt8F4gk2Q7WR5LfiVZYBNFYybZiLd3GdR9Ww23n4rnCiwJ/Rp7demaZSdTaLJSSoO/kq1qxbG8CezevJMo3igRl5HkXus/1ATdvT3C9LA5qvV4dD9ETudR+grfQqC1kWeoFERwCm+lHwVaeTadqUDTQc6spjyrOsjw6rDZYFw1ridmNxCGUhjxMliHAC5lG52kMSKL1JsX2Gtdudm2MuNleWk/QRcFxs/Pt3XFdUij0Ip5cc9qg1gSC+YBCyxeJyJOs6aL7sxJkewLE83CYNPhkHkpFlFP+UbGJZCBQU3AkB3Dc4MivpIftJmkbiYi/B+e5eyDNbRdUYir6oZxKPCfnH3tuJuAaq8qzaG/NUf1TxB2x2ioncxvd73oXeyLtX8fZz+ofMKcpe8t0elHVECA74Ff/JoW3MKaMEw+dXXdITmcBJcWvDXypsC6sH25+geHMK0+QMFNhCI5kYIEC+swk1/1VmiwX6fMsrRGfQarkk8jRT49kPA81Y1neLndAwGNvD6+SfjPDUt9ulClyEzaEaH3/dza+lzjJjYmpll6So/PZZl4xWDJuAojUCiGMc4wyC4C20OgrefHWVi7Tj870yGikpVRkvj5GwCenyTEsvEhC/oZDeOv126efnQ4xkU8GAdgLz5GnaPXbTdojKKW+ud0JO+gnXuz6rYbHTD/G/YBgFvvjKfrrFPGKbFjRV9vwUwqqO5lzYXJl3fUhQX3ih5iTr2 lUpY+nh0 rnGHK0kN6q0a4T7Zhp1FE2QnhVhoSwXHKg4XpHlAgVUNdezGWtCxtGJowmzD8O92r2J/vMGIQVwphZ01/7k77TxC4PnCygyM8PIedm2HIZ++0w6lwR2weG8PX3QTSA0RPX3BfypL01wtGH7v5Ule46crsxiCnSlNSuee5 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: Both madvise(MADV_COLLAPSE) and khugepaged can collapse a contiguous THP-sized memory region mapped as PTEs into a THP. If metadata is enabled for the VMA where the PTEs are mapped, make sure to allocate metadata storage for the compound page that will be replacing them. Signed-off-by: Alexandru Elisei --- arch/arm64/include/asm/memory_metadata.h | 7 +++++++ include/asm-generic/memory_metadata.h | 4 ++++ mm/khugepaged.c | 7 +++++++ 3 files changed, 18 insertions(+) diff --git a/arch/arm64/include/asm/memory_metadata.h b/arch/arm64/include/asm/memory_metadata.h index 1b18e3217dd0..ade37331a5c8 100644 --- a/arch/arm64/include/asm/memory_metadata.h +++ b/arch/arm64/include/asm/memory_metadata.h @@ -5,6 +5,8 @@ #ifndef __ASM_MEMORY_METADATA_H #define __ASM_MEMORY_METADATA_H +#include + #include #include @@ -40,6 +42,11 @@ static inline int reserve_metadata_storage(struct page *page, int order, gfp_t g static inline void free_metadata_storage(struct page *page, int order) { } + +static inline bool vma_has_metadata(struct vm_area_struct *vma) +{ + return vma && (vma->vm_flags & VM_MTE); +} #endif /* CONFIG_MEMORY_METADATA */ #endif /* __ASM_MEMORY_METADATA_H */ diff --git a/include/asm-generic/memory_metadata.h b/include/asm-generic/memory_metadata.h index 111d6edc0997..35a0d6a8b5fc 100644 --- a/include/asm-generic/memory_metadata.h +++ b/include/asm-generic/memory_metadata.h @@ -35,6 +35,10 @@ static inline bool folio_has_metadata(struct folio *folio) { return false; } +static inline bool vma_has_metadata(struct vm_area_struct *vma) +{ + return false; +} #endif /* !CONFIG_MEMORY_METADATA */ #endif /* __ASM_GENERIC_MEMORY_METADATA_H */ diff --git a/mm/khugepaged.c b/mm/khugepaged.c index 78c8d5d8b628..174710d941c2 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -20,6 +20,7 @@ #include #include +#include #include #include #include "internal.h" @@ -96,6 +97,7 @@ static struct kmem_cache *mm_slot_cache __read_mostly; struct collapse_control { bool is_khugepaged; + bool has_metadata; /* Num pages scanned per node */ u32 node_load[MAX_NUMNODES]; @@ -1069,6 +1071,9 @@ static int alloc_charge_hpage(struct page **hpage, struct mm_struct *mm, int node = hpage_collapse_find_target_node(cc); struct folio *folio; + if (cc->has_metadata) + gfp |= __GFP_TAGGED; + if (!hpage_collapse_alloc_page(hpage, gfp, node, &cc->alloc_nmask)) return SCAN_ALLOC_HUGE_PAGE_FAIL; @@ -2497,6 +2502,7 @@ static unsigned int khugepaged_scan_mm_slot(unsigned int pages, int *result, if (khugepaged_scan.address < hstart) khugepaged_scan.address = hstart; VM_BUG_ON(khugepaged_scan.address & ~HPAGE_PMD_MASK); + cc->has_metadata = vma_has_metadata(vma); while (khugepaged_scan.address < hend) { bool mmap_locked = true; @@ -2838,6 +2844,7 @@ int madvise_collapse(struct vm_area_struct *vma, struct vm_area_struct **prev, if (!cc) return -ENOMEM; cc->is_khugepaged = false; + cc->has_metadata = vma_has_metadata(vma); mmgrab(mm); lru_add_drain_all(); -- 2.41.0