From mboxrd@z Thu Jan 1 00:00:00 1970 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 6F9332E3B03 for ; Tue, 8 Jul 2025 16:06: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=1751990807; cv=none; b=OfZaELoXl142oAQIbFFC8A+D16RJtBuD5aWwylOXvxGGRyAPpHIM5n4z8+Oc9it7DO83mHOHd0E1jNA3zJTnDVWnm4yJjKh/N1eIjRkRDniTWxPjmtwsZkc/WjDper7IluF7/mKlgFec7jiZ7KRFLX+VTSPLFgX2R7/QTV/NuYQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751990807; c=relaxed/simple; bh=m5cGrmZw2plZkZu6pmVWkJKfBuySuyZ/0uG5Zgtwu6k=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LVSi3IZitXc6sxx0K/mCD3j3cdsh0eLlCR+WUo4ipTZRkdIKyhn+eqXdwsyrblVCneAtO/8kbFEtkhYQxZfsimghLTtHxj2Ojg+p/QDLwV63MK/o9LdSB8EtMgU7lFAyPjU6cmQ1ygDNXu/itc/5st9GjKjcpI2pSkxfRqJivsQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=XaSq41ER; 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="XaSq41ER" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 206FEC4CEF0; Tue, 8 Jul 2025 16:06:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1751990807; bh=m5cGrmZw2plZkZu6pmVWkJKfBuySuyZ/0uG5Zgtwu6k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XaSq41ERf3CYJ8+gpp4mtOMCD2mgEmAynWl6fWEdLYL5JqiPxyraYYEt2hobjM1tl rXmkXBurmHrDrCxULqq/ocZ4IizpJwkaCdl4MmRCibnKtl8Gf5riUFqr8cmMjwM832 WfGw9M7UfjWdtGXCaROKLX/fp9J5n4bP9g5IcPkD57IK9wTk2PFT33aNu/RPG9ifSN JHPA9k0DL35Lx2qgjwqUlpvxyKIJEIceWjRm8mgWO/ukRcl/YPKr9lyqSc4PAiS6dk Wnx1/4Yi0FVrjVX83WXIEBzkolcFrz3Nbon+YMVhrVvr74I3zL00WY+xNsKT8H3HDn OqSJdcdgCiulg== From: Mike Snitzer To: Chuck Lever , Jeff Layton , NeilBrown , Olga Kornievskaia , Dai Ngo , Tom Talpey , Trond Myklebust , Anna Schumaker Cc: linux-nfs@vger.kernel.org, linus-fsdevel@vger.kernel.org, linux-mm@kvack.org, snitzer@kernel.org Subject: [RFC PATCH v2 7/8] NFSD: add io_cache_write controls to debugfs interface Date: Tue, 8 Jul 2025 12:06:18 -0400 Message-ID: <20250708160619.64800-8-snitzer@kernel.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20250708160619.64800-1-snitzer@kernel.org> References: <20250708160619.64800-1-snitzer@kernel.org> Precedence: bulk X-Mailing-List: linux-nfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Add 'io_cache_write' to NFSD's debugfs interface so that: Any data written by NFSD will either be: - cached using page cache (NFSD_IO_BUFFERED=0) - cached but removed from the page cache upon completion (NFSD_IO_DONTCACHE=1). - not cached (NFSD_IO_DIRECT=2) io_cache_write is 0 by default. It may be set by writing to: /sys/kernel/debug/nfsd/io_cache_write If NFSD_IO_DONTCACHE is specified using 1, FOP_DONTCACHE must be advertised as supported by the underlying filesystem (e.g. XFS), otherwise all IO flagged with RWF_DONTCACHE will fail with -EOPNOTSUPP. If NFSD_IO_DIRECT is specified using 2, the IO must be aligned relative to the underlying block device's logical_block_size. Also the memory buffer used to store the WRITE payload must be aligned relative to the underlying block device's dma_alignment. Signed-off-by: Mike Snitzer --- fs/nfsd/debugfs.c | 41 +++++++++++++++++++++++++++++++++++++++++ fs/nfsd/nfsd.h | 1 + fs/nfsd/vfs.c | 15 +++++++++++++++ 3 files changed, 57 insertions(+) diff --git a/fs/nfsd/debugfs.c b/fs/nfsd/debugfs.c index 709646af797a..fadf1d88f640 100644 --- a/fs/nfsd/debugfs.c +++ b/fs/nfsd/debugfs.c @@ -82,6 +82,44 @@ static int nfsd_io_cache_read_set(void *data, u64 val) DEFINE_DEBUGFS_ATTRIBUTE(nfsd_io_cache_read_fops, nfsd_io_cache_read_get, nfsd_io_cache_read_set, "%llu\n"); +/* + * /sys/kernel/debug/nfsd/io_cache_write + * + * Contents: + * %0: NFS WRITE will use buffered IO (default) + * %1: NFS WRITE will use dontcache (buffered IO w/ dropbehind) + * %2: NFS WRITE will use direct IO + * + * The default value of this setting is zero (buffered IO is + * used). This setting takes immediate effect for all NFS + * versions, all exports, and in all NFSD net namespaces. + */ + +static int nfsd_io_cache_write_get(void *data, u64 *val) +{ + *val = nfsd_io_cache_write; + return 0; +} + +static int nfsd_io_cache_write_set(void *data, u64 val) +{ + switch (val) { + case NFSD_IO_BUFFERED: + case NFSD_IO_DONTCACHE: + case NFSD_IO_DIRECT: + nfsd_io_cache_write = val; + break; + default: + nfsd_io_cache_write = NFSD_IO_BUFFERED; + break; + } + + return 0; +} + +DEFINE_DEBUGFS_ATTRIBUTE(nfsd_io_cache_write_fops, nfsd_io_cache_write_get, + nfsd_io_cache_write_set, "%llu\n"); + void nfsd_debugfs_exit(void) { debugfs_remove_recursive(nfsd_top_dir); @@ -97,4 +135,7 @@ void nfsd_debugfs_init(void) debugfs_create_file("io_cache_read", S_IWUSR | S_IRUGO, nfsd_top_dir, NULL, &nfsd_io_cache_read_fops); + + debugfs_create_file("io_cache_write", S_IWUSR | S_IRUGO, + nfsd_top_dir, NULL, &nfsd_io_cache_write_fops); } diff --git a/fs/nfsd/nfsd.h b/fs/nfsd/nfsd.h index 4740567f4e7e..1ae38c5557c4 100644 --- a/fs/nfsd/nfsd.h +++ b/fs/nfsd/nfsd.h @@ -160,6 +160,7 @@ enum { }; extern u64 nfsd_io_cache_read __read_mostly; +extern u64 nfsd_io_cache_write __read_mostly; extern int nfsd_max_blksize; diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index 632ce417f4ef..05a7ba383334 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c @@ -50,6 +50,7 @@ bool nfsd_disable_splice_read __read_mostly; u64 nfsd_io_cache_read __read_mostly; +u64 nfsd_io_cache_write __read_mostly; /** * nfserrno - Map Linux errnos to NFS errnos @@ -1228,6 +1229,20 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, nvecs = xdr_buf_to_bvec(rqstp->rq_bvec, rqstp->rq_maxpages, payload); iov_iter_bvec(&iter, ITER_SOURCE, rqstp->rq_bvec, nvecs, *cnt); + + switch (nfsd_io_cache_write) { + case NFSD_IO_DIRECT: + if (iov_iter_is_aligned(&iter, nf->nf_dio_mem_align - 1, + nf->nf_dio_offset_align - 1)) + kiocb.ki_flags = IOCB_DIRECT; + break; + case NFSD_IO_DONTCACHE: + kiocb.ki_flags = IOCB_DONTCACHE; + break; + case NFSD_IO_BUFFERED: + break; + } + since = READ_ONCE(file->f_wb_err); if (verf) nfsd_copy_write_verifier(verf, nn); -- 2.44.0