Module Name: src
Committed By: jruoho
Date: Mon Jul 13 13:16:08 UTC 2020
Modified Files:
src/sys/kern: kern_cpu.c
src/tests/usr.sbin/cpuctl: t_cpuctl.sh
Log Message:
Do not allow disabling interrupts on the primary CPU. Fixes PR kern/45117.
To generate a diff of this commit:
cvs rdiff -u -r1.91 -r1.92 src/sys/kern/kern_cpu.c
cvs rdiff -u -r1.3 -r1.4 src/tests/usr.sbin/cpuctl/t_cpuctl.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_cpu.c
diff -u src/sys/kern/kern_cpu.c:1.91 src/sys/kern/kern_cpu.c:1.92
--- src/sys/kern/kern_cpu.c:1.91 Thu May 28 20:29:18 2020
+++ src/sys/kern/kern_cpu.c Mon Jul 13 13:16:07 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_cpu.c,v 1.91 2020/05/28 20:29:18 ad Exp $ */
+/* $NetBSD: kern_cpu.c,v 1.92 2020/07/13 13:16:07 jruoho Exp $ */
/*-
* Copyright (c) 2007, 2008, 2009, 2010, 2012, 2019 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_cpu.c,v 1.91 2020/05/28 20:29:18 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_cpu.c,v 1.92 2020/07/13 13:16:07 jruoho Exp $");
#ifdef _KERNEL_OPT
#include "opt_cpu_ucode.h"
@@ -212,7 +212,9 @@ cpuctl_ioctl(dev_t dev, u_long cmd, void
error = ESRCH;
break;
}
- cpu_setintr(ci, cs->cs_intr);
+ error = cpu_setintr(ci, cs->cs_intr);
+ if (error)
+ break;
error = cpu_setstate(ci, cs->cs_online);
break;
@@ -490,6 +492,8 @@ cpu_setintr(struct cpu_info *ci, bool in
return 0;
func = (xcfunc_t)cpu_xc_intr;
} else {
+ if (CPU_IS_PRIMARY(ci))
+ return EINVAL;
if ((spc->spc_flags & SPCF_NOINTR) != 0)
return 0;
/*
Index: src/tests/usr.sbin/cpuctl/t_cpuctl.sh
diff -u src/tests/usr.sbin/cpuctl/t_cpuctl.sh:1.3 src/tests/usr.sbin/cpuctl/t_cpuctl.sh:1.4
--- src/tests/usr.sbin/cpuctl/t_cpuctl.sh:1.3 Thu Jun 25 15:43:26 2020
+++ src/tests/usr.sbin/cpuctl/t_cpuctl.sh Mon Jul 13 13:16:07 2020
@@ -1,4 +1,4 @@
-# $NetBSD: t_cpuctl.sh,v 1.3 2020/06/25 15:43:26 jruoho Exp $
+# $NetBSD: t_cpuctl.sh,v 1.4 2020/07/13 13:16:07 jruoho Exp $
#
# Copyright (c) 2020 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -37,9 +37,6 @@ setcpu() {
atf_pass
fi
- # Skip the boot processor. Disabling interrupts
- # on it will hang the system (PR kern/45117).
- #
while [ $ncpu -gt 1 ]; do
cpuid=$(expr $ncpu - 1)
@@ -51,6 +48,15 @@ setcpu() {
ncpu=$(expr $ncpu - 1)
done
+
+ # Additional check that interrupts cannot be
+ # disabled for the primary CPU (PR kern/45117).
+ #
+ cpuctl nointr 0 >/dev/null 2>&1
+
+ if [ $? -eq 0 ]; then
+ $2 $3
+ fi
}
clean() {
