[src/trunk]: src/sys/arch x86: abort pageidlezero unconditionally if there is...

[ad <ad%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c0d2e656fa50
branches:  trunk
changeset: 461284:c0d2e656fa50
user:      ad <ad%NetBSD.org@localhost>
date:      Thu Nov 21 19:27:54 2019 +0000

description:
x86: abort pageidlezero unconditionally if there is something to run.

diffstat:

 sys/arch/amd64/amd64/genassym.cf |  4 +---
 sys/arch/amd64/amd64/locore.S    |  4 ++--
 sys/arch/i386/i386/genassym.cf   |  4 +---
 sys/arch/i386/i386/locore.S      |  6 +++---
 4 files changed, 7 insertions(+), 11 deletions(-)

diffs (79 lines):

diff -r 0c27a9605f9f -r c0d2e656fa50 sys/arch/amd64/amd64/genassym.cf
--- a/sys/arch/amd64/amd64/genassym.cf  Thu Nov 21 19:23:58 2019 +0000
+++ b/sys/arch/amd64/amd64/genassym.cf  Thu Nov 21 19:27:54 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: genassym.cf,v 1.77 2019/10/12 06:31:03 maxv Exp $
+#      $NetBSD: genassym.cf,v 1.78 2019/11/21 19:27:54 ad Exp $
 
 #
 # Copyright (c) 1998, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -385,6 +385,4 @@
 
 define VM_SPACE_SEP_HIGH32     (0xFFFF800000000000 >> 32)
 
-define RESCHED_KPREEMPT        RESCHED_KPREEMPT
-
 define SEL_RPL_MASK            SEL_RPL
diff -r 0c27a9605f9f -r c0d2e656fa50 sys/arch/amd64/amd64/locore.S
--- a/sys/arch/amd64/amd64/locore.S     Thu Nov 21 19:23:58 2019 +0000
+++ b/sys/arch/amd64/amd64/locore.S     Thu Nov 21 19:27:54 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore.S,v 1.190 2019/11/14 16:23:52 maxv Exp $        */
+/*     $NetBSD: locore.S,v 1.191 2019/11/21 19:27:54 ad Exp $  */
 
 /*
  * Copyright-o-rama!
@@ -1491,7 +1491,7 @@
        xorq    %rax, %rax
        .align  16
 1:
-       testl   $RESCHED_KPREEMPT, CPUVAR(RESCHED)
+       cmpl    $0, CPUVAR(RESCHED)
        jnz     2f
        movnti  %rax, 0(%rdi)
        movnti  %rax, 8(%rdi)
diff -r 0c27a9605f9f -r c0d2e656fa50 sys/arch/i386/i386/genassym.cf
--- a/sys/arch/i386/i386/genassym.cf    Thu Nov 21 19:23:58 2019 +0000
+++ b/sys/arch/i386/i386/genassym.cf    Thu Nov 21 19:27:54 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: genassym.cf,v 1.114 2019/10/12 06:31:03 maxv Exp $
+#      $NetBSD: genassym.cf,v 1.115 2019/11/21 19:27:54 ad Exp $
 
 #
 # Copyright (c) 1998, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -376,8 +376,6 @@
 define PGOFSET                 PGOFSET
 define PGSHIFT                 PGSHIFT
 
-define RESCHED_KPREEMPT        RESCHED_KPREEMPT
-
 ifdef XEN
 define CPU_INFO_VCPU           offsetof(struct cpu_info, ci_vcpu)
 define CPU_INFO_XPENDING       offsetof(struct cpu_info, ci_xpending)
diff -r 0c27a9605f9f -r c0d2e656fa50 sys/arch/i386/i386/locore.S
--- a/sys/arch/i386/i386/locore.S       Thu Nov 21 19:23:58 2019 +0000
+++ b/sys/arch/i386/i386/locore.S       Thu Nov 21 19:27:54 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore.S,v 1.173 2019/10/18 01:38:28 manu Exp $        */
+/*     $NetBSD: locore.S,v 1.174 2019/11/21 19:27:54 ad Exp $  */
 
 /*
  * Copyright-o-rama!
@@ -128,7 +128,7 @@
  */
 
 #include <machine/asm.h>
-__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.173 2019/10/18 01:38:28 manu Exp $");
+__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.174 2019/11/21 19:27:54 ad Exp $");
 
 #include "opt_copy_symtab.h"
 #include "opt_ddb.h"
@@ -1590,7 +1590,7 @@
        xorl    %eax, %eax
        .align  16
 1:
-       testl   $RESCHED_KPREEMPT, CPUVAR(RESCHED)
+       cmpl    $0, CPUVAR(RESCHED)
        jnz     2f
        movnti  %eax, 0(%edx)
        movnti  %eax, 4(%edx)