Module Name: src
Committed By: knakahara
Date: Thu Jan 24 09:33:03 UTC 2019
Modified Files:
src/sys/dev/bluetooth: bcsp.c btuart.c
src/sys/dev/ir: irframe_tty.c
src/sys/net: if_sl.c if_strip.c
Log Message:
Add comments about D_MPSAFE to functions called as struct linesw.l_ioctl.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/bluetooth/bcsp.c
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/bluetooth/btuart.c
cvs rdiff -u -r1.62 -r1.63 src/sys/dev/ir/irframe_tty.c
cvs rdiff -u -r1.130 -r1.131 src/sys/net/if_sl.c
cvs rdiff -u -r1.111 -r1.112 src/sys/net/if_strip.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/dev/bluetooth/bcsp.c
diff -u src/sys/dev/bluetooth/bcsp.c:1.30 src/sys/dev/bluetooth/bcsp.c:1.31
--- src/sys/dev/bluetooth/bcsp.c:1.30 Mon Aug 15 08:20:11 2016
+++ src/sys/dev/bluetooth/bcsp.c Thu Jan 24 09:33:03 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: bcsp.c,v 1.30 2016/08/15 08:20:11 maxv Exp $ */
+/* $NetBSD: bcsp.c,v 1.31 2019/01/24 09:33:03 knakahara Exp $ */
/*
* Copyright (c) 2007 KIYOHARA Takashi
* All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bcsp.c,v 1.30 2016/08/15 08:20:11 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcsp.c,v 1.31 2019/01/24 09:33:03 knakahara Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -467,6 +467,12 @@ bcspioctl(struct tty *tp, u_long cmd, vo
struct bcsp_softc *sc = tp->t_sc;
int error;
+ /*
+ * XXX
+ * This function can be called without KERNEL_LOCK when caller's
+ * struct cdevsw is set D_MPSAFE. Is KERNEL_LOCK required?
+ */
+
if (sc == NULL || tp != sc->sc_tp)
return EPASSTHROUGH;
Index: src/sys/dev/bluetooth/btuart.c
diff -u src/sys/dev/bluetooth/btuart.c:1.28 src/sys/dev/bluetooth/btuart.c:1.29
--- src/sys/dev/bluetooth/btuart.c:1.28 Thu Aug 20 14:40:17 2015
+++ src/sys/dev/bluetooth/btuart.c Thu Jan 24 09:33:03 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: btuart.c,v 1.28 2015/08/20 14:40:17 christos Exp $ */
+/* $NetBSD: btuart.c,v 1.29 2019/01/24 09:33:03 knakahara Exp $ */
/*-
* Copyright (c) 2006, 2007 KIYOHARA Takashi
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: btuart.c,v 1.28 2015/08/20 14:40:17 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: btuart.c,v 1.29 2019/01/24 09:33:03 knakahara Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -313,6 +313,12 @@ btuartioctl(struct tty *tp, u_long cmd,
struct btuart_softc *sc = tp->t_sc;
int error;
+ /*
+ * XXX
+ * This function can be called without KERNEL_LOCK when caller's
+ * struct cdevsw is set D_MPSAFE. Is KERNEL_LOCK required?
+ */
+
if (sc == NULL || tp != sc->sc_tp)
return EPASSTHROUGH;
Index: src/sys/dev/ir/irframe_tty.c
diff -u src/sys/dev/ir/irframe_tty.c:1.62 src/sys/dev/ir/irframe_tty.c:1.63
--- src/sys/dev/ir/irframe_tty.c:1.62 Wed Oct 25 08:12:38 2017
+++ src/sys/dev/ir/irframe_tty.c Thu Jan 24 09:33:03 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: irframe_tty.c,v 1.62 2017/10/25 08:12:38 maya Exp $ */
+/* $NetBSD: irframe_tty.c,v 1.63 2019/01/24 09:33:03 knakahara Exp $ */
/*
* TODO
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: irframe_tty.c,v 1.62 2017/10/25 08:12:38 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: irframe_tty.c,v 1.63 2019/01/24 09:33:03 knakahara Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -377,6 +377,12 @@ irframetioctl(struct tty *tp, u_long cmd
DPRINTF(("%s: tp=%p\n", __func__, tp));
+ /*
+ * XXX
+ * This function can be called without KERNEL_LOCK when caller's
+ * struct cdevsw is set D_MPSAFE. Is KERNEL_LOCK required?
+ */
+
if (sc == NULL || tp != sc->sc_tp)
return (EPASSTHROUGH);
Index: src/sys/net/if_sl.c
diff -u src/sys/net/if_sl.c:1.130 src/sys/net/if_sl.c:1.131
--- src/sys/net/if_sl.c:1.130 Sat Dec 22 13:11:37 2018
+++ src/sys/net/if_sl.c Thu Jan 24 09:33:03 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_sl.c,v 1.130 2018/12/22 13:11:37 maxv Exp $ */
+/* $NetBSD: if_sl.c,v 1.131 2019/01/24 09:33:03 knakahara Exp $ */
/*
* Copyright (c) 1987, 1989, 1992, 1993
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_sl.c,v 1.130 2018/12/22 13:11:37 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sl.c,v 1.131 2019/01/24 09:33:03 knakahara Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -443,6 +443,12 @@ sltioctl(struct tty *tp, u_long cmd, voi
{
struct sl_softc *sc = (struct sl_softc *)tp->t_sc;
+ /*
+ * XXX
+ * This function can be called without KERNEL_LOCK when caller's
+ * struct cdevsw is set D_MPSAFE. Is KERNEL_LOCK required?
+ */
+
switch (cmd) {
case SLIOCGUNIT:
*(int *)data = sc->sc_unit; /* XXX */
Index: src/sys/net/if_strip.c
diff -u src/sys/net/if_strip.c:1.111 src/sys/net/if_strip.c:1.112
--- src/sys/net/if_strip.c:1.111 Sat Dec 22 13:11:37 2018
+++ src/sys/net/if_strip.c Thu Jan 24 09:33:03 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_strip.c,v 1.111 2018/12/22 13:11:37 maxv Exp $ */
+/* $NetBSD: if_strip.c,v 1.112 2019/01/24 09:33:03 knakahara Exp $ */
/* from: NetBSD: if_sl.c,v 1.38 1996/02/13 22:00:23 christos Exp $ */
/*
@@ -87,7 +87,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_strip.c,v 1.111 2018/12/22 13:11:37 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_strip.c,v 1.112 2019/01/24 09:33:03 knakahara Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -640,6 +640,12 @@ striptioctl(struct tty *tp, u_long cmd,
{
struct strip_softc *sc = (struct strip_softc *)tp->t_sc;
+ /*
+ * XXX
+ * This function can be called without KERNEL_LOCK when caller's
+ * struct cdevsw is set D_MPSAFE. Is KERNEL_LOCK required?
+ */
+
switch (cmd) {
case SLIOCGUNIT:
*(int *)data = sc->sc_unit;
