Module Name: src
Committed By: ad
Date: Sun May 17 14:15:55 UTC 2020
Modified Files:
src/sys/arch/amd64/amd64: vector.S
src/sys/arch/i386/i386: vector.S
Log Message:
Flag EOI on TLB shootdown IPIs after the shootdown has been processed.
To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 src/sys/arch/amd64/amd64/vector.S
cvs rdiff -u -r1.86 -r1.87 src/sys/arch/i386/i386/vector.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/amd64/vector.S
diff -u src/sys/arch/amd64/amd64/vector.S:1.76 src/sys/arch/amd64/amd64/vector.S:1.77
--- src/sys/arch/amd64/amd64/vector.S:1.76 Fri May 1 07:03:02 2020
+++ src/sys/arch/amd64/amd64/vector.S Sun May 17 14:15:55 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: vector.S,v 1.76 2020/05/01 07:03:02 maxv Exp $ */
+/* $NetBSD: vector.S,v 1.77 2020/05/17 14:15:55 ad Exp $ */
/*
* Copyright (c) 1998, 2007, 2008 The NetBSD Foundation, Inc.
@@ -314,21 +314,21 @@ IDTVEC_END(intr_hyperv_hypercall)
* TLB shootdown handler.
*/
IDTVEC(handle_lapic_tlb)
- movq _C_LABEL(local_apic_va),%rax
- movl $0,LAPIC_EOI(%rax)
KCOV_DISABLE
callq _C_LABEL(pmap_tlb_intr)
KCOV_ENABLE
+ movq _C_LABEL(local_apic_va),%rax
+ movl $0,LAPIC_EOI(%rax)
INTRFASTEXIT
IDTVEC_END(handle_lapic_tlb)
IDTVEC(handle_x2apic_tlb)
+ KCOV_DISABLE
+ callq _C_LABEL(pmap_tlb_intr)
+ KCOV_ENABLE
movl $(MSR_X2APIC_BASE + MSR_X2APIC_EOI),%ecx
xorl %eax,%eax
xorl %edx,%edx
wrmsr
- KCOV_DISABLE
- callq _C_LABEL(pmap_tlb_intr)
- KCOV_ENABLE
INTRFASTEXIT
IDTVEC_END(handle_x2apic_tlb)
Index: src/sys/arch/i386/i386/vector.S
diff -u src/sys/arch/i386/i386/vector.S:1.86 src/sys/arch/i386/i386/vector.S:1.87
--- src/sys/arch/i386/i386/vector.S:1.86 Sat Apr 25 15:26:17 2020
+++ src/sys/arch/i386/i386/vector.S Sun May 17 14:15:55 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: vector.S,v 1.86 2020/04/25 15:26:17 bouyer Exp $ */
+/* $NetBSD: vector.S,v 1.87 2020/05/17 14:15:55 ad Exp $ */
/*
* Copyright 2002 (c) Wasabi Systems, Inc.
@@ -65,7 +65,7 @@
*/
#include <machine/asm.h>
-__KERNEL_RCSID(0, "$NetBSD: vector.S,v 1.86 2020/04/25 15:26:17 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vector.S,v 1.87 2020/05/17 14:15:55 ad Exp $");
#include "opt_ddb.h"
#include "opt_multiprocessor.h"
@@ -201,9 +201,9 @@ IDTVEC(intr_lapic_tlb)
pushl $0
pushl $T_ASTFLT
INTRENTRY
+ call _C_LABEL(pmap_tlb_intr)
movl _C_LABEL(local_apic_va),%eax
movl $0,LAPIC_EOI(%eax)
- call _C_LABEL(pmap_tlb_intr)
INTRFASTEXIT
IDTVEC_END(intr_lapic_tlb)
@@ -211,11 +211,11 @@ IDTVEC(intr_x2apic_tlb)
pushl $0
pushl $T_ASTFLT
INTRENTRY
+ call _C_LABEL(pmap_tlb_intr)
movl $(MSR_X2APIC_BASE + MSR_X2APIC_EOI),%ecx
xorl %eax,%eax
xorl %edx,%edx
wrmsr
- call _C_LABEL(pmap_tlb_intr)
INTRFASTEXIT
IDTVEC_END(intr_x2apic_tlb)
