From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
To: xen-devel@lists.xenproject.org, konrad@kernel.org,
ross.lagerwall@citrix.com, mpohlack@amazon.com,
andrew.cooper3@citrix.com, sasha.levin@oracle.com
Cc: George Dunlap <george.dunlap@eu.citrix.com>,
Jan Beulich <JBeulich@suse.com>,
Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Subject: [PATCH v8.1 09/27] x86/mm: Introduce modify_xen_mappings()
Date: Wed, 13 Apr 2016 18:01:50 -0400 [thread overview]
Message-ID: <1460584928-32440-10-git-send-email-konrad.wilk@oracle.com> (raw)
In-Reply-To: <1460584928-32440-1-git-send-email-konrad.wilk@oracle.com>
From: Andrew Cooper <andrew.cooper3@citrix.com>
To simply change the permissions on existing Xen mappings. The existing
destroy_xen_mappings() is altered to support a change the PTE permissions.
A new destroy_xen_mappings() is introduced, as the special case of not passing
_PAGE_PRESENT to modify_xen_mappings().
As cleanup (and an ideal functional test), the boot logic which remaps Xen's
code and data with reduced permissions is altered to use
modify_xen_mappings(), rather than map_pages_to_xen() passing the same mfn's
back in.
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Reviewed-by: George Dunlap <george.dunlap@citrix.com>
Reviewed-by: Jan Beulich <jbeulich@suse.com>
---
CC: Jan Beulich <JBeulich@suse.com>
CC: George Dunlap <george.dunlap@eu.citrix.com>
v7: New
v8:
* Allow callers to pass PAGE_HYPERVISOR_xxx constants, for consistently with
similar functions.
* Replace one opencoded 0 with its logical equivalent, _PAGE_NONE.
* Add check for creating new mappings of 4K entries.
* Correct the continue logic. Invert the sense of the comment to match the
code.
* Added Reviewed-by George and Jan. Fix missing "are" in comment.
---
---
xen/arch/x86/mm.c | 75 +++++++++++++++++++++++++++++++++++++++++++++-------
xen/arch/x86/setup.c | 22 +++++++--------
xen/include/xen/mm.h | 2 ++
3 files changed, 76 insertions(+), 23 deletions(-)
diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c
index ca2d0bb..73798c3 100644
--- a/xen/arch/x86/mm.c
+++ b/xen/arch/x86/mm.c
@@ -5956,7 +5956,19 @@ int populate_pt_range(unsigned long virt, unsigned long mfn,
return map_pages_to_xen(virt, mfn, nr_mfns, MAP_SMALL_PAGES);
}
-void destroy_xen_mappings(unsigned long s, unsigned long e)
+/*
+ * Alter the permissions of a range of Xen virtual address space.
+ *
+ * Does not create new mappings, and does not modify the mfn in existing
+ * mappings, but will shatter superpages if necessary, and will destroy
+ * mappings if not passed _PAGE_PRESENT.
+ *
+ * The only flags considered are NX, RW and PRESENT. All other input flags
+ * are ignored.
+ *
+ * It is an error to call with present flags over an unpopulated range.
+ */
+void modify_xen_mappings(unsigned long s, unsigned long e, unsigned int nf)
{
bool_t locking = system_state > SYS_STATE_boot;
l2_pgentry_t *pl2e;
@@ -5964,6 +5976,10 @@ void destroy_xen_mappings(unsigned long s, unsigned long e)
unsigned int i;
unsigned long v = s;
+ /* Set of valid PTE bits which may be altered. */
+#define FLAGS_MASK (_PAGE_NX|_PAGE_RW|_PAGE_PRESENT)
+ nf &= FLAGS_MASK;
+
ASSERT(IS_ALIGNED(s, PAGE_SIZE));
ASSERT(IS_ALIGNED(e, PAGE_SIZE));
@@ -5973,6 +5989,9 @@ void destroy_xen_mappings(unsigned long s, unsigned long e)
if ( !(l3e_get_flags(*pl3e) & _PAGE_PRESENT) )
{
+ /* Confirm the caller isn't trying to create new mappings. */
+ ASSERT(!(nf & _PAGE_PRESENT));
+
v += 1UL << L3_PAGETABLE_SHIFT;
v &= ~((1UL << L3_PAGETABLE_SHIFT) - 1);
continue;
@@ -5984,8 +6003,12 @@ void destroy_xen_mappings(unsigned long s, unsigned long e)
l1_table_offset(v) == 0 &&
((e - v) >= (1UL << L3_PAGETABLE_SHIFT)) )
{
- /* PAGE1GB: whole superpage is destroyed. */
- l3e_write_atomic(pl3e, l3e_empty());
+ /* PAGE1GB: whole superpage is modified. */
+ l3_pgentry_t nl3e = !(nf & _PAGE_PRESENT) ? l3e_empty()
+ : l3e_from_pfn(l3e_get_pfn(*pl3e),
+ (l3e_get_flags(*pl3e) & ~FLAGS_MASK) | nf);
+
+ l3e_write_atomic(pl3e, nl3e);
v += 1UL << L3_PAGETABLE_SHIFT;
continue;
}
@@ -6016,6 +6039,9 @@ void destroy_xen_mappings(unsigned long s, unsigned long e)
if ( !(l2e_get_flags(*pl2e) & _PAGE_PRESENT) )
{
+ /* Confirm the caller isn't trying to create new mappings. */
+ ASSERT(!(nf & _PAGE_PRESENT));
+
v += 1UL << L2_PAGETABLE_SHIFT;
v &= ~((1UL << L2_PAGETABLE_SHIFT) - 1);
continue;
@@ -6026,8 +6052,12 @@ void destroy_xen_mappings(unsigned long s, unsigned long e)
if ( (l1_table_offset(v) == 0) &&
((e-v) >= (1UL << L2_PAGETABLE_SHIFT)) )
{
- /* PSE: whole superpage is destroyed. */
- l2e_write_atomic(pl2e, l2e_empty());
+ /* PSE: whole superpage is modified. */
+ l2_pgentry_t nl2e = !(nf & _PAGE_PRESENT) ? l2e_empty()
+ : l2e_from_pfn(l2e_get_pfn(*pl2e),
+ (l2e_get_flags(*pl2e) & ~FLAGS_MASK) | nf);
+
+ l2e_write_atomic(pl2e, nl2e);
v += 1UL << L2_PAGETABLE_SHIFT;
}
else
@@ -6055,13 +6085,27 @@ void destroy_xen_mappings(unsigned long s, unsigned long e)
}
else
{
+ l1_pgentry_t nl1e;
+
/* Ordinary 4kB mapping. */
pl1e = l2e_to_l1e(*pl2e) + l1_table_offset(v);
- l1e_write_atomic(pl1e, l1e_empty());
+
+ /* Confirm the caller isn't trying to create new mappings. */
+ if ( !(l1e_get_flags(*pl1e) & _PAGE_PRESENT) )
+ ASSERT(!(nf & _PAGE_PRESENT));
+
+ nl1e = !(nf & _PAGE_PRESENT) ? l1e_empty()
+ : l1e_from_pfn(l1e_get_pfn(*pl1e),
+ (l1e_get_flags(*pl1e) & ~FLAGS_MASK) | nf);
+
+ l1e_write_atomic(pl1e, nl1e);
v += PAGE_SIZE;
- /* If we are done with the L2E, check if it is now empty. */
- if ( (v != e) && (l1_table_offset(v) != 0) )
+ /*
+ * If we not destroying mappings, or are not done with the L2E,
+ * skip the empty&free check.
+ */
+ if ( (nf & _PAGE_PRESENT) || ((v != e) && (l1_table_offset(v) != 0)) )
continue;
pl1e = l2e_to_l1e(*pl2e);
for ( i = 0; i < L1_PAGETABLE_ENTRIES; i++ )
@@ -6076,8 +6120,12 @@ void destroy_xen_mappings(unsigned long s, unsigned long e)
}
}
- /* If we are done with the L3E, check if it is now empty. */
- if ( (v != e) && (l2_table_offset(v) + l1_table_offset(v) != 0) )
+ /*
+ * If we are not destroying mappings, or not done with the L3E,
+ * skip the empty&free check.
+ */
+ if ( (nf & _PAGE_PRESENT) ||
+ ((v != e) && (l2_table_offset(v) + l1_table_offset(v) != 0)) )
continue;
pl2e = l3e_to_l2e(*pl3e);
for ( i = 0; i < L2_PAGETABLE_ENTRIES; i++ )
@@ -6093,10 +6141,17 @@ void destroy_xen_mappings(unsigned long s, unsigned long e)
}
flush_area(NULL, FLUSH_TLB_GLOBAL);
+
+#undef FLAGS_MASK
}
#undef flush_area
+void destroy_xen_mappings(unsigned long s, unsigned long e)
+{
+ modify_xen_mappings(s, e, _PAGE_NONE);
+}
+
void __set_fixmap(
enum fixed_addresses idx, unsigned long mfn, unsigned long flags)
{
diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c
index 22dc148..5029568 100644
--- a/xen/arch/x86/setup.c
+++ b/xen/arch/x86/setup.c
@@ -1220,23 +1220,19 @@ void __init noreturn __start_xen(unsigned long mbi_p)
if ( !using_2M_mapping() )
{
/* Mark .text as RX (avoiding the first 2M superpage). */
- map_pages_to_xen(XEN_VIRT_START + MB(2),
- PFN_DOWN(__pa(XEN_VIRT_START + MB(2))),
- PFN_DOWN(__2M_text_end -
- (const char *)(XEN_VIRT_START + MB(2))),
- PAGE_HYPERVISOR_RX);
+ modify_xen_mappings(XEN_VIRT_START + MB(2),
+ (unsigned long)&__2M_text_end,
+ PAGE_HYPERVISOR_RX);
/* Mark .rodata as RO. */
- map_pages_to_xen((unsigned long)&__2M_rodata_start,
- PFN_DOWN(__pa(__2M_rodata_start)),
- PFN_DOWN(__2M_rodata_end - __2M_rodata_start),
- PAGE_HYPERVISOR_RO);
+ modify_xen_mappings((unsigned long)&__2M_rodata_start,
+ (unsigned long)&__2M_rodata_end,
+ PAGE_HYPERVISOR_RO);
/* Mark .data and .bss as RW. */
- map_pages_to_xen((unsigned long)&__2M_rwdata_start,
- PFN_DOWN(__pa(__2M_rwdata_start)),
- PFN_DOWN(__2M_rwdata_end - __2M_rwdata_start),
- PAGE_HYPERVISOR_RW);
+ modify_xen_mappings((unsigned long)&__2M_rwdata_start,
+ (unsigned long)&__2M_rwdata_end,
+ PAGE_HYPERVISOR_RW);
/* Drop the remaining mappings in the shattered superpage. */
destroy_xen_mappings((unsigned long)&__2M_rwdata_end,
diff --git a/xen/include/xen/mm.h b/xen/include/xen/mm.h
index d62394f..d4721fc 100644
--- a/xen/include/xen/mm.h
+++ b/xen/include/xen/mm.h
@@ -103,6 +103,8 @@ int map_pages_to_xen(
unsigned long mfn,
unsigned long nr_mfns,
unsigned int flags);
+/* Alter the permissions of a range of Xen virtual address space. */
+void modify_xen_mappings(unsigned long s, unsigned long e, unsigned int flags);
void destroy_xen_mappings(unsigned long v, unsigned long e);
/*
* Create only non-leaf page table entries for the
--
2.5.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
next prev parent reply other threads:[~2016-04-13 22:02 UTC|newest]
Thread overview: 126+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-13 22:01 [PATCH v8.1] xSplice v1 design and implementation Konrad Rzeszutek Wilk
2016-04-13 22:01 ` [PATCH v8.1 01/27] Revert "libxc/libxl/python/xenstat/ocaml: Use new XEN_VERSION hypercall" Konrad Rzeszutek Wilk
2016-04-13 22:01 ` [PATCH v8.1 02/27] Revert "HYPERCALL_version_op. New hypercall mirroring XENVER_ but sane." Konrad Rzeszutek Wilk
2016-04-14 16:14 ` Jan Beulich
2016-04-13 22:01 ` [PATCH v8.1 03/27] xsplice: Design document Konrad Rzeszutek Wilk
2016-04-13 22:01 ` [PATCH v8.1 04/27] xen/xsplice: Hypervisor implementation of XEN_XSPLICE_op Konrad Rzeszutek Wilk
2016-04-14 16:36 ` Jan Beulich
2016-04-15 2:28 ` Konrad Rzeszutek Wilk
2016-04-17 8:05 ` Jan Beulich
2016-04-18 7:48 ` Konrad Rzeszutek Wilk
2016-04-18 16:33 ` Jan Beulich
2016-04-19 10:14 ` Konrad Rzeszutek Wilk
2016-04-13 22:01 ` [PATCH v8.1 05/27] libxc: Implementation of XEN_XSPLICE_op in libxc Konrad Rzeszutek Wilk
2016-04-13 22:01 ` [PATCH v8.1 06/27] xen-xsplice: Tool to manipulate xsplice payloads Konrad Rzeszutek Wilk
2016-04-13 22:01 ` [PATCH v8.1 07/27] arm/x86: Use struct virtual_region to do bug, symbol, and (x86) exception tables lookup Konrad Rzeszutek Wilk
2016-04-14 16:50 ` Jan Beulich
2016-04-13 22:01 ` [PATCH v8.1 08/27] arm/x86/vmap: Add vmalloc_xen, vfree_xen and vm_init_type Konrad Rzeszutek Wilk
2016-04-17 20:17 ` Jan Beulich
2016-04-13 22:01 ` Konrad Rzeszutek Wilk [this message]
2016-04-14 4:07 ` [PATCH v8.1 09/27] x86/mm: Introduce modify_xen_mappings() Jan Beulich
2016-04-14 13:34 ` Konrad Rzeszutek Wilk
2016-04-13 22:01 ` [PATCH v8.1 10/27] xsplice: Add helper elf routines Konrad Rzeszutek Wilk
2016-04-17 20:55 ` Jan Beulich
2016-04-18 5:53 ` Konrad Rzeszutek Wilk
2016-04-18 6:23 ` Jan Beulich
2016-04-20 16:07 ` Konrad Rzeszutek Wilk
2016-04-20 16:59 ` Jan Beulich
2016-04-13 22:01 ` [PATCH v8.1 11/27] xsplice: Implement payload loading Konrad Rzeszutek Wilk
2016-04-18 6:16 ` Jan Beulich
2016-04-20 15:59 ` Konrad Rzeszutek Wilk
2016-04-20 17:05 ` Jan Beulich
2016-04-20 17:36 ` Konrad Rzeszutek Wilk
2016-04-21 6:41 ` Jan Beulich
2016-04-21 15:15 ` Konrad Rzeszutek Wilk
2016-04-21 15:36 ` Jan Beulich
2016-04-21 16:47 ` Konrad Rzeszutek Wilk
2016-04-22 7:40 ` Jan Beulich
2016-04-13 22:01 ` [PATCH v8.1 12/27] xsplice: Implement support for applying/reverting/replacing patches Konrad Rzeszutek Wilk
2016-04-19 6:27 ` Jan Beulich
2016-04-21 0:28 ` Konrad Rzeszutek Wilk
2016-04-21 6:44 ` Jan Beulich
2016-04-21 20:27 ` Konrad Rzeszutek Wilk
2016-04-22 7:44 ` Jan Beulich
2016-04-22 10:51 ` Konrad Rzeszutek Wilk
2016-04-22 17:26 ` Konrad Rzeszutek Wilk
2016-04-25 7:55 ` Jan Beulich
2016-04-13 22:01 ` [PATCH v8.1 13/27] x86/xen_hello_world.xsplice: Test payload for patching 'xen_extra_version' Konrad Rzeszutek Wilk
2016-04-19 17:40 ` Jan Beulich
2016-04-20 16:10 ` Konrad Rzeszutek Wilk
2016-04-20 17:06 ` Jan Beulich
2016-04-13 22:01 ` [PATCH v8.1 14/27] xsplice, symbols: Implement symbol name resolution on address Konrad Rzeszutek Wilk
2016-04-19 19:31 ` Jan Beulich
2016-04-20 12:55 ` Ross Lagerwall
2016-04-21 0:26 ` Konrad Rzeszutek Wilk
2016-04-21 6:46 ` Jan Beulich
[not found] ` <CACJDEmrucgYZpCDv3EAkDJUOtdcP9P2T=Vine1o2pzUmwJDY1w@mail.gmail.com>
[not found] ` <CACJDEmrzieYh6__MHJH_okoZPk+RA56PuQKv-oid0j1t1po1oQ@mail.gmail.com>
[not found] ` <CACJDEmrdi3sTZjGowkvGP67-_DH3+TLvArC8qZfArsyPb6fpuA@mail.gmail.com>
[not found] ` <CACJDEmrQ6onv-xqYOi3nekioCSASb4c1eZHJ-rzMxU3Wa7SXTQ@mail.gmail.com>
2016-04-21 13:56 ` Konrad Rzeszutek Wilk
2016-04-21 14:25 ` Jan Beulich
2016-04-22 7:17 ` Ross Lagerwall
2016-04-22 7:51 ` Jan Beulich
2016-04-22 8:45 ` Ross Lagerwall
2016-04-22 10:08 ` Jan Beulich
2016-04-22 10:28 ` Konrad Rzeszutek Wilk
2016-04-22 10:50 ` Jan Beulich
2016-04-22 11:08 ` Konrad Rzeszutek Wilk
2016-04-22 11:18 ` Jan Beulich
2016-04-24 21:41 ` Konrad Rzeszutek Wilk
2016-04-25 8:02 ` Jan Beulich
2016-04-22 11:13 ` Ross Lagerwall
2016-04-22 11:24 ` Jan Beulich
2016-04-22 21:10 ` Konrad Rzeszutek Wilk
2016-04-25 6:41 ` Ross Lagerwall
2016-04-25 8:15 ` Jan Beulich
2016-04-22 14:17 ` Konrad Rzeszutek Wilk
2016-04-13 22:01 ` [PATCH v8.1 15/27] xsplice, symbols: Implement fast symbol names -> virtual addresses lookup Konrad Rzeszutek Wilk
2016-04-19 19:52 ` Jan Beulich
2016-04-22 15:21 ` Konrad Rzeszutek Wilk
2016-04-25 8:38 ` Jan Beulich
2016-04-25 14:12 ` Konrad Rzeszutek Wilk
2016-04-13 22:01 ` [PATCH v8.1 16/27] x86, xsplice: Print payload's symbol name and payload name in backtraces Konrad Rzeszutek Wilk
2016-04-19 20:09 ` Jan Beulich
2016-04-13 22:01 ` [PATCH v8.1 17/27] xsplice: Add support for bug frames Konrad Rzeszutek Wilk
2016-04-19 20:17 ` Jan Beulich
2016-04-21 0:29 ` Konrad Rzeszutek Wilk
2016-04-21 6:49 ` Jan Beulich
2016-04-22 10:10 ` Konrad Rzeszutek Wilk
2016-04-22 10:28 ` Jan Beulich
2016-04-22 10:54 ` Konrad Rzeszutek Wilk
2016-04-22 10:58 ` Jan Beulich
2016-04-22 11:10 ` Konrad Rzeszutek Wilk
2016-04-13 22:01 ` [PATCH v8.1 18/27] xsplice: Add support for exception tables Konrad Rzeszutek Wilk
2016-04-19 20:31 ` Jan Beulich
2016-04-13 22:02 ` [PATCH v8.1 19/27] xsplice: Add support for alternatives Konrad Rzeszutek Wilk
2016-04-20 6:28 ` Jan Beulich
2016-04-21 0:30 ` Konrad Rzeszutek Wilk
2016-04-21 6:55 ` Jan Beulich
2016-04-21 0:31 ` Konrad Rzeszutek Wilk
2016-04-21 6:56 ` Jan Beulich
2016-04-22 16:06 ` Konrad Rzeszutek Wilk
2016-04-13 22:02 ` [PATCH v8.1 20/27] build_id: Provide ld-embedded build-ids Konrad Rzeszutek Wilk
2016-04-20 7:14 ` Jan Beulich
2016-04-21 0:33 ` Konrad Rzeszutek Wilk
2016-04-21 6:59 ` Jan Beulich
2016-04-21 20:30 ` Konrad Rzeszutek Wilk
2016-04-22 16:16 ` Konrad Rzeszutek Wilk
2016-04-13 22:02 ` [PATCH v8.1 21/27] xsplice: Print build_id in keyhandler and on bootup Konrad Rzeszutek Wilk
2016-04-13 22:02 ` [PATCH v8.1 22/27] XENVER_build_id/libxc: Provide ld-embedded build-id Konrad Rzeszutek Wilk
2016-04-14 15:03 ` Wei Liu
2016-04-14 15:04 ` Daniel De Graaf
2016-04-20 7:19 ` Jan Beulich
2016-04-13 22:02 ` [PATCH v8.1 23/27] libxl: info: Display build_id of the hypervisor Konrad Rzeszutek Wilk
2016-04-14 15:06 ` Wei Liu
2016-04-13 22:02 ` [PATCH v8.1 24/27] xsplice: Stacking build-id dependency checking Konrad Rzeszutek Wilk
2016-04-20 7:49 ` Jan Beulich
2016-04-22 10:46 ` Konrad Rzeszutek Wilk
2016-04-22 10:55 ` Jan Beulich
2016-04-13 22:02 ` [PATCH v8.1 25/27] xsplice/xen_replace_world: Test-case for XSPLICE_ACTION_REPLACE Konrad Rzeszutek Wilk
2016-04-20 11:12 ` Jan Beulich
2016-04-13 22:02 ` [PATCH v8.1 26/27] xsplice: Prevent duplicate payloads from being loaded Konrad Rzeszutek Wilk
2016-04-20 11:16 ` Jan Beulich
2016-04-13 22:02 ` [PATCH v8.1 27/27] MAINTAINERS/xsplice: Add myself and Ross as the maintainers Konrad Rzeszutek Wilk
2016-04-14 14:26 ` [PATCH v8.1] xSplice v1 design and implementation Konrad Rzeszutek Wilk
2016-04-14 14:29 ` Julien Grall
2016-04-14 15:12 ` Andrew Cooper
2016-04-14 15:17 ` Jan Beulich
2016-04-15 0:55 ` Konrad Rzeszutek Wilk
2016-04-17 8:00 ` 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=1460584928-32440-10-git-send-email-konrad.wilk@oracle.com \
--to=konrad.wilk@oracle.com \
--cc=JBeulich@suse.com \
--cc=andrew.cooper3@citrix.com \
--cc=george.dunlap@eu.citrix.com \
--cc=konrad@kernel.org \
--cc=mpohlack@amazon.com \
--cc=ross.lagerwall@citrix.com \
--cc=sasha.levin@oracle.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).