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

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

Merge tag 'stable/for-linus-3.5-rc0-tag' of... 

Merge tag 'stable/for-linus-3.5-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen

Pull Xen updates from Konrad Rzeszutek Wilk:
 "Features:
   * Extend the APIC ops implementation and add IRQ_WORKER vector
     support so that 'perf' can work properly.
   * Fix self-ballooning code, and balloon logic when booting as initial
     domain.
   * Move array printing code to generic debugfs
   * Support XenBus domains.
   * Lazily free grants when a domain is dead/non-existent.
   * In M2P code use batching calls
  Bug-fixes:
   * Fix NULL dereference in allocation failure path (hvc_xen)
   * Fix unbinding of IRQ_WORKER vector during vCPU hot-unplug
   * Fix HVM guest resume - we would leak an PIRQ value instead of
     reusing the existing one."

Fix up add-add onflicts in arch/x86/xen/enlighten.c due to addition of
apic ipi interface next to the new apic_id functions.

* tag 'stable/for-linus-3.5-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
  xen: do not map the same GSI twice in PVHVM guests.
  hvc_xen: NULL dereference on allocation failure
  xen: Add selfballoning memory reservation tunable.
  xenbus: Add support for xenbus backend in stub domain
  xen/smp: unbind irqworkX when unplugging vCPUs.
  xen: enter/exit lazy_mmu_mode around m2p_override calls
  xen/acpi/sleep: Enable ACPI sleep via the __acpi_os_prepare_sleep
  xen: implement IRQ_WORK_VECTOR handler
  xen: implement apic ipi interface
  xen/setup: update VA mapping when releasing memory during setup
  xen/setup: Combine the two hypercall functions - since they are quite similar.
  xen/setup: Populate freed MFNs from non-RAM E820 entries and gaps to E820 RAM
  xen/setup: Only print "Freeing XXX-YYY pfn range: Z pages freed" if Z > 0
  xen/gnttab: add deferred freeing logic
  debugfs: Add support to print u32 array in debugfs
  xen/p2m: An early bootup variant of set_phys_to_machine
  xen/p2m: Collapse early_alloc_p2m_middle redundant checks.
  xen/p2m: Allow alloc_p2m_middle to call reserve_brk depending on argument
  xen/p2m: Move code around to allow for better re-usage.
parents ce004178 68c2c39a

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

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ enum ipi_vector { 
	XEN_CALL_FUNCTION_VECTOR,

	XEN_CALL_FUNCTION_SINGLE_VECTOR,

	XEN_SPIN_UNLOCK_VECTOR,

	XEN_IRQ_WORK_VECTOR,



	XEN_NR_IPIS,

};

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

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ extern unsigned long machine_to_phys_nr; 


extern unsigned long get_phys_to_machine(unsigned long pfn);

extern bool set_phys_to_machine(unsigned long pfn, unsigned long mfn);

extern bool __init early_set_phys_to_machine(unsigned long pfn, unsigned long mfn);

extern bool __set_phys_to_machine(unsigned long pfn, unsigned long mfn);

extern unsigned long set_phys_range_identity(unsigned long pfn_s,

					     unsigned long pfn_e);

arch/x86/pci/xen.c

+4 −0
Original line number Diff line number Diff line
@@ -64,6 +64,10 @@ static int xen_register_pirq(u32 gsi, int gsi_override, int triggering, 
	int shareable = 0;

	char *name;



	irq = xen_irq_from_gsi(gsi);

	if (irq > 0)

		return irq;



	if (set_pirq)

		pirq = gsi;

arch/x86/xen/debugfs.c

+0 −104
Original line number Diff line number Diff line
@@ -19,107 +19,3 @@ struct dentry * __init xen_init_debugfs(void) 
	return d_xen_debug;

}

struct array_data

{

	void *array;

	unsigned elements;

};



static int u32_array_open(struct inode *inode, struct file *file)

{

	file->private_data = NULL;

	return nonseekable_open(inode, file);

}



static size_t format_array(char *buf, size_t bufsize, const char *fmt,

			   u32 *array, unsigned array_size)

{

	size_t ret = 0;

	unsigned i;



	for(i = 0; i < array_size; i++) {

		size_t len;



		len = snprintf(buf, bufsize, fmt, array[i]);

		len++;	/* ' ' or '\n' */

		ret += len;



		if (buf) {

			buf += len;

			bufsize -= len;

			buf[-1] = (i == array_size-1) ? '\n' : ' ';

		}

	}



	ret++;		/* \0 */

	if (buf)

		*buf = '\0';



	return ret;

}



static char *format_array_alloc(const char *fmt, u32 *array, unsigned array_size)

{

	size_t len = format_array(NULL, 0, fmt, array, array_size);

	char *ret;



	ret = kmalloc(len, GFP_KERNEL);

	if (ret == NULL)

		return NULL;



	format_array(ret, len, fmt, array, array_size);

	return ret;

}



static ssize_t u32_array_read(struct file *file, char __user *buf, size_t len,

			      loff_t *ppos)

{

	struct inode *inode = file->f_path.dentry->d_inode;

	struct array_data *data = inode->i_private;

	size_t size;



	if (*ppos == 0) {

		if (file->private_data) {

			kfree(file->private_data);

			file->private_data = NULL;

		}



		file->private_data = format_array_alloc("%u", data->array, data->elements);

	}



	size = 0;

	if (file->private_data)

		size = strlen(file->private_data);



	return simple_read_from_buffer(buf, len, ppos, file->private_data, size);

}



static int xen_array_release(struct inode *inode, struct file *file)

{

	kfree(file->private_data);



	return 0;

}



static const struct file_operations u32_array_fops = {

	.owner	= THIS_MODULE,

	.open	= u32_array_open,

	.release= xen_array_release,

	.read	= u32_array_read,

	.llseek = no_llseek,

};



struct dentry *xen_debugfs_create_u32_array(const char *name, umode_t mode,

					    struct dentry *parent,

					    u32 *array, unsigned elements)

{

	struct array_data *data = kmalloc(sizeof(*data), GFP_KERNEL);



	if (data == NULL)

		return NULL;



	data->array = array;

	data->elements = elements;



	return debugfs_create_file(name, mode, parent, data, &u32_array_fops);

}

arch/x86/xen/debugfs.h

+0 −4
Original line number Diff line number Diff line
@@ -3,8 +3,4 @@ 


struct dentry * __init xen_init_debugfs(void);



struct dentry *xen_debugfs_create_u32_array(const char *name, umode_t mode,

					    struct dentry *parent,

					    u32 *array, unsigned elements);



#endif /* _XEN_DEBUGFS_H */