Mailing List Archive

commit 91c45cfbab5d9878c0a7021f762988a688d5e91d
Author: Michal Orzel <michal.orzel@amd.com>
AuthorDate: Mon Feb 6 14:05:28 2023 +0100
Commit: Stefano Stabellini <stefano.stabellini@amd.com>
CommitDate: Wed Feb 15 13:49:58 2023 -0800

xen/arm: Print return code from domain_create and construct_dom{0,U} on panic

This might be helpful in providing additional debugging information (in
most cases, at least to distinguish -EINVAL from -ENOMEM), so modify the
code to include printing return code in panic message. In create_dom0,
move the call to alloc_dom0_vcpu0() to a separate condition and call a
meaningful panic message.

Signed-off-by: Michal Orzel <michal.orzel@amd.com>
Reviewed-by: Luca Fancellu <luca.fancellu@arm.com>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
---
xen/arch/arm/domain_build.c | 23 ++++++++++++++++-------
1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c
index c2b97fa21e..edca23b986 100644
--- a/xen/arch/arm/domain_build.c
+++ b/xen/arch/arm/domain_build.c
@@ -3874,6 +3874,7 @@ void __init create_domUs(void)
};
unsigned int flags = 0U;
uint32_t val;
+ int rc;

if ( !dt_device_is_compatible(node, "xen,domain") )
continue;
@@ -3966,13 +3967,16 @@ void __init create_domUs(void)
*/
d = domain_create(++max_init_domid, &d_cfg, flags);
if ( IS_ERR(d) )
- panic("Error creating domain %s\n", dt_node_name(node));
+ panic("Error creating domain %s (rc = %ld)\n",
+ dt_node_name(node), PTR_ERR(d));

d->is_console = true;
dt_device_set_used_by(node, d->domain_id);

- if ( construct_domU(d, node) != 0 )
- panic("Could not set up domain %s\n", dt_node_name(node));
+ rc = construct_domU(d, node);
+ if ( rc )
+ panic("Could not set up domain %s (rc = %d)\n",
+ dt_node_name(node), rc);
}
}

@@ -4060,6 +4064,7 @@ void __init create_dom0(void)
.max_maptrack_frames = -1,
.grant_opts = XEN_DOMCTL_GRANT_version(opt_gnttab_max_version),
};
+ int rc;

/* The vGIC for DOM0 is exactly emulating the hardware GIC */
dom0_cfg.arch.gic_version = XEN_DOMCTL_CONFIG_GIC_NATIVE;
@@ -4077,11 +4082,15 @@ void __init create_dom0(void)
dom0_cfg.flags |= XEN_DOMCTL_CDF_iommu;

dom0 = domain_create(0, &dom0_cfg, CDF_privileged | CDF_directmap);
- if ( IS_ERR(dom0) || (alloc_dom0_vcpu0(dom0) == NULL) )
- panic("Error creating domain 0\n");
+ if ( IS_ERR(dom0) )
+ panic("Error creating domain 0 (rc = %ld)\n", PTR_ERR(dom0));
+
+ if ( alloc_dom0_vcpu0(dom0) == NULL )
+ panic("Error creating domain 0 vcpu0\n");

- if ( construct_dom0(dom0) != 0)
- panic("Could not set up DOM0 guest OS\n");
+ rc = construct_dom0(dom0);
+ if ( rc )
+ panic("Could not set up DOM0 guest OS (rc = %d)\n", rc);
}

/*
--
generated by git-patchbot for /home/xen/git/xen.git#master