lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

xenbus: don't rely on xen_initial_domain to detect local xenstore

Browse Source 
The xenstore daemon does not have to run in the xen initial domain;
however, Linux currently uses xen_initial_domain to test if a loopback
event channel should be used instead of the event channel provided in
Xen's start_info structure. Instead, if the event channel passed in the
start_info structure is not valid, assume that this domain will run
xenstored locally and set up the event channel.

Signed-off-by: Daniel De Graaf <dgdegra@tycho.nsa.gov>
Reviewed-by: Ian Campbell <Ian.Campbell@citrix.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
This commit is contained in:
Daniel De Graaf
2011-10-13 16:07:08 -04:00
committed by Konrad Rzeszutek Wilk
parent 77447991b6
commit e4184aaf3b
1 changed files with 57 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

109
drivers/xen/xenbus/xenbus_probe.c
View File

@@ -696,64 +696,74 @@ static int __init xenbus_probe_initcall(void)
device_initcall(xenbus_probe_initcall); device_initcall(xenbus_probe_initcall);
static int __init xenbus_init(void) /* Set up event channel for xenstored which is run as a local process
* (this is normally used only in dom0)
*/
static int __init xenstored_local_init(void)
{ {
int err = 0; int err = 0;
unsigned long page = 0; unsigned long page = 0;
struct evtchn_alloc_unbound alloc_unbound;
DPRINTK(""); /* Allocate Xenstore page */
page = get_zeroed_page(GFP_KERNEL);
if (!page)
goto out_err;
xen_store_mfn = xen_start_info->store_mfn =
pfn_to_mfn(virt_to_phys((void *)page) >>
PAGE_SHIFT);
/* Next allocate a local port which xenstored can bind to */
alloc_unbound.dom = DOMID_SELF;
alloc_unbound.remote_dom = DOMID_SELF;
err = HYPERVISOR_event_channel_op(EVTCHNOP_alloc_unbound,
&alloc_unbound);
if (err == -ENOSYS)
goto out_err;
BUG_ON(err);
xen_store_evtchn = xen_start_info->store_evtchn =
alloc_unbound.port;
return 0;
out_err:
if (page != 0)
free_page(page);
return err;
}
static int __init xenbus_init(void)
{
int err = 0;
err = -ENODEV;
if (!xen_domain()) if (!xen_domain())
return err; return -ENODEV;
/* if (xen_hvm_domain()) {
* Domain0 doesn't have a store_evtchn or store_mfn yet. uint64_t v = 0;
*/ err = hvm_get_parameter(HVM_PARAM_STORE_EVTCHN, &v);
if (xen_initial_domain()) { if (err)
struct evtchn_alloc_unbound alloc_unbound;
/* Allocate Xenstore page */
page = get_zeroed_page(GFP_KERNEL);
if (!page)
goto out_error; goto out_error;
xen_store_evtchn = (int)v;
xen_store_mfn = xen_start_info->store_mfn = err = hvm_get_parameter(HVM_PARAM_STORE_PFN, &v);
pfn_to_mfn(virt_to_phys((void *)page) >> if (err)
PAGE_SHIFT);
/* Next allocate a local port which xenstored can bind to */
alloc_unbound.dom = DOMID_SELF;
alloc_unbound.remote_dom = DOMID_SELF;
err = HYPERVISOR_event_channel_op(EVTCHNOP_alloc_unbound,
&alloc_unbound);
if (err == -ENOSYS)
goto out_error; goto out_error;
xen_store_mfn = (unsigned long)v;
BUG_ON(err); xen_store_interface = ioremap(xen_store_mfn << PAGE_SHIFT, PAGE_SIZE);
xen_store_evtchn = xen_start_info->store_evtchn =
alloc_unbound.port;
xen_store_interface = mfn_to_virt(xen_store_mfn);
} else { } else {
if (xen_hvm_domain()) { xen_store_evtchn = xen_start_info->store_evtchn;
uint64_t v = 0; xen_store_mfn = xen_start_info->store_mfn;
err = hvm_get_parameter(HVM_PARAM_STORE_EVTCHN, &v); if (xen_store_evtchn)
if (err)
goto out_error;
xen_store_evtchn = (int)v;
err = hvm_get_parameter(HVM_PARAM_STORE_PFN, &v);
if (err)
goto out_error;
xen_store_mfn = (unsigned long)v;
xen_store_interface = ioremap(xen_store_mfn << PAGE_SHIFT, PAGE_SIZE);
} else {
xen_store_evtchn = xen_start_info->store_evtchn;
xen_store_mfn = xen_start_info->store_mfn;
xen_store_interface = mfn_to_virt(xen_store_mfn);
xenstored_ready = 1; xenstored_ready = 1;
else {
err = xenstored_local_init();
if (err)
goto out_error;
} }
xen_store_interface = mfn_to_virt(xen_store_mfn);
} }
/* Initialize the interface to xenstore. */ /* Initialize the interface to xenstore. */
@@ -772,12 +782,7 @@ static int __init xenbus_init(void)
proc_mkdir("xen", NULL); proc_mkdir("xen", NULL);
#endif #endif
return 0; out_error:
out_error:
if (page != 0)
free_page(page);
return err; return err;
} }