Module Name: src
Committed By: maxv
Date: Fri Jan 31 08:55:38 UTC 2020
Modified Files:
src/sys/arch/x86/x86: dbregs.c fpu.c spectre.c svs.c
Log Message:
'oldlwp' is never NULL now, so remove the NULL checks.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/x86/x86/dbregs.c
cvs rdiff -u -r1.60 -r1.61 src/sys/arch/x86/x86/fpu.c
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/x86/x86/spectre.c
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/x86/x86/svs.c
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/x86/x86/dbregs.c
diff -u src/sys/arch/x86/x86/dbregs.c:1.14 src/sys/arch/x86/x86/dbregs.c:1.15
--- src/sys/arch/x86/x86/dbregs.c:1.14 Mon Jan 14 18:54:07 2019
+++ src/sys/arch/x86/x86/dbregs.c Fri Jan 31 08:55:38 2020
@@ -1,4 +1,4 @@
-/* $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.
@@ -297,13 +297,10 @@ x86_dbregs_switch(struct lwp *oldlwp, st
struct pcb *oldpcb, *newpcb;
bool olddb, newdb;
- oldpcb = (oldlwp != NULL) ? lwp_getpcb(oldlwp) : NULL;
+ oldpcb = lwp_getpcb(oldlwp);
newpcb = lwp_getpcb(newlwp);
- olddb = false;
- if (oldpcb) {
- olddb = (oldpcb->pcb_flags & PCB_DBREGS) != 0;
- }
+ olddb = (oldpcb->pcb_flags & PCB_DBREGS) != 0;
newdb = (newpcb->pcb_flags & PCB_DBREGS) != 0;
if (__predict_true(!olddb && !newdb)) {
Index: src/sys/arch/x86/x86/fpu.c
diff -u src/sys/arch/x86/x86/fpu.c:1.60 src/sys/arch/x86/x86/fpu.c:1.61
--- src/sys/arch/x86/x86/fpu.c:1.60 Wed Nov 27 06:24:33 2019
+++ src/sys/arch/x86/x86/fpu.c Fri Jan 31 08:55:38 2020
@@ -1,4 +1,4 @@
-/* $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
@@ -96,7 +96,7 @@
*/
#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"
@@ -301,7 +301,7 @@ fpu_switch(struct lwp *oldlwp, struct lw
{
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);
Index: src/sys/arch/x86/x86/spectre.c
diff -u src/sys/arch/x86/x86/spectre.c:1.32 src/sys/arch/x86/x86/spectre.c:1.33
--- src/sys/arch/x86/x86/spectre.c:1.32 Thu Dec 12 16:49:20 2019
+++ src/sys/arch/x86/x86/spectre.c Fri Jan 31 08:55:38 2020
@@ -1,4 +1,4 @@
-/* $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.
@@ -34,7 +34,7 @@
*/
#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"
@@ -966,8 +966,7 @@ speculation_barrier(struct lwp *oldlwp,
/*
* From kernel thread to kernel thread, no need for a barrier.
*/
- if ((oldlwp != NULL && (oldlwp->l_flag & LW_SYSTEM)) &&
- (newlwp->l_flag & LW_SYSTEM))
+ if ((oldlwp->l_flag & LW_SYSTEM) && (newlwp->l_flag & LW_SYSTEM))
return;
switch (v2_mitigation_method) {
Index: src/sys/arch/x86/x86/svs.c
diff -u src/sys/arch/x86/x86/svs.c:1.31 src/sys/arch/x86/x86/svs.c:1.32
--- src/sys/arch/x86/x86/svs.c:1.31 Sun Dec 8 20:42:48 2019
+++ src/sys/arch/x86/x86/svs.c Fri Jan 31 08:55:38 2020
@@ -1,4 +1,4 @@
-/* $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.
@@ -30,7 +30,7 @@
*/
#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"
@@ -540,7 +540,7 @@ svs_lwp_switch(struct lwp *oldlwp, struc
}
#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);
