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 85B50C6FA89 for ; Mon, 12 Sep 2022 19:28:21 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 33E06940008; Mon, 12 Sep 2022 15:28:20 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1E1F894000F; Mon, 12 Sep 2022 15:28:20 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id ED7E094000E; Mon, 12 Sep 2022 15:28:19 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id D0506940008 for ; Mon, 12 Sep 2022 15:28:19 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id A5100C10FA for ; Mon, 12 Sep 2022 19:28:19 +0000 (UTC) X-FDA: 79904419518.22.7A53D6A Received: from mx0a-00082601.pphosted.com (mx0a-00082601.pphosted.com [67.231.145.42]) by imf29.hostedemail.com (Postfix) with ESMTP id 323C41200CC for ; Mon, 12 Sep 2022 19:28:18 +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 28CIEpph022502 for ; Mon, 12 Sep 2022 12:28:18 -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=v668+yucalsclBLGva7iP+bpxwNMZZM7NOxiVrIMvJs=; b=o+ANsbFDBaBM+3/6v0+TF/TCM6whzW6+JPujEiuO7iZaQhZCwogBAZkTI4JtugwViqfW E9sohXDvDdy/MSW7Z5GMPuO2uhe+gMwW1CxO6i4gZEPAvDWWOea6cWLmYbiaGjrvTebx bUUwZpcwcuGx5huZM8f/DnE/g+Hy789HlhQ= Received: from maileast.thefacebook.com ([163.114.130.16]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3jgsw4ccjw-9 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Mon, 12 Sep 2022 12:28:18 -0700 Received: from twshared15978.04.prn5.facebook.com (2620:10d:c0a8:1b::d) by mail.thefacebook.com (2620:10d:c0a8:83::4) 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 1BA292085236; Mon, 12 Sep 2022 12:27:54 -0700 (PDT) From: Stefan Roesch To: , , , CC: , , , Subject: [PATCH v3 08/12] btrfs: make lock_and_cleanup_extent_if_need nowait compatible Date: Mon, 12 Sep 2022 12:27:48 -0700 Message-ID: <20220912192752.3785061-9-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: XtQxRGV_jFq5ASsCK3yyq4JZhxRF427N X-Proofpoint-GUID: XtQxRGV_jFq5ASsCK3yyq4JZhxRF427N 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-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1663010899; a=rsa-sha256; cv=none; b=bKHBKGUYe7WlqFmrZ7ho+i4LzxYAPYDmr/q5t/sVmCiSJarHDOTpz5ZkOwsUOlj06HltzC c0aENvSsDDyoR7zRdG93UyMON5lot+0wbHoSaVFupVhVQo+Le0oCIbPwW+8ka1yTGcSTjz lhwcGFb0HhkSnBvoNl8K/1+B8AXniGA= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=fb.com header.s=facebook header.b=o+ANsbFD; 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-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1663010899; 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=v668+yucalsclBLGva7iP+bpxwNMZZM7NOxiVrIMvJs=; b=HAVUK1HsjR2gdS74mo8++/fwWiO+kpj8FidRAxBBcGX7gi0kP/YGM72w2nCompMFz9m/q9 gq1DGOI6GSB2ch5rgwv+/63dBAr5RH8dtO9xUNQBtvhbeHdRm4YjA0An//iEiY3MYDm778 m6YYDEHSXUzuwBb0lyVreSto/m9sDfw= X-Rspamd-Queue-Id: 323C41200CC Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=fb.com header.s=facebook header.b=o+ANsbFD; 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-Rspam-User: X-Rspamd-Server: rspam10 X-Stat-Signature: j9kpbkxu34bm61dqdps9obohrad5dyr5 X-HE-Tag: 1663010898-984064 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: This adds the nowait parameter to lock_and_cleanup_extent_if_need(). If the nowait parameter is specified we try to lock the extent in nowait mode. Signed-off-by: Stefan Roesch --- fs/btrfs/file.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c index d4362ee7e09e..cb54ba631691 100644 --- a/fs/btrfs/file.c +++ b/fs/btrfs/file.c @@ -1439,7 +1439,7 @@ static noinline int lock_and_cleanup_extent_if_need(struct btrfs_inode *inode, struct page *= *pages, size_t num_pages, loff_t pos, size_t write_bytes, - u64 *lockstart, u64 *lockend, + u64 *lockstart, u64 *lockend, bool nowait, struct extent_state **cached_state) { struct btrfs_fs_info *fs_info =3D inode->root->fs_info; @@ -1454,8 +1454,21 @@ lock_and_cleanup_extent_if_need(struct btrfs_inode= *inode, struct page **pages, if (start_pos < inode->vfs_inode.i_size) { struct btrfs_ordered_extent *ordered; =20 - lock_extent_bits(&inode->io_tree, start_pos, last_pos, + if (nowait) { + if (!try_lock_extent(&inode->io_tree, start_pos, last_pos)) { + for (i =3D 0; i < num_pages; i++) { + unlock_page(pages[i]); + put_page(pages[i]); + pages[i] =3D NULL; + } + + return -EAGAIN; + } + } else { + lock_extent_bits(&inode->io_tree, start_pos, last_pos, cached_state); + } + ordered =3D btrfs_lookup_ordered_range(inode, start_pos, last_pos - start_pos + 1); if (ordered && @@ -1754,7 +1767,7 @@ static noinline ssize_t btrfs_buffered_write(struct= kiocb *iocb, extents_locked =3D lock_and_cleanup_extent_if_need( BTRFS_I(inode), pages, num_pages, pos, write_bytes, &lockstart, - &lockend, &cached_state); + &lockend, false, &cached_state); if (extents_locked < 0) { if (extents_locked =3D=3D -EAGAIN) goto again; --=20 2.30.2