xen-devel.lists.xenproject.org archive mirror
 help / color / mirror / Atom feed
From: Wei Liu <wei.liu2@citrix.com>
To: Xen-devel <xen-devel@lists.xenproject.org>
Cc: Andrew Cooper <andrew.cooper3@citrix.com>,
	Wei Liu <wei.liu2@citrix.com>, Jan Beulich <JBeulich@suse.com>
Subject: [PATCH v6 2/9] x86/mm: move disallow masks to pv/mm.h
Date: Tue, 13 Feb 2018 20:04:01 +0000	[thread overview]
Message-ID: <20180213200408.5463-3-wei.liu2@citrix.com> (raw)
In-Reply-To: <20180213200408.5463-1-wei.liu2@citrix.com>

This is in preparation for adding an extra parameter to
get_page_from_l1e for disallow mask.

No functional change.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
 xen/arch/x86/mm.c    | 19 +------------------
 xen/arch/x86/pv/mm.h | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c
index 97ec467002..bfa0a6436c 100644
--- a/xen/arch/x86/mm.c
+++ b/xen/arch/x86/mm.c
@@ -153,24 +153,7 @@ bool __read_mostly machine_to_phys_mapping_valid;
 
 struct rangeset *__read_mostly mmio_ro_ranges;
 
-static uint32_t base_disallow_mask;
-/* Global bit is allowed to be set on L1 PTEs. Intended for user mappings. */
-#define L1_DISALLOW_MASK ((base_disallow_mask | _PAGE_GNTTAB) & ~_PAGE_GLOBAL)
-
-#define L2_DISALLOW_MASK base_disallow_mask
-
-#define l3_disallow_mask(d) (!is_pv_32bit_domain(d) ? \
-                             base_disallow_mask : 0xFFFFF198U)
-
-#define L4_DISALLOW_MASK (base_disallow_mask)
-
-#define l1_disallow_mask(d)                                     \
-    ((d != dom_io) &&                                           \
-     (rangeset_is_empty((d)->iomem_caps) &&                     \
-      rangeset_is_empty((d)->arch.ioport_caps) &&               \
-      !has_arch_pdevs(d) &&                                     \
-      is_pv_domain(d)) ?                                        \
-     L1_DISALLOW_MASK : (L1_DISALLOW_MASK & ~PAGE_CACHE_ATTRS))
+uint32_t base_disallow_mask;
 
 static s8 __read_mostly opt_mmio_relax;
 
diff --git a/xen/arch/x86/pv/mm.h b/xen/arch/x86/pv/mm.h
index 976209ba4c..84ca71bd08 100644
--- a/xen/arch/x86/pv/mm.h
+++ b/xen/arch/x86/pv/mm.h
@@ -1,6 +1,25 @@
 #ifndef __PV_MM_H__
 #define __PV_MM_H__
 
+extern uint32_t base_disallow_mask;
+/* Global bit is allowed to be set on L1 PTEs. Intended for user mappings. */
+#define L1_DISALLOW_MASK ((base_disallow_mask | _PAGE_GNTTAB) & ~_PAGE_GLOBAL)
+
+#define L2_DISALLOW_MASK base_disallow_mask
+
+#define l3_disallow_mask(d) (!is_pv_32bit_domain(d) ? \
+                             base_disallow_mask : 0xFFFFF198U)
+
+#define L4_DISALLOW_MASK (base_disallow_mask)
+
+#define l1_disallow_mask(d)                                     \
+    ((d != dom_io) &&                                           \
+     (rangeset_is_empty((d)->iomem_caps) &&                     \
+      rangeset_is_empty((d)->arch.ioport_caps) &&               \
+      !has_arch_pdevs(d) &&                                     \
+      is_pv_domain(d)) ?                                        \
+     L1_DISALLOW_MASK : (L1_DISALLOW_MASK & ~PAGE_CACHE_ATTRS))
+
 l1_pgentry_t *map_guest_l1e(unsigned long linear, mfn_t *gl1mfn);
 
 int new_guest_cr3(mfn_t mfn);
-- 
2.11.0


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

  parent reply	other threads:[~2018-02-13 20:05 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-02-13 20:03 [PATCH v6 0/9] x86: refactor mm.c Wei Liu
2018-02-13 20:04 ` [PATCH v6 1/9] x86/mm: add pv prefix to {alloc, free}_page_type Wei Liu
2018-03-08 17:03   ` Jan Beulich
2018-03-08 17:05   ` Jan Beulich
2018-02-13 20:04 ` Wei Liu [this message]
2018-02-13 20:04 ` [PATCH v6 3/9] x86/mm: add disallow_mask parameter to get_page_from_l1e Wei Liu
2018-03-13 15:54   ` Jan Beulich
2018-03-19 12:10     ` Tim Deegan
2018-02-13 20:04 ` [PATCH v6 4/9] x86/mm: add pv prefix to _put_final_page_type Wei Liu
2018-03-13 15:55   ` Jan Beulich
2018-02-13 20:04 ` [PATCH v6 5/9] x86/mm: factor out pv_dec_linear_pt Wei Liu
2018-03-13 15:59   ` Jan Beulich
2018-02-13 20:04 ` [PATCH v6 6/9] x86/mm: export set_tlbflush_timestamp Wei Liu
2018-03-13 16:06   ` Jan Beulich
2018-02-13 20:04 ` [PATCH v6 7/9] x86/mm: provide put_page_type_ptpg{, _preemptible} Wei Liu
2018-03-13 16:10   ` Jan Beulich
2018-03-13 16:17   ` Jan Beulich
2018-02-13 20:04 ` [PATCH v6 8/9] x86/mm: move PV code to pv/mm.c Wei Liu
2018-02-13 20:04 ` [PATCH v6 9/9] x86/mm: remove now unused inclusion of pv/mm.h Wei Liu
2018-03-08 12:17 ` [PATCH v6 0/9] x86: refactor mm.c Wei Liu
2018-03-08 12:36   ` Jan Beulich

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180213200408.5463-3-wei.liu2@citrix.com \
    --to=wei.liu2@citrix.com \
    --cc=JBeulich@suse.com \
    --cc=andrew.cooper3@citrix.com \
    --cc=xen-devel@lists.xenproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
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).