From: Andrew Cooper <andrew.cooper3@citrix.com>
To: Xen-devel <xen-devel@lists.xen.org>
Cc: Andrew Cooper <andrew.cooper3@citrix.com>,
Keir Fraser <keir@xen.org>, Jan Beulich <JBeulich@suse.com>
Subject: [PATCH] x86/boot: Explicitly clean pcpu stacks in debug builds
Date: Thu, 15 Aug 2013 21:49:01 +0100 [thread overview]
Message-ID: <1376599741-31694-1-git-send-email-andrew.cooper3@citrix.com> (raw)
This reduces confusion when looking at a hexdump of the pcpu stacks and
wondering were on earth some of the junk was coming from. Also leave some
grep fodder for finding where the BSP switches stack (because it took me far
longer to find than I care to admit to)
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
CC: Keir Fraser <keir@xen.org>
CC: Jan Beulich <JBeulich@suse.com>
---
I came across this while developing my pcpu stack hexdumping capability into
the crashdump analyser. While I know it is not neccessary for Xen to function
correctly, I do feel that it is quite important when getting to this level of
debugging.
I guess this patch is partly RFC, but it does successfully boot on my test
box, and fix stack junk seen on all CPUs.
---
xen/arch/x86/boot/x86_64.S | 9 +++++++++
xen/arch/x86/smpboot.c | 4 ++++
2 files changed, 13 insertions(+)
diff --git a/xen/arch/x86/boot/x86_64.S b/xen/arch/x86/boot/x86_64.S
index ed3888d..a45549b 100644
--- a/xen/arch/x86/boot/x86_64.S
+++ b/xen/arch/x86/boot/x86_64.S
@@ -13,6 +13,15 @@
mov mmu_cr4_features(%rip),%rcx
mov %rcx,%cr4
+#ifndef NDEBUG
+ /* Clean stack. */
+ mov stack_start(%rip),%rdi
+ mov $(STACK_SIZE>>8),%rcx
+ xor %eax,%eax
+ rep stosq
+#endif
+
+ /* Move to cpu0_stack. */
mov stack_start(%rip),%rsp
or $(STACK_SIZE-CPUINFO_sizeof),%rsp
diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c
index 3df4e88..eced9ba 100644
--- a/xen/arch/x86/smpboot.c
+++ b/xen/arch/x86/smpboot.c
@@ -662,6 +662,10 @@ static int cpu_smpboot_alloc(unsigned int cpu)
stack_base[cpu] = alloc_xenheap_pages(STACK_ORDER, 0);
if ( stack_base[cpu] == NULL )
goto oom;
+#ifndef NDEBUG
+ for ( order = 0 ; order < 1<<STACK_ORDER ; ++order )
+ clear_page(stack_base[cpu] + order * PAGE_SIZE);
+#endif
memguard_guard_stack(stack_base[cpu]);
order = get_order_from_pages(NR_RESERVED_GDT_PAGES);
--
1.7.10.4
next reply other threads:[~2013-08-15 20:49 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-15 20:49 Andrew Cooper [this message]
2013-08-16 9:33 ` [PATCH] x86/boot: Explicitly clean pcpu stacks in debug builds Jan Beulich
2013-08-26 11:10 ` [Patch v2] " Andrew Cooper
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=1376599741-31694-1-git-send-email-andrew.cooper3@citrix.com \
--to=andrew.cooper3@citrix.com \
--cc=JBeulich@suse.com \
--cc=keir@xen.org \
--cc=xen-devel@lists.xen.org \
/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).