31 Aug
2006
31 Aug
'06
5:25 a.m.
Author: ion
Date: Thu Aug 31 09:25:58 2006
New Revision: 23833
URL: http://svn.reactos.org/svn/reactos?rev=23833&view=rev
Log:
- Don't do fast system calls with the wrong DS/ES selectors.
- Properly load DS/ES on system startup and GDT load
- Use proper DS/ES during deprecated IRQ handling.
- Always use GS as 0 for all of the above.
- *FINALLY* fixes the oldest bug there ever was -> DS/ES corruption noticed in VMWare
(And recently in QEMU+KERNELKQEMU, since it behaves internally like vmware). Hacks in trap
code have FINALLY been removed!
Modified:
trunk/reactos/ntoskrnl/KrnlFun.c
trunk/reactos/ntoskrnl/deprecated/irqhand.S
trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S
trunk/reactos/ntoskrnl/ke/i386/gdt.c
trunk/reactos/ntoskrnl/ke/i386/main_asm.S
trunk/reactos/ntoskrnl/ke/i386/trap.s
Modified: trunk/reactos/ntoskrnl/KrnlFun.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/KrnlFun.c?rev=238…
==============================================================================
--- trunk/reactos/ntoskrnl/KrnlFun.c (original)
+++ trunk/reactos/ntoskrnl/KrnlFun.c Thu Aug 31 09:25:58 2006
@@ -28,8 +28,6 @@
// - Get rid of KiRosPrintAddress and use KiDumpParameterImages instead.
// - Sanitize some context fields during conversions.
// - Implement stack fault and segment fault handlers.
-// - Figure out why ES/DS gets messed up in VMWare, when doing KiServiceExit only,
-// and only when called from user-mode, and returning to user-mode.
// - Add DR macro/save and VM macro/save.
// - Implement KiCallbackReturn, KiGetTickCount, KiRaiseAssertion.
//
Modified: trunk/reactos/ntoskrnl/deprecated/irqhand.S
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/deprecated/irqhan…
==============================================================================
--- trunk/reactos/ntoskrnl/deprecated/irqhand.S (original)
+++ trunk/reactos/ntoskrnl/deprecated/irqhand.S Thu Aug 31 09:25:58 2006
@@ -8,10 +8,20 @@
pushl %fs
pushl %gs
pushl $0xceafbeef
- movl $KGDT_R0_DATA,%eax
- movl %eax,%ds
- movl %eax,%es
- movl %eax,%gs
+
+ /* Load DS/ES (with override) */
+ .intel_syntax noprefix
+ mov eax, KGDT_R3_DATA + RPL_MASK
+ .byte 0x66
+ mov ds, ax
+ .byte 0x66
+ mov es, ax
+
+ /* Clear gs */
+ xor eax, eax
+ .byte 0x66
+ mov gs, ax
+ .att_syntax
movl $KGDT_R0_PCR,%eax
movl %eax,%fs
pushl %esp
Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/ctxswitch…
==============================================================================
--- trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S (original)
+++ trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S Thu Aug 31 09:25:58 2006
@@ -291,7 +291,7 @@
@KiSwapContextInternal@0:
/* Set the Thread to running */
- mov byte ptr [esi+KTHREAD_STATE], Running
+ mov byte ptr es:[esi+KTHREAD_STATE], Running
/* Save the IRQL */
push ecx
Modified: trunk/reactos/ntoskrnl/ke/i386/gdt.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/gdt.c?rev…
==============================================================================
--- trunk/reactos/ntoskrnl/ke/i386/gdt.c (original)
+++ trunk/reactos/ntoskrnl/ke/i386/gdt.c Thu Aug 31 09:25:58 2006
@@ -115,9 +115,10 @@
__asm__ ("movl %0, %%ds\n\t"
"movl %0, %%es\n\t"
"movl %1, %%fs\n\t"
- "movl %0, %%gs\n\t"
+ "xor %%ax, %%ax\n\t"
+ "movw %%ax, %%gs\n\t"
: /* no output */
- : "a" (KGDT_R0_DATA), "d" (KGDT_R0_PCR));
+ : "a" (KGDT_R3_DATA | RPL_MASK), "d" (KGDT_R0_PCR));
__asm__ ("pushl %0\n\t"
"pushl $.l4\n\t"
"lret\n\t"
@@ -128,11 +129,12 @@
__asm
{
lgdt Descriptor;
- mov ax, KGDT_R0_DATA;
+ mov ax, KGDT_R3_DATA | RPL_MASK;
mov dx, KGDT_R0_PCR;
mov ds, ax;
mov es, ax;
mov fs, dx;
+ xor ax, ax
mov gs, ax;
push KGDT_R0_CODE;
push offset l4 ;
Modified: trunk/reactos/ntoskrnl/ke/i386/main_asm.S
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/main_asm.…
==============================================================================
--- trunk/reactos/ntoskrnl/ke/i386/main_asm.S (original)
+++ trunk/reactos/ntoskrnl/ke/i386/main_asm.S Thu Aug 31 09:25:58 2006
@@ -39,7 +39,16 @@
/* Load the PCR selector */
movl $KGDT_R0_PCR, %eax
movl %eax, %fs
-
+
+ /* Load DS/ES (with override) */
+ .intel_syntax noprefix
+ mov eax, KGDT_R3_DATA + RPL_MASK
+ .byte 0x66
+ mov ds, ax
+ .byte 0x66
+ mov es, ax
+ .att_syntax
+
cmpl $AP_MAGIC, %ecx
jne .m1
Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/trap.s?re…
==============================================================================
--- trunk/reactos/ntoskrnl/ke/i386/trap.s (original)
+++ trunk/reactos/ntoskrnl/ke/i386/trap.s Thu Aug 31 09:25:58 2006
@@ -111,8 +111,8 @@
mov ecx, KGDT_R0_PCR
mov fs, cx
- /* Set DS/ES to Kernel Selector */
- mov ecx, KGDT_R0_DATA
+ /* Set DS/ES to User Selector */
+ mov ecx, KGDT_R3_DATA | RPL_MASK
mov ds, cx
mov es, cx
@@ -157,10 +157,6 @@
/* Skip the other registers */
sub esp, 0x48
-
- /* Hack: it seems that on VMWare someone damages ES/DS on exit. Investigate! */
- mov dword ptr [esp+KTRAP_FRAME_DS], KGDT_R3_DATA + RPL_MASK
- mov dword ptr [esp+KTRAP_FRAME_ES], KGDT_R3_DATA + RPL_MASK
/* Make space for us on the stack */
sub ebp, 0x29C
@@ -335,10 +331,6 @@
/* Check for, and deliver, User-Mode APCs if needed */
CHECK_FOR_APC_DELIVER 1
- /* Hack for VMWare: Sometimes ES/DS seem to be invalid when returning to user-mode.
Investigate! */
- mov es, [ebp+KTRAP_FRAME_ES]
- mov ds, [ebp+KTRAP_FRAME_DS]
-
/* Exit and cleanup */
TRAP_EPILOG FromSystemCall, DoRestorePreviousMode, DoNotRestoreSegments,
DoNotRestoreVolatiles, DoRestoreEverything
.endfunc