Commit ecb85fe4 authored by Paolo Bonzini's avatar Paolo Bonzini Committed by Eduardo Habkost
Browse files

target/i386: Disable MPX support on named CPU models 



MPX support is being phased out by Intel; GCC has dropped it, Linux
is also going to do that.  Even though KVM will have special code
to support MPX after the kernel proper stops enabling it in XCR0,
we probably also want to deprecate that in a few years.  As a start,
do not enable it by default for any named CPU model starting with
the 4.0 machine types; this include Skylake, Icelake and Cascadelake.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Message-Id: <20181220121100.21554-1-pbonzini@redhat.com>
Reviewed-by: default avatar&nbsp; Wainer dos Santos Moschetta <wainersm@redhat.com>
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent 483c6ad4

hw/i386/pc.c

+7 −0
Original line number Diff line number Diff line
@@ -115,6 +115,13 @@ GlobalProperty pc_compat_3_1[] = { 
    { "Opteron_G3" "-" TYPE_X86_CPU, "rdtscp", "off" },

    { "Opteron_G4" "-" TYPE_X86_CPU, "rdtscp", "off" },

    { "Opteron_G5" "-" TYPE_X86_CPU, "rdtscp", "off" },

    { "Skylake-Client" "-" TYPE_X86_CPU,      "mpx", "on" },

    { "Skylake-Client-IBRS" "-" TYPE_X86_CPU, "mpx", "on" },

    { "Skylake-Server" "-" TYPE_X86_CPU,      "mpx", "on" },

    { "Skylake-Server-IBRS" "-" TYPE_X86_CPU, "mpx", "on" },

    { "Cascadelake-Server" "-" TYPE_X86_CPU,  "mpx", "on" },

    { "Icelake-Client" "-" TYPE_X86_CPU,      "mpx", "on" },

    { "Icelake-Server" "-" TYPE_X86_CPU,      "mpx", "on" },

};

const size_t pc_compat_3_1_len = G_N_ELEMENTS(pc_compat_3_1);

target/i386/cpu.c

+7 −7
Original line number Diff line number Diff line
@@ -2326,7 +2326,7 @@ static X86CPUDefinition builtin_x86_defs[] = { 
            CPUID_7_0_EBX_HLE | CPUID_7_0_EBX_AVX2 | CPUID_7_0_EBX_SMEP |

            CPUID_7_0_EBX_BMI2 | CPUID_7_0_EBX_ERMS | CPUID_7_0_EBX_INVPCID |

            CPUID_7_0_EBX_RTM | CPUID_7_0_EBX_RDSEED | CPUID_7_0_EBX_ADX |

            CPUID_7_0_EBX_SMAP | CPUID_7_0_EBX_MPX,

            CPUID_7_0_EBX_SMAP,

        /* Missing: XSAVES (not supported by some Linux versions,

         * including v4.1 to v4.12).

         * KVM doesn't yet expose any XSAVES state save component,
@@ -2373,7 +2373,7 @@ static X86CPUDefinition builtin_x86_defs[] = { 
            CPUID_7_0_EBX_HLE | CPUID_7_0_EBX_AVX2 | CPUID_7_0_EBX_SMEP |

            CPUID_7_0_EBX_BMI2 | CPUID_7_0_EBX_ERMS | CPUID_7_0_EBX_INVPCID |

            CPUID_7_0_EBX_RTM | CPUID_7_0_EBX_RDSEED | CPUID_7_0_EBX_ADX |

            CPUID_7_0_EBX_SMAP | CPUID_7_0_EBX_MPX,

            CPUID_7_0_EBX_SMAP,

        /* Missing: XSAVES (not supported by some Linux versions,

         * including v4.1 to v4.12).

         * KVM doesn't yet expose any XSAVES state save component,
@@ -2418,7 +2418,7 @@ static X86CPUDefinition builtin_x86_defs[] = { 
            CPUID_7_0_EBX_HLE | CPUID_7_0_EBX_AVX2 | CPUID_7_0_EBX_SMEP |

            CPUID_7_0_EBX_BMI2 | CPUID_7_0_EBX_ERMS | CPUID_7_0_EBX_INVPCID |

            CPUID_7_0_EBX_RTM | CPUID_7_0_EBX_RDSEED | CPUID_7_0_EBX_ADX |

            CPUID_7_0_EBX_SMAP | CPUID_7_0_EBX_MPX | CPUID_7_0_EBX_CLWB |

            CPUID_7_0_EBX_SMAP | CPUID_7_0_EBX_CLWB |

            CPUID_7_0_EBX_AVX512F | CPUID_7_0_EBX_AVX512DQ |

            CPUID_7_0_EBX_AVX512BW | CPUID_7_0_EBX_AVX512CD |

            CPUID_7_0_EBX_AVX512VL | CPUID_7_0_EBX_CLFLUSHOPT,
@@ -2470,7 +2470,7 @@ static X86CPUDefinition builtin_x86_defs[] = { 
            CPUID_7_0_EBX_HLE | CPUID_7_0_EBX_AVX2 | CPUID_7_0_EBX_SMEP |

            CPUID_7_0_EBX_BMI2 | CPUID_7_0_EBX_ERMS | CPUID_7_0_EBX_INVPCID |

            CPUID_7_0_EBX_RTM | CPUID_7_0_EBX_RDSEED | CPUID_7_0_EBX_ADX |

            CPUID_7_0_EBX_SMAP | CPUID_7_0_EBX_MPX | CPUID_7_0_EBX_CLWB |

            CPUID_7_0_EBX_SMAP | CPUID_7_0_EBX_CLWB |

            CPUID_7_0_EBX_AVX512F | CPUID_7_0_EBX_AVX512DQ |

            CPUID_7_0_EBX_AVX512BW | CPUID_7_0_EBX_AVX512CD |

            CPUID_7_0_EBX_AVX512VL,
@@ -2520,7 +2520,7 @@ static X86CPUDefinition builtin_x86_defs[] = { 
            CPUID_7_0_EBX_HLE | CPUID_7_0_EBX_AVX2 | CPUID_7_0_EBX_SMEP |

            CPUID_7_0_EBX_BMI2 | CPUID_7_0_EBX_ERMS | CPUID_7_0_EBX_INVPCID |

            CPUID_7_0_EBX_RTM | CPUID_7_0_EBX_RDSEED | CPUID_7_0_EBX_ADX |

            CPUID_7_0_EBX_SMAP | CPUID_7_0_EBX_MPX | CPUID_7_0_EBX_CLWB |

            CPUID_7_0_EBX_SMAP | CPUID_7_0_EBX_CLWB |

            CPUID_7_0_EBX_AVX512F | CPUID_7_0_EBX_AVX512DQ |

            CPUID_7_0_EBX_AVX512BW | CPUID_7_0_EBX_AVX512CD |

            CPUID_7_0_EBX_AVX512VL | CPUID_7_0_EBX_CLFLUSHOPT |
@@ -2576,7 +2576,7 @@ static X86CPUDefinition builtin_x86_defs[] = { 
            CPUID_7_0_EBX_HLE | CPUID_7_0_EBX_AVX2 | CPUID_7_0_EBX_SMEP |

            CPUID_7_0_EBX_BMI2 | CPUID_7_0_EBX_ERMS | CPUID_7_0_EBX_INVPCID |

            CPUID_7_0_EBX_RTM | CPUID_7_0_EBX_RDSEED | CPUID_7_0_EBX_ADX |

            CPUID_7_0_EBX_SMAP | CPUID_7_0_EBX_MPX | CPUID_7_0_EBX_INTEL_PT,

            CPUID_7_0_EBX_SMAP | CPUID_7_0_EBX_INTEL_PT,

        .features[FEAT_7_0_ECX] =

            CPUID_7_0_ECX_VBMI | CPUID_7_0_ECX_UMIP | CPUID_7_0_ECX_PKU |

            CPUID_7_0_ECX_OSPKE | CPUID_7_0_ECX_VBMI2 | CPUID_7_0_ECX_GFNI |
@@ -2631,7 +2631,7 @@ static X86CPUDefinition builtin_x86_defs[] = { 
            CPUID_7_0_EBX_HLE | CPUID_7_0_EBX_AVX2 | CPUID_7_0_EBX_SMEP |

            CPUID_7_0_EBX_BMI2 | CPUID_7_0_EBX_ERMS | CPUID_7_0_EBX_INVPCID |

            CPUID_7_0_EBX_RTM | CPUID_7_0_EBX_RDSEED | CPUID_7_0_EBX_ADX |

            CPUID_7_0_EBX_SMAP | CPUID_7_0_EBX_MPX | CPUID_7_0_EBX_CLWB |

            CPUID_7_0_EBX_SMAP | CPUID_7_0_EBX_CLWB |

            CPUID_7_0_EBX_AVX512F | CPUID_7_0_EBX_AVX512DQ |

            CPUID_7_0_EBX_AVX512BW | CPUID_7_0_EBX_AVX512CD |

            CPUID_7_0_EBX_AVX512VL | CPUID_7_0_EBX_CLFLUSHOPT |