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.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,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 0A067C433E0 for ; Mon, 29 Mar 2021 13:50:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CF0D06196C for ; Mon, 29 Mar 2021 13:50:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231612AbhC2Nt5 (ORCPT ); Mon, 29 Mar 2021 09:49:57 -0400 Received: from mail.kernel.org ([198.145.29.99]:59490 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231506AbhC2Ntb (ORCPT ); Mon, 29 Mar 2021 09:49:31 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 4BA7D6193A; Mon, 29 Mar 2021 13:49:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1617025771; bh=eWlMxJo0CB8ZN8+tpv24UjmWeH7ZtyFbqegk1ou+9YA=; h=References:In-Reply-To:From:Date:Subject:To:Cc:From; b=EeYeJ3u9wJ2VakJUX6mWEtNfXOIxQtEEC4PHmLwFfO7d+Jb82AsTkN2Z4GN3ja6IC CQ7mIzCIkEgwZvnrwxtg79OXoT6sBFARlLo8vsM1yhNHU06qBFWKFVk3W+jhlp2zuA sRWWoMJQ1vtgt+aIAeeANFu2rlx4dsTcbbglTXwrqhIZKMhGJuq2CCr3wPmOAsVjP6 UuJ/XfVOu9CGb6COTxEgWisRU1PXdL8eC8l9bNR6I0BeTOuPWgj6a39vKc/Ja5sD67 QDMGSYRzWbYHCF4dWATdko3qXVxMhhwCJgF/aLTPeEXKY493xq+R1NXxUUiywjCYg2 k8eEegRfYcJtA== Received: by mail-ot1-f53.google.com with SMTP id g8-20020a9d6c480000b02901b65ca2432cso12319593otq.3; Mon, 29 Mar 2021 06:49:31 -0700 (PDT) X-Gm-Message-State: AOAM530iq+q+PODIU0vl2iiaWoHpQtHUGSN+maoJti00QhH49doQuMw6 /dc5JV9Ll8hSy/dixcH0VxVdI8g5uobN+EGAhRY= X-Google-Smtp-Source: ABdhPJztKxV324Sj/LOdmVqcQjFN69+JsLdAibSHWGgZ7BPboqAIxNOsOIGz2Vl5Tx8Q/Tmqc7S8e6pLAIQqbYl2dE8= X-Received: by 2002:a9d:600a:: with SMTP id h10mr22425019otj.90.1617025770625; Mon, 29 Mar 2021 06:49:30 -0700 (PDT) MIME-Version: 1.0 References: <20210329075633.135869143@linuxfoundation.org> <20210329075640.480623043@linuxfoundation.org> In-Reply-To: From: Ard Biesheuvel Date: Mon, 29 Mar 2021 15:49:19 +0200 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH 5.11 225/254] arm64/mm: define arch_get_mappable_range() To: Greg Kroah-Hartman , Pavel Tatashin Cc: 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 Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org (+ 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? [0] https://lore.kernel.org/linux-arm-kernel/20210215192237.362706-2-pasha.tatashin@soleen.com/