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


Ignore:
Timestamp:
2006-08-01T17:27:11Z (19 years ago)
Author:
Martin Decky <martin@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
0fbfa0d
Parents:
e386cbf
Message:

xen32: use writable page tables, cleanup mm

Location:
kernel/arch/xen32/include
Files:
4 edited

Legend:

Unmodified
Added
Removed

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

    re386cbf re12ccc5  
    3737
    3838#define GUEST_CMDLINE   1024
     39#define VIRT_CPUS               32
    3940#define START_INFO_SIZE 1104
     41
    4042#define BOOT_OFFSET             0x0000
     43#define XEN_VIRT_START  0xFC000000
     44
     45#define TEMP_STACK_SIZE 0x1000
    4146
    4247#ifndef __ASM__
    4348
     49#define mp_map ((pfn_t *) XEN_VIRT_START)
     50
    4451#include <arch/types.h>
     52
     53typedef uint32_t evtchn_t;
     54
     55typedef struct {
     56        uint32_t version;
     57        uint32_t pad0;
     58        uint64_t tsc_timestamp;   /**< TSC at last update of time vals */
     59        uint64_t system_time;     /**< Time, in nanosecs, since boot */
     60        uint32_t tsc_to_system_mul;
     61        int8_t tsc_shift;
     62        int8_t pad1[3];
     63} vcpu_time_info_t;
     64
     65typedef struct {
     66        uint32_t cr2;
     67        uint32_t pad[5];
     68} arch_vcpu_info_t;
     69
     70typedef struct arch_shared_info {
     71        pfn_t max_pfn;                  /**< max pfn that appears in table */
     72        uint32_t pfn_to_mfn_frame_list_list;
     73    uint32_t nmi_reason;
     74} arch_shared_info_t;
     75
     76typedef struct {
     77        uint8_t evtchn_upcall_pending;
     78        uint8_t evtchn_upcall_mask;
     79        evtchn_t evtchn_pending_sel;
     80        arch_vcpu_info_t arch;
     81        vcpu_time_info_t time;
     82} vcpu_info_t;
     83
     84typedef struct {
     85        vcpu_info_t vcpu_info[VIRT_CPUS];
     86        evtchn_t evtchn_pending[32];
     87        evtchn_t evtchn_mask[32];
     88       
     89        uint32_t wc_version;                  /**< Version counter */
     90        uint32_t wc_sec;                      /**< Secs  00:00:00 UTC, Jan 1, 1970 */
     91        uint32_t wc_nsec;                     /**< Nsecs 00:00:00 UTC, Jan 1, 1970 */
     92       
     93        arch_shared_info_t arch;
     94} shared_info_t;
    4595
    4696typedef struct {
    4797        int8_t magic[32];           /**< "xen-<version>-<platform>" */
    4898        uint32_t frames;            /**< Available frames */
    49         void *shared_info;          /**< Shared info structure (machine address) */
     99        shared_info_t *shared_info; /**< Shared info structure (machine address) */
    50100        uint32_t flags;             /**< SIF_xxx flags */
    51101        pfn_t store_mfn;            /**< Shared page (machine page) */
    52         uint32_t store_evtchn;      /**< Event channel for store communication */
     102        evtchn_t store_evtchn;      /**< Event channel for store communication */
    53103        void *console_mfn;          /**< Console page (machine address) */
    54         uint32_t console_evtchn;    /**< Event channel for console messages */
     104        evtchn_t console_evtchn;    /**< Event channel for console messages */
    55105        pte_t *ptl0;                /**< Boot PTL0 (kernel address) */
    56106        uint32_t pt_frames;         /**< Number of bootstrap page table frames */
    … …  
    61111} start_info_t;
    62112
     113typedef struct {
     114        pfn_t start;
     115        pfn_t size;
     116        pfn_t reserved;
     117} memzone_t;
     118
    63119extern start_info_t start_info;
     120extern shared_info_t shared_info;
     121extern memzone_t meminfo;
    64122
    65123#endif

  • kernel/arch/xen32/include/hypercall.h

    re386cbf re12ccc5  
    3636typedef uint16_t domid_t;
    3737
    38 typedef struct {
    39     uint64_t ptr;  /**< Machine address of PTE */
    40     uint64_t val;  /**< New contents of PTE */
    41 } mmu_update_t;
    42 
    43 typedef struct {
    44     unsigned int cmd;
    45     union {
    46         unsigned long mfn;
    47         unsigned long linear_addr;
    48     } arg1;
    49     union {
    50         unsigned int nr_ents;
    51         void *vcpumask;
    52     } arg2;
    53 } mmuext_op_t;
    54 
    55 
    56 #define XEN_MMU_UPDATE  1
    57 #define XEN_CONSOLE_IO  18
    58 #define XEN_MMUEXT_OP   26
     38
     39#define XEN_MMU_UPDATE                  1
     40#define XEN_UPDATE_VA_MAPPING   14
     41#define XEN_CONSOLE_IO                  18
     42#define XEN_VM_ASSIST                   21
     43#define XEN_MMUEXT_OP                   26
    5944
    6045
    … …  
    8368
    8469
     70#define UVMF_NONE                               0        /**< No flushing at all */
     71#define UVMF_TLB_FLUSH                  1        /**< Flush entire TLB(s) */
     72#define UVMF_INVLPG                             2        /**< Flush only one entry */
     73#define UVMF_FLUSHTYPE_MASK             3
     74#define UVMF_MULTI                              0        /**< Flush subset of TLBs */
     75#define UVMF_LOCAL                              0        /**< Flush local TLB */
     76#define UVMF_ALL                                (1 << 2) /**< Flush all TLBs */
     77
     78
     79/*
     80 * Commands to XEN_VM_ASSIST
     81 */
     82#define VMASST_CMD_ENABLE                               0
     83#define VMASST_CMD_DISABLE                              1
     84#define VMASST_TYPE_4GB_SEGMENTS                0
     85#define VMASST_TYPE_4GB_SEGMENTS_NOTIFY 1
     86#define VMASST_TYPE_WRITABLE_PAGETABLES 2
     87
     88
    8589#define DOMID_SELF (0x7FF0U)
    8690#define DOMID_IO   (0x7FF1U)
    … …  
    190194}
    191195
    192 static inline int xen_mmu_update(const mmu_update_t *req, const unsigned int count, unsigned int *success_count, domid_t domid)
     196static inline int xen_vm_assist(const unsigned int cmd, const unsigned int type)
    193197{
    194         return hypercall4(XEN_MMU_UPDATE, req, count, success_count, domid);
     198    return hypercall2(XEN_VM_ASSIST, cmd, type);
    195199}
    196200
    197 static inline int xen_mmuext_op(const mmuext_op_t *op, const unsigned int count, unsigned int *success_count, domid_t domid)
    198 {
    199         return hypercall4(XEN_MMUEXT_OP, op, count, success_count, domid);
    200 }
    201 
    202201#endif

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

    re386cbf re12ccc5  
    4747
    4848#define PA2MA(x)        ((start_info.pm_map[((uintptr_t) (x)) >> 12] << 12) + (((uintptr_t) (x)) & 0xfff))
    49 
    50 extern uintptr_t last_frame;
     49#define MA2PA(x)        ((mp_map[((uintptr_t) (x)) >> 12] << 12) + (((uintptr_t) (x)) & 0xfff))
    5150
    5251extern void frame_arch_init(void);

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

    re386cbf re12ccc5  
    4444
    4545#ifndef __ASM__
    46 #       include <arch/hypercall.h>
    4746#       define KA2PA(x) (((uintptr_t) (x)) - 0x80000000)
    4847#       define PA2KA(x) (((uintptr_t) (x)) + 0x80000000)
    … …  
    6665#define PTL3_INDEX_ARCH(vaddr)  (((vaddr) >> 12) & 0x3ff)
    6766
    68 #define GET_PTL1_ADDRESS_ARCH(ptl0, i)          ((pte_t *)((((pte_t *)(ptl0))[(i)].frame_address) << 12))
     67#define GET_PTL1_ADDRESS_ARCH(ptl0, i)          ((pte_t *) MA2PA((((pte_t *) (ptl0))[(i)].frame_address) << 12))
    6968#define GET_PTL2_ADDRESS_ARCH(ptl1, i)          (ptl1)
    7069#define GET_PTL3_ADDRESS_ARCH(ptl2, i)          (ptl2)
    71 #define GET_FRAME_ADDRESS_ARCH(ptl3, i)         ((uintptr_t)((((pte_t *)(ptl3))[(i)].frame_address) << 12))
     70#define GET_FRAME_ADDRESS_ARCH(ptl3, i)         ((uintptr_t) MA2PA((((pte_t *) (ptl3))[(i)].frame_address) << 12))
    7271
    7372#define SET_PTL0_ADDRESS_ARCH(ptl0) { \
    7473        mmuext_op_t mmu_ext; \
     74        \
    7575        mmu_ext.cmd = MMUEXT_NEW_BASEPTR; \
    76         mmu_ext.arg1.mfn = ADDR2PFN(PA2MA(ptl0)); \
     76        mmu_ext.mfn = ADDR2PFN(PA2MA(ptl0)); \
    7777        xen_mmuext_op(&mmu_ext, 1, NULL, DOMID_SELF); \
    7878}
     79
    7980#define SET_PTL1_ADDRESS_ARCH(ptl0, i, a) { \
    8081        mmu_update_t update; \
     82        \
    8183        update.ptr = PA2MA(KA2PA(&((pte_t *) (ptl0))[(i)])); \
    82         update.val = PA2MA(a); \
     84        update.val = PA2MA(a) | 0x0003; \
    8385        xen_mmu_update(&update, 1, NULL, DOMID_SELF); \
    8486}
    8587#define SET_PTL2_ADDRESS_ARCH(ptl1, i, a)
    8688#define SET_PTL3_ADDRESS_ARCH(ptl2, i, a)
    87 #define SET_FRAME_ADDRESS_ARCH(ptl3, i, a) { \
    88         mmu_update_t update; \
    89         update.ptr = PA2MA(KA2PA(&((pte_t *) (ptl3))[(i)])); \
    90         update.val = PA2MA(a); \
    91         xen_mmu_update(&update, 1, NULL, DOMID_SELF); \
    92 }
    93 
    94 #define GET_PTL1_FLAGS_ARCH(ptl0, i)            get_pt_flags((pte_t *)(ptl0), (index_t)(i))
     89#define SET_FRAME_ADDRESS_ARCH(ptl3, i, a)      (((pte_t *) (ptl3))[(i)].frame_address = PA2MA(a) >> 12)
     90
     91#define GET_PTL1_FLAGS_ARCH(ptl0, i)            get_pt_flags((pte_t *) (ptl0), (index_t)(i))
    9592#define GET_PTL2_FLAGS_ARCH(ptl1, i)            PAGE_PRESENT
    9693#define GET_PTL3_FLAGS_ARCH(ptl2, i)            PAGE_PRESENT
    97 #define GET_FRAME_FLAGS_ARCH(ptl3, i)           get_pt_flags((pte_t *)(ptl3), (index_t)(i))
    98 
    99 #define SET_PTL1_FLAGS_ARCH(ptl0, i, x)         set_pt_flags((pte_t *)(ptl0), (index_t)(i), (x))
     94#define GET_FRAME_FLAGS_ARCH(ptl3, i)           get_pt_flags((pte_t *) (ptl3), (index_t)(i))
     95
     96#define SET_PTL1_FLAGS_ARCH(ptl0, i, x)         set_pt_flags((pte_t *) (ptl0), (index_t)(i), (x))
    10097#define SET_PTL2_FLAGS_ARCH(ptl1, i, x)
    10198#define SET_PTL3_FLAGS_ARCH(ptl2, i, x)
    102 #define SET_FRAME_FLAGS_ARCH(ptl3, i, x)        set_pt_flags((pte_t *)(ptl3), (index_t)(i), (x))
     99#define SET_FRAME_FLAGS_ARCH(ptl3, i, x)                set_pt_flags((pte_t *) (ptl3), (index_t)(i), (x))
    103100
    104101#define PTE_VALID_ARCH(p)                       (*((uint32_t *) (p)) != 0)
    … …  
    114111#include <arch/mm/frame.h>
    115112#include <typedefs.h>
     113#include <arch/hypercall.h>
    116114
    117115/* Page fault error codes. */
    … …  
    145143} __attribute__ ((packed));
    146144
     145typedef struct {
     146        uint64_t ptr;      /**< Machine address of PTE */
     147        union {            /**< New contents of PTE */
     148                uint64_t val;
     149                pte_t pte;
     150        };
     151} mmu_update_t;
     152
     153typedef struct {
     154        unsigned int cmd;
     155        union {
     156                unsigned long mfn;
     157                unsigned long linear_addr;
     158        };
     159        union {
     160                unsigned int nr_ents;
     161                void *vcpumask;
     162        };
     163} mmuext_op_t;
     164
     165static inline int xen_update_va_mapping(const void *va, const pte_t pte, const unsigned int flags)
     166{
     167        return hypercall4(XEN_UPDATE_VA_MAPPING, va, pte, 0, flags);
     168}
     169
     170static inline int xen_mmu_update(const mmu_update_t *req, const unsigned int count, unsigned int *success_count, domid_t domid)
     171{
     172        return hypercall4(XEN_MMU_UPDATE, req, count, success_count, domid);
     173}
     174
     175static inline int xen_mmuext_op(const mmuext_op_t *op, const unsigned int count, unsigned int *success_count, domid_t domid)
     176{
     177        return hypercall4(XEN_MMUEXT_OP, op, count, success_count, domid);
     178}
     179
    147180static inline int get_pt_flags(pte_t *pt, index_t i)
    148181{
Note: See TracChangeset for help on using the changeset viewer.