Received: by 2002:a05:6a10:1287:0:0:0:0 with SMTP id d7csp3748404pxv; Mon, 19 Jul 2021 07:52:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzY40JLmAiRS+0X7dxwZ0G7CCdXcOU0Z6IXk1ckf8uGbbHnJCmfJX6980opKYb5X5toiFK5 X-Received: by 2002:a92:3207:: with SMTP id z7mr17430378ile.288.1626706366272; Mon, 19 Jul 2021 07:52:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626706366; cv=none; d=google.com; s=arc-20160816; b=rkJMNsIpSgBWUK5rfc4+rKX/NO33g/pRX+fkbaXxtS+yyaLfKYzfDX6JxGtWv3MN8A 7RLzbvOiRxkiow1qA+6h8rYZVHI1ClBSeLmpFrys/cravMILkd9+4pvhd7Fw/+NEEq+W MIbHyqvHJfWLEvBpM4QNdlR5lfxqyX8eUd9KjdHfkLiWYFbvIKKH1zJtQcGEzGpc0vBl 98iDDRYYtflYJWnIpnAReyv3LXLfL50Q62mdyRPQep6kdKtjVQ83Vd8ljLztQSqWvRid aGIDAZn+cK85jrewIcBaGd3kD8giVAAnNZSnKz6xw1eJ7n13jy2oikFT0mN9Lz95fa2y 0bHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:cc:to:from :subject; bh=qqJw7eTDWyTv8COke6gLXEDvYlq2A0IgOpg9jozKbq0=; b=HAnC9YTtnPHKCBjKKwNC/vDiO+3d8o1+N/8eukhHxvDBRU5PRnps2gw4Y0rHWUlXP8 dYXW7c76i5TeuDZFJ8iTXk5rim2mcDGBWZ0l9IlmXu7Simy3ZqnTF1Jh3c8B29EjnT0H GM7AkijKE12kBW+sXHqFscaf1LmzAYqW+vafKlXgzF2DdhfQpdiMnY2kMJjD6BBveN0L KHjHAQvESq4taYG5YHqxBLJKTrRUIGy90tGZFRgsGerDO3WORQ7Jc+OlPkJdWpAQcZoE VyosPz8Oev/vIYrqtwvRu3s6S4f+GMNti3gOrihrsSfYuccbyjfGHXul1cJ6uEL9IKTD oThA== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=NONE sp=NONE dis=NONE) header.from=oracle.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id b69si22141556jai.66.2021.07.19.07.52.28; Mon, 19 Jul 2021 07:52:46 -0700 (PDT) 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; 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=fail (p=NONE sp=NONE dis=NONE) header.from=oracle.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232225AbhGSOLh (ORCPT + 99 others); Mon, 19 Jul 2021 10:11:37 -0400 Received: from mail.kernel.org ([198.145.29.99]:41186 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241054AbhGSOI2 (ORCPT ); Mon, 19 Jul 2021 10:08:28 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 572296113B; Mon, 19 Jul 2021 14:48:35 +0000 (UTC) Subject: [PATCH v2 6/6] SUNRPC: Record timeout value in xprt_retransmit tracepoint From: Chuck Lever To: trondmy@hammerspace.com, anna.schumaker@netapp.com Cc: linux-nfs@vger.kernel.org Date: Mon, 19 Jul 2021 10:48:34 -0400 Message-ID: <162670611464.468132.12153190117646878882.stgit@manet.1015granger.net> In-Reply-To: <162670594361.468132.16222376053830760696.stgit@manet.1015granger.net> References: <162670594361.468132.16222376053830760696.stgit@manet.1015granger.net> User-Agent: StGit/1.1 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org The client can alter the timeout value after each retransmit. Record the updated timeout value in the trace log. Suggested-by: Dai Ngo Signed-off-by: Chuck Lever --- include/trace/events/sunrpc.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/include/trace/events/sunrpc.h b/include/trace/events/sunrpc.h index 59ad1718496b..18d552a17c19 100644 --- a/include/trace/events/sunrpc.h +++ b/include/trace/events/sunrpc.h @@ -1061,6 +1061,7 @@ TRACE_EVENT(xprt_retransmit, __field(u32, xid) __field(int, ntrans) __field(int, version) + __field(unsigned long, timeout) __string(progname, rqst->rq_task->tk_client->cl_program->name) __string(procname, rpc_proc_name(rqst->rq_task)) @@ -1074,6 +1075,7 @@ TRACE_EVENT(xprt_retransmit, task->tk_client->cl_clid : -1; __entry->xid = be32_to_cpu(rqst->rq_xid); __entry->ntrans = rqst->rq_ntrans; + __entry->timeout = task->tk_timeout; __assign_str(progname, task->tk_client->cl_program->name); __entry->version = task->tk_client->cl_vers; @@ -1081,10 +1083,10 @@ TRACE_EVENT(xprt_retransmit, ), TP_printk( - "task:%u@%u xid=0x%08x %sv%d %s ntrans=%d", + "task:%u@%u xid=0x%08x %sv%d %s ntrans=%d timeout=%lu", __entry->task_id, __entry->client_id, __entry->xid, __get_str(progname), __entry->version, __get_str(procname), - __entry->ntrans + __entry->ntrans, __entry->timeout ) );