 @@ -1,14 +1,14 @@
-/*	$NetBSD: dbregs.c,v 1.14 2019/01/14 18:54:07 maxv Exp $	*/
+/*	$NetBSD: dbregs.c,v 1.15 2020/01/31 08:55:38 maxv Exp $	*/
 /*
  * Copyright (c) 2016 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -287,33 +287,30 @@ x86_dbregs_write(struct lwp *l, const st
 	memcpy(pcb->pcb_dbregs, regs, sizeof(*regs));
 	pcb->pcb_flags |= PCB_DBREGS;
+}
 /*
  * Called with preemption disabled.
  */
 void
 x86_dbregs_switch(struct lwp *oldlwp, struct lwp *newlwp)
+{
 	struct pcb *oldpcb, *newpcb;
 	bool olddb, newdb;
-	oldpcb = (oldlwp != NULL) ? lwp_getpcb(oldlwp) : NULL;
+	oldpcb = lwp_getpcb(oldlwp);
 	newpcb = lwp_getpcb(newlwp);
-	olddb = false;
+	olddb = (oldpcb->pcb_flags & PCB_DBREGS) != 0;
 	if (oldpcb) {
 		olddb = (oldpcb->pcb_flags & PCB_DBREGS) != 0;
 	newdb = (newpcb->pcb_flags & PCB_DBREGS) != 0;
 	if (__predict_true(!olddb && !newdb)) {
 		/* fast path */
 		return;
+	}
 	if (olddb) {
 		x86_dbregs_save(oldlwp);
+	}
 	if (newdb) {
 		x86_dbregs_restore(newlwp);
 	} else if (olddb) {

 @@ -1,14 +1,14 @@
-/*	$NetBSD: fpu.c,v 1.60 2019/11/27 06:24:33 maxv Exp $	*/
+/*	$NetBSD: fpu.c,v 1.61 2020/01/31 08:55:38 maxv Exp $	*/
 /*
  * Copyright (c) 2008, 2019 The NetBSD Foundation, Inc.  All
  * rights reserved.
+ *
  * This code is derived from software developed for The NetBSD Foundation
  * by Andrew Doran and Maxime Villard.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -86,27 +86,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)npx.c	7.2 (Berkeley) 5/12/91
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.60 2019/11/27 06:24:33 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.61 2020/01/31 08:55:38 maxv Exp $");
 #include "opt_multiprocessor.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
 #include <sys/cpu.h>
 #include <sys/file.h>
 #include <sys/proc.h>
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
 #include <sys/xcall.h>
 @@ -291,27 +291,27 @@ fpu_area_restore(void *area, uint64_t xs
 void
 fpu_handle_deferred(void)
+{
 	struct pcb *pcb = lwp_getpcb(curlwp);
 	fpu_area_restore(&pcb->pcb_savefpu, x86_xsave_features);
+}
 void
 fpu_switch(struct lwp *oldlwp, struct lwp *newlwp)
+{
 	struct pcb *pcb;
-	if ((oldlwp != NULL) && (oldlwp->l_md.md_flags & MDL_FPU_IN_CPU)) {
+	if (oldlwp->l_md.md_flags & MDL_FPU_IN_CPU) {
 		KASSERT(!(oldlwp->l_flag & LW_SYSTEM));
 		pcb = lwp_getpcb(oldlwp);
 		fpu_area_save(&pcb->pcb_savefpu, x86_xsave_features);
 		oldlwp->l_md.md_flags &= ~MDL_FPU_IN_CPU;
+	}
 	KASSERT(!(newlwp->l_md.md_flags & MDL_FPU_IN_CPU));
+}
 void
 fpu_lwp_fork(struct lwp *l1, struct lwp *l2)
+{
 	struct pcb *pcb2 = lwp_getpcb(l2);
 	union savefpu *fpu_save;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: spectre.c,v 1.32 2019/12/12 16:49:20 maxv Exp $	*/
+/*	$NetBSD: spectre.c,v 1.33 2020/01/31 08:55:38 maxv Exp $	*/
 /*
  * Copyright (c) 2018-2019 NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Maxime Villard.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -24,27 +24,27 @@
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * Mitigations for the SpectreV2, SpectreV4, MDS and TAA CPU flaws.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spectre.c,v 1.32 2019/12/12 16:49:20 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spectre.c,v 1.33 2020/01/31 08:55:38 maxv Exp $");
 #include "opt_spectre.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/cpu.h>
 #include <sys/sysctl.h>
 #include <sys/xcall.h>
 #include <machine/cpufunc.h>
 #include <machine/cpuvar.h>
 #include <machine/specialreg.h>
 #include <machine/frameasm.h>
 @@ -956,28 +956,27 @@ void speculation_barrier(struct lwp *, s
 void
 speculation_barrier(struct lwp *oldlwp, struct lwp *newlwp)
+{
 	/*
 	 * Speculation barriers are applicable only to Spectre V2.
 	 */
 	if (!v2_mitigation_enabled)
 		return;
 	/*
 	 * From kernel thread to kernel thread, no need for a barrier.
 	 */
-	if ((oldlwp != NULL && (oldlwp->l_flag & LW_SYSTEM)) &&
+	if ((oldlwp->l_flag & LW_SYSTEM) && (newlwp->l_flag & LW_SYSTEM))
 	    (newlwp->l_flag & LW_SYSTEM))
 		return;
 	switch (v2_mitigation_method) {
 	case V2_MITIGATION_INTEL_IBRS:
 		wrmsr(MSR_IA32_PRED_CMD, IA32_PRED_CMD_IBPB);
 		break;
 	default:
 		/* nothing */
 		break;
+	}
+}
 /*

 @@ -1,14 +1,14 @@
-/*	$NetBSD: svs.c,v 1.31 2019/12/08 20:42:48 ad Exp $	*/
+/*	$NetBSD: svs.c,v 1.32 2020/01/31 08:55:38 maxv Exp $	*/
 /*
  * Copyright (c) 2018-2019 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Maxime Villard.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -20,27 +20,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: svs.c,v 1.31 2019/12/08 20:42:48 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svs.c,v 1.32 2020/01/31 08:55:38 maxv Exp $");
 #include "opt_svs.h"
 #include "opt_user_ldt.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/cpu.h>
 #include <sys/kauth.h>
 #include <sys/sysctl.h>
 #include <sys/xcall.h>
 #include <sys/reboot.h>
 @@ -530,27 +530,27 @@ svs_lwp_switch(struct lwp *oldlwp, struc
+{
 	struct cpu_info *ci = curcpu();
 	struct svs_utls *utls;
 	struct pcb *pcb;
 	pt_entry_t *pte;
 	uintptr_t rsp0;
 	vaddr_t va;
 	if (newlwp->l_flag & LW_SYSTEM) {
 		return;
+	}
 #ifdef DIAGNOSTIC
-	if (oldlwp != NULL && !(oldlwp->l_flag & LW_SYSTEM)) {
+	if (!(oldlwp->l_flag & LW_SYSTEM)) {
 		pcb = lwp_getpcb(oldlwp);
 		rsp0 = pcb->pcb_rsp0;
 		va = rounddown(rsp0, PAGE_SIZE);
 		KASSERT(ci->ci_svs_krsp0 == rsp0 - sizeof(struct trapframe));
 		pte = ci->ci_svs_rsp0_pte;
 		KASSERT(*pte == L1_BASE[pl1_i(va)]);
+	}
 #endif
 	pcb = lwp_getpcb(newlwp);
 	rsp0 = pcb->pcb_rsp0;
 	va = rounddown(rsp0, PAGE_SIZE);