From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-24.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1,USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 005C7C2BBD4 for ; Thu, 17 Dec 2020 18:30:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AB650238E8 for ; Thu, 17 Dec 2020 18:30:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731162AbgLQSaO (ORCPT ); Thu, 17 Dec 2020 13:30:14 -0500 Received: from linux.microsoft.com ([13.77.154.182]:58442 "EHLO linux.microsoft.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728180AbgLQSaL (ORCPT ); Thu, 17 Dec 2020 13:30:11 -0500 Received: from [192.168.0.104] (c-73-42-176-67.hsd1.wa.comcast.net [73.42.176.67]) by linux.microsoft.com (Postfix) with ESMTPSA id 0B6E620B717A; Thu, 17 Dec 2020 10:29:30 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 0B6E620B717A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1608229770; bh=GwfRqRu08UdwXtSUpS9V9mnLcj+rN1xicTZ0lOWPifs=; h=Subject:From:To:Cc:References:Date:In-Reply-To:From; b=Va0dDR8fH6oIFQsOLK4t9CSVal0ebVldzlYKaF7CNl2rfSNuhHp17P7L9q01f261u ndOKIA66Pku3uWcsP9bumD5l/vEPT5t84v9tJgalSnBXq07ovsz6mNNVBpHAlebueH OnT27wrw3DIoXQZ+LKgduXrjhaB6Jh/00eMCC+Fs= Subject: Re: [PATCH v12 1/4] powerpc: Use fdt_appendprop_addrrange() to add ima buffer to FDT From: Lakshmi Ramasubramanian To: zohar@linux.ibm.com, bauerman@linux.ibm.com, robh@kernel.org, takahiro.akashi@linaro.org, gregkh@linuxfoundation.org, will@kernel.org, catalin.marinas@arm.com, mpe@ellerman.id.au Cc: james.morse@arm.com, sashal@kernel.org, benh@kernel.crashing.org, paulus@samba.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, masahiroy@kernel.org, bhsharma@redhat.com, mbrugger@suse.com, hsinyi@chromium.org, tao.li@vivo.com, christophe.leroy@c-s.fr, prsriva@linux.microsoft.com, balajib@linux.microsoft.com, linux-integrity@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org References: <20201217173708.6940-1-nramas@linux.microsoft.com> <20201217173708.6940-2-nramas@linux.microsoft.com> Message-ID: <37a62c46-cb43-0e71-ee79-8c497a11e159@linux.microsoft.com> Date: Thu, 17 Dec 2020 10:29:29 -0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <20201217173708.6940-2-nramas@linux.microsoft.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org On 12/17/20 9:37 AM, Lakshmi Ramasubramanian wrote: > fdt_appendprop_addrrange() function adds a property, with the given name, > to the device tree at the given node offset, and also sets the address > and size of the property. This function should be used to add > "linux,ima-kexec-buffer" property to the device tree and set the address > and size of the IMA measurement buffer, instead of using custom function. > Typo in the email address of James Morse (ARM.com). Sorry about that. Adding the correct email address. -lakshmi > Use fdt_appendprop_addrrange() to add "linux,ima-kexec-buffer" property > to the device tree. This property holds the address and size of > the IMA measurement buffer that needs to be passed from the current > kernel to the next kernel across kexec system call. > > Remove custom code that is used in setup_ima_buffer() to add > "linux,ima-kexec-buffer" property to the device tree. > > Signed-off-by: Lakshmi Ramasubramanian > --- > arch/powerpc/kexec/ima.c | 51 ++++++---------------------------------- > 1 file changed, 7 insertions(+), 44 deletions(-) > > diff --git a/arch/powerpc/kexec/ima.c b/arch/powerpc/kexec/ima.c > index 720e50e490b6..d579d3da4715 100644 > --- a/arch/powerpc/kexec/ima.c > +++ b/arch/powerpc/kexec/ima.c > @@ -11,6 +11,7 @@ > #include > #include > #include > +#include > > static int get_addr_size_cells(int *addr_cells, int *size_cells) > { > @@ -145,27 +146,6 @@ int arch_ima_add_kexec_buffer(struct kimage *image, unsigned long load_addr, > return 0; > } > > -static int write_number(void *p, u64 value, int cells) > -{ > - if (cells == 1) { > - u32 tmp; > - > - if (value > U32_MAX) > - return -EINVAL; > - > - tmp = cpu_to_be32(value); > - memcpy(p, &tmp, sizeof(tmp)); > - } else if (cells == 2) { > - u64 tmp; > - > - tmp = cpu_to_be64(value); > - memcpy(p, &tmp, sizeof(tmp)); > - } else > - return -EINVAL; > - > - return 0; > -} > - > /** > * setup_ima_buffer - add IMA buffer information to the fdt > * @image: kexec image being loaded. > @@ -176,35 +156,18 @@ static int write_number(void *p, u64 value, int cells) > */ > int setup_ima_buffer(const struct kimage *image, void *fdt, int chosen_node) > { > - int ret, addr_cells, size_cells, entry_size; > - u8 value[16]; > + int ret; > > remove_ima_buffer(fdt, chosen_node); > if (!image->arch.ima_buffer_size) > return 0; > > - ret = get_addr_size_cells(&addr_cells, &size_cells); > + ret = fdt_appendprop_addrrange(fdt, 0, chosen_node, > + "linux,ima-kexec-buffer", > + image->arch.ima_buffer_addr, > + image->arch.ima_buffer_size); > if (ret) > - return ret; > - > - entry_size = 4 * (addr_cells + size_cells); > - > - if (entry_size > sizeof(value)) > - return -EINVAL; > - > - ret = write_number(value, image->arch.ima_buffer_addr, addr_cells); > - if (ret) > - return ret; > - > - ret = write_number(value + 4 * addr_cells, image->arch.ima_buffer_size, > - size_cells); > - if (ret) > - return ret; > - > - ret = fdt_setprop(fdt, chosen_node, "linux,ima-kexec-buffer", value, > - entry_size); > - if (ret < 0) > - return -EINVAL; > + return (ret == -FDT_ERR_NOSPACE ? -ENOMEM : -EINVAL); > > ret = fdt_add_mem_rsv(fdt, image->arch.ima_buffer_addr, > image->arch.ima_buffer_size); >