From patchwork Fri Oct 27 20:18:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 10030593 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 341296039A for ; Fri, 27 Oct 2017 20:18:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1260528FDB for ; Fri, 27 Oct 2017 20:18:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 074F628FDD; Fri, 27 Oct 2017 20:18:38 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A90E528FDB for ; Fri, 27 Oct 2017 20:18:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751831AbdJ0USg (ORCPT ); Fri, 27 Oct 2017 16:18:36 -0400 Received: from mail-io0-f194.google.com ([209.85.223.194]:51128 "EHLO mail-io0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751944AbdJ0USf (ORCPT ); Fri, 27 Oct 2017 16:18:35 -0400 Received: by mail-io0-f194.google.com with SMTP id 97so15173108iok.7 for ; Fri, 27 Oct 2017 13:18:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NCwzC5xcNUVV9Y0ivTiqR7XdcOqXxWRuaEgRXTSZg0o=; b=lhGBJDve6fMf5smgKCH3446od8Kd9/7rcNHMogRQZ7zupJVazxxnT82kgq0clxaqFy SleKhU0QmAIZ7pLB5763+oFSom3Cfr6Wxql8Su2OsFhuojJvws7JslqoBHg3WNmZFnI0 OncviB+7ZnD6xBHcD9L0TiCQ6eeiehgr10NPOYWodww6/c8DQ5abfzKBt/Oy8ukTO8NK vg+sNM4BqRiaZEc9/HloEnEnHMLzOZUQcIPThT9/8KvUQIikGmd3gAwDoWJVVi0rDKTf CmAAApPm4kanr0lm0K5x6FJTMGPiMmxan7SkI9wkt62VgjN6RFBv2lbLBeNbL41A9sQE Ni4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=NCwzC5xcNUVV9Y0ivTiqR7XdcOqXxWRuaEgRXTSZg0o=; b=NvtfXNWGBvAPt2psIbkJWow5fBKfikzDCfMn+EM4dmJ5UKCF8pzkTykfeGnXmglYC4 KegJ3aTwPonIgojNhBBsUu0LoyR4j8J4l1C0wXBHTL9NG2rkWr9IiTPSSXSJ1X5jGSbJ yMq7wTo0IbV5VbsL82kJygIo5azrMsd6c9Uz2o8OQhIfbXOCI+xINospdfYRi2Od+KHU Gq2MA8c6PlIxtrIpJDt0m+Wya8O3rYrGWl+M+YqqBQ5HON5gYieXfLZw9L4H2KnCXtpA b28+eUHlpjfVBISRGtilmbq3RX8zjrJRs5Cxc1ppHlQ0q7gCc/qTDynaRd6ux91SI6CJ SYwA== X-Gm-Message-State: AMCzsaVPfLm89wxWJbo0+QnvWLS8mDvo6hhEBURfMUBF4UKUIEqtpXID va7WqCf22U6FvOMeZl2I5g== X-Google-Smtp-Source: ABhQp+RaczWhEWfY625RsoVWcKjKV5jNZTISca0L48Vrpj73lyombx0mLlRu08kQfRoW8DTFilgS/g== X-Received: by 10.107.200.6 with SMTP id y6mr2098071iof.123.1509135515130; Fri, 27 Oct 2017 13:18:35 -0700 (PDT) Received: from localhost.localdomain (c-68-49-162-121.hsd1.mi.comcast.net. [68.49.162.121]) by smtp.gmail.com with ESMTPSA id d16sm3726567iod.38.2017.10.27.13.18.34 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 27 Oct 2017 13:18:34 -0700 (PDT) From: Trond Myklebust To: Benjamin Coddington , Anna Schumaker Cc: linux-nfs@vger.kernel.org Subject: [PATCH v3 2/2] NFSv4: Add a tracepoint to document open stateid updates Date: Fri, 27 Oct 2017 16:18:29 -0400 Message-Id: <20171027201829.98702-3-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171027201829.98702-2-trond.myklebust@primarydata.com> References: <20171027201829.98702-1-trond.myklebust@primarydata.com> <20171027201829.98702-2-trond.myklebust@primarydata.com> MIME-Version: 1.0 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Trond Myklebust --- fs/nfs/nfs4proc.c | 3 +++ fs/nfs/nfs4trace.h | 2 ++ 2 files changed, 5 insertions(+) diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 9045f167c1b5..c6cbea42da97 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -1488,6 +1488,7 @@ static void nfs_clear_open_stateid_locked(struct nfs4_state *state, if (test_bit(NFS_DELEGATED_STATE, &state->flags) == 0) nfs4_stateid_copy(&state->stateid, stateid); nfs4_stateid_copy(&state->open_stateid, stateid); + trace_nfs4_open_stateid_update(state->inode, stateid, 0); out: nfs_state_log_update_open_stateid(state); } @@ -1536,6 +1537,7 @@ static void nfs_set_open_stateid_locked(struct nfs4_state *state, write_sequnlock(&state->seqlock); spin_unlock(&state->owner->so_lock); rcu_read_unlock(); + trace_nfs4_open_stateid_update_wait(state->inode, stateid, 0); status = wait_on_bit_timeout(&state->flags, NFS_STATE_CHANGE_WAIT, TASK_KILLABLE, 5*HZ); @@ -1546,6 +1548,7 @@ static void nfs_set_open_stateid_locked(struct nfs4_state *state, if (test_bit(NFS_DELEGATED_STATE, &state->flags) == 0) nfs4_stateid_copy(&state->stateid, stateid); nfs4_stateid_copy(&state->open_stateid, stateid); + trace_nfs4_open_stateid_update(state->inode, stateid, status); nfs_state_log_update_open_stateid(state); } diff --git a/fs/nfs/nfs4trace.h b/fs/nfs/nfs4trace.h index be1da19c65d6..b9962d93e746 100644 --- a/fs/nfs/nfs4trace.h +++ b/fs/nfs/nfs4trace.h @@ -1065,6 +1065,8 @@ DECLARE_EVENT_CLASS(nfs4_inode_stateid_event, DEFINE_NFS4_INODE_STATEID_EVENT(nfs4_setattr); DEFINE_NFS4_INODE_STATEID_EVENT(nfs4_delegreturn); +DEFINE_NFS4_INODE_STATEID_EVENT(nfs4_open_stateid_update); +DEFINE_NFS4_INODE_STATEID_EVENT(nfs4_open_stateid_update_wait); DECLARE_EVENT_CLASS(nfs4_getattr_event, TP_PROTO(