From: Benny Halevy <benny@tonian.com>
To: linux-nfs@vger.kernel.org
Subject: [PATCH 06/13] pnfsd-block: change blr_lock to mutex
Date: Sun, 4 Dec 2011 15:48:58 +0200 [thread overview]
Message-ID: <1323006538-13675-1-git-send-email-benny@tonian.com> (raw)
In-Reply-To: <4EDB79A9.2080109@tonian.com>
From: Benny Halevy <bhalevy@tonian.com>
We're allocating memory while holding blr_lock
via bl_layoutget -> layout_cache_fill_from -> bll_alloc
Signed-off-by: Benny Halevy <bhalevy@tonian.com>
---
fs/nfsd/bl_ops.c | 27 +++++++++++++--------------
1 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/fs/nfsd/bl_ops.c b/fs/nfsd/bl_ops.c
index 15d2604..5f20b90 100644
--- a/fs/nfsd/bl_ops.c
+++ b/fs/nfsd/bl_ops.c
@@ -68,7 +68,7 @@
u64 blr_orig_size,
blr_commit_size,
blr_ext_size;
- spinlock_t blr_lock; // Protects blr_layouts
+ struct mutex blr_lock; // Protects blr_layouts
} bl_layout_rec_t;
static struct list_head layout_hash;
@@ -401,7 +401,7 @@ enum nfsstat4
}
BUG_ON(!r);
- spin_lock(&r->blr_lock);
+ mutex_lock(&r->blr_lock);
if (layout_cache_fill_from(r, &bl_possible, &res->lg_seg)) {
/*
@@ -443,7 +443,7 @@ enum nfsstat4
}
}
- spin_unlock(&r->blr_lock);
+ mutex_unlock(&r->blr_lock);
if (unlikely(nfserr)) {
if (del_on_error == True)
layout_inode_del(i);
@@ -541,9 +541,9 @@ enum nfsstat4
r = layout_inode_find(i);
if (r) {
- spin_lock(&r->blr_lock);
+ mutex_lock(&r->blr_lock);
layout_cache_del(r, &args->lr_seg);
- spin_unlock(&r->blr_lock);
+ mutex_unlock(&r->blr_lock);
dprintk(" ext_size %Lu, i_size %Lu, orig_size %Lu\n",
r->blr_ext_size, i->i_size, r->blr_orig_size);
}
@@ -591,7 +591,7 @@ enum nfsstat4
restart:
r = layout_inode_find(inode);
if (r && len && !r->blr_recalled) {
- spin_lock(&r->blr_lock);
+ mutex_lock(&r->blr_lock);
list_for_each_entry(b, &r->blr_layouts, bll_list) {
if (!r->blr_recalled && !b->bll_recalled &&
(offset >= b->bll_foff) && (offset < BLL_F_END(b))) {
@@ -624,14 +624,14 @@ enum nfsstat4
* the lock. The request will come in on the
* same thread which will cause a deadlock.
*/
- spin_unlock(&r->blr_lock);
+ mutex_unlock(&r->blr_lock);
_nfsd_layout_recall_cb(sb, inode, &lr, with_nfs4_state_lock);
adj = MIN(b->bll_len - (offset - b->bll_foff),
len);
offset += adj;
len -= adj;
if (!len) {
- spin_lock(&r->blr_lock);
+ mutex_lock(&r->blr_lock);
break;
}
/*
@@ -642,7 +642,7 @@ enum nfsstat4
goto restart;
}
}
- spin_unlock(&r->blr_lock);
+ mutex_unlock(&r->blr_lock);
}
dprintk("<-- %s\n", __func__);
@@ -1451,7 +1451,7 @@ struct list_head *
r->blr_ext_size = 0;
r->blr_recalled = 0;
INIT_LIST_HEAD(&r->blr_layouts);
- spin_lock_init(&r->blr_lock);
+ mutex_init(&r->blr_lock);
spin_lock(&layout_hashtbl_lock);
list_add_tail(&r->blr_hash, &layout_hash);
spin_unlock(&layout_hashtbl_lock);
@@ -1500,13 +1500,12 @@ struct list_head *
spin_lock(&layout_hashtbl_lock);
r = __layout_inode_find(i);
if (r) {
- spin_lock(&r->blr_lock);
+ /* FIXME: cannot acquire mutex while holding a spin lock
+ * need kref?
+ */
if (list_empty(&r->blr_layouts)) {
list_del(&r->blr_hash);
- spin_unlock(&r->blr_lock);
kfree(r);
- } else {
- spin_unlock(&r->blr_lock);
}
} else {
dprintk("%s: failed to find inode [0x%x:%lu] in table for delete\n",
--
1.7.6
next prev parent reply other threads:[~2011-12-04 13:49 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-04 13:46 [PATCH 0/13] misc pnfsd patches Benny Halevy
2011-12-04 13:47 ` [PATCH 01/13] SQUASHME: pnfsd: add missing nfs4_unlock_state in nfs4_pnfs_return_layout Benny Halevy
2011-12-04 13:48 ` [PATCH 02/13] DEBUG: pnfsd: printouts Benny Halevy
2011-12-04 13:48 ` [PATCH 03/13] pnfsd-block: reverse boolean_t values so they make sense Benny Halevy
2011-12-06 2:10 ` J. Bruce Fields
2011-12-06 11:27 ` Benny Halevy
2011-12-06 11:56 ` J. Bruce Fields
2011-12-07 12:45 ` Benny Halevy
2011-12-04 13:48 ` [PATCH 04/13] pnfsd-block: mv include/linux/nfsd4_block.h include/linux/nfsd/ Benny Halevy
2011-12-06 2:12 ` J. Bruce Fields
2011-12-06 11:28 ` Benny Halevy
2011-12-04 13:48 ` [PATCH 05/13] pnfsd-block: do not override s_pnfs_op Benny Halevy
2011-12-04 13:48 ` Benny Halevy [this message]
2011-12-04 13:49 ` [PATCH 07/13] pnfsd-block: dprint fiemap rval Benny Halevy
2011-12-04 13:49 ` [PATCH 08/13] pnfsd-block: allow positive " Benny Halevy
2011-12-04 13:49 ` [PATCH 09/13] pnfsd-block: use SECT_SIZE helper macros Benny Halevy
2011-12-04 13:49 ` [PATCH 10/13] pnfsd-block: undo dependence on spnfs Benny Halevy
2011-12-04 13:50 ` [PATCH 11/13] pnfsd-block: set the sbid part of the deviceid Benny Halevy
2011-12-04 13:50 ` [PATCH 12/13] DEBUG: pnfs: printouts Benny Halevy
2011-12-04 13:50 ` [PATCH 13/13] DEBUG: pnfsblock: add devid debug printouts Benny Halevy
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=1323006538-13675-1-git-send-email-benny@tonian.com \
--to=benny@tonian.com \
--cc=linux-nfs@vger.kernel.org \
/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 NNTP newsgroup(s).