Module Name: src
Committed By: thorpej
Date: Wed Sep 29 13:15:46 UTC 2021
Modified Files:
src/sys/kern: uipc_socket.c
src/sys/miscfs/fifofs: fifo_vnops.c
Log Message:
The kq filterops that interact with sockets are MPSAFE.
To generate a diff of this commit:
cvs rdiff -u -r1.297 -r1.298 src/sys/kern/uipc_socket.c
cvs rdiff -u -r1.85 -r1.86 src/sys/miscfs/fifofs/fifo_vnops.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/kern/uipc_socket.c
diff -u src/sys/kern/uipc_socket.c:1.297 src/sys/kern/uipc_socket.c:1.298
--- src/sys/kern/uipc_socket.c:1.297 Wed Sep 29 02:47:22 2021
+++ src/sys/kern/uipc_socket.c Wed Sep 29 13:15:45 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_socket.c,v 1.297 2021/09/29 02:47:22 thorpej Exp $ */
+/* $NetBSD: uipc_socket.c,v 1.298 2021/09/29 13:15:45 thorpej Exp $ */
/*
* Copyright (c) 2002, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.297 2021/09/29 02:47:22 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.298 2021/09/29 13:15:45 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -2320,21 +2320,21 @@ filt_solisten(struct knote *kn, long hin
}
static const struct filterops solisten_filtops = {
- .f_flags = FILTEROP_ISFD,
+ .f_flags = FILTEROP_ISFD | FILTEROP_MPSAFE,
.f_attach = NULL,
.f_detach = filt_sordetach,
.f_event = filt_solisten,
};
static const struct filterops soread_filtops = {
- .f_flags = FILTEROP_ISFD,
+ .f_flags = FILTEROP_ISFD | FILTEROP_MPSAFE,
.f_attach = NULL,
.f_detach = filt_sordetach,
.f_event = filt_soread,
};
static const struct filterops sowrite_filtops = {
- .f_flags = FILTEROP_ISFD,
+ .f_flags = FILTEROP_ISFD | FILTEROP_MPSAFE,
.f_attach = NULL,
.f_detach = filt_sowdetach,
.f_event = filt_sowrite,
Index: src/sys/miscfs/fifofs/fifo_vnops.c
diff -u src/sys/miscfs/fifofs/fifo_vnops.c:1.85 src/sys/miscfs/fifofs/fifo_vnops.c:1.86
--- src/sys/miscfs/fifofs/fifo_vnops.c:1.85 Wed Sep 29 02:47:22 2021
+++ src/sys/miscfs/fifofs/fifo_vnops.c Wed Sep 29 13:15:45 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: fifo_vnops.c,v 1.85 2021/09/29 02:47:22 thorpej Exp $ */
+/* $NetBSD: fifo_vnops.c,v 1.86 2021/09/29 13:15:45 thorpej Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fifo_vnops.c,v 1.85 2021/09/29 02:47:22 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fifo_vnops.c,v 1.86 2021/09/29 13:15:45 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -578,14 +578,14 @@ filt_fifowrite(struct knote *kn, long hi
}
static const struct filterops fiforead_filtops = {
- .f_flags = FILTEROP_ISFD,
+ .f_flags = FILTEROP_ISFD | FILTEROP_MPSAFE,
.f_attach = NULL,
.f_detach = filt_fifordetach,
.f_event = filt_fiforead,
};
static const struct filterops fifowrite_filtops = {
- .f_flags = FILTEROP_ISFD,
+ .f_flags = FILTEROP_ISFD | FILTEROP_MPSAFE,
.f_attach = NULL,
.f_detach = filt_fifowdetach,
.f_event = filt_fifowrite,
