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=-16.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham 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 F02C8C433C1 for ; Mon, 29 Mar 2021 14:00:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CA4666195B for ; Mon, 29 Mar 2021 14:00:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229873AbhC2N77 (ORCPT ); Mon, 29 Mar 2021 09:59:59 -0400 Received: from mail.kernel.org ([198.145.29.99]:35568 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230210AbhC2N74 (ORCPT ); Mon, 29 Mar 2021 09:59:56 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 0C1186191B; Mon, 29 Mar 2021 13:59:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1617026395; bh=DCBZz8px5deYRkkddBKC1usc1yFRvfSmu4Va0AsvYFQ=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=lhmezTFyYyqJetNwZgFYIibddfOnx/4fzXI6kaAfmGAhQtVVUoNLF2rKZ3JqG8OPG sEu4nxmOdt+jywqMvOyptgYij2cytfhQA+gmJMKVfiB4Z4w9+E9hZqPoc+9ROo4O5y oEovTVtYtif26B/uilKbkBGUim4VrhTr4uFiD8mc= Date: Mon, 29 Mar 2021 15:59:52 +0200 From: Greg Kroah-Hartman To: Pavel Tatashin Cc: Ard Biesheuvel , Naresh Kamboju , open list , linux-stable , Anshuman Khandual , David Hildenbrand , Catalin Marinas , Will Deacon , Mark Rutland , Heiko Carstens , Jason Wang , Jonathan Cameron , "Michael S. Tsirkin" , Michal Hocko , Oscar Salvador , Pankaj Gupta , Pankaj Gupta , teawater , Vasily Gorbik , Wei Yang , Andrew Morton , Linus Torvalds , Sasha Levin Subject: Re: [PATCH 5.11 225/254] arm64/mm: define arch_get_mappable_range() Message-ID: References: <20210329075633.135869143@linuxfoundation.org> <20210329075640.480623043@linuxfoundation.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Mar 29, 2021 at 09:53:10AM -0400, Pavel Tatashin wrote: > On Mon, Mar 29, 2021 at 9:51 AM Greg Kroah-Hartman > wrote: > > > > On Mon, Mar 29, 2021 at 03:49:19PM +0200, Ard Biesheuvel wrote: > > > (+ Pavel) > > > > > > On Mon, 29 Mar 2021 at 15:42, Greg Kroah-Hartman > > > wrote: > > > > > > > > On Mon, Mar 29, 2021 at 03:08:52PM +0200, Ard Biesheuvel wrote: > > > > > On Mon, 29 Mar 2021 at 12:12, Greg Kroah-Hartman > > > > > wrote: > > > > > > > > > > > > On Mon, Mar 29, 2021 at 03:05:25PM +0530, Naresh Kamboju wrote: > > > > > > > On Mon, 29 Mar 2021 at 14:10, Greg Kroah-Hartman > > > > > > > wrote: > > > > > > > > > > > > > > > > From: Anshuman Khandual > > > > > > > > > > > > > > > > [ Upstream commit 03aaf83fba6e5af08b5dd174c72edee9b7d9ed9b ] > > > > > > > > > > > > > > > > This overrides arch_get_mappable_range() on arm64 platform which will be > > > > > > > > used with recently added generic framework. It drops > > > > > > > > inside_linear_region() and subsequent check in arch_add_memory() which are > > > > > > > > no longer required. It also adds a VM_BUG_ON() check that would ensure > > > > > > > > that mhp_range_allowed() has already been called. > > > > > > > > > > > > > > > > Link: https://lkml.kernel.org/r/1612149902-7867-3-git-send-email-anshuman.khandual@arm.com > > > > > > > > Signed-off-by: Anshuman Khandual > > > > > > > > Reviewed-by: David Hildenbrand > > > > > > > > Reviewed-by: Catalin Marinas > > > > > > > > Cc: Will Deacon > > > > > > > > Cc: Ard Biesheuvel > > > > > > > > Cc: Mark Rutland > > > > > > > > Cc: Heiko Carstens > > > > > > > > Cc: Jason Wang > > > > > > > > Cc: Jonathan Cameron > > > > > > > > Cc: "Michael S. Tsirkin" > > > > > > > > Cc: Michal Hocko > > > > > > > > Cc: Oscar Salvador > > > > > > > > Cc: Pankaj Gupta > > > > > > > > Cc: Pankaj Gupta > > > > > > > > Cc: teawater > > > > > > > > Cc: Vasily Gorbik > > > > > > > > Cc: Wei Yang > > > > > > > > Signed-off-by: Andrew Morton > > > > > > > > Signed-off-by: Linus Torvalds > > > > > > > > Signed-off-by: Sasha Levin > > > > > > > > --- > > > > > > > > arch/arm64/mm/mmu.c | 15 +++++++-------- > > > > > > > > 1 file changed, 7 insertions(+), 8 deletions(-) > > > > > > > > > > > > > > > > diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c > > > > > > > > index 6f0648777d34..92b3be127796 100644 > > > > > > > > --- a/arch/arm64/mm/mmu.c > > > > > > > > +++ b/arch/arm64/mm/mmu.c > > > > > > > > @@ -1443,16 +1443,19 @@ static void __remove_pgd_mapping(pgd_t *pgdir, unsigned long start, u64 size) > > > > > > > > free_empty_tables(start, end, PAGE_OFFSET, PAGE_END); > > > > > > > > } > > > > > > > > > > > > > > > > -static bool inside_linear_region(u64 start, u64 size) > > > > > > > > +struct range arch_get_mappable_range(void) > > > > > > > > { > > > > > > > > + struct range mhp_range; > > > > > > > > + > > > > > > > > /* > > > > > > > > * 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); > > > > > > > > + mhp_range.start = __pa(_PAGE_OFFSET(vabits_actual)); > > > > > > > > + mhp_range.end = __pa(PAGE_END - 1); > > > > > > > > + return mhp_range; > > > > > > > > } > > > > > > > > > > > > > > > > int arch_add_memory(int nid, u64 start, u64 size, > > > > > > > > @@ -1460,11 +1463,7 @@ int arch_add_memory(int nid, u64 start, u64 size, > > > > > > > > { > > > > > > > > int ret, flags = 0; > > > > > > > > > > > > > > > > - if (!inside_linear_region(start, size)) { > > > > > > > > - pr_err("[%llx %llx] is outside linear mapping region\n", start, start + size); > > > > > > > > - return -EINVAL; > > > > > > > > - } > > > > > > > > - > > > > > > > > + VM_BUG_ON(!mhp_range_allowed(start, size, true)); > > > > > > > > if (rodata_full || debug_pagealloc_enabled()) > > > > > > > > flags = NO_BLOCK_MAPPINGS | NO_CONT_MAPPINGS; > > > > > > > > > > > > > > The stable rc 5.10 and 5.11 builds failed for arm64 architecture > > > > > > > due to below warnings / errors, > > > > > > > > > > > > > > > Anshuman Khandual > > > > > > > > arm64/mm: define arch_get_mappable_range() > > > > > > > > > > > > > > > > > > > > > arch/arm64/mm/mmu.c: In function 'arch_add_memory': > > > > > > > arch/arm64/mm/mmu.c:1483:13: error: implicit declaration of function > > > > > > > 'mhp_range_allowed'; did you mean 'cpu_map_prog_allowed'? > > > > > > > [-Werror=implicit-function-declaration] > > > > > > > VM_BUG_ON(!mhp_range_allowed(start, size, true)); > > > > > > > ^ > > > > > > > include/linux/build_bug.h:30:63: note: in definition of macro > > > > > > > 'BUILD_BUG_ON_INVALID' > > > > > > > #define BUILD_BUG_ON_INVALID(e) ((void)(sizeof((__force long)(e)))) > > > > > > > ^ > > > > > > > arch/arm64/mm/mmu.c:1483:2: note: in expansion of macro 'VM_BUG_ON' > > > > > > > VM_BUG_ON(!mhp_range_allowed(start, size, true)); > > > > > > > ^~~~~~~~~ > > > > > > > > > > > > > > Build link, > > > > > > > https://ci.linaro.org/view/lkft/job/openembedded-lkft-linux-stable-rc-5.11/DISTRO=lkft,MACHINE=juno,label=docker-buster-lkft/41/consoleText > > > > > > > https://ci.linaro.org/view/lkft/job/openembedded-lkft-linux-stable-rc-5.10/DISTRO=lkft,MACHINE=dragonboard-410c,label=docker-buster-lkft/120/consoleFull > > > > > > > > > > > > thanks, will go drop this, and the patch that was after it in the > > > > > > series, from both trees and will push out a -rc2. > > > > > > > > > > > > > > > > Why were these picked up in the first place? I don't see any fixes or > > > > > cc:stable tags, and the commit log clearly describes that the change > > > > > is preparatory work for enabling arm64 support into a recently > > > > > introduced generic framework. > > > > > > > > This was needed for a follow-on patch in the series that fixed an issue. > > > > Specifically it was commit ee7febce0519 ("arm64: mm: correct the inside > > > > linear map range during hotplug check") > > > > > > > > > > Yeah, but during the discussion of that patch [0], we pointed out that > > > it needed to be rebased because of these new changes. So trying to > > > backport this rebased version is obviously not the right approach: > > > Pavel's original patch would be much more suitable for that. > > > > > > Could we have annotated this patch in a better way to make this more obvious? > > > > Yes, given that there was no annotation on the patch at all to let us > > know this :) > > > > You can say things like "do not apply to stable trees" or "needs total > > rework for older kernels" or other fun such things that when we read > > them, we know to ask for help. As it is, the patch provided nothing so > > we guessed and got it wrong... > > I will send the patch for stable trees with the commit id included as requested. Wonderful, thank you so much. greg k-h