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 B570230C615 for ; Sun, 7 Jun 2026 07:32:07 +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=1780817529; cv=none; b=LYYa1LecVwcC11DIuSZ17epjnmoWOg2hAbAvhR6HMbt1MqcIrM87Z0Es0hUvCoE6SA+2uBXTFJVJHchTE5TekEgwoQF5rNVMe9AxroqVdS46FV2l81krkhIcpCibJznERIWTzZAO8HhAJuhn8xtQo0922txE3iCqMXAb0Vn0JQk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780817529; c=relaxed/simple; bh=ixLRwyZ7Jxo5tM81pF8bPmeIBDeeOOSq2YWj9b8+M0w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UJ8yc8R+rxlsBMUQXro0I5czIbNI98d9dvKUaIUdJwussQKChwOcD1ozjrNnhzkHHwN37BjWbm0GM+U5QULpNt6h5mStJwdZe2O/7hzPjzgNFDbZ45u8gX1AstOMN3zSvmGKG8IMl4HTpHq7ZNVUdObe54dJy36s94xdsK1WrHE= 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=WluwxSFQ; 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="WluwxSFQ" Received: by mail-wr1-f48.google.com with SMTP id ffacd0b85a97d-46019edc13dso1471495f8f.1 for ; Sun, 07 Jun 2026 00:32:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1780817526; x=1781422326; 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=awuv5dGGzG/SbXd109I+wvKTasG/T2oytd+uKQuR6kU=; b=WluwxSFQUIlOv/Yki4ftq8ZQBoJqeGKJdy8y0epSKUD+SQN84qNLOtNWSn8J4ytBwq pS0D/ysI51vMmvJrjtuqeJaaI6DJR0/0gOzuB4GnYnf3m9yrqsh5VZStJMcRRABLyUZg Y0GNWctY/EQokjb69mYSV7A68W76EUj0Yu7RD+6NTYD0x6A84gtdxvNO4OPqyUd0C9fe m/hw6o/IafHf5QZ2SPUQ8sQtWBkaQOpU60u5cbUMwJaWT9Mgn0ypcyu3AWB4Q7ZxLMIh Ol1sP+ea/8r9YClg1mgWO3QuYB9zvkjSYPuZabmFfUwPF+51K+AGryz0TSQRvuZhlvJL uDSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780817526; x=1781422326; 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=awuv5dGGzG/SbXd109I+wvKTasG/T2oytd+uKQuR6kU=; b=IXOTFXJcAB7enLA7HMKme0cj7PUBKxMT4cWy3311G37X+MZGOP7Gf/vF/NKZCPsyRA 9RpZSuuVg4px+9TbrwxJqLRDmki/2A+PuO1Ll7TPV1262SGuD8CP+qU1JXlOQWXHJqY9 sdiF8gwxVywSkR2Z5jl2n88bVG1ZaxulWMjOvLVGRkZ23Tk0h8tuJ6yd8v8sf+2B7Zla 2Ae8ANcBYlxM50RKzeM6NkYKHA+fhr0XecDMR68jgy+FHP93kLSIEJeVjiwiSG3TAHVf sazYmrWn0x2ChlmXezZLwi/Y18XFSCianuriGr3q7qg2/xv23lRc5yNg00wS8EQ3CPNl VSWw== X-Forwarded-Encrypted: i=1; AFNElJ+nrBFJZd3rXY+6gT9kYMhg29feKcIwSP2umVtPCYldQzkVnJb7Ugjb47YdK6QEhzMrg0M5ozL/xA==@vger.kernel.org X-Gm-Message-State: AOJu0YzG5yVRZU4jKknR/g3JT1thy1MKDsP/+8ucAyU17gq+AM58rSNF 5IjsydX+wpzC3IgMeNi6yjbmOnuQunS3QeR6eSXiAdZom9R1zJhs1D60 X-Gm-Gg: Acq92OFZE7JOG2nV4uB8//MvUUmgDNuYOBRpc2xML58Mks5j50AW6pYmViG7Ts8NoJI Y1pF4No6WQjWIMGuZ9TILTb0fd4trmh1sIxy/whBnSN+CEyjim1xTA0mSAk0h6kW/kvlfnhUzdy eoG/2j6TAopnGp/bmceBslax+v3pekhM0ivuJEt7pDDuY6J9ws0uWyolI8MOYS1HMc3hE8To8WV Kdk8IbJbiOK1x3XhC7/B+yqA6alShDrahbWCCWtNJWDbtcJp+H7tP4gCibY6y5D5RdwtXR2vVhr d5dSnm3ZuTroFG1kzx0wm7M5GbS8Ldil6l6fI0FcU3iXJnF+3I7puC/r0iPXU4DQluac/iUBSPE yYD1fED8n7yVwnXqV4nXeYAJdgkGet4BPmYVUo9/SchQ6m6E4S1+u4eMRvj/MEdTC7lFJmJ/rs5 VCFDooV645mn9SXXYRszxxaJkNPIdWqdrScBd7ekkS5eEOMlTCIsIM X-Received: by 2002:a05:6000:43c5:10b0:45e:dacb:8885 with SMTP id ffacd0b85a97d-46030766a2dmr12519915f8f.35.1780817525922; Sun, 07 Jun 2026 00:32:05 -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.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Jun 2026 00:32:04 -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 1/2] nfs: add nowait version of nfs_start_io_direct Date: Sun, 7 Jun 2026 08:31:54 +0100 Message-ID: <20260607073155.105314-2-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: io-uring@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit nfs_start_io_direct might block on existing operations to the same inode. In order to support NOWAIT O_DIRECT reads, add a non-blocking version of this nfs_start_io_direct that just returns -EAGAIN if locks could not be taken. Signed-off-by: Dylan Yudaken --- fs/nfs/internal.h | 1 + fs/nfs/io.c | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h index 18d46b0e71dd..0c9aca624353 100644 --- a/fs/nfs/internal.h +++ b/fs/nfs/internal.h @@ -532,6 +532,7 @@ extern void nfs_end_io_read(struct inode *inode); extern __must_check int nfs_start_io_write(struct inode *inode); extern void nfs_end_io_write(struct inode *inode); extern __must_check int nfs_start_io_direct(struct inode *inode); +extern __must_check int nfs_start_io_direct_nowait(struct inode *inode); extern void nfs_end_io_direct(struct inode *inode); static inline bool nfs_file_io_is_buffered(struct nfs_inode *nfsi) diff --git a/fs/nfs/io.c b/fs/nfs/io.c index 8337f0ae852d..2faf2003faf6 100644 --- a/fs/nfs/io.c +++ b/fs/nfs/io.c @@ -109,6 +109,16 @@ static void nfs_block_buffered(struct nfs_inode *nfsi, struct inode *inode) } } +static int nfs_block_buffered_nowait(struct nfs_inode *nfsi, struct inode *inode) +{ + if (!test_bit(NFS_INO_ODIRECT, &nfsi->flags)) { + if (inode->i_mapping->nrpages != 0) + return 1; + set_bit(NFS_INO_ODIRECT, &nfsi->flags); + } + return 0; +} + /** * nfs_start_io_direct - declare the file is being used for direct i/o * @inode: file inode @@ -149,6 +159,37 @@ nfs_start_io_direct(struct inode *inode) return 0; } +/** + * nfs_start_io_direct_nowait - non-blocking variant of nfs_start_io_direct() + * @inode: file inode + * + * Try to declare that a direct I/O operation is about to start without + * blocking. + * Ensure all buffered I/O is blocked. + * If this could not be done without blocking then returns -EAGAIN. + */ +int +nfs_start_io_direct_nowait(struct inode *inode) +{ + struct nfs_inode *nfsi = NFS_I(inode); + + if (!down_read_trylock(&inode->i_rwsem)) + return -EAGAIN; + if (test_bit(NFS_INO_ODIRECT, &nfsi->flags)) + return 0; + up_read(&inode->i_rwsem); + + /* Slow path: try to flip NFS_INO_ODIRECT without blocking. */ + if (!down_write_trylock(&inode->i_rwsem)) + return -EAGAIN; + if (nfs_block_buffered_nowait(nfsi, inode)) { + up_write(&inode->i_rwsem); + return -EAGAIN; + } + downgrade_write(&inode->i_rwsem); + return 0; +} + /** * nfs_end_io_direct - declare that the direct i/o operation is done * @inode: file inode -- 2.50.1