diff options
author | Rusty Russell <rusty@rustcorp.com.au> | 2008-07-22 01:40:46 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-22 04:41:18 -0400 |
commit | c2e3277f875b83e5adc34e96989d6d87ec5f80f7 (patch) | |
tree | c25f6dd50e136d720f8f35d689946b6d256d054b /include | |
parent | 988781dc3e1d9209192b04458d279815923f5e76 (diff) |
x86: fix pte_flags() to only return flags, fix lguest (updated)
(Jeremy said:
rusty: use PTE_MASK
rusty: use PTE_MASK
rusty: use PTE_MASK
When I asked:
jsgf: does that include the NX flag?
He responded eloquently:
rusty: use PTE_MASK
rusty: use PTE_MASK
yes, it's the official constant of masking flags out of ptes
)
Change a15af1c9ea2750a9ff01e51615c45950bad8221b 'x86/paravirt: add
pte_flags to just get pte flags' removed lguest's private pte_flags()
in favor of a generic one.
Unfortunately, the generic one doesn't filter out the non-flags bits:
this results in lguest creating corrupt shadow page tables and blowing
up host memory.
Since noone is supposed to use the pfn part of pte_flags(), it seems
safest to always do the filtering.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Acked-by: Jeremy Fitzhardinge <jeremy@goop.org>
Signed-off-and-morning-tea-spilled-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-x86/page.h | 7 | ||||
-rw-r--r-- | include/asm-x86/paravirt.h | 3 |
2 files changed, 9 insertions, 1 deletions
diff --git a/include/asm-x86/page.h b/include/asm-x86/page.h index 28d7b4533b1a..05d9bea2bfd5 100644 --- a/include/asm-x86/page.h +++ b/include/asm-x86/page.h | |||
@@ -144,6 +144,11 @@ static inline pteval_t native_pte_val(pte_t pte) | |||
144 | return pte.pte; | 144 | return pte.pte; |
145 | } | 145 | } |
146 | 146 | ||
147 | static inline pteval_t native_pte_flags(pte_t pte) | ||
148 | { | ||
149 | return native_pte_val(pte) & ~PTE_MASK; | ||
150 | } | ||
151 | |||
147 | #define pgprot_val(x) ((x).pgprot) | 152 | #define pgprot_val(x) ((x).pgprot) |
148 | #define __pgprot(x) ((pgprot_t) { (x) } ) | 153 | #define __pgprot(x) ((pgprot_t) { (x) } ) |
149 | 154 | ||
@@ -165,7 +170,7 @@ static inline pteval_t native_pte_val(pte_t pte) | |||
165 | #endif | 170 | #endif |
166 | 171 | ||
167 | #define pte_val(x) native_pte_val(x) | 172 | #define pte_val(x) native_pte_val(x) |
168 | #define pte_flags(x) native_pte_val(x) | 173 | #define pte_flags(x) native_pte_flags(x) |
169 | #define __pte(x) native_make_pte(x) | 174 | #define __pte(x) native_make_pte(x) |
170 | 175 | ||
171 | #endif /* CONFIG_PARAVIRT */ | 176 | #endif /* CONFIG_PARAVIRT */ |
diff --git a/include/asm-x86/paravirt.h b/include/asm-x86/paravirt.h index aec9767836b6..5ca4639dc7dd 100644 --- a/include/asm-x86/paravirt.h +++ b/include/asm-x86/paravirt.h | |||
@@ -1088,6 +1088,9 @@ static inline pteval_t pte_flags(pte_t pte) | |||
1088 | ret = PVOP_CALL1(pteval_t, pv_mmu_ops.pte_flags, | 1088 | ret = PVOP_CALL1(pteval_t, pv_mmu_ops.pte_flags, |
1089 | pte.pte); | 1089 | pte.pte); |
1090 | 1090 | ||
1091 | #ifdef CONFIG_PARAVIRT_DEBUG | ||
1092 | BUG_ON(ret & PTE_MASK); | ||
1093 | #endif | ||
1091 | return ret; | 1094 | return ret; |
1092 | } | 1095 | } |
1093 | 1096 | ||