From patchwork Fri Jan 17 12:51:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Thumshirn X-Patchwork-Id: 11338961 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 34CFA6C1 for ; Fri, 17 Jan 2020 12:51:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F315324685 for ; Fri, 17 Jan 2020 12:51:13 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=wdc.com header.i=@wdc.com header.b="ilGB7SRx" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726974AbgAQMvM (ORCPT ); Fri, 17 Jan 2020 07:51:12 -0500 Received: from esa1.hgst.iphmx.com ([68.232.141.245]:51277 "EHLO esa1.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726936AbgAQMvM (ORCPT ); Fri, 17 Jan 2020 07:51:12 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1579265472; x=1610801472; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=OhMw4LY1G6uS8EAgIEblclvhtEtzYdK67n7w4ZlDcKA=; b=ilGB7SRx8Yx2idNfnuHE+2YXnA4pqYC6VahOgnuvjrzYq6CA/7gDQZBG cOJrUuWQhofN7tkQBNJbLOg+uZ81J9MbZs1oBtFimPLPcOAwQcSURYwKp Yg/M1f99R5QYSrJ2lYI+QhDt9xxLowydGPhXKf21pQmEWdP3h8lr2o/j9 9Mcsn2T9EUFo9Fl3ywIOWufLmA4pFe3YP/LSecR1/cmE1QY32uMTdigNO VERPq1wdWBtWpxiR33LlimoY2263rO52mTRtKdX6ipCNLzly8cX6pdTv/ h0OAFLgFR+V7hihTKlxrm3oMaCn09YfL9NtZXPXOTiCuqftqzjKbCshPM Q==; IronPort-SDR: Eqx82xe25k5Go7zrK7oojPkVKIX+GM9A7wqsQ5qhGaQ4NtwbZlWHPTIJhX55dGaICdvT/0gNJs JjLHU/xJhy8q0FN/N22Udlsfs0XdNIl82EbtK9enGxlNnHtAzxZ3ubzL/Y3oyfk7uMDBnhrUyA 5NxBdDOAzkTEleOJrgPrEYNnluxDQxza3z12MOuMMXTZR3hJMlS36m65FMbjT8wXyaSpkF2P03 R8uuvFlXvouvOCBaXQ4EFTWHT7ZjwTNGaPaUnbjQsHFZrbZ0p9FJjIfMV4XZ58I5hu+oigQZ/j mO8= X-IronPort-AV: E=Sophos;i="5.70,330,1574092800"; d="scan'208";a="235550979" Received: from uls-op-cesaip01.wdc.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 17 Jan 2020 20:51:11 +0800 IronPort-SDR: iXw8Ss6m+fLj1k3E6Fqgh+8KAoMFjP0HagKHm/RNstR3uhalDKR+xborKxJOSMrsptQmhER87M Hin8GPGDx1W4vDnnpHGL3zmkPmzEtfaRGsRF+V/M1FSe6JBN0USsItNxGYz1npcVRwnqGZ3sNk 52sWRgPntvX3QcGV9XoLYVpPbHBtLCX2Q09a+L0Is9XAhpjeuAXUZlM3eI1PzvkuFSUbrkbRYx gJWJkHF6sbuTjjZQNoc7y1VNZ3f88u6eepa29CdekSbSBnaWjJ8Y9M07CIS0hHr0Y2bEgDxCIc Vh7Hhgm3mzuI7ucMxlnpWRIc Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Jan 2020 04:44:45 -0800 IronPort-SDR: HZfHXIUquzaYOwy4LW5sEJ3bymGB/6EJLpK2wLwl9DUdf+4EnO4sEYW14YjxcwckUsGqbkDCyd ZJDow7dcCHbKMxtAMiIf5doci9QqYHJeaJjrcC7hOJeFYj1ptD8epjkedL6O+OkOsEe45Xbou5 D0v79RzFsbkR0DuvHR6zEJuH1MXHvZkEnuVczhrwKWWX1BLv9GQCarle23XomTqBeIfJrZEo2n bh4KygHpIkhXwWKx3RoudyeNqAnhLmPsVhm4NHz7FvXvX04qWsm3N8ngl0kTwlZcmfTMe+4uA7 pTg= WDCIronportException: Internal Received: from unknown (HELO redsun60.ssa.fujisawa.hgst.com) ([10.149.66.36]) by uls-op-cesaip02.wdc.com with ESMTP; 17 Jan 2020 04:51:11 -0800 From: Johannes Thumshirn To: David Sterba Cc: Nikolay Borisov , linux-btrfs@vger.kernel.org, Johannes Thumshirn Subject: [PATCH 1/5] btrfs: remove buffer heads from super block reading Date: Fri, 17 Jan 2020 21:51:01 +0900 Message-Id: <20200117125105.20989-2-johannes.thumshirn@wdc.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200117125105.20989-1-johannes.thumshirn@wdc.com> References: <20200117125105.20989-1-johannes.thumshirn@wdc.com> MIME-Version: 1.0 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org Super-block reading in BTRFS is done using buffer_heads. Buffer_heads have some drawbacks, like not being able to propagate errors from the lower layers. Change the buffer_heads to BIOs. Signed-off-by: Johannes Thumshirn Reviewed-by: Nikolay Borisov --- fs/btrfs/disk-io.c | 80 +++++++++++++++++++++++++++------------------- fs/btrfs/disk-io.h | 4 +-- fs/btrfs/volumes.c | 64 ++++++++++++++++++++++--------------- fs/btrfs/volumes.h | 2 -- 4 files changed, 88 insertions(+), 62 deletions(-) diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 5ce2801f8388..50c93ffe8d03 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -2635,11 +2635,11 @@ int __cold open_ctree(struct super_block *sb, u64 features; u16 csum_type; struct btrfs_key location; - struct buffer_head *bh; struct btrfs_super_block *disk_super; struct btrfs_fs_info *fs_info = btrfs_sb(sb); struct btrfs_root *tree_root; struct btrfs_root *chunk_root; + struct page *super_page; int ret; int err = -EINVAL; int clear_free_space_tree = 0; @@ -2832,39 +2832,37 @@ int __cold open_ctree(struct super_block *sb, /* * Read super block and check the signature bytes only */ - bh = btrfs_read_dev_super(fs_devices->latest_bdev); - if (IS_ERR(bh)) { - err = PTR_ERR(bh); - goto fail_alloc; + ret = btrfs_read_dev_super(fs_devices->latest_bdev, &super_page); + if (ret) { + err = ret; + goto fail_page_alloc; } /* * Verify the type first, if that or the the checksum value are * corrupted, we'll find out */ - csum_type = btrfs_super_csum_type((struct btrfs_super_block *)bh->b_data); + csum_type = btrfs_super_csum_type(page_address(super_page)); if (!btrfs_supported_super_csum(csum_type)) { btrfs_err(fs_info, "unsupported checksum algorithm: %u", csum_type); err = -EINVAL; - brelse(bh); - goto fail_alloc; + goto fail_page_alloc; } ret = btrfs_init_csum_hash(fs_info, csum_type); if (ret) { err = ret; - goto fail_alloc; + goto fail_page_alloc; } /* * We want to check superblock checksum, the type is stored inside. * Pass the whole disk block of size BTRFS_SUPER_INFO_SIZE (4k). */ - if (btrfs_check_super_csum(fs_info, bh->b_data)) { + if (btrfs_check_super_csum(fs_info, page_address(super_page))) { btrfs_err(fs_info, "superblock checksum mismatch"); err = -EINVAL; - brelse(bh); goto fail_csum; } @@ -2873,8 +2871,9 @@ int __cold open_ctree(struct super_block *sb, * following bytes up to INFO_SIZE, the checksum is calculated from * the whole block of INFO_SIZE */ - memcpy(fs_info->super_copy, bh->b_data, sizeof(*fs_info->super_copy)); - brelse(bh); + memcpy(fs_info->super_copy, page_address(super_page), + sizeof(*fs_info->super_copy)); + __free_page(super_page); disk_super = fs_info->super_copy; @@ -3330,6 +3329,8 @@ int __cold open_ctree(struct super_block *sb, btrfs_free_block_groups(fs_info); fail_csum: btrfs_free_csum_hash(fs_info); +fail_page_alloc: + __free_page(super_page); fail_alloc: fail_iput: btrfs_mapping_tree_free(&fs_info->mapping_tree); @@ -3374,40 +3375,52 @@ static void btrfs_end_buffer_write_sync(struct buffer_head *bh, int uptodate) } int btrfs_read_dev_one_super(struct block_device *bdev, int copy_num, - struct buffer_head **bh_ret) + struct page **super_page) { - struct buffer_head *bh; struct btrfs_super_block *super; + struct bio_vec bio_vec; + struct bio bio; + struct page *page; u64 bytenr; + gfp_t gfp_mask = mapping_gfp_constraint(bdev->bd_inode->i_mapping, + ~__GFP_FS) | __GFP_NOFAIL; + int ret; bytenr = btrfs_sb_offset(copy_num); if (bytenr + BTRFS_SUPER_INFO_SIZE >= i_size_read(bdev->bd_inode)) return -EINVAL; - bh = __bread(bdev, bytenr / BTRFS_BDEV_BLOCKSIZE, BTRFS_SUPER_INFO_SIZE); + page = alloc_page(gfp_mask); + if (!page) + return -ENOMEM; + + bio_init(&bio, &bio_vec, 1); + bio.bi_iter.bi_sector = bytenr >> SECTOR_SHIFT; + bio_set_dev(&bio, bdev); + bio_set_op_attrs(&bio, REQ_OP_READ, 0); + bio_add_page(&bio, page, BTRFS_SUPER_INFO_SIZE, 0); + + ret = submit_bio_wait(&bio); /* * If we fail to read from the underlying devices, as of now * the best option we have is to mark it EIO. */ - if (!bh) + if (ret) return -EIO; - super = (struct btrfs_super_block *)bh->b_data; + super = page_address(page); if (btrfs_super_bytenr(super) != bytenr || - btrfs_super_magic(super) != BTRFS_MAGIC) { - brelse(bh); + btrfs_super_magic(super) != BTRFS_MAGIC) return -EINVAL; - } - *bh_ret = bh; + *super_page = page; return 0; } -struct buffer_head *btrfs_read_dev_super(struct block_device *bdev) +int btrfs_read_dev_super(struct block_device *bdev, struct page **page) { - struct buffer_head *bh; - struct buffer_head *latest = NULL; + struct page *latest = NULL; struct btrfs_super_block *super; int i; u64 transid = 0; @@ -3419,25 +3432,26 @@ struct buffer_head *btrfs_read_dev_super(struct block_device *bdev) * later supers, using BTRFS_SUPER_MIRROR_MAX instead */ for (i = 0; i < 1; i++) { - ret = btrfs_read_dev_one_super(bdev, i, &bh); + ret = btrfs_read_dev_one_super(bdev, i, page); if (ret) continue; - super = (struct btrfs_super_block *)bh->b_data; + super = page_address(*page); if (!latest || btrfs_super_generation(super) > transid) { - brelse(latest); - latest = bh; + if (latest) + __free_page(latest); + latest = *page; transid = btrfs_super_generation(super); } else { - brelse(bh); + __free_page(*page); } } - if (!latest) - return ERR_PTR(ret); + if (ret) + return ret; - return latest; + return 0; } /* diff --git a/fs/btrfs/disk-io.h b/fs/btrfs/disk-io.h index 8c2d6cf1ce59..e04b233c436a 100644 --- a/fs/btrfs/disk-io.h +++ b/fs/btrfs/disk-io.h @@ -54,9 +54,9 @@ int __cold open_ctree(struct super_block *sb, char *options); void __cold close_ctree(struct btrfs_fs_info *fs_info); int write_all_supers(struct btrfs_fs_info *fs_info, int max_mirrors); -struct buffer_head *btrfs_read_dev_super(struct block_device *bdev); +int btrfs_read_dev_super(struct block_device *bdev, struct page **super_page); int btrfs_read_dev_one_super(struct block_device *bdev, int copy_num, - struct buffer_head **bh_ret); + struct page **super_page); int btrfs_commit_super(struct btrfs_fs_info *fs_info); struct btrfs_root *btrfs_read_fs_root(struct btrfs_root *tree_root, struct btrfs_key *location); diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index 3d5714bf2e32..4aded417a7d1 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -6,7 +6,6 @@ #include #include #include -#include #include #include #include @@ -492,7 +491,7 @@ static noinline struct btrfs_fs_devices *find_fsid( static int btrfs_get_bdev_and_sb(const char *device_path, fmode_t flags, void *holder, int flush, struct block_device **bdev, - struct buffer_head **bh) + struct page **super_page) { int ret; @@ -511,9 +510,8 @@ btrfs_get_bdev_and_sb(const char *device_path, fmode_t flags, void *holder, goto error; } invalidate_bdev(*bdev); - *bh = btrfs_read_dev_super(*bdev); - if (IS_ERR(*bh)) { - ret = PTR_ERR(*bh); + ret = btrfs_read_dev_super(*bdev, super_page); + if (ret) { blkdev_put(*bdev, flags); goto error; } @@ -522,7 +520,6 @@ btrfs_get_bdev_and_sb(const char *device_path, fmode_t flags, void *holder, error: *bdev = NULL; - *bh = NULL; return ret; } @@ -603,7 +600,7 @@ static int btrfs_open_one_device(struct btrfs_fs_devices *fs_devices, { struct request_queue *q; struct block_device *bdev; - struct buffer_head *bh; + struct page *super_page; struct btrfs_super_block *disk_super; u64 devid; int ret; @@ -614,17 +611,17 @@ static int btrfs_open_one_device(struct btrfs_fs_devices *fs_devices, return -EINVAL; ret = btrfs_get_bdev_and_sb(device->name->str, flags, holder, 1, - &bdev, &bh); + &bdev, &super_page); if (ret) return ret; - disk_super = (struct btrfs_super_block *)bh->b_data; + disk_super = page_address(super_page); devid = btrfs_stack_device_id(&disk_super->dev_item); if (devid != device->devid) - goto error_brelse; + goto error_free_page; if (memcmp(device->uuid, disk_super->dev_item.uuid, BTRFS_UUID_SIZE)) - goto error_brelse; + goto error_free_page; device->generation = btrfs_super_generation(disk_super); @@ -633,7 +630,7 @@ static int btrfs_open_one_device(struct btrfs_fs_devices *fs_devices, BTRFS_FEATURE_INCOMPAT_METADATA_UUID) { pr_err( "BTRFS: Invalid seeding and uuid-changed device detected\n"); - goto error_brelse; + goto error_free_page; } clear_bit(BTRFS_DEV_STATE_WRITEABLE, &device->dev_state); @@ -659,12 +656,12 @@ static int btrfs_open_one_device(struct btrfs_fs_devices *fs_devices, fs_devices->rw_devices++; list_add_tail(&device->dev_alloc_list, &fs_devices->alloc_list); } - brelse(bh); + __free_page(super_page); return 0; -error_brelse: - brelse(bh); +error_free_page: + __free_page(super_page); blkdev_put(bdev, flags); return -EINVAL; @@ -2164,14 +2161,15 @@ static struct btrfs_device *btrfs_find_device_by_path( u64 devid; u8 *dev_uuid; struct block_device *bdev; - struct buffer_head *bh; + struct page *super_page; struct btrfs_device *device; ret = btrfs_get_bdev_and_sb(device_path, FMODE_READ, - fs_info->bdev_holder, 0, &bdev, &bh); + fs_info->bdev_holder, 0, &bdev, + &super_page); if (ret) return ERR_PTR(ret); - disk_super = (struct btrfs_super_block *)bh->b_data; + disk_super = page_address(super_page); devid = btrfs_stack_device_id(&disk_super->dev_item); dev_uuid = disk_super->dev_item.uuid; if (btrfs_fs_incompat(fs_info, METADATA_UUID)) @@ -2181,7 +2179,7 @@ static struct btrfs_device *btrfs_find_device_by_path( device = btrfs_find_device(fs_info->fs_devices, devid, dev_uuid, disk_super->fsid, true); - brelse(bh); + __free_page(super_page); if (!device) device = ERR_PTR(-ENOENT); blkdev_put(bdev, FMODE_READ); @@ -7270,25 +7268,41 @@ int btrfs_get_dev_stats(struct btrfs_fs_info *fs_info, void btrfs_scratch_superblocks(struct block_device *bdev, const char *device_path) { - struct buffer_head *bh; + struct page *super_page; + struct bio_vec bio_vec; + struct bio bio; struct btrfs_super_block *disk_super; int copy_num; + int ret; if (!bdev) return; + bio_init(&bio, &bio_vec, 1); for (copy_num = 0; copy_num < BTRFS_SUPER_MIRROR_MAX; copy_num++) { + u64 bytenr; - if (btrfs_read_dev_one_super(bdev, copy_num, &bh)) + if (btrfs_read_dev_one_super(bdev, copy_num, &super_page)) continue; - disk_super = (struct btrfs_super_block *)bh->b_data; + disk_super = page_address(super_page); memset(&disk_super->magic, 0, sizeof(disk_super->magic)); - set_buffer_dirty(bh); - sync_dirty_buffer(bh); - brelse(bh); + + bytenr = btrfs_sb_offset(copy_num); + + bio.bi_iter.bi_sector = bytenr >> SECTOR_SHIFT; + bio_set_dev(&bio, bdev); + bio_set_op_attrs(&bio, REQ_OP_WRITE, 0); + bio_add_page(&bio, super_page, PAGE_SIZE, 0); + + ret = submit_bio_wait(&bio); + WARN_ON(ret); + + __free_page(super_page); + bio_reset(&bio); + } /* Notify udev that device has changed */ diff --git a/fs/btrfs/volumes.h b/fs/btrfs/volumes.h index 9c7d4fe5c39a..46a65b15eb93 100644 --- a/fs/btrfs/volumes.h +++ b/fs/btrfs/volumes.h @@ -17,8 +17,6 @@ extern struct mutex uuid_mutex; #define BTRFS_STRIPE_LEN SZ_64K -struct buffer_head; - struct btrfs_io_geometry { /* remaining bytes before crossing a stripe */ u64 len; From patchwork Fri Jan 17 12:51:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Thumshirn X-Patchwork-Id: 11338965 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E86FD6C1 for ; Fri, 17 Jan 2020 12:51:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BD4E724681 for ; Fri, 17 Jan 2020 12:51:14 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=wdc.com header.i=@wdc.com header.b="kgcvtENL" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726956AbgAQMvO (ORCPT ); Fri, 17 Jan 2020 07:51:14 -0500 Received: from esa1.hgst.iphmx.com ([68.232.141.245]:51277 "EHLO esa1.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726936AbgAQMvN (ORCPT ); Fri, 17 Jan 2020 07:51:13 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1579265472; x=1610801472; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=EXeMYQjQ9z7NroZQii20vxjEAYhUJDOqhpca2gEApo0=; b=kgcvtENLNK6JVrrKEKFQ803pYdlL16eOMJ2ztDEM5ip8G3H4riMlKRv/ WNuC0ncqv7DxXqddy/Bg/H/rWbFJ3S+CSjySgGyqWktoNEczqiNcWD5/E rmnumpVCreP8MAx/WovfzPKsZGIEpA57okHwtdOpM7VvchFBVQ6sQmX/n 8E0pyuXysj59uCIVKp0S0f6xZqW6mfXs9zCbKloMQ+tjzkBA0hdo4R1em QyuHMdv+HcC0+fX5NR669mv1KWhiLrlINTh81NtzoeEIovk43ciOUbmuT pW7qUjyoSRKMcl0EAJwxA1MqJSaD6Y3qKbWdrkZAgNUtXdxYvpOVCTtej w==; IronPort-SDR: 9XgxaOwtCcCGepyVxVFYzx3gV8Fxpt13ghFLxvl0niaV7qOPKd6FObIeUuzDJBvNFuDsMpShuQ zw7mVH3QLPa96K7pVR6JbN1DLoqFpkl1jHUV2Sne1Fh5rT/AELWaQGlmC+VMFZYM7nI4Yf0k+6 MW/hVEOB6o3rAP52uJ899fnEupwZTdI6DCoemYnoXAWSUWbz61N14W5lH/pSsHo4vVJRQ5mPpA kmTTs/USFArT5pM+UcnWh7iUls49DVc8KESMFfIErAW4NAii3DZvNE+nOfBGOMaQdbm6XEXTVB 3p0= X-IronPort-AV: E=Sophos;i="5.70,330,1574092800"; d="scan'208";a="235550981" Received: from uls-op-cesaip01.wdc.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 17 Jan 2020 20:51:12 +0800 IronPort-SDR: gKNX/ozUPeIy3F854LIrvVLS6MMcQxxVvX6FTPRQdK38VJlvdqyz7XRkiKrjOxv9jFVwiCGEuF V+as9VIwJvv0zrtV81YBwEXRX4NSKVD56BNKipN4nyQNnEv7kN/8pyB4JXacBMsY5tknBRciG3 WH2JCGT2GqLOftLHZdvi5PGHG0Isq+nSbQKa0DA/laKxuleRFDWdzhG9R+rll0XcXgy3rOh0dd +8sY+4MsGBlzO8fa8dbVbIRJKwm01j7VzTJQ5pQjgSnAbevXvOJ2D7YxC/1Y4D62HdmTHo9tDH 5LYypCFJQ+tIm5vRdDFwornP Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Jan 2020 04:44:46 -0800 IronPort-SDR: YgZwDjj7LQBhruZlRXtuJ22kkdY4XJUDU115i8j3Ti/qmJZE64z9TiumWSbz8pmieS/z8PNAZY xSfAQtoWiebMnuYhQpg6g4ouhn/4iC3A+gogTP55XcZjy6Z27MeNdLQkXmT8qXTuKIpbB8n+8y mVftywHpWuCDdAt/XDFHCqYrfrwUfgPcCVu6dBJi0lf3b5cTyAoyE3bgzr3EYdgCmn2OaTOefF 9c/7UTgaEmMcZqP3xFZ99+tQjzmUjLNfoF5dgdj9Vnmilt+UPuiQN7YY13g9qs92g+Kw82bzlo TUs= WDCIronportException: Internal Received: from unknown (HELO redsun60.ssa.fujisawa.hgst.com) ([10.149.66.36]) by uls-op-cesaip02.wdc.com with ESMTP; 17 Jan 2020 04:51:12 -0800 From: Johannes Thumshirn To: David Sterba Cc: Nikolay Borisov , linux-btrfs@vger.kernel.org, Johannes Thumshirn Subject: [PATCH 2/5] btrfs: remove use of buffer_heads from superblock writeout Date: Fri, 17 Jan 2020 21:51:02 +0900 Message-Id: <20200117125105.20989-3-johannes.thumshirn@wdc.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200117125105.20989-1-johannes.thumshirn@wdc.com> References: <20200117125105.20989-1-johannes.thumshirn@wdc.com> MIME-Version: 1.0 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org Similar to the superblock read path, change the write path to using BIOs and pages instead of buffer_heads. This is based on a patch originally authored by Nikolay Borisov. Co-developed-by: Nikolay Borisov Signed-off-by: Johannes Thumshirn --- fs/btrfs/disk-io.c | 107 ++++++++++++++++++++++++++------------------- 1 file changed, 61 insertions(+), 46 deletions(-) diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 50c93ffe8d03..51e7b832c8fd 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -3353,25 +3353,33 @@ int __cold open_ctree(struct super_block *sb, } ALLOW_ERROR_INJECTION(open_ctree, ERRNO); -static void btrfs_end_buffer_write_sync(struct buffer_head *bh, int uptodate) +static void btrfs_end_super_write(struct bio *bio) { - if (uptodate) { - set_buffer_uptodate(bh); - } else { - struct btrfs_device *device = (struct btrfs_device *) - bh->b_private; - - btrfs_warn_rl_in_rcu(device->fs_info, - "lost page write due to IO error on %s", - rcu_str_deref(device->name)); - /* note, we don't set_buffer_write_io_error because we have - * our own ways of dealing with the IO errors - */ - clear_buffer_uptodate(bh); - btrfs_dev_stat_inc_and_print(device, BTRFS_DEV_STAT_WRITE_ERRS); + struct btrfs_device *device = bio->bi_private; + struct bio_vec *bvec; + struct bvec_iter_all iter_all; + struct page *page; + + bio_for_each_segment_all(bvec, bio, iter_all) { + page = bvec->bv_page; + + if (blk_status_to_errno(bio->bi_status)) { + btrfs_warn_rl_in_rcu(device->fs_info, + "lost page write due to IO error on %s", + rcu_str_deref(device->name)); + ClearPageUptodate(page); + SetPageError(page); + btrfs_dev_stat_inc_and_print(device, + BTRFS_DEV_STAT_WRITE_ERRS); + } else { + SetPageUptodate(page); + } + + put_page(page); + unlock_page(page); } - unlock_buffer(bh); - put_bh(bh); + + bio_put(bio); } int btrfs_read_dev_one_super(struct block_device *bdev, int copy_num, @@ -3462,16 +3470,15 @@ int btrfs_read_dev_super(struct block_device *bdev, struct page **page) * the expected device size at commit time. Note that max_mirrors must be * same for write and wait phases. * - * Return number of errors when buffer head is not found or submission fails. + * Return number of errors when page is not found or submission fails. */ static int write_dev_supers(struct btrfs_device *device, struct btrfs_super_block *sb, int max_mirrors) { struct btrfs_fs_info *fs_info = device->fs_info; SHASH_DESC_ON_STACK(shash, fs_info->csum_shash); - struct buffer_head *bh; + gfp_t gfp_mask; int i; - int ret; int errors = 0; u64 bytenr; int op_flags; @@ -3481,7 +3488,13 @@ static int write_dev_supers(struct btrfs_device *device, shash->tfm = fs_info->csum_shash; + gfp_mask = mapping_gfp_constraint(device->bdev->bd_inode->i_mapping, + ~__GFP_FS) | __GFP_NOFAIL; + for (i = 0; i < max_mirrors; i++) { + struct page *page; + struct bio *bio; + bytenr = btrfs_sb_offset(i); if (bytenr + BTRFS_SUPER_INFO_SIZE >= device->commit_total_bytes) @@ -3494,26 +3507,20 @@ static int write_dev_supers(struct btrfs_device *device, BTRFS_SUPER_INFO_SIZE - BTRFS_CSUM_SIZE); crypto_shash_final(shash, sb->csum); - /* One reference for us, and we leave it for the caller */ - bh = __getblk(device->bdev, bytenr / BTRFS_BDEV_BLOCKSIZE, - BTRFS_SUPER_INFO_SIZE); - if (!bh) { + page = find_or_create_page(device->bdev->bd_inode->i_mapping, + bytenr >> PAGE_SHIFT, gfp_mask); + if (!page) { btrfs_err(device->fs_info, - "couldn't get super buffer head for bytenr %llu", + "couldn't get superblock page for bytenr %llu", bytenr); errors++; continue; } - memcpy(bh->b_data, sb, BTRFS_SUPER_INFO_SIZE); + /* Bump the refcount for wait_dev_supers() */ + get_page(page); - /* one reference for submit_bh */ - get_bh(bh); - - set_buffer_uptodate(bh); - lock_buffer(bh); - bh->b_end_io = btrfs_end_buffer_write_sync; - bh->b_private = device; + memcpy(page_address(page), sb, BTRFS_SUPER_INFO_SIZE); /* * we fua the first super. The others we allow @@ -3522,9 +3529,17 @@ static int write_dev_supers(struct btrfs_device *device, op_flags = REQ_SYNC | REQ_META | REQ_PRIO; if (i == 0 && !btrfs_test_opt(device->fs_info, NOBARRIER)) op_flags |= REQ_FUA; - ret = btrfsic_submit_bh(REQ_OP_WRITE, op_flags, bh); - if (ret) - errors++; + + bio = bio_alloc(gfp_mask, 1); + bio_set_dev(bio, device->bdev); + bio->bi_iter.bi_sector = bytenr >> SECTOR_SHIFT; + bio->bi_private = device; + bio->bi_end_io = btrfs_end_super_write; + bio_add_page(bio, page, BTRFS_SUPER_INFO_SIZE, + offset_in_page(bytenr)); + + bio_set_op_attrs(bio, REQ_OP_WRITE, op_flags); + btrfsic_submit_bio(bio); } return errors < i ? 0 : -1; } @@ -3533,12 +3548,11 @@ static int write_dev_supers(struct btrfs_device *device, * Wait for write completion of superblocks done by write_dev_supers, * @max_mirrors same for write and wait phases. * - * Return number of errors when buffer head is not found or not marked up to + * Return number of errors when page is not found or not marked up to * date. */ static int wait_dev_supers(struct btrfs_device *device, int max_mirrors) { - struct buffer_head *bh; int i; int errors = 0; bool primary_failed = false; @@ -3548,32 +3562,33 @@ static int wait_dev_supers(struct btrfs_device *device, int max_mirrors) max_mirrors = BTRFS_SUPER_MIRROR_MAX; for (i = 0; i < max_mirrors; i++) { + struct page *page; + bytenr = btrfs_sb_offset(i); if (bytenr + BTRFS_SUPER_INFO_SIZE >= device->commit_total_bytes) break; - bh = __find_get_block(device->bdev, - bytenr / BTRFS_BDEV_BLOCKSIZE, - BTRFS_SUPER_INFO_SIZE); - if (!bh) { + page = find_get_page(device->bdev->bd_inode->i_mapping, + bytenr >> PAGE_SHIFT); + if (!page) { errors++; if (i == 0) primary_failed = true; continue; } - wait_on_buffer(bh); - if (!buffer_uptodate(bh)) { + wait_on_page_locked(page); + if (PageError(page)) { errors++; if (i == 0) primary_failed = true; } /* drop our reference */ - brelse(bh); + put_page(page); /* drop the reference from the writing run */ - brelse(bh); + put_page(page); } /* log error, force error return */ From patchwork Fri Jan 17 12:51:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Thumshirn X-Patchwork-Id: 11338969 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D76FD17EA for ; Fri, 17 Jan 2020 12:51:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B61C92467D for ; Fri, 17 Jan 2020 12:51:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=wdc.com header.i=@wdc.com header.b="IF0AhVTb" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727007AbgAQMvP (ORCPT ); Fri, 17 Jan 2020 07:51:15 -0500 Received: from esa1.hgst.iphmx.com ([68.232.141.245]:51277 "EHLO esa1.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726999AbgAQMvO (ORCPT ); Fri, 17 Jan 2020 07:51:14 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1579265473; x=1610801473; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Hy71lNTVcbuLCRAZWfy0CvPCGTtjoMyaOm7eapCokFs=; b=IF0AhVTbbh6UTh044HlKDNwG+I8wjzkhAkwHZy3UR+m8hyLVu6D6vklb 24eHK8DRZkRL79SrZd8TC8pOfOTa0rn5qI3ADAC+XjK8P1pwQnfSNvHtA fbjyowISqkvnIgTBdOVJhv0ZmA898bmLElAqXmkSodu1CraVdFXaPHMbK gBPW8AYwINY5Ml/yQofLI5oFtw1yb0qXht42V0MUGtg8vUYMnFWZ1Sg0m du1h244xbz4gWcJL9Pt0Fk1Uztww0x0hseu8s7+2pEz9A/IbowFJ4wg4o XjEkWKCV8Ev1M8GZAvtAlxWff5dNIPwgUZJiXYnGtx2RzLIU7VAZtID1z g==; IronPort-SDR: QQHsi2p/bbiv74sFBZ2/ga4S7hC8UqGD8yj0qNxBFPt0q+1a4QDSoRbn9nJyuV6LZzbvjTHKmR GkP1nRylRT64aMMXqiwiUf04H0RB8UPDjSezZWXbl1ZXPxjCWAWYPhGZHSU1Yw5Whh+ueeUtN+ gyV/qzbrwiz22gegiXvnnIMXcTV12Cn0ZywO4GoyHELXUkfnbyqWS6x0D6BTyOvHjKa1QYCxj/ Cp5Z1DCvd0PoJb2mR3fMwWZ83XbZO2e1K1EfgU/HkytuSlhWQ7MVHtXK0VabCgPQ2o5ueoaT1/ jBU= X-IronPort-AV: E=Sophos;i="5.70,330,1574092800"; d="scan'208";a="235550982" Received: from uls-op-cesaip01.wdc.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 17 Jan 2020 20:51:13 +0800 IronPort-SDR: Q1FqhbQq9+e+z0JTr7/h5VMbQDHvT7eVYjT4NQyW1dMP1ad0HBsX08BoDgr3RlzZzf+EZ4Ozgw ST1bnD0Ltr23PX2g7paqeerx5fzSEvyQVmnDErR1CSQgKrA9G23nZaHnuC06nOSUifm+K4/ZRx VL/X8SvuYhp4H/8R9lVQdfsPXQHcgqhc5FlDLUsd3aRuoTwBXbwiCBNtaY1TgC+kZe/2np4YV/ ujCm0/rOtnzn4zXzwTLjfN/JgntHGLMiFPcGADGAzaF702WakkV2bUCijVtSi+9Wf6zw1vdOVX y01T/4Pd3lhA56jXVxG9vo2+ Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Jan 2020 04:44:46 -0800 IronPort-SDR: 7HSKw/ZWPzMTuwmilheeaROFYz3b7Hr+VSHowo8ueDE0bf/FAfEd0al4ltFPb74Z3Stutn87c/ E/C50Mh7OlvtsPCEwtcs38hU6DOVNyokp/q29IcHzbVjnbCSNqpVRqcKP0/cdXF9YdfUOfmJ8J ka5TesbdxnIXgm2XWWG3bbJB1ggWhgL/ZHYmmLTivoX8p3sDwEjKBOrP02Ft2D0sFlrb294j3e eOCPkfAZxfgYVMU44aTA2mNPaJEVQ+70vmt8dhUQ89e8s1DnPnB0KI0HmRXUjtTOIgmyIHU1BA mFY= WDCIronportException: Internal Received: from unknown (HELO redsun60.ssa.fujisawa.hgst.com) ([10.149.66.36]) by uls-op-cesaip02.wdc.com with ESMTP; 17 Jan 2020 04:51:13 -0800 From: Johannes Thumshirn To: David Sterba Cc: Nikolay Borisov , linux-btrfs@vger.kernel.org, Johannes Thumshirn Subject: [PATCH 3/5] btrfs: remove btrfsic_submit_bh() Date: Fri, 17 Jan 2020 21:51:03 +0900 Message-Id: <20200117125105.20989-4-johannes.thumshirn@wdc.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200117125105.20989-1-johannes.thumshirn@wdc.com> References: <20200117125105.20989-1-johannes.thumshirn@wdc.com> MIME-Version: 1.0 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org Now that the last use of btrfsic_submit_bh() is gone, remove the function as well. Signed-off-by: Johannes Thumshirn Reviewed-by: Nikolay Borisov --- fs/btrfs/check-integrity.c | 57 -------------------------------------- fs/btrfs/check-integrity.h | 2 -- 2 files changed, 59 deletions(-) diff --git a/fs/btrfs/check-integrity.c b/fs/btrfs/check-integrity.c index a0ce69f2d27c..e7507985435e 100644 --- a/fs/btrfs/check-integrity.c +++ b/fs/btrfs/check-integrity.c @@ -2730,63 +2730,6 @@ static struct btrfsic_dev_state *btrfsic_dev_state_lookup(dev_t dev) &btrfsic_dev_state_hashtable); } -int btrfsic_submit_bh(int op, int op_flags, struct buffer_head *bh) -{ - struct btrfsic_dev_state *dev_state; - - if (!btrfsic_is_initialized) - return submit_bh(op, op_flags, bh); - - mutex_lock(&btrfsic_mutex); - /* since btrfsic_submit_bh() might also be called before - * btrfsic_mount(), this might return NULL */ - dev_state = btrfsic_dev_state_lookup(bh->b_bdev->bd_dev); - - /* Only called to write the superblock (incl. FLUSH/FUA) */ - if (NULL != dev_state && - (op == REQ_OP_WRITE) && bh->b_size > 0) { - u64 dev_bytenr; - - dev_bytenr = BTRFS_BDEV_BLOCKSIZE * bh->b_blocknr; - if (dev_state->state->print_mask & - BTRFSIC_PRINT_MASK_SUBMIT_BIO_BH) - pr_info("submit_bh(op=0x%x,0x%x, blocknr=%llu (bytenr %llu), size=%zu, data=%p, bdev=%p)\n", - op, op_flags, (unsigned long long)bh->b_blocknr, - dev_bytenr, bh->b_size, bh->b_data, bh->b_bdev); - btrfsic_process_written_block(dev_state, dev_bytenr, - &bh->b_data, 1, NULL, - NULL, bh, op_flags); - } else if (NULL != dev_state && (op_flags & REQ_PREFLUSH)) { - if (dev_state->state->print_mask & - BTRFSIC_PRINT_MASK_SUBMIT_BIO_BH) - pr_info("submit_bh(op=0x%x,0x%x FLUSH, bdev=%p)\n", - op, op_flags, bh->b_bdev); - if (!dev_state->dummy_block_for_bio_bh_flush.is_iodone) { - if ((dev_state->state->print_mask & - (BTRFSIC_PRINT_MASK_SUBMIT_BIO_BH | - BTRFSIC_PRINT_MASK_VERBOSE))) - pr_info("btrfsic_submit_bh(%s) with FLUSH but dummy block already in use (ignored)!\n", - dev_state->name); - } else { - struct btrfsic_block *const block = - &dev_state->dummy_block_for_bio_bh_flush; - - block->is_iodone = 0; - block->never_written = 0; - block->iodone_w_error = 0; - block->flush_gen = dev_state->last_flush_gen + 1; - block->submit_bio_bh_rw = op_flags; - block->orig_bio_bh_private = bh->b_private; - block->orig_bio_bh_end_io.bh = bh->b_end_io; - block->next_in_same_bio = NULL; - bh->b_private = block; - bh->b_end_io = btrfsic_bh_end_io; - } - } - mutex_unlock(&btrfsic_mutex); - return submit_bh(op, op_flags, bh); -} - static void __btrfsic_submit_bio(struct bio *bio) { struct btrfsic_dev_state *dev_state; diff --git a/fs/btrfs/check-integrity.h b/fs/btrfs/check-integrity.h index 9bf4359cc44c..bcc730a06cb5 100644 --- a/fs/btrfs/check-integrity.h +++ b/fs/btrfs/check-integrity.h @@ -7,11 +7,9 @@ #define BTRFS_CHECK_INTEGRITY_H #ifdef CONFIG_BTRFS_FS_CHECK_INTEGRITY -int btrfsic_submit_bh(int op, int op_flags, struct buffer_head *bh); void btrfsic_submit_bio(struct bio *bio); int btrfsic_submit_bio_wait(struct bio *bio); #else -#define btrfsic_submit_bh submit_bh #define btrfsic_submit_bio submit_bio #define btrfsic_submit_bio_wait submit_bio_wait #endif From patchwork Fri Jan 17 12:51:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Thumshirn X-Patchwork-Id: 11338975 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6F8D913A0 for ; Fri, 17 Jan 2020 12:51:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4F0FE2467D for ; Fri, 17 Jan 2020 12:51:18 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=wdc.com header.i=@wdc.com header.b="fEHNyF5i" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727011AbgAQMvQ (ORCPT ); Fri, 17 Jan 2020 07:51:16 -0500 Received: from esa1.hgst.iphmx.com ([68.232.141.245]:51283 "EHLO esa1.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726936AbgAQMvP (ORCPT ); Fri, 17 Jan 2020 07:51:15 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1579265474; x=1610801474; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=EneM6WceyRrMsFpB6DnTbMPZ+dkv9q8AsWLcEvey984=; b=fEHNyF5i2GrR/NYC3KIylmvLw3FSIKDc1CKnsl/ZHDnkn9Sgf8EyWu8d nwHejSj1g1aBbJab/qXEeJ68tBCKr+vrzAa5JQ7fGTys48/x5lM9MT7Ew aBhlRa3ZOno5tjZ45Z/FqFoyZyHUmnVDLy74w8eE2NyHxeSPLXYU2F4IJ zL2YvHvZ+1ieFKWBAw4OWR5Lv5WIJVT2N2Rrv9bslfyZuSmiw/SMPYJJC REid+1Xbvweusuv/PPhLUBI95VfrAN1rhTLrY8Gzi13HEOrLvMYthc7a9 grhYxL/s6jhKSbV3Mcouk8MGn9UynUfby95s5TNA5eILp9hmHM86QdLTU A==; IronPort-SDR: iDsAajKqkWV4uT4IPTvT2VdOlYoLXfMJ1QmeAJGcyDSA22TXcm3mYUfyl4h3sg3e9+8O/Tm/qs zDrYmhr/VJ08xLxgUnaxz2V21eyWbEr51XLpHxbgqFRalV865QkjTsB31MSXfDjxVUgiR4Gyoe TZesXkcmdG/jSI3aAdrtagv+b7gSgG+z/bCkaa4RQt82xrjEQTCBuphZcwE6Nidw6CIfVaS889 yL53FaEevtIIl5zfSpJNxHELctNrsQ6lfwNa9W8q5Oz4duLdtMJ4X1f27NUPSiFcobAhiS84gZ yn8= X-IronPort-AV: E=Sophos;i="5.70,330,1574092800"; d="scan'208";a="235550983" Received: from uls-op-cesaip01.wdc.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 17 Jan 2020 20:51:14 +0800 IronPort-SDR: y0inL0dQAuBMGz08JHtN1c3H24xQ/NPefPkWkTK7b4uQNaYgbQFpfoPTf5OP4bDttrH+N/KIqc zoqD7u8pU3Wau0nD5St8SQbiXkCt4wbAU2Fc0AviHM5McCtIR9V+mdb5dugnNO51/ZJeoZ4la7 hkEElmnvnYZ9SMRqPo8D4KvBw0v2F4x9xOcxMEeYVceLKAecA6Hqfle91efcvZYKpLLO06slBY YJdu7mW5mA5TmRQQgohWMHrGVJuBeUKAmZ7/g/P41AgLo9ZI27rXRddTeyPeBDy6iRCybByYz9 BJ/eJNE1FcBHZweqWY2OkMWR Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Jan 2020 04:44:47 -0800 IronPort-SDR: /2jW+7iu6nTikyU2ZX24jU7pLaP2HrlAFtaAvzJruIPLujqwXGWo6j8h07f5ROOb3vAwVgaHqb To5/U9Ln2xW06B9HqpfMiPGPxoZgA+6Cu53nKcvHDV6s4rvuM3ssQaQ8WnRnqGE6KidVKxrQyJ Ci8bLVbg8SUVlC3ByuGxwzld2VzBDeBOwncq708rMA7eFGJI3HSBrDsToTFAD3EmU/aXD6HOWI Accbge9Bpp+cSHDsmsfWhntAVqNe9UwtJAX6zFgPpOhSDaSDbq/CoQ3GHm9bDMAmRnhx12Ki/k PzU= WDCIronportException: Internal Received: from unknown (HELO redsun60.ssa.fujisawa.hgst.com) ([10.149.66.36]) by uls-op-cesaip02.wdc.com with ESMTP; 17 Jan 2020 04:51:14 -0800 From: Johannes Thumshirn To: David Sterba Cc: Nikolay Borisov , linux-btrfs@vger.kernel.org, Johannes Thumshirn Subject: [PATCH 4/5] btrfs: remove buffer_heads from btrfsic_process_written_block() Date: Fri, 17 Jan 2020 21:51:04 +0900 Message-Id: <20200117125105.20989-5-johannes.thumshirn@wdc.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200117125105.20989-1-johannes.thumshirn@wdc.com> References: <20200117125105.20989-1-johannes.thumshirn@wdc.com> MIME-Version: 1.0 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org Now that the last caller of btrfsic_process_written_block() with buffer_heads is gone, remove the buffer_head processing path from it as well. Signed-off-by: Johannes Thumshirn --- fs/btrfs/check-integrity.c | 103 +++++++++---------------------------- 1 file changed, 25 insertions(+), 78 deletions(-) diff --git a/fs/btrfs/check-integrity.c b/fs/btrfs/check-integrity.c index e7507985435e..4f6db2fe482a 100644 --- a/fs/btrfs/check-integrity.c +++ b/fs/btrfs/check-integrity.c @@ -152,11 +152,8 @@ struct btrfsic_block { struct list_head ref_to_list; /* list */ struct list_head ref_from_list; /* list */ struct btrfsic_block *next_in_same_bio; - void *orig_bio_bh_private; - union { - bio_end_io_t *bio; - bh_end_io_t *bh; - } orig_bio_bh_end_io; + void *orig_bio_private; + bio_end_io_t *orig_bio_end_io; int submit_bio_bh_rw; u64 flush_gen; /* only valid if !never_written */ }; @@ -325,14 +322,12 @@ static void btrfsic_process_written_block(struct btrfsic_dev_state *dev_state, u64 dev_bytenr, char **mapped_datav, unsigned int num_pages, struct bio *bio, int *bio_is_patched, - struct buffer_head *bh, int submit_bio_bh_rw); static int btrfsic_process_written_superblock( struct btrfsic_state *state, struct btrfsic_block *const block, struct btrfs_super_block *const super_hdr); static void btrfsic_bio_end_io(struct bio *bp); -static void btrfsic_bh_end_io(struct buffer_head *bh, int uptodate); static int btrfsic_is_block_ref_by_superblock(const struct btrfsic_state *state, const struct btrfsic_block *block, int recursion_level); @@ -399,8 +394,8 @@ static void btrfsic_block_init(struct btrfsic_block *b) b->never_written = 0; b->mirror_num = 0; b->next_in_same_bio = NULL; - b->orig_bio_bh_private = NULL; - b->orig_bio_bh_end_io.bio = NULL; + b->orig_bio_private = NULL; + b->orig_bio_end_io = NULL; INIT_LIST_HEAD(&b->collision_resolving_node); INIT_LIST_HEAD(&b->all_blocks_node); INIT_LIST_HEAD(&b->ref_to_list); @@ -1743,7 +1738,6 @@ static void btrfsic_process_written_block(struct btrfsic_dev_state *dev_state, u64 dev_bytenr, char **mapped_datav, unsigned int num_pages, struct bio *bio, int *bio_is_patched, - struct buffer_head *bh, int submit_bio_bh_rw) { int is_metadata; @@ -1902,9 +1896,9 @@ static void btrfsic_process_written_block(struct btrfsic_dev_state *dev_state, block->is_iodone = 0; BUG_ON(NULL == bio_is_patched); if (!*bio_is_patched) { - block->orig_bio_bh_private = + block->orig_bio_private = bio->bi_private; - block->orig_bio_bh_end_io.bio = + block->orig_bio_end_io = bio->bi_end_io; block->next_in_same_bio = NULL; bio->bi_private = block; @@ -1916,25 +1910,17 @@ static void btrfsic_process_written_block(struct btrfsic_dev_state *dev_state, bio->bi_private; BUG_ON(NULL == chained_block); - block->orig_bio_bh_private = - chained_block->orig_bio_bh_private; - block->orig_bio_bh_end_io.bio = - chained_block->orig_bio_bh_end_io. - bio; + block->orig_bio_private = + chained_block->orig_bio_private; + block->orig_bio_end_io = + chained_block->orig_bio_end_io; block->next_in_same_bio = chained_block; bio->bi_private = block; } - } else if (NULL != bh) { - block->is_iodone = 0; - block->orig_bio_bh_private = bh->b_private; - block->orig_bio_bh_end_io.bh = bh->b_end_io; - block->next_in_same_bio = NULL; - bh->b_private = block; - bh->b_end_io = btrfsic_bh_end_io; } else { block->is_iodone = 1; - block->orig_bio_bh_private = NULL; - block->orig_bio_bh_end_io.bio = NULL; + block->orig_bio_private = NULL; + block->orig_bio_end_io = NULL; block->next_in_same_bio = NULL; } } @@ -2042,8 +2028,8 @@ static void btrfsic_process_written_block(struct btrfsic_dev_state *dev_state, block->is_iodone = 0; BUG_ON(NULL == bio_is_patched); if (!*bio_is_patched) { - block->orig_bio_bh_private = bio->bi_private; - block->orig_bio_bh_end_io.bio = bio->bi_end_io; + block->orig_bio_private = bio->bi_private; + block->orig_bio_end_io = bio->bi_end_io; block->next_in_same_bio = NULL; bio->bi_private = block; bio->bi_end_io = btrfsic_bio_end_io; @@ -2054,24 +2040,17 @@ static void btrfsic_process_written_block(struct btrfsic_dev_state *dev_state, bio->bi_private; BUG_ON(NULL == chained_block); - block->orig_bio_bh_private = - chained_block->orig_bio_bh_private; - block->orig_bio_bh_end_io.bio = - chained_block->orig_bio_bh_end_io.bio; + block->orig_bio_private = + chained_block->orig_bio_private; + block->orig_bio_end_io = + chained_block->orig_bio_end_io; block->next_in_same_bio = chained_block; bio->bi_private = block; } - } else if (NULL != bh) { - block->is_iodone = 0; - block->orig_bio_bh_private = bh->b_private; - block->orig_bio_bh_end_io.bh = bh->b_end_io; - block->next_in_same_bio = NULL; - bh->b_private = block; - bh->b_end_io = btrfsic_bh_end_io; } else { block->is_iodone = 1; - block->orig_bio_bh_private = NULL; - block->orig_bio_bh_end_io.bio = NULL; + block->orig_bio_private = NULL; + block->orig_bio_end_io = NULL; block->next_in_same_bio = NULL; } if (state->print_mask & BTRFSIC_PRINT_MASK_VERBOSE) @@ -2112,8 +2091,8 @@ static void btrfsic_bio_end_io(struct bio *bp) iodone_w_error = 1; BUG_ON(NULL == block); - bp->bi_private = block->orig_bio_bh_private; - bp->bi_end_io = block->orig_bio_bh_end_io.bio; + bp->bi_private = block->orig_bio_private; + bp->bi_end_io = block->orig_bio_end_io; do { struct btrfsic_block *next_block; @@ -2146,38 +2125,6 @@ static void btrfsic_bio_end_io(struct bio *bp) bp->bi_end_io(bp); } -static void btrfsic_bh_end_io(struct buffer_head *bh, int uptodate) -{ - struct btrfsic_block *block = (struct btrfsic_block *)bh->b_private; - int iodone_w_error = !uptodate; - struct btrfsic_dev_state *dev_state; - - BUG_ON(NULL == block); - dev_state = block->dev_state; - if ((dev_state->state->print_mask & BTRFSIC_PRINT_MASK_END_IO_BIO_BH)) - pr_info("bh_end_io(error=%d) for %c @%llu (%s/%llu/%d)\n", - iodone_w_error, - btrfsic_get_block_type(dev_state->state, block), - block->logical_bytenr, block->dev_state->name, - block->dev_bytenr, block->mirror_num); - - block->iodone_w_error = iodone_w_error; - if (block->submit_bio_bh_rw & REQ_PREFLUSH) { - dev_state->last_flush_gen++; - if ((dev_state->state->print_mask & - BTRFSIC_PRINT_MASK_END_IO_BIO_BH)) - pr_info("bh_end_io() new %s flush_gen=%llu\n", - dev_state->name, dev_state->last_flush_gen); - } - if (block->submit_bio_bh_rw & REQ_FUA) - block->flush_gen = 0; /* FUA completed means block is on disk */ - - bh->b_private = block->orig_bio_bh_private; - bh->b_end_io = block->orig_bio_bh_end_io.bh; - block->is_iodone = 1; /* for FLUSH, this releases the block */ - bh->b_end_io(bh, uptodate); -} - static int btrfsic_process_written_superblock( struct btrfsic_state *state, struct btrfsic_block *const superblock, @@ -2781,7 +2728,7 @@ static void __btrfsic_submit_bio(struct bio *bio) btrfsic_process_written_block(dev_state, dev_bytenr, mapped_datav, segs, bio, &bio_is_patched, - NULL, bio->bi_opf); + bio->bi_opf); bio_for_each_segment(bvec, bio, iter) kunmap(bvec.bv_page); kfree(mapped_datav); @@ -2805,8 +2752,8 @@ static void __btrfsic_submit_bio(struct bio *bio) block->iodone_w_error = 0; block->flush_gen = dev_state->last_flush_gen + 1; block->submit_bio_bh_rw = bio->bi_opf; - block->orig_bio_bh_private = bio->bi_private; - block->orig_bio_bh_end_io.bio = bio->bi_end_io; + block->orig_bio_private = bio->bi_private; + block->orig_bio_end_io = bio->bi_end_io; block->next_in_same_bio = NULL; bio->bi_private = block; bio->bi_end_io = btrfsic_bio_end_io; From patchwork Fri Jan 17 12:51:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Thumshirn X-Patchwork-Id: 11338971 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 609EB6C1 for ; Fri, 17 Jan 2020 12:51:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3FB3C24684 for ; Fri, 17 Jan 2020 12:51:17 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=wdc.com header.i=@wdc.com header.b="lRGfiGru" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727018AbgAQMvQ (ORCPT ); Fri, 17 Jan 2020 07:51:16 -0500 Received: from esa1.hgst.iphmx.com ([68.232.141.245]:51277 "EHLO esa1.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727008AbgAQMvQ (ORCPT ); Fri, 17 Jan 2020 07:51:16 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1579265475; x=1610801475; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=WA5F+FX0E9WeJOkw1sFa98+qZMvbx/Z2qgjl1FT0UKI=; b=lRGfiGru+fW0XLR98jMASbyt7pfyMjZublaSmuxWM3+wknaoIuWY1tYh QpYhDBm+nyr4vFtDBVOjEnQiE/nf8XPkVj61CdjcbRUOO4uYREeBr0axA 7Wt/zI8yih/fe1yKmQjwBRW4W2CwcoMQ7phMTqH8Idp1EMPfXnZUONQSz 8GlGsati9hAJr6EUTN1rp7+omW7ViwWS1/VVLs+jslEhKG8Kj91WrG082 z+DdWR0K9AZqg/3TghF7XKol/T8RzK7UvEDGPXSAmy4YcPxqncAC6m2CR 5EumfSU8tizGX8Vstna2dlfqbmLmhI5uctl+NGAQa42meY29UvOTT1SXh w==; IronPort-SDR: rjtAspJ5w9zIYVHXh91yMO1T0c2ZuWahnPS6IMHSeam/n59JquddXXJ2NOMRzqmNbW6xsuMc0z fff5sYRF0r37IUCVxCaGTUBM80JSgrRaWCxlgm8/31XGGi715I/dONxENFMjGgFNzJCImmaMff 0jQqwqXAWawHeD7gSE6pcZZnF9ewh0AKLe8GkXuzCCD7M6n5NXdpe3j2cssWrw19BP+3agjBNH 2534HcbYV00LJ6SdCQZ2lPCqtc/itMUxyVK4Ujmv7BAcbY2wDrXsvhITYRZq0g9ZQ+CD2Hs0YI HpM= X-IronPort-AV: E=Sophos;i="5.70,330,1574092800"; d="scan'208";a="235550984" Received: from uls-op-cesaip01.wdc.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 17 Jan 2020 20:51:15 +0800 IronPort-SDR: jlMSaOaafkaz8Ib5sT0+P61KqLyeMV+Z6ujzIkcru69gj0c2F5cim2ywQ3jgW8lC6usB3QeE8C /CIcGBOP/ufXt2g9eiMDZPbLsGIS+vu9fSQDDZWF7xwClVzWkqi1Sw02M0X41ZXeSKHlqOOrGk DWb9EO/ZLAyO/jkpvaEPrvMOYACnBc66lpb0zKzkax43T5mVgX3jGOq19PPWQcNvFH27sSvmo5 kUq6m6YFb0XyJO8KzVvBMN81Jtvn+tH/4Anv5864zKLydaEMk5nIXRy8YmXi7eRugXYxE9/kA0 WBSUbCnBkgnM94FOnJU0IXq4 Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Jan 2020 04:44:48 -0800 IronPort-SDR: 05sxgocP+J35Gos13f8TyiLaO/HHZVu36c+LHG7tlxAMLJupweOH3hvmlhe5JLaNv0+TBqmwXG 1P4P6p6yqn617wYhIIeOdfR5BLRJ51ZgkoI6sQwiWQToTKM3ioRLATX3KONIyIia80L8xLEk43 UTm4rKJeW24zfxByFcXYL5KFRsA+NGfAfqsVFwZgpZq6J42HtxkRPC9nJrX0NJZpoK8pePkRMA faZ8pGRq1mg1vTAtuAvXfw9W8O2xDT1lDjpEtnWGlAOryvo/g9IvwIlnAX7rCFB91jEXezLIJm /4E= WDCIronportException: Internal Received: from unknown (HELO redsun60.ssa.fujisawa.hgst.com) ([10.149.66.36]) by uls-op-cesaip02.wdc.com with ESMTP; 17 Jan 2020 04:51:15 -0800 From: Johannes Thumshirn To: David Sterba Cc: Nikolay Borisov , linux-btrfs@vger.kernel.org, Johannes Thumshirn Subject: [PATCH 5/5] btrfs: remove buffer_heads form superblock mirror integrity checking Date: Fri, 17 Jan 2020 21:51:05 +0900 Message-Id: <20200117125105.20989-6-johannes.thumshirn@wdc.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200117125105.20989-1-johannes.thumshirn@wdc.com> References: <20200117125105.20989-1-johannes.thumshirn@wdc.com> MIME-Version: 1.0 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org The integrity checking code for the superblock mirrors is the last remaining user of buffer_heads in BTRFS, change it to using plain BIOs as well. Signed-off-by: Johannes Thumshirn --- fs/btrfs/check-integrity.c | 38 +++++++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/fs/btrfs/check-integrity.c b/fs/btrfs/check-integrity.c index 4f6db2fe482a..9a614b19b6b3 100644 --- a/fs/btrfs/check-integrity.c +++ b/fs/btrfs/check-integrity.c @@ -77,7 +77,6 @@ #include #include -#include #include #include #include @@ -762,28 +761,41 @@ static int btrfsic_process_superblock_dev_mirror( struct btrfs_fs_info *fs_info = state->fs_info; struct btrfs_super_block *super_tmp; u64 dev_bytenr; - struct buffer_head *bh; struct btrfsic_block *superblock_tmp; int pass; struct block_device *const superblock_bdev = device->bdev; + struct page *page; + struct bio bio; + struct bio_vec bio_vec; + int ret; /* super block bytenr is always the unmapped device bytenr */ dev_bytenr = btrfs_sb_offset(superblock_mirror_num); if (dev_bytenr + BTRFS_SUPER_INFO_SIZE > device->commit_total_bytes) return -1; - bh = __bread(superblock_bdev, dev_bytenr / BTRFS_BDEV_BLOCKSIZE, - BTRFS_SUPER_INFO_SIZE); - if (NULL == bh) + + page = alloc_page(GFP_NOIO); + if (!page) + return -1; + + bio_init(&bio, &bio_vec, 1); + bio.bi_iter.bi_sector = dev_bytenr >> SECTOR_SHIFT; + bio_set_dev(&bio, superblock_bdev); + bio_set_op_attrs(&bio, REQ_OP_READ, 0); + bio_add_page(&bio, page, BTRFS_SUPER_INFO_SIZE, 0); + + ret = submit_bio_wait(&bio); + if (ret) return -1; - super_tmp = (struct btrfs_super_block *) - (bh->b_data + (dev_bytenr & (BTRFS_BDEV_BLOCKSIZE - 1))); + + super_tmp = page_address(page); if (btrfs_super_bytenr(super_tmp) != dev_bytenr || btrfs_super_magic(super_tmp) != BTRFS_MAGIC || memcmp(device->uuid, super_tmp->dev_item.uuid, BTRFS_UUID_SIZE) || btrfs_super_nodesize(super_tmp) != state->metablock_size || btrfs_super_sectorsize(super_tmp) != state->datablock_size) { - brelse(bh); + __free_page(page); return 0; } @@ -795,7 +807,7 @@ static int btrfsic_process_superblock_dev_mirror( superblock_tmp = btrfsic_block_alloc(); if (NULL == superblock_tmp) { pr_info("btrfsic: error, kmalloc failed!\n"); - brelse(bh); + __free_page(page); return -1; } /* for superblock, only the dev_bytenr makes sense */ @@ -880,7 +892,7 @@ static int btrfsic_process_superblock_dev_mirror( mirror_num)) { pr_info("btrfsic: btrfsic_map_block(bytenr @%llu, mirror %d) failed!\n", next_bytenr, mirror_num); - brelse(bh); + __free_page(page); return -1; } @@ -890,7 +902,7 @@ static int btrfsic_process_superblock_dev_mirror( mirror_num, NULL); if (NULL == next_block) { btrfsic_release_block_ctx(&tmp_next_block_ctx); - brelse(bh); + __free_page(page); return -1; } @@ -902,7 +914,7 @@ static int btrfsic_process_superblock_dev_mirror( BTRFSIC_GENERATION_UNKNOWN); btrfsic_release_block_ctx(&tmp_next_block_ctx); if (NULL == l) { - brelse(bh); + __free_page(page); return -1; } } @@ -910,7 +922,7 @@ static int btrfsic_process_superblock_dev_mirror( if (state->print_mask & BTRFSIC_PRINT_MASK_INITIAL_ALL_TREES) btrfsic_dump_tree_sub(state, superblock_tmp, 0); - brelse(bh); + __free_page(page); return 0; }