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 6DE1EEE49B0 for ; Wed, 23 Aug 2023 13:15:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EC5FD900031; Wed, 23 Aug 2023 09:15:40 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E749490002C; Wed, 23 Aug 2023 09:15:40 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CC715900031; Wed, 23 Aug 2023 09:15:40 -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 B6F4190002C for ; Wed, 23 Aug 2023 09:15:40 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 8EBEB12012B for ; Wed, 23 Aug 2023 13:15:40 +0000 (UTC) X-FDA: 81155416440.24.18E00AE Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf01.hostedemail.com (Postfix) with ESMTP id C1B934001D for ; Wed, 23 Aug 2023 13:15:38 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf01.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=1692796538; 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=8EJ+2QqpCbHyjqA+CxCqOVdJDVMnVbpZW0doDrqRPVQ=; b=v7I6ef9J4bHliOq9CPEqyzvuQYdbUs3p3Z1lD6rqC3O7Ajifzm52zpEXP/7aM5emsMqKZW 7QfvvymYWCfArFn05I3lubHO7nX26QhEurRtA5aoMW74OdU89T0EAusPuzqymazK9Dqy+S 3L2EwMa/hUDEE0/MYC9HWA3rF15vIDs= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf01.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=1692796538; a=rsa-sha256; cv=none; b=Lw5NRG/+JWRiVDlXevHrF9aPsQ7Pgh+eiun+B9ao4xIWrP5BinWfGeXbVlx22ncqItxkd0 v5ad5JAW/wVBsZIZurn0UTrDB3J3GPZ8NtjgtnfrjPQmZB3ZG+GBG5EMu3CfzVqMzeXXKF KyAaaXhlx4PQCrpeZ0DOxdTSnaA7vZY= 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 8850B165C; Wed, 23 Aug 2023 06:16:18 -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 CEDA63F740; Wed, 23 Aug 2023 06:15:30 -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 14/37] arm64: mte: Expose tag storage pages to the MIGRATE_METADATA freelist Date: Wed, 23 Aug 2023 14:13:27 +0100 Message-Id: <20230823131350.114942-15-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: C1B934001D X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: 747enxub1jkc5xa6cnisryne6yqs5itq X-HE-Tag: 1692796538-399019 X-HE-Meta: U2FsdGVkX1+0Ac0LtDJYtWxH7UsEw3rJatcbId0+Est33OlYfTaJNSePxsAz6bq4mPwUizD46WH8GSKFi/T7AQgRdEGt01E+WVp9DlvtnA8jzmA1tko9Vk4b9q9e5jYAFCPy+tb9EtnpNeA6iGiGO2nIY/kTCpBlQnNGA4G3VdQ4EtTBEZxAsDsslAP+gr2VZAcNN8d5PhpjaIUYlnvMHc5aFTDnVdnFt9c1rxog6vx1S+JjYhkHVoNvoLZfjUDXAOXwk6sjiOycvpPDuXpfXuRJBSiL8NFM0KStMDJfHTLHiHh38pI5TfTXoTG1UC5/goYXgnjmpy9Dir30csBz5kPoDU7m7kYa7r7wykj06htqD068VJDqJXDPyF13DLKInKpdbnAktAmui55ASzJ1FDQiMKNLKqsLWqUvfD0JqrBzbhPhWZVFqusjUSlrauBjInJPR39XvIYAnHtbjPTSusffm1j265S7CLJ6uw/Xz4Fo4ldygh5LudkUAPFZvjbN7nxQYQ4FmEJ2EsQ4qQClYGqeiQd3RVflHP9rs1hgzyPnsn0TZG8N7VS2ii4h71OfYOgi+58wmLrSdGVEBuiq88+b5+C88s17KpIRlhckkQyhLBS41blZLBkaCclffXL4jsFKdM1cuAjgOA6yvno7NMKgA66FZCyjsNCloT1P3cDnwzCEFtFde290/1reUZyayc/U+thYG3tyFFiKTHZ+FH4gzKupBJ483Pj6+zhl8rPnYAGLoSD7TjtHNBP9etl3VynZguNZrM29IrP61SK5Xg+Un5xyNckm/ZjCqqV1A5ahEcipzTeW/f192JDcXWz78mQKzirWF/n9h2GMHohqYWKWJqEoi5JxsR5sfoWuSLwJxcCqmvGl9nSOSkMAeAaR8m+VLq1GMD2bLqNEFMSph0+6mr0Z+0VJJds6QQGo04OlDpXEpzB2R2Che8jclxB1A5t8awZZzhla41q1MXZ tSiSI5dm 0iqCOfuoKUg3X4iGwg88xpyVGEqWKhNizZEjX0Td3mLlp3rW8FQSJOvyHI163/LOx8Ocqy9/mF7UkQTqnMKFK6Pm59qjPAD8E0rIVW9MH1Zt9tQX6p41krmCwwaWqRcoDYmKQ4wtmNtZYX0PZR0eVFp94WdN6ElfWRgnvpYLAyw0PcSMQG1xj6pUXEgPoiVpMAi3IuipbYfQrbXhKmxTpIfabYN5KtPWsV9XRnQMHOtnBmPiT54bLZElBxgS2hfq/7zP3 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: Add the MTE tag storage pages to the MIGRATE_METADATA freelist, which allows the page allocator to manage them like (almost) regular pages. Signed-off-by: Alexandru Elisei --- arch/arm64/kernel/mte_tag_storage.c | 47 +++++++++++++++++++++++++++++ include/linux/gfp.h | 8 +++++ mm/mm_init.c | 24 +++++++++++++-- 3 files changed, 76 insertions(+), 3 deletions(-) diff --git a/arch/arm64/kernel/mte_tag_storage.c b/arch/arm64/kernel/mte_tag_storage.c index 5014dda9bf35..87160f53960f 100644 --- a/arch/arm64/kernel/mte_tag_storage.c +++ b/arch/arm64/kernel/mte_tag_storage.c @@ -5,10 +5,12 @@ * Copyright (C) 2023 ARM Ltd. */ +#include #include #include #include #include +#include #include #include #include @@ -190,6 +192,12 @@ static int __init fdt_init_tag_storage(unsigned long node, const char *uname, return ret; } + /* Pages are managed in pageblock_nr_pages chunks */ + if (!IS_ALIGNED(tag_range->start | range_len(tag_range), pageblock_nr_pages)) { + pr_err("Tag storage region not aligned to 0x%lx", pageblock_nr_pages); + return -EINVAL; + } + ret = tag_storage_get_memory_node(node, &mem_node); if (ret) return ret; @@ -260,3 +268,42 @@ void __init mte_tag_storage_init(void) } num_tag_regions = 0; } + +static int __init mte_tag_storage_activate_regions(void) +{ + phys_addr_t dram_start, dram_end; + struct range *tag_range; + unsigned long pfn; + int i; + + if (num_tag_regions == 0) + return 0; + + dram_start = memblock_start_of_DRAM(); + dram_end = memblock_end_of_DRAM(); + + for (i = 0; i < num_tag_regions; i++) { + tag_range = &tag_regions[i].tag_range; + /* + * Tag storage region was clipped by arm64_bootmem_init() + * enforcing addressing limits. + */ + if (PFN_PHYS(tag_range->start) < dram_start || + PFN_PHYS(tag_range->end) >= dram_end) { + pr_err("Tag storage region 0x%llx-0x%llx outside addressable memory", + PFN_PHYS(tag_range->start), PFN_PHYS(tag_range->end + 1)); + return -EINVAL; + } + } + + for (i = 0; i < num_tag_regions; i++) { + tag_range = &tag_regions[i].tag_range; + for (pfn = tag_range->start; pfn <= tag_range->end; pfn += pageblock_nr_pages) { + init_metadata_reserved_pageblock(pfn_to_page(pfn)); + totalmetadata_pages += pageblock_nr_pages; + } + } + + return 0; +} +core_initcall(mte_tag_storage_activate_regions) diff --git a/include/linux/gfp.h b/include/linux/gfp.h index 665f06675c83..fb344baa9a9b 100644 --- a/include/linux/gfp.h +++ b/include/linux/gfp.h @@ -354,4 +354,12 @@ extern struct page *alloc_contig_pages(unsigned long nr_pages, gfp_t gfp_mask, #endif void free_contig_range(unsigned long pfn, unsigned long nr_pages); +#ifdef CONFIG_MEMORY_METADATA +extern void init_metadata_reserved_pageblock(struct page *page); +#else +static inline void init_metadata_reserved_pageblock(struct page *page) +{ +} +#endif + #endif /* __LINUX_GFP_H */ diff --git a/mm/mm_init.c b/mm/mm_init.c index a1963c3322af..467c80e9dacc 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c @@ -2329,8 +2329,9 @@ bool __init deferred_grow_zone(struct zone *zone, unsigned int order) #endif /* CONFIG_DEFERRED_STRUCT_PAGE_INIT */ -#ifdef CONFIG_CMA -void __init init_cma_reserved_pageblock(struct page *page) +#if defined(CONFIG_CMA) || defined(CONFIG_MEMORY_METADATA) +static void __init init_reserved_pageblock(struct page *page, + enum migratetype migratetype) { unsigned i = pageblock_nr_pages; struct page *p = page; @@ -2340,15 +2341,32 @@ void __init init_cma_reserved_pageblock(struct page *page) set_page_count(p, 0); } while (++p, --i); - set_pageblock_migratetype(page, MIGRATE_CMA); + set_pageblock_migratetype(page, migratetype); set_page_refcounted(page); __free_pages(page, pageblock_order); adjust_managed_page_count(page, pageblock_nr_pages); +} + +#ifdef CONFIG_CMA +/* Free whole pageblock and set its migration type to MIGRATE_CMA. */ +void __init init_cma_reserved_pageblock(struct page *page) +{ + init_reserved_pageblock(page, MIGRATE_CMA); page_zone(page)->cma_pages += pageblock_nr_pages; } #endif +#ifdef CONFIG_MEMORY_METADATA +/* Free whole pageblock and set its migration type to MIGRATE_METADATA. */ +void __init init_metadata_reserved_pageblock(struct page *page) +{ + init_reserved_pageblock(page, MIGRATE_METADATA); + page_zone(page)->metadata_pages += pageblock_nr_pages; +} +#endif +#endif /* CONFIG_CMA || CONFIG_MEMORY_METADATA */ + void set_zone_contiguous(struct zone *zone) { unsigned long block_start_pfn = zone->zone_start_pfn; -- 2.41.0