From: Jeremy Linton <jeremy.linton@arm.com> To: Ard Biesheuvel <ard.biesheuvel@linaro.org>, linux-efi@vger.kernel.org, Ingo Molnar <mingo@kernel.org>, Thomas Gleixner <tglx@linutronix.de> Cc: linux-kernel@vger.kernel.org Subject: Re: [PATCH 5/5] efi: permit calling efi_mem_reserve_persistent from atomic context Date: Tue, 27 Nov 2018 12:59:46 -0600 Message-ID: <a8346212-70cb-0bbb-9e29-e21fa2ee5040@arm.com> (raw) In-Reply-To: <20181114175544.12860-6-ard.biesheuvel@linaro.org> Hi Ard, On 11/14/2018 11:55 AM, Ard Biesheuvel wrote: > Currently, efi_mem_reserve_persistent() may not be called from atomic > context, since both the kmalloc() call and the memremap() call may > sleep. > > The kmalloc() call is easy enough to fix, but the memremap() call > needs to be moved into an init hook since we cannot control the > memory allocation behavior of memremap() at the call site. So, at first glance this looks correct until I noticed that its_cpu_init_lpis() is being called before the early_initcalls are run. This results in the WARN_ON triggering with the following backtrace: [ 0.000000] its_cpu_init_lpis+0x1d4/0x2e0 [ 0.000000] its_cpu_init+0x78/0x1b4 [ 0.000000] gic_init_bases+0x2c4/0x2e0 [ 0.000000] gic_acpi_init+0x158/0x270 [ 0.000000] acpi_match_madt+0x4c/0x84 [ 0.000000] acpi_table_parse_entries_array+0x140/0x218 [ 0.000000] acpi_table_parse_entries+0x70/0x98 [ 0.000000] acpi_table_parse_madt+0x40/0x50 [ 0.000000] __acpi_probe_device_table+0x88/0xe0 [ 0.000000] irqchip_init+0x38/0x40 [ 0.000000] init_IRQ+0xfc/0x130 [ 0.000000] start_kernel+0x344/0x4cc due to the efi_memreserve_root not yet being set. > > Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> > --- > drivers/firmware/efi/efi.c | 31 +++++++++++++++++++------------ > 1 file changed, 19 insertions(+), 12 deletions(-) > > diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c > index 72a4da76d274..fad7c62cfc0e 100644 > --- a/drivers/firmware/efi/efi.c > +++ b/drivers/firmware/efi/efi.c > @@ -967,36 +967,43 @@ bool efi_is_table_address(unsigned long phys_addr) > } > > static DEFINE_SPINLOCK(efi_mem_reserve_persistent_lock); > +static struct linux_efi_memreserve *efi_memreserve_root __ro_after_init; > > int efi_mem_reserve_persistent(phys_addr_t addr, u64 size) > { > - struct linux_efi_memreserve *rsv, *parent; > + struct linux_efi_memreserve *rsv; > > - if (efi.mem_reserve == EFI_INVALID_TABLE_ADDR) > + if (!efi_memreserve_root) > return -ENODEV; > > - rsv = kmalloc(sizeof(*rsv), GFP_KERNEL); > + rsv = kmalloc(sizeof(*rsv), GFP_ATOMIC); > if (!rsv) > return -ENOMEM; > > - parent = memremap(efi.mem_reserve, sizeof(*rsv), MEMREMAP_WB); > - if (!parent) { > - kfree(rsv); > - return -ENOMEM; > - } > - > rsv->base = addr; > rsv->size = size; > > spin_lock(&efi_mem_reserve_persistent_lock); > - rsv->next = parent->next; > - parent->next = __pa(rsv); > + rsv->next = efi_memreserve_root->next; > + efi_memreserve_root->next = __pa(rsv); > spin_unlock(&efi_mem_reserve_persistent_lock); > > - memunmap(parent); > + return 0; > +} > > +static int __init efi_memreserve_root_init(void) > +{ > + if (efi.mem_reserve == EFI_INVALID_TABLE_ADDR) > + return -ENODEV; > + > + efi_memreserve_root = memremap(efi.mem_reserve, > + sizeof(*efi_memreserve_root), > + MEMREMAP_WB); > + if (!efi_memreserve_root) > + return -ENOMEM; > return 0; > } > +early_initcall(efi_memreserve_root_init); > > #ifdef CONFIG_KEXEC > static int update_efi_random_seed(struct notifier_block *nb, >
next prev parent reply index Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-11-14 17:55 [GIT PULL 0/5] EFI fixes for v4.20 Ard Biesheuvel 2018-11-14 17:55 ` [PATCH 1/5] efi: Fix debugobjects warning on efi_rts_work Ard Biesheuvel 2018-11-14 17:55 ` [PATCH 2/5] efi: arm: revert deferred unmap of early memmap mapping Ard Biesheuvel 2018-11-14 17:55 ` [PATCH 3/5] efi/arm: libstub: pack FDT after populating it Ard Biesheuvel 2018-11-14 17:55 ` [PATCH 4/5] efi/arm: defer persistent reservations until after paging_init() Ard Biesheuvel 2018-11-14 17:55 ` [PATCH 5/5] efi: permit calling efi_mem_reserve_persistent from atomic context Ard Biesheuvel 2018-11-27 18:59 ` Jeremy Linton [this message] 2018-11-27 19:16 ` Ard Biesheuvel
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=a8346212-70cb-0bbb-9e29-e21fa2ee5040@arm.com \ --to=jeremy.linton@arm.com \ --cc=ard.biesheuvel@linaro.org \ --cc=linux-efi@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=mingo@kernel.org \ --cc=tglx@linutronix.de \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Linux-EFI Archive on lore.kernel.org Archives are clonable: git clone --mirror https://lore.kernel.org/linux-efi/0 linux-efi/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 linux-efi linux-efi/ https://lore.kernel.org/linux-efi \ linux-efi@vger.kernel.org public-inbox-index linux-efi Example config snippet for mirrors Newsgroup available over NNTP: nntp://nntp.lore.kernel.org/org.kernel.vger.linux-efi AGPL code for this site: git clone https://public-inbox.org/public-inbox.git