From patchwork Wed Feb 20 09:32:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dann frazier X-Patchwork-Id: 1045229 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 444C801xMdz9s5R; Wed, 20 Feb 2019 20:33:04 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1gwOFP-00014z-J2; Wed, 20 Feb 2019 09:32:59 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1gwOFM-00012h-DA for kernel-team@lists.ubuntu.com; Wed, 20 Feb 2019 09:32:56 +0000 Received: from mail-wr1-f69.google.com ([209.85.221.69]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1gwOFL-0000zr-VR for kernel-team@lists.ubuntu.com; Wed, 20 Feb 2019 09:32:56 +0000 Received: by mail-wr1-f69.google.com with SMTP id e14so10191588wrt.12 for ; Wed, 20 Feb 2019 01:32:55 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=GMrsDSUbsPveB8lnfw9+jo/weEyuBDDcaC/1uPDjAJ8=; b=OSiysumRHBTg0w2/B+10VGsCEkhZP4CIoOgEHnMVD0kNpX4r8m28pR5A/KHinRYRaA QszHxsOXeNGC0Zd3Fmwgq7GIQGJQf6IgM3XhEzy7xLPj/ZUBjKmOjcFomXaMAk5yHmIQ fKRGwZ4/zZxdxD6j18hElxQlltXtfDrGN1nlGtR/Pa0T+WhUedsrhnCUw+41f7wP5fTU ukZkMQVxAd25+CvsXvxLKCHETXkC7LCDjH/P7AuUgDOjzWCVNbk93cgS9PqPAyW1RzUu 3Bh+pBQcz8DjMTBO9OknJt433T6TPeb30TWa/bivqdC2QOjO1f80VJV1jn7bTk9oulGs w0gg== X-Gm-Message-State: AHQUAuaucYo5oWMjF81qkjeI7dIXysjPXG/rgcOuKga0pJb3lNxGuuUH YnIi3t64kJo5IlZrXUp+lXLAdR7jBPnpOeRrTYYXoR2/iFOMKYVmCqM69XiH7onmG6U4AtMT262 gCPmCiy2clfjkq2qGsreUoUChta6pkdQeAQfpV66eBA== X-Received: by 2002:adf:edca:: with SMTP id v10mr22845275wro.313.1550655175309; Wed, 20 Feb 2019 01:32:55 -0800 (PST) X-Google-Smtp-Source: AHgI3IaoEMLTEwdr4M8xzdXSBdRKQmN14aATxppNrHtHBbWlmNY+K7XKK1Fv9eDRCY6eBhAmWJwPdw== X-Received: by 2002:adf:edca:: with SMTP id v10mr22845263wro.313.1550655174953; Wed, 20 Feb 2019 01:32:54 -0800 (PST) Received: from xps13.canonical.com ([194.204.107.10]) by smtp.gmail.com with ESMTPSA id h13sm26400196wrs.42.2019.02.20.01.32.53 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 20 Feb 2019 01:32:54 -0800 (PST) From: dann frazier To: kernel-team@lists.ubuntu.com Subject: [PATCH 4/4][SRU Cosmic] efi/arm: Revert "Defer persistent reservations until after paging_init()" Date: Wed, 20 Feb 2019 10:32:36 +0100 Message-Id: <20190220093236.30296-5-dann.frazier@canonical.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190220093236.30296-1-dann.frazier@canonical.com> References: <20190220093236.30296-1-dann.frazier@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Ard Biesheuvel BugLink: https://bugs.launchpad.net/bugs/1816425 This reverts commit eff896288872d687d9662000ec9ae11b6d61766f, which deferred the processing of persistent memory reservations to a point where the memory may have already been allocated and overwritten, defeating the purpose. Signed-off-by: Ard Biesheuvel Acked-by: Will Deacon Cc: Linus Torvalds Cc: Marc Zyngier Cc: Mike Rapoport Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: linux-arm-kernel@lists.infradead.org Cc: linux-efi@vger.kernel.org Link: http://lkml.kernel.org/r/20190215123333.21209-3-ard.biesheuvel@linaro.org Signed-off-by: Ingo Molnar (backported from commit 582a32e708823e5957fd73ccd78dc4a9e49d21ea) [dannf: Minor offset adjustments in efi.h] Signed-off-by: dann frazier --- arch/arm64/kernel/setup.c | 1 - drivers/firmware/efi/efi.c | 4 ---- drivers/firmware/efi/libstub/arm-stub.c | 3 --- include/linux/efi.h | 7 ------- 4 files changed, 15 deletions(-) diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c index ca32a884bc7d4..952c2b1268822 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c @@ -327,7 +327,6 @@ void __init setup_arch(char **cmdline_p) arm64_memblock_init(); paging_init(); - efi_apply_persistent_mem_reservations(); acpi_table_upgrade(); diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c index 4ee1e5c13029e..989e8a208dfb6 100644 --- a/drivers/firmware/efi/efi.c +++ b/drivers/firmware/efi/efi.c @@ -584,11 +584,7 @@ int __init efi_config_parse_tables(void *config_tables, int count, int sz, early_memunmap(tbl, sizeof(*tbl)); } - return 0; -} -int __init efi_apply_persistent_mem_reservations(void) -{ if (efi.mem_reserve != EFI_INVALID_TABLE_ADDR) { unsigned long prsv = efi.mem_reserve; diff --git a/drivers/firmware/efi/libstub/arm-stub.c b/drivers/firmware/efi/libstub/arm-stub.c index e30c26f572c25..60f202e57a607 100644 --- a/drivers/firmware/efi/libstub/arm-stub.c +++ b/drivers/firmware/efi/libstub/arm-stub.c @@ -100,9 +100,6 @@ void install_memreserve_table(efi_system_table_t *sys_table_arg) efi_guid_t memreserve_table_guid = LINUX_EFI_MEMRESERVE_TABLE_GUID; efi_status_t status; - if (IS_ENABLED(CONFIG_ARM)) - return; - status = efi_call_early(allocate_pool, EFI_LOADER_DATA, sizeof(*rsv), (void **)&rsv); if (status != EFI_SUCCESS) { diff --git a/include/linux/efi.h b/include/linux/efi.h index 2290aa9380c56..ae2a65ea6017f 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h @@ -1204,8 +1204,6 @@ extern void efi_reboot(enum reboot_mode reboot_mode, const char *__unused); extern bool efi_is_table_address(unsigned long phys_addr); extern void __init efi_set_secure_boot(enum efi_secureboot_mode mode); - -extern int efi_apply_persistent_mem_reservations(void); #else static inline bool efi_enabled(int feature) { @@ -1225,11 +1223,6 @@ static inline bool efi_is_table_address(unsigned long phys_addr) return false; } static inline void efi_set_secure_boot(enum efi_secureboot_mode mode) {} - -static inline int efi_apply_persistent_mem_reservations(void) -{ - return 0; -} #endif extern int efi_status_to_err(efi_status_t status);