summaryrefslogtreecommitdiffstats
path: root/drivers/lguest
diff options
context:
space:
mode:
authorRusty Russell <rusty@rustcorp.com.au>2013-04-22 14:10:38 +0930
committerRusty Russell <rusty@rustcorp.com.au>2013-04-22 15:31:36 +0930
commit93a2cdff98243df06bafd3c4f3b31b38f0d0fe3e (patch)
treecfda9a918a92ac0308e1c888489c83c0b243138a /drivers/lguest
parent856c608827928d29f80605e85fc3f8f0ab3af4fb (diff)
lguest: assume Switcher text is a single page.
ie. SHARED_SWITCHER_PAGES == 1. It is well under a page, and it's a minor simplification: it's nice to have *one* simplification in a patch series! Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'drivers/lguest')
-rw-r--r--drivers/lguest/core.c9
-rw-r--r--drivers/lguest/lg.h2
-rw-r--r--drivers/lguest/page_tables.c21
-rw-r--r--drivers/lguest/x86/core.c5
4 files changed, 19 insertions, 18 deletions
diff --git a/drivers/lguest/core.c b/drivers/lguest/core.c
index 211d8267992..4209065b9b1 100644
--- a/drivers/lguest/core.c
+++ b/drivers/lguest/core.c
@@ -52,6 +52,13 @@ static __init int map_switcher(void)
* easy.
*/
+ /* We assume Switcher text fits into a single page. */
+ if (end_switcher_text - start_switcher_text > PAGE_SIZE) {
+ printk(KERN_ERR "lguest: switcher text too large (%zu)\n",
+ end_switcher_text - start_switcher_text);
+ return -EINVAL;
+ }
+
/*
* We allocate an array of struct page pointers. map_vm_area() wants
* this, rather than just an array of pages.
@@ -326,7 +333,7 @@ static int __init init(void)
goto out;
/* Now we set up the pagetable implementation for the Guests. */
- err = init_pagetables(switcher_pages, SHARED_SWITCHER_PAGES);
+ err = init_pagetables(switcher_pages);
if (err)
goto unmap;
diff --git a/drivers/lguest/lg.h b/drivers/lguest/lg.h
index 8bf68c54ff7..4c3e532d50d 100644
--- a/drivers/lguest/lg.h
+++ b/drivers/lguest/lg.h
@@ -15,7 +15,7 @@
#include <asm/lguest.h>
void free_pagetables(void);
-int init_pagetables(struct page **switcher_pages, unsigned int pages);
+int init_pagetables(struct page **switcher_pages);
struct pgdir {
unsigned long gpgdir;
diff --git a/drivers/lguest/page_tables.c b/drivers/lguest/page_tables.c
index 21685580eb9..758466299b0 100644
--- a/drivers/lguest/page_tables.c
+++ b/drivers/lguest/page_tables.c
@@ -1079,25 +1079,20 @@ static void free_switcher_pte_pages(void)
/*H:520
* Setting up the Switcher PTE page for given CPU is fairly easy, given
- * the CPU number and the "struct page"s for the Switcher code itself.
- *
- * Currently the Switcher is less than a page long, so "pages" is always 1.
+ * the CPU number and the "struct page"s for the Switcher and per-cpu pages.
*/
static __init void populate_switcher_pte_page(unsigned int cpu,
- struct page *switcher_pages[],
- unsigned int pages)
+ struct page *switcher_pages[])
{
- unsigned int i;
pte_t *pte = switcher_pte_page(cpu);
+ int i;
- /* The first entries are easy: they map the Switcher code. */
- for (i = 0; i < pages; i++) {
- set_pte(&pte[i], mk_pte(switcher_pages[i],
+ /* The first entries maps the Switcher code. */
+ set_pte(&pte[0], mk_pte(switcher_pages[0],
__pgprot(_PAGE_PRESENT|_PAGE_ACCESSED)));
- }
/* The only other thing we map is this CPU's pair of pages. */
- i = pages + cpu*2;
+ i = 1 + cpu*2;
/* First page (Guest registers) is writable from the Guest */
set_pte(&pte[i], pfn_pte(page_to_pfn(switcher_pages[i]),
@@ -1128,7 +1123,7 @@ static __init void populate_switcher_pte_page(unsigned int cpu,
* At boot or module load time, init_pagetables() allocates and populates
* the Switcher PTE page for each CPU.
*/
-__init int init_pagetables(struct page **switcher_pages, unsigned int pages)
+__init int init_pagetables(struct page **switcher_pages)
{
unsigned int i;
@@ -1138,7 +1133,7 @@ __init int init_pagetables(struct page **switcher_pages, unsigned int pages)
free_switcher_pte_pages();
return -ENOMEM;
}
- populate_switcher_pte_page(i, switcher_pages, pages);
+ populate_switcher_pte_page(i, switcher_pages);
}
return 0;
}
diff --git a/drivers/lguest/x86/core.c b/drivers/lguest/x86/core.c
index 20fae765d60..f0a3347b644 100644
--- a/drivers/lguest/x86/core.c
+++ b/drivers/lguest/x86/core.c
@@ -62,11 +62,10 @@ static unsigned long switcher_offset(void)
return switcher_addr - (unsigned long)start_switcher_text;
}
-/* This cpu's struct lguest_pages. */
+/* This cpu's struct lguest_pages (after the Switcher text page) */
static struct lguest_pages *lguest_pages(unsigned int cpu)
{
- return &(((struct lguest_pages *)
- (switcher_addr + SHARED_SWITCHER_PAGES*PAGE_SIZE))[cpu]);
+ return &(((struct lguest_pages *)(switcher_addr + PAGE_SIZE))[cpu]);
}
static DEFINE_PER_CPU(struct lg_cpu *, lg_last_cpu);