From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0b-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 40F297DA7C for ; Tue, 22 Oct 2024 14:50:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=67.231.153.30 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729608659; cv=none; b=iNj6Ybtno5qN9idUOnxo3NhX3IFL590/WB6L0AsLZ+7VCOTizQcovK3bgqQ/8yli6xFJMpk6jifcJkjIKs1rjrWbKy3jGw/+kyHBMTvFG5JKTaapqUPCt9wgyLP4qG+3uF0jMYVdbTm2qBFrpDqjMhb9UpPXPufIBh0wkVa5Tzo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729608659; c=relaxed/simple; bh=jcAWiMqBTPTGbxhO5biUmLCEYzANTGnD1124VL8NmS4=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=lxL3f/RI2LJ9dZIVVWEe5BUL7hrHse4i4GNy9gQQFcsRsNyY7CiVaMGMKc986yvGQ1H7MOtQSVAmdqtTZaBgvKJj430mpapwA/MDHlyo9MZhx2YX0sml+XCtJWp6sCBWSThGjyZ+Xms+QCfCauN4CdoLZ60aGFv0G6vxN3hZUWg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=fb.com; spf=pass smtp.mailfrom=meta.com; dkim=pass (1024-bit key) header.d=fb.com header.i=@fb.com header.b=MVV4u6Fy; arc=none smtp.client-ip=67.231.153.30 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=fb.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=meta.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=fb.com header.i=@fb.com header.b="MVV4u6Fy" Received: from pps.filterd (m0109331.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 49MELR9O024551 for ; Tue, 22 Oct 2024 07:50:56 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=facebook; bh=O FFWFj88xL2Dj/HElq1YlDCuz0JjMvCuTyHJHqZEU1k=; b=MVV4u6FyeZWMzAJrx vWJLM3sGLkY2aHyZ8lU2x6vbnuGyR2+zbd9ZWQhk1Wb6iWR2a7rxOru/+tzGMolu Hcx6rinORQey+t9KfAOV5gKvREdG95roW+pZb6v0h9ktc/05evB2TarcLib6Qvfa cs+tB7bU3ScFA6Qvcr9bx0f5R4= Received: from maileast.thefacebook.com ([163.114.135.16]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 42edr5r6a8-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Tue, 22 Oct 2024 07:50:56 -0700 (PDT) Received: from twshared11671.02.ash9.facebook.com (2620:10d:c0a8:1c::11) by mail.thefacebook.com (2620:10d:c0a9:6f::237c) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.2.1544.11; Tue, 22 Oct 2024 14:50:43 +0000 Received: by devbig276.nha1.facebook.com (Postfix, from userid 660015) id AF85B7FDCDA9; Tue, 22 Oct 2024 15:50:32 +0100 (BST) From: Mark Harmstone To: CC: , Mark Harmstone Subject: [PATCH 2/5] btrfs: change btrfs_encoded_read so that reading of extent is done by caller Date: Tue, 22 Oct 2024 15:50:17 +0100 Message-ID: <20241022145024.1046883-3-maharmstone@fb.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20241022145024.1046883-1-maharmstone@fb.com> References: <20241022145024.1046883-1-maharmstone@fb.com> Precedence: bulk X-Mailing-List: io-uring@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-FB-Internal: Safe Content-Type: text/plain X-Proofpoint-GUID: _le2CegTe_sjQe6JtHy8LyAST_6EjO6p X-Proofpoint-ORIG-GUID: _le2CegTe_sjQe6JtHy8LyAST_6EjO6p X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1051,Hydra:6.0.680,FMLib:17.12.62.30 definitions=2024-10-05_03,2024-10-04_01,2024-09-30_01 Change the behaviour of btrfs_encoded_read so that if it needs to read an extent from disk, it leaves the extent and inode locked and returns -EIOCBQUEUED. The caller is then responsible for doing the I/O via btrfs_encoded_read_regular and unlocking the extent and inode. Signed-off-by: Mark Harmstone --- fs/btrfs/btrfs_inode.h | 10 +++++++- fs/btrfs/inode.c | 58 ++++++++++++++++++++---------------------- fs/btrfs/ioctl.c | 33 +++++++++++++++++++++++- 3 files changed, 69 insertions(+), 32 deletions(-) diff --git a/fs/btrfs/btrfs_inode.h b/fs/btrfs/btrfs_inode.h index 157fd3f4cb33..ab1fbde97cee 100644 --- a/fs/btrfs/btrfs_inode.h +++ b/fs/btrfs/btrfs_inode.h @@ -615,7 +615,15 @@ int btrfs_encoded_read_regular_fill_pages(struct btr= fs_inode *inode, u64 disk_bytenr, u64 disk_io_size, struct page **pages); ssize_t btrfs_encoded_read(struct kiocb *iocb, struct iov_iter *iter, - struct btrfs_ioctl_encoded_io_args *encoded); + struct btrfs_ioctl_encoded_io_args *encoded, + struct extent_state **cached_state, + u64 *disk_bytenr, u64 *disk_io_size); +ssize_t btrfs_encoded_read_regular(struct kiocb *iocb, struct iov_iter *= iter, + u64 start, u64 lockend, + struct extent_state **cached_state, + u64 disk_bytenr, u64 disk_io_size, + size_t count, bool compressed, + bool *unlocked); ssize_t btrfs_do_encoded_write(struct kiocb *iocb, struct iov_iter *from= , const struct btrfs_ioctl_encoded_io_args *encoded); =20 diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 94098a4c782d..0a4dc85769c7 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -9123,13 +9123,12 @@ int btrfs_encoded_read_regular_fill_pages(struct = btrfs_inode *inode, return blk_status_to_errno(READ_ONCE(priv.status)); } =20 -static ssize_t btrfs_encoded_read_regular(struct kiocb *iocb, - struct iov_iter *iter, - u64 start, u64 lockend, - struct extent_state **cached_state, - u64 disk_bytenr, u64 disk_io_size, - size_t count, bool compressed, - bool *unlocked) +ssize_t btrfs_encoded_read_regular(struct kiocb *iocb, struct iov_iter *= iter, + u64 start, u64 lockend, + struct extent_state **cached_state, + u64 disk_bytenr, u64 disk_io_size, + size_t count, bool compressed, + bool *unlocked) { struct btrfs_inode *inode =3D BTRFS_I(file_inode(iocb->ki_filp)); struct extent_io_tree *io_tree =3D &inode->io_tree; @@ -9190,15 +9189,16 @@ static ssize_t btrfs_encoded_read_regular(struct = kiocb *iocb, } =20 ssize_t btrfs_encoded_read(struct kiocb *iocb, struct iov_iter *iter, - struct btrfs_ioctl_encoded_io_args *encoded) + struct btrfs_ioctl_encoded_io_args *encoded, + struct extent_state **cached_state, + u64 *disk_bytenr, u64 *disk_io_size) { struct btrfs_inode *inode =3D BTRFS_I(file_inode(iocb->ki_filp)); struct btrfs_fs_info *fs_info =3D inode->root->fs_info; struct extent_io_tree *io_tree =3D &inode->io_tree; ssize_t ret; size_t count =3D iov_iter_count(iter); - u64 start, lockend, disk_bytenr, disk_io_size; - struct extent_state *cached_state =3D NULL; + u64 start, lockend; struct extent_map *em; bool unlocked =3D false; =20 @@ -9224,13 +9224,13 @@ ssize_t btrfs_encoded_read(struct kiocb *iocb, st= ruct iov_iter *iter, lockend - start + 1); if (ret) goto out_unlock_inode; - lock_extent(io_tree, start, lockend, &cached_state); + lock_extent(io_tree, start, lockend, cached_state); ordered =3D btrfs_lookup_ordered_range(inode, start, lockend - start + 1); if (!ordered) break; btrfs_put_ordered_extent(ordered); - unlock_extent(io_tree, start, lockend, &cached_state); + unlock_extent(io_tree, start, lockend, cached_state); cond_resched(); } =20 @@ -9250,7 +9250,7 @@ ssize_t btrfs_encoded_read(struct kiocb *iocb, stru= ct iov_iter *iter, free_extent_map(em); em =3D NULL; ret =3D btrfs_encoded_read_inline(iocb, iter, start, lockend, - &cached_state, extent_start, + cached_state, extent_start, count, encoded, &unlocked); goto out_em; } @@ -9263,12 +9263,12 @@ ssize_t btrfs_encoded_read(struct kiocb *iocb, st= ruct iov_iter *iter, inode->vfs_inode.i_size) - iocb->ki_pos; if (em->disk_bytenr =3D=3D EXTENT_MAP_HOLE || (em->flags & EXTENT_FLAG_PREALLOC)) { - disk_bytenr =3D EXTENT_MAP_HOLE; + *disk_bytenr =3D EXTENT_MAP_HOLE; count =3D min_t(u64, count, encoded->len); encoded->len =3D count; encoded->unencoded_len =3D count; } else if (extent_map_is_compressed(em)) { - disk_bytenr =3D em->disk_bytenr; + *disk_bytenr =3D em->disk_bytenr; /* * Bail if the buffer isn't large enough to return the whole * compressed extent. @@ -9277,7 +9277,7 @@ ssize_t btrfs_encoded_read(struct kiocb *iocb, stru= ct iov_iter *iter, ret =3D -ENOBUFS; goto out_em; } - disk_io_size =3D em->disk_num_bytes; + *disk_io_size =3D em->disk_num_bytes; count =3D em->disk_num_bytes; encoded->unencoded_len =3D em->ram_bytes; encoded->unencoded_offset =3D iocb->ki_pos - (em->start - em->offset); @@ -9287,44 +9287,42 @@ ssize_t btrfs_encoded_read(struct kiocb *iocb, st= ruct iov_iter *iter, goto out_em; encoded->compression =3D ret; } else { - disk_bytenr =3D extent_map_block_start(em) + (start - em->start); + *disk_bytenr =3D extent_map_block_start(em) + (start - em->start); if (encoded->len > count) encoded->len =3D count; /* * Don't read beyond what we locked. This also limits the page * allocations that we'll do. */ - disk_io_size =3D min(lockend + 1, iocb->ki_pos + encoded->len) - start= ; - count =3D start + disk_io_size - iocb->ki_pos; + *disk_io_size =3D min(lockend + 1, iocb->ki_pos + encoded->len) - star= t; + count =3D start + *disk_io_size - iocb->ki_pos; encoded->len =3D count; encoded->unencoded_len =3D count; - disk_io_size =3D ALIGN(disk_io_size, fs_info->sectorsize); + *disk_io_size =3D ALIGN(*disk_io_size, fs_info->sectorsize); } free_extent_map(em); em =3D NULL; =20 - if (disk_bytenr =3D=3D EXTENT_MAP_HOLE) { - unlock_extent(io_tree, start, lockend, &cached_state); + if (*disk_bytenr =3D=3D EXTENT_MAP_HOLE) { + unlock_extent(io_tree, start, lockend, cached_state); btrfs_inode_unlock(inode, BTRFS_ILOCK_SHARED); unlocked =3D true; ret =3D iov_iter_zero(count, iter); if (ret !=3D count) ret =3D -EFAULT; } else { - ret =3D btrfs_encoded_read_regular(iocb, iter, start, lockend, - &cached_state, disk_bytenr, - disk_io_size, count, - encoded->compression, - &unlocked); + ret =3D -EIOCBQUEUED; + goto out_em; } =20 out_em: free_extent_map(em); out_unlock_extent: - if (!unlocked) - unlock_extent(io_tree, start, lockend, &cached_state); + /* Leave inode and extent locked if we need to do a read */ + if (!unlocked && ret !=3D -EIOCBQUEUED) + unlock_extent(io_tree, start, lockend, cached_state); out_unlock_inode: - if (!unlocked) + if (!unlocked && ret !=3D -EIOCBQUEUED) btrfs_inode_unlock(inode, BTRFS_ILOCK_SHARED); return ret; } diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index 28b9b7fda578..d502b31010bc 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -4513,12 +4513,17 @@ static int btrfs_ioctl_encoded_read(struct file *= file, void __user *argp, size_t copy_end_kernel =3D offsetofend(struct btrfs_ioctl_encoded_io_ar= gs, flags); size_t copy_end; + struct btrfs_inode *inode =3D BTRFS_I(file_inode(file)); + struct btrfs_fs_info *fs_info =3D inode->root->fs_info; + struct extent_io_tree *io_tree =3D &inode->io_tree; struct iovec iovstack[UIO_FASTIOV]; struct iovec *iov =3D iovstack; struct iov_iter iter; loff_t pos; struct kiocb kiocb; ssize_t ret; + u64 disk_bytenr, disk_io_size; + struct extent_state *cached_state =3D NULL; =20 if (!capable(CAP_SYS_ADMIN)) { ret =3D -EPERM; @@ -4571,7 +4576,33 @@ static int btrfs_ioctl_encoded_read(struct file *f= ile, void __user *argp, init_sync_kiocb(&kiocb, file); kiocb.ki_pos =3D pos; =20 - ret =3D btrfs_encoded_read(&kiocb, &iter, &args); + ret =3D btrfs_encoded_read(&kiocb, &iter, &args, &cached_state, + &disk_bytenr, &disk_io_size); + + if (ret =3D=3D -EIOCBQUEUED) { + bool unlocked =3D false; + u64 start, lockend, count; + + start =3D ALIGN_DOWN(kiocb.ki_pos, fs_info->sectorsize); + lockend =3D start + BTRFS_MAX_UNCOMPRESSED - 1; + + if (args.compression) + count =3D disk_io_size; + else + count =3D args.len; + + ret =3D btrfs_encoded_read_regular(&kiocb, &iter, start, lockend, + &cached_state, disk_bytenr, + disk_io_size, count, + args.compression, + &unlocked); + + if (!unlocked) { + unlock_extent(io_tree, start, lockend, &cached_state); + btrfs_inode_unlock(inode, BTRFS_ILOCK_SHARED); + } + } + if (ret >=3D 0) { fsnotify_access(file); if (copy_to_user(argp + copy_end, --=20 2.45.2