Received: by 2002:a05:6a10:9e8c:0:0:0:0 with SMTP id y12csp3312675pxx; Mon, 2 Nov 2020 05:52:15 -0800 (PST) X-Google-Smtp-Source: ABdhPJyRdNJS/nfUvMdIzwOuSRjk1VUWlvchAhNH/9uJ8wX9D6DDg9VhEcUtdN5Ucrg0+gjoqhy7 X-Received: by 2002:a17:906:3daa:: with SMTP id y10mr15362107ejh.23.1604325134998; Mon, 02 Nov 2020 05:52:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1604325134; cv=none; d=google.com; s=arc-20160816; b=FeYWTEDw43+x8jLvjNEaH0qotCmAEYW4C30hJ66jNzhEFKhHWNUee3fgiunqxdGjtE UeZRrsJSyA7A0RjTnOfnFNIDTrmrxZXnadUXRmXpeVodCLH64V4hVyJbG8LTzErrBrmA FxnnJ95mBkslxMVVGpTxB9XcfJii21BFKNXM6mKbkGkbLTpRDbKZlzViqNNS7NiIqfP5 z2rf9d0BkG8UvkWBBHK2GJTVVw1RWudtDM71/Fat8ogJ2AoB70H+paVfM2KLqu2gEe04 ol6H6sWMS6tUW6LgC4pgOAneDzj936k7oQkr0iC0sfxpc1LzCqn8VI9TCSyo4ieLSvpQ kXHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from:dkim-signature; bh=AT49TBC/qONh0mFaANQBF4Wz/J/y8viuZKlidItHO8Q=; b=eOcM3PWdA9L9BabFmL1BFTjkR2wicQ0Y58MsCl9IHLE3SVxLE8fYpvdKArJEWYqstb DhU05nuMQA+XcyVC3uX408hyGRHr0HiiPzTpcVIgvck5SHpiS78lYt3ih7nZypkWCatq +DcaxxCBNE1dVAVBooqYS3ufR5NoLzNFnVKcJVa6Eyc36xBho4bHmYiGQJjEzkdQToRv 1nBSaTx/I2eIJNu2ZtlJEt8A7YOmN6+J0w31O1UOiMKA1lXzrYOmK0XnrALoXvzAKoZg MSoNAxiDvcUBF6f6K5MKGoxve8s6qx9a3sxwVAQ6UODmbd6Wolao4YdI9dfIE3dLDcHc /cCw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=feKrbNmb; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id m5si10067122eje.723.2020.11.02.05.51.52; Mon, 02 Nov 2020 05:52:14 -0800 (PST) Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=feKrbNmb; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725973AbgKBNvc (ORCPT + 99 others); Mon, 2 Nov 2020 08:51:32 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:37278 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725971AbgKBNuU (ORCPT ); Mon, 2 Nov 2020 08:50:20 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604325019; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:in-reply-to:in-reply-to:references:references; bh=AT49TBC/qONh0mFaANQBF4Wz/J/y8viuZKlidItHO8Q=; b=feKrbNmbnugvCmFh41l3UAEHpxjHIi194tXKFrPiPprbssPxo5jRW4ZYC31YLpQPuD3sr4 MEQCpRL0o9sPvrqgClXhSqE+SlZ8bvr2yGRcMhxDW0lnEI4EgSxSdB5NuViePIR1sHjIV0 SdSGh6pv7wCydi6tA4iVAF+0JYpPreE= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-345-sV-g7fXCMXCgJKMVUzkERg-1; Mon, 02 Nov 2020 08:50:18 -0500 X-MC-Unique: sV-g7fXCMXCgJKMVUzkERg-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DDC7F5719E; Mon, 2 Nov 2020 13:50:16 +0000 (UTC) Received: from dwysocha.rdu.csb (ovpn-113-255.rdu2.redhat.com [10.10.113.255]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 84F065D9DD; Mon, 2 Nov 2020 13:50:16 +0000 (UTC) From: Dave Wysochanski To: Trond Myklebust , Anna Schumaker Cc: linux-nfs@vger.kernel.org Subject: [PATCH 06/11] NFS: Add tracepoints for nfs_readdir_xdr_filler enter and exit Date: Mon, 2 Nov 2020 08:50:06 -0500 Message-Id: <1604325011-29427-7-git-send-email-dwysocha@redhat.com> In-Reply-To: <1604325011-29427-1-git-send-email-dwysocha@redhat.com> References: <1604325011-29427-1-git-send-email-dwysocha@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org Add tracepoints for entry and exit to nfs_readdir_xdr_filler. Note the exit trace event captures the results of over the wire READDIR operations, regardless of NFS version. Signed-off-by: Dave Wysochanski --- fs/nfs/dir.c | 2 ++ fs/nfs/nfstrace.h | 2 ++ 2 files changed, 4 insertions(+) diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c index e4cd9789ebb5..d1e9ba28c4a0 100644 --- a/fs/nfs/dir.c +++ b/fs/nfs/dir.c @@ -361,6 +361,7 @@ int nfs_readdir_xdr_filler(struct page **pages, nfs_readdir_descriptor_t *desc, int error; again: + trace_nfs_readdir_xdr_filler_enter(desc); timestamp = jiffies; gencount = nfs_inc_attr_generation_counter(); desc->dir_verifier = nfs_save_change_attribute(inode); @@ -379,6 +380,7 @@ int nfs_readdir_xdr_filler(struct page **pages, nfs_readdir_descriptor_t *desc, desc->timestamp = timestamp; desc->gencount = gencount; error: + trace_nfs_readdir_xdr_filler_exit(desc, error); return error; } diff --git a/fs/nfs/nfstrace.h b/fs/nfs/nfstrace.h index 0ed330f323bb..5dbadd2718e3 100644 --- a/fs/nfs/nfstrace.h +++ b/fs/nfs/nfstrace.h @@ -926,6 +926,8 @@ DEFINE_NFS_READDIR_DESCRIPTOR_EVENT_EXIT(nfs_readdir_search_pagecache_exit); DEFINE_NFS_READDIR_DESCRIPTOR_EVENT(nfs_readdir_search_array_enter); DEFINE_NFS_READDIR_DESCRIPTOR_EVENT_EXIT(nfs_readdir_search_array_exit); +DEFINE_NFS_READDIR_DESCRIPTOR_EVENT(nfs_readdir_xdr_filler_enter); +DEFINE_NFS_READDIR_DESCRIPTOR_EVENT_EXIT(nfs_readdir_xdr_filler_exit); TRACE_EVENT(nfs_link_enter, TP_PROTO( -- 1.8.3.1