From: Liu Bo <bo.li.liu@oracle.com>
To: Qu Wenruo <quwenruo@cn.fujitsu.com>
Cc: linux-btrfs@vger.kernel.org, dsterba@suse.cz
Subject: Re: [PATCH v3 4/5] btrfs: Wait flighting bio before freeing target device for raid56
Date: Wed, 29 Mar 2017 11:05:54 -0700 [thread overview]
Message-ID: <20170329180554.GC8328@lim.localdomain> (raw)
In-Reply-To: <20170329013322.1323-5-quwenruo@cn.fujitsu.com>
On Wed, Mar 29, 2017 at 09:33:21AM +0800, Qu Wenruo wrote:
> When raid56 dev replace is cancelled by running scrub, we will free target
> device without waiting flighting bios, causing the following NULL
> pointer deference or general protection.
>
> BUG: unable to handle kernel NULL pointer dereference at 00000000000005e0
> IP: generic_make_request_checks+0x4d/0x610
> CPU: 1 PID: 11676 Comm: kworker/u4:14 Tainted: G O 4.11.0-rc2 #72
> Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.10.2-20170228_101828-anatol 04/01/2014
> Workqueue: btrfs-endio-raid56 btrfs_endio_raid56_helper [btrfs]
> task: ffff88002875b4c0 task.stack: ffffc90001334000
> RIP: 0010:generic_make_request_checks+0x4d/0x610
> Call Trace:
> ? generic_make_request+0xc7/0x360
> generic_make_request+0x24/0x360
> ? generic_make_request+0xc7/0x360
> submit_bio+0x64/0x120
> ? page_in_rbio+0x4d/0x80 [btrfs]
> ? rbio_orig_end_io+0x80/0x80 [btrfs]
> finish_rmw+0x3f4/0x540 [btrfs]
> validate_rbio_for_rmw+0x36/0x40 [btrfs]
> raid_rmw_end_io+0x7a/0x90 [btrfs]
> bio_endio+0x56/0x60
> end_workqueue_fn+0x3c/0x40 [btrfs]
> btrfs_scrubparity_helper+0xef/0x620 [btrfs]
> btrfs_endio_raid56_helper+0xe/0x10 [btrfs]
> process_one_work+0x2af/0x720
> ? process_one_work+0x22b/0x720
> worker_thread+0x4b/0x4f0
> kthread+0x10f/0x150
> ? process_one_work+0x720/0x720
> ? kthread_create_on_node+0x40/0x40
> ret_from_fork+0x2e/0x40
> RIP: generic_make_request_checks+0x4d/0x610 RSP: ffffc90001337bb8
>
> In btrfs_dev_replace_finishing(), we will call
> btrfs_rm_dev_replace_blocked() to wait bios before destroying the target
> device when scrub is finished normally.
>
> However when scrub is aborted, either due to error or canceled by scrub,
Isn't it "when dev replace is aborted"?
> we didn't wait bios, this can leads to use-after-free if there are bios
> holding the target device.
>
> Furthermore, for raid56 scrub, at least 2 places are calling
> btrfs_map_sblock() without protection of bio_counter, leading to the
> problem.
>
> This patch fixes the problen by
typo: *problem"
> 1) Wait bio_counter before freeing target device when canceling replace
> 2) When calling btrfs_map_sblock() for raid56, use bio_counter to
> protect the call.
>
Reviewed-by: Liu Bo <bo.li.liu@oracle.com>
Thanks,
-liubo
> Cc: Liu Bo <bo.li.liu@oracle.com>
> Signed-off-by: Qu Wenruo <quwenruo@cn.fujitsu.com>
> ---
> fs/btrfs/dev-replace.c | 2 ++
> fs/btrfs/raid56.c | 14 ++++++++++++++
> fs/btrfs/scrub.c | 5 +++++
> 3 files changed, 21 insertions(+)
>
> diff --git a/fs/btrfs/dev-replace.c b/fs/btrfs/dev-replace.c
> index e653921f05d9..b9d88136b5a9 100644
> --- a/fs/btrfs/dev-replace.c
> +++ b/fs/btrfs/dev-replace.c
> @@ -546,8 +546,10 @@ static int btrfs_dev_replace_finishing(struct btrfs_fs_info *fs_info,
> mutex_unlock(&fs_info->chunk_mutex);
> mutex_unlock(&fs_info->fs_devices->device_list_mutex);
> mutex_unlock(&uuid_mutex);
> + btrfs_rm_dev_replace_blocked(fs_info);
> if (tgt_device)
> btrfs_destroy_dev_replace_tgtdev(fs_info, tgt_device);
> + btrfs_rm_dev_replace_unblocked(fs_info);
> mutex_unlock(&dev_replace->lock_finishing_cancel_unmount);
>
> return scrub_ret;
> diff --git a/fs/btrfs/raid56.c b/fs/btrfs/raid56.c
> index 1571bf26dc07..5c180fea32ab 100644
> --- a/fs/btrfs/raid56.c
> +++ b/fs/btrfs/raid56.c
> @@ -2194,6 +2194,8 @@ static void read_rebuild_work(struct btrfs_work *work)
> /*
> * The following code is used to scrub/replace the parity stripe
> *
> + * Caller must have already increased bio_counter for getting @bbio.
> + *
> * Note: We need make sure all the pages that add into the scrub/replace
> * raid bio are correct and not be changed during the scrub/replace. That
> * is those pages just hold metadata or file data with checksum.
> @@ -2231,6 +2233,12 @@ raid56_parity_alloc_scrub_rbio(struct btrfs_fs_info *fs_info, struct bio *bio,
> ASSERT(rbio->stripe_npages == stripe_nsectors);
> bitmap_copy(rbio->dbitmap, dbitmap, stripe_nsectors);
>
> + /*
> + * We have already increased bio_counter when getting bbio, record it
> + * so we can free it at rbio_orig_end_io().
> + */
> + rbio->generic_bio_cnt = 1;
> +
> return rbio;
> }
>
> @@ -2673,6 +2681,12 @@ raid56_alloc_missing_rbio(struct btrfs_fs_info *fs_info, struct bio *bio,
> return NULL;
> }
>
> + /*
> + * When we get bbio, we have already increased bio_counter, record it
> + * so we can free it at rbio_orig_end_io()
> + */
> + rbio->generic_bio_cnt = 1;
> +
> return rbio;
> }
>
> diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c
> index 2fd259dbf4db..b8c49074d1b3 100644
> --- a/fs/btrfs/scrub.c
> +++ b/fs/btrfs/scrub.c
> @@ -2413,6 +2413,7 @@ static void scrub_missing_raid56_pages(struct scrub_block *sblock)
> int ret;
> int i;
>
> + btrfs_bio_counter_inc_blocked(fs_info);
> ret = btrfs_map_sblock(fs_info, BTRFS_MAP_GET_READ_MIRRORS, logical,
> &length, &bbio, 0, 1);
> if (ret || !bbio || !bbio->raid_map)
> @@ -2457,6 +2458,7 @@ static void scrub_missing_raid56_pages(struct scrub_block *sblock)
> rbio_out:
> bio_put(bio);
> bbio_out:
> + btrfs_bio_counter_dec(fs_info);
> btrfs_put_bbio(bbio);
> spin_lock(&sctx->stat_lock);
> sctx->stat.malloc_errors++;
> @@ -3000,6 +3002,8 @@ static void scrub_parity_check_and_repair(struct scrub_parity *sparity)
> goto out;
>
> length = sparity->logic_end - sparity->logic_start;
> +
> + btrfs_bio_counter_inc_blocked(fs_info);
> ret = btrfs_map_sblock(fs_info, BTRFS_MAP_WRITE, sparity->logic_start,
> &length, &bbio, 0, 1);
> if (ret || !bbio || !bbio->raid_map)
> @@ -3027,6 +3031,7 @@ static void scrub_parity_check_and_repair(struct scrub_parity *sparity)
> rbio_out:
> bio_put(bio);
> bbio_out:
> + btrfs_bio_counter_dec(fs_info);
> btrfs_put_bbio(bbio);
> bitmap_or(sparity->ebitmap, sparity->ebitmap, sparity->dbitmap,
> sparity->nsectors);
> --
> 2.12.1
>
>
>
next prev parent reply other threads:[~2017-03-29 18:06 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-29 1:33 [PATCH v3 0/5] raid56: scrub related fixes Qu Wenruo
2017-03-29 1:33 ` [PATCH v3 1/5] btrfs: scrub: Introduce full stripe lock for RAID56 Qu Wenruo
2017-03-30 0:34 ` Liu Bo
2017-03-30 1:03 ` Qu Wenruo
2017-03-30 10:31 ` David Sterba
2017-03-31 2:03 ` Qu Wenruo
2017-03-31 17:26 ` David Sterba
2017-04-03 0:43 ` Qu Wenruo
2017-03-29 1:33 ` [PATCH v3 2/5] btrfs: scrub: Fix RAID56 recovery race condition Qu Wenruo
2017-03-30 0:51 ` Liu Bo
2017-03-30 3:24 ` Qu Wenruo
2017-03-29 1:33 ` [PATCH v3 3/5] btrfs: scrub: Don't append on-disk pages for raid56 scrub Qu Wenruo
2017-03-29 18:00 ` Liu Bo
2017-03-29 1:33 ` [PATCH v3 4/5] btrfs: Wait flighting bio before freeing target device for raid56 Qu Wenruo
2017-03-29 18:05 ` Liu Bo [this message]
2017-03-29 1:33 ` [PATCH v3 5/5] btrfs: Prevent scrub recheck from racing with dev replace Qu Wenruo
2017-03-29 18:08 ` Liu Bo
2017-03-30 16:52 ` [PATCH v3 0/5] raid56: scrub related fixes David Sterba
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=20170329180554.GC8328@lim.localdomain \
--to=bo.li.liu@oracle.com \
--cc=dsterba@suse.cz \
--cc=linux-btrfs@vger.kernel.org \
--cc=quwenruo@cn.fujitsu.com \
/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).