Re: [PATCH-v2] JBD: Fix race between free buffer and commit trasanction

From: Jan Kara
Date: Sat May 24 2008 - 18:45:41 EST


> On Wed, 2008-05-21 at 01:53 +0200, Jan Kara wrote:
> > > fs/jbd/transaction.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++--
> > > mm/filemap.c | 3 --
> > > 2 files changed, 54 insertions(+), 4 deletions(-)
> > >
> > > Index: linux-2.6.26-rc2/fs/jbd/transaction.c
> > > ===================================================================
> > > --- linux-2.6.26-rc2.orig/fs/jbd/transaction.c 2008-05-11 17:09:41.000000000 -0700
> > > +++ linux-2.6.26-rc2/fs/jbd/transaction.c 2008-05-19 16:16:41.000000000 -0700
> > > @@ -1648,12 +1648,39 @@ out:
> > > return;
> > > }
> > >
> > > +/*
> > > + * journal_try_to_free_buffers() could race with journal_commit_transaction()
> > > + * The later might still hold the reference count to the buffers when inspecting
> > > + * them on t_syncdata_list or t_locked_list.
> > > + *
> > > + * Journal_try_to_free_buffers() will call this function to
> > > + * wait for the current transaction to finish syncing data buffers, before
> > > + * try to free that buffer.
> > > + *
> > > + * Called with journal->j_state_lock hold.
> > > + */
> > > +static void journal_wait_for_transaction_sync_data(journal_t *journal)
> > > +{
> > > + transaction_t *transaction = NULL;
> > > + tid_t tid;
> > > +
> > > + transaction = journal->j_committing_transaction;
> > > +
> > > + if (!transaction)
> > > + return;
> > > +
> > > + tid = transaction->t_tid;
> > > + spin_unlock(&journal->j_state_lock);
> > > + log_wait_commit(journal, tid);
> > > + spin_lock(&journal->j_state_lock);
> > > +}
> > What is actually the point of entering the function with j_state_lock
> > held and also keeping it after return? It should be enough to take it
> > and release it just inside this function, shouldn't it?
> >
>
> I was worried about the case when we call try_to_free_buffers() again,
> it races with the current transaction commit again. Is it possible? I
> guess the question is whether it is possible to have buffers on the same
> page attached to different transaction. If so, I think we need to keep
> the journal state lock while retry try_to_free_buffers(), so that the
> retry won't race with the commit transaction again...
Well, but by the time log_wait_commit() finishes, it may well
happen that a new transaction is already started so your lock doesn't
help you much. And the page you are called on is actually locked, so
noone can really mess with it until you unlock it... So I think you can
just use the lock for obtaining tid and then drop it.

Honza

PS: For JBD2 you'd need to be a bit more careful because you cannot call
log_wait_commit() while holding page lock (we have reversed locking
order for ext4) - but ordered-mode rewrite patch actually fixes this
problem and I'm going to submit the splitted patches on Monday or
Tuesday (I only need to test them that I didn't do something stupid
while porting them to ext4)...

--
Jan Kara <jack@xxxxxxx>
SuSE CR Labs
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/