Commit 4ab59fcf authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull xen fixes from Juergen Gross:
 "This contains the following fixes/cleanups:

   - the removal of a BUG_ON() which wasn't necessary and which could
     trigger now due to a recent change

   - a correction of a long standing bug happening very rarely in Xen
     dom0 when a hypercall buffer from user land was not accessible by
     the hypervisor for very short periods of time due to e.g. page
     migration or compaction

   - usage of EXPORT_SYMBOL_GPL() instead of EXPORT_SYMBOL() in a
     Xen-related driver (no breakage possible as using those symbols
     without others already exported via EXPORT-SYMBOL_GPL() wouldn't
     make any sense)

   - a simplification for Xen PVH or Xen ARM guests

   - some additional error handling for callers of xenbus_printf()"

* tag 'for-linus-4.18-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen: Remove unnecessary BUG_ON from __unbind_from_irq()
  xen: add new hypercall buffer mapping device
  xen/scsiback: add error handling for xenbus_printf
  scsi: xen-scsifront: add error handling for xenbus_printf
  xen/grant-table: Export gnttab_{alloc|free}_pages as GPL
  xen: add error handling for xenbus_printf
  xen: share start flags between PV and PVH
parents 894b8c00 eef04c7b

arch/arm/xen/enlighten.c

+4 −3
Original line number Original line Diff line number Diff line
@@ -59,6 +59,9 @@ struct xen_memory_region xen_extra_mem[XEN_EXTRA_MEM_MAX_REGIONS] __initdata; 




static __read_mostly unsigned int xen_events_irq;

static __read_mostly unsigned int xen_events_irq;





uint32_t xen_start_flags;

EXPORT_SYMBOL(xen_start_flags);



int xen_remap_domain_gfn_array(struct vm_area_struct *vma,

int xen_remap_domain_gfn_array(struct vm_area_struct *vma,

			       unsigned long addr,

			       unsigned long addr,

			       xen_pfn_t *gfn, int nr,

			       xen_pfn_t *gfn, int nr,
@@ -293,9 +296,7 @@ void __init xen_early_init(void) 
	xen_setup_features();

	xen_setup_features();





	if (xen_feature(XENFEAT_dom0))

	if (xen_feature(XENFEAT_dom0))

		xen_start_info->flags |= SIF_INITDOMAIN|SIF_PRIVILEGED;

		xen_start_flags |= SIF_INITDOMAIN|SIF_PRIVILEGED;

	else

		xen_start_info->flags &= ~(SIF_INITDOMAIN|SIF_PRIVILEGED);





	if (!console_set_on_cmdline && !xen_initial_domain())

	if (!console_set_on_cmdline && !xen_initial_domain())

		add_preferred_console("hvc", 0, NULL);

		add_preferred_console("hvc", 0, NULL);

arch/x86/xen/enlighten.c

+7 −0
Original line number Original line Diff line number Diff line
@@ -64,6 +64,13 @@ struct shared_info xen_dummy_shared_info; 
__read_mostly int xen_have_vector_callback;

__read_mostly int xen_have_vector_callback;

EXPORT_SYMBOL_GPL(xen_have_vector_callback);

EXPORT_SYMBOL_GPL(xen_have_vector_callback);





/*

 * NB: needs to live in .data because it's used by xen_prepare_pvh which runs

 * before clearing the bss.

 */

uint32_t xen_start_flags __attribute__((section(".data"))) = 0;

EXPORT_SYMBOL(xen_start_flags);



/*

/*

 * Point at some empty memory to start with. We map the real shared_info

 * Point at some empty memory to start with. We map the real shared_info

 * page as soon as fixmap is up and running.

 * page as soon as fixmap is up and running.

arch/x86/xen/enlighten_pv.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -1203,6 +1203,7 @@ asmlinkage __visible void __init xen_start_kernel(void) 
		return;

		return;





	xen_domain_type = XEN_PV_DOMAIN;

	xen_domain_type = XEN_PV_DOMAIN;

	xen_start_flags = xen_start_info->flags;





	xen_setup_features();

	xen_setup_features();

arch/x86/xen/enlighten_pvh.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -97,6 +97,7 @@ void __init xen_prepare_pvh(void) 
	}

	}





	xen_pvh = 1;

	xen_pvh = 1;

	xen_start_flags = pvh_start_info.flags;





	msr = cpuid_ebx(xen_cpuid_base() + 2);

	msr = cpuid_ebx(xen_cpuid_base() + 2);

	pfn = __pa(hypercall_page);

	pfn = __pa(hypercall_page);

drivers/scsi/xen-scsifront.c

+26 −7
Original line number Original line Diff line number Diff line
@@ -654,10 +654,17 @@ static int scsifront_dev_reset_handler(struct scsi_cmnd *sc) 
static int scsifront_sdev_configure(struct scsi_device *sdev)

static int scsifront_sdev_configure(struct scsi_device *sdev)

{

{

	struct vscsifrnt_info *info = shost_priv(sdev->host);

	struct vscsifrnt_info *info = shost_priv(sdev->host);

	int err;





	if (info && current == info->curr)

	if (info && current == info->curr) {

		xenbus_printf(XBT_NIL, info->dev->nodename,

		err = xenbus_printf(XBT_NIL, info->dev->nodename,

			      info->dev_state_path, "%d", XenbusStateConnected);

			      info->dev_state_path, "%d", XenbusStateConnected);

		if (err) {

			xenbus_dev_error(info->dev, err,

				"%s: writing dev_state_path", __func__);

			return err;

		}

	}





	return 0;

	return 0;

}

}
@@ -665,10 +672,15 @@ static int scsifront_sdev_configure(struct scsi_device *sdev) 
static void scsifront_sdev_destroy(struct scsi_device *sdev)

static void scsifront_sdev_destroy(struct scsi_device *sdev)

{

{

	struct vscsifrnt_info *info = shost_priv(sdev->host);

	struct vscsifrnt_info *info = shost_priv(sdev->host);

	int err;





	if (info && current == info->curr)

	if (info && current == info->curr) {

		xenbus_printf(XBT_NIL, info->dev->nodename,

		err = xenbus_printf(XBT_NIL, info->dev->nodename,

			      info->dev_state_path, "%d", XenbusStateClosed);

			      info->dev_state_path, "%d", XenbusStateClosed);

		if (err)

			xenbus_dev_error(info->dev, err,

				"%s: writing dev_state_path", __func__);

	}

}

}





static struct scsi_host_template scsifront_sht = {

static struct scsi_host_template scsifront_sht = {
@@ -1003,9 +1015,12 @@ static void scsifront_do_lun_hotplug(struct vscsifrnt_info *info, int op) 




			if (scsi_add_device(info->host, chn, tgt, lun)) {

			if (scsi_add_device(info->host, chn, tgt, lun)) {

				dev_err(&dev->dev, "scsi_add_device\n");

				dev_err(&dev->dev, "scsi_add_device\n");

				xenbus_printf(XBT_NIL, dev->nodename,

				err = xenbus_printf(XBT_NIL, dev->nodename,

					      info->dev_state_path,

					      info->dev_state_path,

					      "%d", XenbusStateClosed);

					      "%d", XenbusStateClosed);

				if (err)

					xenbus_dev_error(dev, err,

						"%s: writing dev_state_path", __func__);

			}

			}

			break;

			break;

		case VSCSIFRONT_OP_DEL_LUN:

		case VSCSIFRONT_OP_DEL_LUN:
@@ -1019,10 +1034,14 @@ static void scsifront_do_lun_hotplug(struct vscsifrnt_info *info, int op) 
			}

			}

			break;

			break;

		case VSCSIFRONT_OP_READD_LUN:

		case VSCSIFRONT_OP_READD_LUN:

			if (device_state == XenbusStateConnected)

			if (device_state == XenbusStateConnected) {

				xenbus_printf(XBT_NIL, dev->nodename,

				err = xenbus_printf(XBT_NIL, dev->nodename,

					      info->dev_state_path,

					      info->dev_state_path,

					      "%d", XenbusStateConnected);

					      "%d", XenbusStateConnected);

				if (err)

					xenbus_dev_error(dev, err,

						"%s: writing dev_state_path", __func__);

			}

			break;

			break;

		default:

		default:

			break;

			break;

CRA Git | Maintained and supported by SUSTech CRA and CCSE