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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1B39EC433FE for ; Wed, 15 Dec 2021 02:04:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239075AbhLOCE5 (ORCPT ); Tue, 14 Dec 2021 21:04:57 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51606 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238932AbhLOCE5 (ORCPT ); Tue, 14 Dec 2021 21:04:57 -0500 Received: from mail-pl1-x630.google.com (mail-pl1-x630.google.com [IPv6:2607:f8b0:4864:20::630]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1617FC061574; Tue, 14 Dec 2021 18:04:57 -0800 (PST) Received: by mail-pl1-x630.google.com with SMTP id w24so2403209ply.12; Tue, 14 Dec 2021 18:04:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=+n9C5k8qwb1sSa6XZ10LfUXplUt6SGQdjqaWN4ooIHA=; b=AcqEzIpok4RquCAZJKk4LEAJWzeYcxHEZcss4eUUNzXYl717f6dntybA3lOwF9ZTIr 7e/OjqKbfFGa+aVAMx4gboA2ZSmX+nd1qE9viWXsCP1yhMgr/gIXJbUWHivtUeRAZk+Z BNj287EIe44q/3NB8t6hoYFZSX8bahv72flcY1MD5VY3nmp0rCXiTKV2O2I0DSj2HuPm RzpogZOC6734eAMqxcVg8Wzj6n7zAU+u1pvNoUPZ/sw53VRaOJdA1bBx/EIVUUz47iZ/ zwnqJaHy3xQnUaDcvRuQwtBzf/47YJmgcIa/m3Fg1EHqdXdsz2sStYqDdJYOY3xRy3s9 DDpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=+n9C5k8qwb1sSa6XZ10LfUXplUt6SGQdjqaWN4ooIHA=; b=mSNP2Ya3VbRMxzVq064qfacVukksz9+t2eP8xmsfgY4kihMQsDPXzQ7Ir/ss26fKc5 6EYhzUGhTLjespFiaFrPavkxN3uvJVM0BpkZWMsTLd4/bfjCDbz+zmp8xfDrxAiGrAxT un9GC+yGp7CpE75/bldZZtMwK9xuVYERZ80jSz1zwH/Ad3RaC3xOIre9ZpxJ0XSZ7Xwv rWhb3gOtHyguxP11JmaXeKIibUFTP/ovtgXfS1eLNSSc6TTvuzsGjgXI+thDDMmhSY0i h2Y7W1Hdjso5Bj7/0+IqDpkW4UbTuS97bMj2yGk5HVF3AbyQiKejQ9iNUVJEBN9/pZ/a WrVw== X-Gm-Message-State: AOAM5328B5vHYuLs7IZ5UqUNfVmu1ySyM49uSChcKVAXbpKZAJKkmoPl ekVGy37HLOiJsGmUSDSRSw== X-Google-Smtp-Source: ABdhPJw7pKKOYw5qTkUmhAzHsnAYEG+DtDGUQp5L/pI1JNsAIuiHiQSPPjzcSzXF+gEwXUQhxHYUYg== X-Received: by 2002:a17:90b:3810:: with SMTP id mq16mr9397286pjb.128.1639533896574; Tue, 14 Dec 2021 18:04:56 -0800 (PST) Received: from piliu.users.ipa.redhat.com ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id ne7sm3713941pjb.36.2021.12.14.18.04.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Dec 2021 18:04:54 -0800 (PST) Date: Wed, 15 Dec 2021 10:04:40 +0800 From: Pingfan Liu To: Rob Herring Cc: devicetree@vger.kernel.org, linux-efi , Zhen Lei , Catalin Marinas , Will Deacon , Andrew Morton , Mike Rapoport , Geert Uytterhoeven , Frank Rowand , Ard Biesheuvel , Nick Terrell , linux-arm-kernel Subject: Re: [PATCHv2 2/2] efi: apply memblock cap after memblock_add() Message-ID: References: <20211214040157.27443-1-kernelfans@gmail.com> <20211214040157.27443-3-kernelfans@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org On Tue, Dec 14, 2021 at 08:55:18AM -0600, Rob Herring wrote: > On Mon, Dec 13, 2021 at 10:02 PM Pingfan Liu wrote: > > > > On arm64, during kdump kernel saves vmcore, it runs into the following bug: > > ... > > [ 15.148919] usercopy: Kernel memory exposure attempt detected from SLUB object 'kmem_cache_node' (offset 0, size 4096)! > > [ 15.159707] ------------[ cut here ]------------ > > [ 15.164311] kernel BUG at mm/usercopy.c:99! > > [ 15.168482] Internal error: Oops - BUG: 0 [#1] SMP > > [ 15.173261] Modules linked in: xfs libcrc32c crct10dif_ce ghash_ce sha2_ce sha256_arm64 sha1_ce sbsa_gwdt ast i2c_algo_bit drm_vram_helper drm_kms_helper syscopyarea sysfillrect sysimgblt fb_sys_fops cec drm_ttm_helper ttm drm nvme nvme_core xgene_hwmon i2c_designware_platform i2c_designware_core dm_mirror dm_region_hash dm_log dm_mod overlay squashfs zstd_decompress loop > > [ 15.206186] CPU: 0 PID: 542 Comm: cp Not tainted 5.16.0-rc4 #1 > > [ 15.212006] Hardware name: GIGABYTE R272-P30-JG/MP32-AR0-JG, BIOS F12 (SCP: 1.5.20210426) 05/13/2021 > > [ 15.221125] pstate: 60400009 (nZCv daif +PAN -UAO -TCO -DIT -SSBS BTYPE=--) > > [ 15.228073] pc : usercopy_abort+0x9c/0xa0 > > [ 15.232074] lr : usercopy_abort+0x9c/0xa0 > > [ 15.236070] sp : ffff8000121abba0 > > [ 15.239371] x29: ffff8000121abbb0 x28: 0000000000003000 x27: 0000000000000000 > > [ 15.246494] x26: 0000000080000400 x25: 0000ffff885c7000 x24: 0000000000000000 > > [ 15.253617] x23: 000007ff80400000 x22: ffff07ff80401000 x21: 0000000000000001 > > [ 15.260739] x20: 0000000000001000 x19: ffff07ff80400000 x18: ffffffffffffffff > > [ 15.267861] x17: 656a626f2042554c x16: 53206d6f72662064 x15: 6574636574656420 > > [ 15.274983] x14: 74706d6574746120 x13: 2129363930342065 x12: 7a6973202c302074 > > [ 15.282105] x11: ffffc8b041d1b148 x10: 00000000ffff8000 x9 : ffffc8b04012812c > > [ 15.289228] x8 : 00000000ffff7fff x7 : ffffc8b041d1b148 x6 : 0000000000000000 > > [ 15.296349] x5 : 0000000000000000 x4 : 0000000000007fff x3 : 0000000000000000 > > [ 15.303471] x2 : 0000000000000000 x1 : ffff07ff8c064800 x0 : 000000000000006b > > [ 15.310593] Call trace: > > [ 15.313027] usercopy_abort+0x9c/0xa0 > > [ 15.316677] __check_heap_object+0xd4/0xf0 > > [ 15.320762] __check_object_size.part.0+0x160/0x1e0 > > [ 15.325628] __check_object_size+0x2c/0x40 > > [ 15.329711] copy_oldmem_page+0x7c/0x140 > > [ 15.333623] read_from_oldmem.part.0+0xfc/0x1c0 > > [ 15.338142] __read_vmcore.constprop.0+0x23c/0x350 > > [ 15.342920] read_vmcore+0x28/0x34 > > [ 15.346309] proc_reg_read+0xb4/0xf0 > > [ 15.349871] vfs_read+0xb8/0x1f0 > > [ 15.353088] ksys_read+0x74/0x100 > > [ 15.356390] __arm64_sys_read+0x28/0x34 > > ... > > > > This bug introduced by commit b261dba2fdb2 ("arm64: kdump: Remove custom > > linux,usable-memory-range handling"), which moves > > memblock_cap_memory_range() to fdt, but it breaches the rules that > > memblock_cap_memory_range() should come after memblock_add() etc as said > > in commit e888fa7bb882 ("memblock: Check memory add/cap ordering"). > > > > As a consequence, the virtual address set up by copy_oldmem_page() does > > not bail out from the test of virt_addr_valid() in check_heap_object(), > > and finally hits the BUG_ON(). > > > > Since memblock allocator has no idea about when the memblock is fully > > populated, while efi_init() is aware, so tackling this issue by calling the > > interface early_init_dt_check_for_usable_mem_range() exposed by of/fdt. > > > > Fixes: b261dba2fdb2 ("arm64: kdump: Remove custom linux,usable-memory-range handling") > > Signed-off-by: Pingfan Liu > > Cc: Rob Herring > > Cc: Zhen Lei > > Cc: Catalin Marinas > > Cc: Will Deacon > > Cc: Andrew Morton > > Cc: Mike Rapoport > > Cc: Geert Uytterhoeven > > Cc: Frank Rowand > > Cc: Ard Biesheuvel > > Cc: Nick Terrell > > Cc: linux-arm-kernel@lists.infradead.org > > To: devicetree@vger.kernel.org > > To: linux-efi@vger.kernel.org > > --- > > drivers/firmware/efi/efi-init.c | 7 +++++++ > > drivers/of/fdt.c | 2 +- > > include/linux/of_fdt.h | 1 + > > 3 files changed, 9 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/firmware/efi/efi-init.c b/drivers/firmware/efi/efi-init.c > > index b19ce1a83f91..82d986016fa9 100644 > > --- a/drivers/firmware/efi/efi-init.c > > +++ b/drivers/firmware/efi/efi-init.c > > @@ -235,6 +235,13 @@ void __init efi_init(void) > > } > > > > reserve_regions(); > > +#ifdef CONFIG_OF_FLATTREE > > Add a static inline stub to avoid this ifdef. > Thanks for the suggestion. I will follow up with V3 to this patch. Regards, Pingfan > > + /* > > + * For memblock manipulation, the cap should come after the memblock_add(). > > + * And now, memblock is fully populated, it is time to do capping. > > + */ > > + early_init_dt_check_for_usable_mem_range(); > > +#endif > > efi_esrt_init(); > > efi_mokvar_table_init(); > > > > diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c > > index 18a2df431bfd..aa07ef5cab5f 100644 > > --- a/drivers/of/fdt.c > > +++ b/drivers/of/fdt.c > > @@ -972,7 +972,7 @@ static unsigned long chosen_node_offset = -FDT_ERR_NOTFOUND; > > * location from flat tree > > * @node: reference to node containing usable memory range location ('chosen') > > */ > > -static void __init early_init_dt_check_for_usable_mem_range(void) > > +void __init early_init_dt_check_for_usable_mem_range(void) > > { > > const __be32 *prop; > > int len; > > diff --git a/include/linux/of_fdt.h b/include/linux/of_fdt.h > > index cf48983d3c86..1d5ee19fadf7 100644 > > --- a/include/linux/of_fdt.h > > +++ b/include/linux/of_fdt.h > > @@ -62,6 +62,7 @@ extern int early_init_dt_scan_chosen(unsigned long node, const char *uname, > > int depth, void *data); > > extern int early_init_dt_scan_memory(unsigned long node, const char *uname, > > int depth, void *data); > > +extern void early_init_dt_check_for_usable_mem_range(void); > > extern int early_init_dt_scan_chosen_stdout(void); > > extern void early_init_fdt_scan_reserved_mem(void); > > extern void early_init_fdt_reserve_self(void); > > -- > > 2.31.1 > > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel 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 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9BD3FC433F5 for ; Wed, 15 Dec 2021 02:06:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc: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=Oc5uHlO+MLd1B9q6hl5PiUX20DAtt6VIkazvM1gZpEo=; b=rrAGVnK7twpWBL 0hBLJunIXih20fu9pK9EbbovVObbZmq0sQlqxfH6bQcmixwAk3XrxdxAPCN1izTfiz5VFlB+taj5o u0PeK4VdejbGuHgkkdSUkYMfqY4J+BO+wKWnvnl5rxYXUQxTyz50dCIP8Phhm3ggbbfnPYnEG8jtH aF7jNrbH76ZhBXLLsl9T7Vbsgv3UHEm4pPJbrcoktpcqooCQfi4woDq/a3A7+4G75X5cE5kKCvkL1 MIRF9ZgBxcMoDqiYAmj3W+kuaBcuvIjEX5D+wB7TCdqeXStKhEvaboDAwjPauznmg1gkSfNRs37Gn Q42/fT177u4RTrSBvxUg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mxJfC-00GL55-MK; Wed, 15 Dec 2021 02:05:02 +0000 Received: from mail-pl1-x62f.google.com ([2607:f8b0:4864:20::62f]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mxJf8-00GL3i-4q for linux-arm-kernel@lists.infradead.org; Wed, 15 Dec 2021 02:05:00 +0000 Received: by mail-pl1-x62f.google.com with SMTP id z6so15104050plk.6 for ; Tue, 14 Dec 2021 18:04:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=+n9C5k8qwb1sSa6XZ10LfUXplUt6SGQdjqaWN4ooIHA=; b=AcqEzIpok4RquCAZJKk4LEAJWzeYcxHEZcss4eUUNzXYl717f6dntybA3lOwF9ZTIr 7e/OjqKbfFGa+aVAMx4gboA2ZSmX+nd1qE9viWXsCP1yhMgr/gIXJbUWHivtUeRAZk+Z BNj287EIe44q/3NB8t6hoYFZSX8bahv72flcY1MD5VY3nmp0rCXiTKV2O2I0DSj2HuPm RzpogZOC6734eAMqxcVg8Wzj6n7zAU+u1pvNoUPZ/sw53VRaOJdA1bBx/EIVUUz47iZ/ zwnqJaHy3xQnUaDcvRuQwtBzf/47YJmgcIa/m3Fg1EHqdXdsz2sStYqDdJYOY3xRy3s9 DDpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=+n9C5k8qwb1sSa6XZ10LfUXplUt6SGQdjqaWN4ooIHA=; b=xn34MTiiK5VdveRhuqImNnqJkhdJGwynRgHDlYOcuzXwpO9uL7bfIqWiYup/Su7EQZ h4YemDwinQbc4DZW4TedCa0cx9IpQG16/4XvqcJg0cClPAHxI50oAEMvr8B1iSrJ4ItH QPBGAmb+X3jB7QtxyzLnu2TdKeYsWEVQ6sfFwyzJt7zFWfnH4a5ZrKaIV/fF6gd08ivz kiWpvVM2NyGITpm2tbAOqV+1jhGhWxGPje1S/1v8JEQ1PAy7sX8at3ijUAoFcMBL2BLL v3ubAF+GtlrgpVvDz38BJTJ7fEbjAgxJkjAO+OBg+hFU8xyxiZhPieSTXyj9iHCm/Dyo /7aQ== X-Gm-Message-State: AOAM531g0deoheW2G/Ue3ezufSpruJmGjlvim+WuSgZmZqWV2FdKNw58 bG156aUPoa5QOtNQk7b+YATJj5dGbg== X-Google-Smtp-Source: ABdhPJw7pKKOYw5qTkUmhAzHsnAYEG+DtDGUQp5L/pI1JNsAIuiHiQSPPjzcSzXF+gEwXUQhxHYUYg== X-Received: by 2002:a17:90b:3810:: with SMTP id mq16mr9397286pjb.128.1639533896574; Tue, 14 Dec 2021 18:04:56 -0800 (PST) Received: from piliu.users.ipa.redhat.com ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id ne7sm3713941pjb.36.2021.12.14.18.04.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Dec 2021 18:04:54 -0800 (PST) Date: Wed, 15 Dec 2021 10:04:40 +0800 From: Pingfan Liu To: Rob Herring Cc: devicetree@vger.kernel.org, linux-efi , Zhen Lei , Catalin Marinas , Will Deacon , Andrew Morton , Mike Rapoport , Geert Uytterhoeven , Frank Rowand , Ard Biesheuvel , Nick Terrell , linux-arm-kernel Subject: Re: [PATCHv2 2/2] efi: apply memblock cap after memblock_add() Message-ID: References: <20211214040157.27443-1-kernelfans@gmail.com> <20211214040157.27443-3-kernelfans@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211214_180458_218712_1808FFCC X-CRM114-Status: GOOD ( 36.31 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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 Tue, Dec 14, 2021 at 08:55:18AM -0600, Rob Herring wrote: > On Mon, Dec 13, 2021 at 10:02 PM Pingfan Liu wrote: > > > > On arm64, during kdump kernel saves vmcore, it runs into the following bug: > > ... > > [ 15.148919] usercopy: Kernel memory exposure attempt detected from SLUB object 'kmem_cache_node' (offset 0, size 4096)! > > [ 15.159707] ------------[ cut here ]------------ > > [ 15.164311] kernel BUG at mm/usercopy.c:99! > > [ 15.168482] Internal error: Oops - BUG: 0 [#1] SMP > > [ 15.173261] Modules linked in: xfs libcrc32c crct10dif_ce ghash_ce sha2_ce sha256_arm64 sha1_ce sbsa_gwdt ast i2c_algo_bit drm_vram_helper drm_kms_helper syscopyarea sysfillrect sysimgblt fb_sys_fops cec drm_ttm_helper ttm drm nvme nvme_core xgene_hwmon i2c_designware_platform i2c_designware_core dm_mirror dm_region_hash dm_log dm_mod overlay squashfs zstd_decompress loop > > [ 15.206186] CPU: 0 PID: 542 Comm: cp Not tainted 5.16.0-rc4 #1 > > [ 15.212006] Hardware name: GIGABYTE R272-P30-JG/MP32-AR0-JG, BIOS F12 (SCP: 1.5.20210426) 05/13/2021 > > [ 15.221125] pstate: 60400009 (nZCv daif +PAN -UAO -TCO -DIT -SSBS BTYPE=--) > > [ 15.228073] pc : usercopy_abort+0x9c/0xa0 > > [ 15.232074] lr : usercopy_abort+0x9c/0xa0 > > [ 15.236070] sp : ffff8000121abba0 > > [ 15.239371] x29: ffff8000121abbb0 x28: 0000000000003000 x27: 0000000000000000 > > [ 15.246494] x26: 0000000080000400 x25: 0000ffff885c7000 x24: 0000000000000000 > > [ 15.253617] x23: 000007ff80400000 x22: ffff07ff80401000 x21: 0000000000000001 > > [ 15.260739] x20: 0000000000001000 x19: ffff07ff80400000 x18: ffffffffffffffff > > [ 15.267861] x17: 656a626f2042554c x16: 53206d6f72662064 x15: 6574636574656420 > > [ 15.274983] x14: 74706d6574746120 x13: 2129363930342065 x12: 7a6973202c302074 > > [ 15.282105] x11: ffffc8b041d1b148 x10: 00000000ffff8000 x9 : ffffc8b04012812c > > [ 15.289228] x8 : 00000000ffff7fff x7 : ffffc8b041d1b148 x6 : 0000000000000000 > > [ 15.296349] x5 : 0000000000000000 x4 : 0000000000007fff x3 : 0000000000000000 > > [ 15.303471] x2 : 0000000000000000 x1 : ffff07ff8c064800 x0 : 000000000000006b > > [ 15.310593] Call trace: > > [ 15.313027] usercopy_abort+0x9c/0xa0 > > [ 15.316677] __check_heap_object+0xd4/0xf0 > > [ 15.320762] __check_object_size.part.0+0x160/0x1e0 > > [ 15.325628] __check_object_size+0x2c/0x40 > > [ 15.329711] copy_oldmem_page+0x7c/0x140 > > [ 15.333623] read_from_oldmem.part.0+0xfc/0x1c0 > > [ 15.338142] __read_vmcore.constprop.0+0x23c/0x350 > > [ 15.342920] read_vmcore+0x28/0x34 > > [ 15.346309] proc_reg_read+0xb4/0xf0 > > [ 15.349871] vfs_read+0xb8/0x1f0 > > [ 15.353088] ksys_read+0x74/0x100 > > [ 15.356390] __arm64_sys_read+0x28/0x34 > > ... > > > > This bug introduced by commit b261dba2fdb2 ("arm64: kdump: Remove custom > > linux,usable-memory-range handling"), which moves > > memblock_cap_memory_range() to fdt, but it breaches the rules that > > memblock_cap_memory_range() should come after memblock_add() etc as said > > in commit e888fa7bb882 ("memblock: Check memory add/cap ordering"). > > > > As a consequence, the virtual address set up by copy_oldmem_page() does > > not bail out from the test of virt_addr_valid() in check_heap_object(), > > and finally hits the BUG_ON(). > > > > Since memblock allocator has no idea about when the memblock is fully > > populated, while efi_init() is aware, so tackling this issue by calling the > > interface early_init_dt_check_for_usable_mem_range() exposed by of/fdt. > > > > Fixes: b261dba2fdb2 ("arm64: kdump: Remove custom linux,usable-memory-range handling") > > Signed-off-by: Pingfan Liu > > Cc: Rob Herring > > Cc: Zhen Lei > > Cc: Catalin Marinas > > Cc: Will Deacon > > Cc: Andrew Morton > > Cc: Mike Rapoport > > Cc: Geert Uytterhoeven > > Cc: Frank Rowand > > Cc: Ard Biesheuvel > > Cc: Nick Terrell > > Cc: linux-arm-kernel@lists.infradead.org > > To: devicetree@vger.kernel.org > > To: linux-efi@vger.kernel.org > > --- > > drivers/firmware/efi/efi-init.c | 7 +++++++ > > drivers/of/fdt.c | 2 +- > > include/linux/of_fdt.h | 1 + > > 3 files changed, 9 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/firmware/efi/efi-init.c b/drivers/firmware/efi/efi-init.c > > index b19ce1a83f91..82d986016fa9 100644 > > --- a/drivers/firmware/efi/efi-init.c > > +++ b/drivers/firmware/efi/efi-init.c > > @@ -235,6 +235,13 @@ void __init efi_init(void) > > } > > > > reserve_regions(); > > +#ifdef CONFIG_OF_FLATTREE > > Add a static inline stub to avoid this ifdef. > Thanks for the suggestion. I will follow up with V3 to this patch. Regards, Pingfan > > + /* > > + * For memblock manipulation, the cap should come after the memblock_add(). > > + * And now, memblock is fully populated, it is time to do capping. > > + */ > > + early_init_dt_check_for_usable_mem_range(); > > +#endif > > efi_esrt_init(); > > efi_mokvar_table_init(); > > > > diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c > > index 18a2df431bfd..aa07ef5cab5f 100644 > > --- a/drivers/of/fdt.c > > +++ b/drivers/of/fdt.c > > @@ -972,7 +972,7 @@ static unsigned long chosen_node_offset = -FDT_ERR_NOTFOUND; > > * location from flat tree > > * @node: reference to node containing usable memory range location ('chosen') > > */ > > -static void __init early_init_dt_check_for_usable_mem_range(void) > > +void __init early_init_dt_check_for_usable_mem_range(void) > > { > > const __be32 *prop; > > int len; > > diff --git a/include/linux/of_fdt.h b/include/linux/of_fdt.h > > index cf48983d3c86..1d5ee19fadf7 100644 > > --- a/include/linux/of_fdt.h > > +++ b/include/linux/of_fdt.h > > @@ -62,6 +62,7 @@ extern int early_init_dt_scan_chosen(unsigned long node, const char *uname, > > int depth, void *data); > > extern int early_init_dt_scan_memory(unsigned long node, const char *uname, > > int depth, void *data); > > +extern void early_init_dt_check_for_usable_mem_range(void); > > extern int early_init_dt_scan_chosen_stdout(void); > > extern void early_init_fdt_scan_reserved_mem(void); > > extern void early_init_fdt_reserve_self(void); > > -- > > 2.31.1 > > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel