forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge tag 'for-linus-4.10-rc0-tag' of git://git.kernel.org/pub/scm/li…
…nux/kernel/git/xen/tip Pull xen updates from Juergen Gross: "Xen features and fixes for 4.10 These are some fixes, a move of some arm related headers to share them between arm and arm64 and a series introducing a helper to make code more readable. The most notable change is David stepping down as maintainer of the Xen hypervisor interface. This results in me sending you the pull requests for Xen related code from now on" * tag 'for-linus-4.10-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip: (29 commits) xen/balloon: Only mark a page as managed when it is released xenbus: fix deadlock on writes to /proc/xen/xenbus xen/scsifront: don't request a slot on the ring until request is ready xen/x86: Increase xen_e820_map to E820_X_MAX possible entries x86: Make E820_X_MAX unconditionally larger than E820MAX xen/pci: Bubble up error and fix description. xen: xenbus: set error code on failure xen: set error code on failures arm/xen: Use alloc_percpu rather than __alloc_percpu arm/arm64: xen: Move shared architecture headers to include/xen/arm xen/events: use xen_vcpu_id mapping for EVTCHNOP_status xen/gntdev: Use VM_MIXEDMAP instead of VM_IO to avoid NUMA balancing xen-scsifront: Add a missing call to kfree MAINTAINERS: update XEN HYPERVISOR INTERFACE xenfs: Use proc_create_mount_point() to create /proc/xen xen-platform: use builtin_pci_driver xen-netback: fix error handling output xen: make use of xenbus_read_unsigned() in xenbus xen: make use of xenbus_read_unsigned() in xen-pciback xen: make use of xenbus_read_unsigned() in xen-fbfront ...
- Loading branch information
Showing
43 changed files
with
669 additions
and
780 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13354,7 +13354,6 @@ F: drivers/media/tuners/tuner-xc2028.* | |
|
|
||
| XEN HYPERVISOR INTERFACE | ||
| M: Boris Ostrovsky <[email protected]> | ||
| M: David Vrabel <[email protected]> | ||
| M: Juergen Gross <[email protected]> | ||
| L: [email protected] (moderated for non-subscribers) | ||
| T: git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,87 +1 @@ | ||
| /****************************************************************************** | ||
| * hypercall.h | ||
| * | ||
| * Linux-specific hypervisor handling. | ||
| * | ||
| * Stefano Stabellini <[email protected]>, Citrix, 2012 | ||
| * | ||
| * This program is free software; you can redistribute it and/or | ||
| * modify it under the terms of the GNU General Public License version 2 | ||
| * as published by the Free Software Foundation; or, when distributed | ||
| * separately from the Linux kernel or incorporated into other | ||
| * software packages, subject to the following license: | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| * of this source file (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. | ||
| */ | ||
|
|
||
| #ifndef _ASM_ARM_XEN_HYPERCALL_H | ||
| #define _ASM_ARM_XEN_HYPERCALL_H | ||
|
|
||
| #include <linux/bug.h> | ||
|
|
||
| #include <xen/interface/xen.h> | ||
| #include <xen/interface/sched.h> | ||
| #include <xen/interface/platform.h> | ||
|
|
||
| long privcmd_call(unsigned call, unsigned long a1, | ||
| unsigned long a2, unsigned long a3, | ||
| unsigned long a4, unsigned long a5); | ||
| int HYPERVISOR_xen_version(int cmd, void *arg); | ||
| int HYPERVISOR_console_io(int cmd, int count, char *str); | ||
| int HYPERVISOR_grant_table_op(unsigned int cmd, void *uop, unsigned int count); | ||
| int HYPERVISOR_sched_op(int cmd, void *arg); | ||
| int HYPERVISOR_event_channel_op(int cmd, void *arg); | ||
| unsigned long HYPERVISOR_hvm_op(int op, void *arg); | ||
| int HYPERVISOR_memory_op(unsigned int cmd, void *arg); | ||
| int HYPERVISOR_physdev_op(int cmd, void *arg); | ||
| int HYPERVISOR_vcpu_op(int cmd, int vcpuid, void *extra_args); | ||
| int HYPERVISOR_tmem_op(void *arg); | ||
| int HYPERVISOR_vm_assist(unsigned int cmd, unsigned int type); | ||
| int HYPERVISOR_platform_op_raw(void *arg); | ||
| static inline int HYPERVISOR_platform_op(struct xen_platform_op *op) | ||
| { | ||
| op->interface_version = XENPF_INTERFACE_VERSION; | ||
| return HYPERVISOR_platform_op_raw(op); | ||
| } | ||
| int HYPERVISOR_multicall(struct multicall_entry *calls, uint32_t nr); | ||
|
|
||
| static inline int | ||
| HYPERVISOR_suspend(unsigned long start_info_mfn) | ||
| { | ||
| struct sched_shutdown r = { .reason = SHUTDOWN_suspend }; | ||
|
|
||
| /* start_info_mfn is unused on ARM */ | ||
| return HYPERVISOR_sched_op(SCHEDOP_shutdown, &r); | ||
| } | ||
|
|
||
| static inline void | ||
| MULTI_update_va_mapping(struct multicall_entry *mcl, unsigned long va, | ||
| unsigned int new_val, unsigned long flags) | ||
| { | ||
| BUG(); | ||
| } | ||
|
|
||
| static inline void | ||
| MULTI_mmu_update(struct multicall_entry *mcl, struct mmu_update *req, | ||
| int count, int *success_count, domid_t domid) | ||
| { | ||
| BUG(); | ||
| } | ||
|
|
||
| #endif /* _ASM_ARM_XEN_HYPERCALL_H */ | ||
| #include <xen/arm/hypercall.h> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,39 +1 @@ | ||
| #ifndef _ASM_ARM_XEN_HYPERVISOR_H | ||
| #define _ASM_ARM_XEN_HYPERVISOR_H | ||
|
|
||
| #include <linux/init.h> | ||
|
|
||
| extern struct shared_info *HYPERVISOR_shared_info; | ||
| extern struct start_info *xen_start_info; | ||
|
|
||
| /* Lazy mode for batching updates / context switch */ | ||
| enum paravirt_lazy_mode { | ||
| PARAVIRT_LAZY_NONE, | ||
| PARAVIRT_LAZY_MMU, | ||
| PARAVIRT_LAZY_CPU, | ||
| }; | ||
|
|
||
| static inline enum paravirt_lazy_mode paravirt_get_lazy_mode(void) | ||
| { | ||
| return PARAVIRT_LAZY_NONE; | ||
| } | ||
|
|
||
| extern struct dma_map_ops *xen_dma_ops; | ||
|
|
||
| #ifdef CONFIG_XEN | ||
| void __init xen_early_init(void); | ||
| #else | ||
| static inline void xen_early_init(void) { return; } | ||
| #endif | ||
|
|
||
| #ifdef CONFIG_HOTPLUG_CPU | ||
| static inline void xen_arch_register_cpu(int num) | ||
| { | ||
| } | ||
|
|
||
| static inline void xen_arch_unregister_cpu(int num) | ||
| { | ||
| } | ||
| #endif | ||
|
|
||
| #endif /* _ASM_ARM_XEN_HYPERVISOR_H */ | ||
| #include <xen/arm/hypervisor.h> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,85 +1 @@ | ||
| /****************************************************************************** | ||
| * Guest OS interface to ARM Xen. | ||
| * | ||
| * Stefano Stabellini <[email protected]>, Citrix, 2012 | ||
| */ | ||
|
|
||
| #ifndef _ASM_ARM_XEN_INTERFACE_H | ||
| #define _ASM_ARM_XEN_INTERFACE_H | ||
|
|
||
| #include <linux/types.h> | ||
|
|
||
| #define uint64_aligned_t uint64_t __attribute__((aligned(8))) | ||
|
|
||
| #define __DEFINE_GUEST_HANDLE(name, type) \ | ||
| typedef struct { union { type *p; uint64_aligned_t q; }; } \ | ||
| __guest_handle_ ## name | ||
|
|
||
| #define DEFINE_GUEST_HANDLE_STRUCT(name) \ | ||
| __DEFINE_GUEST_HANDLE(name, struct name) | ||
| #define DEFINE_GUEST_HANDLE(name) __DEFINE_GUEST_HANDLE(name, name) | ||
| #define GUEST_HANDLE(name) __guest_handle_ ## name | ||
|
|
||
| #define set_xen_guest_handle(hnd, val) \ | ||
| do { \ | ||
| if (sizeof(hnd) == 8) \ | ||
| *(uint64_t *)&(hnd) = 0; \ | ||
| (hnd).p = val; \ | ||
| } while (0) | ||
|
|
||
| #define __HYPERVISOR_platform_op_raw __HYPERVISOR_platform_op | ||
|
|
||
| #ifndef __ASSEMBLY__ | ||
| /* Explicitly size integers that represent pfns in the interface with | ||
| * Xen so that we can have one ABI that works for 32 and 64 bit guests. | ||
| * Note that this means that the xen_pfn_t type may be capable of | ||
| * representing pfn's which the guest cannot represent in its own pfn | ||
| * type. However since pfn space is controlled by the guest this is | ||
| * fine since it simply wouldn't be able to create any sure pfns in | ||
| * the first place. | ||
| */ | ||
| typedef uint64_t xen_pfn_t; | ||
| #define PRI_xen_pfn "llx" | ||
| typedef uint64_t xen_ulong_t; | ||
| #define PRI_xen_ulong "llx" | ||
| typedef int64_t xen_long_t; | ||
| #define PRI_xen_long "llx" | ||
| /* Guest handles for primitive C types. */ | ||
| __DEFINE_GUEST_HANDLE(uchar, unsigned char); | ||
| __DEFINE_GUEST_HANDLE(uint, unsigned int); | ||
| DEFINE_GUEST_HANDLE(char); | ||
| DEFINE_GUEST_HANDLE(int); | ||
| DEFINE_GUEST_HANDLE(void); | ||
| DEFINE_GUEST_HANDLE(uint64_t); | ||
| DEFINE_GUEST_HANDLE(uint32_t); | ||
| DEFINE_GUEST_HANDLE(xen_pfn_t); | ||
| DEFINE_GUEST_HANDLE(xen_ulong_t); | ||
|
|
||
| /* Maximum number of virtual CPUs in multi-processor guests. */ | ||
| #define MAX_VIRT_CPUS 1 | ||
|
|
||
| struct arch_vcpu_info { }; | ||
| struct arch_shared_info { }; | ||
|
|
||
| /* TODO: Move pvclock definitions some place arch independent */ | ||
| struct pvclock_vcpu_time_info { | ||
| u32 version; | ||
| u32 pad0; | ||
| u64 tsc_timestamp; | ||
| u64 system_time; | ||
| u32 tsc_to_system_mul; | ||
| s8 tsc_shift; | ||
| u8 flags; | ||
| u8 pad[2]; | ||
| } __attribute__((__packed__)); /* 32 bytes */ | ||
|
|
||
| /* It is OK to have a 12 bytes struct with no padding because it is packed */ | ||
| struct pvclock_wall_clock { | ||
| u32 version; | ||
| u32 sec; | ||
| u32 nsec; | ||
| u32 sec_hi; | ||
| } __attribute__((__packed__)); | ||
| #endif | ||
|
|
||
| #endif /* _ASM_ARM_XEN_INTERFACE_H */ | ||
| #include <xen/arm/interface.h> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,98 +1 @@ | ||
| #ifndef _ASM_ARM_XEN_PAGE_COHERENT_H | ||
| #define _ASM_ARM_XEN_PAGE_COHERENT_H | ||
|
|
||
| #include <asm/page.h> | ||
| #include <linux/dma-mapping.h> | ||
|
|
||
| void __xen_dma_map_page(struct device *hwdev, struct page *page, | ||
| dma_addr_t dev_addr, unsigned long offset, size_t size, | ||
| enum dma_data_direction dir, unsigned long attrs); | ||
| void __xen_dma_unmap_page(struct device *hwdev, dma_addr_t handle, | ||
| size_t size, enum dma_data_direction dir, | ||
| unsigned long attrs); | ||
| void __xen_dma_sync_single_for_cpu(struct device *hwdev, | ||
| dma_addr_t handle, size_t size, enum dma_data_direction dir); | ||
|
|
||
| void __xen_dma_sync_single_for_device(struct device *hwdev, | ||
| dma_addr_t handle, size_t size, enum dma_data_direction dir); | ||
|
|
||
| static inline void *xen_alloc_coherent_pages(struct device *hwdev, size_t size, | ||
| dma_addr_t *dma_handle, gfp_t flags, unsigned long attrs) | ||
| { | ||
| return __generic_dma_ops(hwdev)->alloc(hwdev, size, dma_handle, flags, attrs); | ||
| } | ||
|
|
||
| static inline void xen_free_coherent_pages(struct device *hwdev, size_t size, | ||
| void *cpu_addr, dma_addr_t dma_handle, unsigned long attrs) | ||
| { | ||
| __generic_dma_ops(hwdev)->free(hwdev, size, cpu_addr, dma_handle, attrs); | ||
| } | ||
|
|
||
| static inline void xen_dma_map_page(struct device *hwdev, struct page *page, | ||
| dma_addr_t dev_addr, unsigned long offset, size_t size, | ||
| enum dma_data_direction dir, unsigned long attrs) | ||
| { | ||
| unsigned long page_pfn = page_to_xen_pfn(page); | ||
| unsigned long dev_pfn = XEN_PFN_DOWN(dev_addr); | ||
| unsigned long compound_pages = | ||
| (1<<compound_order(page)) * XEN_PFN_PER_PAGE; | ||
| bool local = (page_pfn <= dev_pfn) && | ||
| (dev_pfn - page_pfn < compound_pages); | ||
|
|
||
| /* | ||
| * Dom0 is mapped 1:1, while the Linux page can span across | ||
| * multiple Xen pages, it's not possible for it to contain a | ||
| * mix of local and foreign Xen pages. So if the first xen_pfn | ||
| * == mfn the page is local otherwise it's a foreign page | ||
| * grant-mapped in dom0. If the page is local we can safely | ||
| * call the native dma_ops function, otherwise we call the xen | ||
| * specific function. | ||
| */ | ||
| if (local) | ||
| __generic_dma_ops(hwdev)->map_page(hwdev, page, offset, size, dir, attrs); | ||
| else | ||
| __xen_dma_map_page(hwdev, page, dev_addr, offset, size, dir, attrs); | ||
| } | ||
|
|
||
| static inline void xen_dma_unmap_page(struct device *hwdev, dma_addr_t handle, | ||
| size_t size, enum dma_data_direction dir, unsigned long attrs) | ||
| { | ||
| unsigned long pfn = PFN_DOWN(handle); | ||
| /* | ||
| * Dom0 is mapped 1:1, while the Linux page can be spanned accross | ||
| * multiple Xen page, it's not possible to have a mix of local and | ||
| * foreign Xen page. Dom0 is mapped 1:1, so calling pfn_valid on a | ||
| * foreign mfn will always return false. If the page is local we can | ||
| * safely call the native dma_ops function, otherwise we call the xen | ||
| * specific function. | ||
| */ | ||
| if (pfn_valid(pfn)) { | ||
| if (__generic_dma_ops(hwdev)->unmap_page) | ||
| __generic_dma_ops(hwdev)->unmap_page(hwdev, handle, size, dir, attrs); | ||
| } else | ||
| __xen_dma_unmap_page(hwdev, handle, size, dir, attrs); | ||
| } | ||
|
|
||
| static inline void xen_dma_sync_single_for_cpu(struct device *hwdev, | ||
| dma_addr_t handle, size_t size, enum dma_data_direction dir) | ||
| { | ||
| unsigned long pfn = PFN_DOWN(handle); | ||
| if (pfn_valid(pfn)) { | ||
| if (__generic_dma_ops(hwdev)->sync_single_for_cpu) | ||
| __generic_dma_ops(hwdev)->sync_single_for_cpu(hwdev, handle, size, dir); | ||
| } else | ||
| __xen_dma_sync_single_for_cpu(hwdev, handle, size, dir); | ||
| } | ||
|
|
||
| static inline void xen_dma_sync_single_for_device(struct device *hwdev, | ||
| dma_addr_t handle, size_t size, enum dma_data_direction dir) | ||
| { | ||
| unsigned long pfn = PFN_DOWN(handle); | ||
| if (pfn_valid(pfn)) { | ||
| if (__generic_dma_ops(hwdev)->sync_single_for_device) | ||
| __generic_dma_ops(hwdev)->sync_single_for_device(hwdev, handle, size, dir); | ||
| } else | ||
| __xen_dma_sync_single_for_device(hwdev, handle, size, dir); | ||
| } | ||
|
|
||
| #endif /* _ASM_ARM_XEN_PAGE_COHERENT_H */ | ||
| #include <xen/arm/page-coherent.h> |
Oops, something went wrong.