fs/gfs2/inode.c | 30 +++++++++++++++++++++++++++++-
fs/namei.c | 30 ++++++++++++++++++++++++++++--
kernel/locking/rwsem.c | 10 ++++++++++
3 files changed, 67 insertions(+), 3 deletions(-)
diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
index 8344040ecaf7..2be4a899c665 100644
--- a/fs/gfs2/inode.c
+++ b/fs/gfs2/inode.c
@@ -36,6 +36,9 @@
#include "super.h"
#include "glops.h"
+void *gfs2_debug_watched_rwsem;
+EXPORT_SYMBOL(gfs2_debug_watched_rwsem);
+
static const struct inode_operations gfs2_file_iops;
static const struct inode_operations gfs2_dir_iops;
static const struct inode_operations gfs2_symlink_iops;
@@ -725,19 +728,26 @@ static int gfs2_create_inode(struct inode *dir, struct dentry *dentry,
error = gfs2_rindex_update(sdp);
if (error)
goto fail;
+ pr_warn("DEBUG GFS2: after glock_nq dir=%px rwsem owner=%px current=%px\n",
+ dir, READ_ONCE(dir->i_rwsem.owner), current);
error = gfs2_glock_nq_init(dip->i_gl, LM_ST_EXCLUSIVE, 0, &d_gh);
+ pr_warn("DEBUG GFS2 A: dir=%px rwsem owner=%px\n", dir, READ_ONCE(dir->i_rwsem.owner));
if (error)
goto fail;
gfs2_holder_mark_uninitialized(&gh);
error = create_ok(dip, name, mode);
+ pr_warn("DEBUG GFS2 B: dir=%px rwsem owner=%px error=%d\n", dir, READ_ONCE(dir->i_rwsem.owner), error);
if (error)
goto fail_gunlock;
inode = gfs2_dir_search(dir, &dentry->d_name, !S_ISREG(mode) || excl);
error = PTR_ERR(inode);
if (!IS_ERR(inode)) {
+ pr_warn("DEBUG GFS2: gfs2_create_inode found existing entry! dir=%px mode=%o file=%px inode=%px S_ISDIR=%d rwsem owner=%px current=%px\n",
+ dir, mode, file, inode, S_ISDIR(inode->i_mode),
+ READ_ONCE(dir->i_rwsem.owner), current);
if (S_ISDIR(inode->i_mode)) {
iput(inode);
inode = NULL;
@@ -759,6 +769,7 @@ static int gfs2_create_inode(struct inode *dir, struct dentry *dentry,
}
error = gfs2_diradd_alloc_required(dir, name, &da);
+ pr_warn("DEBUG GFS2 C: dir=%px rwsem owner=%px error=%d\n", dir, READ_ONCE(dir->i_rwsem.owner), error);
if (error < 0)
goto fail_gunlock;
@@ -820,16 +831,19 @@ static int gfs2_create_inode(struct inode *dir, struct dentry *dentry,
blocks++;
error = alloc_dinode(ip, aflags, &blocks);
+ pr_warn("DEBUG GFS2 D: dir=%px rwsem owner=%px error=%d\n", dir, READ_ONCE(dir->i_rwsem.owner), error);
if (error)
goto fail_free_inode;
gfs2_set_inode_blocks(inode, blocks);
error = gfs2_glock_get(sdp, ip->i_no_addr, &gfs2_inode_glops, CREATE, &ip->i_gl);
+ pr_warn("DEBUG GFS2 D1: dir=%px rwsem owner=%px error=%d\n", dir, READ_ONCE(dir->i_rwsem.owner), error);
if (error)
goto fail_dealloc_inode;
error = gfs2_glock_get(sdp, ip->i_no_addr, &gfs2_iopen_glops, CREATE, &io_gl);
+ pr_warn("DEBUG GFS2 D2: dir=%px rwsem owner=%px error=%d\n", dir, READ_ONCE(dir->i_rwsem.owner), error);
if (error)
goto fail_dealloc_inode;
gfs2_cancel_delete_work(io_gl);
@@ -837,13 +851,17 @@ static int gfs2_create_inode(struct inode *dir, struct dentry *dentry,
retry:
error = insert_inode_locked4(inode, ip->i_no_addr, iget_test, &ip->i_no_addr);
+ pr_warn("DEBUG GFS2 D3: dir=%px rwsem owner=%px error=%d\n", dir, READ_ONCE(dir->i_rwsem.owner), error);
if (error == -EBUSY)
goto retry;
if (error)
goto fail_gunlock2;
+ gfs2_debug_watched_rwsem = &dir->i_rwsem;
error = gfs2_glock_nq_init(io_gl, LM_ST_SHARED, GL_EXACT | GL_NOPID,
&ip->i_iopen_gh);
+ gfs2_debug_watched_rwsem = NULL;
+ pr_warn("DEBUG GFS2 E: dir=%px rwsem owner=%px error=%d\n", dir, READ_ONCE(dir->i_rwsem.owner), error);
if (error)
goto fail_gunlock2;
@@ -862,7 +880,7 @@ static int gfs2_create_inode(struct inode *dir, struct dentry *dentry,
}
init_dinode(dip, ip, symname);
gfs2_trans_end(sdp);
-
+ pr_warn("DEBUG GFS2 F: dir=%px rwsem owner=%px\n", dir, READ_ONCE(dir->i_rwsem.owner));
glock_set_object(ip->i_gl, ip);
glock_set_object(io_gl, ip);
gfs2_set_iop(inode);
@@ -888,11 +906,15 @@ static int gfs2_create_inode(struct inode *dir, struct dentry *dentry,
goto fail_gunlock4;
error = link_dinode(dip, name, ip, &da);
+ pr_warn("DEBUG GFS2 G: dir=%px rwsem owner=%px error=%d\n", dir, READ_ONCE(dir->i_rwsem.owner), error);
if (error)
goto fail_gunlock4;
mark_inode_dirty(inode);
d_instantiate(dentry, inode);
+ pr_warn("DEBUG GFS2 H: dir=%px rwsem owner=%px\n", dir, READ_ONCE(dir->i_rwsem.owner));
+ pr_warn("DEBUG GFS2: before glock_dq dir=%px rwsem owner=%px current=%px\n",
+ dir, READ_ONCE(dir->i_rwsem.owner), current);
/* After instantiate, errors should result in evict which will destroy
* both inode and iopen glocks properly. */
if (file) {
@@ -900,6 +922,8 @@ static int gfs2_create_inode(struct inode *dir, struct dentry *dentry,
error = finish_open(file, dentry, gfs2_open_common);
}
gfs2_glock_dq_uninit(&d_gh);
+ pr_warn("DEBUG GFS2: after glock_dq dir=%px rwsem owner=%px current=%px\n",
+ dir, READ_ONCE(dir->i_rwsem.owner), current);
gfs2_qa_put(ip);
gfs2_glock_dq_uninit(&gh);
gfs2_glock_put(io_gl);
@@ -937,7 +961,11 @@ static int gfs2_create_inode(struct inode *dir, struct dentry *dentry,
diff --git a/kernel/locking/rwsem.c b/kernel/locking/rwsem.c
index 24df4d98f7d2..4c4c6daf8172 100644
--- a/kernel/locking/rwsem.c
+++ b/kernel/locking/rwsem.c
@@ -1629,6 +1629,11 @@ EXPORT_SYMBOL(down_write_trylock);
*/
void up_read(struct rw_semaphore *sem)
{
+ extern void *gfs2_debug_watched_rwsem;
+ if (sem == gfs2_debug_watched_rwsem) {
+ pr_warn("DEBUG WATCHPOINT: up_read on watched rwsem=%px!\n", sem);
+ dump_stack();
+ }
rwsem_release(&sem->dep_map, _RET_IP_);
__up_read(sem);
}
@@ -1639,6 +1644,11 @@ EXPORT_SYMBOL(up_read);
*/
void up_write(struct rw_semaphore *sem)
{
+ extern void *gfs2_debug_watched_rwsem;
+ if (sem == gfs2_debug_watched_rwsem) {
+ pr_warn("DEBUG WATCHPOINT: up_write on watched rwsem=%px!\n", sem);
+ dump_stack();
+ }
rwsem_release(&sem->dep_map, _RET_IP_);
__up_write(sem);
}
--
2.43.0