xen: sync with xen headers (17fb46b1) · Commits · 戴 / test

arch/x86/include/asm/xen/interface.h

+87 −9

Original line number	Diff line number	Diff line
		@@ -3,12 +3,38 @@
		*
		* Guest OS interface to x86 Xen.
		*
		* Copyright (c) 2004, K A Fraser
		* Permission is hereby granted, free of charge, to any person obtaining a copy
		* of this software and associated documentation files (the "Software"), to
		* deal in the Software without restriction, including without limitation the
		* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
		* sell copies of the Software, and to permit persons to whom the Software is
		* furnished to do so, subject to the following conditions:
		*
		* The above copyright notice and this permission notice shall be included in
		* all copies or substantial portions of the Software.
		*
		* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
		* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
		* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
		* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
		* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
		* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
		* DEALINGS IN THE SOFTWARE.
		*
		* Copyright (c) 2004-2006, K A Fraser
		*/

		#ifndef _ASM_X86_XEN_INTERFACE_H
		#define _ASM_X86_XEN_INTERFACE_H

		/*
		* XEN_GUEST_HANDLE represents a guest pointer, when passed as a field
		* in a struct in memory.
		* XEN_GUEST_HANDLE_PARAM represent a guest pointer, when passed as an
		* hypercall argument.
		* XEN_GUEST_HANDLE_PARAM and XEN_GUEST_HANDLE are the same on X86 but
		* they might not be on other architectures.
		*/
		#ifdef __XEN__
		#define __DEFINE_GUEST_HANDLE(name, type) \
		typedef struct { type *p; } __guest_handle_ ## name
		@@ -88,13 +114,16 @@ DEFINE_GUEST_HANDLE(xen_ulong_t);
		* start of the GDT because some stupid OSes export hard-coded selector values
		* in their ABI. These hard-coded values are always near the start of the GDT,
		* so Xen places itself out of the way, at the far end of the GDT.
		*
		* NB The LDT is set using the MMUEXT_SET_LDT op of HYPERVISOR_mmuext_op
		*/
		#define FIRST_RESERVED_GDT_PAGE 14
		#define FIRST_RESERVED_GDT_BYTE (FIRST_RESERVED_GDT_PAGE * 4096)
		#define FIRST_RESERVED_GDT_ENTRY (FIRST_RESERVED_GDT_BYTE / 8)

		/*
		* Send an array of these to HYPERVISOR_set_trap_table()
		* Send an array of these to HYPERVISOR_set_trap_table().
		* Terminate the array with a sentinel entry, with traps[].address==0.
		* The privilege level specifies which modes may enter a trap via a software
		* interrupt. On x86/64, since rings 1 and 2 are unavailable, we allocate
		* privilege levels as follows:
		@@ -118,10 +147,41 @@ struct trap_info {
		DEFINE_GUEST_HANDLE_STRUCT(trap_info);

		struct arch_shared_info {
		unsigned long max_pfn; /* max pfn that appears in table */
		/* Frame containing list of mfns containing list of mfns containing p2m. */
		unsigned long pfn_to_mfn_frame_list_list;
		/*
		* Number of valid entries in the p2m table(s) anchored at
		* pfn_to_mfn_frame_list_list and/or p2m_vaddr.
		*/
		unsigned long max_pfn;
		/*
		* Frame containing list of mfns containing list of mfns containing p2m.
		* A value of 0 indicates it has not yet been set up, ~0 indicates it
		* has been set to invalid e.g. due to the p2m being too large for the
		* 3-level p2m tree. In this case the linear mapper p2m list anchored
		* at p2m_vaddr is to be used.
		*/
		xen_pfn_t pfn_to_mfn_frame_list_list;
		unsigned long nmi_reason;
		/*
		* Following three fields are valid if p2m_cr3 contains a value
		* different from 0.
		* p2m_cr3 is the root of the address space where p2m_vaddr is valid.
		* p2m_cr3 is in the same format as a cr3 value in the vcpu register
		* state and holds the folded machine frame number (via xen_pfn_to_cr3)
		* of a L3 or L4 page table.
		* p2m_vaddr holds the virtual address of the linear p2m list. All
		* entries in the range [0...max_pfn[ are accessible via this pointer.
		* p2m_generation will be incremented by the guest before and after each
		* change of the mappings of the p2m list. p2m_generation starts at 0
		* and a value with the least significant bit set indicates that a
		* mapping update is in progress. This allows guest external software
		* (e.g. in Dom0) to verify that read mappings are consistent and
		* whether they have changed since the last check.
		* Modifying a p2m element in the linear p2m list is allowed via an
		* atomic write only.
		*/
		unsigned long p2m_cr3; /* cr3 value of the p2m address space */
		unsigned long p2m_vaddr; /* virtual address of the p2m list */
		unsigned long p2m_generation; /* generation count of p2m mapping */
		};
		#endif /* !__ASSEMBLY__ */

		@@ -137,13 +197,31 @@ struct arch_shared_info {
		/*
		* The following is all CPU context. Note that the fpu_ctxt block is filled
		* in by FXSAVE if the CPU has feature FXSR; otherwise FSAVE is used.
		*
		* Also note that when calling DOMCTL_setvcpucontext and VCPU_initialise
		* for HVM and PVH guests, not all information in this structure is updated:
		*
		* - For HVM guests, the structures read include: fpu_ctxt (if
		* VGCT_I387_VALID is set), flags, user_regs, debugreg[*]
		*
		* - PVH guests are the same as HVM guests, but additionally use ctrlreg[3] to
		* set cr3. All other fields not used should be set to 0.
		*/
		struct vcpu_guest_context {
		/* FPU registers come first so they can be aligned for FXSAVE/FXRSTOR. */
		struct { char x[512]; } fpu_ctxt; /* User-level FPU registers */
		#define VGCF_I387_VALID (1<<0)
		#define VGCF_HVM_GUEST (1<<1)
		#define VGCF_IN_KERNEL (1<<2)
		#define _VGCF_i387_valid 0
		#define VGCF_i387_valid (1<<_VGCF_i387_valid)
		#define _VGCF_in_kernel 2
		#define VGCF_in_kernel (1<<_VGCF_in_kernel)
		#define _VGCF_failsafe_disables_events 3
		#define VGCF_failsafe_disables_events (1<<_VGCF_failsafe_disables_events)
		#define _VGCF_syscall_disables_events 4
		#define VGCF_syscall_disables_events (1<<_VGCF_syscall_disables_events)
		#define _VGCF_online 5
		#define VGCF_online (1<<_VGCF_online)
		unsigned long flags; /* VGCF_* flags */
		struct cpu_user_regs user_regs; /* User-level CPU registers */
		struct trap_info trap_ctxt[256]; /* Virtual IDT */

include/xen/interface/xen.h

+20 −15

Original line number	Diff line number	Diff line
		@@ -585,26 +585,29 @@ struct shared_info {
		};

		/*
		* Start-of-day memory layout for the initial domain (DOM0):
		* Start-of-day memory layout
		*
		* 1. The domain is started within contiguous virtual-memory region.
		* 2. The contiguous region begins and ends on an aligned 4MB boundary.
		* 3. The region start corresponds to the load address of the OS image.
		* If the load address is not 4MB aligned then the address is rounded down.
		* 4. This the order of bootstrap elements in the initial virtual region:
		* 3. This the order of bootstrap elements in the initial virtual region:
		* a. relocated kernel image
		* b. initial ram disk [mod_start, mod_len]
		* (may be omitted)
		* c. list of allocated page frames [mfn_list, nr_pages]
		* (unless relocated due to XEN_ELFNOTE_INIT_P2M)
		* d. start_info_t structure [register ESI (x86)]
		* e. bootstrap page tables [pt_base, CR3 (x86)]
		* f. bootstrap stack [register ESP (x86)]
		* 5. Bootstrap elements are packed together, but each is 4kB-aligned.
		* 6. The initial ram disk may be omitted.
		* 7. The list of page frames forms a contiguous 'pseudo-physical' memory
		* in case of dom0 this page contains the console info, too
		* e. unless dom0: xenstore ring page
		* f. unless dom0: console ring page
		* g. bootstrap page tables [pt_base, CR3 (x86)]
		* h. bootstrap stack [register ESP (x86)]
		* 4. Bootstrap elements are packed together, but each is 4kB-aligned.
		* 5. The list of page frames forms a contiguous 'pseudo-physical' memory
		* layout for the domain. In particular, the bootstrap virtual-memory
		* region is a 1:1 mapping to the first section of the pseudo-physical map.
		* 8. All bootstrap elements are mapped read-writable for the guest OS. The
		* 6. All bootstrap elements are mapped read-writable for the guest OS. The
		* only exception is the bootstrap page table, which is mapped read-only.
		* 9. There is guaranteed to be at least 512kB padding after the final
		* 7. There is guaranteed to be at least 512kB padding after the final
		* bootstrap element. If necessary, the bootstrap virtual region is
		* extended by an extra 4MB to ensure this.
		*/
		@@ -645,6 +648,8 @@ struct start_info {
		#define SIF_INITDOMAIN (1<<1) /* Is this the initial control domain? */
		#define SIF_MULTIBOOT_MOD (1<<2) /* Is mod_start a multiboot module? */
		#define SIF_MOD_START_PFN (1<<3) /* Is mod_start a PFN? */
		#define SIF_VIRT_P2M_4TOOLS (1<<4) /* Do Xen tools understand a virt. mapped */
		/* P->M making the 3 level tree obsolete? */
		#define SIF_PM_MASK (0xFF<<8) /* reserve 1 byte for xen-pm options */

		/*

Admin message