From: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
To: Shannon Zhao <zhaoshenglong@huawei.com>
Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>,
<linux-arm-kernel@lists.infradead.org>,
<ard.biesheuvel@linaro.org>, <stefano.stabellini@citrix.com>,
<david.vrabel@citrix.com>, <mark.rutland@arm.com>,
<devicetree@vger.kernel.org>, <linux-efi@vger.kernel.org>,
<catalin.marinas@arm.com>, <will.deacon@arm.com>,
<linux-kernel@vger.kernel.org>, <xen-devel@lists.xen.org>,
<julien.grall@citrix.com>, <shannon.zhao@linaro.org>,
<peter.huangpeng@huawei.com>
Subject: Re: [Xen-devel] [PATCH v2 10/16] ARM: XEN: Move xen_early_init() before efi_init()
Date: Tue, 19 Jan 2016 12:14:32 +0000 [thread overview]
Message-ID: <alpine.DEB.2.02.1601191210250.9400@kaball.uk.xensource.com> (raw)
In-Reply-To: <569DF590.6030105@huawei.com>
On Tue, 19 Jan 2016, Shannon Zhao wrote:
> On 2016/1/18 22:59, Stefano Stabellini wrote:
> > On Fri, 15 Jan 2016, Shannon Zhao wrote:
> >> From: Shannon Zhao <shannon.zhao@linaro.org>
> >>
> >> Move xen_early_init() before efi_init(), then when calling efi_init()
> >> could initialize Xen specific UEFI.
> >>
> >> Check if it runs on Xen hypervisor through the flat dts.
> >>
> >> Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
> >> ---
> >> arch/arm/xen/enlighten.c | 56 ++++++++++++++++++++++++++++++++++-------------
> >> arch/arm64/kernel/setup.c | 2 +-
> >> 2 files changed, 42 insertions(+), 16 deletions(-)
> >>
> >> diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c
> >> index 4e78c49..5d0fe68 100644
> >> --- a/arch/arm/xen/enlighten.c
> >> +++ b/arch/arm/xen/enlighten.c
> >> @@ -19,6 +19,7 @@
> >> #include <linux/irqreturn.h>
> >> #include <linux/module.h>
> >> #include <linux/of.h>
> >> +#include <linux/of_fdt.h>
> >> #include <linux/of_irq.h>
> >> #include <linux/of_address.h>
> >> #include <linux/cpuidle.h>
> >> @@ -52,8 +53,6 @@ struct xen_memory_region xen_extra_mem[XEN_EXTRA_MEM_MAX_REGIONS] __initdata;
> >>
> >> static __read_mostly unsigned int xen_events_irq;
> >>
> >> -static __initdata struct device_node *xen_node;
> >> -
> >> int xen_remap_domain_gfn_array(struct vm_area_struct *vma,
> >> unsigned long addr,
> >> xen_pfn_t *gfn, int nr,
> >> @@ -222,6 +221,33 @@ static irqreturn_t xen_arm_callback(int irq, void *arg)
> >> return IRQ_HANDLED;
> >> }
> >>
> >> +static __initdata struct {
> >> + const char *compat;
> >> + const char *prefix;
> >> + const char *version;
> >> + bool found;
> >> +} xen_node = {"xen,xen", "xen,xen-", NULL, false};
> >> +
> >> +static int __init fdt_find_xen_node(unsigned long node, const char *uname,
> >> + int depth, void *data)
> >> +{
> >> + const void *s = NULL;
> >> + int len;
> >> +
> >> + if (depth != 1 || strcmp(uname, "hypervisor") != 0)
> >> + return 0;
> >> +
> >> + if (of_flat_dt_is_compatible(node, xen_node.compat))
> >> + xen_node.found = true;
> >> +
> >> + s = of_get_flat_dt_prop(node, "compatible", &len);
> >> + if (strlen(xen_node.prefix) + 3 < len &&
> >> + !strncmp(xen_node.prefix, s, strlen(xen_node.prefix)))
> >> + xen_node.version = s + strlen(xen_node.prefix);
> >> +
> >> + return 0;
> >> +}
> >> +
> >> /*
> >> * see Documentation/devicetree/bindings/arm/xen.txt for the
> >> * documentation of the Xen Device Tree format.
> >> @@ -229,26 +255,18 @@ static irqreturn_t xen_arm_callback(int irq, void *arg)
> >> #define GRANT_TABLE_PHYSADDR 0
> >> void __init xen_early_init(void)
> >> {
> >> - int len;
> >> - const char *s = NULL;
> >> - const char *version = NULL;
> >> - const char *xen_prefix = "xen,xen-";
> >> -
> >> - xen_node = of_find_compatible_node(NULL, NULL, "xen,xen");
> >> - if (!xen_node) {
> >> + of_scan_flat_dt(fdt_find_xen_node, NULL);
> >> + if (!xen_node.found) {
> >> pr_debug("No Xen support\n");
> >> return;
> >> }
> >> - s = of_get_property(xen_node, "compatible", &len);
> >> - if (strlen(xen_prefix) + 3 < len &&
> >> - !strncmp(xen_prefix, s, strlen(xen_prefix)))
> >> - version = s + strlen(xen_prefix);
> >> - if (version == NULL) {
> >> +
> >> + if (xen_node.version == NULL) {
> >> pr_debug("Xen version not found\n");
> >> return;
> >> }
> >
> > This is going to access data within the fdt, after it has been
> > unflattened (by the unflatten_device_tree call). Is that allowed?
> >
> > If that's not allowed, then you could copy the version string to
> > xen_node.version, rather than just copying the pointer. Otherwise you
> > could move the version check entirely within fdt_find_xen_node and
> > remove the version field from xen_node.
> >
> A little confused. Since here we move xen_early_init before efi_init and
> before unflatten_device_tree as well, at this moment in xen_early_init
> the fdt is flattened. The xen_node.version is only set in
> fdt_find_xen_node and accessed in xen_early_init.
You are right, sorry, I must have been confused. It might be good to
rename the xen_node variable that this patch introduced in xen_guest_init.
> >> - pr_info("Xen %s support found\n", version);
> >> + pr_info("Xen %s support found\n", xen_node.version);
> >>
> >> xen_domain_type = XEN_HVM_DOMAIN;
> >>
> >> @@ -296,6 +314,14 @@ static int __init xen_guest_init(void)
> >> }
> >> #endif
> >> } else {
> >> + struct device_node *xen_node;
> >> +
> >> + xen_node = of_find_compatible_node(NULL, NULL, "xen,xen");
> >> + if (!xen_node) {
> >> + pr_debug("No Xen support\n");
> >> + return -ENODEV;
> >> + }
> >
> > It makes sense to move this into a DT specific init function called from
> > xen_guest_init. Also, given that at this point we know that a Xen node
> > should be present, it makes sense to return EFAULT on error, instead of
> > ENODEV. The error message could be changed to something like: "Xen
> > support was detected before, but it has disappeared" and should be
> > pr_err.
> >
> OK, thanks.
next prev parent reply other threads:[~2016-01-19 12:15 UTC|newest]
Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-15 6:55 [PATCH v2 00/16] Add ACPI support for Xen Dom0 on ARM64 Shannon Zhao
2016-01-15 6:55 ` [PATCH v2 01/16] Xen: ACPI: Hide UART used by Xen Shannon Zhao
2016-01-15 15:39 ` Stefano Stabellini
2016-01-18 10:32 ` Mark Rutland
2016-01-18 11:38 ` Stefano Stabellini
2016-01-15 6:55 ` [PATCH v2 02/16] xen/grant-table: Move xlated_setup_gnttab_pages to common place Shannon Zhao
2016-01-15 15:53 ` [Xen-devel] " Stefano Stabellini
2016-01-15 6:55 ` [PATCH v2 03/16] Xen: xlate: Use page_to_xen_pfn instead of page_to_pfn Shannon Zhao
2016-01-15 17:08 ` [Xen-devel] " Stefano Stabellini
2016-01-18 5:08 ` Shannon Zhao
2016-01-19 14:59 ` Stefano Stabellini
2016-01-19 15:10 ` Shannon Zhao
2016-01-15 6:55 ` [PATCH v2 04/16] arm/xen: Use xen_xlate_map_ballooned_pages to setup grant table Shannon Zhao
2016-01-15 17:21 ` Stefano Stabellini
2016-01-15 6:55 ` [PATCH v2 05/16] xen: memory : Add new XENMAPSPACE type XENMAPSPACE_dev_mmio Shannon Zhao
2016-01-15 6:55 ` [PATCH v2 06/16] Xen: ARM: Add support for mapping platform device mmio Shannon Zhao
2016-01-15 17:39 ` [Xen-devel] " Stefano Stabellini
2016-01-15 6:55 ` [PATCH v2 07/16] Xen: ARM: Add support for mapping AMBA " Shannon Zhao
2016-01-18 11:58 ` [Xen-devel] " Stefano Stabellini
2016-01-15 6:55 ` [PATCH v2 08/16] xen/hvm/params: Add a new delivery type for event-channel in HVM_PARAM_CALLBACK_IRQ Shannon Zhao
2016-01-18 12:38 ` [Xen-devel] " Stefano Stabellini
2016-01-18 12:42 ` Andrew Cooper
2016-01-18 12:46 ` Stefano Stabellini
2016-01-18 12:52 ` Andrew Cooper
2016-01-20 6:33 ` Shannon Zhao
2016-01-20 8:39 ` Andrew Cooper
2016-01-20 8:45 ` Shannon Zhao
2016-01-15 6:55 ` [PATCH v2 09/16] arm/xen: Get event-channel irq through HVM_PARAM when booting with ACPI Shannon Zhao
2016-01-18 14:38 ` [Xen-devel] " Stefano Stabellini
2016-01-19 8:21 ` Shannon Zhao
2016-01-15 6:55 ` [PATCH v2 10/16] ARM: XEN: Move xen_early_init() before efi_init() Shannon Zhao
2016-01-18 14:59 ` [Xen-devel] " Stefano Stabellini
2016-01-19 8:36 ` Shannon Zhao
2016-01-19 12:14 ` Stefano Stabellini [this message]
2016-01-15 6:55 ` [PATCH v2 11/16] ARM64: ACPI: Check if it runs on Xen to enable or disable ACPI Shannon Zhao
2016-01-18 10:41 ` Mark Rutland
2016-01-18 15:07 ` Stefano Stabellini
2016-01-19 8:41 ` Shannon Zhao
2016-01-15 6:55 ` [PATCH v2 12/16] ARM: Xen: Document UEFI support on Xen ARM virtual platforms Shannon Zhao
2016-01-17 3:43 ` Rob Herring
2016-01-18 10:51 ` Mark Rutland
2016-01-18 17:34 ` Stefano Stabellini
2016-01-19 10:25 ` Shannon Zhao
2016-01-19 10:47 ` Mark Rutland
2016-01-19 12:23 ` Stefano Stabellini
2016-01-19 13:13 ` Mark Rutland
2016-01-19 13:18 ` Ard Biesheuvel
2016-01-19 13:43 ` Shannon Zhao
2016-01-19 14:11 ` Stefano Stabellini
2016-01-21 11:50 ` Mark Rutland
2016-01-15 6:55 ` [PATCH v2 13/16] ARM: XEN: Set EFI_PARAVIRT if Xen supports EFI Shannon Zhao
2016-01-18 10:57 ` Mark Rutland
2016-01-15 6:55 ` [PATCH v2 14/16] Xen: EFI: Parse DT parameters for Xen specific UEFI Shannon Zhao
2016-01-18 11:03 ` Mark Rutland
2016-01-18 15:41 ` [Xen-devel] " Stefano Stabellini
2016-01-19 13:19 ` Shannon Zhao
2016-01-19 13:43 ` Mark Rutland
2016-01-19 13:46 ` Shannon Zhao
2016-01-15 6:55 ` [PATCH v2 15/16] XEN: EFI: Move x86 specific codes to architecture directory Shannon Zhao
2016-01-15 6:55 ` [PATCH v2 16/16] ARM64: XEN: Initialize Xen specific UEFI runtime services Shannon Zhao
2016-01-18 11:08 ` Mark Rutland
2016-01-18 17:45 ` Stefano Stabellini
2016-01-18 18:27 ` Mark Rutland
2016-01-19 12:03 ` Stefano Stabellini
2016-01-19 13:03 ` Mark Rutland
2016-01-19 13:31 ` Shannon Zhao
2016-01-19 14:20 ` Stefano Stabellini
2016-01-18 17:03 ` [Xen-devel] " Stefano Stabellini
2016-01-19 13:12 ` Shannon Zhao
2016-01-19 14:24 ` Stefano Stabellini
2016-01-22 3:58 ` Shannon Zhao
2016-01-22 10:57 ` Stefano Stabellini
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=alpine.DEB.2.02.1601191210250.9400@kaball.uk.xensource.com \
--to=stefano.stabellini@eu.citrix.com \
--cc=ard.biesheuvel@linaro.org \
--cc=catalin.marinas@arm.com \
--cc=david.vrabel@citrix.com \
--cc=devicetree@vger.kernel.org \
--cc=julien.grall@citrix.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-efi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=peter.huangpeng@huawei.com \
--cc=shannon.zhao@linaro.org \
--cc=stefano.stabellini@citrix.com \
--cc=will.deacon@arm.com \
--cc=xen-devel@lists.xen.org \
--cc=zhaoshenglong@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).