This part adds support for sys_indirect on x86 and x86-64.
arch/x86/ia32/ia32entry.S | 1 +
b/arch/x86/kernel/syscall_table_32.S | 1 +
b/include/asm-x86/indirect.h | 5 +++++
b/include/asm-x86/indirect_32.h | 23 +++++++++++++++++++++++
b/include/asm-x86/indirect_64.h | 24 ++++++++++++++++++++++++
b/include/asm-x86/unistd_32.h | 3 ++-
b/include/asm-x86/unistd_64.h | 2 ++
7 files changed, 58 insertions(+), 1 deletion(-)
--- a/arch/x86/ia32/ia32entry.S
+++ b/arch/x86/ia32/ia32entry.S
@@ -726,4 +726,5 @@ ia32_sys_call_table:
.quad compat_sys_timerfd
.quad sys_eventfd
.quad sys32_fallocate
+ .quad sys_indirect /* 325 */
ia32_syscall_end:
diff --git a/arch/x86/kernel/syscall_table_32.S b/arch/x86/kernel/syscall_table_32.S
index 8344c70..92095b2 100644
--- a/arch/x86/kernel/syscall_table_32.S
+++ b/arch/x86/kernel/syscall_table_32.S
@@ -324,3 +324,4 @@ ENTRY(sys_call_table)
.long sys_timerfd
.long sys_eventfd
.long sys_fallocate
+ .long sys_indirect /* 325 */
diff --git a/include/asm-x86/unistd_32.h b/include/asm-x86/unistd_32.h
index 9b15545..8ee0b20 100644
--- a/include/asm-x86/unistd_32.h
+++ b/include/asm-x86/unistd_32.h
@@ -330,10 +330,11 @@
#define __NR_timerfd 322
#define __NR_eventfd 323
#define __NR_fallocate 324
+#define __NR_indirect 325
#ifdef __KERNEL__
-#define NR_syscalls 325
+#define NR_syscalls 326
#define __ARCH_WANT_IPC_PARSE_VERSION
#define __ARCH_WANT_OLD_READDIR
diff --git a/include/asm-x86/unistd_64.h b/include/asm-x86/unistd_64.h
index 5ff4d3e..66eab33 100644
--- a/include/asm-x86/unistd_64.h
+++ b/include/asm-x86/unistd_64.h
@@ -635,6 +635,8 @@ __SYSCALL(__NR_timerfd, sys_timerfd)
__SYSCALL(__NR_eventfd, sys_eventfd)
#define __NR_fallocate 285
__SYSCALL(__NR_fallocate, sys_fallocate)
+#define __NR_indirect 286
+__SYSCALL(__NR_indirect, sys_indirect)
#ifndef __NO_STUBS
#define __ARCH_WANT_OLD_READDIR
diff --git a/include/linux/sched.h b/include/linux/sched.h
index ee800e7..e4e8a22 100644
--- /dev/null 2007-09-23 16:36:38.465394704 -0700
+++ b/include/asm-x86/indirect_32.h 2007-11-15 09:52:47.000000000 -0800
@@ -0,0 +1,23 @@
+#ifndef _ASM_X86_INDIRECT_32_H
+#define _ASM_X86_INDIRECT_32_H
+
+struct indirect_registers {
+ __u32 eax;
+ __u32 ebx;
+ __u32 ecx;
+ __u32 edx;
+ __u32 esi;
+ __u32 edi;
+ __u32 ebp;
+};
+
+#define INDIRECT_SYSCALL(regs) (regs)->eax
+
+#define CALL_INDIRECT(regs) \
+ ({ extern long (*sys_call_table[]) (__u32, __u32, __u32, __u32, __u32, __u32); \
+ sys_call_table[INDIRECT_SYSCALL(regs)->eax] ((regs)->ebx, (regs)->ecx, \
+ (regs)->edx, (regs)->esi, \
+ (regs)->edi, (regs)->ebp); \
+ })
+
+#endif
--- /dev/null 2007-09-23 16:36:38.465394704 -0700
+++ b/include/asm-x86/indirect_64.h 2007-11-15 09:54:55.000000000 -0800
@@ -0,0 +1,24 @@
+#ifndef _ASM_X86_INDIRECT_64_H
+#define _ASM_X86_INDIRECT_64_H
+
+struct indirect_registers {
+ __u64 rax;
+ __u64 rdi;
+ __u64 rsi;
+ __u64 rdx;
+ __u64 r10;
+ __u64 r8;
+ __u64 r9;
+};
+
+
+#define INDIRECT_SYSCALL(regs) (regs)->rax
+
+#define CALL_INDIRECT(regs) \
+ ({ extern long (*sys_call_table[]) (__u64, __u64, __u64, __u64, __u64, __u64); \
+ sys_call_table[INDIRECT_SYSCALL(regs)] ((regs)->rdi, (regs)->rsi, \
+ (regs)->rdx, (regs)->r10, \
+ (regs)->r8, (regs)->r9); \
+ })
+
+#endif
--- /dev/null 2007-09-23 16:36:38.465394704 -0700
+++ b/include/asm-x86/indirect.h 2007-11-14 17:15:58.000000000 -0800
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "indirect_32.h"
+#else
+# include "indirect_64.h"
+#endif
Hello Ulrich,
On Thu, Nov 15, 2007 at 01:22:31PM -0500, Ulrich Drepper wrote:
> diff --git a/include/linux/sched.h b/include/linux/sched.h
> index ee800e7..e4e8a22 100644
> --- /dev/null 2007-09-23 16:36:38.465394704 -0700
> +++ b/include/asm-x86/indirect_32.h 2007-11-15 09:52:47.000000000 -0800
[...]
> +#define INDIRECT_SYSCALL(regs) (regs)->eax
^^^^^
> +
> +#define CALL_INDIRECT(regs) \
> + ({ extern long (*sys_call_table[]) (__u32, __u32, __u32, __u32, __u32, __u32); \
> + sys_call_table[INDIRECT_SYSCALL(regs)->eax] ((regs)->ebx, (regs)->ecx, \
^^^^^-> I take it that ->eax is wrong here?
> + (regs)->edx, (regs)->esi, \
> + (regs)->edi, (regs)->ebp); \
> + })
> +
> +#endif
Regards,
Frederik
* Ulrich Drepper <[email protected]> wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Frederik Deweerdt wrote:
> \>> + sys_call_table[INDIRECT_SYSCALL(regs)->eax] ((regs)->ebx,
> (regs)->ecx, \
> > ^^^^^-> I take it that ->eax is wrong here?
>
> Yep, my bad. I've retired the 32-bit machines around here.
weird - i built it on 32-bit and it should have failed the build?
Ingo
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Frederik Deweerdt wrote:
\>> + sys_call_table[INDIRECT_SYSCALL(regs)->eax] ((regs)->ebx,
(regs)->ecx, \
> ^^^^^-> I take it that ->eax is wrong here?
Yep, my bad. I've retired the 32-bit machines around here.
- --
➧ Ulrich Drepper ➧ Red Hat, Inc. ➧ 444 Castro St ➧ Mountain View, CA ❖
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org
iD8DBQFHPKcp2ijCOnn/RHQRAjqMAKCLra+KisV6inTbPrbLtqruDVKyxACgxRLf
kFDyFNbnhqyj3MUkmzV0S2o=
=HQcV
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Ingo Molnar wrote:
> weird - i built it on 32-bit and it should have failed the build?
Not weird, since I've changed that file after Linus' comment. The
mistake I made was to reuse the old 0/0 mail with your s-o-b line
without asking you again. Sorry.
- --
➧ Ulrich Drepper ➧ Red Hat, Inc. ➧ 444 Castro St ➧ Mountain View, CA ❖
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org
iD8DBQFHPKkm2ijCOnn/RHQRAkY2AKCRfOhk5pUrYuTSMWnBBgu0Ou0fJACfQVz1
qzhRYyWgS1xGQwI2eoHHTgc=
=DkS8
-----END PGP SIGNATURE-----
Ulrich Drepper a ?crit :
> This part adds support for sys_indirect on x86 and x86-64.
>
> arch/x86/ia32/ia32entry.S | 1 +
> b/arch/x86/kernel/syscall_table_32.S | 1 +
> b/include/asm-x86/indirect.h | 5 +++++
> b/include/asm-x86/indirect_32.h | 23 +++++++++++++++++++++++
> b/include/asm-x86/indirect_64.h | 24 ++++++++++++++++++++++++
> b/include/asm-x86/unistd_32.h | 3 ++-
> b/include/asm-x86/unistd_64.h | 2 ++
> 7 files changed, 58 insertions(+), 1 deletion(-)
I am not sure how compat is handled ? (ie running a 32bit task in a 64bit kernel)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Eric Dumazet wrote:
> I am not sure how compat is handled ? (ie running a 32bit task in a
> 64bit kernel)
I already mentioned that I have a patch here. I'll test it first, though.
- --
➧ Ulrich Drepper ➧ Red Hat, Inc. ➧ 444 Castro St ➧ Mountain View, CA ❖
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
iD8DBQFHPQtU2ijCOnn/RHQRAqRYAKCA6x79xzmYxS0WjdoB29+1bIcP4gCgpAj3
VmOkji7I1Ec+FaMeLSf1fSA=
=7jn7
-----END PGP SIGNATURE-----