From patchwork Tue Nov 20 19:16:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 10691159 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 86A0014BD for ; Tue, 20 Nov 2018 19:18:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 663752A7F4 for ; Tue, 20 Nov 2018 19:18:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 573CE2A9DF; Tue, 20 Nov 2018 19:18:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.6 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B34ED2A7F4 for ; Tue, 20 Nov 2018 19:18:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=nb/yqwJsF/m/G3uLvABaIjrPSch05+62J/KWSJ1q7yE=; b=M4g tyWnV82HpbNaOFp53xddU4pzQ0Pck3Zucl7y+SKdV2g9iF1IjNlcYV3ICYfsWeiFMU3LKHe/ATMez //lbHX/tyzHOEIJaD3YUCaEsdYJtVxH7IJxhCqAefze1SQ8l4b8K5NrvLIfPqdD4s5hUbUUgqorkE GN4rAIO3SJXw8e1PsN/jJKKHjYNaHLK8io93PqE+3je5uTAw+/YvHOZ5VjGAiJ9IiyluNTPOJJGos o5CUCO2iaOQJ6ry8eckVU0MgpspjaRJRZ8XV/nfEQzsnSTLmcuZeliOYTOJIO+fZBuKxi61PvbKvX +QWGNRWTZHQSEZ6nMivi2OjOYdArNYw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gPBX8-0001es-RQ; Tue, 20 Nov 2018 19:18:02 +0000 Received: from mail-ed1-f67.google.com ([209.85.208.67]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gPBX1-0001QI-UK for linux-arm-kernel@lists.infradead.org; Tue, 20 Nov 2018 19:18:00 +0000 Received: by mail-ed1-f67.google.com with SMTP id h50so2901037ede.5 for ; Tue, 20 Nov 2018 11:17:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=uccvkBgiBgMWg+wRsgVoOX/QRDRZoIfKZEK3tlNIlYk=; b=Rgzqp1ctsTIi68m+JerU2mHUYZk927BS7/hTDT2BhPDEvlTMBGK9l7USyf8xeEsR2f Sz2P74FleVTtUcou3g83Jd081bMXTfmEctCaeMnKhUUcR+YglVGhPGSHFeKdtet84BS9 qTJzqbTe53WM0usBYShU2CZ4mlmdezHier1kE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=uccvkBgiBgMWg+wRsgVoOX/QRDRZoIfKZEK3tlNIlYk=; b=R5s/3Z1F5YQMWoOKDAx+s7AdjYoHcUZZYy6yXtxIkjQNn49erOMR2DdiOFRc83O7Xd xsWbdWpRcRwqUHngcEjZQ1xCLR05cNle8JdkVlvA3bF1LNe8YTGkkpMz1IakRxuIu8yT v5DRJIPekQCFTcC6pTSy0UauyFBK9hTfcH9LeW0Jo+g93HuwrGjopUQVM3yC4Ckq5Qhj iTRu5BDHCP5Z6CEJ/h8uHL8V/l6hSWh56BBy0aliGatwTYdyLyKCgA5WUb7gQ4z9Jm9M fqBhXmj4JKi4coWfHNfapFe/NRhCEogpj8CfD2W4J1gRnh1pucnEZUKAX6Z6tq2LK2+2 GUAA== X-Gm-Message-State: AGRZ1gKKLLMB68PlFkGmOu9K0gyh8j70tEjf0h31mqb16K+WGZg7f8Ys l6F5Px4NOne69Vq+68Vxc/x7Zw== X-Google-Smtp-Source: AJdET5dIuuDvPH17SSgvWZ1zhPruY7yU5Vi8tLJZr4p849xf5P7IQYXXgBWGsbN7qlHVQFDc+/Hbbw== X-Received: by 2002:a17:906:7692:: with SMTP id o18-v6mr2864760ejm.63.1542741400654; Tue, 20 Nov 2018 11:16:40 -0800 (PST) Received: from mba13.wifi.ns.nl (dhcp-077-251-017-237.chello.nl. [77.251.17.237]) by smtp.gmail.com with ESMTPSA id l18sm40184edq.87.2018.11.20.11.16.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Nov 2018 11:16:39 -0800 (PST) From: Ard Biesheuvel To: linux-efi@vger.kernel.org Subject: [RFT PATCH v2] efi: map memreserve table before first use Date: Tue, 20 Nov 2018 20:16:34 +0100 Message-Id: <20181120191634.7376-1-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181120_111756_895337_DADCC68B X-CRM114-Status: GOOD ( 14.24 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: marc.zyngier@arm.com, john.garry@huawei.com, Ard Biesheuvel , linux-arm-kernel@lists.infradead.org, Jan.Glauber@cavium.com MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Mapping the MEMRESERVE EFI configuration table from an early initcall is too late: the GICv3 ITS code that creates persistent reservations for the boot CPU's LPI tables is invoked from init_IRQ(), which runs much earlier than the handling of the initcalls. So instead, move the initialization performed by the initcall into efi_mem_reserve_persistent() itself, but keep the initcall as well so that the init is guaranteed to have been called before SMP boot. Signed-off-by: Ard Biesheuvel --- drivers/firmware/efi/efi.c | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c index fad7c62cfc0e..0e2d52a0c50e 100644 --- a/drivers/firmware/efi/efi.c +++ b/drivers/firmware/efi/efi.c @@ -969,13 +969,33 @@ 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) +static int __init efi_memreserve_map_root(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 (WARN_ON_ONCE(!efi_memreserve_root)) + return -ENOMEM; + return 0; +} + +int __ref efi_mem_reserve_persistent(phys_addr_t addr, u64 size) { struct linux_efi_memreserve *rsv; + int rc; - if (!efi_memreserve_root) + if (efi_memreserve_root == (void *)ULONG_MAX) return -ENODEV; + if (!efi_memreserve_root) { + rc = efi_memreserve_map_root(); + if (rc) + return rc; + } + rsv = kmalloc(sizeof(*rsv), GFP_ATOMIC); if (!rsv) return -ENOMEM; @@ -993,14 +1013,12 @@ int efi_mem_reserve_persistent(phys_addr_t addr, u64 size) static int __init efi_memreserve_root_init(void) { - if (efi.mem_reserve == EFI_INVALID_TABLE_ADDR) - return -ENODEV; + if (efi_memreserve_root) + return 0; - efi_memreserve_root = memremap(efi.mem_reserve, - sizeof(*efi_memreserve_root), - MEMREMAP_WB); + efi_memreserve_map_root(); if (!efi_memreserve_root) - return -ENOMEM; + efi_memreserve_root = (void *)ULONG_MAX; return 0; } early_initcall(efi_memreserve_root_init);