From nobody Thu Apr 9 17:15:22 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 857BD3603DD; Fri, 6 Mar 2026 10:12:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772791967; cv=none; b=atrlq578jrgse8+XLCg2v1ZCP0MAg2d4te8YeaAa6wlP3cu/vBQhGf/06kwAmE4PyDTNyKAcqQC9Yj3MPraXXZVZ/vyIzMYz4hNmESpSKFU1CwggaY31wo5ofdLAiX9QA3zeG+DWjObtCPlXTMq/uAiTXFwnDmTor9QmtK4ENjA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772791967; c=relaxed/simple; bh=gDKkyGTyap/7a7kVvfBd9tCAQADwooiLJVcBjqvRCeA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To:Cc; b=Ocr3Nw24T/ISveCgm7o0Fu60ICFBbLljLfmgUT792IueurlfL44nQBZitm8FzC+FafvazfmDXsLXZGNyTp+sjG9yww6rtyeWQtoGrcFym/gly/IG9o/4qxgUbUKwSvnNZ7MrSajFJtY6HgZ7mv61PG7ftja2UYHub6nUeA0IR8U= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=c1BWKO6Q; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="c1BWKO6Q" Received: by smtp.kernel.org (Postfix) with ESMTPS id 20808C4CEF7; Fri, 6 Mar 2026 10:12:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772791967; bh=gDKkyGTyap/7a7kVvfBd9tCAQADwooiLJVcBjqvRCeA=; h=From:Date:Subject:To:Cc:Reply-To:From; b=c1BWKO6Ql/zopqMU+iKj14qDLx9T7LRJWUEHqaiqUGdiDRyc05rPzaz8/Cdd1t5Ef 9TAMozX+7uWehzBSY4tizuOMh1gwOBrmwK83qANnObs3XPlEuV2spNYOt8F74p7e0a nJ2tUPXu86+FUp3clIPrzqScnZ8lL+CGfR1h/L8bH8pVI8XBublqPjVyJwQZU8r0VL IPWQUZoxuVsPZJfVUC7TxZxHYxdUp5GaHcsFH92R+kezFGRUYErN37RxF9J/LK9ulh kA24bpOe2sfwc39habTAa/X6CERBjxT+UrKN7Uy2Tdui66MJ4wfd0PT1R852eivdIF 4x01FPNWR7JPg== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 033F1F01821; Fri, 6 Mar 2026 10:12:47 +0000 (UTC) From: Cheng Ding via B4 Relay Date: Fri, 06 Mar 2026 18:12:23 +0800 Subject: [PATCH v2] fuse: invalidate page cache after sync and async direct writes Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260306-xfstests-generic-451-v2-1-93b2d540304b@ddn.com> X-B4-Tracking: v=1; b=H4sIAIaoqmkC/zWOSwrDMAxErxK8rorjfCBd9R4lC9eSE0PrFMuYh JC7Vw10ocUbmHnaFVMKxOpW7SpRCRyWKGAulXKzjRNBQGFltOl1o3tYPWfizDBRlKqDtqvBE2o /YGf10CmpfhL5sJ6zj1F4DpyXtJ2WUv/S/2ADlrfoAMMCVs5ZN4szFvsKaLN8A6UGMTyt9qhb0 7vmjhivbnmr8TiOL8DtTnLCAAAA X-Change-ID: 20260306-xfstests-generic-451-fed0f9d5a095 To: Miklos Szeredi Cc: Jingbo Xu , Bernd Schubert , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, Cheng Ding X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1772791965; l=4920; i=cding@ddn.com; s=20260306; h=from:subject:message-id; bh=EvQek0qcvvJzAP6LXHZM8DbJwI5dqhU9DnJRdAT27o4=; b=4aPzLVfAAKvj1XN1cCaABjD8lKc5HSJ5dsoT78kkTGDgcqw43IgQoxNpCVb/hFa9XbgeqMC/3 TKom6l17sxjBc2c0BV9q1UbI2A2/4BRoW1wtIKmaADZnOY/bfnA00Ua X-Developer-Key: i=cding@ddn.com; a=ed25519; pk=dzzlP8PhiZl3jtcAzbjIIv0kgtoA95fHdILVyjaeePk= X-Endpoint-Received: by B4 Relay for cding@ddn.com/20260306 with auth_id=667 X-Original-From: Cheng Ding Reply-To: cding@ddn.com From: Cheng Ding Fixes xfstests generic/451, similar to how commit b359af8275a9 ("fuse: Invalidate the page cache after FOPEN_DIRECT_IO write") fixes xfstests generic/209. Signed-off-by: Cheng Ding --- Changes in v2: - Address review comments: move invalidation from fuse_direct_io() to fuse_direct_write_iter() - Link to v1: https://lore.kernel.org/r/20260303-async-dio-aio-cache-invali= dation-v1-1-fba0fd0426c3@ddn.com --- fs/fuse/file.c | 53 +++++++++++++++++++++++++++++++++++++++++++---------- fs/fuse/fuse_i.h | 1 + 2 files changed, 44 insertions(+), 10 deletions(-) diff --git a/fs/fuse/file.c b/fs/fuse/file.c index b1bb7153cb78..dc92da9973ae 100644 --- a/fs/fuse/file.c +++ b/fs/fuse/file.c @@ -23,6 +23,8 @@ #include #include =20 +int sb_init_dio_done_wq(struct super_block *sb); + static int fuse_send_open(struct fuse_mount *fm, u64 nodeid, unsigned int open_flags, int opcode, struct fuse_open_out *outargp) @@ -629,6 +631,19 @@ static ssize_t fuse_get_res_by_io(struct fuse_io_priv = *io) return io->bytes < 0 ? io->size : io->bytes; } =20 +static void fuse_aio_invalidate_worker(struct work_struct *work) +{ + struct fuse_io_priv *io =3D container_of(work, struct fuse_io_priv, work); + struct address_space *mapping =3D io->iocb->ki_filp->f_mapping; + ssize_t res =3D fuse_get_res_by_io(io); + pgoff_t start =3D io->offset >> PAGE_SHIFT; + pgoff_t end =3D (io->offset + res - 1) >> PAGE_SHIFT; + + invalidate_inode_pages2_range(mapping, start, end); + io->iocb->ki_complete(io->iocb, res); + kref_put(&io->refcnt, fuse_io_release); +} + /* * In case of short read, the caller sets 'pos' to the position of * actual end of fuse request in IO request. Otherwise, if bytes_requested @@ -661,10 +676,11 @@ static void fuse_aio_complete(struct fuse_io_priv *io= , int err, ssize_t pos) spin_unlock(&io->lock); =20 if (!left && !io->blocking) { + struct inode *inode =3D file_inode(io->iocb->ki_filp); + struct address_space *mapping =3D io->iocb->ki_filp->f_mapping; ssize_t res =3D fuse_get_res_by_io(io); =20 if (res >=3D 0) { - struct inode *inode =3D file_inode(io->iocb->ki_filp); struct fuse_conn *fc =3D get_fuse_conn(inode); struct fuse_inode *fi =3D get_fuse_inode(inode); =20 @@ -673,6 +689,20 @@ static void fuse_aio_complete(struct fuse_io_priv *io,= int err, ssize_t pos) spin_unlock(&fi->lock); } =20 + if (io->write && res >=3D 0 && mapping->nrpages) { + /* + * As in generic_file_direct_write(), invalidate after the + * write, to invalidate read-ahead cache that may have competed + * with the write. + */ + if (!inode->i_sb->s_dio_done_wq) + res =3D sb_init_dio_done_wq(inode->i_sb); + if (res >=3D 0) { + INIT_WORK(&io->work, fuse_aio_invalidate_worker); + queue_work(inode->i_sb->s_dio_done_wq, &io->work); + return; + } + } io->iocb->ki_complete(io->iocb, res); } =20 @@ -1738,15 +1768,6 @@ ssize_t fuse_direct_io(struct fuse_io_priv *io, stru= ct iov_iter *iter, if (res > 0) *ppos =3D pos; =20 - if (res > 0 && write && fopen_direct_io) { - /* - * As in generic_file_direct_write(), invalidate after the - * write, to invalidate read-ahead cache that may have competed - * with the write. - */ - invalidate_inode_pages2_range(mapping, idx_from, idx_to); - } - return res > 0 ? res : err; } EXPORT_SYMBOL_GPL(fuse_direct_io); @@ -1785,6 +1806,8 @@ static ssize_t fuse_direct_read_iter(struct kiocb *io= cb, struct iov_iter *to) static ssize_t fuse_direct_write_iter(struct kiocb *iocb, struct iov_iter = *from) { struct inode *inode =3D file_inode(iocb->ki_filp); + struct address_space *mapping =3D inode->i_mapping; + loff_t pos =3D iocb->ki_pos; ssize_t res; bool exclusive; =20 @@ -1801,6 +1824,16 @@ static ssize_t fuse_direct_write_iter(struct kiocb *= iocb, struct iov_iter *from) FUSE_DIO_WRITE); fuse_write_update_attr(inode, iocb->ki_pos, res); } + if (res > 0 && mapping->nrpages) { + /* + * As in generic_file_direct_write(), invalidate after + * write, to invalidate read-ahead cache that may have + * with the write. + */ + invalidate_inode_pages2_range(mapping, + pos >> PAGE_SHIFT, + (pos + res - 1) >> PAGE_SHIFT); + } } fuse_dio_unlock(iocb, exclusive); =20 diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h index 7f16049387d1..6e8c8cf6b2c8 100644 --- a/fs/fuse/fuse_i.h +++ b/fs/fuse/fuse_i.h @@ -377,6 +377,7 @@ union fuse_file_args { /** The request IO state (for asynchronous processing) */ struct fuse_io_priv { struct kref refcnt; + struct work_struct work; int async; spinlock_t lock; unsigned reqs; --- base-commit: 3c9332f821aa11552f19c331c5aa5299c78c7c94 change-id: 20260306-xfstests-generic-451-fed0f9d5a095 Best regards, --=20 Cheng Ding