M-Labs/compiler-builtins-zynq
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Tweak definition of probestack functions

Browse Source 
It looks like the old `__rust_probestack` routine is incompatible with newer
linux kernels. My best guess for this is that the kernel's auto-growth logic is
failing to trigger, causing what looks like a legitimate segfault to get
delivered. My best guess for why *that's* happening is that the faulting address
is below `%rsp`, whereas previously all faulting stack addresses were above
`%rsp`. The probestack routine does not modify `%rsp` as it's probing the stack,
and presumably newer kernels are interpreting this as a legitimate violation.

This commit tweaks the probestack routine to instead update `%rsp` incrementally
as probing happens. The ABI of the function, however, requires that `%rsp`
isn't changed as part of the function so it's restored at the end to the
previous value.
This commit is contained in:
Alex Crichton 2017-07-07 10:16:03 -07:00
parent e9b258bc0c
commit f9f6bd0589
1 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/probestack.rs
View File

@ -53,28 +53,33 @@ pub unsafe extern fn __rust_probestack() {
// The ABI here is that the stack frame size is located in `%eax`. Upon // The ABI here is that the stack frame size is located in `%eax`. Upon
// return we're not supposed to modify `%esp` or `%eax`. // return we're not supposed to modify `%esp` or `%eax`.
asm!(" asm!("
lea 8(%rsp),%r11 // rsp before calling this routine -> r11 mov %rax,%r11 // duplicate %rax as we're clobbering %r11
// Main loop, taken in one page increments. We're decrementing r11 by // Main loop, taken in one page increments. We're decrementing rsp by
// a page each time until there's less than a page remaining. We're // a page each time until there's less than a page remaining. We're
// guaranteed that this function isn't called unless there's more than a // guaranteed that this function isn't called unless there's more than a
// page needed // page needed.
//
// Note that we're also testing against `8(%rsp)` to account for the 8
// bytes pushed on the stack orginally with our return address. Using
// `8(%rsp)` simulates us testing the stack pointer in the caller's
// context.
2: 2:
sub $$0x1000,%rsp
test %rsp,8(%rsp)
sub $$0x1000,%r11 sub $$0x1000,%r11
test %r11,(%r11) cmp $$0x1000,%r11
sub $$0x1000,%rax
cmp $$0x1000,%rax
ja 2b ja 2b
// Finish up the last remaining stack space requested, getting the last // Finish up the last remaining stack space requested, getting the last
// bits out of rax // bits out of r11
sub %rax,%r11 sub %r11,%rsp
test %r11,(%r11) test %rsp,8(%rsp)
// We now know that %r11 is (%rsp + 8 - %rax) so to recover rax // Restore the stack pointer to what it previously was when entering
// we calculate (%rsp + 8) - %r11 which will give us %rax // this function. The caller will readjust the stack pointer after we
lea 8(%rsp),%rax // return.
sub %r11,%rax add %rax,%rsp
ret ret
"); ");
@ -92,19 +97,18 @@ pub unsafe extern fn __rust_probestack() {
// The ABI here is the same as x86_64, except everything is 32-bits large. // The ABI here is the same as x86_64, except everything is 32-bits large.
asm!(" asm!("
push %ecx push %ecx
lea 8(%esp),%ecx mov %eax,%ecx
2: 2:
sub $$0x1000,%esp
test %esp,8(%esp)
sub $$0x1000,%ecx sub $$0x1000,%ecx
test %ecx,(%ecx) cmp $$0x1000,%ecx
sub $$0x1000,%eax
cmp $$0x1000,%eax
ja 2b ja 2b
sub %eax,%ecx sub %ecx,%esp
test %ecx,(%ecx) test %esp,8(%esp)
lea 8(%esp),%eax add %eax,%esp
sub %ecx,%eax
pop %ecx pop %ecx
ret ret
"); ");