From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751246AbeCIKLp (ORCPT ); Fri, 9 Mar 2018 05:11:45 -0500 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:37676 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751226AbeCIKLo (ORCPT ); Fri, 9 Mar 2018 05:11:44 -0500 Date: Fri, 9 Mar 2018 11:11:34 +0100 From: Philipp Rudo To: Dave Young Cc: kexec@lists.infradead.org, linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org, Eric Biederman , Vivek Goyal , Michael Ellerman , Thiago Jung Bauermann , Martin Schwidefsky , Heiko Carstens , Andrew Morton , x86@kernel.org, AKASHI Takahiro 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> Organization: IBM X-Mailer: Claws Mail 3.13.2 (GTK+ 2.24.30; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TM-AS-GCONF: 00 x-cbid: 18030910-0020-0000-0000-00000400B032 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18030910-0021-0000-0000-00004294F8A8 Message-Id: <20180309111134.6854a2a5@ThinkPad> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2018-03-09_05:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 impostorscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1709140000 definitions=main-1803090131 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 >