Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp2937536iob; Sun, 1 May 2022 01:57:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJziVIrTk3XWvFuQFscs6TOLorJ8MeXdk0Xt2Mso9qmBnTE8lcKf317ZSHKxCFkOTPnwYOZk X-Received: by 2002:a05:6512:33c1:b0:472:3402:4127 with SMTP id d1-20020a05651233c100b0047234024127mr5671373lfg.145.1651395436740; Sun, 01 May 2022 01:57:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651395436; cv=none; d=google.com; s=arc-20160816; b=j+m8eB/WD8BmWHtIlq73qJ4g5ISYsJFpPE2KxRA1vFX5Ff389j6NTsdJRf6Yfpebz+ bsWsm8cxiVhK2chMq4LnNA5K+Hh0/eD27Yf7XIuzObX2ETfEcTYg+OSpVqF1TOsInssx OZHV9RQxS0efobNwzCMq3oJ6L/ArtSz7lq0CYV7sc8RBNPZJhv6x8q5M1SaIsRglxNAA /If3e5BNQUofxE6fTkZWY4R+L+hKh+8POLoHQGcZlTPRZSHrC7evPQVMEMAob0s7/KWn UvF8XlC5a6x8M0amkD6itqSGJj0iDJF7F0umgMDFuZxd5riT+fNejtE7wjlN1wD3zqbN 1UUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:subject:message-id:date:from:in-reply-to :references:mime-version:dkim-signature; bh=mry41bTUmrLAyCZhkby0P2zVIn/bAxXTFtFxQXmWE8w=; b=P2Otw8lho5YB0sNtwb1Ohgnw8DNtjw+oY4O9vL9ijQ1gVY9zDM5NW6Fm381mvV2A17 mT8c4TJ9Rmh4Diz32NXPDJZcT+hhIU7G7XKRSg8RHL2glC9+6dbuZHZj3G3Y9MlOdmib PwrloZqxa65kL7dIwb1ktJ7X2sFcMC1OwYqCmfxmVJHqwwWOFmFJIMpoRBxulVAm0wwP 9iRFRNu45TJR7ZLeTwZZhSB/reWINIV4Dlp0R4KIadC7SrsWMMh2c03VxdhxDlmU/h+1 w3SSCIxuGM678sGQoRBduXjmB4xTz8AAbSCvKEkU521Ie20kMOAJMuyAsNVbjCzAG8iJ xwhA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=vRMWlIw4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id o17-20020a05651c051100b0024f700a4e60si1390817ljp.435.2022.05.01.01.56.50; Sun, 01 May 2022 01:57:16 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=vRMWlIw4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236786AbiD2Nmp (ORCPT + 99 others); Fri, 29 Apr 2022 09:42:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53908 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1357952AbiD2Nmb (ORCPT ); Fri, 29 Apr 2022 09:42:31 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1AED1CB036; Fri, 29 Apr 2022 06:39:13 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id B4922622B7; Fri, 29 Apr 2022 13:39:12 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1D1C5C385B7; Fri, 29 Apr 2022 13:39:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1651239552; bh=N9fQmEl3ImvB9J7VUSPgaqnkcUMXRSpOC2WJD514V+0=; h=References:In-Reply-To:From:Date:Subject:To:Cc:From; b=vRMWlIw46xZ4PUBO6CL6zDq8poNp54VbHQ7VuENmgOwp/wnbycRE4v3oQ5HMGV7Ja Ss5tiEpr8pbZYlY1z2QmGIKiKonn1xwlVYEFpQycPxgAdlUGowTcZ3aodlK1cO/DAs nZLYGcdp8B9dtNVbH3AAze2sEMO3lw5OdQNqnAJFCG8Jvr+PDm6yOwlGB4T15CieHl htZQ7qPZ2x01YVAviEsvaRZ4u6WdCAEW2Jkh216N5MtU0gQi9gPxS3fLqaJ3GV4H0o 3CIK12NmGJs9NumheTn1zTN3swwTtur7aSUd0hKHR66PjyLGqmNb5eUuCK9JLBDJP2 VAy3afiE8Wp6Q== Received: by mail-oi1-f181.google.com with SMTP id l203so8577262oif.0; Fri, 29 Apr 2022 06:39:12 -0700 (PDT) X-Gm-Message-State: AOAM533hpWj4ec1m2yQuxpTr5MzMMq6OlrDSJJzPU+boWzgROf/UxXdS idW845RNoPtymZ79XtAOP9nSyWZ57mYSm9QidbQ= X-Received: by 2002:a05:6808:e8d:b0:322:bac0:2943 with SMTP id k13-20020a0568080e8d00b00322bac02943mr1461318oil.126.1651239551067; Fri, 29 Apr 2022 06:39:11 -0700 (PDT) MIME-Version: 1.0 References: <20220426060107.7618-1-rppt@kernel.org> In-Reply-To: <20220426060107.7618-1-rppt@kernel.org> From: Ard Biesheuvel Date: Fri, 29 Apr 2022 15:38:59 +0200 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH v2] arm[64]/memremap: don't abuse pfn_valid() to ensure presence of linear map To: Mike Rapoport Cc: Linux Kernel Mailing List , Andrew Morton , Catalin Marinas , Greg Kroah-Hartman , Guillaume Tucker , Mark Brown , Mark-PK Tsai , Mike Rapoport , Russell King , Tony Lindgren , Will Deacon , "kernelci . org bot" , kernelci-results@groups.io, Linux ARM , "# 3.4.x" Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-7.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 26 Apr 2022 at 08:01, Mike Rapoport wrote: > > From: Mike Rapoport > > The semantics of pfn_valid() is to check presence of the memory map for a > PFN and not whether a PFN is covered by the linear map. The memory map may > be present for NOMAP memory regions, but they won't be mapped in the linear > mapping. Accessing such regions via __va() when they are memremap()'ed > will cause a crash. > > On v5.4.y the crash happens on qemu-arm with UEFI [1]: > > <1>[ 0.084476] 8<--- cut here --- > <1>[ 0.084595] Unable to handle kernel paging request at virtual address dfb76000 > <1>[ 0.084938] pgd = (ptrval) > <1>[ 0.085038] [dfb76000] *pgd=5f7fe801, *pte=00000000, *ppte=00000000 > > ... > > <4>[ 0.093923] [] (memcpy) from [] (dmi_setup+0x60/0x418) > <4>[ 0.094204] [] (dmi_setup) from [] (arm_dmi_init+0x8/0x10) > <4>[ 0.094408] [] (arm_dmi_init) from [] (do_one_initcall+0x50/0x228) > <4>[ 0.094619] [] (do_one_initcall) from [] (kernel_init_freeable+0x15c/0x1f8) > <4>[ 0.094841] [] (kernel_init_freeable) from [] (kernel_init+0x8/0x10c) > <4>[ 0.095057] [] (kernel_init) from [] (ret_from_fork+0x14/0x2c) > > On kernels v5.10.y and newer the same crash won't reproduce on ARM because > commit b10d6bca8720 ("arch, drivers: replace for_each_membock() with > for_each_mem_range()") changed the way memory regions are registered in the > resource tree, but that merely covers up the problem. > > On ARM64 memory resources registered in yet another way and there the > issue of wrong usage of pfn_valid() to ensure availability of the linear > map is also covered. > > Implement arch_memremap_can_ram_remap() on ARM and ARM64 to prevent access > to NOMAP regions via the linear mapping in memremap(). > > Link: https://lore.kernel.org/all/Yl65zxGgFzF1Okac@sirena.org.uk > Reported-by: "kernelci.org bot" > Tested-by: Mark Brown > Cc: stable@vger.kernel.org # 5.4+ > Signed-off-by: Mike Rapoport > --- > v2: don't remove pfn_valid() from try_ram_remap(), per Ard > > arch/arm/include/asm/io.h | 3 +++ > arch/arm/mm/ioremap.c | 8 ++++++++ > arch/arm64/include/asm/io.h | 4 ++++ > arch/arm64/mm/ioremap.c | 8 ++++++++ > 4 files changed, 23 insertions(+) > I think this looks reasonable, but you'll need to split it in two if it is going through the respective arch trees. Reviewed-by: Ard Biesheuvel > diff --git a/arch/arm/include/asm/io.h b/arch/arm/include/asm/io.h > index 0c70eb688a00..2a0739a2350b 100644 > --- a/arch/arm/include/asm/io.h > +++ b/arch/arm/include/asm/io.h > @@ -440,6 +440,9 @@ extern void pci_iounmap(struct pci_dev *dev, void __iomem *addr); > #define ARCH_HAS_VALID_PHYS_ADDR_RANGE > extern int valid_phys_addr_range(phys_addr_t addr, size_t size); > extern int valid_mmap_phys_addr_range(unsigned long pfn, size_t size); > +extern bool arch_memremap_can_ram_remap(resource_size_t offset, size_t size, > + unsigned long flags); > +#define arch_memremap_can_ram_remap arch_memremap_can_ram_remap > #endif > > /* > diff --git a/arch/arm/mm/ioremap.c b/arch/arm/mm/ioremap.c > index aa08bcb72db9..290702328a33 100644 > --- a/arch/arm/mm/ioremap.c > +++ b/arch/arm/mm/ioremap.c > @@ -493,3 +493,11 @@ void __init early_ioremap_init(void) > { > early_ioremap_setup(); > } > + > +bool arch_memremap_can_ram_remap(resource_size_t offset, size_t size, > + unsigned long flags) > +{ > + unsigned long pfn = PHYS_PFN(offset); > + > + return memblock_is_map_memory(pfn); > +} > diff --git a/arch/arm64/include/asm/io.h b/arch/arm64/include/asm/io.h > index 7fd836bea7eb..3995652daf81 100644 > --- a/arch/arm64/include/asm/io.h > +++ b/arch/arm64/include/asm/io.h > @@ -192,4 +192,8 @@ extern void __iomem *ioremap_cache(phys_addr_t phys_addr, size_t size); > extern int valid_phys_addr_range(phys_addr_t addr, size_t size); > extern int valid_mmap_phys_addr_range(unsigned long pfn, size_t size); > > +extern bool arch_memremap_can_ram_remap(resource_size_t offset, size_t size, > + unsigned long flags); > +#define arch_memremap_can_ram_remap arch_memremap_can_ram_remap > + > #endif /* __ASM_IO_H */ > diff --git a/arch/arm64/mm/ioremap.c b/arch/arm64/mm/ioremap.c > index b7c81dacabf0..b21f91cd830d 100644 > --- a/arch/arm64/mm/ioremap.c > +++ b/arch/arm64/mm/ioremap.c > @@ -99,3 +99,11 @@ void __init early_ioremap_init(void) > { > early_ioremap_setup(); > } > + > +bool arch_memremap_can_ram_remap(resource_size_t offset, size_t size, > + unsigned long flags) > +{ > + unsigned long pfn = PHYS_PFN(offset); > + > + return pfn_is_map_memory(pfn); > +} > > base-commit: b2d229d4ddb17db541098b83524d901257e93845 > -- > 2.28.0 >