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=ham 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 62466C4361B for ; Wed, 16 Dec 2020 16:59:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1101F22DBF for ; Wed, 16 Dec 2020 16:59:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726901AbgLPQ6n (ORCPT ); Wed, 16 Dec 2020 11:58:43 -0500 Received: from linux.microsoft.com ([13.77.154.182]:51890 "EHLO linux.microsoft.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726745AbgLPQ6n (ORCPT ); Wed, 16 Dec 2020 11:58:43 -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 D8A2820B717A; Wed, 16 Dec 2020 08:58:00 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com D8A2820B717A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1608137881; bh=D7IeDQSLrMQalbqHtiNQWaTnbkIyUfEAlM97NWNMyc8=; h=Subject:To:Cc:References:From:Date:In-Reply-To:From; b=RQ4AeGq80q4TfLyhbvpIM28amv3LOW2hqkZrRtHYepCacrCmpTFo5lZyxpyHWCDIy Ez9h00a151IsBDnEXcz+esu18ZpQBy8FAiEq2d0pqemkwkSBmfPwu+FzysDWTsxNss fFZixRgup2LH0lIW3/ENv8OTQTJqcaX+VYtrsTa8= Subject: Re: [PATCH v11 2/8] powerpc: Move ima buffer functions to drivers/of/kexec.c To: Rob Herring Cc: zohar@linux.ibm.com, bauerman@linux.ibm.com, takahiro.akashi@linaro.org, gregkh@linuxfoundation.org, will@kernel.org, catalin.marinas@arm.com, mpe@ellerman.id.au, 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: <20201214191854.9050-1-nramas@linux.microsoft.com> <20201214191854.9050-3-nramas@linux.microsoft.com> <20201215181601.GA4105316@robh.at.kernel.org> From: Lakshmi Ramasubramanian Message-ID: Date: Wed, 16 Dec 2020 08:58:00 -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: <20201215181601.GA4105316@robh.at.kernel.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 12/15/20 10:16 AM, Rob Herring wrote: > On Mon, Dec 14, 2020 at 11:18:48AM -0800, Lakshmi Ramasubramanian wrote: >> The functions do_get_kexec_buffer() and get_addr_size_cells(), >> defined in arch/powerpc/kexec/ima.c, retrieve the address and size >> of the given property from the device tree blob. These functions do >> not have architecture specific code, but are currently limited to >> powerpc. do_get_kexec_buffer() correctly handles a device tree property >> that is a child node of the root node, but not anything other than >> the immediate root child nodes. >> >> Move architecture independent functions get_ima_kexec_buffer() and >> get_root_addr_size_cells() to "drivers/of/kexec.c". These functions >> retrieve the chosen node "linux,ima-kexec-buffer" from the device tree, >> and return the address and size of the buffer used for carrying forward >> the IMA measurement log across kexec system call. >> >> Co-developed-by: Prakhar Srivastava >> Signed-off-by: Prakhar Srivastava >> Signed-off-by: Lakshmi Ramasubramanian >> --- >> drivers/of/kexec.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++ >> include/linux/of.h | 3 ++ >> 2 files changed, 71 insertions(+) >> >> diff --git a/drivers/of/kexec.c b/drivers/of/kexec.c >> index 66787be081fe..9af5371340b1 100644 >> --- a/drivers/of/kexec.c >> +++ b/drivers/of/kexec.c >> @@ -30,6 +30,10 @@ >> /** >> * fdt_find_and_del_mem_rsv - delete memory reservation with given address and size >> * >> + * @fdt: Flattened Device Tree to update >> + * @start: Starting address of the reservation to delete >> + * @size: Size of the reservation to delete >> + * > > This belongs in the patch adding fdt_find_and_del_mem_rsv. Yes. > >> * Return: 0 on success, or negative errno on error. >> */ >> static int fdt_find_and_del_mem_rsv(void *fdt, unsigned long start, unsigned long size) >> @@ -226,3 +230,67 @@ int of_kexec_setup_new_fdt(const struct kimage *image, void *fdt, >> >> return 0; >> } >> + >> +/** >> + * get_root_addr_size_cells - Get address and size of root node >> + * >> + * @addr_cells: Return address of the root node >> + * @size_cells: Return size of the root node >> + * >> + * Return: 0 on success, or negative errno on error. >> + */ >> +int get_root_addr_size_cells(int *addr_cells, int *size_cells) >> +{ >> + struct device_node *root; >> + >> + root = of_find_node_by_path("/"); >> + if (!root) >> + return -EINVAL; >> + >> + *addr_cells = of_n_addr_cells(root); >> + *size_cells = of_n_size_cells(root); >> + >> + of_node_put(root); >> + >> + return 0; >> +} >> + >> +/** >> + * get_ima_kexec_buffer - Get address and size of IMA kexec buffer >> + * >> + * @fdt: Flattened Device Tree >> + * @chosen_node: Offset of chosen node in the FDT >> + * @addr: Return address of the node >> + * @size: Return size of the node >> + * >> + * Return: 0 on success, or negative errno on error. >> + */ >> +int get_ima_kexec_buffer(void *fdt, int chosen_node, >> + unsigned long *addr, size_t *size) >> +{ >> + const void *prop; >> + int addr_cells, size_cells, prop_len; >> + int rc; >> + >> + rc = get_root_addr_size_cells(&addr_cells, &size_cells); >> + if (rc) >> + return rc; >> + >> + if (fdt) >> + prop = fdt_getprop(fdt, chosen_node, >> + "linux,ima-kexec-buffer", &prop_len); >> + else >> + prop = of_get_property(of_chosen, >> + "linux,ima-kexec-buffer", &prop_len); > > This is an odd structure. The DT APIs are generally of_foo() for > unflattened tree and of_flat_foo() for FDT. > Ok - will update. >> + >> + if (!prop) >> + return -ENOENT; >> + >> + if (prop_len < 4 * (addr_cells + size_cells)) >> + return -EINVAL; >> + >> + *addr = of_read_number(prop, addr_cells); >> + *size = of_read_number(prop + 4 * addr_cells, size_cells); >> + >> + return 0; >> +} >> diff --git a/include/linux/of.h b/include/linux/of.h >> index 3375f5295875..fb2ef274135d 100644 >> --- a/include/linux/of.h >> +++ b/include/linux/of.h >> @@ -562,6 +562,9 @@ struct kimage; >> int of_kexec_setup_new_fdt(const struct kimage *image, void *fdt, >> unsigned long initrd_load_addr, unsigned long initrd_len, >> const char *cmdline); >> +int get_root_addr_size_cells(int *addr_cells, int *size_cells); >> +int get_ima_kexec_buffer(void *fdt, int chosen_node, >> + unsigned long *addr, size_t *size); > > The whole point of moving code out of arch code was to avoid all these > cross tree calls. > > I was expecting the next step to be moving setup_ima_buffer() call into > of_kexec_setup_new_fdt with all the code in powerpc/kexec/ima.c moved > here. Then the end result to enable on arm64 is just selecting > HAVE_IMA_KEXEC and adding fields to kimage_arch. > setup_ima_buffer() implemented for powerpc can be simplified by using fdt_appendprop_addrrange() to add the IMA buffer's address and size to "linux,ima-kexec-buffer" node. With that change, setup_ima_buffer() can be moved into of_kexec_setup_new_fdt along with all the code in powerpc/kexec/ima.c to drivers'of/kexec.c I'll make the above change and post the next version shortly. thanks, -lakshmi 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=-15.3 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 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 4F787C4361B for ; Wed, 16 Dec 2020 16:59:32 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id F2A6022EBF for ; Wed, 16 Dec 2020 16:59:31 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F2A6022EBF Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.microsoft.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Type: Content-Transfer-Encoding:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date:Message-ID:From: References:To:Subject:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=e0QjeAH2UobSm33t1v4X15pzSYMwLHB9wfUnnNFLLbU=; b=SLeFAjc0+KqkvQnrTkfIr5+kp iS+TF8RQppC1etyQzCo7av2+RveFarTTDgyLyeTCRGEkKME04MUZtUxn4KDzw52cLPv89kl554JZc FmRSvDB96ry/msEajvnrPIGUzvLR4cOaJjL8Ss0iA/MacYZpFh7aSKvYffjbTfkW4nDmQPusf2Aad +N1miK18HpMC2u5foF+I2spuTCp8nBardMzYnadNyYxv5hkp2xRjLrFfpMx+e3prCL+Cp+aZoiaqs 6UKzTfbLL/G0NYmWlpbeEFdgcCtOgnCt24ZNEnC0s4R5FiMRGVKadC84cLcqkreRsILwZIyPBwWU0 PQUvf1XAQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kpa7r-0005ji-Gs; Wed, 16 Dec 2020 16:58:07 +0000 Received: from linux.microsoft.com ([13.77.154.182]) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kpa7n-0005iI-SZ for linux-arm-kernel@lists.infradead.org; Wed, 16 Dec 2020 16:58:05 +0000 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 D8A2820B717A; Wed, 16 Dec 2020 08:58:00 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com D8A2820B717A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1608137881; bh=D7IeDQSLrMQalbqHtiNQWaTnbkIyUfEAlM97NWNMyc8=; h=Subject:To:Cc:References:From:Date:In-Reply-To:From; b=RQ4AeGq80q4TfLyhbvpIM28amv3LOW2hqkZrRtHYepCacrCmpTFo5lZyxpyHWCDIy Ez9h00a151IsBDnEXcz+esu18ZpQBy8FAiEq2d0pqemkwkSBmfPwu+FzysDWTsxNss fFZixRgup2LH0lIW3/ENv8OTQTJqcaX+VYtrsTa8= Subject: Re: [PATCH v11 2/8] powerpc: Move ima buffer functions to drivers/of/kexec.c To: Rob Herring References: <20201214191854.9050-1-nramas@linux.microsoft.com> <20201214191854.9050-3-nramas@linux.microsoft.com> <20201215181601.GA4105316@robh.at.kernel.org> From: Lakshmi Ramasubramanian Message-ID: Date: Wed, 16 Dec 2020 08:58:00 -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: <20201215181601.GA4105316@robh.at.kernel.org> Content-Language: en-US X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201216_115804_171626_FC7EBEA6 X-CRM114-Status: GOOD ( 27.08 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mark.rutland@arm.com, benh@kernel.crashing.org, bhsharma@redhat.com, tao.li@vivo.com, zohar@linux.ibm.com, paulus@samba.org, vincenzo.frascino@arm.com, frowand.list@gmail.com, sashal@kernel.org, mpe@ellerman.id.au, masahiroy@kernel.org, jmorris@namei.org, takahiro.akashi@linaro.org, linux-arm-kernel@lists.infradead.org, catalin.marinas@arm.com, serge@hallyn.com, devicetree@vger.kernel.org, pasha.tatashin@soleen.com, will@kernel.org, prsriva@linux.microsoft.com, hsinyi@chromium.org, allison@lohutok.net, christophe.leroy@c-s.fr, mbrugger@suse.com, balajib@linux.microsoft.com, dmitry.kasatkin@gmail.com, linux-kernel@vger.kernel.org, james.morse@arm.com, gregkh@linuxfoundation.org, linux-integrity@vger.kernel.org, bauerman@linux.ibm.com Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 12/15/20 10:16 AM, Rob Herring wrote: > On Mon, Dec 14, 2020 at 11:18:48AM -0800, Lakshmi Ramasubramanian wrote: >> The functions do_get_kexec_buffer() and get_addr_size_cells(), >> defined in arch/powerpc/kexec/ima.c, retrieve the address and size >> of the given property from the device tree blob. These functions do >> not have architecture specific code, but are currently limited to >> powerpc. do_get_kexec_buffer() correctly handles a device tree property >> that is a child node of the root node, but not anything other than >> the immediate root child nodes. >> >> Move architecture independent functions get_ima_kexec_buffer() and >> get_root_addr_size_cells() to "drivers/of/kexec.c". These functions >> retrieve the chosen node "linux,ima-kexec-buffer" from the device tree, >> and return the address and size of the buffer used for carrying forward >> the IMA measurement log across kexec system call. >> >> Co-developed-by: Prakhar Srivastava >> Signed-off-by: Prakhar Srivastava >> Signed-off-by: Lakshmi Ramasubramanian >> --- >> drivers/of/kexec.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++ >> include/linux/of.h | 3 ++ >> 2 files changed, 71 insertions(+) >> >> diff --git a/drivers/of/kexec.c b/drivers/of/kexec.c >> index 66787be081fe..9af5371340b1 100644 >> --- a/drivers/of/kexec.c >> +++ b/drivers/of/kexec.c >> @@ -30,6 +30,10 @@ >> /** >> * fdt_find_and_del_mem_rsv - delete memory reservation with given address and size >> * >> + * @fdt: Flattened Device Tree to update >> + * @start: Starting address of the reservation to delete >> + * @size: Size of the reservation to delete >> + * > > This belongs in the patch adding fdt_find_and_del_mem_rsv. Yes. > >> * Return: 0 on success, or negative errno on error. >> */ >> static int fdt_find_and_del_mem_rsv(void *fdt, unsigned long start, unsigned long size) >> @@ -226,3 +230,67 @@ int of_kexec_setup_new_fdt(const struct kimage *image, void *fdt, >> >> return 0; >> } >> + >> +/** >> + * get_root_addr_size_cells - Get address and size of root node >> + * >> + * @addr_cells: Return address of the root node >> + * @size_cells: Return size of the root node >> + * >> + * Return: 0 on success, or negative errno on error. >> + */ >> +int get_root_addr_size_cells(int *addr_cells, int *size_cells) >> +{ >> + struct device_node *root; >> + >> + root = of_find_node_by_path("/"); >> + if (!root) >> + return -EINVAL; >> + >> + *addr_cells = of_n_addr_cells(root); >> + *size_cells = of_n_size_cells(root); >> + >> + of_node_put(root); >> + >> + return 0; >> +} >> + >> +/** >> + * get_ima_kexec_buffer - Get address and size of IMA kexec buffer >> + * >> + * @fdt: Flattened Device Tree >> + * @chosen_node: Offset of chosen node in the FDT >> + * @addr: Return address of the node >> + * @size: Return size of the node >> + * >> + * Return: 0 on success, or negative errno on error. >> + */ >> +int get_ima_kexec_buffer(void *fdt, int chosen_node, >> + unsigned long *addr, size_t *size) >> +{ >> + const void *prop; >> + int addr_cells, size_cells, prop_len; >> + int rc; >> + >> + rc = get_root_addr_size_cells(&addr_cells, &size_cells); >> + if (rc) >> + return rc; >> + >> + if (fdt) >> + prop = fdt_getprop(fdt, chosen_node, >> + "linux,ima-kexec-buffer", &prop_len); >> + else >> + prop = of_get_property(of_chosen, >> + "linux,ima-kexec-buffer", &prop_len); > > This is an odd structure. The DT APIs are generally of_foo() for > unflattened tree and of_flat_foo() for FDT. > Ok - will update. >> + >> + if (!prop) >> + return -ENOENT; >> + >> + if (prop_len < 4 * (addr_cells + size_cells)) >> + return -EINVAL; >> + >> + *addr = of_read_number(prop, addr_cells); >> + *size = of_read_number(prop + 4 * addr_cells, size_cells); >> + >> + return 0; >> +} >> diff --git a/include/linux/of.h b/include/linux/of.h >> index 3375f5295875..fb2ef274135d 100644 >> --- a/include/linux/of.h >> +++ b/include/linux/of.h >> @@ -562,6 +562,9 @@ struct kimage; >> int of_kexec_setup_new_fdt(const struct kimage *image, void *fdt, >> unsigned long initrd_load_addr, unsigned long initrd_len, >> const char *cmdline); >> +int get_root_addr_size_cells(int *addr_cells, int *size_cells); >> +int get_ima_kexec_buffer(void *fdt, int chosen_node, >> + unsigned long *addr, size_t *size); > > The whole point of moving code out of arch code was to avoid all these > cross tree calls. > > I was expecting the next step to be moving setup_ima_buffer() call into > of_kexec_setup_new_fdt with all the code in powerpc/kexec/ima.c moved > here. Then the end result to enable on arm64 is just selecting > HAVE_IMA_KEXEC and adding fields to kimage_arch. > setup_ima_buffer() implemented for powerpc can be simplified by using fdt_appendprop_addrrange() to add the IMA buffer's address and size to "linux,ima-kexec-buffer" node. With that change, setup_ima_buffer() can be moved into of_kexec_setup_new_fdt along with all the code in powerpc/kexec/ima.c to drivers'of/kexec.c I'll make the above change and post the next version shortly. thanks, -lakshmi _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel