From: Stefan Berger <stefanb@linux.ibm.com>
To: mpe@ellerman.id.au, linux-integrity@vger.kernel.org,
linuxppc-dev@lists.ozlabs.org
Cc: devicetree@vger.kernel.org, rnsastry@linux.ibm.com,
jsnitsel@redhat.com, linux-kernel@vger.kernel.org,
jarkko@kernel.org, peterhuewe@gmx.de, viparash@in.ibm.com,
Stefan Berger <stefanb@linux.ibm.com>
Subject: [RFC PATCH v2 1/3] powerpc/prom_init: Replace linux,sml-base/sml-size with linux,sml-log
Date: Mon, 11 Mar 2024 09:20:28 -0400 [thread overview]
Message-ID: <20240311132030.1103122-2-stefanb@linux.ibm.com> (raw)
In-Reply-To: <20240311132030.1103122-1-stefanb@linux.ibm.com>
linux,sml-base holds the address of a buffer with the TPM log. This
buffer may become invalid after a kexec. To avoid accessing an invalid
address or corrupted buffer, embed the whole TPM log in the device tree
property linux,sml-log. This helps to protect the log since it is
properly carried across a kexec soft reboot with both of the kexec
syscalls.
Avoid having the firmware ingest the whole TPM log when calling
prom_setprop but only create the linux,sml-log property as a place holder.
Insert the actual TPM log during the tree flattening phase.
Fixes: 4a727429abec ("PPC64: Add support for instantiating SML from Open Firmware")
Suggested-by: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
---
arch/powerpc/kernel/prom_init.c | 27 +++++++++++++++++++--------
1 file changed, 19 insertions(+), 8 deletions(-)
diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c
index e67effdba85c..6f7ca72013c2 100644
--- a/arch/powerpc/kernel/prom_init.c
+++ b/arch/powerpc/kernel/prom_init.c
@@ -211,6 +211,8 @@ static cell_t __prombss regbuf[1024];
static bool __prombss rtas_has_query_cpu_stopped;
+static u64 __prombss sml_base;
+static u32 __prombss sml_size;
/*
* Error results ... some OF calls will return "-1" on error, some
@@ -1954,17 +1956,15 @@ static void __init prom_instantiate_sml(void)
}
prom_printf(" done\n");
- reserve_mem(base, size);
-
- prom_setprop(ibmvtpm_node, "/vdevice/vtpm", "linux,sml-base",
- &base, sizeof(base));
- prom_setprop(ibmvtpm_node, "/vdevice/vtpm", "linux,sml-size",
- &size, sizeof(size));
-
- prom_debug("sml base = 0x%llx\n", base);
+ /* Add property now, defer adding log to tree flattening phase */
+ prom_setprop(ibmvtpm_node, "/vdevice/vtpm", "linux,sml-log",
+ NULL, 0);
prom_debug("sml size = 0x%x\n", size);
prom_debug("prom_instantiate_sml: end...\n");
+
+ sml_base = base;
+ sml_size = size;
}
/*
@@ -2645,6 +2645,17 @@ static void __init scan_dt_build_struct(phandle node, unsigned long *mem_start,
}
prev_name = sstart + soff;
+ if (!prom_strcmp("linux,sml-log", pname)) {
+ /* push property head */
+ dt_push_token(OF_DT_PROP, mem_start, mem_end);
+ dt_push_token(sml_size, mem_start, mem_end);
+ dt_push_token(soff, mem_start, mem_end);
+ /* push property content */
+ valp = make_room(mem_start, mem_end, sml_size, 1);
+ memcpy(valp, (void *)sml_base, sml_size);
+ *mem_start = ALIGN(*mem_start, 4);
+ continue;
+ }
/* get length */
l = call_prom("getproplen", 2, 1, node, pname);
--
2.43.0
next prev parent reply other threads:[~2024-03-11 13:22 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-11 13:20 [RFC PATCH v2 0/3] Preserve TPM log across kexec Stefan Berger
2024-03-11 13:20 ` Stefan Berger [this message]
2024-03-11 17:24 ` [RFC PATCH v2 1/3] powerpc/prom_init: Replace linux,sml-base/sml-size with linux,sml-log Christophe Leroy
2024-03-11 19:10 ` Stefan Berger
2024-03-11 17:47 ` Jerry Snitselaar
2024-03-11 20:21 ` Jarkko Sakkinen
2024-03-11 13:20 ` [RFC PATCH v2 2/3] dt-bindings: tpm: Add linux,sml-log to ibm,vtpm.yaml Stefan Berger
2024-03-12 11:11 ` Lukas Wunner
2024-03-12 14:12 ` Stefan Berger
2024-03-12 15:52 ` Jarkko Sakkinen
2024-03-11 13:20 ` [RFC PATCH v2 3/3] tpm: of: If available use linux,sml-log to get the log and its size Stefan Berger
2024-03-11 20:25 ` Jarkko Sakkinen
2024-03-11 20:33 ` Stefan Berger
2024-03-12 15:43 ` Jarkko Sakkinen
2024-03-12 19:37 ` Stefan Berger
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=20240311132030.1103122-2-stefanb@linux.ibm.com \
--to=stefanb@linux.ibm.com \
--cc=devicetree@vger.kernel.org \
--cc=jarkko@kernel.org \
--cc=jsnitsel@redhat.com \
--cc=linux-integrity@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mpe@ellerman.id.au \
--cc=peterhuewe@gmx.de \
--cc=rnsastry@linux.ibm.com \
--cc=viparash@in.ibm.com \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).