Changeset c049309 in mainline for kernel/arch/xen32/include

Timestamp:

2006-07-30T15:57:07Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

b3e8c90

Parents:

764c302

Message:

xen32 cleanup

Location:

kernel/arch/xen32/include

Files:

• asm.h (modified) (2 diffs)
• boot/boot.h (modified) (1 diff)
• mm/frame.h (modified) (2 diffs)
• mm/page.h (modified) (4 diffs)

kernel/arch/xen32/include/asm.h

@@ -43 +43 @@
 extern uint32_t interrupt_handler_size;
 
-extern void paging_on(void);
-
 extern void interrupt_handlers(void);
 
@@ -75 +73 @@
 GEN_READ_REG(cr0);
 GEN_READ_REG(cr2);
-GEN_READ_REG(cr3);
-GEN_WRITE_REG(cr3);
 
 GEN_READ_REG(dr0);

kernel/arch/xen32/include/boot/boot.h

@@ -45 +45 @@
 
 typedef struct {
-        char magic[32];             /**< "xen-<version>-<platform>" */
-        unsigned long nr_pages;     /**< Total pages allocated to this domain */
-        void *shared_info;          /**< Machine address of shared info struct */
+        int8_t magic[32];           /**< "xen-<version>-<platform>" */
+        uint32_t frames;            /**< Available frames */
+        void *shared_info;          /**< Shared info structure (machine address) */
         uint32_t flags;             /**< SIF_xxx flags */
-        void *store_mfn;            /**< Machine page number of shared page */
+        pfn_t store_mfn;            /**< Shared page (machine page) */
         uint32_t store_evtchn;      /**< Event channel for store communication */
-        void *console_mfn;          /**< Machine address of console page */
+        void *console_mfn;          /**< Console page (machine address) */
         uint32_t console_evtchn;    /**< Event channel for console messages */
-        unsigned long *pt_base;     /**< Virtual address of page directory */
-        unsigned long nr_pt_frames; /**< Number of bootstrap p.t. frames */
-        unsigned long *mfn_list;    /**< Virtual address of page-frame list */
-        void *mod_start;            /**< Virtual address of pre-loaded module */
-        unsigned long mod_len;      /**< Size (bytes) of pre-loaded module */
+        pte_t *ptl0;                /**< Boot PTL0 (kernel address) */
+        uint32_t pt_frames;         /**< Number of bootstrap page table frames */
+        pfn_t *pm_map;              /**< Physical->machine frame map (kernel address) */
+        void *mod_start;            /**< Modules start (kernel address) */
+        uint32_t mod_len;           /**< Modules size (bytes) */
         int8_t cmd_line[GUEST_CMDLINE];
 } start_info_t;

kernel/arch/xen32/include/mm/frame.h

@@ -37 +37 @@
 
 #define FRAME_WIDTH     12      /* 4K */
-#define FRAME_SIZE      (1<<FRAME_WIDTH)
+#define FRAME_SIZE      (1 << FRAME_WIDTH)
 
 
@@ -44 +44 @@
 
 #include <arch/types.h>
+#include <arch/boot/boot.h>
+
+#define PA2MA(x)        ((start_info.pm_map[((uintptr_t) (x)) >> 12] << 12) + (((uintptr_t) (x)) & 0xfff))
 
 extern uintptr_t last_frame;

kernel/arch/xen32/include/mm/page.h

@@ -44 +44 @@
 
 #ifndef __ASM__
+#       include <arch/hypercall.h>
 #       define KA2PA(x) (((uintptr_t) (x)) - 0x80000000)
 #       define PA2KA(x) (((uintptr_t) (x)) + 0x80000000)
@@ -60 +61 @@
 #define PTL3_ENTRIES_ARCH       1024
 
-#define PTL0_INDEX_ARCH(vaddr)  (((vaddr)>>22)&0x3ff)
+#define PTL0_INDEX_ARCH(vaddr)  (((vaddr) >> 22) & 0x3ff)
 #define PTL1_INDEX_ARCH(vaddr)  0
 #define PTL2_INDEX_ARCH(vaddr)  0
-#define PTL3_INDEX_ARCH(vaddr)  (((vaddr)>>12)&0x3ff)
+#define PTL3_INDEX_ARCH(vaddr)  (((vaddr) >> 12) & 0x3ff)
 
-#define GET_PTL1_ADDRESS_ARCH(ptl0, i)          ((pte_t *)((((pte_t *)(ptl0))[(i)].frame_address)<<12))
+#define GET_PTL1_ADDRESS_ARCH(ptl0, i)          ((pte_t *)((((pte_t *)(ptl0))[(i)].frame_address) << 12))
 #define GET_PTL2_ADDRESS_ARCH(ptl1, i)          (ptl1)
 #define GET_PTL3_ADDRESS_ARCH(ptl2, i)          (ptl2)
-#define GET_FRAME_ADDRESS_ARCH(ptl3, i)         ((uintptr_t)((((pte_t *)(ptl3))[(i)].frame_address)<<12))
+#define GET_FRAME_ADDRESS_ARCH(ptl3, i)         ((uintptr_t)((((pte_t *)(ptl3))[(i)].frame_address) << 12))
 
-#define SET_PTL0_ADDRESS_ARCH(ptl0)             (write_cr3((uintptr_t) (ptl0)))
-#define SET_PTL1_ADDRESS_ARCH(ptl0, i, a)       (((pte_t *)(ptl0))[(i)].frame_address = (a)>>12)
+#define SET_PTL0_ADDRESS_ARCH(ptl0) { \
+        mmuext_op_t mmu_ext; \
+        mmu_ext.cmd = MMUEXT_NEW_BASEPTR; \
+        mmu_ext.arg1.mfn = ADDR2PFN(PA2MA(ptl0)); \
+        xen_mmuext_op(&mmu_ext, 1, NULL, DOMID_SELF); \
+}
+#define SET_PTL1_ADDRESS_ARCH(ptl0, i, a) { \
+        mmu_update_t update; \
+        update.ptr = PA2MA(KA2PA(&((pte_t *) (ptl0))[(i)])); \
+        update.val = PA2MA(a); \
+        xen_mmu_update(&update, 1, NULL, DOMID_SELF); \
+}
 #define SET_PTL2_ADDRESS_ARCH(ptl1, i, a)
 #define SET_PTL3_ADDRESS_ARCH(ptl2, i, a)
-#define SET_FRAME_ADDRESS_ARCH(ptl3, i, a)      (((pte_t *)(ptl3))[(i)].frame_address = (a)>>12)
+#define SET_FRAME_ADDRESS_ARCH(ptl3, i, a) { \
+        mmu_update_t update; \
+        update.ptr = PA2MA(KA2PA(&((pte_t *) (ptl3))[(i)])); \
+        update.val = PA2MA(a); \
+        xen_mmu_update(&update, 1, NULL, DOMID_SELF); \
+}
 
 #define GET_PTL1_FLAGS_ARCH(ptl0, i)            get_pt_flags((pte_t *)(ptl0), (index_t)(i))
@@ -88 +104 @@
 #define PTE_VALID_ARCH(p)                       (*((uint32_t *) (p)) != 0)
 #define PTE_PRESENT_ARCH(p)                     ((p)->present != 0)
-#define PTE_GET_FRAME_ARCH(p)                   ((p)->frame_address<<FRAME_WIDTH)
+#define PTE_GET_FRAME_ARCH(p)                   ((p)->frame_address << FRAME_WIDTH)
 #define PTE_WRITABLE_ARCH(p)                    ((p)->writeable != 0)
 #define PTE_EXECUTABLE_ARCH(p)                  1
@@ -102 +118 @@
 
 /** When bit on this position is 0, the page fault was caused by a not-present page. */
-#define PFERR_CODE_P            (1<<0)
+#define PFERR_CODE_P            (1 << 0)
 
 /** When bit on this position is 1, the page fault was caused by a write. */
-#define PFERR_CODE_RW           (1<<1)
+#define PFERR_CODE_RW           (1 << 1)
 
 /** When bit on this position is 1, the page fault was caused in user mode. */
-#define PFERR_CODE_US           (1<<2)
+#define PFERR_CODE_US           (1 << 2)
 
 /** When bit on this position is 1, a reserved bit was set in page directory. */ 
-#define PFERR_CODE_RSVD         (1<<3)  
+#define PFERR_CODE_RSVD         (1 << 3)
 
 /** Page Table Entry. */