From: Jan Kara <jack@suse.cz>
To: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>,
LKML <linux-kernel@vger.kernel.org>,
Ingo Molnar <mingo@kernel.org>,
Sebastian Siewior <bigeasy@linutronix.de>,
Anna-Maria Gleixner <anna-maria@linutronix.de>,
Steven Rostedt <rostedt@goodmis.org>,
Julia Cartwright <julia@ni.com>, Jan Kara <jack@suse.com>,
Theodore Tso <tytso@mit.edu>, Mark Fasheh <mark@fasheh.com>,
Joseph Qi <joseph.qi@linux.alibaba.com>,
Joel Becker <jlbec@evilplan.org>,
linux-ext4@vger.kernel.org, Jan Kara <jack@suse.cz>,
Matthew Wilcox <willy@infradead.org>,
Alexander Viro <viro@zeniv.linux.org.uk>,
linux-fsdevel@vger.kernel.org
Subject: Re: [patch V2 6/7] fs/jbd2: Make state lock a spinlock
Date: Fri, 2 Aug 2019 15:31:54 +0200 [thread overview]
Message-ID: <20190802133154.GM25064@quack2.suse.cz> (raw)
In-Reply-To: <20190801112849.GB31381@hirez.programming.kicks-ass.net>
On Thu 01-08-19 13:28:49, Peter Zijlstra wrote:
> On Thu, Aug 01, 2019 at 03:01:32AM +0200, Thomas Gleixner wrote:
>
> > @@ -1931,7 +1932,7 @@ static void __jbd2_journal_temp_unlink_b
> > transaction_t *transaction;
> > struct buffer_head *bh = jh2bh(jh);
> >
> > - J_ASSERT_JH(jh, jbd_is_locked_bh_state(bh));
> > + assert_spin_locked(&jh->state_lock);
> > transaction = jh->b_transaction;
> > if (transaction)
> > assert_spin_locked(&transaction->t_journal->j_list_lock);
>
> > @@ -2415,7 +2416,7 @@ void __jbd2_journal_file_buffer(struct j
> > int was_dirty = 0;
> > struct buffer_head *bh = jh2bh(jh);
> >
> > - J_ASSERT_JH(jh, jbd_is_locked_bh_state(bh));
> > + assert_spin_locked(&jh->state_lock);
> > assert_spin_locked(&transaction->t_journal->j_list_lock);
> >
> > J_ASSERT_JH(jh, jh->b_jlist < BJ_Types);
>
> > @@ -2500,7 +2501,7 @@ void __jbd2_journal_refile_buffer(struct
> > int was_dirty, jlist;
> > struct buffer_head *bh = jh2bh(jh);
> >
> > - J_ASSERT_JH(jh, jbd_is_locked_bh_state(bh));
> > + assert_spin_locked(&jh->state_lock);
> > if (jh->b_transaction)
> > assert_spin_locked(&jh->b_transaction->t_journal->j_list_lock);
> >
>
> Do those want to be:
>
> lockdep_assert_held(&jh->state_lock);
>
> instead? The difference is of course that lockdep_assert_held() requires
> the current context to hold the lock, where assert_*_locked() merely
> checks _someone_ holds it.
Yeah, jbd2 doesn't play any weird locking tricks so lockdep_assert_held()
is fine. I'll replace those when I'm updating the patch.
Honza
--
Jan Kara <jack@suse.com>
SUSE Labs, CR
next prev parent reply other threads:[~2019-08-02 13:32 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-01 1:01 [patch V2 0/7] fs: Substitute bit-spinlocks for PREEMPT_RT and debugging Thomas Gleixner
2019-08-01 1:01 ` [patch V2 1/7] locking/lockdep: Add Kconfig option for bit spinlocks Thomas Gleixner
2019-08-01 1:01 ` [patch V2 2/7] fs/buffer: Move BH_Uptodate_Lock locking into wrapper functions Thomas Gleixner
2019-08-01 1:01 ` [patch V2 3/7] fs/buffer: Substitute BH_Uptodate_Lock for RT and bit spinlock debugging Thomas Gleixner
2019-08-01 1:01 ` [patch V2 4/7] fs/jbd2: Remove jbd_trylock_bh_state() Thomas Gleixner
2019-08-01 9:00 ` Jan Kara
2019-08-01 1:01 ` [patch V2 5/7] fs/jbd2: Simplify journal_unmap_buffer() Thomas Gleixner
2019-08-01 9:04 ` Jan Kara
2019-08-01 1:01 ` [patch V2 6/7] fs/jbd2: Make state lock a spinlock Thomas Gleixner
2019-08-01 11:28 ` Peter Zijlstra
2019-08-02 13:31 ` Jan Kara [this message]
2019-08-01 17:57 ` Jan Kara
2019-08-01 18:12 ` Thomas Gleixner
2019-08-02 13:37 ` Jan Kara
2019-08-02 15:29 ` Thomas Gleixner
2019-08-01 1:01 ` [patch V2 7/7] fs/jbd2: Free journal head outside of locked region Thomas Gleixner
2019-08-01 9:22 ` Jan Kara
2019-08-01 18:08 ` Thomas Gleixner
2019-08-02 7:56 ` [patch V2 0/7] fs: Substitute bit-spinlocks for PREEMPT_RT and debugging Christoph Hellwig
2019-08-02 9:07 ` Thomas Gleixner
2019-08-06 6:11 ` Christoph Hellwig
2019-08-08 7:02 ` Thomas Gleixner
2019-08-08 7:28 ` Christoph Hellwig
2019-08-08 7:54 ` Thomas Gleixner
2019-08-10 8:18 ` Christoph Hellwig
2019-08-11 1:22 ` Matthew Wilcox
2019-08-20 17:16 ` Sebastian Siewior
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=20190802133154.GM25064@quack2.suse.cz \
--to=jack@suse.cz \
--cc=anna-maria@linutronix.de \
--cc=bigeasy@linutronix.de \
--cc=jack@suse.com \
--cc=jlbec@evilplan.org \
--cc=joseph.qi@linux.alibaba.com \
--cc=julia@ni.com \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark@fasheh.com \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=rostedt@goodmis.org \
--cc=tglx@linutronix.de \
--cc=tytso@mit.edu \
--cc=viro@zeniv.linux.org.uk \
--cc=willy@infradead.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).