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=-15.8 required=3.0 tests=BAYES_00,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 B1519C433E0 for ; Mon, 29 Mar 2021 13:54:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8D3C661938 for ; Mon, 29 Mar 2021 13:54:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231906AbhC2NyK (ORCPT ); Mon, 29 Mar 2021 09:54:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37752 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231913AbhC2Nxs (ORCPT ); Mon, 29 Mar 2021 09:53:48 -0400 Received: from mail-ej1-x634.google.com (mail-ej1-x634.google.com [IPv6:2a00:1450:4864:20::634]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 19E99C061574 for ; Mon, 29 Mar 2021 06:53:48 -0700 (PDT) Received: by mail-ej1-x634.google.com with SMTP id kt15so19560775ejb.12 for ; Mon, 29 Mar 2021 06:53:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=soleen.com; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=tRDNxOKqgMTRliUmrUZqC4bBoTo2G0CXnwLhIBoHBgQ=; b=lV/ix2kywBpsOJiijM/WDFtwKZh+quRH1NlZdU/cB6BOr54qZHEckSENplCl/KquXC gN9U81nnoQ2RYxXAqxIHc8B0711uMXP+CyPpeOFNhBuDEr6JPOtiODuewDHGtmo0gCbE hX2QVbfD+TDgozhIZtbZ7wOS84erifIMalyN7rqOn5ML/fSyhjfMg73IoAjYpWkJpuAD mmdWVH2wHATaY3vfv9RibREUTrmdc9EWprBIBmV/oMPo8zthPlscnSPl5Imxf8TdXtzr HYBbrI3ZI8201l2ZXOsRFMiG+muYmMuMEsysbyOX09JZDEzCx74nkuPChT4rU4gAWVke 1Snw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=tRDNxOKqgMTRliUmrUZqC4bBoTo2G0CXnwLhIBoHBgQ=; b=khzm/wKumKMhtrBuixDpFVUlHbFibVCF2BxhBgr/1gky1AUwkYRw4BIXEvGpBNzz4k mcXFvhPLvoY7bdePXVDq+BzbAf1ZoaWgHu5GL6N2pxEE6oDsRFLZ+906WejUuw2K1+EC bUqDdIsWF6YSgf16iLxPb2hzY7O/XBIwg+lZiGsllAN1reSJXA4Kr4QfZDFXGK1QnaC8 3PPdxLVkPQ0WCXy1csg7rNN6j1RWNq+Yv2NC/iCDCo6JdV58F93WSkJPFczxDMuR05tJ qLbGUtmTHeigtMKKLYU1YaGnZPpca+PaV9Aa11l0c3VIVIEFKFas0fSJerL7ez39k/Bc 4XwQ== X-Gm-Message-State: AOAM530NUgBOmtzxRC97Vz5PZDPuxI7eT4byKEC3LT474sapeppxbrKE zPfUAN54aOfFDIkbOO/l+QKfq6xSqLVl4pdL5YOzvQ== X-Google-Smtp-Source: ABdhPJyPot+DS1608lIJgrkfz6R2AOz71ovrgOCJBMt3U5z3OuE0pbEebY1yKj+z4oQQygBbwuGVti/2aTqx1YjW8M0= X-Received: by 2002:a17:906:3409:: with SMTP id c9mr28359752ejb.314.1617026026828; Mon, 29 Mar 2021 06:53:46 -0700 (PDT) MIME-Version: 1.0 References: <20210329075633.135869143@linuxfoundation.org> <20210329075640.480623043@linuxfoundation.org> In-Reply-To: From: Pavel Tatashin Date: Mon, 29 Mar 2021 09:53:10 -0400 Message-ID: Subject: Re: [PATCH 5.11 225/254] arm64/mm: define arch_get_mappable_range() To: Greg Kroah-Hartman 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 Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. Pasha > > thanks, > > greg k-h