From nobody Sat May 10 00:37:51 2025 Delivered-To: importer2@patchew.org Received-SPF: pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; envelope-from=linux-kernel-owner@vger.kernel.org; helo=vger.kernel.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1611741330; cv=none; d=zohomail.com; s=zohoarc; b=DPVvseCaTI1yW/TPUQAiimZBeCn988XADge8BePYAgObTmcw8AyC3+v6t5vemMOKxnCLdWKWcxTycPJlrLdlge/HVXP3rqQtOiYQ9607MuVLZWCpg52kZUxPHVLuBPKInF1QE1RiLaJLUnIPYzkRbz/zRlGP2Zqeuknz1ME2eVQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611741330; h=Content-Transfer-Encoding:Cc:Date:From:List-Id:MIME-Version:Message-ID:Subject:To; bh=sHEu9eSauVJShsahwZ7u+w1EGL/XPZTnGqgLtdRj/NE=; b=UL5JPUtqcCe8JyL7SvhkagtfpRI8WPLxcYL0klcmXynG9bd17JbqqYXKeo97ncDTCfNTsaQ9sKA8z8LBABchw0TNWDPXhGyC5RSv9ymAFiO0mdTmDHmFiFzD9T3N7NVG5eeK7yrGkK7h9UbMTQ+WWXzF9hxGE6lwa4tq2matfQU= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mx.zohomail.com with SMTP id 1611741330484918.5485346475837; Wed, 27 Jan 2021 01:55:30 -0800 (PST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235612AbhA0JzA (ORCPT ); Wed, 27 Jan 2021 04:55:00 -0500 Received: from mx2.suse.de ([195.135.220.15]:56366 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235634AbhA0Jwa (ORCPT ); Wed, 27 Jan 2021 04:52:30 -0500 Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 4495CAD78; Wed, 27 Jan 2021 09:51:40 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de From: Michal Rostecki Cc: Michal Rostecki , Chris Mason , Josef Bacik , David Sterba , Nikolay Borisov , linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] btrfs: Avoid calling btrfs_get_chunk_map() twice Date: Wed, 27 Jan 2021 10:51:31 +0100 Message-Id: <20210127095131.22600-1-mrostecki@suse.de> X-Mailer: git-send-email 2.30.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Michal Rostecki Before this change, the btrfs_get_io_geometry() function was calling btrfs_get_chunk_map() to get the extent mapping, necessary for calculating the I/O geometry. It was using that extent mapping only internally and freeing the pointer after its execution. That resulted in calling btrfs_get_chunk_map() de facto twice by the __btrfs_map_block() function. It was calling btrfs_get_io_geometry() first and then calling btrfs_get_chunk_map() directly to get the extent mapping, used by the rest of the function. This change fixes that by passing the extent mapping to the btrfs_get_io_geometry() function as an argument. Fixes: 89b798ad1b42 ("btrfs: Use btrfs_get_io_geometry appropriately") Signed-off-by: Michal Rostecki --- fs/btrfs/inode.c | 37 ++++++++++++++++++++++++++++--------- fs/btrfs/volumes.c | 39 ++++++++++++++++----------------------- fs/btrfs/volumes.h | 5 +++-- 3 files changed, 47 insertions(+), 34 deletions(-) diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 0dbe1aaa0b71..a4ce8501ed4d 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -2183,9 +2183,10 @@ int btrfs_bio_fits_in_stripe(struct page *page, size= _t size, struct bio *bio, struct inode *inode =3D page->mapping->host; struct btrfs_fs_info *fs_info =3D btrfs_sb(inode->i_sb); u64 logical =3D bio->bi_iter.bi_sector << 9; + struct extent_map *em; u64 length =3D 0; u64 map_length; - int ret; + int ret =3D 0; struct btrfs_io_geometry geom; =20 if (bio_flags & EXTENT_BIO_COMPRESSED) @@ -2193,14 +2194,21 @@ int btrfs_bio_fits_in_stripe(struct page *page, siz= e_t size, struct bio *bio, =20 length =3D bio->bi_iter.bi_size; map_length =3D length; - ret =3D btrfs_get_io_geometry(fs_info, btrfs_op(bio), logical, map_length, - &geom); + em =3D btrfs_get_chunk_map(fs_info, logical, map_length); + if (IS_ERR(em)) + return PTR_ERR(em); + ret =3D btrfs_get_io_geometry(fs_info, em, btrfs_op(bio), logical, + map_length, &geom); if (ret < 0) - return ret; + goto out; =20 - if (geom.len < length + size) - return 1; - return 0; + if (geom.len < length + size) { + ret =3D 1; + goto out; + } +out: + free_extent_map(em); + return ret; } =20 /* @@ -7941,10 +7949,12 @@ static blk_qc_t btrfs_submit_direct(struct inode *i= node, struct iomap *iomap, u64 submit_len; int clone_offset =3D 0; int clone_len; + int logical; int ret; blk_status_t status; struct btrfs_io_geometry geom; struct btrfs_dio_data *dio_data =3D iomap->private; + struct extent_map *em; =20 dip =3D btrfs_create_dio_private(dio_bio, inode, file_offset); if (!dip) { @@ -7970,11 +7980,17 @@ static blk_qc_t btrfs_submit_direct(struct inode *i= node, struct iomap *iomap, } =20 start_sector =3D dio_bio->bi_iter.bi_sector; + logical =3D start_sector << 9; submit_len =3D dio_bio->bi_iter.bi_size; =20 do { - ret =3D btrfs_get_io_geometry(fs_info, btrfs_op(dio_bio), - start_sector << 9, submit_len, + em =3D btrfs_get_chunk_map(fs_info, logical, submit_len); + if (IS_ERR(em)) { + status =3D errno_to_blk_status(ret); + goto out_err; + } + ret =3D btrfs_get_io_geometry(fs_info, em, btrfs_op(dio_bio), + logical, submit_len, &geom); if (ret) { status =3D errno_to_blk_status(ret); @@ -8030,12 +8046,15 @@ static blk_qc_t btrfs_submit_direct(struct inode *i= node, struct iomap *iomap, clone_offset +=3D clone_len; start_sector +=3D clone_len >> 9; file_offset +=3D clone_len; + + free_extent_map(em); } while (submit_len > 0); return BLK_QC_T_NONE; =20 out_err: dip->dio_bio->bi_status =3D status; btrfs_dio_private_put(dip); + free_extent_map(em); return BLK_QC_T_NONE; } =20 diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index a8ec8539cd8d..4c753b17c0a2 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -5940,23 +5940,24 @@ static bool need_full_stripe(enum btrfs_map_op op) } =20 /* - * btrfs_get_io_geometry - calculates the geomery of a particular (address= , len) + * btrfs_get_io_geometry - calculates the geometry of a particular (addres= s, len) * tuple. This information is used to calculate how big a * particular bio can get before it straddles a stripe. * - * @fs_info - the filesystem - * @logical - address that we want to figure out the geometry of - * @len - the length of IO we are going to perform, starting at @logic= al - * @op - type of operation - write or read - * @io_geom - pointer used to return values + * @fs_info: the filesystem + * @em: mapping containing the logical extent + * @op: type of operation - write or read + * @logical: address that we want to figure out the geometry of + * @len: the length of IO we are going to perform, starting at @logical + * @io_geom: pointer used to return values * * Returns < 0 in case a chunk for the given logical address cannot be fou= nd, * usually shouldn't happen unless @logical is corrupted, 0 otherwise. */ -int btrfs_get_io_geometry(struct btrfs_fs_info *fs_info, enum btrfs_map_op= op, - u64 logical, u64 len, struct btrfs_io_geometry *io_geom) +int btrfs_get_io_geometry(struct btrfs_fs_info *fs_info, struct extent_map= *em, + enum btrfs_map_op op, u64 logical, u64 len, + struct btrfs_io_geometry *io_geom) { - struct extent_map *em; struct map_lookup *map; u64 offset; u64 stripe_offset; @@ -5964,14 +5965,9 @@ int btrfs_get_io_geometry(struct btrfs_fs_info *fs_i= nfo, enum btrfs_map_op op, u64 stripe_len; u64 raid56_full_stripe_start =3D (u64)-1; int data_stripes; - int ret =3D 0; =20 ASSERT(op !=3D BTRFS_MAP_DISCARD); =20 - em =3D btrfs_get_chunk_map(fs_info, logical, len); - if (IS_ERR(em)) - return PTR_ERR(em); - map =3D em->map_lookup; /* Offset of this logical address in the chunk */ offset =3D logical - em->start; @@ -5985,8 +5981,7 @@ int btrfs_get_io_geometry(struct btrfs_fs_info *fs_in= fo, enum btrfs_map_op op, btrfs_crit(fs_info, "stripe math has gone wrong, stripe_offset=3D%llu offset=3D%llu start=3D%l= lu logical=3D%llu stripe_len=3D%llu", stripe_offset, offset, em->start, logical, stripe_len); - ret =3D -EINVAL; - goto out; + return -EINVAL; } =20 /* stripe_offset is the offset of this block in its stripe */ @@ -6033,10 +6028,7 @@ int btrfs_get_io_geometry(struct btrfs_fs_info *fs_i= nfo, enum btrfs_map_op op, io_geom->stripe_offset =3D stripe_offset; io_geom->raid56_stripe_offset =3D raid56_full_stripe_start; =20 -out: - /* once for us */ - free_extent_map(em); - return ret; + return 0; } =20 static int __btrfs_map_block(struct btrfs_fs_info *fs_info, @@ -6069,12 +6061,13 @@ static int __btrfs_map_block(struct btrfs_fs_info *= fs_info, ASSERT(bbio_ret); ASSERT(op !=3D BTRFS_MAP_DISCARD); =20 - ret =3D btrfs_get_io_geometry(fs_info, op, logical, *length, &geom); + em =3D btrfs_get_chunk_map(fs_info, logical, *length); + ASSERT(!IS_ERR(em)); + + ret =3D btrfs_get_io_geometry(fs_info, em, op, logical, *length, &geom); if (ret < 0) return ret; =20 - em =3D btrfs_get_chunk_map(fs_info, logical, *length); - ASSERT(!IS_ERR(em)); map =3D em->map_lookup; =20 *length =3D geom.len; diff --git a/fs/btrfs/volumes.h b/fs/btrfs/volumes.h index c43663d9c22e..04e2b26823c2 100644 --- a/fs/btrfs/volumes.h +++ b/fs/btrfs/volumes.h @@ -440,8 +440,9 @@ int btrfs_map_block(struct btrfs_fs_info *fs_info, enum= btrfs_map_op op, int btrfs_map_sblock(struct btrfs_fs_info *fs_info, enum btrfs_map_op op, u64 logical, u64 *length, struct btrfs_bio **bbio_ret); -int btrfs_get_io_geometry(struct btrfs_fs_info *fs_info, enum btrfs_map_op= op, - u64 logical, u64 len, struct btrfs_io_geometry *io_geom); +int btrfs_get_io_geometry(struct btrfs_fs_info *fs_info, struct extent_map= *map, + enum btrfs_map_op op, u64 logical, u64 len, + struct btrfs_io_geometry *io_geom); int btrfs_read_sys_array(struct btrfs_fs_info *fs_info); int btrfs_read_chunk_tree(struct btrfs_fs_info *fs_info); int btrfs_alloc_chunk(struct btrfs_trans_handle *trans, u64 type); --=20 2.30.0