From: konrad.wilk@oracle•com (Konrad Rzeszutek Wilk)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH 09/24] xen/arm: compile and run xenbus
Date: Wed, 1 Aug 2012 10:28:40 -0400 [thread overview]
Message-ID: <20120801142840.GG7227@phenom.dumpdata.com> (raw)
In-Reply-To: <1343316846-25860-9-git-send-email-stefano.stabellini@eu.citrix.com>
On Thu, Jul 26, 2012 at 04:33:51PM +0100, Stefano Stabellini wrote:
> bind_evtchn_to_irqhandler can legitimately return 0 (irq 0): it is not
> an error.
>
> If Linux is running as an HVM domain and is running as Dom0, use
> xenstored_local_init to initialize the xenstore page and event channel.
>
> Signed-off-by: Stefano Stabellini <stefano.stabellini@eu•citrix.com>
> ---
> drivers/xen/xenbus/xenbus_comms.c | 2 +-
> drivers/xen/xenbus/xenbus_probe.c | 27 +++++++++++++++++----------
> drivers/xen/xenbus/xenbus_xs.c | 1 +
> 3 files changed, 19 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/xen/xenbus/xenbus_comms.c b/drivers/xen/xenbus/xenbus_comms.c
> index 52fe7ad..c5aa55c 100644
> --- a/drivers/xen/xenbus/xenbus_comms.c
> +++ b/drivers/xen/xenbus/xenbus_comms.c
> @@ -224,7 +224,7 @@ int xb_init_comms(void)
> int err;
> err = bind_evtchn_to_irqhandler(xen_store_evtchn, wake_waiting,
> 0, "xenbus", &xb_waitq);
> - if (err <= 0) {
> + if (err < 0) {
> printk(KERN_ERR "XENBUS request irq failed %i\n", err);
> return err;
> }
> diff --git a/drivers/xen/xenbus/xenbus_probe.c b/drivers/xen/xenbus/xenbus_probe.c
> index b793723..3ae47c2 100644
> --- a/drivers/xen/xenbus/xenbus_probe.c
> +++ b/drivers/xen/xenbus/xenbus_probe.c
> @@ -729,16 +729,23 @@ static int __init xenbus_init(void)
> xenbus_ring_ops_init();
>
> if (xen_hvm_domain()) {
> - uint64_t v = 0;
> - err = hvm_get_parameter(HVM_PARAM_STORE_EVTCHN, &v);
> - 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);
> + if (xen_initial_domain()) {
> + err = xenstored_local_init();
> + xen_store_interface =
> + phys_to_virt(xen_store_mfn << PAGE_SHIFT);
> + } else {
> + uint64_t v = 0;
> + err = hvm_get_parameter(HVM_PARAM_STORE_EVTCHN, &v);
> + 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);
> + }
This, and along with the Hybrid PV dom0 (not yet posted, but it was doing
similar manipulation here) is getting more and more like a rat-mess.
Any chance we can just abstract the three different XenStore access
ways and just have something like this:
enum {
USE_UNKNOWN
USE_HVM,
USE_PV,
USE_LOCAL
USE_ALREADY_INIT
};
int usage = USE_UNKNOWN;
if (xen_pv_domain())
usage = USE_PV;
if (xen_hvm_domain())
usage = USE_HVM;
if (xen_initial_domain())
usage = USE_LOCAL;
if (xen_start_info->store_evtchn)
usage = USE_ALREADY_INIT;
.. other overwrites..
switch (usage) {
.. blah blah.
}
> xen_store_evtchn = xen_start_info->store_evtchn;
> xen_store_mfn = xen_start_info->store_mfn;
> diff --git a/drivers/xen/xenbus/xenbus_xs.c b/drivers/xen/xenbus/xenbus_xs.c
> index d1c217b..f7feb3d 100644
> --- a/drivers/xen/xenbus/xenbus_xs.c
> +++ b/drivers/xen/xenbus/xenbus_xs.c
> @@ -44,6 +44,7 @@
> #include <linux/rwsem.h>
> #include <linux/module.h>
> #include <linux/mutex.h>
> +#include <asm/xen/hypervisor.h>
> #include <xen/xenbus.h>
> #include <xen/xen.h>
> #include "xenbus_comms.h"
> --
> 1.7.2.5
next prev parent reply other threads:[~2012-08-01 14:28 UTC|newest]
Thread overview: 99+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-26 15:33 [PATCH 00/24] Introduce Xen support on ARM Stefano Stabellini
2012-07-26 15:33 ` [PATCH 01/24] arm: initial Xen support Stefano Stabellini
2012-07-26 16:30 ` [Xen-devel] " Konrad Rzeszutek Wilk
2012-07-27 11:56 ` Stefano Stabellini
2012-08-01 10:42 ` Konrad Rzeszutek Wilk
2012-08-06 10:55 ` Stefano Stabellini
2012-08-01 18:27 ` Rob Herring
2012-08-02 7:35 ` Ian Campbell
2012-08-02 14:13 ` [Xen-devel] " Konrad Rzeszutek Wilk
2012-08-06 10:46 ` Stefano Stabellini
2012-07-26 15:33 ` [PATCH 02/24] xen/arm: hypercalls Stefano Stabellini
2012-07-26 16:33 ` [Xen-devel] " Konrad Rzeszutek Wilk
2012-07-27 9:17 ` Ian Campbell
2012-07-27 13:02 ` Stefano Stabellini
2012-07-27 13:18 ` Ian Campbell
2012-07-27 13:41 ` Stefano Stabellini
2012-07-27 14:21 ` Russell King - ARM Linux
2012-07-27 14:36 ` Stefano Stabellini
2012-07-27 14:39 ` Ian Campbell
2012-07-27 14:59 ` Russell King - ARM Linux
2012-07-26 16:56 ` David Vrabel
2012-07-26 17:19 ` Stefano Stabellini
2012-07-27 9:00 ` Ian Campbell
2012-07-26 19:19 ` Christopher Covington
2012-07-27 9:19 ` Ian Campbell
2012-07-27 12:56 ` Christopher Covington
2012-07-27 13:57 ` Stefano Stabellini
2012-07-26 15:33 ` [PATCH 03/24] xen/arm: page.h definitions Stefano Stabellini
2012-07-26 16:36 ` [Xen-devel] " Konrad Rzeszutek Wilk
2012-07-27 13:47 ` Stefano Stabellini
2012-07-26 15:33 ` [PATCH 04/24] xen/arm: sync_bitops Stefano Stabellini
2012-07-26 16:37 ` [Xen-devel] " Konrad Rzeszutek Wilk
2012-07-27 9:28 ` Ian Campbell
2012-08-01 14:35 ` Konrad Rzeszutek Wilk
2012-08-01 16:07 ` Stefano Stabellini
2012-07-26 15:33 ` [PATCH 05/24] xen/arm: empty implementation of grant_table arch specific functions Stefano Stabellini
2012-08-01 14:16 ` Konrad Rzeszutek Wilk
2012-08-01 15:46 ` Stefano Stabellini
2012-07-26 15:33 ` [PATCH 06/24] xen: missing includes Stefano Stabellini
2012-07-27 6:57 ` [Xen-devel] " Jan Beulich
2012-07-27 16:47 ` Stefano Stabellini
2012-07-26 15:33 ` [PATCH 07/24] xen/arm: Xen detection and shared_info page mapping Stefano Stabellini
2012-07-27 9:36 ` Ian Campbell
2012-07-27 14:48 ` Stefano Stabellini
2012-07-27 14:51 ` Ian Campbell
2012-08-01 14:19 ` Konrad Rzeszutek Wilk
2012-08-01 15:45 ` Stefano Stabellini
2012-07-26 15:33 ` [PATCH 08/24] xen/arm: Introduce xen_pfn_t for pfn and mfn types Stefano Stabellini
2012-08-01 14:22 ` Konrad Rzeszutek Wilk
2012-08-01 15:50 ` Stefano Stabellini
2012-07-26 15:33 ` [PATCH 09/24] xen/arm: compile and run xenbus Stefano Stabellini
2012-08-01 14:28 ` Konrad Rzeszutek Wilk [this message]
2012-08-06 11:17 ` Stefano Stabellini
2012-07-26 15:33 ` [PATCH 10/24] xen: do not compile manage, balloon, pci, acpi and cpu_hotplug on ARM Stefano Stabellini
2012-07-27 7:01 ` [Xen-devel] " Jan Beulich
2012-07-27 16:51 ` Stefano Stabellini
2012-07-26 15:33 ` [PATCH 11/24] xen/arm: introduce CONFIG_XEN " Stefano Stabellini
2012-08-01 14:34 ` [Xen-devel] " Konrad Rzeszutek Wilk
2012-07-26 15:33 ` [PATCH 12/24] xen/arm: Introduce xen_guest_init Stefano Stabellini
2012-07-27 9:42 ` Ian Campbell
2012-07-27 15:54 ` Stefano Stabellini
2012-07-27 16:11 ` Ian Campbell
2012-08-01 14:38 ` Konrad Rzeszutek Wilk
2012-07-26 15:33 ` [PATCH 13/24] xen/arm: get privilege status Stefano Stabellini
2012-07-27 9:44 ` Ian Campbell
2012-07-27 14:25 ` Stefano Stabellini
2012-07-27 14:33 ` Ian Campbell
2012-08-01 14:39 ` Konrad Rzeszutek Wilk
2012-08-01 16:21 ` Stefano Stabellini
2012-07-26 15:33 ` [PATCH 14/24] xen/arm: initialize grant_table on ARM Stefano Stabellini
2012-08-01 14:40 ` Konrad Rzeszutek Wilk
2012-08-01 17:08 ` Stefano Stabellini
2012-07-26 15:33 ` [PATCH 15/24] xen/arm: receive Xen events " Stefano Stabellini
2012-08-01 14:44 ` Konrad Rzeszutek Wilk
2012-08-06 10:31 ` Stefano Stabellini
2012-07-26 15:33 ` [PATCH 16/24] xen/arm: implement alloc/free_xenballooned_pages with alloc_pages/kfree Stefano Stabellini
2012-07-26 15:33 ` [PATCH 17/24] xen: allow privcmd for HVM guests Stefano Stabellini
2012-07-27 7:04 ` [Xen-devel] " Jan Beulich
2012-07-27 14:10 ` Stefano Stabellini
2012-08-01 14:47 ` Konrad Rzeszutek Wilk
2012-07-26 15:34 ` [PATCH 18/24] xen/arm: compile blkfront and blkback Stefano Stabellini
2012-07-27 9:48 ` Ian Campbell
2012-07-27 16:25 ` Stefano Stabellini
2012-08-01 14:48 ` Konrad Rzeszutek Wilk
2012-08-01 16:19 ` Stefano Stabellini
2012-07-26 15:34 ` [PATCH 19/24] xen/arm: compile netback Stefano Stabellini
2012-07-26 15:34 ` [PATCH 20/24] xen: update xen_add_to_physmap interface Stefano Stabellini
2012-08-01 14:52 ` Konrad Rzeszutek Wilk
2012-08-01 16:18 ` Stefano Stabellini
2012-08-01 18:19 ` Mukesh Rathor
2012-07-26 15:34 ` [PATCH 21/24] arm/v2m: initialize arch_timers even if v2m_timer is not present Stefano Stabellini
2012-08-01 14:52 ` Konrad Rzeszutek Wilk
2012-08-01 16:06 ` Stefano Stabellini
2012-07-26 15:34 ` [PATCH 22/24] ARM: enable earlyprintk=xen Stefano Stabellini
2012-07-26 15:34 ` [PATCH 23/24] hvc_xen: allow dom0_write_console for HVM guests Stefano Stabellini
2012-08-01 14:54 ` Konrad Rzeszutek Wilk
2012-08-01 16:04 ` Stefano Stabellini
2012-07-26 15:34 ` [PATCH 24/24] [HACK] xen/arm: implement xen_remap_domain_mfn_range Stefano Stabellini
2012-08-01 14:56 ` Konrad Rzeszutek Wilk
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120801142840.GG7227@phenom.dumpdata.com \
--to=konrad.wilk@oracle$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox