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 82C2D2BE655 for ; Wed, 17 Sep 2025 18:18:53 +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=1758133134; cv=none; b=ZHCSxQI/R3Hp3SI5N58On29PEz56MjzSk+Jfvn1Mvbz0jZaqXsaEB4CB47rFLtDsXYy2Bs3+YTFTMNQWJEToVd5e1Mkvqu054BwAPHkru/RwUn6JVFcchuFFwMMBmjpS2cwWIQp48g9RvPjKzapUWu7gyvtr78HC1wemJ8GRKrI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758133134; c=relaxed/simple; bh=2OiuDv9l3vjHMK+akDaOTgRXBSMA/4RIVH2Z6JeMeZs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lFjVjlZoD3IGrSjhNzwWsKLuIE41o9EovzsWjt6y6GygPkoK6msTuiXQMd2H0DhPYPixIzvVi9oq+xcpF/veL1iEBeJFxYSepCKd4H4zw2uNEpZMYHUOu3q7vzSAM1yE2KxKfoHtpHRCLXJs6vqNavn2Kf7qew8hV6cKtZCf8MY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ozbSNaV4; 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="ozbSNaV4" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CDE68C4CEE7; Wed, 17 Sep 2025 18:18:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1758133133; bh=2OiuDv9l3vjHMK+akDaOTgRXBSMA/4RIVH2Z6JeMeZs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ozbSNaV4uq3bH1+asG3d690rm6vCHytq0MFvwlHD6YtsJbf9h304OaqCefGgskJxx SsEH1DMDNcVnNl1rY1zIayJuPInnpHwS5eZbbG1rxDZRxBkCZRZ1E/hm4mJ35kqCIh +yIhGYxwuVfqfVaxCKkiamswUllHxQ9/hTi+pkxq3DepDEUNYJqNMRtbL+RAGTcxcT tmloJ7wlrRQ9kD5/tyg5dceIYgSHq2o6C69nsYQBKFWb3pSWa2ILUTW0mYCMVtqjpi vP41FOTzdJL+WZA8vNxw7fQV+l+zadWlAVQM+3t8poILPBwbfZYMBnkIvRmtXjwAdB 7XVWGe+t2H5Qw== From: Mike Snitzer To: Anna Schumaker Cc: Trond Myklebust , linux-nfs@vger.kernel.org Subject: [PATCH v10 6/7] nfs/localio: add tracepoints for misaligned DIO READ and WRITE support Date: Wed, 17 Sep 2025 14:18:42 -0400 Message-ID: <20250917181843.33865-7-snitzer@kernel.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20250917181843.33865-1-snitzer@kernel.org> References: <20250917181843.33865-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 nfs_local_dio_class and use it to create nfs_local_dio_read, nfs_local_dio_write and nfs_local_dio_misaligned trace events. These trace events show how NFS LOCALIO splits a given misaligned IO into a mix of misaligned head and/or tail extents and a DIO-aligned middle extent. The misaligned head and/or tail extents are issued using buffered IO and the DIO-aligned middle is issued using O_DIRECT. This combination of trace events is useful for LOCALIO DIO READs: echo 1 > /sys/kernel/tracing/events/nfs/nfs_local_dio_read/enable echo 1 > /sys/kernel/tracing/events/nfs/nfs_local_dio_misaligned/enable echo 1 > /sys/kernel/tracing/events/nfs/nfs_initiate_read/enable echo 1 > /sys/kernel/tracing/events/nfs/nfs_readpage_done/enable echo 1 > /sys/kernel/tracing/events/xfs/xfs_file_direct_read/enable This combination of trace events is useful for LOCALIO DIO WRITEs: echo 1 > /sys/kernel/tracing/events/nfs/nfs_local_dio_write/enable echo 1 > /sys/kernel/tracing/events/nfs/nfs_local_dio_misaligned/enable echo 1 > /sys/kernel/tracing/events/nfs/nfs_initiate_write/enable echo 1 > /sys/kernel/tracing/events/nfs/nfs_writeback_done/enable echo 1 > /sys/kernel/tracing/events/xfs/xfs_file_direct_write/enable Signed-off-by: Mike Snitzer --- fs/nfs/internal.h | 10 +++++++ fs/nfs/localio.c | 19 ++++++------- fs/nfs/nfs3xdr.c | 2 +- fs/nfs/nfstrace.h | 70 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 89 insertions(+), 12 deletions(-) diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h index d44233cfd7949..3d380c45b5ef3 100644 --- a/fs/nfs/internal.h +++ b/fs/nfs/internal.h @@ -456,6 +456,16 @@ extern int nfs_wait_bit_killable(struct wait_bit_key *key, int mode); #if IS_ENABLED(CONFIG_NFS_LOCALIO) /* localio.c */ +struct nfs_local_dio { + u32 mem_align; + u32 offset_align; + loff_t middle_offset; + loff_t end_offset; + ssize_t start_len; /* Length for misaligned first extent */ + ssize_t middle_len; /* Length for DIO-aligned middle extent */ + ssize_t end_len; /* Length for misaligned last extent */ +}; + extern void nfs_local_probe_async(struct nfs_client *); extern void nfs_local_probe_async_work(struct work_struct *); extern struct nfsd_file *nfs_local_open_fh(struct nfs_client *, diff --git a/fs/nfs/localio.c b/fs/nfs/localio.c index 768af570183af..cf1533759646e 100644 --- a/fs/nfs/localio.c +++ b/fs/nfs/localio.c @@ -322,16 +322,6 @@ nfs_local_iocb_alloc(struct nfs_pgio_header *hdr, return iocb; } -struct nfs_local_dio { - u32 mem_align; - u32 offset_align; - loff_t middle_offset; - loff_t end_offset; - ssize_t start_len; /* Length for misaligned first extent */ - ssize_t middle_len; /* Length for DIO-aligned middle extent */ - ssize_t end_len; /* Length for misaligned last extent */ -}; - static bool nfs_is_local_dio_possible(struct nfs_local_kiocb *iocb, int rw, size_t len, struct nfs_local_dio *local_dio) @@ -367,6 +357,10 @@ nfs_is_local_dio_possible(struct nfs_local_kiocb *iocb, int rw, local_dio->middle_len = middle_end - start_end; local_dio->end_len = orig_end - middle_end; + if (rw == ITER_DEST) + trace_nfs_local_dio_read(hdr->inode, offset, len, local_dio); + else + trace_nfs_local_dio_write(hdr->inode, offset, len, local_dio); return true; } @@ -446,8 +440,11 @@ nfs_local_iters_setup_dio(struct nfs_local_kiocb *iocb, int rw, nfs_iov_iter_aligned_bvec(&iters[n_iters], local_dio->mem_align-1, local_dio->offset_align-1); - if (unlikely(!iocb->iter_is_dio_aligned[n_iters])) + if (unlikely(!iocb->iter_is_dio_aligned[n_iters])) { + trace_nfs_local_dio_misaligned(iocb->hdr->inode, + iocb->hdr->args.offset, len, local_dio); return 0; /* no DIO-aligned IO possible */ + } ++n_iters; iocb->n_iters = n_iters; diff --git a/fs/nfs/nfs3xdr.c b/fs/nfs/nfs3xdr.c index 4ae01c10b7e28..e17d729084125 100644 --- a/fs/nfs/nfs3xdr.c +++ b/fs/nfs/nfs3xdr.c @@ -23,8 +23,8 @@ #include #include -#include "nfstrace.h" #include "internal.h" +#include "nfstrace.h" #define NFSDBG_FACILITY NFSDBG_XDR diff --git a/fs/nfs/nfstrace.h b/fs/nfs/nfstrace.h index d5949da8c2e5d..132c1b87fa3eb 100644 --- a/fs/nfs/nfstrace.h +++ b/fs/nfs/nfstrace.h @@ -1599,6 +1599,76 @@ DEFINE_NFS_DIRECT_REQ_EVENT(nfs_direct_write_completion); DEFINE_NFS_DIRECT_REQ_EVENT(nfs_direct_write_schedule_iovec); DEFINE_NFS_DIRECT_REQ_EVENT(nfs_direct_write_reschedule_io); +#if IS_ENABLED(CONFIG_NFS_LOCALIO) + +DECLARE_EVENT_CLASS(nfs_local_dio_class, + TP_PROTO( + const struct inode *inode, + loff_t offset, + ssize_t count, + const struct nfs_local_dio *local_dio + ), + TP_ARGS(inode, offset, count, local_dio), + TP_STRUCT__entry( + __field(dev_t, dev) + __field(u64, fileid) + __field(u32, fhandle) + __field(loff_t, offset) + __field(ssize_t, count) + __field(u32, mem_align) + __field(u32, offset_align) + __field(loff_t, start) + __field(ssize_t, start_len) + __field(loff_t, middle) + __field(ssize_t, middle_len) + __field(loff_t, end) + __field(ssize_t, end_len) + ), + TP_fast_assign( + const struct nfs_inode *nfsi = NFS_I(inode); + const struct nfs_fh *fh = &nfsi->fh; + + __entry->dev = inode->i_sb->s_dev; + __entry->fileid = nfsi->fileid; + __entry->fhandle = nfs_fhandle_hash(fh); + __entry->offset = offset; + __entry->count = count; + __entry->mem_align = local_dio->mem_align; + __entry->offset_align = local_dio->offset_align; + __entry->start = offset; + __entry->start_len = local_dio->start_len; + __entry->middle = local_dio->middle_offset; + __entry->middle_len = local_dio->middle_len; + __entry->end = local_dio->end_offset; + __entry->end_len = local_dio->end_len; + ), + TP_printk("fileid=%02x:%02x:%llu fhandle=0x%08x " + "offset=%lld count=%zd " + "mem_align=%u offset_align=%u " + "start=%llu+%zd middle=%llu+%zd end=%llu+%zd", + MAJOR(__entry->dev), MINOR(__entry->dev), + (unsigned long long)__entry->fileid, + __entry->fhandle, __entry->offset, __entry->count, + __entry->mem_align, __entry->offset_align, + __entry->start, __entry->start_len, + __entry->middle, __entry->middle_len, + __entry->end, __entry->end_len) +) + +#define DEFINE_NFS_LOCAL_DIO_EVENT(name) \ +DEFINE_EVENT(nfs_local_dio_class, nfs_local_dio_##name, \ + TP_PROTO(const struct inode *inode, \ + loff_t offset, \ + ssize_t count, \ + const struct nfs_local_dio *local_dio),\ + TP_ARGS(inode, offset, count, local_dio)) + +DEFINE_NFS_LOCAL_DIO_EVENT(read); +DEFINE_NFS_LOCAL_DIO_EVENT(write); +DEFINE_NFS_LOCAL_DIO_EVENT(misaligned); + +#endif /* CONFIG_NFS_LOCALIO */ + TRACE_EVENT(nfs_fh_to_dentry, TP_PROTO( const struct super_block *sb, -- 2.44.0