mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 02:01:24 +01:00
Make the fixmap area moveable in kernel address space.
From: Gerd Hoffmann <kraxel@suse.de> Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>
This commit is contained in:
cl349@firebug.cl.cam.ac.uk committed
1 parent
7ac0b750e5
commit
f79142a93d
4 files changed
+24
-4
No files matched your search
@@ -13,6 +13,7 @@
|
||||
#include <linux/slab.h>
|
||||
#include <linux/pagemap.h>
|
||||
#include <linux/spinlock.h>
|
||||
#include <linux/module.h>
|
||||
|
||||
#include <asm/system.h>
|
||||
#include <asm/pgtable.h>
|
||||
@@ -184,6 +185,10 @@ void set_pmd_pfn(unsigned long vaddr, unsigned long pfn, pgprot_t flags)
|
||||
__flush_tlb_one(vaddr);
|
||||
}
|
||||
|
||||
static int nr_fixmaps = 0;
|
||||
unsigned long __FIXADDR_TOP = (HYPERVISOR_VIRT_START - 2 * PAGE_SIZE);
|
||||
EXPORT_SYMBOL(__FIXADDR_TOP);
|
||||
|
||||
void __set_fixmap (enum fixed_addresses idx, maddr_t phys, pgprot_t flags)
|
||||
{
|
||||
unsigned long address = __fix_to_virt(idx);
|
||||
@@ -203,6 +208,13 @@ void __set_fixmap (enum fixed_addresses idx, maddr_t phys, pgprot_t flags)
|
||||
set_pte_pfn_ma(address, phys >> PAGE_SHIFT, flags);
|
||||
break;
|
||||
}
|
||||
nr_fixmaps++;
|
||||
}
|
||||
|
||||
void set_fixaddr_top(unsigned long top)
|
||||
{
|
||||
BUG_ON(nr_fixmaps > 0);
|
||||
__FIXADDR_TOP = top - PAGE_SIZE;
|
||||
}
|
||||
|
||||
pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address)
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
* Leave one empty page between vmalloc'ed areas and
|
||||
* the start of the fixmap.
|
||||
*/
|
||||
#define __FIXADDR_TOP (HYPERVISOR_VIRT_START - 2 * PAGE_SIZE)
|
||||
extern unsigned long __FIXADDR_TOP;
|
||||
|
||||
#ifndef __ASSEMBLY__
|
||||
#include <linux/kernel.h>
|
||||
@@ -98,8 +98,10 @@ enum fixed_addresses {
|
||||
__end_of_fixed_addresses
|
||||
};
|
||||
|
||||
extern void __set_fixmap(
|
||||
enum fixed_addresses idx, maddr_t phys, pgprot_t flags);
|
||||
extern void __set_fixmap(enum fixed_addresses idx,
|
||||
maddr_t phys, pgprot_t flags);
|
||||
|
||||
extern void set_fixaddr_top(unsigned long top);
|
||||
|
||||
#define set_fixmap(idx, phys) \
|
||||
__set_fixmap(idx, phys, PAGE_KERNEL)
|
||||
|
||||
@@ -294,7 +294,7 @@ extern int page_is_ram(unsigned long pagenr);
|
||||
|
||||
#define PAGE_OFFSET ((unsigned long)__PAGE_OFFSET)
|
||||
#define VMALLOC_RESERVE ((unsigned long)__VMALLOC_RESERVE)
|
||||
#define MAXMEM (HYPERVISOR_VIRT_START-__PAGE_OFFSET-__VMALLOC_RESERVE)
|
||||
#define MAXMEM (__FIXADDR_TOP-__PAGE_OFFSET-__VMALLOC_RESERVE)
|
||||
#define __pa(x) ((unsigned long)(x)-PAGE_OFFSET)
|
||||
#define __va(x) ((void *)((unsigned long)(x)+PAGE_OFFSET))
|
||||
#define pfn_to_kaddr(pfn) __va((pfn) << PAGE_SHIFT)
|
||||
|
||||
@@ -33,6 +33,8 @@ extern void nmi(void);
|
||||
|
||||
static void __init machine_specific_arch_setup(void)
|
||||
{
|
||||
struct xen_platform_parameters pp;
|
||||
|
||||
HYPERVISOR_set_callbacks(
|
||||
__KERNEL_CS, (unsigned long)hypervisor_callback,
|
||||
__KERNEL_CS, (unsigned long)failsafe_callback);
|
||||
@@ -40,4 +42,8 @@ static void __init machine_specific_arch_setup(void)
|
||||
HYPERVISOR_nmi_op(XENNMI_register_callback, (unsigned long)&nmi);
|
||||
|
||||
machine_specific_modify_cpu_capabilities(&boot_cpu_data);
|
||||
|
||||
if (HYPERVISOR_xen_version(XENVER_platform_parameters,
|
||||
&pp) == 0)
|
||||
set_fixaddr_top(pp.virt_start - PAGE_SIZE);
|
||||
}
|
||||