* Re: [PATCH] fs/jbd2: t_updates should increase when start_this_handle() failed in jbd2__journal_restart()
2013-06-19 4:48 [PATCH] fs/jbd2: t_updates should increase when start_this_handle() failed in jbd2__journal_restart() Younger Liu
@ 2013-06-20 15:55 ` Theodore Ts'o
0 siblings, 0 replies; 2+ messages in thread
From: Theodore Ts'o @ 2013-06-20 15:55 UTC (permalink / raw)
To: Younger Liu; +Cc: Andrew Morton, linux-ext4, Ocfs2-Devel, Li Zefan, jack
[ LKML and linux-fsdevel BCC'ed ]
On Wed, Jun 19, 2013 at 12:48:26PM +0800, Younger Liu wrote:
> jbd2_journal_restart() would restart a handle. In this function, it
> calls start_this_handle(). Before calling start_this_handle()，subtract
> 1 from transaction->t_updates.
> If start_this_handle() succeeds, transaction->t_updates increases by 1
> in it. But if start_this_handle() fails, transaction->t_updates does
> not increase.
> So, when commit the handle's transaction in jbd2_journal_stop(), the
> assertion is false, and then trigger a bug.
> The assertion is as follows:
> J_ASSERT(atomic_read(&transaction->t_updates) > 0)
>
> Signed-off-by: Younger Liu <younger.liu@huawei.com>
Thanks for pointing out this potential problem. Your fix isn't quite
the right one, however.
The problem is once we get to this point, the transaction pointer may
no longer be valid, since once we decrement t_updates, the transaction
could start commiting, and so we should not actually dereference the
transaction pointer after we unlock transaction->t_handle_lock. (We
are referencing t_tid two lines later, and technically that's a bug.
We've just been getting lucky.)
The real issue is that by the time we call start_this_handle() in
jbd2__journal_restart, the handle is not attached to any transaction.
So if jbd2_journal_restart() fails, the handle has to be considered
invalid, and the calling code should not try to use the handle at all,
including calling jbd2_journal_stop().
Jan Kara is I believe currently on vacation but I'd really like him to
chime in with his opinion about the best way to fix this, since he's
also quite familiar with the jbd2 code.
Also, Jan has recently submitted changes to implement reserved handles
(to be submitted in the next merge window), and in these new
functions, if start_this_handle() fails when called from
jbd2_journal_start_reserved(), the handle is left invalidated, and the
caller of jbd2_journal_start_reserved() must not touch the handle
again, including calling jbd2_journal_stop() --- in fact, because
jbd2_journal_start_reserved() clears current->journal_info on failure,
an attempt to call jbd2_journal_stop() will result in the kernel oops
due to an assertion failure.
My inclination is to fix this in the same way, but it will require
changing the current code paths that use jbd2_journal_restart(), and
in some cases passing back the state that the handle is now invalid
and should not be released via jbd2_journal_stop() is going to be
tricky indeed.
Another possible fix is to set the handle to be aborted, via
jbd2_journal_abort_handle(). This function isn't used at all at the
moment, but from what I can tell this should do the right thing. The
one unfortunate thing about this is that when jbd2_journal_stop() gets
called, it will return EROFS, which is a misleading error code. I'm
guessing you're seeing this because start_this_handle() returned
ENOMEM, correct? We could hack around this by stashing the real error
in the handle, and then change jbd2_journal_stop() to return that
error instead of EROFS if it is set.
This second solution is hacky all-around, and it's also inconsistent
with how we are doing things with jbd2_journal_start_reserved(). So
I'm not so happy with this solution. But it would require a lot less
work because the fix would be isolated in the jbd2 layer. OTOH, right
now if the code calls jbd2_journal_stop() on the handle after a
failure in jbd2_journal_start_reserved(), they are crashing anyway, so
changing the code so it changes with an assertion failure doesn't make
things any worse, and then we fix things in ext4 and ocfs2 without any
patch interdependencies --- and this is a problem which appears to
happen very rarely in practice.
(How did you manage to trigger this, BTW? Was this something you
noticed by manual code inspection? Or are you instrumenting the
kernel's memory allocators to occasionally fail to test our error
paths? Or were you running in a system with very heavy memory
pressure?)
- Ted
> ---
> fs/jbd2/transaction.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/fs/jbd2/transaction.c b/fs/jbd2/transaction.c
> index 325bc01..9ddb444 100644
> --- a/fs/jbd2/transaction.c
> +++ b/fs/jbd2/transaction.c
> @@ -530,6 +530,8 @@ int jbd2__journal_restart(handle_t *handle, int nblocks, gfp_t gfp_mask)
> lock_map_release(&handle->h_lockdep_map);
> handle->h_buffer_credits = nblocks;
> ret = start_this_handle(journal, handle, gfp_mask);
> + if (ret < 0)
> + atomic_inc(&transaction->t_updates);
> return ret;
> }
> EXPORT_SYMBOL(jbd2__journal_restart);
> --
> 1.7.9.7
>
--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 2+ messages in thread