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 BBADDC433EF for ; Thu, 23 Jun 2022 18:20:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 292928E017C; Thu, 23 Jun 2022 14:20:46 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2430A8E0144; Thu, 23 Jun 2022 14:20:46 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1324C8E017C; Thu, 23 Jun 2022 14:20:46 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id F40388E0144 for ; Thu, 23 Jun 2022 14:20:45 -0400 (EDT) Received: from smtpin31.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 376B261439 for ; Thu, 23 Jun 2022 18:20:36 +0000 (UTC) X-FDA: 79610316072.31.B66EC4E Received: from mx0a-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) by imf16.hostedemail.com (Postfix) with ESMTP id A0991180022 for ; Thu, 23 Jun 2022 18:20:34 +0000 (UTC) Received: from pps.filterd (m0089730.ppops.net [127.0.0.1]) by m0089730.ppops.net (8.17.1.5/8.17.1.5) with ESMTP id 25NHuoAQ020485 for ; Thu, 23 Jun 2022 11:20:08 -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=mUyYlJXItg61v1JvQQks15Uucu0ATZYHM7QlCl3c3gQ=; b=VZKdRcr9LZs38Nb/xm+f8yCJQ2LEwgYgKqLoqtcoIKjvPUftIcIpsu2xozwBnKKuy6tZ LVSsYl7JBzzlujPfrA44g2DXGa13rey6uliU1N/LMmpMT3PwXWBOfhSEbmLZyME5DWih Isa6jAM15RB7/8skv0JIJa94uA2B0jrt2bo= Received: from maileast.thefacebook.com ([163.114.130.16]) by m0089730.ppops.net (PPS) with ESMTPS id 3gvce7wndn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 23 Jun 2022 11:20:08 -0700 Received: from twshared18317.08.ash9.facebook.com (2620:10d:c0a8:1b::d) by mail.thefacebook.com (2620:10d:c0a8:82::d) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.28; Thu, 23 Jun 2022 11:20:07 -0700 Received: by devvm225.atn0.facebook.com (Postfix, from userid 425415) id A7D8A10C5DC70; Thu, 23 Jun 2022 10:52:00 -0700 (PDT) From: Stefan Roesch To: , , , , CC: , , , , , , Christoph Hellwig Subject: [RESEND PATCH v9 14/14] xfs: Add async buffered write support Date: Thu, 23 Jun 2022 10:51:57 -0700 Message-ID: <20220623175157.1715274-15-shr@fb.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220623175157.1715274-1-shr@fb.com> References: <20220623175157.1715274-1-shr@fb.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-FB-Internal: Safe Content-Type: text/plain X-Proofpoint-GUID: Bx8CKIfkfScDAddNfU-SnaWUQrMa8CHN X-Proofpoint-ORIG-GUID: Bx8CKIfkfScDAddNfU-SnaWUQrMa8CHN X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.883,Hydra:6.0.517,FMLib:17.11.122.1 definitions=2022-06-23_07,2022-06-23_01,2022-06-22_01 ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1656008435; a=rsa-sha256; cv=none; b=WmGz2ih5VyVJJVjP3KSBHMIzgmdKQs13MKX3j11g5VRf/+tkVt8VeLPzrgdAAyAgbYLhx4 7p9M7NVdYbZbz9DvrLJdoXy8lnN/WRAY9rqjcMYhbtqRVc9XxWjyEDT9oTmySngCpjEXLF qWHi0+HuGg4Dtw9INdsPvxH4baXxAJg= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=fb.com header.s=facebook header.b=VZKdRcr9; dmarc=pass (policy=reject) header.from=fb.com; spf=none (imf16.hostedemail.com: domain of "prvs=71737354e2=shr@fb.com" has no SPF policy when checking 67.231.153.30) smtp.mailfrom="prvs=71737354e2=shr@fb.com" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1656008435; 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=mUyYlJXItg61v1JvQQks15Uucu0ATZYHM7QlCl3c3gQ=; b=FYp7K+/jjFOyq4YI4B7THhQhq/pcDHX4a+1tudS5ih3Pk6+SDsDaSQ3ntKTCCNE+RhOT2g aMk+3F1nyyVbS61KGjAyiZqoAwZnrDlkvJnQE/UXnbvHpY9MSVJoo55lYfsYuRB5XLP40c P0tCNB2WrdHjadGHYS++MfXeeaXdw6k= X-Stat-Signature: kpkhy4q6io5r8a7df17wsxcqum7e1maw X-Rspamd-Queue-Id: A0991180022 Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=fb.com header.s=facebook header.b=VZKdRcr9; dmarc=pass (policy=reject) header.from=fb.com; spf=none (imf16.hostedemail.com: domain of "prvs=71737354e2=shr@fb.com" has no SPF policy when checking 67.231.153.30) smtp.mailfrom="prvs=71737354e2=shr@fb.com" X-Rspamd-Server: rspam10 X-Rspam-User: X-HE-Tag: 1656008434-786704 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 async buffered write support to XFS. For async buffered write requests, the request will return -EAGAIN if the ilock cannot be obtained immediately. Signed-off-by: Stefan Roesch Reviewed-by: Christoph Hellwig --- fs/xfs/xfs_file.c | 11 +++++------ fs/xfs/xfs_iomap.c | 5 ++++- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c index 5a171c0b244b..8d9b14d2b912 100644 --- a/fs/xfs/xfs_file.c +++ b/fs/xfs/xfs_file.c @@ -410,7 +410,7 @@ xfs_file_write_checks( spin_unlock(&ip->i_flags_lock); =20 out: - return file_modified(file); + return kiocb_modified(iocb); } =20 static int @@ -700,12 +700,11 @@ xfs_file_buffered_write( bool cleared_space =3D false; unsigned int iolock; =20 - if (iocb->ki_flags & IOCB_NOWAIT) - return -EOPNOTSUPP; - write_retry: iolock =3D XFS_IOLOCK_EXCL; - xfs_ilock(ip, iolock); + ret =3D xfs_ilock_iocb(iocb, iolock); + if (ret) + return ret; =20 ret =3D xfs_file_write_checks(iocb, from, &iolock); if (ret) @@ -1165,7 +1164,7 @@ xfs_file_open( { if (xfs_is_shutdown(XFS_M(inode->i_sb))) return -EIO; - file->f_mode |=3D FMODE_NOWAIT | FMODE_BUF_RASYNC; + file->f_mode |=3D FMODE_NOWAIT | FMODE_BUF_RASYNC | FMODE_BUF_WASYNC; return generic_file_open(inode, file); } =20 diff --git a/fs/xfs/xfs_iomap.c b/fs/xfs/xfs_iomap.c index bcf7c3694290..5d50fed291b4 100644 --- a/fs/xfs/xfs_iomap.c +++ b/fs/xfs/xfs_iomap.c @@ -886,6 +886,7 @@ xfs_buffered_write_iomap_begin( bool eof =3D false, cow_eof =3D false, shared =3D false; int allocfork =3D XFS_DATA_FORK; int error =3D 0; + unsigned int lockmode =3D XFS_ILOCK_EXCL; =20 if (xfs_is_shutdown(mp)) return -EIO; @@ -897,7 +898,9 @@ xfs_buffered_write_iomap_begin( =20 ASSERT(!XFS_IS_REALTIME_INODE(ip)); =20 - xfs_ilock(ip, XFS_ILOCK_EXCL); + error =3D xfs_ilock_for_iomap(ip, flags, &lockmode); + if (error) + return error; =20 if (XFS_IS_CORRUPT(mp, !xfs_ifork_has_extents(&ip->i_df)) || XFS_TEST_ERROR(false, mp, XFS_ERRTAG_BMAPIFORMAT)) { --=20 2.30.2