From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2178) id E3167384B82C; Thu, 19 May 2022 13:05:12 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E3167384B82C Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Florian Weimer To: glibc-cvs@sourceware.org Subject: [glibc/release/2.34/master] i386: Honor I386_USE_SYSENTER for 6-argument Linux system calls X-Act-Checkin: glibc X-Git-Author: Florian Weimer X-Git-Refname: refs/heads/release/2.34/master X-Git-Oldrev: 1e7b011f87c653ad109b34e675f64e7a5cc3805a X-Git-Newrev: 1a5b9d1a231ae788aac3520dab07dc856e404c69 Message-Id: <20220519130512.E3167384B82C@sourceware.org> Date: Thu, 19 May 2022 13:05:12 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 May 2022 13:05:13 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=1a5b9d1a231ae788aac3520dab07dc856e404c69 commit 1a5b9d1a231ae788aac3520dab07dc856e404c69 Author: Florian Weimer Date: Wed May 4 15:37:21 2022 +0200 i386: Honor I386_USE_SYSENTER for 6-argument Linux system calls Introduce an int-80h-based version of __libc_do_syscall and use it if I386_USE_SYSENTER is defined as 0. Reviewed-by: H.J. Lu (cherry picked from commit 60f0f2130d30cfd008ca39743027f1e200592dff) Diff: --- sysdeps/unix/sysv/linux/i386/Makefile | 2 +- .../unix/sysv/linux/i386/libc-do-syscall-int80.S | 25 ++++++++++++++++++++++ sysdeps/unix/sysv/linux/i386/sysdep.h | 13 +++++++++-- 3 files changed, 37 insertions(+), 3 deletions(-) diff --git a/sysdeps/unix/sysv/linux/i386/Makefile b/sysdeps/unix/sysv/linux/i386/Makefile index abd0009d58..e379a2e767 100644 --- a/sysdeps/unix/sysv/linux/i386/Makefile +++ b/sysdeps/unix/sysv/linux/i386/Makefile @@ -14,7 +14,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 + . */ + +#ifndef SHARED +# define I386_USE_SYSENTER 0 +# include + +# 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 39d6a3c134..4c6358c7fe 100644 --- a/sysdeps/unix/sysv/linux/i386/sysdep.h +++ b/sysdeps/unix/sysv/linux/i386/sysdep.h @@ -43,6 +43,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, @@ -302,7 +311,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") @@ -316,7 +325,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")