There are two problems with domain_crash().
First, that it is frequently not preceded by a printk() at all, or that it is
only preceded by a dprintk(). Either way, critical diagnostic is omitted for
an event which is fatal to the guest.
Second, the embedded __LINE__ is an issue for livepatching, creating unwanted
churn in the binary diff. This is the final __LINE__ remaining in
livepatching-relevant contexts.
The end goal is to have domain_crash() require a print string which gets fed
to printk(), making it far less easy to omit relevant diagnostic information.
However, modifying all callers at once is far too big and complicated, so use
some macro magic to tolerate the old API (no print string) in the short term.
Adjust two callers in load_segments() to demonstrate the new API.
Signed-off-by: Andrew Cooper <andrew.coop...@citrix.com>
---
CC: Jan Beulich <jbeul...@suse.com>
CC: Roger Pau Monné <roger....@citrix.com>
CC: Wei Liu <w...@xen.org>
CC: Stefano Stabellini <sstabell...@kernel.org>
CC: Julien Grall <jul...@xen.org>
CC: Volodymyr Babchuk <volodymyr_babc...@epam.com>
CC: Bertrand Marquis <bertrand.marq...@arm.com>
Supersedes my previous attempt to update every caller in one go. In due
course I'll split that mammoth patch up into a series.
---
xen/arch/x86/domain.c | 14 ++++----------
xen/include/xen/sched.h | 13 +++++++++----
2 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c
index ef1812dc1402..45be5e1cd7c9 100644
--- a/xen/arch/x86/domain.c
+++ b/xen/arch/x86/domain.c
@@ -1693,11 +1693,8 @@ static void load_segments(struct vcpu *n)
put_guest(uregs->fs, esp - 5) |
put_guest(uregs->es, esp - 6) |
put_guest(uregs->ds, esp - 7) )
- {
- gprintk(XENLOG_ERR,
- "error while creating compat failsafe callback
frame\n");
- domain_crash(n->domain);
- }
+ domain_crash(n->domain,
+ "Error creating compat failsafe callback
frame\n");
if ( n->arch.pv.vgc_flags & VGCF_failsafe_disables_events )
vcpu_info(n, evtchn_upcall_mask) = 1;
@@ -1732,11 +1729,8 @@ static void load_segments(struct vcpu *n)
put_guest(uregs->ds, rsp - 9) |
put_guest(regs->r11, rsp - 10) |
put_guest(regs->rcx, rsp - 11) )
- {
- gprintk(XENLOG_ERR,
- "error while creating failsafe callback frame\n");
- domain_crash(n->domain);
- }
+ domain_crash(n->domain,
+ "Error creating failsafe callback frame\n");
if ( n->arch.pv.vgc_flags & VGCF_failsafe_disables_events )
vcpu_info(n, evtchn_upcall_mask) = 1;
diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h
index 37f78cc4c4c9..38b390d20371 100644
--- a/xen/include/xen/sched.h
+++ b/xen/include/xen/sched.h
@@ -736,10 +736,15 @@ void vcpu_end_shutdown_deferral(struct vcpu *v);
* from any processor.
*/
void __domain_crash(struct domain *d);
-#define domain_crash(d) do { \
- printk("domain_crash called from %s:%d\n", __FILE__, __LINE__); \
- __domain_crash(d); \
-} while (0)
+#define domain_crash(d, ...) \
+ do { \
+ if ( count_args(__VA_ARGS__) == 0 ) \
+ printk("domain_crash called from %s:%d\n", \
+ __FILE__, __LINE__); \
+ else \
+ printk(XENLOG_G_ERR __VA_ARGS__); \
+ __domain_crash(d); \
+ } while ( 0 )
/*
* Called from assembly code, with an optional address to help indicate why
--
2.11.0
