mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2025-09-15 13:50:11 +03:00
Skip dbuf_evict_one() from dbuf_evict_notify() for reclaim thread
Avoid calling dbuf_evict_one() from memory reclaim contexts (e.g. Linux kswapd, FreeBSD pagedaemon). This prevents deadlock caused by reclaim threads waiting for the dbuf hash lock in the call sequence: dbuf_evict_one -> dbuf_destroy -> arc_buf_destroy Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Reviewed-by: Alexander Motin <alexander.motin@TrueNAS.com> Signed-off-by: Kaitlin Hoang <kthoang@amazon.com> Closes #17561
This commit is contained in:
parent
4808641e71
commit
c405a7a35c
@ -56,4 +56,9 @@ struct opensolaris_utsname {
|
||||
#define task_io_account_read(n)
|
||||
#define task_io_account_write(n)
|
||||
|
||||
/*
|
||||
* Check if the current thread is a memory reclaim thread.
|
||||
*/
|
||||
extern int current_is_reclaim_thread(void);
|
||||
|
||||
#endif /* _OPENSOLARIS_SYS_MISC_H_ */
|
||||
|
@ -24,7 +24,13 @@
|
||||
#define _OS_LINUX_SPL_MISC_H
|
||||
|
||||
#include <linux/kobject.h>
|
||||
#include <linux/swap.h>
|
||||
|
||||
extern void spl_signal_kobj_evt(struct block_device *bdev);
|
||||
|
||||
/*
|
||||
* Check if the current thread is a memory reclaim thread.
|
||||
*/
|
||||
extern int current_is_reclaim_thread(void);
|
||||
|
||||
#endif
|
||||
|
@ -236,6 +236,11 @@ typedef pthread_t kthread_t;
|
||||
#define thread_join(t) pthread_join((pthread_t)(t), NULL)
|
||||
|
||||
#define newproc(f, a, cid, pri, ctp, pid) (ENOSYS)
|
||||
/*
|
||||
* Check if the current thread is a memory reclaim thread.
|
||||
* Always returns false in userspace (no memory reclaim thread).
|
||||
*/
|
||||
#define current_is_reclaim_thread() (0)
|
||||
|
||||
/* in libzpool, p0 exists only to have its address taken */
|
||||
typedef struct proc {
|
||||
|
@ -101,6 +101,15 @@ spl_panic(const char *file, const char *func, int line, const char *fmt, ...)
|
||||
va_end(ap);
|
||||
}
|
||||
|
||||
/*
|
||||
* Check if the current thread is a memory reclaim thread.
|
||||
* Returns true if curproc is pageproc (FreeBSD's page daemon).
|
||||
*/
|
||||
int
|
||||
current_is_reclaim_thread(void)
|
||||
{
|
||||
return (curproc == pageproc);
|
||||
}
|
||||
|
||||
SYSINIT(opensolaris_utsname_init, SI_SUB_TUNABLES, SI_ORDER_ANY,
|
||||
opensolaris_utsname_init, NULL);
|
||||
|
@ -28,6 +28,7 @@
|
||||
#include <sys/kmem.h>
|
||||
#include <sys/tsd.h>
|
||||
#include <sys/string.h>
|
||||
#include <sys/misc.h>
|
||||
|
||||
/*
|
||||
* Thread interfaces
|
||||
@ -197,3 +198,14 @@ issig(void)
|
||||
}
|
||||
|
||||
EXPORT_SYMBOL(issig);
|
||||
|
||||
/*
|
||||
* Check if the current thread is a memory reclaim thread.
|
||||
* Returns true if current thread is kswapd.
|
||||
*/
|
||||
int
|
||||
current_is_reclaim_thread(void)
|
||||
{
|
||||
return (current_is_kswapd());
|
||||
}
|
||||
EXPORT_SYMBOL(current_is_reclaim_thread);
|
||||
|
@ -866,8 +866,16 @@ dbuf_evict_notify(uint64_t size)
|
||||
* and grabbing the lock results in massive lock contention.
|
||||
*/
|
||||
if (size > dbuf_cache_target_bytes()) {
|
||||
if (size > dbuf_cache_hiwater_bytes())
|
||||
/*
|
||||
* Avoid calling dbuf_evict_one() from memory reclaim context
|
||||
* (e.g. Linux kswapd, FreeBSD pagedaemon) to prevent deadlocks.
|
||||
* Memory reclaim threads can get stuck waiting for the dbuf
|
||||
* hash lock.
|
||||
*/
|
||||
if (size > dbuf_cache_hiwater_bytes() &&
|
||||
!current_is_reclaim_thread()) {
|
||||
dbuf_evict_one();
|
||||
}
|
||||
cv_signal(&dbuf_evict_cv);
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user