From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) (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 6CDA744D01D for ; Tue, 28 Apr 2026 16:08:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.174 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777392517; cv=none; b=jqePxfEIZ+h7cKAqW4qUYNsyuFIfva9H0wIUUcFPk8/OUZdkh7OztBDXoUMbh+C8l3dPhLTQbuwnPQubcBt0kH5HFxpWq5LvUdcsaeWLFZnbPS1WyJNBwPWfZnhkruhkmNExhdw5E7OkpW0sU+dw36osp/o2VbMdFsXwdlYX2W4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777392517; c=relaxed/simple; bh=EDqu8J/Cj3OnUosHQqw97x6VT5My9mRZIBiZu8DHN/8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IBTML9iogtEGcrasurtDAcPKvk6KmuDDhHtTHLCCVCC42HFo6W9rzVFX7bhuZbZcxC4/7dSRzF+mqQYlLMJErIkZsWncmJbs67V5Pv5rIkVWuINC++ArSwm79qEiMgCvPHWZMdS+9YWg1z+gbSvckGdSFOvjz/VudVZRuJLOh7Q= 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=LXtnm1Wa; arc=none smtp.client-ip=209.85.214.174 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="LXtnm1Wa" Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-2ab232cc803so56045545ad.3 for ; Tue, 28 Apr 2026 09:08:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777392514; x=1777997314; 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=aJZoFnYLto/Rz6vgRyUrEsw5PIdTqEOL5GHZLukOXPk=; b=LXtnm1Wa5YL/+ZEK9/DQ7tvMq81bFgvPk3Jl/TwYsyJt5iLxJ5b6aTHS/vn7HZ3JBb X97P6dZAfBTJvvnmHHf2KADz/6CLW9ugcN/z8IaNQPwB4mvEJa3/8BivYjhLFMRlBu67 lovb+luOJRUWBiZJ77RP8qkhbKgIFulZnyfYLHHWO3IoGzwI90+GHbIn+fbWuRxwxHOi fDe+hXZ9aQzbvbCqqbmtIsNYvI1tx227dCk5DRYBpbXJvKA04MSeQnhCVQQ7p5Ez5F3s BO54X69DoYxLv2zXWz0967OpyuxIQHetRzRZrt3XV8V+umDp3/6ahV6onLaGKtmilIr1 qVmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777392514; x=1777997314; 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=aJZoFnYLto/Rz6vgRyUrEsw5PIdTqEOL5GHZLukOXPk=; b=WEsYTAy/CV60693GSxQnG01VpdyzGxJMEaNMtbGl0RazfkXZkIfGiql/f+y7qUNLl9 itSU8C83LKrkzaEsqlo11Zp/hQIyM2xphvYWDyKEEmVZSWkd5UNmzlMmk4ja7E06o9za A3A3BOMqhfpz9sRh7F0d0hpQGKEiCzUs1/LJSA9BKFjCEnrdj2KjMDl6dUnq1/ajOCVW 0XOl1WQLwVPnOi5JPHOgolMNt3bnZ7KqzpuE6m5foxUxqscC9ox5W5kIZ55mrnYptdHW BB3lV5KOeFb/mUMec8xMqND9udSNg//EOVpkt51r6oY6LhwrXEDxc3lDIbPNR8h9Ri9a 7C1A== X-Gm-Message-State: AOJu0Yw1J1d7CZBd9+RRtibNmOmK+uuh3+wHBzF4ka49wVQuIQm/fsne cdaZEWieOhxrHOdiYsauwXFFOfZOYaDdQana9g8B8DYLj5C8l6aKU0Gbt3x+18ljHo0= X-Gm-Gg: AeBDietjYi9EfYZD98Cal9Uy905zW0x9yUgN+/34aKDIce4NDPNw5apZNu1FO36QG0n 318wdVBBFLjgeGFAltKvaBg2XrylkxkJdtnT6BkOv2yf+TcB7vKeZan8jHPod57qHWnbWZKCiSJ WjIciu+N3ejBwt5etKKF3tS27x25Ec1VSxW6h0xFsFGFc6IZIx+449qRD5/Hl4vrzbqjC9x+2dd t7QsgKjb7Q9pA69oaWzIc+0AaQ//8XXTif0M4zNVGO9ujG78wjHfdKRReHNQgNtePFaSrz1i9rO jCzf/7JSszGzcjM2VcN6SXmM4oeA4u5WIOSbRMJQAUYHGQb0MmQGPDR2Q4cUUrKEE7ZAvu729xB hb21UBejZP85NKP6w/nrP8wqYIRs0IT5ZaqcgKyRi1pcaOaEhB1P3tckb/RHaSf+ok+zIyt68YH 8zQw8j3+cndXgAdCOPVfkAlEToI09otX99fns+xtaK0xtP6x9Fi7iya/UeLTuSl86+ X-Received: by 2002:a17:903:1ae6:b0:2b2:57f3:8d07 with SMTP id d9443c01a7336-2b97c3cc06amr39418025ad.7.1777392514150; Tue, 28 Apr 2026 09:08:34 -0700 (PDT) Received: from sprasad-dev1.corp.microsoft.com ([167.220.110.216]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b97ac7894csm30864465ad.50.2026.04.28.09.08.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Apr 2026 09:08:33 -0700 (PDT) From: nspmangalore@gmail.com X-Google-Original-From: sprasad@microsoft.com To: linux-cifs@vger.kernel.org, smfrench@gmail.com, pc@manguebit.org, bharathsm@microsoft.com, dhowells@redhat.com, henrique.carvalho@suse.com, ematsumiya@suse.de Cc: Shyam Prasad N Subject: [PATCH v3 16/19] cifs: trace points for cached_dir operations Date: Tue, 28 Apr 2026 21:38:01 +0530 Message-ID: <20260428160804.281745-16-sprasad@microsoft.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260428160804.281745-1-sprasad@microsoft.com> References: <20260428160804.281745-1-sprasad@microsoft.com> Precedence: bulk X-Mailing-List: linux-cifs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Shyam Prasad N This change introduces ftrace tracepoints for cached_dir operations. Intended to be used for debugging cached_dir. Signed-off-by: Shyam Prasad N --- fs/smb/client/cached_dir.c | 21 ++++++++++- fs/smb/client/inode.c | 13 +++++++ fs/smb/client/trace.h | 73 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 106 insertions(+), 1 deletion(-) diff --git a/fs/smb/client/cached_dir.c b/fs/smb/client/cached_dir.c index 863b8d666ea95..6fb88c4c97dc1 100644 --- a/fs/smb/client/cached_dir.c +++ b/fs/smb/client/cached_dir.c @@ -1011,6 +1011,7 @@ bool add_to_cached_dir(struct cached_fid *cfid, atomic64_sub(-bytes_diff, &cfid->cfids->total_dirents_bytes); atomic64_sub(-bytes_diff, &cifs_dircache_bytes_used); } + trace_smb3_add_to_cached_dir(cfid, name, namelen, added ? 0 : -1); return added; @@ -1041,6 +1042,9 @@ void complete_cached_dir(struct cached_fid *cfid, cde = &cfid->dirents; mutex_lock(&cfid->dirents.de_mutex); finished_cached_dirents_count(cde, ctx, file); + trace_smb3_complete_cached_dir(cfid, ctx->pos, cde->pos, + cde->is_valid, + cde->is_failed); mutex_unlock(&cfid->dirents.de_mutex); } @@ -1076,12 +1080,14 @@ int lookup_cached_dir(struct cached_fid *cfid, entry = lookup_cached_dirent_entry_locked(&cfid->dirents, name, namelen); if (!entry || !entry->dirent) { mutex_unlock(&cfid->dirents.de_mutex); + trace_smb3_lookup_cached_dir(cfid, name, namelen, -ENOENT); return -ENOENT; } dirent = entry->dirent; if (dirent->tombstone) { mutex_unlock(&cfid->dirents.de_mutex); + trace_smb3_lookup_cached_dir(cfid, name, namelen, -ENOENT); return -ENOENT; } @@ -1089,6 +1095,7 @@ int lookup_cached_dir(struct cached_fid *cfid, memcpy(&result->fattr, &dirent->fattr, sizeof(result->fattr)); mutex_unlock(&cfid->dirents.de_mutex); + trace_smb3_lookup_cached_dir(cfid, name, namelen, 0); return 0; } @@ -1126,6 +1133,8 @@ bool update_dirent_in_cached_dir(struct cached_fid *cfid, updated = update_cached_dirent_locked(&cfid->dirents, name, namelen, fattr); mutex_unlock(&cfid->dirents.de_mutex); + trace_smb3_update_dirent_in_cached_dir(cfid, name, namelen, + updated ? 0 : -ENOENT); return updated; } @@ -1185,6 +1194,7 @@ void cifs_complete_pending_dcache(struct cached_fid *cfid, mutex_unlock(&cfid->dirents.de_mutex); cifs_dbg(FYI, "Dcache population of %.*s. status: %d\n", namelen, name, ret); + trace_smb3_dcache_complete(cfid, name, namelen, ret); } /* @@ -1226,6 +1236,7 @@ int cifs_wait_for_pending_dcache(struct cached_fid *cfid, } } + trace_smb3_dcache_wait(cfid, name, namelen, ret); return ret; } @@ -1399,6 +1410,7 @@ int open_cached_dir(unsigned int xid, struct cifs_tcon *tcon, if (cfid == NULL) { spin_unlock(&cfids->cfid_list_lock); kfree(utf16_path); + trace_smb3_open_cached_dir(NULL, path, strlen(path), -ENOENT); return -ENOENT; } spin_unlock(&cfids->cfid_list_lock); @@ -1637,6 +1649,7 @@ int open_cached_dir(unsigned int xid, struct cifs_tcon *tcon, *ret_cfid = cfid; atomic_inc(&tcon->num_remote_opens); } + trace_smb3_open_cached_dir(cfid, path, strlen(path), rc); kfree(utf16_path); if (is_replayable_error(rc) && @@ -1651,7 +1664,6 @@ int open_cached_dir_by_dentry(struct cifs_tcon *tcon, struct cached_fid **ret_cfid) { struct cached_fid *cfid; - struct cached_fid *trace_cfid = NULL; struct cached_fids *cfids = tcon->cfids; int rc = -ENOENT; @@ -1667,6 +1679,7 @@ int open_cached_dir_by_dentry(struct cifs_tcon *tcon, spin_lock(&cfid->cfid_lock); if (!is_valid_cached_dir(cfid)) { spin_unlock(&cfid->cfid_lock); + rc = -ENOENT; break; } cifs_dbg(FYI, "found a cached file handle by dentry\n"); @@ -1677,10 +1690,15 @@ int open_cached_dir_by_dentry(struct cifs_tcon *tcon, trace_cfid = cfid; spin_unlock(&cfid->cfid_lock); spin_unlock(&cfids->cfid_list_lock); + trace_smb3_open_cached_dir_by_dentry(cfid, dentry->d_name.name, + dentry->d_name.len, 0); return rc; } } spin_unlock(&cfids->cfid_list_lock); + trace_smb3_open_cached_dir_by_dentry(NULL, dentry->d_name.name, + dentry->d_name.len, rc); + return rc; } @@ -1982,6 +2000,7 @@ static void free_cached_dir(struct cached_fid *cfid) WARN_ON(work_pending(&cfid->close_work)); WARN_ON(work_pending(&cfid->put_work)); + trace_smb3_free_cached_dir(cfid, cfid->path, strlen(cfid->path), 0); dput(cfid->dentry); diff --git a/fs/smb/client/inode.c b/fs/smb/client/inode.c index f03371abcfef9..75f9f29d303f2 100644 --- a/fs/smb/client/inode.c +++ b/fs/smb/client/inode.c @@ -2865,20 +2865,31 @@ cifs_dentry_needs_reval(struct dentry *dentry) if (!rc && lookup.found && lookup.under_active_lease) { if (cifs_inode_has_writable_handle(inode)) { cifs_set_time(dentry, jiffies); + trace_smb3_dcache_revalidate(cfid, + dentry->d_name.name, + dentry->d_name.len, 0); cifs_put_tlink(tlink); return false; } rc = cifs_fattr_to_inode(inode, &lookup.fattr, false); if (!rc) { cifs_set_time(dentry, jiffies); + trace_smb3_dcache_revalidate(cfid, + dentry->d_name.name, + dentry->d_name.len, 0); cifs_put_tlink(tlink); return false; } if (rc != -ESTALE) { + trace_smb3_dcache_revalidate(cfid, + dentry->d_name.name, + dentry->d_name.len, rc); cifs_put_tlink(tlink); return true; } } + trace_smb3_dcache_revalidate(cfid, dentry->d_name.name, + dentry->d_name.len, rc); } } @@ -2888,6 +2899,8 @@ cifs_dentry_needs_reval(struct dentry *dentry) * cache lookup/update did not satisfy this dentry. */ if (force_reval) { + trace_smb3_dcache_revalidate(cfid, dentry->d_name.name, + dentry->d_name.len, -1); cifs_put_tlink(tlink); return true; } diff --git a/fs/smb/client/trace.h b/fs/smb/client/trace.h index 54ee1317c5b12..9907a89ee4001 100644 --- a/fs/smb/client/trace.h +++ b/fs/smb/client/trace.h @@ -1813,6 +1813,79 @@ TRACE_EVENT(smb3_eio, __entry->info, __entry->info2) ); +/* + * Trace events for async directory cache population work + */ +DECLARE_EVENT_CLASS(smb3_dcache, + TP_PROTO(const void *cfid, + const char *name, + int namelen, + int result), + TP_ARGS(cfid, name, namelen, result), + TP_STRUCT__entry( + __field(const void *, cfid) + __string(name, name) + __field(int, namelen) + __field(int, result) + ), + TP_fast_assign( + __entry->cfid = cfid; + __assign_str(name); + __entry->namelen = namelen; + __entry->result = result; + ), + TP_printk("cfid=%p name=%.*s result=%d", + __entry->cfid, + __entry->namelen, __get_str(name), __entry->result) +); + +#define DEFINE_SMB3_DCACHE_EVENT(name) \ +DEFINE_EVENT(smb3_dcache, smb3_##name, \ + TP_PROTO(const void *cfid, \ + const char *name, \ + int namelen, \ + int result), \ + TP_ARGS(cfid, name, namelen, result)) + +DEFINE_SMB3_DCACHE_EVENT(dcache_complete); +DEFINE_SMB3_DCACHE_EVENT(dcache_wait); +DEFINE_SMB3_DCACHE_EVENT(dcache_revalidate); +DEFINE_SMB3_DCACHE_EVENT(open_cached_dir); +DEFINE_SMB3_DCACHE_EVENT(open_cached_dir_by_dentry); +DEFINE_SMB3_DCACHE_EVENT(free_cached_dir); +DEFINE_SMB3_DCACHE_EVENT(add_to_cached_dir); +DEFINE_SMB3_DCACHE_EVENT(lookup_cached_dir); +DEFINE_SMB3_DCACHE_EVENT(update_dirent_in_cached_dir); + +TRACE_EVENT(smb3_complete_cached_dir, + TP_PROTO(const void *cfid, + loff_t ctx_pos, + loff_t cached_pos, + int is_valid, + int is_failed), + TP_ARGS(cfid, ctx_pos, cached_pos, is_valid, is_failed), + TP_STRUCT__entry( + __field(const void *, cfid) + __field(loff_t, ctx_pos) + __field(loff_t, cached_pos) + __field(int, is_valid) + __field(int, is_failed) + ), + TP_fast_assign( + __entry->cfid = cfid; + __entry->ctx_pos = ctx_pos; + __entry->cached_pos = cached_pos; + __entry->is_valid = is_valid; + __entry->is_failed = is_failed; + ), + TP_printk("cfid=%p ctx_pos=%lld cached_pos=%lld is_valid=%d is_failed=%d", + __entry->cfid, + (long long)__entry->ctx_pos, + (long long)__entry->cached_pos, + __entry->is_valid, + __entry->is_failed) +); + #undef EM #undef E_ #endif /* _CIFS_TRACE_H */ -- 2.43.0