From: Andreas Gruenbacher <agruenba@redhat.com>
To: gfs2@lists.linux.dev
Cc: Andreas Gruenbacher <agruenba@redhat.com>
Subject: [PATCH 08/15] gfs2: Replace gfs2_glock_queue_put with gfs2_glock_put_async
Date: Tue, 9 Apr 2024 18:44:58 +0200 [thread overview]
Message-ID: <20240409164508.79570-9-agruenba@redhat.com> (raw)
In-Reply-To: <20240409164508.79570-1-agruenba@redhat.com>
Function gfs2_glock_queue_put() puts a glock reference by enqueuing
glock work instead of putting the reference directly. This ensures that
the operation won't sleep, but it is costly and really only necessary
when putting the final glock reference. Replace it with a new
gfs2_glock_put_async() function that only queues glock work when putting
the last glock reference.
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
---
fs/gfs2/glock.c | 27 +++++++++++++++++----------
fs/gfs2/glock.h | 2 +-
fs/gfs2/log.c | 2 +-
fs/gfs2/super.c | 4 ++--
4 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
index 34540f9d011c..ed90033b9c72 100644
--- a/fs/gfs2/glock.c
+++ b/fs/gfs2/glock.c
@@ -285,14 +285,6 @@ static void __gfs2_glock_put(struct gfs2_glock *gl)
sdp->sd_lockstruct.ls_ops->lm_put_lock(gl);
}
-/*
- * Cause the glock to be put in work queue context.
- */
-void gfs2_glock_queue_put(struct gfs2_glock *gl)
-{
- gfs2_glock_queue_work(gl, 0);
-}
-
/**
* gfs2_glock_put() - Decrement reference count on glock
* @gl: The glock to put
@@ -307,6 +299,22 @@ void gfs2_glock_put(struct gfs2_glock *gl)
__gfs2_glock_put(gl);
}
+/*
+ * gfs2_glock_put_async - Decrement reference count without sleeping
+ * @gl: The glock to put
+ *
+ * Decrement the reference count on glock immediately unless it is the last
+ * reference. Defer putting the last reference to work queue context.
+ */
+void gfs2_glock_put_async(struct gfs2_glock *gl)
+{
+ if (lockref_put_or_lock(&gl->gl_lockref))
+ return;
+
+ __gfs2_glock_queue_work(gl, 0);
+ spin_unlock(&gl->gl_lockref.lock);
+}
+
/**
* may_grant - check if it's ok to grant a new lock
* @gl: The glock
@@ -2529,8 +2537,7 @@ static void gfs2_glock_iter_next(struct gfs2_glock_iter *gi, loff_t n)
if (gl) {
if (n == 0)
return;
- if (!lockref_put_not_zero(&gl->gl_lockref))
- gfs2_glock_queue_put(gl);
+ gfs2_glock_put_async(gl);
}
for (;;) {
gl = rhashtable_walk_next(&gi->hti);
diff --git a/fs/gfs2/glock.h b/fs/gfs2/glock.h
index 0114f3e0ebe0..2c697674a86f 100644
--- a/fs/gfs2/glock.h
+++ b/fs/gfs2/glock.h
@@ -172,7 +172,7 @@ int gfs2_glock_get(struct gfs2_sbd *sdp, u64 number,
int create, struct gfs2_glock **glp);
struct gfs2_glock *gfs2_glock_hold(struct gfs2_glock *gl);
void gfs2_glock_put(struct gfs2_glock *gl);
-void gfs2_glock_queue_put(struct gfs2_glock *gl);
+void gfs2_glock_put_async(struct gfs2_glock *gl);
void __gfs2_holder_init(struct gfs2_glock *gl, unsigned int state,
u16 flags, struct gfs2_holder *gh,
diff --git a/fs/gfs2/log.c b/fs/gfs2/log.c
index a6dd68b458ce..6ee6013fb825 100644
--- a/fs/gfs2/log.c
+++ b/fs/gfs2/log.c
@@ -786,7 +786,7 @@ void gfs2_glock_remove_revoke(struct gfs2_glock *gl)
{
if (atomic_dec_return(&gl->gl_revokes) == 0) {
clear_bit(GLF_LFLUSH, &gl->gl_flags);
- gfs2_glock_queue_put(gl);
+ gfs2_glock_put_async(gl);
}
}
diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c
index 9de789b78bc5..d481db9510ac 100644
--- a/fs/gfs2/super.c
+++ b/fs/gfs2/super.c
@@ -1049,7 +1049,7 @@ static int gfs2_drop_inode(struct inode *inode)
gfs2_glock_hold(gl);
if (!gfs2_queue_try_to_evict(gl))
- gfs2_glock_queue_put(gl);
+ gfs2_glock_put_async(gl);
return 0;
}
@@ -1255,7 +1255,7 @@ static int gfs2_dinode_dealloc(struct gfs2_inode *ip)
static void gfs2_glock_put_eventually(struct gfs2_glock *gl)
{
if (current->flags & PF_MEMALLOC)
- gfs2_glock_queue_put(gl);
+ gfs2_glock_put_async(gl);
else
gfs2_glock_put(gl);
}
--
2.44.0
next prev parent reply other threads:[~2024-04-09 16:45 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-09 16:44 [PATCH 00/15] gfs2 cleanups and fixes Andreas Gruenbacher
2024-04-09 16:44 ` [PATCH 01/15] gfs2: Get rid of newlines in log messages Andreas Gruenbacher
2024-04-09 16:44 ` [PATCH 02/15] gfs2: Remove unnecessary gfs2_meta_check_ii argument Andreas Gruenbacher
2024-04-09 16:44 ` [PATCH 03/15] gfs2: Follow-up to flag rename in sysfs status file Andreas Gruenbacher
2024-04-09 16:44 ` [PATCH 04/15] gfs2: Use [NO_]CREATE consistently for gfs2_glock_get Andreas Gruenbacher
2024-04-09 16:44 ` [PATCH 05/15] gfs2: Don't forget to complete delayed withdraw Andreas Gruenbacher
2024-04-09 16:44 ` [PATCH 06/15] gfs2: Fix NULL pointer dereference in gfs2_log_flush Andreas Gruenbacher
2024-04-09 16:44 ` [PATCH 07/15] gfs2: Get rid of gfs2_glock_queue_put in signal_our_withdraw Andreas Gruenbacher
2024-04-09 16:44 ` Andreas Gruenbacher [this message]
2024-04-09 16:44 ` [PATCH 09/15] gfs2: Don't set GLF_LOCK in gfs2_dispose_glock_lru Andreas Gruenbacher
2024-04-09 16:45 ` [PATCH 10/15] gfs2: Get rid of unnecessary test_and_set_bit Andreas Gruenbacher
2024-04-09 16:45 ` [PATCH 11/15] gfs2: Fix "ignore unlock failures after withdraw" Andreas Gruenbacher
2024-04-09 16:45 ` [PATCH 12/15] Revert "gfs2: fix glock shrinker ref issues" Andreas Gruenbacher
2024-04-09 16:45 ` [PATCH 13/15] gfs2: Fix "Make glock lru list scanning safer" Andreas Gruenbacher
2024-04-16 16:55 ` Andrew Price
2024-04-17 7:55 ` Andreas Gruenbacher
2024-04-09 16:45 ` [PATCH 14/15] gfs2: Get rid of demote_ok checks Andreas Gruenbacher
2024-04-12 6:00 ` Andreas Gruenbacher
2024-04-09 16:45 ` [PATCH 15/15] gfs2: Fix lru_count accounting Andreas Gruenbacher
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240409164508.79570-9-agruenba@redhat.com \
--to=agruenba@redhat.com \
--cc=gfs2@lists.linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).