From: Mimi Zohar <zohar@linux.ibm.com>
To: Lakshmi Ramasubramanian <nramas@linux.microsoft.com>,
bauerman@linux.ibm.com, robh@kernel.org,
gregkh@linuxfoundation.org, james.morse@arm.com,
catalin.marinas@arm.com, sashal@kernel.org, will@kernel.org,
mpe@ellerman.id.au, benh@kernel.crashing.org, paulus@samba.org,
robh+dt@kernel.org, frowand.list@gmail.com,
vincenzo.frascino@arm.com, mark.rutland@arm.com,
dmitry.kasatkin@gmail.com, jmorris@namei.org, serge@hallyn.com,
pasha.tatashin@soleen.com, allison@lohutok.net,
kstewart@linuxfoundation.org, takahiro.akashi@linaro.org,
tglx@linutronix.de, masahiroy@kernel.org, bhsharma@redhat.com,
mbrugger@suse.com, hsinyi@chromium.org, tao.li@vivo.com,
christophe.leroy@c-s.fr
Cc: linux-integrity@vger.kernel.org, linux-kernel@vger.kernel.org,
devicetree@vger.kernel.org, prsriva@linux.microsoft.com,
balajib@linux.microsoft.com
Subject: Re: [PATCH v9 7/8] arm64: Store IMA log information in kimage used for kexec
Date: Tue, 01 Dec 2020 06:39:04 -0500 [thread overview]
Message-ID: <f0ac42878a713b270f7bad22d44f61739d582db8.camel@linux.ibm.com> (raw)
In-Reply-To: <20201113192243.1993-8-nramas@linux.microsoft.com>
On Fri, 2020-11-13 at 11:22 -0800, Lakshmi Ramasubramanian wrote:
> Address and size of the buffer containing the IMA measurement log need
> to be passed from the current kernel to the next kernel on kexec.
>
> Add address and size fields to "struct kimage_arch" for ARM64 platform
> to hold the address and size of the IMA measurement log buffer.
> Define an architecture specific function for ARM64 namely
> arch_ima_add_kexec_buffer() that will set the address and size of
> the current kernel's IMA buffer to be passed to the next kernel on kexec.
>
> Co-developed-by: Prakhar Srivastava <prsriva@linux.microsoft.com>
> Signed-off-by: Prakhar Srivastava <prsriva@linux.microsoft.com>
> Signed-off-by: Lakshmi Ramasubramanian <nramas@linux.microsoft.com>
> Reviewed-by: Thiago Jung Bauermann <bauerman@linux.ibm.com>
> ---
> arch/arm64/include/asm/ima.h | 18 ++++++++++++++++++
> arch/arm64/include/asm/kexec.h | 3 +++
> arch/arm64/kernel/Makefile | 1 +
> arch/arm64/kernel/ima_kexec.c | 34 ++++++++++++++++++++++++++++++++++
> 4 files changed, 56 insertions(+)
> create mode 100644 arch/arm64/include/asm/ima.h
> create mode 100644 arch/arm64/kernel/ima_kexec.c
>
> diff --git a/arch/arm64/include/asm/ima.h b/arch/arm64/include/asm/ima.h
> new file mode 100644
> index 000000000000..507fc94ddaba
> --- /dev/null
> +++ b/arch/arm64/include/asm/ima.h
> @@ -0,0 +1,18 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
> +/*
> + * Copyright (C) 2019 Microsoft Corporation
> + *
> + * Author: Prakhar Srivastava <prsriva@linux.microsoft.com>
> + *
> + */
> +#ifndef _ASM_ARCH_IMA_H
> +#define _ASM_ARCH_IMA_H
> +
> +struct kimage;
> +
> +#ifdef CONFIG_IMA_KEXEC
> +int arch_ima_add_kexec_buffer(struct kimage *image, unsigned long load_addr,
> + size_t size);
> +#endif /* CONFIG_IMA_KEXEC */
> +
> +#endif /* _ASM_ARCH_IMA_H */
> diff --git a/arch/arm64/include/asm/kexec.h b/arch/arm64/include/asm/kexec.h
> index d24b527e8c00..7bd60c185ad3 100644
> --- a/arch/arm64/include/asm/kexec.h
> +++ b/arch/arm64/include/asm/kexec.h
> @@ -100,6 +100,9 @@ struct kimage_arch {
> void *elf_headers;
> unsigned long elf_headers_mem;
> unsigned long elf_headers_sz;
> +
> + phys_addr_t ima_buffer_addr;
> + size_t ima_buffer_size;
> };
Any reason these definitions are not conditionally defined based on
CONFIG_IMA_KEXEC, like on powerpc?
>
> diff --git a/arch/arm64/kernel/ima_kexec.c b/arch/arm64/kernel/ima_kexec.c
> new file mode 100644
> index 000000000000..1847f1230710
> --- /dev/null
> +++ b/arch/arm64/kernel/ima_kexec.c
> @@ -0,0 +1,34 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
> +/*
> + * Copyright (C) 2019 Microsoft Corporation
> + *
> + * Author: Prakhar Srivastava <prsriva@linux.microsoft.com>
> + *
> + * File: ima_kexec.c
> + * Defines IMA kexec functions.
> + */
> +
> +#include <linux/kernel.h>
> +#include <linux/kexec.h>
> +#include <linux/types.h>
> +#include <asm/ima.h>
> +
> +/**
> + * arch_ima_add_kexec_buffer - do arch-specific steps to add the IMA buffer
> + *
> + * @image: kimage structure to set ima buffer information in for kexec
> + * @load_addr: Start address of the IMA buffer
> + * @size: size of the IMA buffer
> + *
> + * Architectures should use this function to pass on the IMA buffer
> + * information to the next kernel.
> + *
> + * Return: 0 on success, negative errno on error.
> + */
> +int arch_ima_add_kexec_buffer(struct kimage *image, unsigned long load_addr,
> + size_t size)
> +{
> + image->arch.ima_buffer_addr = load_addr;
> + image->arch.ima_buffer_size = size;
> + return 0;
> +}
This is exactly the same as the powerpc version. Couldn't there be a
common version of this as well?
Mimi
next prev parent reply other threads:[~2020-12-01 11:40 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-13 19:22 [PATCH v9 0/8] Carry forward IMA measurement log on kexec on ARM64 Lakshmi Ramasubramanian
2020-11-13 19:22 ` [PATCH v9 1/8] powerpc: fix compiler warnings and errors Lakshmi Ramasubramanian
2020-12-01 3:16 ` Mimi Zohar
2020-11-13 19:22 ` [PATCH v9 2/8] powerpc: Move delete_fdt_mem_rsv() to drivers/of Lakshmi Ramasubramanian
2020-11-13 19:22 ` [PATCH v9 3/8] ima: Define get_ima_kexec_buffer() in drivers/of Lakshmi Ramasubramanian
2020-12-01 11:37 ` Mimi Zohar
2020-12-01 19:01 ` Lakshmi Ramasubramanian
2020-11-13 19:22 ` [PATCH v9 4/8] powerpc: Use get_ima_kexec_buffer to get ima kexec buffer Lakshmi Ramasubramanian
2020-11-13 19:22 ` [PATCH v9 5/8] powerpc: Move remove_ima_buffer() to drivers/of Lakshmi Ramasubramanian
2020-11-13 19:22 ` [PATCH v9 6/8] powerpc: Move ima_get_kexec_buffer() and ima_free_kexec_buffer() to ima Lakshmi Ramasubramanian
2020-12-01 11:38 ` Mimi Zohar
2020-12-01 19:05 ` Lakshmi Ramasubramanian
2020-11-13 19:22 ` [PATCH v9 7/8] arm64: Store IMA log information in kimage used for kexec Lakshmi Ramasubramanian
2020-12-01 11:39 ` Mimi Zohar [this message]
2020-12-01 19:08 ` Lakshmi Ramasubramanian
2020-11-13 19:22 ` [PATCH v9 8/8] arm64: Add IMA kexec buffer to DTB Lakshmi Ramasubramanian
2020-11-21 13:57 ` [PATCH v9 0/8] Carry forward IMA measurement log on kexec on ARM64 Rob Herring
2020-11-21 14:38 ` Lakshmi Ramasubramanian
2020-11-21 19:47 ` Lakshmi Ramasubramanian
2020-12-01 11:34 ` Mimi Zohar
2020-12-01 19:10 ` Lakshmi Ramasubramanian
2020-12-01 19:15 ` Mimi Zohar
2020-12-02 2:25 ` Lakshmi Ramasubramanian
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=f0ac42878a713b270f7bad22d44f61739d582db8.camel@linux.ibm.com \
--to=zohar@linux.ibm.com \
--cc=allison@lohutok.net \
--cc=balajib@linux.microsoft.com \
--cc=bauerman@linux.ibm.com \
--cc=benh@kernel.crashing.org \
--cc=bhsharma@redhat.com \
--cc=catalin.marinas@arm.com \
--cc=christophe.leroy@c-s.fr \
--cc=devicetree@vger.kernel.org \
--cc=dmitry.kasatkin@gmail.com \
--cc=frowand.list@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=hsinyi@chromium.org \
--cc=james.morse@arm.com \
--cc=jmorris@namei.org \
--cc=kstewart@linuxfoundation.org \
--cc=linux-integrity@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=masahiroy@kernel.org \
--cc=mbrugger@suse.com \
--cc=mpe@ellerman.id.au \
--cc=nramas@linux.microsoft.com \
--cc=pasha.tatashin@soleen.com \
--cc=paulus@samba.org \
--cc=prsriva@linux.microsoft.com \
--cc=robh+dt@kernel.org \
--cc=robh@kernel.org \
--cc=sashal@kernel.org \
--cc=serge@hallyn.com \
--cc=takahiro.akashi@linaro.org \
--cc=tao.li@vivo.com \
--cc=tglx@linutronix.de \
--cc=vincenzo.frascino@arm.com \
--cc=will@kernel.org \
/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).