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 7C155EE49A3 for ; Wed, 23 Aug 2023 13:16:06 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0BAAF280038; Wed, 23 Aug 2023 09:16:06 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 06AC390002C; Wed, 23 Aug 2023 09:16:06 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E9B15280038; Wed, 23 Aug 2023 09:16:05 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id D1CFD90002C for ; Wed, 23 Aug 2023 09:16:05 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id B4D6CB0D6A for ; Wed, 23 Aug 2023 13:16:05 +0000 (UTC) X-FDA: 81155417490.19.F0A2B27 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf06.hostedemail.com (Postfix) with ESMTP id EE35718002A for ; Wed, 23 Aug 2023 13:16:03 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=none; spf=pass (imf06.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-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1692796564; a=rsa-sha256; cv=none; b=mPMl9X8vAlt82i5ZiKYlPHoc+KJcGnCCQ7+E+s9jbM92PCREqTQlUMpRZ1aV3tKTx+KjH+ KyPsnFWsBI9PWmTy+igFT88HmG3S37eN8BFNkR+NQlyC6yCeH0ODSvpg2fKSeOO3vfErs+ ivTGRfE0ZSZkGyOChpN+zZGTVSQomjw= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=none; spf=pass (imf06.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=1692796564; 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=GFBau2s/4i9ddIgPVNLkTwGwLRQklrxctctrBRRRHXw=; b=gL97kU1hyq80ncrypiattvKa99eq2jhb8/qtJtQZ/zolKzTzHSUYAuPc0CUHzkIWfvOyao mBh9NHT62GWYPYI2t4jVJyGMTSco0G/hbR7BOS56fLIW5+VJVVNR7BWezKUqZcTRcbIO38 usTNsHZ39h1t809phVx+ZLQAddH6e9o= 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 DA46F15DB; Wed, 23 Aug 2023 06:16:43 -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 A7DD83F740; Wed, 23 Aug 2023 06:15:56 -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 18/37] arm64: mte: Check that tag storage blocks are in the same zone Date: Wed, 23 Aug 2023 14:13:31 +0100 Message-Id: <20230823131350.114942-19-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-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: EE35718002A X-Stat-Signature: qdhhri9ygbyuxo17ji1ru1nqjji3hkw8 X-HE-Tag: 1692796563-212676 X-HE-Meta: U2FsdGVkX18H4JAqxNrsg/p0aIN+zaN33ersniR1X3wMdp911+Z/uPKiDBjy2E0obNpR8wUoSYE63XMrWAVR1Inm55+Vp6uj+Vs16B6s4xo1MmcOSfPPGdAismuUoGpfethYLlGWzEWX68zDiaKAe0UC6TE9l1b243AcnKptAVQWjZCLM8YqbczrAj0/EBV+dQgP3wqm5RYoWzbgrDlcU3U33zp2bgtDOPSAI3N8I03i5NUp0M+xiWXawlxKE7thP9jPO7Zln2erd9pQSO4Xbd6c2a8PzFj+2VdsA4rJ5VdD3Z+I3nXe2HSzdvojmo+UpUm04xw3PFy7DPyIW62A7yL2UenCxBqf6dW5xvFPlhH4B6wi2B1ecEEsfxjcNY8KflbzCiGFTwKiQhNL//R3/eiHnmi0Gz18Nv+wkX2dJehyeVoZedZGp0NZ8ZdC0OWQNqKa9bd3ZleNX0e9tMaQ3Z7E48F5Lzz/vQ1P+EAVwXgSFkuHoLy/uqO7+MQ6FWyd+S+Vg5l4/XHAZkyuwkw3uuZHXOGmXDp1KBf3n7iNeL92NLSceuZXkUjGojcNc8bAJTxtrn109df5xE93v2XhiMEmzD/RZTgYyuZF6Tz1u+R161xVosiL3Qz7uQ7qhd1Xr8iUL7bXfKYMpR4qEAObN/ooiUAtYeu+LTYPPg1Yi3Qht9WMb/Aqw0F0F2qM4Q6Vq1P+xsbkME8f4Vjy2QIQgoQtG8/iqYn4EEqow68APRyIUdRaGO3MDpGfE/ZhhONb8XBdLhNcDbbUyTwNlZ9cRmFNUhJhj+47FEaPQKOe0/m2z10ehsZwYeGr9KO8y850+UFPyxW6enH0JOr4zmBo41x3O4MIqqUydq5YFD2mQVW7HVUuiZwN6FvSbh+nJxm1jtmO0InDKItH6kh+6q06d3ZPJ/FisZPbR/9PR8fQ5mzsTpn+sPLSceOeHQDJg0t9f/LIb1AabKC7QgD67Ao dAliExsI PfDoRj1NIbEQPZzG2Nh7XO9LZ3INffzy6a7TjqnVNMAN3cFnYruVp8RF57Q7gzyux+O8CrvGQBxm5mSNFvesb6B+r0Yk7n2Y+dczgb8o0IG7Z+6fjf6IWu8qV9fi9nqePdJ/nprDcnkcPeUO6MRiB0Wr/qJ9r5392WUrC 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: alloc_contig_range() requires that the requested pages are in the same zone. Check that this is indeed the case before initializing the tag storage blocks. Signed-off-by: Alexandru Elisei --- arch/arm64/kernel/mte_tag_storage.c | 35 ++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/arch/arm64/kernel/mte_tag_storage.c b/arch/arm64/kernel/mte_tag_storage.c index f45128d0244e..3e0123aa3fb3 100644 --- a/arch/arm64/kernel/mte_tag_storage.c +++ b/arch/arm64/kernel/mte_tag_storage.c @@ -269,12 +269,41 @@ void __init mte_tag_storage_init(void) num_tag_regions = 0; } +/* alloc_contig_range() requires all pages to be in the same zone. */ +static int __init mte_tag_storage_check_zone(void) +{ + struct range *tag_range; + struct zone *zone; + unsigned long pfn; + u32 block_size; + int i, j; + + for (i = 0; i < num_tag_regions; i++) { + block_size = tag_regions[i].block_size; + if (block_size == 1) + continue; + + tag_range = &tag_regions[i].tag_range; + for (pfn = tag_range->start; pfn <= tag_range->end; pfn += block_size) { + zone = page_zone(pfn_to_page(pfn)); + for (j = 1; j < block_size; j++) { + if (page_zone(pfn_to_page(pfn + j)) != zone) { + pr_err("Tag block pages in different zones"); + return -EINVAL; + } + } + } + } + + return 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; + int i, ret; if (num_tag_regions == 0) return 0; @@ -326,6 +355,10 @@ static int __init mte_tag_storage_activate_regions(void) return 0; } + ret = mte_tag_storage_check_zone(); + if (ret) + return ret; + 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) { -- 2.41.0