Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 79916C48BD1 for ; Fri, 11 Jun 2021 01:31:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5B764611CD for ; Fri, 11 Jun 2021 01:31:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230462AbhFKBdX (ORCPT ); Thu, 10 Jun 2021 21:33:23 -0400 Received: from smtp-out2.suse.de ([195.135.220.29]:47522 "EHLO smtp-out2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230190AbhFKBdX (ORCPT ); Thu, 10 Jun 2021 21:33:23 -0400 Received: from relay2.suse.de (relay2.suse.de [149.44.160.134]) by smtp-out2.suse.de (Postfix) with ESMTP id 668151FD6C for ; Fri, 11 Jun 2021 01:31:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1623375085; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8G5yrtyq+IWNGcken2UgT+/HLH1uZ9IXAWaKYe/M1Z8=; b=sWXiIJXIQwcDTMCERVvoqMjWE9fMxp+whj7BuvpRaIe8MXaLD7leETdlu/HVbLsIZUimdc qeUVKUI1iEbq26uF9BLOaZcGynoYhKvZySD8/X/Ke0auGMp2+ZKiteCUt0RJsqgMPIAPOX S4hDyO1LuyV56GMYpKUFnc1nSvvfUSI= Received: from adam-pc.lan (unknown [10.163.16.38]) by relay2.suse.de (Postfix) with ESMTP id 7514DA3B84 for ; Fri, 11 Jun 2021 01:31:24 +0000 (UTC) From: Qu Wenruo To: linux-btrfs@vger.kernel.org Subject: [PATCH 4/9] btrfs: hunt down the BUG_ON()s inside btrfs_submit_compressed_write() Date: Fri, 11 Jun 2021 09:31:09 +0800 Message-Id: <20210611013114.57264-5-wqu@suse.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210611013114.57264-1-wqu@suse.com> References: <20210611013114.57264-1-wqu@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org Just like btrfs_submit_compressed_read(), there are quite some BUG_ON()s inside btrfs_submit_compressed_write() for the bio submission path. Fix them using the same method: - For last bio, just endio the bio As in that case, one of the endio function of all these submitted bio will be able to free the comprssed_bio - For half-submitted bio, wait and finish the compressed_bio manually In this case, as long as all other bio finishes, we're the only one referring the compressed_bio, and can manually finish it. Signed-off-by: Qu Wenruo --- fs/btrfs/compression.c | 112 ++++++++++++++++++++++++++++------------- 1 file changed, 78 insertions(+), 34 deletions(-) diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c index f1b9c5fd7779..4bc03309b7b6 100644 --- a/fs/btrfs/compression.c +++ b/fs/btrfs/compression.c @@ -352,50 +352,58 @@ static noinline void end_compressed_writeback(struct inode *inode, /* the inode may be gone now */ } -/* - * do the cleanup once all the compressed pages hit the disk. - * This will clear writeback on the file pages and free the compressed - * pages. - * - * This also calls the writeback end hooks for the file pages so that - * metadata and checksums can be updated in the file. - */ -static void end_compressed_bio_write(struct bio *bio) +static void finish_compressed_bio_write(struct compressed_bio *cb) { - struct compressed_bio *cb = bio->bi_private; - struct inode *inode; - struct page *page; + struct inode *inode = cb->inode; unsigned long index; - if (!dec_and_test_compressed_bio(cb, bio)) - goto out; - - /* ok, we're the last bio for this extent, step one is to + /* + * Ok, we're the last bio for this extent, step one is to * call back into the FS and do all the end_io operations */ inode = cb->inode; - btrfs_record_physical_zoned(inode, cb->start, bio); btrfs_writepage_endio_finish_ordered(BTRFS_I(inode), NULL, cb->start, cb->start + cb->len - 1, - bio->bi_status == BLK_STS_OK); + !cb->errors); end_compressed_writeback(inode, cb); /* note, our inode could be gone now */ /* - * release the compressed pages, these came from alloc_page and + * Release the compressed pages, these came from alloc_page and * are not attached to the inode at all */ - index = 0; for (index = 0; index < cb->nr_pages; index++) { - page = cb->compressed_pages[index]; + struct page *page = cb->compressed_pages[index]; + page->mapping = NULL; put_page(page); } - /* finally free the cb struct */ + /* Finally free the cb struct */ kfree(cb->compressed_pages); kfree(cb); +} +/* + * do the cleanup once all the compressed pages hit the disk. + * This will clear writeback on the file pages and free the compressed + * pages. + * + * This also calls the writeback end hooks for the file pages so that + * metadata and checksums can be updated in the file. + */ +static void end_compressed_bio_write(struct bio *bio) +{ + struct compressed_bio *cb = bio->bi_private; + + if (!dec_and_test_compressed_bio(cb, bio)) + goto out; + + btrfs_record_physical_zoned(cb->inode, cb->start, bio); + + if (bio->bi_status) + cb->errors = 1; + finish_compressed_bio_write(cb); out: bio_put(bio); } @@ -491,18 +499,18 @@ blk_status_t btrfs_submit_compressed_write(struct btrfs_inode *inode, u64 start, atomic_inc(&cb->pending_bios); ret = btrfs_bio_wq_end_io(fs_info, bio, BTRFS_WQ_ENDIO_DATA); - BUG_ON(ret); /* -ENOMEM */ + if (ret) + goto finish_cb; if (!skip_sum) { ret = btrfs_csum_one_bio(inode, bio, start, 1); - BUG_ON(ret); /* -ENOMEM */ + if (ret) + goto finish_cb; } ret = btrfs_map_bio(fs_info, bio, 0); - if (ret) { - bio->bi_status = ret; - bio_endio(bio); - } + if (ret) + goto finish_cb; bio = btrfs_bio_alloc(first_byte); bio->bi_opf = bio_op | write_flags; @@ -528,23 +536,59 @@ blk_status_t btrfs_submit_compressed_write(struct btrfs_inode *inode, u64 start, atomic_inc(&cb->pending_bios); ret = btrfs_bio_wq_end_io(fs_info, bio, BTRFS_WQ_ENDIO_DATA); - BUG_ON(ret); /* -ENOMEM */ + if (ret) + goto last_bio; if (!skip_sum) { ret = btrfs_csum_one_bio(inode, bio, start, 1); - BUG_ON(ret); /* -ENOMEM */ + if (ret) + goto last_bio; } ret = btrfs_map_bio(fs_info, bio, 0); - if (ret) { - bio->bi_status = ret; - bio_endio(bio); - } + if (ret) + goto last_bio; if (blkcg_css) kthread_associate_blkcg(NULL); return 0; + +last_bio: + cb->errors = 1; + bio->bi_status = ret; + /* + * This bio is the last bio, as long as it finishes, it will free the + * compressed_bio, thus we don't need to bother finishing the + * compressed_bio. + */ + bio_endio(bio); + return ret; + +finish_cb: + cb->errors = 1; + if (bio) { + bio->bi_status = ret; + + /* + * For write bio we may have zoned info, manually handle it + * first + */ + btrfs_record_physical_zoned(cb->inode, cb->start, bio); + + /* Now we can safely end the bio */ + bio_endio(bio); + } + + /* + * Even with previous bio ended, we should still have io not yet + * submitted, thus need to finish manually. + */ + ASSERT(atomic_read(&cb->io_sectors)); + wait_event(cb->pending_bio_wait, atomic_read(&cb->pending_bios) == 0); + /* Now we are the only one referring @cb, can finish it safely. */ + finish_compressed_bio_write(cb); + return ret; } static u64 bio_end_offset(struct bio *bio) -- 2.32.0