|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-changelog] [xen master] x86/HVM: use manifest constants / enumerators for memory types
commit 9963a1aa033ce7716dd55659787ba99210066b24
Author: Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Mon Mar 10 11:05:51 2014 +0100
Commit: Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Mon Mar 10 11:05:51 2014 +0100
x86/HVM: use manifest constants / enumerators for memory types
... instead of literal numbers, thus making it possible for the reader
to understand the code without having to look up the meaning of these
numbers.
Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
Acked-by: Keir Fraser <keir@xxxxxxx>
---
xen/arch/x86/hvm/hvm.c | 13 ++++++--
xen/arch/x86/hvm/mtrr.c | 74 ++++++++++++++++++++++++++------------------
xen/include/asm-x86/mtrr.h | 1 -
3 files changed, 54 insertions(+), 34 deletions(-)
diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c
index ae24211..2fa5775 100644
--- a/xen/arch/x86/hvm/hvm.c
+++ b/xen/arch/x86/hvm/hvm.c
@@ -235,9 +235,16 @@ int hvm_set_guest_pat(struct vcpu *v, u64 guest_pat)
uint8_t *value = (uint8_t *)&guest_pat;
for ( i = 0; i < 8; i++ )
- if ( unlikely(!(value[i] == 0 || value[i] == 1 ||
- value[i] == 4 || value[i] == 5 ||
- value[i] == 6 || value[i] == 7)) ) {
+ switch ( value[i] )
+ {
+ 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:
+ break;
+ default:
HVM_DBG_LOG(DBG_LEVEL_MSR, "invalid guest PAT: %"PRIx64"\n",
guest_pat);
return 0;
diff --git a/xen/arch/x86/hvm/mtrr.c b/xen/arch/x86/hvm/mtrr.c
index dd1561e..229bf1d 100644
--- a/xen/arch/x86/hvm/mtrr.c
+++ b/xen/arch/x86/hvm/mtrr.c
@@ -42,22 +42,28 @@ 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][PAT_TYPE_NUMS] = {
-/********PAT(UC,WC,RS,RS,WT,WP,WB,UC-)*/
-/* RS means reserved type(2,3), and type is hardcoded here */
- /*MTRR(UC):(UC,WC,RS,RS,UC,UC,UC,UC)*/
- {0, 1, 2, 2, 0, 0, 0, 0},
- /*MTRR(WC):(UC,WC,RS,RS,UC,UC,WC,WC)*/
- {0, 1, 2, 2, 0, 0, 1, 1},
- /*MTRR(RS):(RS,RS,RS,RS,RS,RS,RS,RS)*/
- {2, 2, 2, 2, 2, 2, 2, 2},
- /*MTRR(RS):(RS,RS,RS,RS,RS,RS,RS,RS)*/
- {2, 2, 2, 2, 2, 2, 2, 2},
- /*MTRR(WT):(UC,WC,RS,RS,WT,WP,WT,UC)*/
- {0, 1, 2, 2, 4, 5, 4, 0},
- /*MTRR(WP):(UC,WC,RS,RS,WT,WP,WP,WC)*/
- {0, 1, 2, 2, 4, 5, 5, 1},
- /*MTRR(WB):(UC,WC,RS,RS,WT,WP,WB,UC)*/
- {0, 1, 2, 2, 4, 5, 6, 0}
+#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
+
+/* PAT(UC, WC, RS, RS, WT, WP, WB, UC-) */
+/* MTRR(UC) */ {UC, WC, RS, RS, UC, UC, UC, UC},
+/* MTRR(WC) */ {UC, WC, RS, RS, UC, UC, WC, WC},
+/* MTRR(RS) */ {RS, RS, RS, RS, RS, RS, RS, RS},
+/* MTRR(RS) */ {RS, RS, RS, RS, RS, RS, RS, RS},
+/* MTRR(WT) */ {UC, WC, RS, RS, WT, WP, WT, UC},
+/* MTRR(WP) */ {UC, WC, RS, RS, WT, WP, WP, WC},
+/* MTRR(WB) */ {UC, WC, RS, RS, WT, WP, WB, UC}
+
+#undef UC
+#undef WC
+#undef WT
+#undef WP
+#undef WB
+#undef RS
};
/*
@@ -301,11 +307,12 @@ static uint8_t get_mtrr_type(struct mtrr_state *m,
paddr_t pa)
*/
return overlap_mtrr_pos;
- if ( overlap_mtrr & 0x1 )
+ if ( overlap_mtrr & (1 << MTRR_TYPE_UNCACHABLE) )
/* Two or more match, one is UC. */
return MTRR_TYPE_UNCACHABLE;
- if ( !(overlap_mtrr & 0xaf) )
+ if ( !(overlap_mtrr &
+ ~((1 << MTRR_TYPE_WRTHROUGH) | (1 << MTRR_TYPE_WRBACK))) )
/* Two or more match, WT and WB. */
return MTRR_TYPE_WRTHROUGH;
@@ -403,13 +410,26 @@ uint32_t get_pat_flags(struct vcpu *v,
return pat_type_2_pte_flags(pat_entry_value);
}
+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:
+ return 1;
+ }
+ return 0;
+}
+
bool_t mtrr_def_type_msr_set(struct mtrr_state *m, uint64_t msr_content)
{
uint8_t def_type = msr_content & 0xff;
uint8_t enabled = (msr_content >> 10) & 0x3;
- if ( unlikely(!(def_type == 0 || def_type == 1 || def_type == 4 ||
- def_type == 5 || def_type == 6)) )
+ if ( unlikely(!valid_mtrr_type(def_type)) )
{
HVM_DBG_LOG(DBG_LEVEL_MSR, "invalid MTRR def type:%x\n", def_type);
return 0;
@@ -436,15 +456,11 @@ bool_t mtrr_fix_range_msr_set(struct mtrr_state *m,
uint32_t row,
if ( fixed_range_base[row] != msr_content )
{
uint8_t *range = (uint8_t*)&msr_content;
- int32_t i, type;
+ unsigned int i;
for ( i = 0; i < 8; i++ )
- {
- type = range[i];
- if ( unlikely(!(type == 0 || type == 1 ||
- type == 4 || type == 5 || type == 6)) )
+ if ( unlikely(!valid_mtrr_type(range[i])) )
return 0;
- }
fixed_range_base[row] = msr_content;
}
@@ -455,7 +471,7 @@ bool_t mtrr_fix_range_msr_set(struct mtrr_state *m,
uint32_t row,
bool_t mtrr_var_range_msr_set(
struct domain *d, struct mtrr_state *m, uint32_t msr, uint64_t msr_content)
{
- uint32_t index, type, phys_addr, eax, ebx, ecx, edx;
+ uint32_t index, phys_addr, eax, ebx, ecx, edx;
uint64_t msr_mask;
uint64_t *var_range_base = (uint64_t*)m->var_ranges;
@@ -463,9 +479,7 @@ bool_t mtrr_var_range_msr_set(
if ( var_range_base[index] == msr_content )
return 1;
- type = (uint8_t)msr_content;
- if ( unlikely(!(type == 0 || type == 1 ||
- type == 4 || type == 5 || type == 6)) )
+ if ( unlikely(!valid_mtrr_type((uint8_t)msr_content)) )
return 0;
phys_addr = 36;
diff --git a/xen/include/asm-x86/mtrr.h b/xen/include/asm-x86/mtrr.h
index 6b4d632..6ef0e2d 100644
--- a/xen/include/asm-x86/mtrr.h
+++ b/xen/include/asm-x86/mtrr.h
@@ -20,7 +20,6 @@
enum {
PAT_TYPE_UNCACHABLE=0,
PAT_TYPE_WRCOMB=1,
- PAT_TYPE_RESERVED=2,
PAT_TYPE_WRTHROUGH=4,
PAT_TYPE_WRPROT=5,
PAT_TYPE_WRBACK=6,
--
generated by git-patchbot for /home/xen/git/xen.git#master
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |