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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4D85AC6FA8B for ; Mon, 12 Sep 2022 19:28:09 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 31D296B0074; Mon, 12 Sep 2022 15:28:08 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2CA46940007; Mon, 12 Sep 2022 15:28:08 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 16ADB6B0075; Mon, 12 Sep 2022 15:28:08 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id EFF8C940007 for ; Mon, 12 Sep 2022 15:28:07 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id C752A141060 for ; Mon, 12 Sep 2022 19:28:07 +0000 (UTC) X-FDA: 79904419014.24.6B9FBBA Received: from mx0a-00082601.pphosted.com (mx0a-00082601.pphosted.com [67.231.145.42]) by imf29.hostedemail.com (Postfix) with ESMTP id 526FA1200D8 for ; Mon, 12 Sep 2022 19:28:07 +0000 (UTC) Received: from pps.filterd (m0109334.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 28CG0r75029413 for ; Mon, 12 Sep 2022 12:28:06 -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=ZXwf58Xx9g1PlCMg5eynHYGJuiJxFviOrGskEtkiq8Y=; b=YpO323rTLyc6aPeHggbpiRiX2UkiQ9yVLjn9w46zB5baeT6i9W1Rn3zk5mX5Xc0B1usG N1jfwDgvNc3nD9JQyImdYlYnbRAj17bq++NG4xAFEXVlvP7c/tYJVMZRueIbqhQuSSi3 Jv3AZBjLUzY8IX9+G0DykFNVdBeFQImGigA= Received: from maileast.thefacebook.com ([163.114.130.16]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3jgsw4cchw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Mon, 12 Sep 2022 12:28:06 -0700 Received: from twshared20183.05.prn5.facebook.com (2620:10d:c0a8:1b::d) by mail.thefacebook.com (2620:10d:c0a8:82::f) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Mon, 12 Sep 2022 12:28:04 -0700 Received: by dev1180.prn1.facebook.com (Postfix, from userid 425415) id 107D62085232; Mon, 12 Sep 2022 12:27:54 -0700 (PDT) From: Stefan Roesch To: , , , CC: , , , Subject: [PATCH v3 06/12] btrfs: make btrfs_check_nocow_lock nowait compatible Date: Mon, 12 Sep 2022 12:27:46 -0700 Message-ID: <20220912192752.3785061-7-shr@fb.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220912192752.3785061-1-shr@fb.com> References: <20220912192752.3785061-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: px4WoYSveq1RuzF_SlhfPO0bCVgTHb_c X-Proofpoint-GUID: px4WoYSveq1RuzF_SlhfPO0bCVgTHb_c 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-12_12,2022-09-12_02,2022-06-22_01 ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=fb.com header.s=facebook header.b=YpO323rT; spf=pass (imf29.hostedemail.com: domain of "prvs=025416ff2e=shr@fb.com" designates 67.231.145.42 as permitted sender) smtp.mailfrom="prvs=025416ff2e=shr@fb.com"; dmarc=pass (policy=reject) header.from=fb.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1663010887; a=rsa-sha256; cv=none; b=SJSr1JAX6hiUDAtCMcke9v7IaUCHTer9T3wjxXCOcKTo3Vtfrf8wvyzCSm5HVTGMZL5Jql csSzUrc/gWZppIqhT3igBp9/sNUi/8kFuDUxRGgf2FO16On4aj1EwqxrkESJNW0mGI6WUz LzNNeNu7OaSl2YVsthaOm8FUt8lvRek= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1663010887; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=ZXwf58Xx9g1PlCMg5eynHYGJuiJxFviOrGskEtkiq8Y=; b=y+EihdgQst349lYm4/ZfVn1duxXfz329ONDeBH79IqrzTe9greaxIJ1jXp4lgofyHokccx 7uly8jpJswUa8JNoM+R8kMzm5QVu318hG0eDHgxVa7FT5lquqGqCOflngwecWoQpbEmP1+ GpV/IEQsPD7KNoJvV726QcrglrMP7G4= X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 526FA1200D8 X-Rspam-User: Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=fb.com header.s=facebook header.b=YpO323rT; spf=pass (imf29.hostedemail.com: domain of "prvs=025416ff2e=shr@fb.com" designates 67.231.145.42 as permitted sender) smtp.mailfrom="prvs=025416ff2e=shr@fb.com"; dmarc=pass (policy=reject) header.from=fb.com X-Stat-Signature: 88w5os4xhytr7qznx3r3p33gzieywmyg X-HE-Tag: 1663010887-267060 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: Josef Bacik Now all the helpers that btrfs_check_nocow_lock uses handle nowait, add a nowait flag to btrfs_check_nocow_lock so it can be used by the write path. Signed-off-by: Josef Bacik Signed-off-by: Stefan Roesch --- fs/btrfs/ctree.h | 2 +- fs/btrfs/file.c | 33 ++++++++++++++++++++++----------- fs/btrfs/inode.c | 2 +- 3 files changed, 24 insertions(+), 13 deletions(-) diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index 5cc5394503e0..eb25d007e651 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h @@ -3480,7 +3480,7 @@ int btrfs_dirty_pages(struct btrfs_inode *inode, st= ruct page **pages, struct extent_state **cached, bool noreserve); int btrfs_fdatawrite_range(struct inode *inode, loff_t start, loff_t end= ); int btrfs_check_nocow_lock(struct btrfs_inode *inode, loff_t pos, - size_t *write_bytes); + size_t *write_bytes, bool nowait); void btrfs_check_nocow_unlock(struct btrfs_inode *inode); =20 /* tree-defrag.c */ diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c index 0f257205c63d..f18efd9f2bc3 100644 --- a/fs/btrfs/file.c +++ b/fs/btrfs/file.c @@ -1481,7 +1481,7 @@ lock_and_cleanup_extent_if_need(struct btrfs_inode = *inode, struct page **pages, * NOTE: Callers need to call btrfs_check_nocow_unlock() if we return > = 0. */ int btrfs_check_nocow_lock(struct btrfs_inode *inode, loff_t pos, - size_t *write_bytes) + size_t *write_bytes, bool nowait) { struct btrfs_fs_info *fs_info =3D inode->root->fs_info; struct btrfs_root *root =3D inode->root; @@ -1500,16 +1500,21 @@ int btrfs_check_nocow_lock(struct btrfs_inode *in= ode, loff_t pos, fs_info->sectorsize) - 1; num_bytes =3D lockend - lockstart + 1; =20 - btrfs_lock_and_flush_ordered_range(inode, lockstart, lockend, NULL); + if (nowait) { + if (!btrfs_try_lock_ordered_range(inode, lockstart, lockend)) { + btrfs_drew_write_unlock(&root->snapshot_lock); + return -EAGAIN; + } + } else { + btrfs_lock_and_flush_ordered_range(inode, lockstart, lockend, NULL); + } ret =3D can_nocow_extent(&inode->vfs_inode, lockstart, &num_bytes, - NULL, NULL, NULL, false, false); - if (ret <=3D 0) { - ret =3D 0; + NULL, NULL, NULL, nowait, false); + if (ret <=3D 0) btrfs_drew_write_unlock(&root->snapshot_lock); - } else { + else *write_bytes =3D min_t(size_t, *write_bytes , num_bytes - pos + lockstart); - } unlock_extent(&inode->io_tree, lockstart, lockend); =20 return ret; @@ -1666,16 +1671,22 @@ static noinline ssize_t btrfs_buffered_write(stru= ct kiocb *iocb, &data_reserved, pos, write_bytes, false); if (ret < 0) { + int can_nocow; + /* * If we don't have to COW at the offset, reserve * metadata only. write_bytes may get smaller than * requested here. */ - if (btrfs_check_nocow_lock(BTRFS_I(inode), pos, - &write_bytes) > 0) - only_release_metadata =3D true; - else + can_nocow =3D btrfs_check_nocow_lock(BTRFS_I(inode), pos, + &write_bytes, false); + if (can_nocow < 0) + ret =3D can_nocow; + if (can_nocow > 0) + ret =3D 0; + if (ret) break; + only_release_metadata =3D true; } =20 num_pages =3D DIV_ROUND_UP(write_bytes + offset, PAGE_SIZE); diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 52b3abb4c57c..4ff07b47df82 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -4883,7 +4883,7 @@ int btrfs_truncate_block(struct btrfs_inode *inode,= loff_t from, loff_t len, ret =3D btrfs_check_data_free_space(inode, &data_reserved, block_start, blocksize, false); if (ret < 0) { - if (btrfs_check_nocow_lock(inode, block_start, &write_bytes) > 0) { + if (btrfs_check_nocow_lock(inode, block_start, &write_bytes, false) > = 0) { /* For nocow case, no need to reserve data space */ only_release_metadata =3D true; } else { --=20 2.30.2