mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2024-12-28 11:59:34 +03:00
f9a9aea126
Many long-running ZFS ioctls lock the spa_namespace_lock, forcing concurrent ioctls to sleep for the mutex. Previously, the only option is to call mutex_enter() which sleeps uninterruptibly. This is a usability issue for sysadmins, for example, if the admin runs `zpool status` while a slow `zpool import` is ongoing, the admin's shell will be locked in uninterruptible sleep for a long time. This patch resolves this admin usability issue by introducing mutex_enter_interruptible() which sleeps interruptibly while waiting to acquire a lock. It is implemented for both Linux and FreeBSD. The ZFS_IOC_POOL_CONFIGS ioctl, used by `zpool status`, is changed to use this new macro so that the command can be interrupted if it is issued during a concurrent `zpool import` (or other long-running operation). Reviewed-by: Tony Hutter <hutter2@llnl.gov> Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Thomas Bertschinger <bertschinger@lanl.gov> Closes #15360
74 lines
2.7 KiB
C
74 lines
2.7 KiB
C
/*
|
|
* Copyright (c) 2007 Pawel Jakub Dawidek <pjd@FreeBSD.org>
|
|
* All rights reserved.
|
|
*
|
|
* 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 AUTHORS 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 AUTHORS 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.
|
|
*
|
|
* $FreeBSD$
|
|
*/
|
|
|
|
#ifndef _OPENSOLARIS_SYS_MUTEX_H_
|
|
#define _OPENSOLARIS_SYS_MUTEX_H_
|
|
|
|
typedef struct sx kmutex_t;
|
|
|
|
#include <sys/param.h>
|
|
#include <sys/lock.h>
|
|
#include_next <sys/sdt.h>
|
|
#include_next <sys/mutex.h>
|
|
#include <sys/proc.h>
|
|
#include <sys/sx.h>
|
|
|
|
typedef enum {
|
|
MUTEX_DEFAULT = 0 /* kernel default mutex */
|
|
} kmutex_type_t;
|
|
|
|
#define MUTEX_HELD(x) (mutex_owned(x))
|
|
#define MUTEX_NOT_HELD(x) (!mutex_owned(x) || panicstr)
|
|
|
|
#ifndef OPENSOLARIS_WITNESS
|
|
#define MUTEX_FLAGS (SX_DUPOK | SX_NEW | SX_NOWITNESS)
|
|
#else
|
|
#define MUTEX_FLAGS (SX_DUPOK | SX_NEW)
|
|
#endif
|
|
|
|
#define mutex_init(lock, desc, type, arg) do { \
|
|
const char *_name; \
|
|
ASSERT((type) == MUTEX_DEFAULT); \
|
|
for (_name = #lock; *_name != '\0'; _name++) { \
|
|
if (*_name >= 'a' && *_name <= 'z') \
|
|
break; \
|
|
} \
|
|
if (*_name == '\0') \
|
|
_name = #lock; \
|
|
sx_init_flags((lock), _name, MUTEX_FLAGS); \
|
|
} while (0)
|
|
#define mutex_destroy(lock) sx_destroy(lock)
|
|
#define mutex_enter(lock) sx_xlock(lock)
|
|
#define mutex_enter_interruptible(lock) sx_xlock_sig(lock)
|
|
#define mutex_enter_nested(lock, type) sx_xlock(lock)
|
|
#define mutex_tryenter(lock) sx_try_xlock(lock)
|
|
#define mutex_exit(lock) sx_xunlock(lock)
|
|
#define mutex_owned(lock) sx_xlocked(lock)
|
|
#define mutex_owner(lock) sx_xholder(lock)
|
|
#endif /* _OPENSOLARIS_SYS_MUTEX_H_ */
|