Make PAT handling less brittle
v2 cover Make PAT handling less brittle
While working on Qubes OS Marek found out that there were some PAT hacks in the Linux i195 driver. I decided to make Xen use Linux’s PAT to see if it solved the graphics glitches that were observed; it did. This required a substantial amount of preliminary work that is useful even without using Linux’s PAT.
Patches 1 through 13 are the preliminary work and I would like them to be accepted into upstream Xen. Patch 13 does break ABI by rejecting the unused PAT entries, but this will only impact buggy PV guests and can be disabled with a Xen command-line option. Patch 14 actually switches to Linux’s PAT and is NOT intended to be merged (at least for now) as it would at a minimum break migration of PV guests from hosts that do not have the patch.
Demi Marie Obenour (14):
x86/mm: Avoid hard-coding PAT in get_page_from_l1e()
p2m-pt: Avoid hard-coding Xen's PAT x86/mm/shadow: avoid assuming a specific Xen PAT
efi: Avoid hard-coding the various PAT constants x86/mm/shadow: do not open-code PAGE_CACHE_ATTRS
x86: Add memory type constants
x86: Replace PAT_* with X86_MT_*
x86: Replace MTRR_* constants with X86_MT_* constants
x86: Replace EPT_EMT_* constants with X86_MT_*
x86: Remove remaining uses of MTRR_* constants
x86: Derive XEN_MSR_PAT from its individual entries x86/mm: make code robust to future PAT changes x86/mm: Reject invalid cacheability in PV guests by default
x86: Use Linux's PAT
xen/arch/x86/cpu/mtrr/generic.c | 12 +-- xen/arch/x86/cpu/mtrr/main.c | 33 ++++---- xen/arch/x86/e820.c | 4 +- xen/arch/x86/hvm/hvm.c | 12 +-- xen/arch/x86/hvm/mtrr.c | 102 ++++++++++++------------ xen/arch/x86/hvm/vmx/vmcs.c | 2 +- xen/arch/x86/hvm/vmx/vmx.c | 18 ++--- xen/arch/x86/include/asm/hvm/vmx/vmcs.h | 2 +- xen/arch/x86/include/asm/hvm/vmx/vmx.h | 9 --- xen/arch/x86/include/asm/mtrr.h | 22 +---- xen/arch/x86/include/asm/page.h | 4 +- xen/arch/x86/include/asm/processor.h | 15 ++-- xen/arch/x86/include/asm/x86-defns.h | 13 +++ xen/arch/x86/mm.c | 80 +++++++++++++++++-- xen/arch/x86/mm/hap/nested_ept.c | 4 +- xen/arch/x86/mm/p2m-ept.c | 70 ++++++++-------- xen/arch/x86/mm/p2m-pt.c | 6 +- xen/arch/x86/mm/shadow/multi.c | 16 ++-- xen/common/efi/boot.c | 12 +-- 19 files changed, 248 insertions(+), 188 deletions(-)
Signature · 3 lines
Sincerely, Demi Marie Obenour (she/her/hers) Invisible Things Lab
PATCH v2 1/14 x86/mm: Avoid hard-coding PAT in get_page_from_l1e()
Also force the unused entries to UC and add a comment.
--- xen/arch/x86/mm.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)
xen/arch/x86/mm.c +10 -5
@@ -959,14 +959,19 @@ get_page_from_l1e( flip = _PAGE_RW; } +/* Force cacheable memtypes to UC */ switch ( l1f &PAGE_CACHE_ATTRS ) { -case 0 :/* WB */ - flip |= _PAGE_PWT | _PAGE_PCD; +case _PAGE_UC: +case _PAGE_UCM: +case _PAGE_WC: +/* not cached */ break ; -case _PAGE_PWT:/* WT */ -case _PAGE_PWT | _PAGE_PAT:/* WP */ - flip |= _PAGE_PCD | (l1f & _PAGE_PAT); +case _PAGE_WB: +case _PAGE_WT: +case _PAGE_WP: +default : + flip |= (l1f &PAGE_CACHE_ATTRS ) ^ _PAGE_UC;break ; }
Signature · 3 lines
Sincerely, Demi Marie Obenour (she/her/hers) Invisible Things Lab
PATCH v2 2/14 p2m-pt: Avoid hard-coding Xen's PAT
This makes the code much easier to understand. No functional change intended. As per Andrew Cooper, the existing logic is incorrect, but this does not make it any worse.
--- xen/arch/x86/mm/p2m-pt.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
xen/arch/x86/mm/p2m-pt.c +3 -3
@@ -99,13 +99,13 @@ static unsigned long p2m_type_to_flags(const struct p2m_domain *p2m,return flags |P2M_BASE_FLAGS | _PAGE_RW | _PAGE_NX_BIT;case p2m_mmio_direct:if ( !rangeset_contains_singleton (mmio_ro_ranges,mfn_x (mfn)) ) - flags |= _PAGE_RW; + flags |= _PAGE_RW | _PAGE_UCM;else { - flags |= _PAGE_PWT; + flags |= _PAGE_UC;ASSERT (!level); } -return flags |P2M_BASE_FLAGS | _PAGE_PCD; +return flags |P2M_BASE_FLAGS ; } }
Signature · 3 lines
Sincerely, Demi Marie Obenour (she/her/hers) Invisible Things Lab
PATCH v2 3/14 x86/mm/shadow: avoid assuming a specific Xen PAT
In reply to Demi Marie ObenourThis makes the code easier to understand and more robust if Xen's PAT ever changes.
--- xen/arch/x86/mm/shadow/multi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
xen/arch/x86/mm/shadow/multi.c +2 -2
@@ -629,8 +629,8 @@ _sh_propagate(struct vcpu *v,else if ( p2mt == p2m_mmio_direct &&rangeset_contains_singleton (mmio_ro_ranges,mfn_x (target_mfn)) ) { - sflags &= ~(_PAGE_RW | _PAGE_PAT); - sflags |= _PAGE_PCD | _PAGE_PWT; + sflags &= ~(_PAGE_RW |PAGE_CACHE_ATTRS ); + sflags |= _PAGE_UC; }// protect guest page tables
Signature · 3 lines
Sincerely, Demi Marie Obenour (she/her/hers) Invisible Things Lab
PATCH v2 5/14 x86/mm/shadow: do not open-code PAGE_CACHE_ATTRS
In reply to Demi Marie ObenourThis makes the code easier to understand.
--- xen/arch/x86/mm/shadow/multi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
xen/arch/x86/mm/shadow/multi.c +2 -2
@@ -535,7 +535,7 @@ _sh_propagate(struct vcpu *v,if (guest_nx_enabled (v) ) pass_thru_flags |= _PAGE_NX_BIT;if ( level ==1 && !shadow_mode_refcounts (d) && mmio_mfn ) - pass_thru_flags |= _PAGE_PAT | _PAGE_PCD | _PAGE_PWT; + pass_thru_flags |=PAGE_CACHE_ATTRS ; sflags = gflags & pass_thru_flags;/*
@@ -548,7 +548,7 @@ _sh_propagate(struct vcpu *v, {int type; -ASSERT (!(sflags & (_PAGE_PAT | _PAGE_PCD | _PAGE_PWT))); +ASSERT (!(sflags &PAGE_CACHE_ATTRS ));/* compute the PAT index for shadow page entry when VT-d is enabled * and device assigned.
Signature · 3 lines
Sincerely, Demi Marie Obenour (she/her/hers) Invisible Things Lab
PATCH v2 4/14 efi: Avoid hard-coding the various PAT constants
In reply to Demi Marie ObenourThis makes the code much easier to understand, and avoids problems if Xen's PAT ever changes in the future.
--- xen/common/efi/boot.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
xen/common/efi/boot.c +6 -6
@@ -1748,23 +1748,23 @@ void __init efi_init_memory(void) emfn =PFN_UP (desc->PhysicalStart + len);if ( desc->Attribute &EFI_MEMORY_WB ) -/* nothing */ ; + prot |= _PAGE_WB;else if ( desc->Attribute &EFI_MEMORY_WT ) - prot |= _PAGE_PWT |MAP_SMALL_PAGES ; + prot |= _PAGE_WT |MAP_SMALL_PAGES ;else if ( desc->Attribute &EFI_MEMORY_WC ) - prot |= _PAGE_PAT |MAP_SMALL_PAGES ; + prot |= _PAGE_WC |MAP_SMALL_PAGES ;else if ( desc->Attribute & (EFI_MEMORY_UC |EFI_MEMORY_UCE ) ) - prot |= _PAGE_PWT | _PAGE_PCD |MAP_SMALL_PAGES ; + prot |= _PAGE_UC |MAP_SMALL_PAGES ;else if ( efi_bs_revision >=EFI_REVISION (2 ,5 ) && (desc->Attribute &EFI_MEMORY_WP ) ) - prot |= _PAGE_PAT | _PAGE_PWT |MAP_SMALL_PAGES ; + prot |= _PAGE_WP |MAP_SMALL_PAGES ;else {printk (XENLOG_ERR "Unknown cachability for MFNs %#lx-%#lx%s\n" , smfn, emfn -1 , efi_map_uc ?", assuming UC" :"" );if ( !efi_map_uc )continue ; - prot |= _PAGE_PWT | _PAGE_PCD |MAP_SMALL_PAGES ; + prot |= _PAGE_UC |MAP_SMALL_PAGES ; } if ( desc->Attribute & (efi_bs_revision < EFI_REVISION(2, 5)
Signature · 3 lines
Sincerely, Demi Marie Obenour (she/her/hers) Invisible Things Lab
PATCH v2 7/14 x86: Replace PAT_* with X86_MT_*
In reply to Demi Marie ObenourThis allows eliminating the former.
--- xen/arch/x86/hvm/hvm.c | 12 ++++---- xen/arch/x86/hvm/mtrr.c | 52 ++++++++++++++++----------------- xen/arch/x86/hvm/vmx/vmx.c | 16 +++++----- xen/arch/x86/include/asm/mtrr.h | 12 +------- xen/arch/x86/mm/p2m-ept.c | 2 +- xen/arch/x86/mm/shadow/multi.c | 4 +-- 6 files changed, 44 insertions(+), 54 deletions(-)
xen/arch/x86/hvm/hvm.c +6 -6
@@ -307,12 +307,12 @@ int hvm_set_guest_pat(struct vcpu *v, uint64_t guest_pat)for ( i =0 , tmp = guest_pat; i <8 ; i++, tmp >>=8 )switch ( tmp &0xff ) { -case PAT_TYPE_UC_MINUS : -case PAT_TYPE_UNCACHABLE : -case PAT_TYPE_WRBACK : -case PAT_TYPE_WRCOMB : -case PAT_TYPE_WRPROT : -case PAT_TYPE_WRTHROUGH : +case X86_MT_UCM : +case X86_MT_UC : +case X86_MT_WB : +case X86_MT_WC : +case X86_MT_WP : +case X86_MT_WT :break ;default :return 0 ;
xen/arch/x86/hvm/mtrr.c +26 -26
124 lines not on this page · raw message
xen/arch/x86/hvm/vmx/vmx.c +8 -8
@@ -1231,14 +1231,14 @@ static void cf_check vmx_handle_cd(struct vcpu *v, unsigned long value)* memory type are all UC. */ u64 uc_pat = - ((uint64_t )PAT_TYPE_UNCACHABLE ) |/* PAT0 */ - ((uint64_t )PAT_TYPE_UNCACHABLE <<8 ) |/* PAT1 */ - ((uint64_t )PAT_TYPE_UNCACHABLE <<16 ) |/* PAT2 */ - ((uint64_t )PAT_TYPE_UNCACHABLE <<24 ) |/* PAT3 */ - ((uint64_t )PAT_TYPE_UNCACHABLE <<32 ) |/* PAT4 */ - ((uint64_t )PAT_TYPE_UNCACHABLE <<40 ) |/* PAT5 */ - ((uint64_t )PAT_TYPE_UNCACHABLE <<48 ) |/* PAT6 */ - ((uint64_t )PAT_TYPE_UNCACHABLE <<56 );/* PAT7 */ + ((uint64_t )X86_MT_UC ) |/* PAT0 */ + ((uint64_t )X86_MT_UC <<8 ) |/* PAT1 */ + ((uint64_t )X86_MT_UC <<16 ) |/* PAT2 */ + ((uint64_t )X86_MT_UC <<24 ) |/* PAT3 */ + ((uint64_t )X86_MT_UC <<32 ) |/* PAT4 */ + ((uint64_t )X86_MT_UC <<40 ) |/* PAT5 */ + ((uint64_t )X86_MT_UC <<48 ) |/* PAT6 */ + ((uint64_t )X86_MT_UC <<56 );/* PAT7 */ vmx_get_guest_pat (v, pat);vmx_set_guest_pat (v, uc_pat);
xen/arch/x86/include/asm/mtrr.h +1 -11
@@ -16,17 +16,7 @@#define NORMAL_CACHE_MODE 0#define NO_FILL_CACHE_MODE 2 -enum { -PAT_TYPE_UNCACHABLE =0 , -PAT_TYPE_WRCOMB =1 , -PAT_TYPE_WRTHROUGH =4 , -PAT_TYPE_WRPROT =5 , -PAT_TYPE_WRBACK =6 , -PAT_TYPE_UC_MINUS =7 , -PAT_TYPE_NUMS -}; - -#define INVALID_MEM_TYPE PAT_TYPE_NUMS +#define INVALID_MEM_TYPE X86_NUM_MT/* In the Intel processor's MTRR interface, the MTRR type is always held in an 8 bit field: */
xen/arch/x86/mm/p2m-ept.c +1 -1
@@ -573,7 +573,7 @@ int epte_get_entry_emt(struct domain *d, gfn_t gfn, mfn_t mfn,if ( gmtrr_mtype >=0 ) { *ipat = true; -return gmtrr_mtype !=PAT_TYPE_UC_MINUS ? gmtrr_mtype +return gmtrr_mtype !=X86_MT_UCM ? gmtrr_mtype :MTRR_TYPE_UNCACHABLE ; }if ( gmtrr_mtype == -EADDRNOTAVAIL )
xen/arch/x86/mm/shadow/multi.c +2 -2
@@ -561,7 +561,7 @@ _sh_propagate(struct vcpu *v, (type = hvm_get_mem_pinned_cacheattr(d, target_gfn, 0)) >= 0 ) sflags |=pat_type_2_pte_flags (type); else if ( d->arch.hvm.is_in_uc_mode ) - sflags |= pat_type_2_pte_flags(PAT_TYPE_UNCACHABLE); + sflags |= pat_type_2_pte_flags(X86_MT_UC); else if ( iomem_access_permitted(d, mfn_x(target_mfn), mfn_x(target_mfn)) ) {
@@ -572,7 +572,7 @@ _sh_propagate(struct vcpu *v,mfn_to_maddr (target_mfn), MTRR_TYPE_UNCACHABLE); else if ( iommu_snoop ) - sflags |= pat_type_2_pte_flags(PAT_TYPE_WRBACK); + sflags |= pat_type_2_pte_flags(X86_MT_WB); else sflags |= get_pat_flags(v, gflags,
Signature · 3 lines
Sincerely, Demi Marie Obenour (she/her/hers) Invisible Things Lab
PATCH v2 6/14 x86: Add memory type constants
In reply to Demi Marie ObenourThese are not currently used, so there is no functional change. Future patches will use these constants.
--- xen/arch/x86/include/asm/x86-defns.h | 13 +++++++++++++ 1 file changed, 13 insertions(+)
xen/arch/x86/include/asm/x86-defns.h +13 -0
@@ -153,4 +153,17 @@ (1u << X86_EXC_AC) | (1u << X86_EXC_CP) | \ (1u << X86_EXC_VC) | (1u << X86_EXC_SX)) +/* Memory types */ +#define X86_MT_UC _AC(0x00, ULL)/* uncachable */ +#define X86_MT_WC _AC(0x01, ULL)/* write-combined */ +#define X86_MT_WT _AC(0x04, ULL)/* write-through */ +#define X86_MT_WP _AC(0x05, ULL)/* write-protect */ +#define X86_MT_WB _AC(0x06, ULL)/* write-back */ +#define X86_MT_UCM _AC(0x07, ULL)/* UC- */ +#define X86_NUM_MT _AC(0x08, ULL) + +/* Reserved memory types (cannot be used) */ +#define X86_MT_RESERVED_1 _AC(0x02, ULL) +#define X86_MT_RESERVED_2 _AC(0x03, ULL) +#endif /* __XEN_X86_DEFNS_H__ */
Signature · 3 lines
Sincerely, Demi Marie Obenour (she/her/hers) Invisible Things Lab
PATCH v2 9/14 x86: Replace EPT_EMT_* constants with X86_MT_*
In reply to Demi Marie ObenourThis allows eliminating the former. No functional change intended.
--- xen/arch/x86/include/asm/hvm/vmx/vmx.h | 9 --------- xen/arch/x86/mm/hap/nested_ept.c | 4 ++-- 2 files changed, 2 insertions(+), 11 deletions(-)
xen/arch/x86/include/asm/hvm/vmx/vmx.h +0 -9
@@ -80,15 +80,6 @@ typedef enum {#define EPTE_RWX_MASK 0x7#define EPTE_FLAG_MASK 0x7f -#define EPT_EMT_UC 0 -#define EPT_EMT_WC 1 -#define EPT_EMT_RSV0 2 -#define EPT_EMT_RSV1 3 -#define EPT_EMT_WT 4 -#define EPT_EMT_WP 5 -#define EPT_EMT_WB 6 -#define EPT_EMT_RSV2 7 -#define PI_xAPIC_NDST_MASK 0xFF00void vmx_asm_vmexit_handler (struct cpu_user_regs );
xen/arch/x86/mm/hap/nested_ept.c +2 -2
@@ -84,8 +84,8 @@ static bool_t nept_emt_bits_check(ept_entry_t e, uint32_t level) {if ( e.sp || level ==1 ) { -if ( e.emt ==EPT_EMT_RSV0 || e.emt ==EPT_EMT_RSV1 || - e.emt ==EPT_EMT_RSV2 ) +if ( e.emt ==X86_MT_RESERVED_1 || e.emt ==X86_MT_RESERVED_2 || + e.emt ==X86_MT_UCM )return 1 ; }return 0 ;
Signature · 3 lines
Sincerely, Demi Marie Obenour (she/her/hers) Invisible Things Lab
PATCH v2 10/14 x86: Remove remaining uses of MTRR_* constants
In reply to Demi Marie ObenourNo functional change intended.
--- xen/arch/x86/cpu/mtrr/generic.c | 2 +- xen/arch/x86/cpu/mtrr/main.c | 7 +++++-- xen/arch/x86/hvm/mtrr.c | 22 +++++++++++----------- xen/arch/x86/include/asm/mtrr.h | 4 ---- xen/arch/x86/mm/p2m-ept.c | 18 +++++++++--------- xen/arch/x86/mm/shadow/multi.c | 2 +- 6 files changed, 27 insertions(+), 28 deletions(-)
xen/arch/x86/cpu/mtrr/generic.c +1 -1
@@ -125,7 +125,7 @@ boolean_param("mtrr.show", mtrr_show);static const char *__init mtrr_attrib_to_str (mtrr_type x) { -static const char __initconst strings[MTRR_NUM_TYPES ][16 ] = +static const char __initconst strings[X86_NUM_MT -1 ][16 ] = { [X86_MT_UC ] ="uncachable" , [X86_MT_WC ] ="write-combining" ,
xen/arch/x86/cpu/mtrr/main.c +5 -2
@@ -62,7 +62,7 @@ const struct mtrr_ops *__read_mostly mtrr_if = NULL;static void set_mtrr (unsigned int reg,unsigned long base,unsigned long size,mtrr_type type); -static const char *const mtrr_strings[MTRR_NUM_TYPES ] = +static const char *const mtrr_strings[X86_NUM_MT ] = {"uncachable" ,/* 0 */ "write-combining" ,/* 1 */
@@ -71,6 +71,7 @@ static const char *const mtrr_strings[MTRR_NUM_TYPES] ="write-through" ,/* 4 */ "write-protect" ,/* 5 */ "write-back" ,/* 6 */ + "?", /* 7 */ };static const char *mtrr_attrib_to_str (int x)
@@ -322,7 +323,9 @@ int mtrr_add_page(unsigned long base, unsigned long size,if ((error = mtrr_if->validate_add_page (base,size,type)))return error; -if (type >=MTRR_NUM_TYPES ) { +if (type ==X86_MT_RESERVED_1 || + type ==X86_MT_RESERVED_2 || + type >=X86_MT_UCM ) {printk (KERN_WARNING "mtrr: type: %u invalid\n" , type);return -EINVAL ; }
xen/arch/x86/hvm/mtrr.c +11 -11
@@ -37,8 +37,8 @@ static const uint8_t pat_entry_2_pte_flags[8] = { _PAGE_PAT | _PAGE_PCD, _PAGE_PAT | _PAGE_PCD | _PAGE_PWT };/* Effective mm type lookup table, according to MTRR and PAT. */ -static const uint8_t mm_type_tbl[MTRR_NUM_TYPES ][X86_NUM_MT ] = { -#define RS MEMORY_NUM_TYPES +static const uint8_t mm_type_tbl[X86_NUM_MT -1 ][X86_NUM_MT ] = { +#define RS X86_MT_UCM #define UC X86_MT_UC #define WB X86_MT_WB #define WC X86_MT_WC
@@ -66,9 +66,9 @@ static const uint8_t mm_type_tbl[MTRR_NUM_TYPES][X86_NUM_MT] = {* Reverse lookup table, to find a pat type according to MTRR and effective * memory type. This table is dynamically generated. */ -static uint8_t __read_mostly mtrr_epat_tbl[MTRR_NUM_TYPES ][MEMORY_NUM_TYPES ] = - { [0 ...MTRR_NUM_TYPES -1 ] = - { [0 ...MEMORY_NUM_TYPES -1 ] =INVALID_MEM_TYPE } +static uint8_t __read_mostly mtrr_epat_tbl[X86_NUM_MT -1 ][X86_NUM_MT ] = + { [0 ...X86_NUM_MT -2 ] = + { [0 ...X86_NUM_MT -2 ] =INVALID_MEM_TYPE } };/* Lookup table for PAT entry of a given PAT value in host PAT. */
@@ -79,13 +79,13 @@ static int __init cf_check hvm_mtrr_pat_init(void) {unsigned int i, j; -for ( i =0 ; i <MTRR_NUM_TYPES ; i++ ) +for ( i =0 ; i <X86_NUM_MT -1 ; i++ ) {for ( j =0 ; j <X86_NUM_MT ; j++ ) {unsigned int tmp = mm_type_tbl[i][j]; -if ( tmp <MEMORY_NUM_TYPES ) +if ( tmp <X86_NUM_MT -1 ) mtrr_epat_tbl[i][tmp] = j; } }
@@ -317,11 +317,11 @@ static uint8_t effective_mm_type(struct mtrr_state *m, uint8_t gmtrr_mtype) {uint8_t mtrr_mtype, pat_value; - +/* if get_pat_flags() gives a dedicated MTRR type, * just use it -*/ -if ( gmtrr_mtype ==NO_HARDCODE_MEM_TYPE ) +*/ +if ( gmtrr_mtype ==X86_MT_UCM ) mtrr_mtype =mtrr_get_type (m, gpa,0 );else mtrr_mtype = gmtrr_mtype;
@@ -346,7 +346,7 @@ uint32_t get_pat_flags(struct vcpu *v,/* 1. Get the effective memory type of guest physical address, * with the pair of guest MTRR and PAT */ - guest_eff_mm_type =effective_mm_type (g, pat, gpaddr, + guest_eff_mm_type =effective_mm_type (g, pat, gpaddr, gl1e_flags, gmtrr_mtype);/* 2. Get the memory type of host physical address, with MTRR */ shadow_mtrr_type =mtrr_get_type (&mtrr_state, spaddr,0 );
xen/arch/x86/include/asm/mtrr.h +0 -4
@@ -3,10 +3,6 @@#include <xen/mm.h> -#define MTRR_NUM_TYPES 7 -#define MEMORY_NUM_TYPES MTRR_NUM_TYPES -#define NO_HARDCODE_MEM_TYPE MTRR_NUM_TYPES -#define NORMAL_CACHE_MODE 0#define NO_FILL_CACHE_MODE 2
xen/arch/x86/mm/p2m-ept.c +9 -9
@@ -394,10 +394,10 @@ static bool ept_invalidate_emt_subtree(struct p2m_domain *p2m, mfn_t mfn,ept_entry_t e =atomic_read_ept_entry (&epte[i]);if ( !is_epte_valid (&e) || !is_epte_present (&e) || - (e.emt ==MTRR_NUM_TYPES && (e.recalc || !recalc)) ) + (e.emt ==X86_MT_UCM && (e.recalc || !recalc)) )continue ; - e.emt =MTRR_NUM_TYPES ; + e.emt =X86_MT_UCM ;if ( recalc ) e.recalc =1 ; rc =atomic_write_ept_entry (p2m, &epte[i], e, level -1 );
@@ -470,9 +470,9 @@ static int ept_invalidate_emt_range(struct p2m_domain *p2m,ept_entry_t e =atomic_read_ept_entry (&table[index]);if (is_epte_valid (&e) &&is_epte_present (&e) && - (e.emt !=MTRR_NUM_TYPES || !e.recalc) ) + (e.emt !=X86_MT_UCM || !e.recalc) ) { - e.emt =MTRR_NUM_TYPES ; + e.emt =X86_MT_UCM ; e.recalc =1 ; wrc =atomic_write_ept_entry (p2m, &table[index], e, target);ASSERT (wrc ==0 );
@@ -655,7 +655,7 @@ static int cf_check resolve_misconfig(struct p2m_domain *p2m, unsigned long gfn) {bool ipat; -if ( e.emt !=MTRR_NUM_TYPES ) +if ( e.emt !=X86_MT_UCM )break ;if ( level ==0 )
@@ -665,7 +665,7 @@ static int cf_check resolve_misconfig(struct p2m_domain *p2m, unsigned long gfn)p2m_type_t nt; e =atomic_read_ept_entry (&epte[i]); -if ( e.emt ==MTRR_NUM_TYPES ) +if ( e.emt ==X86_MT_UCM ) e.emt =0 ;if ( !is_epte_valid (&e) || !is_epte_present (&e) )continue ;
@@ -741,7 +741,7 @@ static int cf_check resolve_misconfig(struct p2m_domain *p2m, unsigned long gfn)break ; } -if ( e.emt ==MTRR_NUM_TYPES ) +if ( e.emt ==X86_MT_UCM ) {ASSERT (is_epte_present (&e));ept_invalidate_emt_subtree (p2m,_mfn (e.mfn), e.recalc, level);
@@ -931,7 +931,7 @@ ept_set_entry(struct p2m_domain *p2m, gfn_t gfn_, mfn_t mfn,if ( emt >=0 ) new_entry.emt = emt;else /* ept_handle_misconfig() will need to take care of this. */ - new_entry.emt =MTRR_NUM_TYPES ; + new_entry.emt =X86_NUM_MT -1 ; new_entry.ipat = ipat; new_entry.sp = !!i;
@@ -1471,7 +1471,7 @@ static void cf_check ept_dump_p2m_table(unsigned char key)for ( i = ept->wl; i >0 ; i-- ) { ept_entry = table + (gfn_remainder >> (i *EPT_TABLE_ORDER )); -if ( ept_entry->emt ==MTRR_NUM_TYPES ) +if ( ept_entry->emt ==X86_MT_UCM ) c ='?' ; ret =ept_next_level (p2m,1 , &table, &gfn_remainder, i);if ( ret !=GUEST_TABLE_NORMAL_PAGE )
xen/arch/x86/mm/shadow/multi.c +1 -1
@@ -578,7 +578,7 @@ _sh_propagate(struct vcpu *v, gflags,gfn_to_paddr (target_gfn),mfn_to_maddr (target_mfn), - NO_HARDCODE_MEM_TYPE); + X86_MT_UCM); } }
Signature · 3 lines
Sincerely, Demi Marie Obenour (she/her/hers) Invisible Things Lab
PATCH v2 8/14 x86: Replace MTRR_* constants with X86_MT_* constants
In reply to Demi Marie ObenourThis allows eliminating most of the former. No functional change intended.
--- xen/arch/x86/cpu/mtrr/generic.c | 10 ++--- xen/arch/x86/cpu/mtrr/main.c | 26 ++++++------- xen/arch/x86/e820.c | 4 +- xen/arch/x86/hvm/mtrr.c | 30 +++++++-------- xen/arch/x86/hvm/vmx/vmcs.c | 2 +- xen/arch/x86/hvm/vmx/vmx.c | 2 +- xen/arch/x86/include/asm/hvm/vmx/vmcs.h | 2 +- xen/arch/x86/include/asm/mtrr.h | 6 --- xen/arch/x86/mm/p2m-ept.c | 50 ++++++++++++------------- xen/arch/x86/mm/shadow/multi.c | 2 +- 10 files changed, 64 insertions(+), 70 deletions(-)
xen/arch/x86/cpu/mtrr/generic.c +5 -5
@@ -127,11 +127,11 @@ static const char *__init mtrr_attrib_to_str(mtrr_type x) {static const char __initconst strings[MTRR_NUM_TYPES ][16 ] = { - [MTRR_TYPE_UNCACHABLE ] ="uncachable" , - [MTRR_TYPE_WRCOMB ] ="write-combining" , - [MTRR_TYPE_WRTHROUGH ] ="write-through" , - [MTRR_TYPE_WRPROT ] ="write-protect" , - [MTRR_TYPE_WRBACK ] ="write-back" , + [X86_MT_UC ] ="uncachable" , + [X86_MT_WC ] ="write-combining" , + [X86_MT_WT ] ="write-through" , + [X86_MT_WP ] ="write-protect" , + [X86_MT_WB ] ="write-back" , };return (x <ARRAY_SIZE (strings) && strings[x][0 ]) ? strings[x] :"?" ;
xen/arch/x86/cpu/mtrr/main.c +13 -13
@@ -163,10 +163,10 @@ static void cf_check ipi_handler(void *info) }static inline int types_compatible (mtrr_type type1,mtrr_type type2) { -return type1 ==MTRR_TYPE_UNCACHABLE || - type2 ==MTRR_TYPE_UNCACHABLE || - (type1 ==MTRR_TYPE_WRTHROUGH && type2 ==MTRR_TYPE_WRBACK ) || - (type1 ==MTRR_TYPE_WRBACK && type2 ==MTRR_TYPE_WRTHROUGH ); +return type1 ==X86_MT_UC || + type2 ==X86_MT_UC || + (type1 ==X86_MT_WT && type2 ==X86_MT_WB ) || + (type1 ==X86_MT_WB && type2 ==X86_MT_WT ); }/**
@@ -297,13 +297,13 @@ static void set_mtrr(unsigned int reg, unsigned long base,* * The available types are * -* %MTRR_TYPE_UNCACHABLE - No caching +* %X86_MT_UC - No caching * -* %MTRR_TYPE_WRBACK - Write data back in bursts whenever +* %X86_MT_WB - Write data back in bursts whenever * -* %MTRR_TYPE_WRCOMB - Write data back soon but allow bursts +* %X86_MT_WC - Write data back soon but allow bursts * -* %MTRR_TYPE_WRTHROUGH - Cache reads but not writes +* %X86_MT_WT - Cache reads but not writes * * BUGS: Needs a quiet flag for the cases where drivers do not mind * failures and do not wish system log messages to be sent.
@@ -328,7 +328,7 @@ int mtrr_add_page(unsigned long base, unsigned long size, }/* If the type is WC, check that this processor supports it */ -if ((type ==MTRR_TYPE_WRCOMB ) && !have_wrcomb ()) { +if ((type ==X86_MT_WC ) && !have_wrcomb ()) {printk (KERN_WARNING "mtrr: your processor doesn't support write-combining\n" );return -EOPNOTSUPP ;
@@ -442,13 +442,13 @@ static int mtrr_check(unsigned long base, unsigned long size)* * The available types are * -* %MTRR_TYPE_UNCACHABLE - No caching +* %X86_MT_UC - No caching * -* %MTRR_TYPE_WRBACK - Write data back in bursts whenever +* %X86_MT_WB - Write data back in bursts whenever * -* %MTRR_TYPE_WRCOMB - Write data back soon but allow bursts +* %X86_MT_WC - Write data back soon but allow bursts * -* %MTRR_TYPE_WRTHROUGH - Cache reads but not writes +* %X86_MT_WT - Cache reads but not writes * * BUGS: Needs a quiet flag for the cases where drivers do not mind * failures and do not wish system log messages to be sent.
xen/arch/x86/e820.c +2 -2
@@ -459,7 +459,7 @@ static uint64_t __init mtrr_top_of_ram(void)printk (" MTRR cap: %" PRIx64" type: %" PRIx64"\n" , mtrr_cap, mtrr_def);/* MTRRs enabled, and default memory type is not writeback? */ -if ( !test_bit (11 , &mtrr_def) || ((uint8_t )mtrr_def ==MTRR_TYPE_WRBACK ) ) +if ( !test_bit (11 , &mtrr_def) || ((uint8_t )mtrr_def ==X86_MT_WB ) )return 0 ;/*
@@ -476,7 +476,7 @@ static uint64_t __init mtrr_top_of_ram(void)printk (" MTRR[%d]: base %" PRIx64" mask %" PRIx64"\n" , i, base, mask); -if ( !test_bit (11 , &mask) || ((uint8_t )base !=MTRR_TYPE_WRBACK ) ) +if ( !test_bit (11 , &mask) || ((uint8_t )base !=X86_MT_WB ) )continue ; base &= addr_mask; mask &= addr_mask;
xen/arch/x86/hvm/mtrr.c +15 -15
@@ -39,11 +39,11 @@ static const uint8_t pat_entry_2_pte_flags[8] = {/* Effective mm type lookup table, according to MTRR and PAT. */ static const uint8_t mm_type_tbl[MTRR_NUM_TYPES ][X86_NUM_MT ] = { #define RS MEMORY_NUM_TYPES -#define UC MTRR_TYPE_UNCACHABLE -#define WB MTRR_TYPE_WRBACK -#define WC MTRR_TYPE_WRCOMB -#define WP MTRR_TYPE_WRPROT -#define WT MTRR_TYPE_WRTHROUGH +#define UC X86_MT_UC +#define WB X86_MT_WB +#define WC X86_MT_WC +#define WP X86_MT_WP +#define WT X86_MT_WT/* PAT(UC, WC, RS, RS, WT, WP, WB, UC-) */ /* MTRR(UC) */ {UC ,WC ,RS ,RS ,UC ,UC ,UC ,UC },
@@ -202,7 +202,7 @@ int mtrr_get_type(const struct mtrr_state *m, paddr_t pa, unsigned int order)unsigned int seg, num_var_ranges =MASK_EXTR (m->mtrr_cap, MTRRcap_VCNT);if (unlikely (!m->enabled) ) -return MTRR_TYPE_UNCACHABLE ; +return X86_MT_UC ; pa &= mask;if ( (pa <0x100000 ) && m->fixed_enabled )
@@ -277,13 +277,13 @@ int mtrr_get_type(const struct mtrr_state *m, paddr_t pa, unsigned int order)return -1 ;/* Two or more matches, one being UC? */ -if ( overlap_mtrr & (1 <<MTRR_TYPE_UNCACHABLE ) ) -return MTRR_TYPE_UNCACHABLE ; +if ( overlap_mtrr & (1 <<X86_MT_UC ) ) +return X86_MT_UC ;/* Two or more matches, all of them WT and WB? */ if ( overlap_mtrr == - ((1 <<MTRR_TYPE_WRTHROUGH ) | (1 <<MTRR_TYPE_WRBACK )) ) -return MTRR_TYPE_WRTHROUGH ; + ((1 <<X86_MT_WT ) | (1 <<X86_MT_WB )) ) +return X86_MT_WT ;/* Behaviour is undefined, but return the last overlapped type. */ return overlap_mtrr_pos;
@@ -381,11 +381,11 @@ static inline bool_t valid_mtrr_type(uint8_t type) {switch ( type ) { -case MTRR_TYPE_UNCACHABLE : -case MTRR_TYPE_WRBACK : -case MTRR_TYPE_WRCOMB : -case MTRR_TYPE_WRPROT : -case MTRR_TYPE_WRTHROUGH : +case X86_MT_UC : +case X86_MT_WB : +case X86_MT_WC : +case X86_MT_WP : +case X86_MT_WT :return 1 ; }return 0 ;
xen/arch/x86/hvm/vmx/vmcs.c +1 -1
@@ -555,7 +555,7 @@ static int vmx_init_vmcs_config(bool bsp)/* Require Write-Back (WB) memory type for VMCS accesses. */ opt = (vmx_basic_msr_high & (VMX_BASIC_MEMORY_TYPE_MASK >>32 )) / ((VMX_BASIC_MEMORY_TYPE_MASK & -VMX_BASIC_MEMORY_TYPE_MASK ) >>32 ); -if ( opt !=MTRR_TYPE_WRBACK ) +if ( opt !=X86_MT_WB ) {printk ("VMX: CPU%d has unexpected VMCS access type %u\n" ,smp_processor_id (), opt);
xen/arch/x86/hvm/vmx/vmx.c +1 -1
@@ -434,7 +434,7 @@ static void cf_check domain_creation_finished(struct domain *d)return ;ASSERT (epte_get_entry_emt (d, gfn, apic_access_mfn,0 , &ipat, - p2m_mmio_direct) ==MTRR_TYPE_WRBACK ); + p2m_mmio_direct) ==X86_MT_WB );ASSERT (ipat);if (set_mmio_p2m_entry (d, gfn, apic_access_mfn,PAGE_ORDER_4K ) )
xen/arch/x86/include/asm/hvm/vmx/vmcs.h +1 -1
@@ -38,7 +38,7 @@ struct vmx_msr_entry {u64 data; }; -#define EPT_DEFAULT_MT MTRR_TYPE_WRBACK +#define EPT_DEFAULT_MT X86_MT_WB struct ept_data { union {
xen/arch/x86/include/asm/mtrr.h +0 -6
@@ -3,12 +3,6 @@#include <xen/mm.h> -/* These are the region types. They match the architectural specification. */ -#define MTRR_TYPE_UNCACHABLE 0 -#define MTRR_TYPE_WRCOMB 1 -#define MTRR_TYPE_WRTHROUGH 4 -#define MTRR_TYPE_WRPROT 5 -#define MTRR_TYPE_WRBACK 6#define MTRR_NUM_TYPES 7#define MEMORY_NUM_TYPES MTRR_NUM_TYPES#define NO_HARDCODE_MEM_TYPE MTRR_NUM_TYPES
xen/arch/x86/mm/p2m-ept.c +25 -25
119 lines not on this page · raw message
xen/arch/x86/mm/shadow/multi.c +1 -1
@@ -570,7 +570,7 @@ _sh_propagate(struct vcpu *v, gflags,gfn_to_paddr (target_gfn),mfn_to_maddr (target_mfn), - MTRR_TYPE_UNCACHABLE); + X86_MT_UC); else if ( iommu_snoop ) sflags |= pat_type_2_pte_flags(X86_MT_WB); else
Signature · 3 lines
Sincerely, Demi Marie Obenour (she/her/hers) Invisible Things Lab
PATCH v2 14/14 x86: Use Linux's PAT
In reply to Demi Marie ObenourThis is purely for testing, to see if it works around a bug in i915. It is not intended to be merged.
NOT-signed-off-by: DO NOT MERGE
--- xen/arch/x86/include/asm/page.h | 4 ++-- xen/arch/x86/include/asm/processor.h | 13 +++++-------- xen/arch/x86/mm.c | 2 -- 3 files changed, 7 insertions(+), 12 deletions(-)
xen/arch/x86/include/asm/page.h +2 -2
@@ -333,11 +333,11 @@ void efi_update_l4_pgtable(unsigned int l4idx, l4_pgentry_t);/* Memory types, encoded under Xen's choice of MSR_PAT. */ #define _PAGE_WB ( 0) -#define _PAGE_WT ( _PAGE_PWT) +#define _PAGE_WC ( _PAGE_PWT)#define _PAGE_UCM ( _PAGE_PCD )#define _PAGE_UC ( _PAGE_PCD | _PAGE_PWT) -#define _PAGE_WC (_PAGE_PAT )#define _PAGE_WP (_PAGE_PAT | _PAGE_PWT) +#define _PAGE_WT (_PAGE_PAT | _PAGE_PCD | _PAGE_PWT)/* * Debug option: Ensure that granted mappings are not implicitly unmapped.
xen/arch/x86/include/asm/processor.h +5 -8
@@ -92,18 +92,15 @@ X86_EFLAGS_NT|X86_EFLAGS_DF|X86_EFLAGS_IF| \ X86_EFLAGS_TF) -/* -* Host IA32_CR_PAT value to cover all memory types. This is not the default -* MSR_PAT value, and is an ABI with PV guests. -*/ +/* Linux PAT, required by i915 driver */ #define XEN_MSR_PAT (X86_MT_WB << 0x00 | \ - X86_MT_WT << 0x08 | \ + X86_MT_WC << 0x08 | \ X86_MT_UCM << 0x10 | \ X86_MT_UC << 0x18 | \ - X86_MT_WC << 0x20 | \ + X86_MT_WB << 0x20 | \ X86_MT_WP << 0x28 | \ - X86_MT_UC << 0x30 | \ - X86_MT_UC << 0x38 | \ + X86_MT_UCM << 0x30 | \ + X86_MT_WT << 0x38 | \ 0)#ifndef __ASSEMBLY__
xen/arch/x86/mm.c +0 -2
@@ -6382,8 +6382,6 @@ static void __init __maybe_unused build_assertions(void) {/* A bunch of static assertions to check that the XEN_MSR_PAT is valid * and consistent with the _PAGE_* macros */ -BUILD_BUG_ON (XEN_MSR_PAT !=0x050100070406ULL && -"wrong XEN_MSR_PAT breaks PV guests" );BUILD_BUG_ON (_PAGE_WB &&"Linux requires _PAGE_WB to be 0" );#define PAT_VALUE (v) (0xFF & (XEN_MSR_PAT >> (8 * (v))))#define BAD_VALUE (v) ((v) < 0 || (v) > 7 || \
Signature · 3 lines
Sincerely, Demi Marie Obenour (she/her/hers) Invisible Things Lab
PATCH v2 12/14 x86/mm: make code robust to future PAT changes
In reply to Demi Marie ObenourIt may be desirable to change Xen's PAT for various reasons. This requires changes to several _PAGE_* macros as well. Add static assertions to check that XEN_MSR_PAT is consistent with the _PAGE_* macros, and that _PAGE_WB is 0 as required by Linux.
--- xen/arch/x86/mm.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+)
xen/arch/x86/mm.c +36 -0
@@ -6357,8 +6357,44 @@ unsigned long get_upper_mfn_bound(void)static void __init __maybe_unused build_assertions (void ) { +/* A bunch of static assertions to check that the XEN_MSR_PAT is valid +* and consistent with the _PAGE_* macros */ BUILD_BUG_ON (XEN_MSR_PAT !=0x050100070406ULL &&"wrong XEN_MSR_PAT breaks PV guests" ); +BUILD_BUG_ON (_PAGE_WB &&"Linux requires _PAGE_WB to be 0" ); +#define PAT_VALUE (v) (0xFF & (XEN_MSR_PAT >> (8 * (v)))) +#define BAD_VALUE (v) ((v) < 0 || (v) > 7 || \ + (v) == X86_MT_RESERVED_1 || (v) == X86_MT_RESERVED_2) +#define BAD_PAT_VALUE (v) BUILD_BUG_ON(BAD_VALUE(PAT_VALUE(v))) +BAD_PAT_VALUE (0 ); +BAD_PAT_VALUE (1 ); +BAD_PAT_VALUE (2 ); +BAD_PAT_VALUE (3 ); +BAD_PAT_VALUE (4 ); +BAD_PAT_VALUE (5 ); +BAD_PAT_VALUE (6 ); +BAD_PAT_VALUE (7 ); +#undef BAD_PAT_VALUE +#undef BAD_VALUE +#define PAT_SHIFT (page_value) (((page_value) & _PAGE_PAT) >> 5 | \ + ((page_value) & (_PAGE_PCD | _PAGE_PWT)) >> 3) +#define CHECK_PAGE_VALUE (page_value) do { \ +/* Check that the _PAGE_* macros only use bits from PAGE_CACHE_ATTRS */ \ + BUILD_BUG_ON(((_PAGE_##page_value) & PAGE_CACHE_ATTRS) != \ + (_PAGE_##page_value)); \ +/* Check that the _PAGE_* are consistent with XEN_MSR_PAT */ \ + BUILD_BUG_ON(PAT_VALUE(PAT_SHIFT(_PAGE_##page_value)) != \ + (X86_MT_##page_value)); \ +} while (0) +CHECK_PAGE_VALUE (WT ); +CHECK_PAGE_VALUE (WB ); +CHECK_PAGE_VALUE (WC ); +CHECK_PAGE_VALUE (UC ); +CHECK_PAGE_VALUE (UCM ); +CHECK_PAGE_VALUE (WP ); +#undef CHECK_PAGE_VALUE +#undef PAT_SHIFT +#undef PAT_VALUE }/*
Signature · 3 lines
Sincerely, Demi Marie Obenour (she/her/hers) Invisible Things Lab
PATCH v2 13/14 x86/mm: Reject invalid cacheability in PV guests by default
In reply to Demi Marie ObenourSetting cacheability flags that are not ones specified by Xen is a bug in the guest. By default, inject #GP into any guest that does this. allow_invalid_cacheability can be used on the Xen command line to disable this check.
--- xen/arch/x86/mm.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-)
xen/arch/x86/mm.c +24 -1
@@ -145,6 +145,8 @@#ifdef CONFIG_PV #include "pv/mm.h" +bool allow_invalid_cacheability; +boolean_param ("allow_invalid_cacheability" , allow_invalid_cacheability);#endif /* Override macros from asm/page.h to make them work with mfn_t */
@@ -1346,7 +1348,28 @@ static int promote_l1_table(struct page_info *page) }else { -switch ( ret =get_page_from_l1e (pl1e[i], d, d) ) +l1_pgentry_t l1e = pl1e[i]; + +BUILD_BUG_ON (PAGE_CACHE_ATTRS >0xffff ); +if ( !allow_invalid_cacheability ) + { +switch ( l1e.l1 &PAGE_CACHE_ATTRS ) + { +case _PAGE_WB: +case _PAGE_UC: +case _PAGE_UCM: +case _PAGE_WC: +case _PAGE_WT: +case _PAGE_WP: +break ; +default : +pv_inject_hw_exception (TRAP_gp_fault,0 ); + ret = -EINVAL ; + goto fail; + } + } + +switch ( ret =get_page_from_l1e (l1e, d, d) ) {default : goto fail;
Signature · 3 lines
Sincerely, Demi Marie Obenour (she/her/hers) Invisible Things Lab
PATCH v2 11/14 x86: Derive XEN_MSR_PAT from its individual entries
In reply to Demi Marie ObenourThis avoids it being a magic constant that is difficult for humans to decode. Use BUILD_BUG_ON to check that the old and new values are identical.
--- xen/arch/x86/include/asm/processor.h | 10 +++++++++- xen/arch/x86/mm.c | 6 ++++++ 2 files changed, 15 insertions(+), 1 deletion(-)
xen/arch/x86/include/asm/processor.h +9 -1
@@ -96,7 +96,15 @@* Host IA32_CR_PAT value to cover all memory types. This is not the default * MSR_PAT value, and is an ABI with PV guests. */ -#define XEN_MSR_PAT _AC(0x050100070406, ULL) +#define XEN_MSR_PAT (X86_MT_WB << 0x00 | \ + X86_MT_WT << 0x08 | \ + X86_MT_UCM << 0x10 | \ + X86_MT_UC << 0x18 | \ + X86_MT_WC << 0x20 | \ + X86_MT_WP << 0x28 | \ + X86_MT_UC << 0x30 | \ + X86_MT_UC << 0x38 | \ + 0)#ifndef __ASSEMBLY__
xen/arch/x86/mm.c +6 -0
@@ -6355,6 +6355,12 @@ unsigned long get_upper_mfn_bound(void)return min (max_mfn,1UL << (paddr_bits -PAGE_SHIFT )) -1 ; } +static void __init __maybe_unused build_assertions (void ) +{ +BUILD_BUG_ON (XEN_MSR_PAT !=0x050100070406ULL && +"wrong XEN_MSR_PAT breaks PV guests" ); +} +/* * Local variables: * mode: C
Signature · 3 lines
Sincerely, Demi Marie Obenour (she/her/hers) Invisible Things Lab
Re: [PATCH v2 04/14] efi: Avoid hard-coding the various PAT constants
In reply to Demi Marie ObenourQuoted 5 lines · Demi Marie Obenour
This makes the code much easier to understand, and avoids problems if Xen's PAT ever changes in the future.
Reviewed-by Jan Beulich <[email protected]>Signed-off-by Demi Marie Obenour <[email protected]>
Nit (quoting docs/process/sending-patches.doc):
In general tags are added in chronological order. So a Reviewed-by: tag should be added **after** the Signed-off-by: tag, as the review happened after the patch was written.
Otherwise it looks like this patch could go in right away, if only it was clear that it's independent of the earlier three (it looks as if it is).
Jan
Re: [PATCH v2 01/14] x86/mm: Avoid hard-coding PAT in get_page_from_l1e()
In reply to Demi Marie ObenourQuoted 3 lines · Demi Marie Obenour
Also force the unused entries to UC and add a comment.
Signed-off-by Demi Marie Obenour <[email protected]>
See my v1 comment as to what further needs saying / justifying.
Jan
Re: [PATCH v2 02/14] p2m-pt: Avoid hard-coding Xen's PAT
In reply to Demi Marie ObenourQuoted 5 lines · Demi Marie Obenour
This makes the code much easier to understand. No functional change intended. As per Andrew Cooper, the existing logic is incorrect, but this does not make it any worse.
Signed-off-by Demi Marie Obenour <[email protected]>
I'm inclined to suggest to prefix "incorrect" by "(now)", or say "questionable" instead. This would give at least a vague hint at what the problem really is (and that the code is merely stale, still matching intentions we no longer have).
Jan
Re: [PATCH v2 06/14] x86: Add memory type constants
In reply to Demi Marie Obenourxen/arch/x86/include/asm/x86-defns.h line 162
Quoted 13 lines · Demi Marie Obenour
xen/arch/x86/include/asm/x86-defns.h +7
-0@@ -153,4 +153,17 @@ (1u << X86_EXC_AC) | (1u << X86_EXC_CP) | \ (1u << X86_EXC_VC) | (1u << X86_EXC_SX)) +/* Memory types */ +#define X86_MT_UC _AC(0x00, ULL)/* uncachable */ +#define X86_MT_WC _AC(0x01, ULL)/* write-combined */ +#define X86_MT_WT _AC(0x04, ULL)/* write-through */ +#define X86_MT_WP _AC(0x05, ULL)/* write-protect */ +#define X86_MT_WB _AC(0x06, ULL)/* write-back */ +#define X86_MT_UCM _AC(0x07, ULL)/* UC- */
I'm guessing that you use ULL here to simplify arithmetic when constructing PAT MSR values, but did you also check that this doesn't lead to compilers needlessly doing calculations in 64 bits when 32-bit (or yet more narrow) operation would suffice?
xen/arch/x86/include/asm/x86-defns.h line 163
Quoted 1 line
xen/arch/x86/include/asm/x86-defns.h +1
-0+#define X86_NUM_MT _AC(0x08, ULL)
This pretty certainly doesn't need ULL, and no use of _AC() at all.
xen/arch/x86/include/asm/x86-defns.h line 167
Quoted 3 lines
xen/arch/x86/include/asm/x86-defns.h +3
-0+/* Reserved memory types (cannot be used) */ +#define X86_MT_RESERVED_1 _AC(0x02, ULL) +#define X86_MT_RESERVED_2 _AC(0x03, ULL)
I think it would be better if the left hand numbers matched the right hand ones here.
Jan
Re: [PATCH v2 07/14] x86: Replace PAT_* with X86_MT_*
In reply to Demi Marie ObenourQuoted 4 lines · Demi Marie Obenour
This allows eliminating the former.
Suggested-by Andrew Cooper <[email protected]>Signed-off-by Demi Marie Obenour <[email protected]>
with a couple of small remarks (some asking for minor adjustments):
xen/arch/x86/hvm/mtrr.c static uint8_t __read_mostly mtrr_epat_tbl[MTRR_NUM_TYPES][MEMORY_NUM_TYPES] = · line 76
Quoted 8 lines
xen/arch/x86/hvm/mtrr.c +2
-2@@ -72,8 +72,8 @@ static uint8_t __read_mostly mtrr_epat_tbl[MTRR_NUM_TYPES][MEMORY_NUM_TYPES] = };/* Lookup table for PAT entry of a given PAT value in host PAT. */ -static uint8_t __read_mostly pat_entry_tbl[PAT_TYPE_NUMS ] = - { [0 ...PAT_TYPE_NUMS -1 ] =INVALID_MEM_TYPE }; +static uint8_t __read_mostly pat_entry_tbl[X86_NUM_MT ] = + { [0 ...X86_NUM_MT -1 ] =INVALID_MEM_TYPE };
When touching code like this, please also correct style (here: missing blanks around '-').
Quoted 10 lines
xen/arch/x86/hvm/mtrr.c +0
-6@@ -145,14 +145,14 @@ int hvm_vcpu_cacheattr_init(struct vcpu *v) m->mtrr_cap = (1u <<10 ) | (1u <<8 ) | num_var_ranges; v->arch.hvm.pat_cr = - ((uint64_t )PAT_TYPE_WRBACK ) |/* PAT0: WB */ - ((uint64_t )PAT_TYPE_WRTHROUGH <<8 ) |/* PAT1: WT */ - ((uint64_t )PAT_TYPE_UC_MINUS <<16 ) |/* PAT2: UC- */ - ((uint64_t )PAT_TYPE_UNCACHABLE <<24 ) |/* PAT3: UC */ - ((uint64_t )PAT_TYPE_WRBACK <<32 ) |/* PAT4: WB */ - ((uint64_t)PAT_TYPE_WRTHROUGH << 40) | /* PAT5: WT */
xen/arch/x86/hvm/mtrr.c int hvm_vcpu_cacheattr_init(struct vcpu *v) · line 155
Quoted 10 lines
xen/arch/x86/hvm/mtrr.c +8
-2- ((uint64_t )PAT_TYPE_UC_MINUS <<48 ) |/* PAT6: UC- */ - ((uint64_t )PAT_TYPE_UNCACHABLE <<56 );/* PAT7: UC */ + ((uint64_t )X86_MT_WB ) |/* PAT0: WB */ + ((uint64_t )X86_MT_WT <<8 ) |/* PAT1: WT */ + ((uint64_t )X86_MT_UCM <<16 ) |/* PAT2: UC- */ + ((uint64_t )X86_MT_UC <<24 ) |/* PAT3: UC */ + ((uint64_t )X86_MT_WB <<32 ) |/* PAT4: WB */ + ((uint64_t )X86_MT_WT <<40 ) |/* PAT5: WT */ + ((uint64_t )X86_MT_UCM <<48 ) |/* PAT6: UC- */ + ((uint64_t )X86_MT_UC <<56 );/* PAT7: UC */
As per my comment on the earlier patch the casts indeed want to stay, but with how you had the earlier patch I wonder why you did keep them in this version (and elsewhere below as well).
xen/arch/x86/hvm/mtrr.c uint32_t get_pat_flags(struct vcpu *v, · line 359
Quoted 6 lines
xen/arch/x86/hvm/mtrr.c +1
-1@@ -356,7 +356,7 @@ uint32_t get_pat_flags(struct vcpu *v,*/ pat_entry_value = mtrr_epat_tbl[shadow_mtrr_type][guest_eff_mm_type];/* If conflit occurs(e.g host MTRR is UC, guest memory type is -* WB),set UC as effective memory. Here, returning PAT_TYPE_UNCACHABLE will +* WB),set UC as effective memory. Here, returning X86_MT_UC will
Would you mind at least adding the missing blank after the comma while you touch the line?
xen/arch/x86/mm/p2m-ept.c int epte_get_entry_emt(struct domain *d, gfn_t gfn, mfn_t mfn, · line 577
Quoted 9 lines
xen/arch/x86/mm/p2m-ept.c +1
-1@@ -573,7 +573,7 @@ int epte_get_entry_emt(struct domain *d, gfn_t gfn, mfn_t mfn,if ( gmtrr_mtype >=0 ) { *ipat = true; -return gmtrr_mtype !=PAT_TYPE_UC_MINUS ? gmtrr_mtype +return gmtrr_mtype !=X86_MT_UCM ? gmtrr_mtype :MTRR_TYPE_UNCACHABLE ;
Please adjust indentation on this line then as well.
Jan
Re: [PATCH v2 08/14] x86: Replace MTRR_* constants with X86_MT_* constants
In reply to Demi Marie ObenourQuoted 2 lines · Demi Marie Obenour
This allows eliminating most of the former. No functional change intended.
"most" would be nice to accompany by what has to stay, and for what reason. Is this solely about MTRR_NUM_TYPES or more?
xen/arch/x86/include/asm/mtrr.h line 6
Quoted 13 lines
xen/arch/x86/include/asm/mtrr.h +0
-6@@ -3,12 +3,6 @@#include <xen/mm.h> -/* These are the region types. They match the architectural specification. */ -#define MTRR_TYPE_UNCACHABLE 0 -#define MTRR_TYPE_WRCOMB 1 -#define MTRR_TYPE_WRTHROUGH 4 -#define MTRR_TYPE_WRPROT 5 -#define MTRR_TYPE_WRBACK 6#define MTRR_NUM_TYPES 7
May I suggest to use X86_MT_UCM here, matching the transformation you do ...
Quoted 6 lines
xen/arch/x86/include/asm/mtrr.h +0
-2@@ -1426,12 +1426,12 @@ void ept_p2m_uninit(struct p2m_domain *p2m)static const char *memory_type_to_str (unsigned int x) {static const char memory_types[8 ][3 ] = { - [MTRR_TYPE_UNCACHABLE ] ="UC" , - [MTRR_TYPE_WRCOMB ] ="WC" ,
xen/arch/x86/include/asm/mtrr.h void ept_p2m_uninit(struct p2m_domain *p2m) · line 1434
Quoted 10 lines
xen/arch/x86/include/asm/mtrr.h +6
-4- [MTRR_TYPE_WRTHROUGH] = "WT", - [MTRR_TYPE_WRPROT] = "WP", - [MTRR_TYPE_WRBACK] = "WB", - [MTRR_NUM_TYPES ] ="??" + [X86_MT_UC] = "UC", + [X86_MT_WC] = "WC", + [X86_MT_WT] = "WT", + [X86_MT_WP] = "WP", + [X86_MT_WB] = "WB", + [X86_MT_UCM] = "??",
... here (and where I wonder whether MTRR_NUM_TYPES wouldn't better be kept).
Jan