From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1euF0F-0006hM-IK for kexec@lists.infradead.org; Fri, 09 Mar 2018 10:12:27 +0000 Received: from pps.filterd (m0098394.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w29A9Tgm054190 for ; Fri, 9 Mar 2018 05:11:43 -0500 Received: from e06smtp15.uk.ibm.com (e06smtp15.uk.ibm.com [195.75.94.111]) by mx0a-001b2d01.pphosted.com with ESMTP id 2gkn2n7h59-1 (version=TLSv1.2 cipher=AES256-SHA256 bits=256 verify=NOT) for ; Fri, 09 Mar 2018 05:11:43 -0500 Received: from localhost by e06smtp15.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 9 Mar 2018 10:11:41 -0000 Date: Fri, 9 Mar 2018 11:11:34 +0100 From: Philipp Rudo Subject: Re: [PATCH 11/11] kexec_file: Move purgatories sha256 to common code In-Reply-To: <20180309044353.GC3246@dhcp-128-65.nay.redhat.com> References: <20180226151620.20970-1-prudo@linux.vnet.ibm.com> <20180226151620.20970-12-prudo@linux.vnet.ibm.com> <20180309044353.GC3246@dhcp-128-65.nay.redhat.com> MIME-Version: 1.0 Message-Id: <20180309111134.6854a2a5@ThinkPad> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "kexec" Errors-To: kexec-bounces+dwmw2=infradead.org@lists.infradead.org To: Dave Young Cc: linux-s390@vger.kernel.org, Heiko Carstens , AKASHI Takahiro , Michael Ellerman , x86@kernel.org, kexec@lists.infradead.org, linux-kernel@vger.kernel.org, Martin Schwidefsky , Eric Biederman , Thiago Jung Bauermann , Andrew Morton , Vivek Goyal Hi Dave, On Fri, 9 Mar 2018 12:43:53 +0800 Dave Young wrote: > On 02/26/18 at 04:16pm, Philipp Rudo wrote: > > The code to verify the new kernels sha digest are applicable for all > > architectures. Move it to common code. > > > > Signed-off-by: Philipp Rudo > > --- > > arch/x86/purgatory/Makefile | 3 +++ > > arch/x86/purgatory/purgatory.c | 2 +- > > {arch/x86/purgatory => include/linux}/sha256.h | 10 +++++++++- > > {arch/x86/purgatory => lib}/sha256.c | 4 ++-- > > 4 files changed, 15 insertions(+), 4 deletions(-) > > rename {arch/x86/purgatory => include/linux}/sha256.h (63%) > > rename {arch/x86/purgatory => lib}/sha256.c (99%) > > > > diff --git a/arch/x86/purgatory/Makefile b/arch/x86/purgatory/Makefile > > index 2f15a2ac4209..414eed6b5065 100644 > > --- a/arch/x86/purgatory/Makefile > > +++ b/arch/x86/purgatory/Makefile > > @@ -6,6 +6,9 @@ purgatory-y := purgatory.o stack.o setup-x86_$(BITS).o sha256.o entry64.o string > > targets += $(purgatory-y) > > PURGATORY_OBJS = $(addprefix $(obj)/,$(purgatory-y)) > > > > +$(obj)/sha256.o: $(srctree)/lib/sha256.c > > + $(call if_changed_rule,cc_o_c) > > + > > LDFLAGS_purgatory.ro := -e purgatory_start -r --no-undefined -nostdlib -z nodefaultlib > > targets += purgatory.ro > > > > diff --git a/arch/x86/purgatory/purgatory.c b/arch/x86/purgatory/purgatory.c > > index 470edad96bb9..025c34ac0d84 100644 > > --- a/arch/x86/purgatory/purgatory.c > > +++ b/arch/x86/purgatory/purgatory.c > > @@ -11,9 +11,9 @@ > > */ > > > > #include > > +#include > > #include > > > > -#include "sha256.h" > > #include "../boot/string.h" > > > > unsigned long purgatory_backup_dest __section(.kexec-purgatory); > > diff --git a/arch/x86/purgatory/sha256.h b/include/linux/sha256.h > > similarity index 63% > > rename from arch/x86/purgatory/sha256.h > > rename to include/linux/sha256.h > > index 2867d9825a57..43a20ac33688 100644 > > --- a/arch/x86/purgatory/sha256.h > > +++ b/include/linux/sha256.h > > @@ -13,9 +13,17 @@ > > #include > > #include > > > > +/* Stand-alone implementation of the SHA256 algorithm. It is designed to > > + * have as little dependencies as possible so it can be used in the > > + * kexec_file purgatory. In other cases you should use the implementation in > > + * crypto/. > > + * > > + * For details see lib/sha256.c > > + */ > > should move to use preferred comment format: > /* > * Stand-alone ... > * ... > */ Fixed it. > > + > > extern int sha256_init(struct sha256_state *sctx); > > extern int sha256_update(struct sha256_state *sctx, const u8 *input, > > - unsigned int length); > > + unsigned int length); > > extern int sha256_final(struct sha256_state *sctx, u8 *hash); > > > > #endif /* SHA256_H */ > > diff --git a/arch/x86/purgatory/sha256.c b/lib/sha256.c > > similarity index 99% > > rename from arch/x86/purgatory/sha256.c > > rename to lib/sha256.c > > index 548ca675a14a..4400c832e2aa 100644 > > --- a/arch/x86/purgatory/sha256.c > > +++ b/lib/sha256.c > > @@ -16,9 +16,9 @@ > > */ > > > > #include > > +#include > > +#include > > #include > > -#include "sha256.h" > > -#include "../boot/string.h" > > Hmm, I'm not sure if moving to linux/string.h will have some side > effects.. Hmm, according to your other mail you are right. I'll have a closer look at it. Thanks Philipp > > > > static inline u32 Ch(u32 x, u32 y, u32 z) > > { > > -- > > 2.13.5 > > > > Thanks > Dave > _______________________________________________ kexec mailing list kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec