From patchwork Fri Nov 3 16:53:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 10040723 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 9F12F6032D for ; Fri, 3 Nov 2017 16:54:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 909BE296ED for ; Fri, 3 Nov 2017 16:54:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 85796296F8; Fri, 3 Nov 2017 16:54:03 +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 31F46296ED for ; Fri, 3 Nov 2017 16:54:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755876AbdKCQyC (ORCPT ); Fri, 3 Nov 2017 12:54:02 -0400 Received: from mail-io0-f194.google.com ([209.85.223.194]:50944 "EHLO mail-io0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752968AbdKCQyB (ORCPT ); Fri, 3 Nov 2017 12:54:01 -0400 Received: by mail-io0-f194.google.com with SMTP id 97so7613402iok.7 for ; Fri, 03 Nov 2017 09:54:01 -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=e9EQsfdnfZdMAjBiMFcDjcqq1OLQcyDOhSIW0m/2vTE=; b=u/OMxIUrUHEp4LHLNAtTKBvFlIsn3K9FX+wRIwOMJfm9MZQjdASAPr92eUq6Z+uM3S NnojttuGqzh4eYQV0y8M6yd3EdxQJlpHMRcjkgrn7fd/JFsN0T8ipT6qZJ6a5E3AGHBW tOD6jB6wB1TguEGWOi7zCxmUe0v9Do5MXonQcfnBeY5yY21SShA+lbXJXf9IPLOCmw30 xbe+jpxayvbed7UTvi9LvtOFQ5el6kfeCwAd8l7Avhux7Ivb7gHs5WH8I3bymZb9pX/a CN26v8inc1SzJrsJhbLRC6phQdDgaAMRm3dN4cL01SpGrWhdgHPgSd3Piw9rCT19Lfd+ CcTw== 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=e9EQsfdnfZdMAjBiMFcDjcqq1OLQcyDOhSIW0m/2vTE=; b=gFf62NHnMu5BLEhEjluHhRj8maAqJj4xAcMw97Xjl7R8vmcKAH1KDfb5fTPXKNfp8o Yhy2slPcRGr/NhJQBhuUfVLgjryyBElD0mqN3dyO2lpY+TuP3Yi+zdykJwbFqYfXSJce vz6MOks9COT5yGKESuvtbbro6i2fcMFX/508cV2k0+SvlgHuHLU8La3CvKQsrwp5vDUJ rHjSxbbakrRo/oNZMcYavilExoznhlSZhBo3f2smqDHLx76guWgRjxn2YnKIK0GcDshz hL5EI5Z3QE5GQAvnOe8ka/OxcN8s1eJHjNeGGIsGVsEl3XCtlSpy+gMO7N0O58rh9cJ/ oYHw== X-Gm-Message-State: AJaThX4OiQX6VvKyxN+wSoSLpzNJu9MY5S4OiP1uiZOAbj0sc5pkulDj KwBE4yMv5UQDEKaVNdFu4LSm5fs= X-Google-Smtp-Source: ABhQp+Q3COpGTuN2kjhi1vUdjU2dLnAuMBRhvjeyoQ8JBFTRYp92pes79aa5IPzVqlZtVTqBVdDRXw== X-Received: by 10.36.163.140 with SMTP id p134mr640747ite.46.1509728040934; Fri, 03 Nov 2017 09:54:00 -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 j63sm2939862ioe.25.2017.11.03.09.53.59 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 03 Nov 2017 09:53:59 -0700 (PDT) From: Trond Myklebust To: Benjamin Coddington , Anna Schumaker Cc: linux-nfs@vger.kernel.org Subject: [PATCH v6 02/10] NFSv4: Add a tracepoint to document open stateid updates Date: Fri, 3 Nov 2017 12:53:46 -0400 Message-Id: <20171103165354.15997-3-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171103165354.15997-2-trond.myklebust@primarydata.com> References: <20171103165354.15997-1-trond.myklebust@primarydata.com> <20171103165354.15997-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 6e3cfa00b4ea..d720b076a34d 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -1481,6 +1481,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); } @@ -1524,6 +1525,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); if (!signal_pending(current)) { if (schedule_timeout(5*HZ) == 0) status = -EAGAIN; @@ -1545,6 +1547,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); } static void nfs_state_set_open_stateid(struct nfs4_state *state, diff --git a/fs/nfs/nfs4trace.h b/fs/nfs/nfs4trace.h index e7c6275519b0..bf92cfd627fe 100644 --- a/fs/nfs/nfs4trace.h +++ b/fs/nfs/nfs4trace.h @@ -1066,6 +1066,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(