* [PATCH] x86/mm: Clean up the construction of base_disallow_mask
@ 2016-08-01 10:05 Andrew Cooper
2016-08-01 15:42 ` Jan Beulich
0 siblings, 1 reply; 2+ messages in thread
From: Andrew Cooper @ 2016-08-01 10:05 UTC (permalink / raw)
To: Xen-devel; +Cc: George Dunlap, Andrew Cooper, Tim Deegan, Jan Beulich
* Use _PAGE_AVAIL_HIGH and _PAGE_NX instead of opencoding them
* Drop further remenants of the 32bit hypervisor build
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
CC: Jan Beulich <JBeulich@suse.com>
CC: Tim Deegan <tim@xen.org>
CC: George Dunlap <george.dunlap@eu.citrix.com>
---
xen/arch/x86/mm.c | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c
index 56ca19f..109b8be 100644
--- a/xen/arch/x86/mm.c
+++ b/xen/arch/x86/mm.c
@@ -271,14 +271,13 @@ void __init arch_init_memory(void)
{
unsigned long i, pfn, rstart_pfn, rend_pfn, iostart_pfn, ioend_pfn;
- /* Basic guest-accessible flags: PRESENT, R/W, USER, A/D, AVAIL[0,1,2] */
- base_disallow_mask = ~(_PAGE_PRESENT|_PAGE_RW|_PAGE_USER|
- _PAGE_ACCESSED|_PAGE_DIRTY|_PAGE_AVAIL);
- /* Allow guest access to the NX flag if hardware supports it. */
- if ( cpu_has_nx )
- base_disallow_mask &= ~_PAGE_NX_BIT;
- /* On x86/64, range [62:52] is available for guest software use. */
- base_disallow_mask &= ~get_pte_flags((intpte_t)0x7ff << 52);
+ /*
+ * Basic guest-accessible flags:
+ * PRESENT, R/W, USER, A/D, AVAIL[0,1,2], AVAIL_HIGH, NX (if available).
+ */
+ base_disallow_mask =
+ ~(_PAGE_PRESENT | _PAGE_RW | _PAGE_USER | _PAGE_ACCESSED |
+ _PAGE_DIRTY | _PAGE_AVAIL | _PAGE_AVAIL_HIGH | _PAGE_NX);
/*
* Initialise our DOMID_XEN domain.
--
2.1.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] x86/mm: Clean up the construction of base_disallow_mask
2016-08-01 10:05 [PATCH] x86/mm: Clean up the construction of base_disallow_mask Andrew Cooper
@ 2016-08-01 15:42 ` Jan Beulich
0 siblings, 0 replies; 2+ messages in thread
From: Jan Beulich @ 2016-08-01 15:42 UTC (permalink / raw)
To: Andrew Cooper; +Cc: George Dunlap, Tim Deegan, Xen-devel
>>> On 01.08.16 at 12:05, <andrew.cooper3@citrix.com> wrote:
> * Use _PAGE_AVAIL_HIGH and _PAGE_NX instead of opencoding them
> * Drop further remenants of the 32bit hypervisor build
>
> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Reviewed-by: Jan Beulich <jbeulich@suse.com>
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-08-01 15:42 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-08-01 10:05 [PATCH] x86/mm: Clean up the construction of base_disallow_mask Andrew Cooper
2016-08-01 15:42 ` Jan Beulich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).