From: "Łukasz Stelmach" <l.stelmach@samsung.com>
To: libc-alpha@sourceware.org, andrew@sifive.com
Cc: "Marek Szyprowski" <m.szyprowski@samsung.com>,
"Łukasz Stelmach" <l.stelmach@samsung.com>,
adhemerval.zanella@linaro.org, alistair.francis@wdc.com,
aurelien@aurel32.net, eggert@cs.ucla.edu,
joseph@codesourcery.com, palmer@dabbelt.com,
k.lewandowsk@samsung.com
Subject: [PATCH v2] RISC-V: Allow long jumps to __syscall_error
Date: Fri, 16 Sep 2022 21:31:27 +0200 [thread overview]
Message-ID: <20220916193127.1527992-1-l.stelmach@samsung.com> (raw)
In-Reply-To: <CGME20220916193237eucas1p2a0a82daf73a66f5e25b9fa5372268f61@eucas1p2.samsung.com>
__syscall_error may end up farther than 1MiB away from a caller,
especially when linking statically large binaries. tail allows for
4GiB jumps and is reduced to j when a linked symbol is within range.
Fixes: 36960f0c76 ("RISC-V: Linux Syscall Interface")
Fixes: 7f33b09c65 ("RISC-V: Linux ABI")
Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com>
---
Changes in v2:
- use tail instead of la+jr as advised by Andrew Waterman
sysdeps/unix/sysv/linux/riscv/clone.S | 2 +-
sysdeps/unix/sysv/linux/riscv/getcontext.S | 2 +-
sysdeps/unix/sysv/linux/riscv/setcontext.S | 2 +-
sysdeps/unix/sysv/linux/riscv/swapcontext.S | 2 +-
sysdeps/unix/sysv/linux/riscv/sysdep.h | 2 +-
sysdeps/unix/sysv/linux/riscv/vfork.S | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/sysdeps/unix/sysv/linux/riscv/clone.S b/sysdeps/unix/sysv/linux/riscv/clone.S
index d7d2915e87..45ea8f184b 100644
--- a/sysdeps/unix/sysv/linux/riscv/clone.S
+++ b/sysdeps/unix/sysv/linux/riscv/clone.S
@@ -63,7 +63,7 @@ L (invalid):
li a0, -EINVAL
/* Something bad happened -- no child created. */
L (error):
- j __syscall_error
+ tail __syscall_error
END (__clone)
/* Load up the arguments to the function. Put this block of code in
diff --git a/sysdeps/unix/sysv/linux/riscv/getcontext.S b/sysdeps/unix/sysv/linux/riscv/getcontext.S
index 499f70b65d..f4f828805c 100644
--- a/sysdeps/unix/sysv/linux/riscv/getcontext.S
+++ b/sysdeps/unix/sysv/linux/riscv/getcontext.S
@@ -70,7 +70,7 @@ LEAF (__getcontext)
ret
-99: j __syscall_error
+99: tail __syscall_error
PSEUDO_END (__getcontext)
diff --git a/sysdeps/unix/sysv/linux/riscv/setcontext.S b/sysdeps/unix/sysv/linux/riscv/setcontext.S
index e3bc84a2e6..1e529b900c 100644
--- a/sysdeps/unix/sysv/linux/riscv/setcontext.S
+++ b/sysdeps/unix/sysv/linux/riscv/setcontext.S
@@ -92,7 +92,7 @@ LEAF (__setcontext)
jr t1
-99: j __syscall_error
+99: tail __syscall_error
END (__setcontext)
libc_hidden_def (__setcontext)
diff --git a/sysdeps/unix/sysv/linux/riscv/swapcontext.S b/sysdeps/unix/sysv/linux/riscv/swapcontext.S
index 4da615f6d4..287ba364cd 100644
--- a/sysdeps/unix/sysv/linux/riscv/swapcontext.S
+++ b/sysdeps/unix/sysv/linux/riscv/swapcontext.S
@@ -118,7 +118,7 @@ LEAF (__swapcontext)
jr t1
-99: j __syscall_error
+99: tail __syscall_error
PSEUDO_END (__swapcontext)
diff --git a/sysdeps/unix/sysv/linux/riscv/sysdep.h b/sysdeps/unix/sysv/linux/riscv/sysdep.h
index 37ff07a0d7..aff8d857c9 100644
--- a/sysdeps/unix/sysv/linux/riscv/sysdep.h
+++ b/sysdeps/unix/sysv/linux/riscv/sysdep.h
@@ -102,7 +102,7 @@
# else
# define SYSCALL_ERROR_HANDLER(name) \
.Lsyscall_error ## name: \
- j __syscall_error;
+ tail __syscall_error;
# endif
/* Performs a system call, not setting errno. */
diff --git a/sysdeps/unix/sysv/linux/riscv/vfork.S b/sysdeps/unix/sysv/linux/riscv/vfork.S
index 0970543619..1482406e2d 100644
--- a/sysdeps/unix/sysv/linux/riscv/vfork.S
+++ b/sysdeps/unix/sysv/linux/riscv/vfork.S
@@ -39,7 +39,7 @@ LEAF (__libc_vfork)
bltz a0, 1f
ret
-1: j __syscall_error
+1: tail __syscall_error
END (__libc_vfork)
weak_alias (__libc_vfork, vfork)
--
2.30.2
next parent reply other threads:[~2022-09-16 19:32 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CGME20220916193237eucas1p2a0a82daf73a66f5e25b9fa5372268f61@eucas1p2.samsung.com>
2022-09-16 19:31 ` Łukasz Stelmach [this message]
2022-09-17 1:33 ` Andrew Waterman
2022-09-17 3:29 ` DJ Delorie
2022-09-17 7:59 ` Palmer Dabbelt
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=20220916193127.1527992-1-l.stelmach@samsung.com \
--to=l.stelmach@samsung.com \
--cc=adhemerval.zanella@linaro.org \
--cc=alistair.francis@wdc.com \
--cc=andrew@sifive.com \
--cc=aurelien@aurel32.net \
--cc=eggert@cs.ucla.edu \
--cc=joseph@codesourcery.com \
--cc=k.lewandowsk@samsung.com \
--cc=libc-alpha@sourceware.org \
--cc=m.szyprowski@samsung.com \
--cc=palmer@dabbelt.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 read-only IMAP folder(s) and NNTP newsgroup(s).