Commit fc3a1fd7 authored by Dr. David Alan Gilbert's avatar Dr. David Alan Gilbert Committed by Paolo Bonzini
Browse files

x86: Work around SMI migration breakages 



Migration from a 2.3.0 qemu results in a reboot on the receiving QEMU
due to a disagreement about SM (System management) interrupts.

2.3.0 didn't have much SMI support, but it did set CPU_INTERRUPT_SMI
and this gets into the migration stream, but on 2.3.0 it
never got delivered.

~2.4.0 SMI interrupt support was added but was broken - so
that when a 2.3.0 stream was received it cleared the CPU_INTERRUPT_SMI
but never actually caused an interrupt.

The SMI delivery was recently fixed by 68c6efe0, but the
effect now is that an incoming 2.3.0 stream takes the interrupt it
had flagged but it's bios can't actually handle it(I think
partly due to the original interrupt not being taken during boot?).
The consequence is a triple(?) fault and a reboot.

Tested from:
  2.3.1 -M 2.3.0
  2.7.0 -M 2.3.0
  2.8.0 -M 2.3.0
  2.8.0 -M 2.8.0

This corresponds to RH bugzilla entry 1420679.

Signed-off-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
Message-Id: <20170223133441.16010-1-dgilbert@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent f20e6f8c

include/hw/i386/pc.h

+4 −0
Original line number Diff line number Diff line
@@ -623,6 +623,10 @@ bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *); 
        .driver   = "Broadwell-noTSX" "-" TYPE_X86_CPU,\

        .property = "xlevel",\

        .value    = stringify(0x8000000a),\

    },{\

        .driver = TYPE_X86_CPU,\

        .property = "kvm-no-smi-migration",\

        .value    = "on",\

    },



#define PC_COMPAT_2_2 \

target/i386/cpu.c

+2 −0
Original line number Diff line number Diff line
@@ -3983,6 +3983,8 @@ static Property x86_cpu_properties[] = { 
    DEFINE_PROP_BOOL("cpuid-0xb", X86CPU, enable_cpuid_0xb, true),

    DEFINE_PROP_BOOL("lmce", X86CPU, enable_lmce, false),

    DEFINE_PROP_BOOL("l3-cache", X86CPU, enable_l3_cache, true),

    DEFINE_PROP_BOOL("kvm-no-smi-migration", X86CPU, kvm_no_smi_migration,

                     false),

    DEFINE_PROP_BOOL("vmware-cpuid-freq", X86CPU, vmware_cpuid_freq, true),

    DEFINE_PROP_END_OF_LIST()

};

target/i386/cpu.h

+3 −0
Original line number Diff line number Diff line
@@ -1255,6 +1255,9 @@ struct X86CPU { 
    /* if true override the phys_bits value with a value read from the host */

    bool host_phys_bits;



    /* Stop SMI delivery for migration compatibility with old machines */

    bool kvm_no_smi_migration;



    /* Number of physical address bits supported */

    uint32_t phys_bits;

target/i386/kvm.c

+6 −1
Original line number Diff line number Diff line
@@ -2492,8 +2492,13 @@ static int kvm_put_vcpu_events(X86CPU *cpu, int level) 
            events.smi.pending = 0;

            events.smi.latched_init = 0;

        }

        /* Stop SMI delivery on old machine types to avoid a reboot

         * on an inward migration of an old VM.

         */

        if (!cpu->kvm_no_smi_migration) {

            events.flags |= KVM_VCPUEVENT_VALID_SMM;

        }

    }



    if (level >= KVM_PUT_RESET_STATE) {

        events.flags |=