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

Commit b6844523 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'stable/for-linus-fixes-3.2' of... 

Merge branch 'stable/for-linus-fixes-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen

* 'stable/for-linus-fixes-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
  xen-gntalloc: signedness bug in add_grefs()
  xen-gntalloc: integer overflow in gntalloc_ioctl_alloc()
  xen-gntdev: integer overflow in gntdev_alloc_map()
  xen:pvhvm: enable PVHVM VCPU placement when using more than 32 CPUs.
  xen/balloon: Avoid OOM when requesting highmem
  xen: Remove hanging references to CONFIG_XEN_PLATFORM_PCI
  xen: map foreign pages for shared rings by updating the PTEs directly
parents 15bd1cfb 99cb2ddc

arch/x86/xen/enlighten.c

+1 −2
Original line number Diff line number Diff line
@@ -1356,7 +1356,7 @@ static int __cpuinit xen_hvm_cpu_notify(struct notifier_block *self, 
	int cpu = (long)hcpu;

	switch (action) {

	case CPU_UP_PREPARE:

		per_cpu(xen_vcpu, cpu) = &HYPERVISOR_shared_info->vcpu_info[cpu];

		xen_vcpu_setup(cpu);

		if (xen_have_vector_callback)

			xen_init_lock_cpu(cpu);

		break;
@@ -1386,7 +1386,6 @@ static void __init xen_hvm_guest_init(void) 
	xen_hvm_smp_init();

	register_cpu_notifier(&xen_hvm_cpu_notifier);

	xen_unplug_emulated_devices();

	have_vcpu_info_placement = 0;

	x86_init.irqs.intr_init = xen_init_IRQ;

	xen_hvm_init_time_ops();

	xen_hvm_init_mmu_ops();

arch/x86/xen/grant-table.c

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ int arch_gnttab_map_shared(unsigned long *frames, unsigned long nr_gframes, 


	if (shared == NULL) {

		struct vm_struct *area =

			alloc_vm_area(PAGE_SIZE * max_nr_gframes);

			alloc_vm_area(PAGE_SIZE * max_nr_gframes, NULL);

		BUG_ON(area == NULL);

		shared = area->addr;

		*__shared = shared;

drivers/xen/balloon.c

+2 −2
Original line number Diff line number Diff line
@@ -501,7 +501,7 @@ EXPORT_SYMBOL_GPL(balloon_set_new_target); 
 * alloc_xenballooned_pages - get pages that have been ballooned out

 * @nr_pages: Number of pages to get

 * @pages: pages returned

 * @highmem: highmem or lowmem pages

 * @highmem: allow highmem pages

 * @return 0 on success, error otherwise

 */

int alloc_xenballooned_pages(int nr_pages, struct page **pages, bool highmem)
@@ -511,7 +511,7 @@ int alloc_xenballooned_pages(int nr_pages, struct page **pages, bool highmem) 
	mutex_lock(&balloon_mutex);

	while (pgno < nr_pages) {

		page = balloon_retrieve(highmem);

		if (page && PageHighMem(page) == highmem) {

		if (page && (highmem || !PageHighMem(page))) {

			pages[pgno++] = page;

		} else {

			enum bp_state st;

drivers/xen/gntalloc.c

+2 −2
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ static int add_grefs(struct ioctl_gntalloc_alloc_gref *op, 
		/* Grant foreign access to the page. */

		gref->gref_id = gnttab_grant_foreign_access(op->domid,

			pfn_to_mfn(page_to_pfn(gref->page)), readonly);

		if (gref->gref_id < 0) {

		if ((int)gref->gref_id < 0) {

			rc = gref->gref_id;

			goto undo;

		}
@@ -280,7 +280,7 @@ static long gntalloc_ioctl_alloc(struct gntalloc_file_private_data *priv, 
		goto out;

	}



	gref_ids = kzalloc(sizeof(gref_ids[0]) * op.count, GFP_TEMPORARY);

	gref_ids = kcalloc(op.count, sizeof(gref_ids[0]), GFP_TEMPORARY);

	if (!gref_ids) {

		rc = -ENOMEM;

		goto out;

drivers/xen/gntdev.c

+5 −5
Original line number Diff line number Diff line
@@ -114,11 +114,11 @@ static struct grant_map *gntdev_alloc_map(struct gntdev_priv *priv, int count) 
	if (NULL == add)

		return NULL;



	add->grants    = kzalloc(sizeof(add->grants[0])    * count, GFP_KERNEL);

	add->map_ops   = kzalloc(sizeof(add->map_ops[0])   * count, GFP_KERNEL);

	add->unmap_ops = kzalloc(sizeof(add->unmap_ops[0]) * count, GFP_KERNEL);

	add->kmap_ops  = kzalloc(sizeof(add->kmap_ops[0])  * count, GFP_KERNEL);

	add->pages     = kzalloc(sizeof(add->pages[0])     * count, GFP_KERNEL);

	add->grants    = kcalloc(count, sizeof(add->grants[0]), GFP_KERNEL);

	add->map_ops   = kcalloc(count, sizeof(add->map_ops[0]), GFP_KERNEL);

	add->unmap_ops = kcalloc(count, sizeof(add->unmap_ops[0]), GFP_KERNEL);

	add->kmap_ops  = kcalloc(count, sizeof(add->kmap_ops[0]), GFP_KERNEL);

	add->pages     = kcalloc(count, sizeof(add->pages[0]), GFP_KERNEL);

	if (NULL == add->grants    ||

	    NULL == add->map_ops   ||

	    NULL == add->unmap_ops ||