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 919BBC6FA83 for ; Mon, 12 Sep 2022 19:28:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2A78094000B; Mon, 12 Sep 2022 15:28:16 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2560794000C; Mon, 12 Sep 2022 15:28:16 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0FAA194000B; Mon, 12 Sep 2022 15:28:16 -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 EFDF2940008 for ; Mon, 12 Sep 2022 15:28:15 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id CBE10A08E8 for ; Mon, 12 Sep 2022 19:28:15 +0000 (UTC) X-FDA: 79904419350.20.EC09082 Received: from mx0a-00082601.pphosted.com (mx0a-00082601.pphosted.com [67.231.145.42]) by imf03.hostedemail.com (Postfix) with ESMTP id 666B120086 for ; Mon, 12 Sep 2022 19:28:15 +0000 (UTC) Received: from pps.filterd (m0044012.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 28CG6lUP003051 for ; Mon, 12 Sep 2022 12:28:14 -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=hjvhu+Qp84kdov74Xj1nrOZz9nTHcHa45YxCt8fKlVM=; b=baVMT3r+NT4+eN5IRphhDBdpbkMFS6hj7tN43AHdsvmFdo2i0Y24Av831cjPdX71r4r+ xTOnZ77FYow+MdGv9AZso1tXi5Zn/s4ptTPXjsPgMobYPYp6c+fx06vHlaxoHaHPcEYU 3/vMxkN+WpPt/RmwV1MKJHeOOyiqEuUEi54= Received: from mail.thefacebook.com ([163.114.132.120]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3jgr9smh8w-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Mon, 12 Sep 2022 12:28:14 -0700 Received: from twshared6447.05.prn5.facebook.com (2620:10d:c085:208::11) by mail.thefacebook.com (2620:10d:c085:11d::6) 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:13 -0700 Received: by dev1180.prn1.facebook.com (Postfix, from userid 425415) id 212BB2085238; Mon, 12 Sep 2022 12:27:54 -0700 (PDT) From: Stefan Roesch To: , , , CC: , , , Subject: [PATCH v3 09/12] btrfs: plumb NOWAIT through the write path Date: Mon, 12 Sep 2022 12:27:49 -0700 Message-ID: <20220912192752.3785061-10-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: cpl2TUUa6c0joBr1yijik3bf7h3KzSQ2 X-Proofpoint-GUID: cpl2TUUa6c0joBr1yijik3bf7h3KzSQ2 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_13,2022-09-12_02,2022-06-22_01 ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=fb.com header.s=facebook header.b=baVMT3r+; spf=pass (imf03.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=1663010895; a=rsa-sha256; cv=none; b=UPFQ41Ahy6SmzfGVkChHyzaTFtXGEj8FUTXtpxrsIPYeVkquaibAMMntKbQdrCl5yitTXA usqXj4ZYeIItsSyIJ4g5VyI0IoKPipmx21NVnwj0rb6ms5u2gyDezbGk9TJwpCWXVNfKni 7VEb96ILT44VwMKmvBfNPV1AGnCcPVw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1663010895; 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=hjvhu+Qp84kdov74Xj1nrOZz9nTHcHa45YxCt8fKlVM=; b=YV4/Ki7zBERwCsConL57nsb9J/Zj6rgOStBNRt26ChToKyjD1n73vJ9aubqcNh9Sfh3p4U l6pfyJabqjqcjjYf8udF8HtBxPkZYl7JMOOidWn9GXOWZ40ZomwJhc0E9xl7pJy2eMz6Pn z2dPGs+lGWEnySStRo6r64dapRM4IhU= Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=fb.com header.s=facebook header.b=baVMT3r+; spf=pass (imf03.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-Rspamd-Queue-Id: 666B120086 X-Stat-Signature: b6f5z8y1mu51gsr9tngjm1w3dgncz8to X-Rspam-User: X-Rspamd-Server: rspam02 X-HE-Tag: 1663010895-609824 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: We have everywhere setup for nowait, plumb NOWAIT through the write path. Signed-off-by: Josef Bacik Signed-off-by: Stefan Roesch --- fs/btrfs/file.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c index cb54ba631691..3d038e1257f9 100644 --- a/fs/btrfs/file.c +++ b/fs/btrfs/file.c @@ -1653,8 +1653,9 @@ static noinline ssize_t btrfs_buffered_write(struct= kiocb *iocb, bool force_page_uptodate =3D false; loff_t old_isize =3D i_size_read(inode); unsigned int ilock_flags =3D 0; + const bool nowait =3D iocb->ki_flags & IOCB_NOWAIT; =20 - if (iocb->ki_flags & IOCB_NOWAIT) + if (nowait) ilock_flags |=3D BTRFS_ILOCK_TRY; =20 ret =3D btrfs_inode_lock(inode, ilock_flags); @@ -1710,17 +1711,22 @@ static noinline ssize_t btrfs_buffered_write(stru= ct kiocb *iocb, extent_changeset_release(data_reserved); ret =3D btrfs_check_data_free_space(BTRFS_I(inode), &data_reserved, pos, - write_bytes, false); + write_bytes, nowait); if (ret < 0) { int can_nocow; =20 + if (nowait && (ret =3D=3D -ENOSPC || ret =3D=3D -EAGAIN)) { + ret =3D -EAGAIN; + break; + } + /* * If we don't have to COW at the offset, reserve * metadata only. write_bytes may get smaller than * requested here. */ can_nocow =3D btrfs_check_nocow_lock(BTRFS_I(inode), pos, - &write_bytes, false); + &write_bytes, nowait); if (can_nocow < 0) ret =3D can_nocow; if (can_nocow > 0) @@ -1737,7 +1743,7 @@ static noinline ssize_t btrfs_buffered_write(struct= kiocb *iocb, WARN_ON(reserve_bytes =3D=3D 0); ret =3D btrfs_delalloc_reserve_metadata(BTRFS_I(inode), reserve_bytes, - reserve_bytes, false); + reserve_bytes, nowait); if (ret) { if (!only_release_metadata) btrfs_free_reserved_data_space(BTRFS_I(inode), @@ -1767,10 +1773,11 @@ static noinline ssize_t btrfs_buffered_write(stru= ct kiocb *iocb, extents_locked =3D lock_and_cleanup_extent_if_need( BTRFS_I(inode), pages, num_pages, pos, write_bytes, &lockstart, - &lockend, false, &cached_state); + &lockend, nowait, &cached_state); if (extents_locked < 0) { - if (extents_locked =3D=3D -EAGAIN) + if (!nowait && extents_locked =3D=3D -EAGAIN) goto again; + btrfs_delalloc_release_extents(BTRFS_I(inode), reserve_bytes); ret =3D extents_locked; --=20 2.30.2