mirror of
https://github.com/linux-msm/laptops-kernel.git
synced 2026-08-13 14:19:53 -07:00
Merge branch 'stable/gntdev' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
* 'stable/gntdev' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: xen/p2m: Fix module linking error. xen p2m: clear the old pte when adding a page to m2p_override xen gntdev: use gnttab_map_refs and gnttab_unmap_refs xen: introduce gnttab_map_refs and gnttab_unmap_refs xen p2m: transparently change the p2m mappings in the m2p override xen/gntdev: Fix circular locking dependency xen/gntdev: stop using "token" argument xen: gntdev: move use of GNTMAP_contains_pte next to the map_op xen: add m2p override mechanism xen: move p2m handling to separate file xen/gntdev: add VM_PFNMAP to vma xen/gntdev: allow usermode to map granted pages xen: define gnttab_set_map_op/unmap_op Fix up trivial conflict in drivers/xen/Kconfig
This commit is contained in:
Linus Torvalds
@@ -42,6 +42,11 @@ extern unsigned int machine_to_phys_order;
|
||||
extern unsigned long get_phys_to_machine(unsigned long pfn);
|
||||
extern bool set_phys_to_machine(unsigned long pfn, unsigned long mfn);
|
||||
|
||||
extern int m2p_add_override(unsigned long mfn, struct page *page);
|
||||
extern int m2p_remove_override(struct page *page);
|
||||
extern struct page *m2p_find_override(unsigned long mfn);
|
||||
extern unsigned long m2p_find_override_pfn(unsigned long mfn, unsigned long pfn);
|
||||
|
||||
static inline unsigned long pfn_to_mfn(unsigned long pfn)
|
||||
{
|
||||
unsigned long mfn;
|
||||
@@ -72,9 +77,6 @@ static inline unsigned long mfn_to_pfn(unsigned long mfn)
|
||||
if (xen_feature(XENFEAT_auto_translated_physmap))
|
||||
return mfn;
|
||||
|
||||
if (unlikely((mfn >> machine_to_phys_order) != 0))
|
||||
return ~0;
|
||||
|
||||
pfn = 0;
|
||||
/*
|
||||
* The array access can fail (e.g., device space beyond end of RAM).
|
||||
@@ -83,6 +85,14 @@ static inline unsigned long mfn_to_pfn(unsigned long mfn)
|
||||
*/
|
||||
__get_user(pfn, &machine_to_phys_mapping[mfn]);
|
||||
|
||||
/*
|
||||
* If this appears to be a foreign mfn (because the pfn
|
||||
* doesn't map back to the mfn), then check the local override
|
||||
* table to see if there's a better pfn to use.
|
||||
*/
|
||||
if (get_phys_to_machine(pfn) != mfn)
|
||||
pfn = m2p_find_override_pfn(mfn, pfn);
|
||||
|
||||
return pfn;
|
||||
}
|
||||
|
||||
|
||||
@@ -12,7 +12,8 @@ CFLAGS_mmu.o := $(nostackp)
|
||||
|
||||
obj-y := enlighten.o setup.o multicalls.o mmu.o irq.o \
|
||||
time.o xen-asm.o xen-asm_$(BITS).o \
|
||||
grant-table.o suspend.o platform-pci-unplug.o
|
||||
grant-table.o suspend.o platform-pci-unplug.o \
|
||||
p2m.o
|
||||
|
||||
obj-$(CONFIG_SMP) += smp.o
|
||||
obj-$(CONFIG_PARAVIRT_SPINLOCKS)+= spinlock.o
|
||||
|
||||
@@ -173,371 +173,6 @@ DEFINE_PER_CPU(unsigned long, xen_current_cr3); /* actual vcpu cr3 */
|
||||
*/
|
||||
#define USER_LIMIT ((STACK_TOP_MAX + PGDIR_SIZE - 1) & PGDIR_MASK)
|
||||
|
||||
/*
|
||||
* Xen leaves the responsibility for maintaining p2m mappings to the
|
||||
* guests themselves, but it must also access and update the p2m array
|
||||
* during suspend/resume when all the pages are reallocated.
|
||||
*
|
||||
* The p2m table is logically a flat array, but we implement it as a
|
||||
* three-level tree to allow the address space to be sparse.
|
||||
*
|
||||
* Xen
|
||||
* |
|
||||
* p2m_top p2m_top_mfn
|
||||
* / \ / \
|
||||
* p2m_mid p2m_mid p2m_mid_mfn p2m_mid_mfn
|
||||
* / \ / \ / /
|
||||
* p2m p2m p2m p2m p2m p2m p2m ...
|
||||
*
|
||||
* The p2m_mid_mfn pages are mapped by p2m_top_mfn_p.
|
||||
*
|
||||
* The p2m_top and p2m_top_mfn levels are limited to 1 page, so the
|
||||
* maximum representable pseudo-physical address space is:
|
||||
* P2M_TOP_PER_PAGE * P2M_MID_PER_PAGE * P2M_PER_PAGE pages
|
||||
*
|
||||
* P2M_PER_PAGE depends on the architecture, as a mfn is always
|
||||
* unsigned long (8 bytes on 64-bit, 4 bytes on 32), leading to
|
||||
* 512 and 1024 entries respectively.
|
||||
*/
|
||||
|
||||
unsigned long xen_max_p2m_pfn __read_mostly;
|
||||
|
||||
#define P2M_PER_PAGE (PAGE_SIZE / sizeof(unsigned long))
|
||||
#define P2M_MID_PER_PAGE (PAGE_SIZE / sizeof(unsigned long *))
|
||||
#define P2M_TOP_PER_PAGE (PAGE_SIZE / sizeof(unsigned long **))
|
||||
|
||||
#define MAX_P2M_PFN (P2M_TOP_PER_PAGE * P2M_MID_PER_PAGE * P2M_PER_PAGE)
|
||||
|
||||
/* Placeholders for holes in the address space */
|
||||
static RESERVE_BRK_ARRAY(unsigned long, p2m_missing, P2M_PER_PAGE);
|
||||
static RESERVE_BRK_ARRAY(unsigned long *, p2m_mid_missing, P2M_MID_PER_PAGE);
|
||||
static RESERVE_BRK_ARRAY(unsigned long, p2m_mid_missing_mfn, P2M_MID_PER_PAGE);
|
||||
|
||||
static RESERVE_BRK_ARRAY(unsigned long **, p2m_top, P2M_TOP_PER_PAGE);
|
||||
static RESERVE_BRK_ARRAY(unsigned long, p2m_top_mfn, P2M_TOP_PER_PAGE);
|
||||
static RESERVE_BRK_ARRAY(unsigned long *, p2m_top_mfn_p, P2M_TOP_PER_PAGE);
|
||||
|
||||
RESERVE_BRK(p2m_mid, PAGE_SIZE * (MAX_DOMAIN_PAGES / (P2M_PER_PAGE * P2M_MID_PER_PAGE)));
|
||||
RESERVE_BRK(p2m_mid_mfn, PAGE_SIZE * (MAX_DOMAIN_PAGES / (P2M_PER_PAGE * P2M_MID_PER_PAGE)));
|
||||
|
||||
static inline unsigned p2m_top_index(unsigned long pfn)
|
||||
{
|
||||
BUG_ON(pfn >= MAX_P2M_PFN);
|
||||
return pfn / (P2M_MID_PER_PAGE * P2M_PER_PAGE);
|
||||
}
|
||||
|
||||
static inline unsigned p2m_mid_index(unsigned long pfn)
|
||||
{
|
||||
return (pfn / P2M_PER_PAGE) % P2M_MID_PER_PAGE;
|
||||
}
|
||||
|
||||
static inline unsigned p2m_index(unsigned long pfn)
|
||||
{
|
||||
return pfn % P2M_PER_PAGE;
|
||||
}
|
||||
|
||||
static void p2m_top_init(unsigned long ***top)
|
||||
{
|
||||
unsigned i;
|
||||
|
||||
for (i = 0; i < P2M_TOP_PER_PAGE; i++)
|
||||
top[i] = p2m_mid_missing;
|
||||
}
|
||||
|
||||
static void p2m_top_mfn_init(unsigned long *top)
|
||||
{
|
||||
unsigned i;
|
||||
|
||||
for (i = 0; i < P2M_TOP_PER_PAGE; i++)
|
||||
top[i] = virt_to_mfn(p2m_mid_missing_mfn);
|
||||
}
|
||||
|
||||
static void p2m_top_mfn_p_init(unsigned long **top)
|
||||
{
|
||||
unsigned i;
|
||||
|
||||
for (i = 0; i < P2M_TOP_PER_PAGE; i++)
|
||||
top[i] = p2m_mid_missing_mfn;
|
||||
}
|
||||
|
||||
static void p2m_mid_init(unsigned long **mid)
|
||||
{
|
||||
unsigned i;
|
||||
|
||||
for (i = 0; i < P2M_MID_PER_PAGE; i++)
|
||||
mid[i] = p2m_missing;
|
||||
}
|
||||
|
||||
static void p2m_mid_mfn_init(unsigned long *mid)
|
||||
{
|
||||
unsigned i;
|
||||
|
||||
for (i = 0; i < P2M_MID_PER_PAGE; i++)
|
||||
mid[i] = virt_to_mfn(p2m_missing);
|
||||
}
|
||||
|
||||
static void p2m_init(unsigned long *p2m)
|
||||
{
|
||||
unsigned i;
|
||||
|
||||
for (i = 0; i < P2M_MID_PER_PAGE; i++)
|
||||
p2m[i] = INVALID_P2M_ENTRY;
|
||||
}
|
||||
|
||||
/*
|
||||
* Build the parallel p2m_top_mfn and p2m_mid_mfn structures
|
||||
*
|
||||
* This is called both at boot time, and after resuming from suspend:
|
||||
* - At boot time we're called very early, and must use extend_brk()
|
||||
* to allocate memory.
|
||||
*
|
||||
* - After resume we're called from within stop_machine, but the mfn
|
||||
* tree should alreay be completely allocated.
|
||||
*/
|
||||
void xen_build_mfn_list_list(void)
|
||||
{
|
||||
unsigned long pfn;
|
||||
|
||||
/* Pre-initialize p2m_top_mfn to be completely missing */
|
||||
if (p2m_top_mfn == NULL) {
|
||||
p2m_mid_missing_mfn = extend_brk(PAGE_SIZE, PAGE_SIZE);
|
||||
p2m_mid_mfn_init(p2m_mid_missing_mfn);
|
||||
|
||||
p2m_top_mfn_p = extend_brk(PAGE_SIZE, PAGE_SIZE);
|
||||
p2m_top_mfn_p_init(p2m_top_mfn_p);
|
||||
|
||||
p2m_top_mfn = extend_brk(PAGE_SIZE, PAGE_SIZE);
|
||||
p2m_top_mfn_init(p2m_top_mfn);
|
||||
} else {
|
||||
/* Reinitialise, mfn's all change after migration */
|
||||
p2m_mid_mfn_init(p2m_mid_missing_mfn);
|
||||
}
|
||||
|
||||
for (pfn = 0; pfn < xen_max_p2m_pfn; pfn += P2M_PER_PAGE) {
|
||||
unsigned topidx = p2m_top_index(pfn);
|
||||
unsigned mididx = p2m_mid_index(pfn);
|
||||
unsigned long **mid;
|
||||
unsigned long *mid_mfn_p;
|
||||
|
||||
mid = p2m_top[topidx];
|
||||
mid_mfn_p = p2m_top_mfn_p[topidx];
|
||||
|
||||
/* Don't bother allocating any mfn mid levels if
|
||||
* they're just missing, just update the stored mfn,
|
||||
* since all could have changed over a migrate.
|
||||
*/
|
||||
if (mid == p2m_mid_missing) {
|
||||
BUG_ON(mididx);
|
||||
BUG_ON(mid_mfn_p != p2m_mid_missing_mfn);
|
||||
p2m_top_mfn[topidx] = virt_to_mfn(p2m_mid_missing_mfn);
|
||||
pfn += (P2M_MID_PER_PAGE - 1) * P2M_PER_PAGE;
|
||||
continue;
|
||||
}
|
||||
|
||||
if (mid_mfn_p == p2m_mid_missing_mfn) {
|
||||
/*
|
||||
* XXX boot-time only! We should never find
|
||||
* missing parts of the mfn tree after
|
||||
* runtime. extend_brk() will BUG if we call
|
||||
* it too late.
|
||||
*/
|
||||
mid_mfn_p = extend_brk(PAGE_SIZE, PAGE_SIZE);
|
||||
p2m_mid_mfn_init(mid_mfn_p);
|
||||
|
||||
p2m_top_mfn_p[topidx] = mid_mfn_p;
|
||||
}
|
||||
|
||||
p2m_top_mfn[topidx] = virt_to_mfn(mid_mfn_p);
|
||||
mid_mfn_p[mididx] = virt_to_mfn(mid[mididx]);
|
||||
}
|
||||
}
|
||||
|
||||
void xen_setup_mfn_list_list(void)
|
||||
{
|
||||
BUG_ON(HYPERVISOR_shared_info == &xen_dummy_shared_info);
|
||||
|
||||
HYPERVISOR_shared_info->arch.pfn_to_mfn_frame_list_list =
|
||||
virt_to_mfn(p2m_top_mfn);
|
||||
HYPERVISOR_shared_info->arch.max_pfn = xen_max_p2m_pfn;
|
||||
}
|
||||
|
||||
/* Set up p2m_top to point to the domain-builder provided p2m pages */
|
||||
void __init xen_build_dynamic_phys_to_machine(void)
|
||||
{
|
||||
unsigned long *mfn_list = (unsigned long *)xen_start_info->mfn_list;
|
||||
unsigned long max_pfn = min(MAX_DOMAIN_PAGES, xen_start_info->nr_pages);
|
||||
unsigned long pfn;
|
||||
|
||||
xen_max_p2m_pfn = max_pfn;
|
||||
|
||||
p2m_missing = extend_brk(PAGE_SIZE, PAGE_SIZE);
|
||||
p2m_init(p2m_missing);
|
||||
|
||||
p2m_mid_missing = extend_brk(PAGE_SIZE, PAGE_SIZE);
|
||||
p2m_mid_init(p2m_mid_missing);
|
||||
|
||||
p2m_top = extend_brk(PAGE_SIZE, PAGE_SIZE);
|
||||
p2m_top_init(p2m_top);
|
||||
|
||||
/*
|
||||
* The domain builder gives us a pre-constructed p2m array in
|
||||
* mfn_list for all the pages initially given to us, so we just
|
||||
* need to graft that into our tree structure.
|
||||
*/
|
||||
for (pfn = 0; pfn < max_pfn; pfn += P2M_PER_PAGE) {
|
||||
unsigned topidx = p2m_top_index(pfn);
|
||||
unsigned mididx = p2m_mid_index(pfn);
|
||||
|
||||
if (p2m_top[topidx] == p2m_mid_missing) {
|
||||
unsigned long **mid = extend_brk(PAGE_SIZE, PAGE_SIZE);
|
||||
p2m_mid_init(mid);
|
||||
|
||||
p2m_top[topidx] = mid;
|
||||
}
|
||||
|
||||
p2m_top[topidx][mididx] = &mfn_list[pfn];
|
||||
}
|
||||
}
|
||||
|
||||
unsigned long get_phys_to_machine(unsigned long pfn)
|
||||
{
|
||||
unsigned topidx, mididx, idx;
|
||||
|
||||
if (unlikely(pfn >= MAX_P2M_PFN))
|
||||
return INVALID_P2M_ENTRY;
|
||||
|
||||
topidx = p2m_top_index(pfn);
|
||||
mididx = p2m_mid_index(pfn);
|
||||
idx = p2m_index(pfn);
|
||||
|
||||
return p2m_top[topidx][mididx][idx];
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(get_phys_to_machine);
|
||||
|
||||
static void *alloc_p2m_page(void)
|
||||
{
|
||||
return (void *)__get_free_page(GFP_KERNEL | __GFP_REPEAT);
|
||||
}
|
||||
|
||||
static void free_p2m_page(void *p)
|
||||
{
|
||||
free_page((unsigned long)p);
|
||||
}
|
||||
|
||||
/*
|
||||
* Fully allocate the p2m structure for a given pfn. We need to check
|
||||
* that both the top and mid levels are allocated, and make sure the
|
||||
* parallel mfn tree is kept in sync. We may race with other cpus, so
|
||||
* the new pages are installed with cmpxchg; if we lose the race then
|
||||
* simply free the page we allocated and use the one that's there.
|
||||
*/
|
||||
static bool alloc_p2m(unsigned long pfn)
|
||||
{
|
||||
unsigned topidx, mididx;
|
||||
unsigned long ***top_p, **mid;
|
||||
unsigned long *top_mfn_p, *mid_mfn;
|
||||
|
||||
topidx = p2m_top_index(pfn);
|
||||
mididx = p2m_mid_index(pfn);
|
||||
|
||||
top_p = &p2m_top[topidx];
|
||||
mid = *top_p;
|
||||
|
||||
if (mid == p2m_mid_missing) {
|
||||
/* Mid level is missing, allocate a new one */
|
||||
mid = alloc_p2m_page();
|
||||
if (!mid)
|
||||
return false;
|
||||
|
||||
p2m_mid_init(mid);
|
||||
|
||||
if (cmpxchg(top_p, p2m_mid_missing, mid) != p2m_mid_missing)
|
||||
free_p2m_page(mid);
|
||||
}
|
||||
|
||||
top_mfn_p = &p2m_top_mfn[topidx];
|
||||
mid_mfn = p2m_top_mfn_p[topidx];
|
||||
|
||||
BUG_ON(virt_to_mfn(mid_mfn) != *top_mfn_p);
|
||||
|
||||
if (mid_mfn == p2m_mid_missing_mfn) {
|
||||
/* Separately check the mid mfn level */
|
||||
unsigned long missing_mfn;
|
||||
unsigned long mid_mfn_mfn;
|
||||
|
||||
mid_mfn = alloc_p2m_page();
|
||||
if (!mid_mfn)
|
||||
return false;
|
||||
|
||||
p2m_mid_mfn_init(mid_mfn);
|
||||
|
||||
missing_mfn = virt_to_mfn(p2m_mid_missing_mfn);
|
||||
mid_mfn_mfn = virt_to_mfn(mid_mfn);
|
||||
if (cmpxchg(top_mfn_p, missing_mfn, mid_mfn_mfn) != missing_mfn)
|
||||
free_p2m_page(mid_mfn);
|
||||
else
|
||||
p2m_top_mfn_p[topidx] = mid_mfn;
|
||||
}
|
||||
|
||||
if (p2m_top[topidx][mididx] == p2m_missing) {
|
||||
/* p2m leaf page is missing */
|
||||
unsigned long *p2m;
|
||||
|
||||
p2m = alloc_p2m_page();
|
||||
if (!p2m)
|
||||
return false;
|
||||
|
||||
p2m_init(p2m);
|
||||
|
||||
if (cmpxchg(&mid[mididx], p2m_missing, p2m) != p2m_missing)
|
||||
free_p2m_page(p2m);
|
||||
else
|
||||
mid_mfn[mididx] = virt_to_mfn(p2m);
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
/* Try to install p2m mapping; fail if intermediate bits missing */
|
||||
bool __set_phys_to_machine(unsigned long pfn, unsigned long mfn)
|
||||
{
|
||||
unsigned topidx, mididx, idx;
|
||||
|
||||
if (unlikely(pfn >= MAX_P2M_PFN)) {
|
||||
BUG_ON(mfn != INVALID_P2M_ENTRY);
|
||||
return true;
|
||||
}
|
||||
|
||||
topidx = p2m_top_index(pfn);
|
||||
mididx = p2m_mid_index(pfn);
|
||||
idx = p2m_index(pfn);
|
||||
|
||||
if (p2m_top[topidx][mididx] == p2m_missing)
|
||||
return mfn == INVALID_P2M_ENTRY;
|
||||
|
||||
p2m_top[topidx][mididx][idx] = mfn;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool set_phys_to_machine(unsigned long pfn, unsigned long mfn)
|
||||
{
|
||||
if (unlikely(xen_feature(XENFEAT_auto_translated_physmap))) {
|
||||
BUG_ON(pfn != mfn && mfn != INVALID_P2M_ENTRY);
|
||||
return true;
|
||||
}
|
||||
|
||||
if (unlikely(!__set_phys_to_machine(pfn, mfn))) {
|
||||
if (!alloc_p2m(pfn))
|
||||
return false;
|
||||
|
||||
if (!__set_phys_to_machine(pfn, mfn))
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
unsigned long arbitrary_virt_to_mfn(void *vaddr)
|
||||
{
|
||||
xmaddr_t maddr = arbitrary_virt_to_machine(vaddr);
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
+8
-1
@@ -71,7 +71,14 @@ config XEN_SYS_HYPERVISOR
|
||||
but will have no xen contents.
|
||||
|
||||
config XEN_XENBUS_FRONTEND
|
||||
tristate
|
||||
tristate
|
||||
|
||||
config XEN_GNTDEV
|
||||
tristate "userspace grant access device driver"
|
||||
depends on XEN
|
||||
select MMU_NOTIFIER
|
||||
help
|
||||
Allows userspace processes to use grants.
|
||||
|
||||
config XEN_PLATFORM_PCI
|
||||
tristate "xen platform pci device driver"
|
||||
|
||||
@@ -9,6 +9,7 @@ obj-$(CONFIG_HOTPLUG_CPU) += cpu_hotplug.o
|
||||
obj-$(CONFIG_XEN_XENCOMM) += xencomm.o
|
||||
obj-$(CONFIG_XEN_BALLOON) += balloon.o
|
||||
obj-$(CONFIG_XEN_DEV_EVTCHN) += xen-evtchn.o
|
||||
obj-$(CONFIG_XEN_GNTDEV) += xen-gntdev.o
|
||||
obj-$(CONFIG_XENFS) += xenfs/
|
||||
obj-$(CONFIG_XEN_SYS_HYPERVISOR) += sys-hypervisor.o
|
||||
obj-$(CONFIG_XEN_PLATFORM_PCI) += xen-platform-pci.o
|
||||
@@ -16,5 +17,6 @@ obj-$(CONFIG_SWIOTLB_XEN) += swiotlb-xen.o
|
||||
obj-$(CONFIG_XEN_DOM0) += pci.o
|
||||
|
||||
xen-evtchn-y := evtchn.o
|
||||
xen-gntdev-y := gntdev.o
|
||||
|
||||
xen-platform-pci-y := platform-pci.o
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -447,6 +447,52 @@ unsigned int gnttab_max_grant_frames(void)
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(gnttab_max_grant_frames);
|
||||
|
||||
int gnttab_map_refs(struct gnttab_map_grant_ref *map_ops,
|
||||
struct page **pages, unsigned int count)
|
||||
{
|
||||
int i, ret;
|
||||
pte_t *pte;
|
||||
unsigned long mfn;
|
||||
|
||||
ret = HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref, map_ops, count);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
for (i = 0; i < count; i++) {
|
||||
/* m2p override only supported for GNTMAP_contains_pte mappings */
|
||||
if (!(map_ops[i].flags & GNTMAP_contains_pte))
|
||||
continue;
|
||||
pte = (pte_t *) (mfn_to_virt(PFN_DOWN(map_ops[i].host_addr)) +
|
||||
(map_ops[i].host_addr & ~PAGE_MASK));
|
||||
mfn = pte_mfn(*pte);
|
||||
ret = m2p_add_override(mfn, pages[i]);
|
||||
if (ret)
|
||||
return ret;
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(gnttab_map_refs);
|
||||
|
||||
int gnttab_unmap_refs(struct gnttab_unmap_grant_ref *unmap_ops,
|
||||
struct page **pages, unsigned int count)
|
||||
{
|
||||
int i, ret;
|
||||
|
||||
ret = HYPERVISOR_grant_table_op(GNTTABOP_unmap_grant_ref, unmap_ops, count);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
for (i = 0; i < count; i++) {
|
||||
ret = m2p_remove_override(pages[i]);
|
||||
if (ret)
|
||||
return ret;
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(gnttab_unmap_refs);
|
||||
|
||||
static int gnttab_map(unsigned int start_idx, unsigned int end_idx)
|
||||
{
|
||||
struct gnttab_setup_table setup;
|
||||
|
||||
@@ -0,0 +1,119 @@
|
||||
/******************************************************************************
|
||||
* gntdev.h
|
||||
*
|
||||
* Interface to /dev/xen/gntdev.
|
||||
*
|
||||
* Copyright (c) 2007, D G Murray
|
||||
*
|
||||
* 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 __LINUX_PUBLIC_GNTDEV_H__
|
||||
#define __LINUX_PUBLIC_GNTDEV_H__
|
||||
|
||||
struct ioctl_gntdev_grant_ref {
|
||||
/* The domain ID of the grant to be mapped. */
|
||||
uint32_t domid;
|
||||
/* The grant reference of the grant to be mapped. */
|
||||
uint32_t ref;
|
||||
};
|
||||
|
||||
/*
|
||||
* Inserts the grant references into the mapping table of an instance
|
||||
* of gntdev. N.B. This does not perform the mapping, which is deferred
|
||||
* until mmap() is called with @index as the offset.
|
||||
*/
|
||||
#define IOCTL_GNTDEV_MAP_GRANT_REF \
|
||||
_IOC(_IOC_NONE, 'G', 0, sizeof(struct ioctl_gntdev_map_grant_ref))
|
||||
struct ioctl_gntdev_map_grant_ref {
|
||||
/* IN parameters */
|
||||
/* The number of grants to be mapped. */
|
||||
uint32_t count;
|
||||
uint32_t pad;
|
||||
/* OUT parameters */
|
||||
/* The offset to be used on a subsequent call to mmap(). */
|
||||
uint64_t index;
|
||||
/* Variable IN parameter. */
|
||||
/* Array of grant references, of size @count. */
|
||||
struct ioctl_gntdev_grant_ref refs[1];
|
||||
};
|
||||
|
||||
/*
|
||||
* Removes the grant references from the mapping table of an instance of
|
||||
* of gntdev. N.B. munmap() must be called on the relevant virtual address(es)
|
||||
* before this ioctl is called, or an error will result.
|
||||
*/
|
||||
#define IOCTL_GNTDEV_UNMAP_GRANT_REF \
|
||||
_IOC(_IOC_NONE, 'G', 1, sizeof(struct ioctl_gntdev_unmap_grant_ref))
|
||||
struct ioctl_gntdev_unmap_grant_ref {
|
||||
/* IN parameters */
|
||||
/* The offset was returned by the corresponding map operation. */
|
||||
uint64_t index;
|
||||
/* The number of pages to be unmapped. */
|
||||
uint32_t count;
|
||||
uint32_t pad;
|
||||
};
|
||||
|
||||
/*
|
||||
* Returns the offset in the driver's address space that corresponds
|
||||
* to @vaddr. This can be used to perform a munmap(), followed by an
|
||||
* UNMAP_GRANT_REF ioctl, where no state about the offset is retained by
|
||||
* the caller. The number of pages that were allocated at the same time as
|
||||
* @vaddr is returned in @count.
|
||||
*
|
||||
* N.B. Where more than one page has been mapped into a contiguous range, the
|
||||
* supplied @vaddr must correspond to the start of the range; otherwise
|
||||
* an error will result. It is only possible to munmap() the entire
|
||||
* contiguously-allocated range at once, and not any subrange thereof.
|
||||
*/
|
||||
#define IOCTL_GNTDEV_GET_OFFSET_FOR_VADDR \
|
||||
_IOC(_IOC_NONE, 'G', 2, sizeof(struct ioctl_gntdev_get_offset_for_vaddr))
|
||||
struct ioctl_gntdev_get_offset_for_vaddr {
|
||||
/* IN parameters */
|
||||
/* The virtual address of the first mapped page in a range. */
|
||||
uint64_t vaddr;
|
||||
/* OUT parameters */
|
||||
/* The offset that was used in the initial mmap() operation. */
|
||||
uint64_t offset;
|
||||
/* The number of pages mapped in the VM area that begins at @vaddr. */
|
||||
uint32_t count;
|
||||
uint32_t pad;
|
||||
};
|
||||
|
||||
/*
|
||||
* Sets the maximum number of grants that may mapped at once by this gntdev
|
||||
* instance.
|
||||
*
|
||||
* N.B. This must be called before any other ioctl is performed on the device.
|
||||
*/
|
||||
#define IOCTL_GNTDEV_SET_MAX_GRANTS \
|
||||
_IOC(_IOC_NONE, 'G', 3, sizeof(struct ioctl_gntdev_set_max_grants))
|
||||
struct ioctl_gntdev_set_max_grants {
|
||||
/* IN parameter */
|
||||
/* The maximum number of grants that may be mapped at once. */
|
||||
uint32_t count;
|
||||
};
|
||||
|
||||
#endif /* __LINUX_PUBLIC_GNTDEV_H__ */
|
||||
@@ -37,10 +37,16 @@
|
||||
#ifndef __ASM_GNTTAB_H__
|
||||
#define __ASM_GNTTAB_H__
|
||||
|
||||
#include <asm/xen/hypervisor.h>
|
||||
#include <asm/page.h>
|
||||
|
||||
#include <xen/interface/xen.h>
|
||||
#include <xen/interface/grant_table.h>
|
||||
|
||||
#include <asm/xen/hypervisor.h>
|
||||
#include <asm/xen/grant_table.h>
|
||||
|
||||
#include <xen/features.h>
|
||||
|
||||
/* NR_GRANT_FRAMES must be less than or equal to that configured in Xen */
|
||||
#define NR_GRANT_FRAMES 4
|
||||
|
||||
@@ -107,6 +113,37 @@ void gnttab_grant_foreign_access_ref(grant_ref_t ref, domid_t domid,
|
||||
void gnttab_grant_foreign_transfer_ref(grant_ref_t, domid_t domid,
|
||||
unsigned long pfn);
|
||||
|
||||
static inline void
|
||||
gnttab_set_map_op(struct gnttab_map_grant_ref *map, phys_addr_t addr,
|
||||
uint32_t flags, grant_ref_t ref, domid_t domid)
|
||||
{
|
||||
if (flags & GNTMAP_contains_pte)
|
||||
map->host_addr = addr;
|
||||
else if (xen_feature(XENFEAT_auto_translated_physmap))
|
||||
map->host_addr = __pa(addr);
|
||||
else
|
||||
map->host_addr = addr;
|
||||
|
||||
map->flags = flags;
|
||||
map->ref = ref;
|
||||
map->dom = domid;
|
||||
}
|
||||
|
||||
static inline void
|
||||
gnttab_set_unmap_op(struct gnttab_unmap_grant_ref *unmap, phys_addr_t addr,
|
||||
uint32_t flags, grant_handle_t handle)
|
||||
{
|
||||
if (flags & GNTMAP_contains_pte)
|
||||
unmap->host_addr = addr;
|
||||
else if (xen_feature(XENFEAT_auto_translated_physmap))
|
||||
unmap->host_addr = __pa(addr);
|
||||
else
|
||||
unmap->host_addr = addr;
|
||||
|
||||
unmap->handle = handle;
|
||||
unmap->dev_bus_addr = 0;
|
||||
}
|
||||
|
||||
int arch_gnttab_map_shared(unsigned long *frames, unsigned long nr_gframes,
|
||||
unsigned long max_nr_gframes,
|
||||
struct grant_entry **__shared);
|
||||
@@ -118,4 +155,9 @@ unsigned int gnttab_max_grant_frames(void);
|
||||
|
||||
#define gnttab_map_vaddr(map) ((void *)(map.host_virt_addr))
|
||||
|
||||
int gnttab_map_refs(struct gnttab_map_grant_ref *map_ops,
|
||||
struct page **pages, unsigned int count);
|
||||
int gnttab_unmap_refs(struct gnttab_unmap_grant_ref *unmap_ops,
|
||||
struct page **pages, unsigned int count);
|
||||
|
||||
#endif /* __ASM_GNTTAB_H__ */
|
||||
|
||||
Reference in New Issue
Block a user