From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 92508ECAAD3 for ; Thu, 8 Sep 2022 00:26:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230063AbiIHA0k (ORCPT ); Wed, 7 Sep 2022 20:26:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34762 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229927AbiIHA0j (ORCPT ); Wed, 7 Sep 2022 20:26:39 -0400 Received: from mx0b-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4E20DC2766 for ; Wed, 7 Sep 2022 17:26:38 -0700 (PDT) Received: from pps.filterd (m0109331.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 287Hnh9T023662 for ; Wed, 7 Sep 2022 17:26:37 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=facebook; bh=nn6pNmrfqii0Pxc5tRFGzs2eYju00h6nYRh4yWgopAs=; b=bqSRSLOqthwkbkNDYd5rLY1v6UOrKjLv3yfEe+1xSO8TgFjHcQfNiQTHtJPfW3enzkcA N5WDvrlxF0uY/cGjiFaO5mf9xe5pjiUqgYJknYGwYKv+y2iEK3olfKlDGj1UEk2e07T3 oGmw7/AsHt/kCv0JXWKMo6kQAzMd4NexcF8= Received: from mail.thefacebook.com ([163.114.132.120]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3jet8md0tg-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Wed, 07 Sep 2022 17:26:37 -0700 Received: from twshared12284.04.prn6.facebook.com (2620:10d:c085:108::4) by mail.thefacebook.com (2620:10d:c085:21d::4) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Wed, 7 Sep 2022 17:26:35 -0700 Received: by dev1180.prn1.facebook.com (Postfix, from userid 425415) id C32C31D2F03A; Wed, 7 Sep 2022 17:26:19 -0700 (PDT) From: Stefan Roesch To: , , CC: , , , Subject: [PATCH v2 04/12] btrfs: add the ability to use NO_FLUSH for data reservations Date: Wed, 7 Sep 2022 17:26:08 -0700 Message-ID: <20220908002616.3189675-5-shr@fb.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220908002616.3189675-1-shr@fb.com> References: <20220908002616.3189675-1-shr@fb.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-FB-Internal: Safe Content-Type: text/plain X-Proofpoint-ORIG-GUID: ZJKBLHoDd4ucazqY0V4gEhlo9gkhm-hY X-Proofpoint-GUID: ZJKBLHoDd4ucazqY0V4gEhlo9gkhm-hY X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.528,FMLib:17.11.122.1 definitions=2022-09-07_10,2022-09-07_02,2022-06-22_01 Precedence: bulk List-ID: X-Mailing-List: io-uring@vger.kernel.org From: Josef Bacik In order to accommodate NOWAIT IOCB's we need to be able to do NO_FLUSH data reservations, so plumb this through the delalloc reservation system. Signed-off-by: Josef Bacik Signed-off-by: Stefan Roesch --- fs/btrfs/block-group.c | 2 +- fs/btrfs/delalloc-space.c | 13 ++++++++++--- fs/btrfs/delalloc-space.h | 3 ++- fs/btrfs/file.c | 2 +- fs/btrfs/inode.c | 4 ++-- fs/btrfs/space-info.c | 3 ++- 6 files changed, 18 insertions(+), 9 deletions(-) diff --git a/fs/btrfs/block-group.c b/fs/btrfs/block-group.c index e0375ba9d0fe..9df51245ba93 100644 --- a/fs/btrfs/block-group.c +++ b/fs/btrfs/block-group.c @@ -2869,7 +2869,7 @@ static int cache_save_setup(struct btrfs_block_grou= p *block_group, cache_size *=3D fs_info->sectorsize; =20 ret =3D btrfs_check_data_free_space(BTRFS_I(inode), &data_reserved, 0, - cache_size); + cache_size, false); if (ret) goto out_put; =20 diff --git a/fs/btrfs/delalloc-space.c b/fs/btrfs/delalloc-space.c index 1e8f17ff829e..118b2e20b2e1 100644 --- a/fs/btrfs/delalloc-space.c +++ b/fs/btrfs/delalloc-space.c @@ -127,9 +127,11 @@ int btrfs_alloc_data_chunk_ondemand(struct btrfs_ino= de *inode, u64 bytes) } =20 int btrfs_check_data_free_space(struct btrfs_inode *inode, - struct extent_changeset **reserved, u64 start, u64 len) + struct extent_changeset **reserved, u64 start, + u64 len, bool noflush) { struct btrfs_fs_info *fs_info =3D inode->root->fs_info; + enum btrfs_reserve_flush_enum flush =3D BTRFS_RESERVE_FLUSH_DATA; int ret; =20 /* align the range */ @@ -137,7 +139,12 @@ int btrfs_check_data_free_space(struct btrfs_inode *= inode, round_down(start, fs_info->sectorsize); start =3D round_down(start, fs_info->sectorsize); =20 - ret =3D btrfs_alloc_data_chunk_ondemand(inode, len); + if (noflush) + flush =3D BTRFS_RESERVE_NO_FLUSH; + else if (btrfs_is_free_space_inode(inode)) + flush =3D BTRFS_RESERVE_FLUSH_FREE_SPACE_INODE; + + ret =3D btrfs_reserve_data_bytes(fs_info, len, flush); if (ret < 0) return ret; =20 @@ -454,7 +461,7 @@ int btrfs_delalloc_reserve_space(struct btrfs_inode *= inode, { int ret; =20 - ret =3D btrfs_check_data_free_space(inode, reserved, start, len); + ret =3D btrfs_check_data_free_space(inode, reserved, start, len, false)= ; if (ret < 0) return ret; ret =3D btrfs_delalloc_reserve_metadata(inode, len, len, false); diff --git a/fs/btrfs/delalloc-space.h b/fs/btrfs/delalloc-space.h index 28bf5c3ef430..e07d46043455 100644 --- a/fs/btrfs/delalloc-space.h +++ b/fs/btrfs/delalloc-space.h @@ -7,7 +7,8 @@ struct extent_changeset; =20 int btrfs_alloc_data_chunk_ondemand(struct btrfs_inode *inode, u64 bytes= ); int btrfs_check_data_free_space(struct btrfs_inode *inode, - struct extent_changeset **reserved, u64 start, u64 len); + struct extent_changeset **reserved, u64 start, u64 len, + bool noflush); void btrfs_free_reserved_data_space(struct btrfs_inode *inode, struct extent_changeset *reserved, u64 start, u64 len); void btrfs_delalloc_release_space(struct btrfs_inode *inode, diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c index f4aa198f0f87..0f257205c63d 100644 --- a/fs/btrfs/file.c +++ b/fs/btrfs/file.c @@ -1664,7 +1664,7 @@ static noinline ssize_t btrfs_buffered_write(struct= kiocb *iocb, extent_changeset_release(data_reserved); ret =3D btrfs_check_data_free_space(BTRFS_I(inode), &data_reserved, pos, - write_bytes); + write_bytes, false); if (ret < 0) { /* * If we don't have to COW at the offset, reserve diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 8ad3bea26652..36e755f73764 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -4882,7 +4882,7 @@ int btrfs_truncate_block(struct btrfs_inode *inode,= loff_t from, loff_t len, block_end =3D block_start + blocksize - 1; =20 ret =3D btrfs_check_data_free_space(inode, &data_reserved, block_start, - blocksize); + blocksize, false); if (ret < 0) { if (btrfs_check_nocow_lock(inode, block_start, &write_bytes) > 0) { /* For nocow case, no need to reserve data space */ @@ -7767,7 +7767,7 @@ static int btrfs_dio_iomap_begin(struct inode *inod= e, loff_t start, if (write && !(flags & IOMAP_NOWAIT)) { ret =3D btrfs_check_data_free_space(BTRFS_I(inode), &dio_data->data_reserved, - start, data_alloc_len); + start, data_alloc_len, false); if (!ret) dio_data->data_space_reserved =3D true; else if (ret && !(BTRFS_I(inode)->flags & diff --git a/fs/btrfs/space-info.c b/fs/btrfs/space-info.c index d0cbeb7ae81c..0738e1efed79 100644 --- a/fs/btrfs/space-info.c +++ b/fs/btrfs/space-info.c @@ -1737,7 +1737,8 @@ int btrfs_reserve_data_bytes(struct btrfs_fs_info *= fs_info, u64 bytes, int ret; =20 ASSERT(flush =3D=3D BTRFS_RESERVE_FLUSH_DATA || - flush =3D=3D BTRFS_RESERVE_FLUSH_FREE_SPACE_INODE); + flush =3D=3D BTRFS_RESERVE_FLUSH_FREE_SPACE_INODE || + flush =3D=3D BTRFS_RESERVE_NO_FLUSH); ASSERT(!current->journal_info || flush !=3D BTRFS_RESERVE_FLUSH_DATA); =20 ret =3D __reserve_bytes(fs_info, data_sinfo, bytes, flush); --=20 2.30.2