Hi Alex,
On 25/05/16 16:09, Alex Shi wrote:
Thanks a lot for your info! I did the backporting on lsk branch: git://git.linaro.org/kernel/linux-linaro-stable.git v4.1/topic/hibernate or https://git.linaro.org/kernel/linux-linaro-stable.git/shortlog/refs/heads/v4...
which has 142 commits, include 20 conflicts. most of them are just skip some missed commits contents. and I tried to give reasons for other complex conflicts fix.
I merged it into linux-linaro-lsk-v4.1-test branch which booted on my x86 qemu.
Would you like to give a review for that branch? or do a testing if it's trouble you much.
I gave this branch a spin through the tests I did on Juno, all of which worked fine.
A quick look at the tree shows you are missing:
c612505f8605 ("arm64: kvm: Fix kvm teardown for systems using the extended idmap")
Which fixes a hyp-panic on Seattle with 4K/39 caused by "arm64: kvm: allows kvm cpu hotplug". We didn't find this until after Will had picked the patches, (hence the gap in the git log).
I received the build-warning below[3] ... hibernate didn't touch this code, and I can't remember if its 'normal' for v4.1.
BTW, During the painful backporting I do think your previous version should be better to avoid much commits introductions. Does you previous version are just base kernel change? or some new ideas from community? Honestly, I have a bit regret for not taking Mark's suggestion on this.
The details are in the cover letter of each version of the series [0].
The hyp-gone stuff was based on Marc Zyngier's feedback, a fix for this was needed as it causes problems when reboot() races with guests being scheduled.(original report at [1]). The other recent change was to the kvm->hyp register use, which is shared with the hyp-stub, again this was based on review feedback [2]. These two probably generated most of the backport difficulties as they both touch kvm, which has seen a lot of changes since v4.1. The same patches would also be required for kexec.
Thanks,
James
[0] http://www.spinics.net/lists/arm-kernel/msg500824.html [1] http://lists.infradead.org/pipermail/kexec/2015-December/014932.html [2] http://lists.infradead.org/pipermail/kexec/2016-March/015595.html [3] Build warnings from v4.1/topic/hibernate: ---------------------%<--------------------- In file included from arch/arm64/kvm/hyp/vgic-v3-sr.c:19:0: include/linux/irqchip/arm-gic-v3.h:390:14: warning: ‘struct device_node’ declared inside parameter list struct irq_domain *domain); ^ include/linux/irqchip/arm-gic-v3.h:390:14: warning: its scope is only this definition or declaration, which is probably not what you want ---------------------%<---------------------