Skip to content

Commit

Permalink
[PATCH] i386: PARAVIRT: Add pagetable accessors to pack and unpack pa…
Browse files Browse the repository at this point in the history 
…getable entries

Add a set of accessors to pack, unpack and modify page table entries
(at all levels).  This allows a paravirt implementation to control the
contents of pgd/pmd/pte entries.  For example, Xen uses this to
convert the (pseudo-)physical address into a machine address when
populating a pagetable entry, and converting back to pphys address
when an entry is read.

Signed-off-by: Jeremy Fitzhardinge <jeremy@xensource.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Acked-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Jeremy Fitzhardinge authored and Andi Kleen committed May 2, 2007
1 parent 4587623 commit 3dc494e
Show file tree
Hide file tree
Showing 7 changed files with 184 additions and 128 deletions.
84 changes: 12 additions & 72 deletions arch/i386/kernel/paravirt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,78 +117,6 @@ static void native_flush_tlb_single(u32 addr)
__native_flush_tlb_single(addr);
}

#ifndef CONFIG_X86_PAE
static void native_set_pte(pte_t *ptep, pte_t pteval)
{
*ptep = pteval;
}

static void native_set_pte_at(struct mm_struct *mm, u32 addr, pte_t *ptep, pte_t pteval)
{
*ptep = pteval;
}

static void native_set_pmd(pmd_t *pmdp, pmd_t pmdval)
{
*pmdp = pmdval;
}

#else /* CONFIG_X86_PAE */

static void native_set_pte(pte_t *ptep, pte_t pte)
{
ptep->pte_high = pte.pte_high;
smp_wmb();
ptep->pte_low = pte.pte_low;
}

static void native_set_pte_at(struct mm_struct *mm, u32 addr, pte_t *ptep, pte_t pte)
{
ptep->pte_high = pte.pte_high;
smp_wmb();
ptep->pte_low = pte.pte_low;
}

static void native_set_pte_present(struct mm_struct *mm, unsigned long addr, pte_t *ptep, pte_t pte)
{
ptep->pte_low = 0;
smp_wmb();
ptep->pte_high = pte.pte_high;
smp_wmb();
ptep->pte_low = pte.pte_low;
}

static void native_set_pte_atomic(pte_t *ptep, pte_t pteval)
{
set_64bit((unsigned long long *)ptep,pte_val(pteval));
}

static void native_set_pmd(pmd_t *pmdp, pmd_t pmdval)
{
set_64bit((unsigned long long *)pmdp,pmd_val(pmdval));
}

static void native_set_pud(pud_t *pudp, pud_t pudval)
{
*pudp = pudval;
}

static void native_pte_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep)
{
ptep->pte_low = 0;
smp_wmb();
ptep->pte_high = 0;
}

static void native_pmd_clear(pmd_t *pmd)
{
u32 *tmp = (u32 *)pmd;
*tmp = 0;
smp_wmb();
*(tmp + 1) = 0;
}
#endif /* CONFIG_X86_PAE */

/* These are in entry.S */
extern void native_iret(void);
extern void native_irq_enable_sysexit(void);
Expand Down Expand Up @@ -282,14 +210,26 @@ struct paravirt_ops paravirt_ops = {
.set_pmd = native_set_pmd,
.pte_update = paravirt_nop,
.pte_update_defer = paravirt_nop,

.ptep_get_and_clear = native_ptep_get_and_clear,

#ifdef CONFIG_X86_PAE
.set_pte_atomic = native_set_pte_atomic,
.set_pte_present = native_set_pte_present,
.set_pud = native_set_pud,
.pte_clear = native_pte_clear,
.pmd_clear = native_pmd_clear,

.pmd_val = native_pmd_val,
.make_pmd = native_make_pmd,
#endif

.pte_val = native_pte_val,
.pgd_val = native_pgd_val,

.make_pte = native_make_pte,
.make_pgd = native_make_pgd,

.irq_enable_sysexit = native_irq_enable_sysexit,
.iret = native_iret,

Expand Down
6 changes: 3 additions & 3 deletions arch/i386/kernel/vmi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -443,13 +443,13 @@ static void vmi_release_pd(u32 pfn)
((level) | (is_current_as(mm, user) ? \
(VMI_PAGE_DEFER | VMI_PAGE_CURRENT_AS | ((addr) & VMI_PAGE_VA_MASK)) : 0))

static void vmi_update_pte(struct mm_struct *mm, u32 addr, pte_t *ptep)
static void vmi_update_pte(struct mm_struct *mm, unsigned long addr, pte_t *ptep)
{
vmi_check_page_type(__pa(ptep) >> PAGE_SHIFT, VMI_PAGE_PTE);
vmi_ops.update_pte(ptep, vmi_flags_addr(mm, addr, VMI_PAGE_PT, 0));
}

static void vmi_update_pte_defer(struct mm_struct *mm, u32 addr, pte_t *ptep)
static void vmi_update_pte_defer(struct mm_struct *mm, unsigned long addr, pte_t *ptep)
{
vmi_check_page_type(__pa(ptep) >> PAGE_SHIFT, VMI_PAGE_PTE);
vmi_ops.update_pte(ptep, vmi_flags_addr_defer(mm, addr, VMI_PAGE_PT, 0));
Expand All @@ -462,7 +462,7 @@ static void vmi_set_pte(pte_t *ptep, pte_t pte)
vmi_ops.set_pte(pte, ptep, VMI_PAGE_PT);
}

static void vmi_set_pte_at(struct mm_struct *mm, u32 addr, pte_t *ptep, pte_t pte)
static void vmi_set_pte_at(struct mm_struct *mm, unsigned long addr, pte_t *ptep, pte_t pte)
{
vmi_check_page_type(__pa(ptep) >> PAGE_SHIFT, VMI_PAGE_PTE);
vmi_ops.set_pte(pte, ptep, vmi_flags_addr(mm, addr, VMI_PAGE_PT, 0));
Expand Down
79 changes: 68 additions & 11 deletions include/asm-i386/page.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
#ifdef __KERNEL__
#ifndef __ASSEMBLY__


#ifdef CONFIG_X86_USE_3DNOW

#include <asm/mmx.h>
Expand Down Expand Up @@ -42,26 +41,81 @@
* These are used to make use of C type-checking..
*/
extern int nx_enabled;

#ifdef CONFIG_X86_PAE
extern unsigned long long __supported_pte_mask;
typedef struct { unsigned long pte_low, pte_high; } pte_t;
typedef struct { unsigned long long pmd; } pmd_t;
typedef struct { unsigned long long pgd; } pgd_t;
typedef struct { unsigned long long pgprot; } pgprot_t;
#define pmd_val(x) ((x).pmd)
#define pte_val(x) ((x).pte_low | ((unsigned long long)(x).pte_high << 32))
#define __pmd(x) ((pmd_t) { (x) } )

static inline unsigned long long native_pgd_val(pgd_t pgd)
{
return pgd.pgd;
}

static inline unsigned long long native_pmd_val(pmd_t pmd)
{
return pmd.pmd;
}

static inline unsigned long long native_pte_val(pte_t pte)
{
return pte.pte_low | ((unsigned long long)pte.pte_high << 32);
}

static inline pgd_t native_make_pgd(unsigned long long val)
{
return (pgd_t) { val };
}

static inline pmd_t native_make_pmd(unsigned long long val)
{
return (pmd_t) { val };
}

static inline pte_t native_make_pte(unsigned long long val)
{
return (pte_t) { .pte_low = val, .pte_high = (val >> 32) } ;
}

#ifndef CONFIG_PARAVIRT
#define pmd_val(x) native_pmd_val(x)
#define __pmd(x) native_make_pmd(x)
#endif

#define HPAGE_SHIFT 21
#include <asm-generic/pgtable-nopud.h>
#else
#else /* !CONFIG_X86_PAE */
typedef struct { unsigned long pte_low; } pte_t;
typedef struct { unsigned long pgd; } pgd_t;
typedef struct { unsigned long pgprot; } pgprot_t;
#define boot_pte_t pte_t /* or would you rather have a typedef */
#define pte_val(x) ((x).pte_low)

static inline unsigned long native_pgd_val(pgd_t pgd)
{
return pgd.pgd;
}

static inline unsigned long native_pte_val(pte_t pte)
{
return pte.pte_low;
}

static inline pgd_t native_make_pgd(unsigned long val)
{
return (pgd_t) { val };
}

static inline pte_t native_make_pte(unsigned long val)
{
return (pte_t) { .pte_low = val };
}

#define HPAGE_SHIFT 22
#include <asm-generic/pgtable-nopmd.h>
#endif
#endif /* CONFIG_X86_PAE */

#define PTE_MASK PAGE_MASK

#ifdef CONFIG_HUGETLB_PAGE
Expand All @@ -71,13 +125,16 @@ typedef struct { unsigned long pgprot; } pgprot_t;
#define HAVE_ARCH_HUGETLB_UNMAPPED_AREA
#endif

#define pgd_val(x) ((x).pgd)
#define pgprot_val(x) ((x).pgprot)

#define __pte(x) ((pte_t) { (x) } )
#define __pgd(x) ((pgd_t) { (x) } )
#define __pgprot(x) ((pgprot_t) { (x) } )

#ifndef CONFIG_PARAVIRT
#define pgd_val(x) native_pgd_val(x)
#define __pgd(x) native_make_pgd(x)
#define pte_val(x) native_pte_val(x)
#define __pte(x) native_make_pte(x)
#endif

#endif /* !__ASSEMBLY__ */

/* to align the pointer to the (next) page boundary */
Expand Down
52 changes: 40 additions & 12 deletions include/asm-i386/paravirt.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
#define __ASM_PARAVIRT_H
/* Various instructions on x86 need to be replaced for
* para-virtualization: those hooks are defined here. */
#include <linux/linkage.h>
#include <linux/stringify.h>
#include <asm/page.h>

Expand All @@ -25,6 +24,8 @@
#define CLBR_ANY 0x7

#ifndef __ASSEMBLY__
#include <linux/types.h>

struct thread_struct;
struct Xgt_desc_struct;
struct tss_struct;
Expand Down Expand Up @@ -55,11 +56,6 @@ struct paravirt_ops
int (*set_wallclock)(unsigned long);
void (*time_init)(void);

/* All the function pointers here are declared as "fastcall"
so that we get a specific register-based calling
convention. This makes it easier to implement inline
assembler replacements. */

void (*cpuid)(unsigned int *eax, unsigned int *ebx,
unsigned int *ecx, unsigned int *edx);

Expand Down Expand Up @@ -139,16 +135,33 @@ struct paravirt_ops
void (*release_pd)(u32 pfn);

void (*set_pte)(pte_t *ptep, pte_t pteval);
void (*set_pte_at)(struct mm_struct *mm, u32 addr, pte_t *ptep, pte_t pteval);
void (*set_pte_at)(struct mm_struct *mm, unsigned long addr, pte_t *ptep, pte_t pteval);
void (*set_pmd)(pmd_t *pmdp, pmd_t pmdval);
void (*pte_update)(struct mm_struct *mm, u32 addr, pte_t *ptep);
void (*pte_update_defer)(struct mm_struct *mm, u32 addr, pte_t *ptep);
void (*pte_update)(struct mm_struct *mm, unsigned long addr, pte_t *ptep);
void (*pte_update_defer)(struct mm_struct *mm, unsigned long addr, pte_t *ptep);

pte_t (*ptep_get_and_clear)(pte_t *ptep);

#ifdef CONFIG_X86_PAE
void (*set_pte_atomic)(pte_t *ptep, pte_t pteval);
void (*set_pte_present)(struct mm_struct *mm, unsigned long addr, pte_t *ptep, pte_t pte);
void (*set_pte_present)(struct mm_struct *mm, unsigned long addr, pte_t *ptep, pte_t pte);
void (*set_pud)(pud_t *pudp, pud_t pudval);
void (*pte_clear)(struct mm_struct *mm, unsigned long addr, pte_t *ptep);
void (*pte_clear)(struct mm_struct *mm, unsigned long addr, pte_t *ptep);
void (*pmd_clear)(pmd_t *pmdp);

unsigned long long (*pte_val)(pte_t);
unsigned long long (*pmd_val)(pmd_t);
unsigned long long (*pgd_val)(pgd_t);

pte_t (*make_pte)(unsigned long long pte);
pmd_t (*make_pmd)(unsigned long long pmd);
pgd_t (*make_pgd)(unsigned long long pgd);
#else
unsigned long (*pte_val)(pte_t);
unsigned long (*pgd_val)(pgd_t);

pte_t (*make_pte)(unsigned long pte);
pgd_t (*make_pgd)(unsigned long pgd);
#endif

void (*set_lazy_mode)(int mode);
Expand Down Expand Up @@ -219,6 +232,8 @@ static inline void __cpuid(unsigned int *eax, unsigned int *ebx,
#define read_cr4_safe(x) paravirt_ops.read_cr4_safe()
#define write_cr4(x) paravirt_ops.write_cr4(x)

#define raw_ptep_get_and_clear(xp) (paravirt_ops.ptep_get_and_clear(xp))

static inline void raw_safe_halt(void)
{
paravirt_ops.safe_halt();
Expand Down Expand Up @@ -304,6 +319,17 @@ static inline void halt(void)
(paravirt_ops.write_idt_entry((dt), (entry), (low), (high)))
#define set_iopl_mask(mask) (paravirt_ops.set_iopl_mask(mask))

#define __pte(x) paravirt_ops.make_pte(x)
#define __pgd(x) paravirt_ops.make_pgd(x)

#define pte_val(x) paravirt_ops.pte_val(x)
#define pgd_val(x) paravirt_ops.pgd_val(x)

#ifdef CONFIG_X86_PAE
#define __pmd(x) paravirt_ops.make_pmd(x)
#define pmd_val(x) paravirt_ops.pmd_val(x)
#endif

/* The paravirtualized I/O functions */
static inline void slow_down_io(void) {
paravirt_ops.io_delay();
Expand Down Expand Up @@ -344,6 +370,7 @@ static inline void setup_secondary_clock(void)
}
#endif


#ifdef CONFIG_SMP
static inline void startup_ipi_hook(int phys_apicid, unsigned long start_eip,
unsigned long start_esp)
Expand Down Expand Up @@ -371,7 +398,8 @@ static inline void set_pte(pte_t *ptep, pte_t pteval)
paravirt_ops.set_pte(ptep, pteval);
}

static inline void set_pte_at(struct mm_struct *mm, u32 addr, pte_t *ptep, pte_t pteval)
static inline void set_pte_at(struct mm_struct *mm, unsigned long addr,
pte_t *ptep, pte_t pteval)
{
paravirt_ops.set_pte_at(mm, addr, ptep, pteval);
}
Expand Down
Loading

0 comments on commit 3dc494e

Please sign in to comment.