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 7370BC6FA83 for ; Mon, 12 Sep 2022 19:28:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0D22794000D; Mon, 12 Sep 2022 15:28:20 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 05D19940008; Mon, 12 Sep 2022 15:28:19 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CDE0F94000D; Mon, 12 Sep 2022 15:28:19 -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 BA1E1940008 for ; Mon, 12 Sep 2022 15:28:19 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 909521C69B0 for ; Mon, 12 Sep 2022 19:28:19 +0000 (UTC) X-FDA: 79904419518.20.1041396 Received: from mx0a-00082601.pphosted.com (mx0a-00082601.pphosted.com [67.231.145.42]) by imf19.hostedemail.com (Postfix) with ESMTP id 337501A007C 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 28CD5XB3028072 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=Xfmv/q1sJqX2orN/Q6I/sqaH1MCfWUK4TQnNtY5BWDc=; b=Km2YyidxKG/uK1G+0axv3B9xehd9q+GKNg9XZeaKqLeJlxnkPGMq2weZwkDxM3Y9cCPO dnFLwxfqA+FdHqCTgg/Nf/wr5jRYcnlR/TfQSzS0QvybHHS03tRkotm1DDKTXl2PEh/L pq0MjTSUvrTkpiVp4x/XGQaej3UTZ4aj5Ac= Received: from maileast.thefacebook.com ([163.114.130.16]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3jgsw4cck9-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Mon, 12 Sep 2022 12:28:17 -0700 Received: from twshared13315.14.prn3.facebook.com (2620:10d:c0a8:1b::d) by mail.thefacebook.com (2620:10d:c0a8:83::5) 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:16 -0700 Received: by dev1180.prn1.facebook.com (Postfix, from userid 425415) id 266C1208523A; Mon, 12 Sep 2022 12:27:54 -0700 (PDT) From: Stefan Roesch To: , , , CC: , , , Subject: [PATCH v3 10/12] btrfs: make balance_dirty_pages nowait compatible Date: Mon, 12 Sep 2022 12:27:50 -0700 Message-ID: <20220912192752.3785061-11-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: Cq82nhW4OVLryPw9GsupdoBXEnOY72d4 X-Proofpoint-GUID: Cq82nhW4OVLryPw9GsupdoBXEnOY72d4 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-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=Xfmv/q1sJqX2orN/Q6I/sqaH1MCfWUK4TQnNtY5BWDc=; b=PJ1mtN4Z/Z+SloYjbhmwic9F5NHqG+ld5ghAHIlCTdY8u92mHoyUFj2stOSm9lNADHnTvQ 5ielC0yf5cWyU0du70FSw2UR4apjFM0yXPbzsqMU9MSATNIY7j5uu11l6vjA7lNzeMpTma qgeND1q85tqJ1ZB9njuuzv0FUhrX2Zw= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=fb.com header.s=facebook header.b=Km2Yyidx; spf=pass (imf19.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=1663010899; a=rsa-sha256; cv=none; b=5FcBbF9M59Jb+fcQfhy9TYLAabetIWrs7/aKnRPBbEYrpEmiHmcB7qT/XyDxmtZd1FTNMU 5pJR5qwvUO177YPjq79ZNryx4x+8PphJa0DzzEXtWAkdPCeGMlQyFN1nws/xzFQ4raaf7W J1qtwICwwJyHii1i5f8FZTTZheCAFfk= X-Rspam-User: X-Stat-Signature: n3qcsfno8ay65xx4u7rh8p7953piqg4u X-Rspamd-Queue-Id: 337501A007C Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=fb.com header.s=facebook header.b=Km2Yyidx; spf=pass (imf19.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-Server: rspam04 X-HE-Tag: 1663010898-940712 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 replaces the call to function balance_dirty_pages_ratelimited() in the function btrfs_buffered_write() with a call to balance_dirty_pages_ratelimited_flags(). It also moves the function after the again label. This can cause the function to be called a bit later, but this should have no impact in the real world. Signed-off-by: Stefan Roesch --- fs/btrfs/file.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c index 3d038e1257f9..4dc6484ff229 100644 --- a/fs/btrfs/file.c +++ b/fs/btrfs/file.c @@ -1654,6 +1654,7 @@ static noinline ssize_t btrfs_buffered_write(struct= kiocb *iocb, loff_t old_isize =3D i_size_read(inode); unsigned int ilock_flags =3D 0; const bool nowait =3D iocb->ki_flags & IOCB_NOWAIT; + unsigned int bdp_flags =3D nowait ? BDP_ASYNC : 0; =20 if (nowait) ilock_flags |=3D BTRFS_ILOCK_TRY; @@ -1756,6 +1757,10 @@ static noinline ssize_t btrfs_buffered_write(struc= t kiocb *iocb, =20 release_bytes =3D reserve_bytes; again: + ret =3D balance_dirty_pages_ratelimited_flags(inode->i_mapping, bdp_fl= ags); + if (ret) + break; + /* * This is going to setup the pages array with the number of * pages we want, so we don't really need to worry about the @@ -1860,8 +1865,6 @@ static noinline ssize_t btrfs_buffered_write(struct= kiocb *iocb, =20 cond_resched(); =20 - balance_dirty_pages_ratelimited(inode->i_mapping); - pos +=3D copied; num_written +=3D copied; } --=20 2.30.2