Module Name: src Committed By: ad Date: Thu Nov 21 19:27:54 UTC 2019
Modified Files: src/sys/arch/amd64/amd64: genassym.cf locore.S src/sys/arch/i386/i386: genassym.cf locore.S Log Message: x86: abort pageidlezero unconditionally if there is something to run. To generate a diff of this commit: cvs rdiff -u -r1.77 -r1.78 src/sys/arch/amd64/amd64/genassym.cf cvs rdiff -u -r1.190 -r1.191 src/sys/arch/amd64/amd64/locore.S cvs rdiff -u -r1.114 -r1.115 src/sys/arch/i386/i386/genassym.cf cvs rdiff -u -r1.173 -r1.174 src/sys/arch/i386/i386/locore.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/genassym.cf diff -u src/sys/arch/amd64/amd64/genassym.cf:1.77 src/sys/arch/amd64/amd64/genassym.cf:1.78 --- src/sys/arch/amd64/amd64/genassym.cf:1.77 Sat Oct 12 06:31:03 2019 +++ src/sys/arch/amd64/amd64/genassym.cf Thu Nov 21 19:27:54 2019 @@ -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 PGSHIFT PGSHIFT define VM_SPACE_SEP_HIGH32 (0xFFFF800000000000 >> 32) -define RESCHED_KPREEMPT RESCHED_KPREEMPT - define SEL_RPL_MASK SEL_RPL Index: src/sys/arch/amd64/amd64/locore.S diff -u src/sys/arch/amd64/amd64/locore.S:1.190 src/sys/arch/amd64/amd64/locore.S:1.191 --- src/sys/arch/amd64/amd64/locore.S:1.190 Thu Nov 14 16:23:52 2019 +++ src/sys/arch/amd64/amd64/locore.S Thu Nov 21 19:27:54 2019 @@ -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 @@ ENTRY(sse2_idlezero_page) 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) Index: src/sys/arch/i386/i386/genassym.cf diff -u src/sys/arch/i386/i386/genassym.cf:1.114 src/sys/arch/i386/i386/genassym.cf:1.115 --- src/sys/arch/i386/i386/genassym.cf:1.114 Sat Oct 12 06:31:03 2019 +++ src/sys/arch/i386/i386/genassym.cf Thu Nov 21 19:27:54 2019 @@ -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 L2_FRAME L2_FRAME 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) Index: src/sys/arch/i386/i386/locore.S diff -u src/sys/arch/i386/i386/locore.S:1.173 src/sys/arch/i386/i386/locore.S:1.174 --- src/sys/arch/i386/i386/locore.S:1.173 Fri Oct 18 01:38:28 2019 +++ src/sys/arch/i386/i386/locore.S Thu Nov 21 19:27:54 2019 @@ -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 @@ ENTRY(sse2_idlezero_page) 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)