xen-devel.lists.xenproject.org archive mirror
 help / color / mirror / Atom feed
From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
To: linux-kernel@vger.kernel.org, xen-devel@lists.xensource.com
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Subject: [PATCH 7/7] xen/mmu: Remove from __ka space PMD entries for pagetables.
Date: Thu, 26 Jul 2012 16:47:32 -0400	[thread overview]
Message-ID: <1343335652-5659-8-git-send-email-konrad.wilk@oracle.com> (raw)
In-Reply-To: <1343335652-5659-1-git-send-email-konrad.wilk@oracle.com>

Please first read the description in "xen/mmu: Copy and revector the
P2M tree."

At this stage, the __ka address space (which is what the old
P2M tree was using) is partially disassembled. The cleanup_highmap
has removed the PMD entries from 0-16MB and anything past _brk_end
up to the max_pfn_mapped (which is the end of the ramdisk).

The xen_remove_p2m_tree and code around has ripped out the __ka for
the old P2M array.

Here we continue on doing it to where the Xen page-tables were.
It is safe to do it, as the page-tables are addressed using __va.
For good measure we delete anything that is within MODULES_VADDR
and up to the end of the PMD.

At this point the __ka only contains PMD entries for the start
of the kernel up to __brk.

Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
---
 arch/x86/xen/mmu.c |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
index 05e8492..738feca 100644
--- a/arch/x86/xen/mmu.c
+++ b/arch/x86/xen/mmu.c
@@ -1241,6 +1241,26 @@ static void __init xen_pagetable_setup_done(pgd_t *base)
 			xen_start_info->mfn_list = new_mfn_list;
 		}
 	}
+#ifdef CONFIG_X86_64
+	/* At this stage, cleanup_highmap has already cleaned __ka space
+	 * from _brk_limit way up to the max_pfn_mapped (which is the end of
+	 * the ramdisk). We continue on, erasing PMD entries that point to page
+	 * tables - do note that they are accessible at this stage via __va.
+	 * For good measure we also round up to the PMD - which means that if
+	 * anybody is using __ka address to the initial boot-stack - and try
+	 * to use it - they are going to crash. The xen_start_info has been
+	 * taken care of already in xen_setup_kernel_pagetable. */
+	addr = xen_start_info->pt_base;
+	size = roundup(xen_start_info->nr_pt_frames * PAGE_SIZE, PMD_SIZE);
+
+	xen_cleanhighmap(addr, addr + size);
+	xen_start_info->pt_base = (unsigned long)__va(__pa(xen_start_info->pt_base));
+
+	/* This is superflous and shouldn't be neccessary, but you know what
+	 * lets do it. The MODULES_VADDR -> MODULES_END should be clear of
+	 * anything at this stage. */
+	xen_cleanhighmap(MODULES_VADDR, roundup(MODULES_VADDR, PUD_SIZE) - 1);
+#endif
 	xen_post_allocator_init();
 }
 
-- 
1.7.7.6

  parent reply	other threads:[~2012-07-26 20:47 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-07-26 20:47 [RFC PATCH] Boot PV guests with more than 128GB (v1) for 3.7 Konrad Rzeszutek Wilk
2012-07-26 20:47 ` [PATCH 1/7] xen/mmu: use copy_page instead of memcpy Konrad Rzeszutek Wilk
2012-07-27  7:35   ` Jan Beulich
2012-07-26 20:47 ` [PATCH 2/7] xen/mmu: For 64-bit do not call xen_map_identity_early Konrad Rzeszutek Wilk
2012-07-26 20:47 ` [PATCH 3/7] xen/mmu: Release the Xen provided L4 (PGD) back Konrad Rzeszutek Wilk
2012-07-27 11:37   ` [Xen-devel] " Stefano Stabellini
2012-07-27 17:35     ` Konrad Rzeszutek Wilk
2012-07-26 20:47 ` [PATCH 4/7] xen/mmu: Recycle the Xen provided L4, L3, and L2 pages Konrad Rzeszutek Wilk
2012-07-27 11:45   ` [Xen-devel] " Stefano Stabellini
2012-07-27 17:38     ` Konrad Rzeszutek Wilk
2012-07-31 14:39       ` [Xen-devel] " Konrad Rzeszutek Wilk
2012-07-26 20:47 ` [PATCH 5/7] xen/p2m: Add logic to revector a P2M tree to use __va leafs Konrad Rzeszutek Wilk
2012-07-27 11:18   ` [Xen-devel] " Stefano Stabellini
2012-07-27 11:47     ` Jan Beulich
     [not found]     ` <50129C030200007800090F9B@nat28.tlf.novell.com>
2012-07-27 17:34       ` Konrad Rzeszutek Wilk
2012-07-30  7:10         ` Jan Beulich
2012-07-26 20:47 ` [PATCH 6/7] xen/mmu: Copy and revector the P2M tree Konrad Rzeszutek Wilk
2012-07-26 20:47 ` Konrad Rzeszutek Wilk [this message]
2012-07-27 11:31   ` [Xen-devel] [PATCH 7/7] xen/mmu: Remove from __ka space PMD entries for pagetables Stefano Stabellini
2012-07-27 17:42     ` Konrad Rzeszutek Wilk
2012-07-31 14:37       ` Konrad Rzeszutek Wilk
2012-07-27  7:34 ` [RFC PATCH] Boot PV guests with more than 128GB (v1) for 3.7 Jan Beulich
     [not found] ` <501260980200007800090E08@nat28.tlf.novell.com>
2012-07-27 10:00   ` Ian Campbell
     [not found]   ` <1343383205.6812.137.camel@zakaz.uk.xensource.com>
2012-07-27 10:17     ` Jan Beulich
     [not found]     ` <501286E50200007800090ECB@nat28.tlf.novell.com>
2012-07-27 10:21       ` Ian Campbell
     [not found]       ` <1343384489.6812.143.camel@zakaz.uk.xensource.com>
2012-07-27 10:33         ` 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=1343335652-5659-8-git-send-email-konrad.wilk@oracle.com \
    --to=konrad.wilk@oracle.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=xen-devel@lists.xensource.com \
    /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).