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 X-Spam-Level: X-Spam-Status: No, score=-14.3 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 75450C433E9 for ; Sat, 13 Feb 2021 17:53:51 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2B28D64E38 for ; Sat, 13 Feb 2021 17:53:51 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2B28D64E38 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.microsoft.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=TPC3agoUTdG0QLHj/yZAUfiiR/Sgca17Gk/yVEGZNmw=; b=sEeDdzbJQuszyXJmDawve0xyd HI8Na/YTgTXgs177J+KOKe5Gi0Zq4K92jFhrfQbPYX4wZWBDghZWU7sJv9jYvfPDECBKSEDVFfz2I yqKNpFuYFN+7r6Dd75AqNLKdw8G/brEQrhA8xlamwlBZtucCOljXzXOm/AK4xXDSoHpmry/YvFLTD fjH9OD7o2mkIhIs+3/hM6cVdBCd9j8J6y5mtjOKWIH4PL2ZMuWZ0KIW1KiVgUkjtIBHCfDPntsGmn 09eTtIvC3Luv8L5hjSQwXdIroZkWjy7bChd9Qq+/2IRbnlkmPeoJNgYJEVX69wf0r/zBVMSSg6gFa QLgiPyazA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1lAz5a-0001Om-PO; Sat, 13 Feb 2021 17:52:14 +0000 Received: from linux.microsoft.com ([13.77.154.182]) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1lAz5Y-0001OM-0c for linux-arm-kernel@lists.infradead.org; Sat, 13 Feb 2021 17:52:13 +0000 Received: from sequoia (162-237-133-238.lightspeed.rcsntx.sbcglobal.net [162.237.133.238]) by linux.microsoft.com (Postfix) with ESMTPSA id 5DE3220B6C40; Sat, 13 Feb 2021 09:52:08 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 5DE3220B6C40 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1613238729; bh=rpYdOjpj1FhPRVoMVuBcX3/kmdKDHEmtzDLETHUirhk=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=f0x9yRh1W4Z03Eavj5Wvr2Rz9XmndNKoeVjCcJOMKOOLl/qHAe8p9YiEySEkp6R4B bEyLMGpqhIaQoHRq3KvJd0H6oTHjkWYVOHMU5AhCku2e+2PEsemmPE3ugrw4QREGMQ 8jOrWE1lDvRvb0ApTGZd1zbpimF91L+3sUnaGAy8= Date: Sat, 13 Feb 2021 11:51:51 -0600 From: Tyler Hicks To: Pavel Tatashin Subject: Re: [PATCH] arm64: mm: correct the start of physical address in linear map Message-ID: <20210213175151.GA4646@sequoia> References: <20210213012316.1525419-1-pasha.tatashin@soleen.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210213012316.1525419-1-pasha.tatashin@soleen.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210213_125212_278398_C8D40023 X-CRM114-Status: GOOD ( 22.41 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: anshuman.khandual@arm.com, catalin.marinas@arm.com, jmorris@namei.org, linux-kernel@vger.kernel.org, logang@deltatee.com, linux-arm-kernel@lists.infradead.org, akpm@linux-foundation.org, will@kernel.org, ardb@kernel.org, rppt@kernel.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 2021-02-12 20:23:16, Pavel Tatashin wrote: > Memory hotplug may fail on systems with CONFIG_RANDOMIZE_BASE because the > linear map range is not checked correctly. > > The start physical address that linear map covers can be actually at the > end of the range because of randmomization. Check that and if so reduce it > to 0. > > This can be verified on QEMU with setting kaslr-seed to ~0ul: > > memstart_offset_seed = 0xffff > START: __pa(_PAGE_OFFSET(vabits_actual)) = ffff9000c0000000 > END: __pa(PAGE_END - 1) = 1000bfffffff > > Signed-off-by: Pavel Tatashin > Fixes: 58284a901b42 ("arm64/mm: Validate hotplug range before creating linear mapping") Tested-by: Tyler Hicks This fixes a memory hot plugging bug that I was seeing on 5.10, with the introduction of 58284a901b42. One comment below... > --- > arch/arm64/mm/mmu.c | 15 +++++++++++++-- > 1 file changed, 13 insertions(+), 2 deletions(-) > > diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c > index ae0c3d023824..6057ecaea897 100644 > --- a/arch/arm64/mm/mmu.c > +++ b/arch/arm64/mm/mmu.c > @@ -1444,14 +1444,25 @@ static void __remove_pgd_mapping(pgd_t *pgdir, unsigned long start, u64 size) > > static bool inside_linear_region(u64 start, u64 size) > { > + u64 start_linear_pa = __pa(_PAGE_OFFSET(vabits_actual)); > + u64 end_linear_pa = __pa(PAGE_END - 1); > + > + /* > + * Check for a wrap, it is possible because of randomized linear mapping > + * the start physical address is actually bigger than the end physical > + * address. In this case set start to zero because [0, end_linear_pa] > + * range must still be able to cover all addressable physical addresses. > + */ > + if (start_linear_pa > end_linear_pa) > + start_linear_pa = 0; We're ignoring the portion from the linear mapping's start PA to the point of wraparound. Could the start and end of the hot plugged memory fall within this range and, as a result, the hot plug operation be incorrectly blocked? Tyler > + > /* > * Linear mapping region is the range [PAGE_OFFSET..(PAGE_END - 1)] > * accommodating both its ends but excluding PAGE_END. Max physical > * range which can be mapped inside this linear mapping range, must > * also be derived from its end points. > */ > - return start >= __pa(_PAGE_OFFSET(vabits_actual)) && > - (start + size - 1) <= __pa(PAGE_END - 1); > + return start >= start_linear_pa && (start + size - 1) <= end_linear_pa; > } > > int arch_add_memory(int nid, u64 start, u64 size, > -- > 2.25.1 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel