From: Florian Weimer <fweimer@redhat.com>
To: libc-alpha@sourceware.org
Subject: [PATCH 4/5] i386: Honor I386_USE_SYSENTER for 6-argument Linux system calls
Date: Mon, 02 May 2022 21:15:45 +0200 [thread overview]
Message-ID: <621524cdf4abec91c12f4c6a88f9807078c0814b.1651518694.git.fweimer@redhat.com> (raw)
In-Reply-To: <cover.1651518694.git.fweimer@redhat.com>
Introduce an int-80h-based version of __libc_do_syscall and use
it if I386_USE_SYSENTER is defined as 0.
---
sysdeps/unix/sysv/linux/i386/Makefile | 2 +-
.../sysv/linux/i386/libc-do-syscall-int80.S | 25 +++++++++++++++++++
sysdeps/unix/sysv/linux/i386/sysdep.h | 13 ++++++++--
3 files changed, 37 insertions(+), 3 deletions(-)
create mode 100644 sysdeps/unix/sysv/linux/i386/libc-do-syscall-int80.S
diff --git a/sysdeps/unix/sysv/linux/i386/Makefile b/sysdeps/unix/sysv/linux/i386/Makefile
index fcab129fc1..598e27dcda 100644
--- a/sysdeps/unix/sysv/linux/i386/Makefile
+++ b/sysdeps/unix/sysv/linux/i386/Makefile
@@ -13,7 +13,7 @@ install-bin += lddlibc4
endif
ifeq ($(subdir),io)
-sysdep_routines += libc-do-syscall
+sysdep_routines += libc-do-syscall libc-do-syscall-int80
endif
ifeq ($(subdir),stdlib)
diff --git a/sysdeps/unix/sysv/linux/i386/libc-do-syscall-int80.S b/sysdeps/unix/sysv/linux/i386/libc-do-syscall-int80.S
new file mode 100644
index 0000000000..2c472f2557
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/i386/libc-do-syscall-int80.S
@@ -0,0 +1,25 @@
+/* Out-of-line syscall stub for six-argument syscalls from C. For static PIE.
+ Copyright (C) 2022 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
+
+#ifndef SHARED
+# define I386_USE_SYSENTER 0
+# include <sysdep.h>
+
+# define __libc_do_syscall __libc_do_syscall_int80
+# include "libc-do-syscall.S"
+#endif
diff --git a/sysdeps/unix/sysv/linux/i386/sysdep.h b/sysdeps/unix/sysv/linux/i386/sysdep.h
index 4558ab66cb..7085f7e19a 100644
--- a/sysdeps/unix/sysv/linux/i386/sysdep.h
+++ b/sysdeps/unix/sysv/linux/i386/sysdep.h
@@ -42,6 +42,15 @@
# endif
#endif
+#if !I386_USE_SYSENTER && IS_IN (libc) && !defined SHARED
+/* Inside static libc, we have two versions. For compilation units
+ with !I386_USE_SYSENTER, the vDSO entry mechanism cannot be
+ used. */
+# define I386_DO_SYSCALL_STRING "__libc_do_syscall_int80"
+#else
+# define I386_DO_SYSCALL_STRING "__libc_do_syscall"
+#endif
+
#ifdef __ASSEMBLER__
/* Linux uses a negative return value to indicate syscall errors,
@@ -301,7 +310,7 @@ struct libc_do_syscall_args
}; \
asm volatile ( \
"movl %1, %%eax\n\t" \
- "call __libc_do_syscall" \
+ "call " I386_DO_SYSCALL_STRING \
: "=a" (resultvar) \
: "i" (__NR_##name), "c" (arg2), "d" (arg3), "S" (arg4), "D" (&_xv) \
: "memory", "cc")
@@ -315,7 +324,7 @@ struct libc_do_syscall_args
}; \
asm volatile ( \
"movl %1, %%eax\n\t" \
- "call __libc_do_syscall" \
+ "call " I386_DO_SYSCALL_STRING \
: "=a" (resultvar) \
: "a" (name), "c" (arg2), "d" (arg3), "S" (arg4), "D" (&_xv) \
: "memory", "cc")
--
2.35.1
next prev parent reply other threads:[~2022-05-02 19:15 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-02 19:15 [PATCH 0/5] Linux: Fall back to mmap if early sbrk fails Florian Weimer
2022-05-02 19:15 ` [PATCH 1/5] Linux: Implement a useful version of _startup_fatal Florian Weimer
2022-05-02 19:45 ` H.J. Lu
2022-05-02 19:52 ` Florian Weimer
2022-05-02 20:06 ` H.J. Lu
2022-05-02 20:37 ` Florian Weimer
2022-05-03 5:18 ` Florian Weimer
2022-05-03 15:54 ` H.J. Lu
2022-05-03 16:00 ` Florian Weimer
2022-05-03 16:36 ` H.J. Lu
2022-05-03 16:43 ` Florian Weimer
2022-05-03 16:46 ` H.J. Lu
2022-05-03 16:57 ` Florian Weimer
2022-05-03 17:01 ` Adhemerval Zanella
2022-05-03 20:16 ` Florian Weimer
2022-05-02 19:15 ` [PATCH 2/5] Linux: Define MMAP_CALL_INTERNAL Florian Weimer
2022-05-03 18:30 ` Florian Weimer
2022-05-04 13:10 ` Stefan Liebler
2022-05-02 19:15 ` [PATCH 3/5] i386: Remove OPTIMIZE_FOR_GCC_5 from Linux libc-do-syscall.S Florian Weimer
2022-05-02 19:20 ` H.J. Lu
2022-05-02 19:15 ` Florian Weimer [this message]
2022-05-02 19:24 ` [PATCH 4/5] i386: Honor I386_USE_SYSENTER for 6-argument Linux system calls H.J. Lu
2022-05-02 19:15 ` [PATCH 5/5] csu: Implement and use _dl_early_allocate during static startup Florian Weimer
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=621524cdf4abec91c12f4c6a88f9807078c0814b.1651518694.git.fweimer@redhat.com \
--to=fweimer@redhat.com \
--cc=libc-alpha@sourceware.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 read-only IMAP folder(s) and NNTP newsgroup(s).