purgatory: compile sha256.c only on ia64 with -O0
Subsystems (2)
PATCH 1/1 purgatory: compile sha256.c only on ia64 with -O0
If we have to compile sha256.c on ia64 with -O0 to produce sane code do it only on ia64.
This change makes executing a new kernel on my AMD geode CPU much faster. Without the patch "kexec -e" takes 27 seconds, with only 16.
--- purgatory/Makefile | 15 +-------------- purgatory/arch/ia64/Makefile | 3 +++ 2 files changed, 4 insertions(+), 14 deletions(-)
purgatory/Makefile +1 -14
@@ -16,16 +16,7 @@ PURGATORY_SRCS += purgatory/string.c dist += purgatory/Makefile $(PURGATORY_SRCS) \ purgatory/include/purgatory.h purgatory/include/string.h -include $(srcdir)/purgatory/arch/alpha/Makefile -include $(srcdir)/purgatory/arch/arm/Makefile -include $(srcdir)/purgatory/arch/i386/Makefile -include $(srcdir)/purgatory/arch/ia64/Makefile -include $(srcdir)/purgatory/arch/mips/Makefile -include $(srcdir)/purgatory/arch/ppc/Makefile -include $(srcdir)/purgatory/arch/ppc64/Makefile -include $(srcdir)/purgatory/arch/s390/Makefile -include $(srcdir)/purgatory/arch/sh/Makefile -include $(srcdir)/purgatory/arch/x86_64/Makefile +include $(srcdir)/purgatory/arch/$(ARCH)/Makefile PURGATORY_SRCS+=$($(ARCH)_PURGATORY_SRCS)
@@ -36,10 +27,6 @@ clean += $(PURGATORY_OBJS) $(PURGATORY_DEPS) $(PURGATORY) -include $(PURGATORY_DEPS) -# sha256.c needs to be compiled without optimization, else -# purgatory fails to execute on ia64. -purgatory/sha256.o: CFLAGS += -O0 - purgatory/sha256.o: $(srcdir)/util_lib/sha256.c mkdir -p $(@D) $(COMPILE.c) -o $@ $^
purgatory/arch/ia64/Makefile +3 -0
@@ -11,3 +11,6 @@ ia64_PURGATORY_EXTRA_CFLAGS = -ffixed-r28 dist += purgatory/arch/ia64/Makefile $(ia64_PURGATORY_SRCS) \ purgatory/arch/ia64/io.h purgatory/arch/ia64/purgatory-ia64.h +# sha256.c needs to be compiled without optimization, else +# purgatory fails to execute on ia64. +purgatory/sha256.o: ia64_PURGATORY_EXTRA_CFLAGS += -O0
Signature · 7 lines
1.8.1.4 _______________________________________________ kexec mailing list [email protected] http://lists.infradead.org/mailman/listinfo/kexec
Quoted 11 lines · Richard Weinberger
If we have to compile
sha256.con ia64 with -O0 to produce sane code do it only on ia64.This change makes executing a new kernel on my AMD geode CPU much faster. Without the patch "kexec -e" takes 27 seconds, with only 16.
Signed-off-by Richard Weinberger <[email protected]>--- purgatory/Makefile | 15 +-------------- purgatory/arch/ia64/Makefile | 3 +++ 2 files changed, 4 insertions(+), 14 deletions(-)
The fix is sound.
_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
Quoted 21 lines · Richard Weinberger
If we have to compile
sha256.con ia64 with -O0 to produce sane code do it only on ia64.This change makes executing a new kernel on my AMD geode CPU much faster. Without the patch "kexec -e" takes 27 seconds, with only 16.
Signed-off-by Richard Weinberger <[email protected]>--- purgatory/Makefile | 15 +-------------- purgatory/arch/ia64/Makefile | 3 +++ 2 files changed, 4 insertions(+), 14 deletions(-)purgatory/Makefile +0
-1@@ -16,16 +16,7 @@ PURGATORY_SRCS += purgatory/string.c dist += purgatory/Makefile $(PURGATORY_SRCS) \ purgatory/include/purgatory.h purgatory/include/string.h -include $(srcdir)/purgatory/arch/alpha/Makefile
purgatory/Makefile PURGATORY_SRCS += purgatory/string.c · line 19
Quoted 10 lines
purgatory/Makefile +1
-9-include $(srcdir)/purgatory/arch/arm/Makefile -include $(srcdir)/purgatory/arch/i386/Makefile -include $(srcdir)/purgatory/arch/ia64/Makefile -include $(srcdir)/purgatory/arch/mips/Makefile -include $(srcdir)/purgatory/arch/ppc/Makefile -include $(srcdir)/purgatory/arch/ppc64/Makefile -include $(srcdir)/purgatory/arch/s390/Makefile -include $(srcdir)/purgatory/arch/sh/Makefile -include $(srcdir)/purgatory/arch/x86_64/Makefile +include $(srcdir)/purgatory/arch/$(ARCH)/Makefile
I believe the above portion will break make dist my causing it to omit purgatory/arch/* other than purgatory/arch/$(ARCH)
Quoted 34 lines
purgatory/Makefile +0
-4PURGATORY_SRCS+=$($(ARCH)_PURGATORY_SRCS)@@ -36,10 +27,6 @@ clean += $(PURGATORY_OBJS) $(PURGATORY_DEPS) $(PURGATORY) -include $(PURGATORY_DEPS) -# sha256.c needs to be compiled without optimization, else -# purgatory fails to execute on ia64. -purgatory/sha256.o: CFLAGS += -O0 - purgatory/sha256.o: $(srcdir)/util_lib/sha256.c mkdir -p $(@D) $(COMPILE.c) -o $@ $^purgatory/arch/ia64/Makefile +3
-0@@ -11,3 +11,6 @@ ia64_PURGATORY_EXTRA_CFLAGS = -ffixed-r28 dist += purgatory/arch/ia64/Makefile $(ia64_PURGATORY_SRCS) \ purgatory/arch/ia64/io.h purgatory/arch/ia64/purgatory-ia64.h +# sha256.c needs to be compiled without optimization, else +# purgatory fails to execute on ia64. +purgatory/sha256.o: ia64_PURGATORY_EXTRA_CFLAGS += -O0Signature · 7 lines
1.8.1.4 _______________________________________________ kexec mailing list [email protected] http://lists.infradead.org/mailman/listinfo/kexec
_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
Quoted 21 lines · Simon Horman
Quoted 20 lines · Richard Weinberger
If we have to compile
sha256.con ia64 with -O0 to produce sane code do it only on ia64.This change makes executing a new kernel on my AMD geode CPU much faster. Without the patch "kexec -e" takes 27 seconds, with only 16.
Signed-off-by Richard Weinberger <[email protected]>--- purgatory/Makefile | 15 +-------------- purgatory/arch/ia64/Makefile | 3 +++ 2 files changed, 4 insertions(+), 14 deletions(-)purgatory/Makefile +0
-0@@ -16,16 +16,7 @@ PURGATORY_SRCS += purgatory/string.c dist += purgatory/Makefile $(PURGATORY_SRCS) \ purgatory/include/purgatory.h purgatory/include/string.h
Quoted 15 lines
purgatory/Makefile PURGATORY_SRCS += purgatory/string.c · line 19
Quoted 11 lines
purgatory/Makefile +1
-10-include $(srcdir)/purgatory/arch/alpha/Makefile -include $(srcdir)/purgatory/arch/arm/Makefile -include $(srcdir)/purgatory/arch/i386/Makefile -include $(srcdir)/purgatory/arch/ia64/Makefile -include $(srcdir)/purgatory/arch/mips/Makefile -include $(srcdir)/purgatory/arch/ppc/Makefile -include $(srcdir)/purgatory/arch/ppc64/Makefile -include $(srcdir)/purgatory/arch/s390/Makefile -include $(srcdir)/purgatory/arch/sh/Makefile -include $(srcdir)/purgatory/arch/x86_64/Makefile +include $(srcdir)/purgatory/arch/$(ARCH)/MakefileI believe the above portion will break make dist my causing it to omit purgatory/arch/* other than purgatory/arch/$(ARCH)
Ah, I've missed this in my review, too.
Other than this, the change about purgatory/sha256.o below looks sound, right?
Thanks
Zhang
Quoted 30 lines
Quoted 30 lines
purgatory/Makefile +0
-4PURGATORY_SRCS+=$($(ARCH)_PURGATORY_SRCS)@@ -36,10 +27,6 @@ clean += $(PURGATORY_OBJS) $(PURGATORY_DEPS) $(PURGATORY) -include $(PURGATORY_DEPS) -# sha256.c needs to be compiled without optimization, else -# purgatory fails to execute on ia64. -purgatory/sha256.o: CFLAGS += -O0 - purgatory/sha256.o: $(srcdir)/util_lib/sha256.c mkdir -p $(@D) $(COMPILE.c) -o $@ $^purgatory/arch/ia64/Makefile +3
-0@@ -11,3 +11,6 @@ ia64_PURGATORY_EXTRA_CFLAGS = -ffixed-r28 dist += purgatory/arch/ia64/Makefile $(ia64_PURGATORY_SRCS) \ purgatory/arch/ia64/io.h purgatory/arch/ia64/purgatory-ia64.h +# sha256.c needs to be compiled without optimization, else +# purgatory fails to execute on ia64. +purgatory/sha256.o: ia64_PURGATORY_EXTRA_CFLAGS += -O0Signature · 1 line
1.8.1.4
Quoted 11 lines
Quoted 5 lines
_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
Simon, Zhang,
Am 01.04.2013 07:16, schrieb Zhang Yanfei:
Quoted 8 lines
Quoted 3 lines
I believe the above portion will break make dist my causing it to omit purgatory/arch/* other than purgatory/arch/$(ARCH)
Ah, I've missed this in my review, too.
Other than this, the change about
purgatory/sha256.obelow looks sound, right?
The dist mechanism is quite strange and error prone. Why can't you just use git archive in the $(TARBALL) target? I'll happily send a patch...
Back to the purgatory/sha256.o issue, I did some more tests. First I thought memcpy() within purgatory is slow, but it isn't. Does kexec reset the CPU so some kind of legacy mode during purgatory? It looks like the same code in sha256.o is fast in normal user space but very slow during purgatory.
Computing sha256 of a 9MiB blob takes less than a second in user space and 16 seconds (with my patch). Otherwise it takes > 25 seconds.
Thanks,
//richard
_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec