From: Jan Kara <jack@suse.cz>
To: Tahsin Erdogan <tahsin@google.com>
Cc: Tejun Heo <tj@kernel.org>,
Alexander Viro <viro@zeniv.linux.org.uk>, Jan Kara <jack@suse.cz>,
Jens Axboe <axboe@fb.com>, John Sperbeck <jsperbeck@google.com>,
Peter Chang <dpf@google.com>,
linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] writeback: fix memory leak in wb_queue_work()
Date: Mon, 13 Mar 2017 15:23:07 +0100 [thread overview]
Message-ID: <20170313142307.GB3885@quack2.suse.cz> (raw)
In-Reply-To: <20170310200949.26359-1-tahsin@google.com>
On Fri 10-03-17 12:09:49, Tahsin Erdogan wrote:
> When WB_registered flag is not set, wb_queue_work() skips queuing the
> work, but does not perform the necessary clean up. In particular, if
> work->auto_free is true, it should free the memory.
>
> The leak condition can be reprouced by following these steps:
>
> mount /dev/sdb /mnt/sdb
> /* In qemu console: device_del sdb */
> umount /dev/sdb
>
> Above will result in a wb_queue_work() call on an unregistered wb and
> thus leak memory.
>
> Reported-by: John Sperbeck <jsperbeck@google.com>
> Signed-off-by: Tahsin Erdogan <tahsin@google.com>
The patch looks good. You can add:
Reviewed-by: Jan Kara <jack@suse.cz>
Honza
> ---
> fs/fs-writeback.c | 35 +++++++++++++++++++++--------------
> 1 file changed, 21 insertions(+), 14 deletions(-)
>
> diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c
> index ef600591d96f..63ee2940775c 100644
> --- a/fs/fs-writeback.c
> +++ b/fs/fs-writeback.c
> @@ -173,19 +173,33 @@ static void wb_wakeup(struct bdi_writeback *wb)
> spin_unlock_bh(&wb->work_lock);
> }
>
> +static void finish_writeback_work(struct bdi_writeback *wb,
> + struct wb_writeback_work *work)
> +{
> + struct wb_completion *done = work->done;
> +
> + if (work->auto_free)
> + kfree(work);
> + if (done && atomic_dec_and_test(&done->cnt))
> + wake_up_all(&wb->bdi->wb_waitq);
> +}
> +
> static void wb_queue_work(struct bdi_writeback *wb,
> struct wb_writeback_work *work)
> {
> trace_writeback_queue(wb, work);
>
> - spin_lock_bh(&wb->work_lock);
> - if (!test_bit(WB_registered, &wb->state))
> - goto out_unlock;
> if (work->done)
> atomic_inc(&work->done->cnt);
> - list_add_tail(&work->list, &wb->work_list);
> - mod_delayed_work(bdi_wq, &wb->dwork, 0);
> -out_unlock:
> +
> + spin_lock_bh(&wb->work_lock);
> +
> + if (test_bit(WB_registered, &wb->state)) {
> + list_add_tail(&work->list, &wb->work_list);
> + mod_delayed_work(bdi_wq, &wb->dwork, 0);
> + } else
> + finish_writeback_work(wb, work);
> +
> spin_unlock_bh(&wb->work_lock);
> }
>
> @@ -1873,16 +1887,9 @@ static long wb_do_writeback(struct bdi_writeback *wb)
>
> set_bit(WB_writeback_running, &wb->state);
> while ((work = get_next_work_item(wb)) != NULL) {
> - struct wb_completion *done = work->done;
> -
> trace_writeback_exec(wb, work);
> -
> wrote += wb_writeback(wb, work);
> -
> - if (work->auto_free)
> - kfree(work);
> - if (done && atomic_dec_and_test(&done->cnt))
> - wake_up_all(&wb->bdi->wb_waitq);
> + finish_writeback_work(wb, work);
> }
>
> /*
> --
> 2.12.0.246.ga2ecc84866-goog
>
--
Jan Kara <jack@suse.com>
SUSE Labs, CR
next prev parent reply other threads:[~2017-03-13 14:23 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-10 20:09 [PATCH] writeback: fix memory leak in wb_queue_work() Tahsin Erdogan
2017-03-13 14:23 ` Jan Kara [this message]
2017-03-13 14:54 ` Jens Axboe
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=20170313142307.GB3885@quack2.suse.cz \
--to=jack@suse.cz \
--cc=axboe@fb.com \
--cc=dpf@google.com \
--cc=jsperbeck@google.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=tahsin@google.com \
--cc=tj@kernel.org \
--cc=viro@zeniv.linux.org.uk \
/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).