Changeset 1a5eca4 in mainline for kernel/arch/amd64/include

Timestamp:

2016-04-27T19:36:56Z (10 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

af9dd1e

Parents:

d6f9fff

Message:

amd64: Make TLS settable from uspace

The TLS document[1] mandates that %fs[0] is the thread pointer on amd64.
That is good as it allows userspace-only TLS management for fibrils:
fibril_save/restore() simply manipulate the thread pointer in %fs:0 and
don't need to ask the kernel to modify %fs's base. The kernel treats
%fs:0 as another preserved register and preserves it across context
switches. GCC gets in the way a little bit because it by default assumes
that TLS is accessible from negative %fs offsets (which would
necessitate a kernel-assisted solution). Fortunately, there is a GCC
option to suppress this assumption.

• Introduce the concept of virtual registers, with VREG_TP (thread pointer) being the first of them
• Preserve VREG_TP in context_save/restore()
• Stop using sys_tls_set() in favour of using %fs:0 as the thread pointer
• Make GCC generate code that always goes through %gs:0 to access TLS
• Introduce kseg: a per-CPU area accessible from GS_KERNEL that holds the kernel stack, kernel FS base and a scratch space for syscall and int handlers to use

[1] Drepper, U.: ELF Handling For Thread-Local Storage

Location:

kernel/arch/amd64/include/arch

Files:

• asm.h (modified) (1 diff)
• context_struct.ag (modified) (1 diff)
• cpu.h (modified) (1 diff)
• kseg.h (added)
• kseg_struct.ag (added)
• proc/thread.h (modified) (1 diff)
• vreg.h (added)

kernel/arch/amd64/include/arch/asm.h

@@ -206 +206 @@
         } else
                 *port = val;
-}
-
-/** Swap Hidden part of GS register with visible one */
-NO_TRACE static inline void swapgs(void)
-{
-        asm volatile (
-                "swapgs"
-        );
 }
 

kernel/arch/amd64/include/arch/context_struct.ag

@@ -75 +75 @@
                         type : uint64_t
                 },
+                {
+                        name : tp,
+                        type : uint64_t
+                },
 
                 {

kernel/arch/amd64/include/arch/cpu.h

@@ -56 +56 @@
 
 /* MSR registers */
-#define AMD_MSR_STAR    0xc0000081
-#define AMD_MSR_LSTAR   0xc0000082
-#define AMD_MSR_SFMASK  0xc0000084
-#define AMD_MSR_FS      0xc0000100
-#define AMD_MSR_GS      0xc0000101
+#define AMD_MSR_STAR            0xc0000081
+#define AMD_MSR_LSTAR           0xc0000082
+#define AMD_MSR_SFMASK          0xc0000084
+#define AMD_MSR_FS              0xc0000100
+#define AMD_MSR_GS              0xc0000101
+#define AMD_MSR_GS_KERNEL       0xc0000102
 
 #ifndef __ASM__

kernel/arch/amd64/include/arch/proc/thread.h

@@ -36 +36 @@
 #define KERN_amd64_THREAD_H_
 
-/* CAUTION: keep these in sync with low level assembly code in syscall_entry */
-#define SYSCALL_USTACK_RSP  0
-#define SYSCALL_KSTACK_RSP  1
+#include <typedefs.h>
 
 typedef struct {
-        sysarg_t tls;
-        /** User and kernel RSP for syscalls. */
-        uint64_t syscall_rsp[2];
+        uint64_t kstack_rsp;
 } thread_arch_t;