From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EAAB633E351 for ; Sun, 7 Jun 2026 07:32:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.48 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780817530; cv=none; b=V0QgbLqkkmnQRsI7FEsWTk+Wmje1xx566Snc7OyQ6ZuVcyZa1tJfc3YTF8FMqKHeI/UsCTwKxNiPYNSpRK2rKAIuJLVA797pUr9N638KXIfHsh3aaRxVorFIqZKCspoFWY+fW3Qp6iDsrfFmMxPFFuKQTrltx39tTrT66ARlHbU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780817530; c=relaxed/simple; bh=TcJi1kY6w0L+kvlTtQn8bf3Yvzy8onv7gAt+BEvpDSI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=g4V2dMm7oktEgiBkC/vdF6sgwcv4CGYvxgG0RRB3PXDCuKUNRHaDk9NT6DR2n10IHEvgTrfbCn9hXXHGRQs7Nwbwwh0JWuVGtvRhrJDm2nDeNQOIG/10Sta5zvQ7N8Svn5yAt8CBA73wEfEH8iT6neIo85U9W0ML8AObKci5s/Y= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=B72W9hcH; arc=none smtp.client-ip=209.85.221.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="B72W9hcH" Received: by mail-wr1-f48.google.com with SMTP id ffacd0b85a97d-4600cbb06deso1708731f8f.1 for ; Sun, 07 Jun 2026 00:32:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1780817527; x=1781422327; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=uL6OlgcDlgjF+B0ED6UmCWmqxd3IQOhibpTPajkvSC4=; b=B72W9hcHAMrCc22dO4/1Jhn4x7kFV8mUWhzhn8sCbCPTK29D1FZ9AevaQm2xj/+mJ3 cB3VhI44FRldOp03ZL8pjRbF6ItInLbZGb/2/Q4t8kusV5K6mYtQUNnQ/Bkj5Poa4Kaa Jg686BrFEfq5U8O+S7wAVw9O4WCV0bKZf9f/UcfgmtA8XRTF4gYvzvpmHzfXug+5/cKl 7I1IX0jjy0XTkYFRa6+GTnA3LXwW5R94aJRAqImkjoXLdu7HJLy3o+xieL0XzS5Ap2n0 IVVkfrpzpp54UaAMvKPZQU9B6GfK2mx3/3vJowiyCJRm/cZ/dFY7RBcy2fvFExSN0fTQ keRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780817527; x=1781422327; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=uL6OlgcDlgjF+B0ED6UmCWmqxd3IQOhibpTPajkvSC4=; b=ZMUKg+TtgKrP99WMqWZ4fp18cvhiCaH+jaa0IInjmmpdRW9u9+llgyc0GENEXZVjmH tVTCnV5JAR9Nd8VBgjPvRlcjeNe0ry1brOQ0GzOtTRgmDG29bFBlaqajG1OpkdQEz+OP CVi7xfeYgLxw3vf0jXVaxTDiyu4LupbPhBL11dogGYK3n/F0qA/Q8DyPtUwbHTd1MngO KPoPQVvF6nAARN5wgybo5Eh6hSjzIvP8apJKgzGHP8pVZvHfOnge+3iQOg6rHHTqcx4q /yQrXpSHYKYHjQTrgLzUBcX4Raoj87w2QNCbgQCAqM12E34Hmx77CouT8LIJO0NGRAs9 5wEw== X-Forwarded-Encrypted: i=1; AFNElJ+qXmpFec6+kNq58GBQTYJrSF8piWfW+zSh2pz3cz0a+H3sNB6RhHnDCzhoFhMT+c2v3ClylRfaX7P02nE=@vger.kernel.org X-Gm-Message-State: AOJu0Yz4rkrPBc/tAEtyWPShNFiXk5HjoEfuwB9wl/Fz5iw+/FrzsGKM RfYifocQ1M6C3sk3VgSrdaEq+sV/cO3mS+RrpwBQO4eTQGYu3cy4FREf X-Gm-Gg: Acq92OGQNiLOuvy97mZ0hdoPWJ/P86uVneOCnLx0pFqlyd42rIcq7ceCYWfZG54j4QN b4gBUPhARk0Dsssr/dif4yb42O3dIjd9ib9g+p1lKC81AtShS9MoRbwyTtg1saiixvSC7nOmd/Q JAKF/aYubyAk4PwnqeF6/j1jMiG9QKKmLrOY1nt0zyI+Zr2b2JGkK/2Tf8ce8DYreNvnGXO9eSU Vk2OKWrcae4pEOHa5g+dCfzHG/+eW0iqzBXSUYqb+Mks54t3rAd8WvOcJixQj/c6QSH1SOx2yAT C0uN0bC5+ABne7xTriXh+Y3quqy5JdVfsJgCtrKgA6lL02mpFwNcA+7c06Byc7Is0/VrEGjKtrs FPRWCBOhHO4Gdrhs1+MKHcHnZ+cBqu8rnxs8mY7jAgopyDSUaOkQZlp3xBc0tJgiNz13yy4L1sQ zjrqGybaD/bqd4wgF7IjRPEwA6uz/NkxpcDjqNF0AKOJ7GFlDi+wCH X-Received: by 2002:a05:6000:4b07:b0:460:21e7:330e with SMTP id ffacd0b85a97d-46032b8164fmr13341511f8f.10.1780817527355; Sun, 07 Jun 2026 00:32:07 -0700 (PDT) Received: from puck (234.243.199.146.dyn.plus.net. [146.199.243.234]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4601f351d40sm40459372f8f.26.2026.06.07.00.32.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Jun 2026 00:32:06 -0700 (PDT) From: Dylan Yudaken To: trondmy@kernel.org, anna@kernel.org, linux-nfs@vger.kernel.org Cc: axboe@kernel.dk, io-uring@vger.kernel.org, linux-kernel@vger.kernel.org, Dylan Yudaken Subject: [PATCH v2 2/2] nfs: expose FMODE_NOWAIT for read-only files Date: Sun, 7 Jun 2026 08:31:55 +0100 Message-ID: <20260607073155.105314-3-dyudaken@gmail.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260607073155.105314-1-dyudaken@gmail.com> References: <20260607073155.105314-1-dyudaken@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit NFS O_DIRECT reads already (mostly) handle async requests, with the exception of locking the inode for direct. Handle async requests properly by using nfs_start_io_direct_nowait, and then expose FMODE_NOWAIT since it's now supported for direct reads. Signed-off-by: Dylan Yudaken --- fs/nfs/direct.c | 12 ++++++++++-- fs/nfs/file.c | 16 +++++++++++++++- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c index 48d89716193a..e626c72495e6 100644 --- a/fs/nfs/direct.c +++ b/fs/nfs/direct.c @@ -466,14 +466,22 @@ ssize_t nfs_file_direct_read(struct kiocb *iocb, struct iov_iter *iter, goto out_release; } dreq->l_ctx = l_ctx; - if (!is_sync_kiocb(iocb)) + if (!is_sync_kiocb(iocb)) { dreq->iocb = iocb; + } else if (iocb->ki_flags & IOCB_NOWAIT) { + result = -EAGAIN; + nfs_direct_req_release(dreq); + goto out_release; + } if (user_backed_iter(iter)) dreq->flags = NFS_ODIRECT_SHOULD_DIRTY; if (!swap) { - result = nfs_start_io_direct(inode); + if (iocb->ki_flags & IOCB_NOWAIT) + result = nfs_start_io_direct_nowait(inode); + else + result = nfs_start_io_direct(inode); if (result) { /* release the reference that would usually be * consumed by nfs_direct_read_schedule_iovec() diff --git a/fs/nfs/file.c b/fs/nfs/file.c index 25048a3c2364..a0d8f1c1cf10 100644 --- a/fs/nfs/file.c +++ b/fs/nfs/file.c @@ -72,8 +72,12 @@ nfs_file_open(struct inode *inode, struct file *filp) return res; res = nfs_open(inode, filp); - if (res == 0) + if (res == 0) { filp->f_mode |= FMODE_CAN_ODIRECT; + /* flag NOWAIT on read-only files only */ + if (!(filp->f_mode & FMODE_WRITE)) + filp->f_mode |= FMODE_NOWAIT; + } return res; } @@ -166,6 +170,10 @@ nfs_file_read(struct kiocb *iocb, struct iov_iter *to) if (iocb->ki_flags & IOCB_DIRECT) return nfs_file_direct_read(iocb, to, false); + /* NOWAIT only supported on direct reads */ + if (iocb->ki_flags & IOCB_NOWAIT) + return -EAGAIN; + dprintk("NFS: read(%pD2, %zu@%lu)\n", iocb->ki_filp, iov_iter_count(to), (unsigned long) iocb->ki_pos); @@ -705,6 +713,12 @@ ssize_t nfs_file_write(struct kiocb *iocb, struct iov_iter *from) trace_nfs_file_write(iocb, from); + /* + * FMODE_NOWAIT is not set for writable files + */ + if (WARN_ON_ONCE(iocb->ki_flags & IOCB_NOWAIT)) + return -EAGAIN; + result = nfs_key_timeout_notify(file, inode); if (result) return result; -- 2.50.1