Re: [linux-pm] [Patch] JBD and JBD2 missing set_freezable()

From: Jan Kara
Date: Mon Mar 05 2012 - 05:28:03 EST


On Sun 04-03-12 23:51:07, Rafael J. Wysocki wrote:
> On Friday, February 03, 2012, Nigel Cunningham wrote:
> > Hi all.
> >
> > With the latest and greatest changes to the freezer, I started seeing
> > panics that were caused by jbd2 running post-process freezing and
> > hitting the canary BUG_ON for non-TuxOnIce I/O submission. I've traced
> > this back to a lack of set_freezable calls in both jbd and jbd2. Since
> > they're clearly meant to be frozen (there are tests for freezing()), I
> > submit the following patch to add the missing calls.
> >
> > Signed-off-by: Nigel Cunningham <nigel@xxxxxxxxxxxx>
>
> Well, I wonder what the filesystems people think about that.
Nigel is right that threads are meant to be freezable. If below patch
is needed for that, you have my ack.

Just two notes:
1) Freezing the journal thread will effectively block filesystem activity
(not immediately but once transaction fills up) so you should better make
sure you don't need to do anything with the filesystem after freezing the
thread.

2) Is freezing journal thread still needed when we freeze filesystem in
suspend code? Because no IO should happen once filesystem is frozen...

Honza
>
> Thanks,
> Rafael
>
>
> > diff --git a/fs/jbd/journal.c b/fs/jbd/journal.c
> > index 59c09f9..89cd985 100644
> > --- a/fs/jbd/journal.c
> > +++ b/fs/jbd/journal.c
> > @@ -129,6 +129,8 @@ static int kjournald(void *arg)
> > setup_timer(&journal->j_commit_timer, commit_timeout,
> > (unsigned long)current);
> >
> > + set_freezable();
> > +
> > /* Record that the journal thread is running */
> > journal->j_task = current;
> > wake_up(&journal->j_wait_done_commit);
> > diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
> > index c0a5f9f..663e47c 100644
> > --- a/fs/jbd2/journal.c
> > +++ b/fs/jbd2/journal.c
> > @@ -139,6 +139,8 @@ static int kjournald2(void *arg)
> > setup_timer(&journal->j_commit_timer, commit_timeout,
> > (unsigned long)current);
> >
> > + set_freezable();
> > +
> > /* Record that the journal thread is running */
> > journal->j_task = current;
> > wake_up(&journal->j_wait_done_commit);
> >
>
--
Jan Kara <jack@xxxxxxx>
SUSE Labs, CR
--
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/