Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 9451D6084A
From:   Tyler Baicar <tbaicar@codeaurora.org>
To:     ard.biesheuvel@linaro.org, linux-efi@vger.kernel.org,
        linux-kernel@vger.kernel.org, jhugo@codeaurora.org,
        sgoel@codeaurora.org, takahiro.akashi@linaro.org,
        timur@codeaurora.org
Cc:     Tyler Baicar <tbaicar@codeaurora.org>
Subject: [PATCH 2/2] efi/esrt: mark ESRT memory region as nomap
Date:   Fri, 23 Feb 2018 12:42:33 -0700
Message-Id: <1519414953-5478-3-git-send-email-tbaicar@codeaurora.org>
In-Reply-To: <1519414953-5478-1-git-send-email-tbaicar@codeaurora.org>
References: <1519414953-5478-1-git-send-email-tbaicar@codeaurora.org>
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

The ESRT memory region is being exposed as System RAM in /proc/iomem
which is wrong because it cannot be overwritten. This memory is needed
for kexec kernels in order to properly initialize ESRT, so if it is
overwritten it will cause ESRT failures in the kexec kernel. Mark this
region as nomap so that it is not overwritten.

Signed-off-by: Tyler Baicar <tbaicar@codeaurora.org>
Tested-by: Jeffrey Hugo <jhugo@codeaurora.org>
---
 drivers/firmware/efi/esrt.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/drivers/firmware/efi/esrt.c b/drivers/firmware/efi/esrt.c
index 504f3c3..f5f79c7 100644
--- a/drivers/firmware/efi/esrt.c
+++ b/drivers/firmware/efi/esrt.c
@@ -335,6 +335,14 @@ void __init efi_esrt_init(void)
 	pr_info("Reserving ESRT space from %pa to %pa.\n", &esrt_data, &end);
 	efi_mem_reserve(esrt_data, esrt_data_size);
 
+	/*
+	 * Mark the ESRT memory region as nomap to avoid it being exposed as
+	 * System RAM in /proc/iomem. Otherwise this block can be overwritten
+	 * which will then cause failures in kexec'd kernels since the ESRT
+	 * information is no longer there.
+	 */
+	memblock_mark_nomap(esrt_data, esrt_data_size);
+
 	pr_debug("esrt-init: loaded.\n");
 err_memunmap:
 	early_memunmap(va, size);
-- 
Qualcomm Datacenter Technologies, Inc. as an affiliate of Qualcomm Technologies, Inc.
Qualcomm Technologies, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project.