Commit c4295ab0 authored by Julien Grall's avatar Julien Grall Committed by Juergen Gross
Browse files

arm/xen: Don't probe xenbus as part of an early initcall 



After Commit 3499ba81 ("xen: Fix event channel callback via
INTX/GSI"), xenbus_probe() will be called too early on Arm. This will
recent to a guest hang during boot.

If the hang wasn't there, we would have ended up to call
xenbus_probe() twice (the second time is in xenbus_probe_initcall()).

We don't need to initialize xenbus_probe() early for Arm guest.
Therefore, the call in xen_guest_init() is now removed.

After this change, there is no more external caller for xenbus_probe().
So the function is turned to a static one. Interestingly there were two
prototypes for it.

Cc: stable@vger.kernel.org
Fixes: 3499ba81 ("xen: Fix event channel callback via INTX/GSI")
Reported-by: default avatarIan Jackson <iwj@xenproject.org>
Signed-off-by: default avatarJulien Grall <jgrall@amazon.com>
Reviewed-by: default avatarDavid Woodhouse <dwmw@amazon.co.uk>
Reviewed-by: default avatarStefano Stabellini <sstabellini@kernel.org>
Link: https://lore.kernel.org/r/20210210170654.5377-1-julien@xen.org


Signed-off-by: default avatarJuergen Gross <jgross@suse.com>
parent 2e924936

arch/arm/xen/enlighten.c

+0 −2
Original line number Diff line number Diff line
@@ -370,8 +370,6 @@ static int __init xen_guest_init(void) 
		return -ENOMEM;

	}

	gnttab_init();

	if (!xen_initial_domain())

		xenbus_probe();



	/*

	 * Making sure board specific code will not set up ops for

drivers/xen/xenbus/xenbus.h

+0 −1
Original line number Diff line number Diff line
@@ -115,7 +115,6 @@ int xenbus_probe_node(struct xen_bus_type *bus, 
		      const char *type,

		      const char *nodename);

int xenbus_probe_devices(struct xen_bus_type *bus);

void xenbus_probe(void);



void xenbus_dev_changed(const char *node, struct xen_bus_type *bus);

drivers/xen/xenbus/xenbus_probe.c

+1 −1
Original line number Diff line number Diff line
@@ -683,7 +683,7 @@ void unregister_xenstore_notifier(struct notifier_block *nb) 
}

EXPORT_SYMBOL_GPL(unregister_xenstore_notifier);



void xenbus_probe(void)

static void xenbus_probe(void)

{

	xenstored_ready = 1;

include/xen/xenbus.h

+0 −2
Original line number Diff line number Diff line
@@ -192,8 +192,6 @@ void xs_suspend_cancel(void); 


struct work_struct;



void xenbus_probe(void);



#define XENBUS_IS_ERR_READ(str) ({			\

	if (!IS_ERR(str) && strlen(str) == 0) {		\

		kfree(str);				\