Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4675348e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'stable/for-linus-3.14-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip 

Pull Xen bugfixes from Konrad Rzeszutek Wilk:
 "This has an healthy amount of code being removed - which we do not use
  anymore (the only user of it was ia64 Xen which had been removed
  already).  The other bug-fixes are to make Xen ARM be able to use the
  new event channel mechanism and proper export of header files to
  user-space.

  Summary:
   - Fix ARM and Xen FIFO not working.
   - Remove more Xen ia64 vestigates.
   - Fix UAPI missing Xen files"

* tag 'stable/for-linus-3.14-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  ia64/xen: Remove Xen support for ia64 even more
  xen: install xen/gntdev.h and xen/gntalloc.h
  xen/events: bind all new interdomain events to VCPU0
parents 9398a10c d8320b2d

drivers/xen/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ xen-pad-$(CONFIG_X86) += xen-acpi-pad.o 
dom0-$(CONFIG_X86) += pcpu.o

obj-$(CONFIG_XEN_DOM0)			+= $(dom0-y)

obj-$(CONFIG_BLOCK)			+= biomerge.o

obj-$(CONFIG_XEN_XENCOMM)		+= xencomm.o

obj-$(CONFIG_XEN_BALLOON)		+= xen-balloon.o

obj-$(CONFIG_XEN_SELFBALLOONING)	+= xen-selfballoon.o

obj-$(CONFIG_XEN_DEV_EVTCHN)		+= xen-evtchn.o

drivers/xen/events/events_base.c

+2 −0
Original line number Diff line number Diff line
@@ -862,6 +862,8 @@ int bind_evtchn_to_irq(unsigned int evtchn) 
			irq = ret;

			goto out;

		}

		/* New interdomain events are bound to VCPU 0. */

		bind_evtchn_to_cpu(evtchn, 0);

	} else {

		struct irq_info *info = info_for_irq(irq);

		WARN_ON(info == NULL || info->type != IRQT_EVTCHN);

drivers/xen/xencomm.c

deleted100644 → 0
+0 −219
Original line number Diff line number Diff line 
/*

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA

 *

 * Copyright (C) IBM Corp. 2006

 *

 * Authors: Hollis Blanchard <hollisb@us.ibm.com>

 */



#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#include <linux/mm.h>

#include <linux/slab.h>

#include <asm/page.h>

#include <xen/xencomm.h>

#include <xen/interface/xen.h>

#include <asm/xen/xencomm.h>	/* for xencomm_is_phys_contiguous() */



static int xencomm_init(struct xencomm_desc *desc,

			void *buffer, unsigned long bytes)

{

	unsigned long recorded = 0;

	int i = 0;



	while ((recorded < bytes) && (i < desc->nr_addrs)) {

		unsigned long vaddr = (unsigned long)buffer + recorded;

		unsigned long paddr;

		int offset;

		int chunksz;



		offset = vaddr % PAGE_SIZE; /* handle partial pages */

		chunksz = min(PAGE_SIZE - offset, bytes - recorded);



		paddr = xencomm_vtop(vaddr);

		if (paddr == ~0UL) {

			printk(KERN_DEBUG "%s: couldn't translate vaddr %lx\n",

			       __func__, vaddr);

			return -EINVAL;

		}



		desc->address[i++] = paddr;

		recorded += chunksz;

	}



	if (recorded < bytes) {

		printk(KERN_DEBUG

		       "%s: could only translate %ld of %ld bytes\n",

		       __func__, recorded, bytes);

		return -ENOSPC;

	}



	/* mark remaining addresses invalid (just for safety) */

	while (i < desc->nr_addrs)

		desc->address[i++] = XENCOMM_INVALID;



	desc->magic = XENCOMM_MAGIC;



	return 0;

}



static struct xencomm_desc *xencomm_alloc(gfp_t gfp_mask,

					  void *buffer, unsigned long bytes)

{

	struct xencomm_desc *desc;

	unsigned long buffer_ulong = (unsigned long)buffer;

	unsigned long start = buffer_ulong & PAGE_MASK;

	unsigned long end = (buffer_ulong + bytes) | ~PAGE_MASK;

	unsigned long nr_addrs = (end - start + 1) >> PAGE_SHIFT;

	unsigned long size = sizeof(*desc) +

		sizeof(desc->address[0]) * nr_addrs;



	/*

	 * slab allocator returns at least sizeof(void*) aligned pointer.

	 * When sizeof(*desc) > sizeof(void*), struct xencomm_desc might

	 * cross page boundary.

	 */

	if (sizeof(*desc) > sizeof(void *)) {

		unsigned long order = get_order(size);

		desc = (struct xencomm_desc *)__get_free_pages(gfp_mask,

							       order);

		if (desc == NULL)

			return NULL;



		desc->nr_addrs =

			((PAGE_SIZE << order) - sizeof(struct xencomm_desc)) /

			sizeof(*desc->address);

	} else {

		desc = kmalloc(size, gfp_mask);

		if (desc == NULL)

			return NULL;



		desc->nr_addrs = nr_addrs;

	}

	return desc;

}



void xencomm_free(struct xencomm_handle *desc)

{

	if (desc && !((ulong)desc & XENCOMM_INLINE_FLAG)) {

		struct xencomm_desc *desc__ = (struct xencomm_desc *)desc;

		if (sizeof(*desc__) > sizeof(void *)) {

			unsigned long size = sizeof(*desc__) +

				sizeof(desc__->address[0]) * desc__->nr_addrs;

			unsigned long order = get_order(size);

			free_pages((unsigned long)__va(desc), order);

		} else

			kfree(__va(desc));

	}

}



static int xencomm_create(void *buffer, unsigned long bytes,

			  struct xencomm_desc **ret, gfp_t gfp_mask)

{

	struct xencomm_desc *desc;

	int rc;



	pr_debug("%s: %p[%ld]\n", __func__, buffer, bytes);



	if (bytes == 0) {

		/* don't create a descriptor; Xen recognizes NULL. */

		BUG_ON(buffer != NULL);

		*ret = NULL;

		return 0;

	}



	BUG_ON(buffer == NULL); /* 'bytes' is non-zero */



	desc = xencomm_alloc(gfp_mask, buffer, bytes);

	if (!desc) {

		printk(KERN_DEBUG "%s failure\n", "xencomm_alloc");

		return -ENOMEM;

	}



	rc = xencomm_init(desc, buffer, bytes);

	if (rc) {

		printk(KERN_DEBUG "%s failure: %d\n", "xencomm_init", rc);

		xencomm_free((struct xencomm_handle *)__pa(desc));

		return rc;

	}



	*ret = desc;

	return 0;

}



static struct xencomm_handle *xencomm_create_inline(void *ptr)

{

	unsigned long paddr;



	BUG_ON(!xencomm_is_phys_contiguous((unsigned long)ptr));



	paddr = (unsigned long)xencomm_pa(ptr);

	BUG_ON(paddr & XENCOMM_INLINE_FLAG);

	return (struct xencomm_handle *)(paddr | XENCOMM_INLINE_FLAG);

}



/* "mini" routine, for stack-based communications: */

static int xencomm_create_mini(void *buffer,

	unsigned long bytes, struct xencomm_mini *xc_desc,

	struct xencomm_desc **ret)

{

	int rc = 0;

	struct xencomm_desc *desc;

	BUG_ON(((unsigned long)xc_desc) % sizeof(*xc_desc) != 0);



	desc = (void *)xc_desc;



	desc->nr_addrs = XENCOMM_MINI_ADDRS;



	rc = xencomm_init(desc, buffer, bytes);

	if (!rc)

		*ret = desc;



	return rc;

}



struct xencomm_handle *xencomm_map(void *ptr, unsigned long bytes)

{

	int rc;

	struct xencomm_desc *desc;



	if (xencomm_is_phys_contiguous((unsigned long)ptr))

		return xencomm_create_inline(ptr);



	rc = xencomm_create(ptr, bytes, &desc, GFP_KERNEL);



	if (rc || desc == NULL)

		return NULL;



	return xencomm_pa(desc);

}



struct xencomm_handle *__xencomm_map_no_alloc(void *ptr, unsigned long bytes,

			struct xencomm_mini *xc_desc)

{

	int rc;

	struct xencomm_desc *desc = NULL;



	if (xencomm_is_phys_contiguous((unsigned long)ptr))

		return xencomm_create_inline(ptr);



	rc = xencomm_create_mini(ptr, bytes, xc_desc,

				&desc);



	if (rc)

		return NULL;



	return xencomm_pa(desc);

}

include/uapi/xen/Kbuild

+2 −0
Original line number Diff line number Diff line 
# UAPI Header export list

header-y += evtchn.h

header-y += gntalloc.h

header-y += gntdev.h

header-y += privcmd.h

include/xen/gntalloc.h→include/uapi/xen/gntalloc.h

+0 −0

File moved.

View file