| Message ID | 20210529091313.16708-3-cfontana@suse.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Fixes for broken commit 48afe6e4eabf, Windows fails to boot | expand |
On Sat, May 29, 2021 at 11:13:13AM +0200, Claudio Fontana wrote: > This partially fixes host and max cpu initialization, > by running the accel cpu initialization only after all instance > init functions are called for all X86 cpu subclasses. Can you describe what exactly are the initialization ordering dependencies that were broken? > > Partial Fix. What does "partial fix" mean? > > Fixes: 48afe6e4eabf ("i386: split cpu accelerators from cpu.c, using AccelCPUClass") > Signed-off-by: Claudio Fontana <cfontana@suse.de> The fix looks simple and may be obvious, my only concerns are: 1. Testing. Luckily we are a bit early in the release cycle so we have some time for that. 2. Describing more clearly what exactly was wrong. This can be fixed manually in the commit message when applying the patch. An even better long term solution would be removing the initialization ordering dependencies and make accel_cpu_instance_init() safe to be called earlier. Would that be doable? > --- > target/i386/cpu.c | 10 +++++++--- > 1 file changed, 7 insertions(+), 3 deletions(-) > > diff --git a/target/i386/cpu.c b/target/i386/cpu.c > index 6bcb7dbc2c..ae148fbd2f 100644 > --- a/target/i386/cpu.c > +++ b/target/i386/cpu.c > @@ -6422,6 +6422,11 @@ static void x86_cpu_register_feature_bit_props(X86CPUClass *xcc, > x86_cpu_register_bit_prop(xcc, name, w, bitnr); > } > > +static void x86_cpu_post_initfn(Object *obj) > +{ > + accel_cpu_instance_init(CPU(obj)); > +} > + > static void x86_cpu_initfn(Object *obj) > { > X86CPU *cpu = X86_CPU(obj); > @@ -6473,9 +6478,6 @@ static void x86_cpu_initfn(Object *obj) > if (xcc->model) { > x86_cpu_load_model(cpu, xcc->model); > } > - > - /* if required, do accelerator-specific cpu initializations */ > - accel_cpu_instance_init(CPU(obj)); > } > > static int64_t x86_cpu_get_arch_id(CPUState *cs) > @@ -6810,6 +6812,8 @@ static const TypeInfo x86_cpu_type_info = { > .parent = TYPE_CPU, > .instance_size = sizeof(X86CPU), > .instance_init = x86_cpu_initfn, > + .instance_post_init = x86_cpu_post_initfn, > + > .abstract = true, > .class_size = sizeof(X86CPUClass), > .class_init = x86_cpu_common_class_init, > -- > 2.26.2 >
On 6/1/21 8:59 PM, Eduardo Habkost wrote: > On Sat, May 29, 2021 at 11:13:13AM +0200, Claudio Fontana wrote: >> This partially fixes host and max cpu initialization, >> by running the accel cpu initialization only after all instance >> init functions are called for all X86 cpu subclasses. > > Can you describe what exactly are the initialization ordering > dependencies that were broken? > >> >> Partial Fix. > > What does "partial fix" mean? Hi Eduardo, this is in response to the report that Windows + UEFI is not booting anymore: https://lists.gnu.org/archive/html/qemu-devel/2021-05/msg06692.html Probably "Partial Fix" does not make sense in the context of the commit log, as there the context of the overall issue is not present. > >> >> Fixes: 48afe6e4eabf ("i386: split cpu accelerators from cpu.c, using AccelCPUClass") >> Signed-off-by: Claudio Fontana <cfontana@suse.de> > > The fix looks simple and may be obvious, my only concerns are: > > 1. Testing. Luckily we are a bit early in the release cycle so > we have some time for that. Indeed, and unfortunately neither make check nor gitlab CI capture this issue. Smoke testing a boot with OVMF_VARS.secboot.fd does: ./build/x86_64-softmmu/qemu-system-x86_64 \ -cpu host \ -enable-kvm \ -name test,debug-threads=on \ -smp 1,threads=1,cores=1,sockets=1 \ -m 4G \ -net nic -net user \ -boot d,menu=on \ -usbdevice tablet \ -machine q35,smm=on \ -drive if=pflash,format=raw,readonly=on,unit=0,file="./OVMF_CODE.secboot.fd" \ -drive if=pflash,format=raw,unit=1,file="./OVMF_VARS.secboot.fd" \ -global ICH9-LPC.disable_s3=1 \ -global driver=cfi.pflash01,property=secure,value=on \ -cdrom "./Windows_Server_2016_Datacenter_EVAL_en-us_14393_refresh.ISO" \ -device ahci,id=ahci > 2. Describing more clearly what exactly was wrong. This can be > fixed manually in the commit message when applying the patch. > "max features" cpu models (cpu "max" and "host", which is child of "max") rely on the instance initialization code to set max_features = true; this is then checked during feature expansion to add features not explicitly set by the user. The original code in the instance initialization was performing different actions depending on the accelerator, with a fallback "else" that was used to set properties for TCG and all other accelerators not explicitly handled (KVM and HVF). My patch went on to split the code that was accelerator-specific, into kvm accel-cpu and hvf accel-cpu, to perform the accelerator-specific initializations there, for the case where cpu->max_features is true. However I inserted the call to the accel cpu initialization at the end of the x86 base class code initialization (x86_cpu_initfn). That was wrong, because the code in the accel cpu for KVM, for example, ends up being called _before_ the subclass ("max") initialization, so it has no chance to see "max_features = true", and so does not initialize the KVM properties. And further, since the subclass "max" code gets called after kvm-cpu accel, it goes on and writes defaults properties that were supposed to be overridden for the KVM specialization. > > An even better long term solution would be removing the > initialization ordering dependencies and make > accel_cpu_instance_init() safe to be called earlier. Would that > be doable? I think that the max_features mechanism would need to be reworked for that, currently I do not see how to make this doable with the existing way x86 is initialized and realized. If the post_init method works for everybody I personally think we should go with that, along with an improvement of our tests (make check + CI) to capture such problems specifically looking at cpu "max" and "host". Thanks, Claudio > > >> --- >> target/i386/cpu.c | 10 +++++++--- >> 1 file changed, 7 insertions(+), 3 deletions(-) >> >> diff --git a/target/i386/cpu.c b/target/i386/cpu.c >> index 6bcb7dbc2c..ae148fbd2f 100644 >> --- a/target/i386/cpu.c >> +++ b/target/i386/cpu.c >> @@ -6422,6 +6422,11 @@ static void x86_cpu_register_feature_bit_props(X86CPUClass *xcc, >> x86_cpu_register_bit_prop(xcc, name, w, bitnr); >> } >> >> +static void x86_cpu_post_initfn(Object *obj) >> +{ >> + accel_cpu_instance_init(CPU(obj)); >> +} >> + >> static void x86_cpu_initfn(Object *obj) >> { >> X86CPU *cpu = X86_CPU(obj); >> @@ -6473,9 +6478,6 @@ static void x86_cpu_initfn(Object *obj) >> if (xcc->model) { >> x86_cpu_load_model(cpu, xcc->model); >> } >> - >> - /* if required, do accelerator-specific cpu initializations */ >> - accel_cpu_instance_init(CPU(obj)); >> } >> >> static int64_t x86_cpu_get_arch_id(CPUState *cs) >> @@ -6810,6 +6812,8 @@ static const TypeInfo x86_cpu_type_info = { >> .parent = TYPE_CPU, >> .instance_size = sizeof(X86CPU), >> .instance_init = x86_cpu_initfn, >> + .instance_post_init = x86_cpu_post_initfn, >> + >> .abstract = true, >> .class_size = sizeof(X86CPUClass), >> .class_init = x86_cpu_common_class_init, >> -- >> 2.26.2 >> >
diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 6bcb7dbc2c..ae148fbd2f 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -6422,6 +6422,11 @@ static void x86_cpu_register_feature_bit_props(X86CPUClass *xcc, x86_cpu_register_bit_prop(xcc, name, w, bitnr); } +static void x86_cpu_post_initfn(Object *obj) +{ + accel_cpu_instance_init(CPU(obj)); +} + static void x86_cpu_initfn(Object *obj) { X86CPU *cpu = X86_CPU(obj); @@ -6473,9 +6478,6 @@ static void x86_cpu_initfn(Object *obj) if (xcc->model) { x86_cpu_load_model(cpu, xcc->model); } - - /* if required, do accelerator-specific cpu initializations */ - accel_cpu_instance_init(CPU(obj)); } static int64_t x86_cpu_get_arch_id(CPUState *cs) @@ -6810,6 +6812,8 @@ static const TypeInfo x86_cpu_type_info = { .parent = TYPE_CPU, .instance_size = sizeof(X86CPU), .instance_init = x86_cpu_initfn, + .instance_post_init = x86_cpu_post_initfn, + .abstract = true, .class_size = sizeof(X86CPUClass), .class_init = x86_cpu_common_class_init,
This partially fixes host and max cpu initialization, by running the accel cpu initialization only after all instance init functions are called for all X86 cpu subclasses. Partial Fix. Fixes: 48afe6e4eabf ("i386: split cpu accelerators from cpu.c, using AccelCPUClass") Signed-off-by: Claudio Fontana <cfontana@suse.de> --- target/i386/cpu.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)