Module Name: src
Committed By: skrll
Date: Fri Oct 6 11:53:27 UTC 2023
Modified Files:
src/sys/arch/alpha/alpha: vm_machdep.c
src/sys/arch/ia64/ia64: vm_machdep.c
src/sys/arch/sh3/sh3: vm_machdep.c
src/sys/arch/x86/x86: vm_machdep.c
Log Message:
Convert the l2->l_md.md_astpending assignments into KASSERTs.
l_md is zeroised by lwp_create with
memset(&l2->l_startzero, 0, sizeof(*l2) -
offsetof(lwp_t, l_startzero));
To generate a diff of this commit:
cvs rdiff -u -r1.122 -r1.123 src/sys/arch/alpha/alpha/vm_machdep.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/ia64/ia64/vm_machdep.c
cvs rdiff -u -r1.82 -r1.83 src/sys/arch/sh3/sh3/vm_machdep.c
cvs rdiff -u -r1.45 -r1.46 src/sys/arch/x86/x86/vm_machdep.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/alpha/alpha/vm_machdep.c
diff -u src/sys/arch/alpha/alpha/vm_machdep.c:1.122 src/sys/arch/alpha/alpha/vm_machdep.c:1.123
--- src/sys/arch/alpha/alpha/vm_machdep.c:1.122 Sun Dec 5 07:53:57 2021
+++ src/sys/arch/alpha/alpha/vm_machdep.c Fri Oct 6 11:53:26 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_machdep.c,v 1.122 2021/12/05 07:53:57 msaitoh Exp $ */
+/* $NetBSD: vm_machdep.c,v 1.123 2023/10/06 11:53:26 skrll Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.122 2021/12/05 07:53:57 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.123 2023/10/06 11:53:26 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -102,7 +102,7 @@ cpu_lwp_fork(struct lwp *l1, struct lwp
l2->l_md.md_tf = l1->l_md.md_tf;
l2->l_md.md_flags = l1->l_md.md_flags & MDLWP_FP_C;
- l2->l_md.md_astpending = 0;
+ KASSERT(l2->l_md.md_astpending == 0);
/*
* Cache the physical address of the pcb, so we can
Index: src/sys/arch/ia64/ia64/vm_machdep.c
diff -u src/sys/arch/ia64/ia64/vm_machdep.c:1.19 src/sys/arch/ia64/ia64/vm_machdep.c:1.20
--- src/sys/arch/ia64/ia64/vm_machdep.c:1.19 Fri Oct 6 11:45:16 2023
+++ src/sys/arch/ia64/ia64/vm_machdep.c Fri Oct 6 11:53:27 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_machdep.c,v 1.19 2023/10/06 11:45:16 skrll Exp $ */
+/* $NetBSD: vm_machdep.c,v 1.20 2023/10/06 11:53:27 skrll Exp $ */
/*
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -174,9 +174,9 @@ cpu_lwp_fork(struct lwp *l1, struct lwp
l2->l_md.md_flags = l1->l_md.md_flags;
l2->l_md.md_tf = (struct trapframe *)(ua2 + UAREA_TF_OFFSET);
- l2->l_md.md_astpending = 0;
l2->l_md.user_stack = NULL;
l2->l_md.user_stack_size = 0;
+ KASSERT(l2->l_md.md_astpending == 0);
/*
* Copy the trapframe.
Index: src/sys/arch/sh3/sh3/vm_machdep.c
diff -u src/sys/arch/sh3/sh3/vm_machdep.c:1.82 src/sys/arch/sh3/sh3/vm_machdep.c:1.83
--- src/sys/arch/sh3/sh3/vm_machdep.c:1.82 Tue May 24 06:28:00 2022
+++ src/sys/arch/sh3/sh3/vm_machdep.c Fri Oct 6 11:53:27 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_machdep.c,v 1.82 2022/05/24 06:28:00 andvar Exp $ */
+/* $NetBSD: vm_machdep.c,v 1.83 2023/10/06 11:53:27 skrll Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc. All rights reserved.
@@ -81,7 +81,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.82 2022/05/24 06:28:00 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.83 2023/10/06 11:53:27 skrll Exp $");
#include "opt_kstack_debug.h"
@@ -147,7 +147,7 @@ cpu_lwp_fork(struct lwp *l1, struct lwp
sh3_setup_uarea(l2);
l2->l_md.md_flags = l1->l_md.md_flags;
- l2->l_md.md_astpending = 0;
+ KASSERT(l2->l_md.md_astpending == 0);
/* Copy user context, may be give a different stack */
memcpy(l2->l_md.md_regs, l1->l_md.md_regs, sizeof(struct trapframe));
Index: src/sys/arch/x86/x86/vm_machdep.c
diff -u src/sys/arch/x86/x86/vm_machdep.c:1.45 src/sys/arch/x86/x86/vm_machdep.c:1.46
--- src/sys/arch/x86/x86/vm_machdep.c:1.45 Sun Mar 28 10:29:05 2021
+++ src/sys/arch/x86/x86/vm_machdep.c Fri Oct 6 11:53:27 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_machdep.c,v 1.45 2021/03/28 10:29:05 skrll Exp $ */
+/* $NetBSD: vm_machdep.c,v 1.46 2023/10/06 11:53:27 skrll Exp $ */
/*-
* Copyright (c) 1982, 1986 The Regents of the University of California.
@@ -80,7 +80,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.45 2021/03/28 10:29:05 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.46 2023/10/06 11:53:27 skrll Exp $");
#include "opt_mtrr.h"
@@ -204,7 +204,7 @@ cpu_lwp_fork(struct lwp *l1, struct lwp
}
l2->l_md.md_flags = l1->l_md.md_flags;
- l2->l_md.md_astpending = 0;
+ KASSERT(l2->l_md.md_astpending == 0);
sf = (struct switchframe *)tf - 1;
