Commit 9ae5fceb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus-5.15-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip 

Pull xen updates from Juergen Gross:

 - some small cleanups

 - a fix for a bug when running as Xen PV guest which could result in
   not all memory being transferred in case of a migration of the guest

 - a small series for getting rid of code for supporting very old Xen
   hypervisor versions nobody should be using since many years now

 - a series for hardening the Xen block frontend driver

 - a fix for Xen PV boot code issuing warning messages due to a stray
   preempt_disable() on the non-boot processors

* tag 'for-linus-5.15-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen: remove stray preempt_disable() from PV AP startup code
  xen/pcifront: Removed unnecessary __ref annotation
  x86: xen: platform-pci-unplug: use pr_err() and pr_warn() instead of raw printk()
  drivers/xen/xenbus/xenbus_client.c: fix bugon.cocci warnings
  xen/blkfront: don't trust the backend response data blindly
  xen/blkfront: don't take local copy of a request from the ring page
  xen/blkfront: read response from backend only once
  xen: assume XENFEAT_gnttab_map_avail_bits being set for pv guests
  xen: assume XENFEAT_mmu_pt_update_preserve_ad being set for pv guests
  xen: check required Xen features
  xen: fix setting of max_pfn in shared_info
parents a2d616b9 58e63603

arch/x86/xen/enlighten_pv.c

+2 −10
Original line number Diff line number Diff line
@@ -116,9 +116,8 @@ static void __init xen_banner(void) 
	HYPERVISOR_xen_version(XENVER_extraversion, &extra);



	pr_info("Booting paravirtualized kernel on %s\n", pv_info.name);

	printk(KERN_INFO "Xen version: %d.%d%s%s\n",

	       version >> 16, version & 0xffff, extra.extraversion,

	       xen_feature(XENFEAT_mmu_pt_update_preserve_ad) ? " (preserve-AD)" : "");

	pr_info("Xen version: %d.%d%s (preserve-AD)\n",

		version >> 16, version & 0xffff, extra.extraversion);

}



static void __init xen_pv_init_platform(void)
@@ -1302,13 +1301,6 @@ asmlinkage __visible void __init xen_start_kernel(void) 
	xen_init_apic();

#endif



	if (xen_feature(XENFEAT_mmu_pt_update_preserve_ad)) {

		pv_ops.mmu.ptep_modify_prot_start =

			xen_ptep_modify_prot_start;

		pv_ops.mmu.ptep_modify_prot_commit =

			xen_ptep_modify_prot_commit;

	}



	machine_ops = xen_machine_ops;



	/*

arch/x86/xen/mmu_pv.c

+2 −2
Original line number Diff line number Diff line
@@ -2099,8 +2099,8 @@ static const struct pv_mmu_ops xen_mmu_ops __initconst = { 
	.set_pte = xen_set_pte_init,

	.set_pmd = xen_set_pmd_hyper,



	.ptep_modify_prot_start = __ptep_modify_prot_start,

	.ptep_modify_prot_commit = __ptep_modify_prot_commit,

	.ptep_modify_prot_start = xen_ptep_modify_prot_start,

	.ptep_modify_prot_commit = xen_ptep_modify_prot_commit,



	.pte_val = PV_CALLEE_SAVE(xen_pte_val),

	.pgd_val = PV_CALLEE_SAVE(xen_pgd_val),

arch/x86/xen/p2m.c

+2 −2
Original line number Diff line number Diff line
@@ -618,8 +618,8 @@ int xen_alloc_p2m_entry(unsigned long pfn) 
	}



	/* Expanded the p2m? */

	if (pfn > xen_p2m_last_pfn) {

		xen_p2m_last_pfn = pfn;

	if (pfn >= xen_p2m_last_pfn) {

		xen_p2m_last_pfn = ALIGN(pfn + 1, P2M_PER_PAGE);

		HYPERVISOR_shared_info->arch.max_pfn = xen_p2m_last_pfn;

	}

arch/x86/xen/platform-pci-unplug.c

+9 −7
Original line number Diff line number Diff line
@@ -7,6 +7,8 @@ 
 * Copyright (c) 2010, Citrix

 */



#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#include <linux/init.h>

#include <linux/io.h>

#include <linux/export.h>
@@ -30,13 +32,13 @@ static int check_platform_magic(void) 


	magic = inw(XEN_IOPORT_MAGIC);

	if (magic != XEN_IOPORT_MAGIC_VAL) {

		printk(KERN_ERR "Xen Platform PCI: unrecognised magic value\n");

		pr_err("Xen Platform PCI: unrecognised magic value\n");

		return XEN_PLATFORM_ERR_MAGIC;

	}



	protocol = inb(XEN_IOPORT_PROTOVER);



	printk(KERN_DEBUG "Xen Platform PCI: I/O protocol version %d\n",

	pr_debug("Xen Platform PCI: I/O protocol version %d\n",

			protocol);



	switch (protocol) {
@@ -44,12 +46,12 @@ static int check_platform_magic(void) 
		outw(XEN_IOPORT_LINUX_PRODNUM, XEN_IOPORT_PRODNUM);

		outl(XEN_IOPORT_LINUX_DRVVER, XEN_IOPORT_DRVVER);

		if (inw(XEN_IOPORT_MAGIC) != XEN_IOPORT_MAGIC_VAL) {

			printk(KERN_ERR "Xen Platform: blacklisted by host\n");

			pr_err("Xen Platform: blacklisted by host\n");

			return XEN_PLATFORM_ERR_BLACKLIST;

		}

		break;

	default:

		printk(KERN_WARNING "Xen Platform PCI: unknown I/O protocol version\n");

		pr_warn("Xen Platform PCI: unknown I/O protocol version\n");

		return XEN_PLATFORM_ERR_PROTOCOL;

	}
@@ -155,12 +157,12 @@ void xen_unplug_emulated_devices(void) 
	 * been compiled for this kernel (modules or built-in are both OK). */

	if (!xen_emul_unplug) {

		if (xen_must_unplug_nics()) {

			printk(KERN_INFO "Netfront and the Xen platform PCI driver have "

			pr_info("Netfront and the Xen platform PCI driver have "

					"been compiled for this kernel: unplug emulated NICs.\n");

			xen_emul_unplug |= XEN_UNPLUG_ALL_NICS;

		}

		if (xen_must_unplug_disks()) {

			printk(KERN_INFO "Blkfront and the Xen platform PCI driver have "

			pr_info("Blkfront and the Xen platform PCI driver have "

					"been compiled for this kernel: unplug emulated disks.\n"

					"You might have to change the root device\n"

					"from /dev/hd[a-d] to /dev/xvd[a-d]\n"
@@ -200,7 +202,7 @@ static int __init parse_xen_emul_unplug(char *arg) 
		else if (!strncmp(p, "never", l))

			xen_emul_unplug |= XEN_UNPLUG_NEVER;

		else

			printk(KERN_WARNING "unrecognised option '%s' "

			pr_warn("unrecognised option '%s' "

				 "in parameter 'xen_emul_unplug'\n", p);

	}

	return 0;

arch/x86/xen/smp_pv.c

+0 −1
Original line number Diff line number Diff line
@@ -64,7 +64,6 @@ static void cpu_bringup(void) 
	cr4_init();

	cpu_init();

	touch_softlockup_watchdog();

	preempt_disable();



	/* PVH runs in ring 0 and allows us to do native syscalls. Yay! */

	if (!xen_feature(XENFEAT_supervisor_mode_kernel)) {