Skip to contentSkip to conversation

x86/asm changes for v2.6.37

GIT PULL Ingo Molnar 3 participants 3 messages Oct 21, 2010 x86

lore
Share & tools
lore
#0 lore raw

Linus,

Please pull the latest x86-asm-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git x86-asm-for-linus

Thanks,

Ingo

------------------>
H. Peter Anvin (1):
x86-64, asm: If the assembler supports fxsave64, use it

Jan Beulich (1):
i386: Make kernel_execve() suitable for stack unwinding

 arch/x86/Makefile             |    8 ++++++--
 arch/x86/include/asm/i387.h   |    2 +-
 arch/x86/kernel/sys_i386_32.c |    4 ++--
 3 files changed, 9 insertions(+), 5 deletions(-)
arch/x86/Makefile +6 -2
index 8aa1b59..40668a9 100644
@@ -96,8 +96,12 @@ cfi := $(call as-instr,.cfi_startproc\n.cfi_rel_offset $(sp-y)$(comma)0\n.cfi_en
 # is .cfi_signal_frame supported too?
 cfi-sigframe := $(call as-instr,.cfi_startproc\n.cfi_signal_frame\n.cfi_endproc,-DCONFIG_AS_CFI_SIGNAL_FRAME=1)
 cfi-sections := $(call as-instr,.cfi_sections .debug_frame,-DCONFIG_AS_CFI_SECTIONS=1)
-KBUILD_AFLAGS += $(cfi) $(cfi-sigframe) $(cfi-sections)
-KBUILD_CFLAGS += $(cfi) $(cfi-sigframe) $(cfi-sections)
+
+# does binutils support specific instructions?
+asinstr := $(call as-instr,fxsaveq (%rax),-DCONFIG_AS_FXSAVEQ=1)
+
+KBUILD_AFLAGS += $(cfi) $(cfi-sigframe) $(cfi-sections) $(asinstr)
+KBUILD_CFLAGS += $(cfi) $(cfi-sigframe) $(cfi-sections) $(asinstr)
 
 LDFLAGS := -m elf_$(UTS_MACHINE)
 
arch/x86/include/asm/i387.h +1 -1
index a73a8d5..70f105b 100644
@@ -175,7 +175,7 @@ static inline void fpu_fxsave(struct fpu *fpu)
 	   uses any extended registers for addressing, a second REX prefix
 	   will be generated (to the assembler, rex64 followed by semicolon
 	   is a separate instruction), and hence the 64-bitness is lost. */
-#if 0
+#ifdef CONFIG_AS_FXSAVEQ
 	/* Using "fxsaveq %0" would be the ideal choice, but is only supported
 	   starting with gas 2.16. */
 	__asm__ __volatile__("fxsaveq %0"
arch/x86/kernel/sys_i386_32.c +2 -2
index d5e0662..0b0cb5f 100644
@@ -33,8 +33,8 @@ int kernel_execve(const char *filename,
 		  const char *const envp[])
 {
 	long __res;
-	asm volatile ("push %%ebx ; movl %2,%%ebx ; int $0x80 ; pop %%ebx"
+	asm volatile ("int $0x80"
 	: "=a" (__res)
-	: "0" (__NR_execve), "ri" (filename), "c" (argv), "d" (envp) : "memory");
+	: "0" (__NR_execve), "b" (filename), "c" (argv), "d" (envp) : "memory");
 	return __res;
 }
#1 lore raw
Quoted 4 lines · Ingo Molnar

Jan Beulich (1):
     i386: Make kernel_execve() suitable for stack unwinding

Quoted 8 lines

       long __res;
-       asm volatile ("push %%ebx ; movl %2,%%ebx ; int $0x80 ; pop %%ebx"
+       asm volatile ("int $0x80"
       : "=a" (__res)
-       : "0" (__NR_execve), "ri" (filename), "c" (argv), "d" (envp) : "memory");
+       : "0" (__NR_execve), "b" (filename), "c" (argv), "d" (envp) : "memory"); return __res;
 }

I pulled this, but there's a reason we used to do it that way - gcc has had bugs with inline asm changing %ebx due to some bad interaction with using it as the GOT base register for position-independent code or something.

So I hope those are all solved, and I guess we use -fPIC only for some early boot code. But in case this is ever used in some environment that is PIC (the vsyscall page?) we need to worry about gcc interactions.

Linus

#2 lore raw
Quoted 19 lines · Linus Torvalds

arch/x86/kernel/sys_i386_32.c int kernel_execve(const char *filename, · line 40

Quoted 12 lines · Ingo Molnar

Jan Beulich (1):
i386: Make kernel_execve() suitable for stack unwinding

long __res;

arch/x86/kernel/sys_i386_32.c +2 -2
-       asm volatile ("push %%ebx ; movl %2,%%ebx ; int $0x80 ; pop %%ebx"
+       asm volatile ("int $0x80"
       : "=a" (__res)
-       : "0" (__NR_execve), "ri" (filename), "c" (argv), "d" (envp) : "memory");
+       : "0" (__NR_execve), "b" (filename), "c" (argv), "d" (envp) : "memory");
       return __res;
 }

I pulled this, but there's a reason we used to do it that way - gcc has had bugs with inline asm changing %ebx due to some bad interaction with using it as the GOT base register for position-independent code or something.

Quoted 5 lines

So I hope those are all solved, and I guess we use -fPIC only for some early boot code. But in case this is ever used in some environment that is PIC (the vsyscall page?) we need to worry about gcc interactions.

We used to allow these macros to be used from user space; we don't anymore. The vsyscall page is PIC, but we wouldn't be calling kernel_execve() from there.

The good part is that gcc will fail to compile if we ever violate the assumptions; we won't see quiet failures.

-hpa