From 9d0887402ba505fa7f82ffeb1e22c34fb07c83ed Mon Sep 17 00:00:00 2001 From: Rob Wing Date: Sat, 13 Aug 2022 21:09:49 -0800 Subject: [PATCH] FreeBSD: add knlist_init_sx() for exclusive locks This will be used to implement kqfilter support for zvol cdevs. Reviewed-by: Ryan Moeller Reviewed-by: Alexander Motin Signed-off-by: Rob Wing Closes #13773 --- include/os/freebsd/zfs/sys/freebsd_event.h | 37 ++++++++++++ module/Makefile.bsd | 1 + module/os/freebsd/zfs/event_os.c | 65 ++++++++++++++++++++++ 3 files changed, 103 insertions(+) create mode 100644 include/os/freebsd/zfs/sys/freebsd_event.h create mode 100644 module/os/freebsd/zfs/event_os.c diff --git a/include/os/freebsd/zfs/sys/freebsd_event.h b/include/os/freebsd/zfs/sys/freebsd_event.h new file mode 100644 index 0000000000..544ff8b0f8 --- /dev/null +++ b/include/os/freebsd/zfs/sys/freebsd_event.h @@ -0,0 +1,37 @@ +/* + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * + * Copyright (c) 2022 Rob Wing + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#ifndef _ZFS_FREEBSD_EVENT_H +#define _ZFS_FREEBSD_EVENT_H + +#ifdef _KERNEL + +void knlist_init_sx(struct knlist *knl, struct sx *lock); + +#endif /* !_KERNEL */ + +#endif /* !_ZFS_FREEBSD_EVENT_H */ diff --git a/module/Makefile.bsd b/module/Makefile.bsd index 589ca60b29..050b6c21e5 100644 --- a/module/Makefile.bsd +++ b/module/Makefile.bsd @@ -172,6 +172,7 @@ SRCS+= abd_os.c \ arc_os.c \ crypto_os.c \ dmu_os.c \ + event_os.c \ hkdf.c \ kmod_core.c \ spa_os.c \ diff --git a/module/os/freebsd/zfs/event_os.c b/module/os/freebsd/zfs/event_os.c new file mode 100644 index 0000000000..97ac151e4f --- /dev/null +++ b/module/os/freebsd/zfs/event_os.c @@ -0,0 +1,65 @@ +/* + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * + * Copyright (c) 2022 Rob Wing + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +#include +#include +#include + +#include + +static void +knlist_sx_xlock(void *arg) +{ + + sx_xlock((struct sx *)arg); +} + +static void +knlist_sx_xunlock(void *arg) +{ + + sx_xunlock((struct sx *)arg); +} + +static void +knlist_sx_assert_lock(void *arg, int what) +{ + + if (what == LA_LOCKED) + sx_assert((struct sx *)arg, SX_LOCKED); + else + sx_assert((struct sx *)arg, SX_UNLOCKED); +} + +void +knlist_init_sx(struct knlist *knl, struct sx *lock) +{ + + knlist_init(knl, lock, knlist_sx_xlock, knlist_sx_xunlock, + knlist_sx_assert_lock); +}