Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp855006pxk; Thu, 17 Sep 2020 19:12:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy/FQ7U+cX0RQF4Ki2mJVe3HoLEJet7Gp7CvHw/CXrwbTMntomXn1RUJcYJtF/TIJrVjLNL X-Received: by 2002:a17:906:8401:: with SMTP id n1mr32790818ejx.215.1600395129810; Thu, 17 Sep 2020 19:12:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1600395129; cv=none; d=google.com; s=arc-20160816; b=yG/GZM1/6owh3U8oCNSvVgaBgaquzrMfy3mV0HQOZnNQRaqxNN25fWcuZ9nKjM7E/8 b3V6zisE+3jMRc5VyXrofcJJ6v5L15LNKSTOcSCaWwtidyZHxA+M+pk37ElmbRvwgBUT 1PqjSwSetS23GrYayXZlhiqpB2hc8ULiUTzeJZ/9ad+xfSq0Wp+nO7c/rjwngSxRmIgB csHLsMH6I//c6zv0JZkrXZ2IN70iiqB9bIBNPBvmy+305JebJvV36PNrEQhw+1XBEFty Y/bbbf0B4JyvQAXAQRCv8l9GudVbbZZJqinPrBChXeMeq1zs/WrTcqNLLLjsggEDWgv3 eICA== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=MKOvd/DnojOab5pWlkkzgIEuK/86q6k/XaJJWEdjJgA=; b=bOrdWuM3bxEg+b3Mlnvh6EtTa0rxgqzJGSVBuxmQ7CeNu2pcKZp85EK8twlPeX6CRY Gu7nkE3O4hacMGJsMAwfVXCIg4aFUJPajxXmj+s2RHejug45a5SzkCouaZGPYrdPVd/d RKxLG8LVVQEmlHAF6jqwctBTcu+hHMWmNTjZQ1OASPsB6Fe43N86D4raiDjOc6CMGP7c LQ7k74i7Z80oWADsLzbtXZevPLf+lAi7stksSIYA4hTjw4BKZPJ1HQeDlysfJGy45CFJ 6JaQNKPdkghq3Z40aOo6C/ABip52oK+DmhNbKZ08mFki7ySE7p3ObQi41RGo1q2Fx4yq vAUg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=X7CbcuQP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id j22si1321802eds.357.2020.09.17.19.11.46; Thu, 17 Sep 2020 19:12:09 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-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=@kernel.org header.s=default header.b=X7CbcuQP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728007AbgIRCHw (ORCPT + 99 others); Thu, 17 Sep 2020 22:07:52 -0400 Received: from mail.kernel.org ([198.145.29.99]:58066 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727962AbgIRCHh (ORCPT ); Thu, 17 Sep 2020 22:07:37 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3CBC02389E; Fri, 18 Sep 2020 02:07:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600394856; bh=9H2IkHGf1BKs826WwCRNNg56rcCbpHAkxILLNh04e8s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=X7CbcuQPwAnXjHwfMibEnMowMCtO0OID9cN7pgcMJnxB/MEbCQlypKCrOUGfE2KtE a7Z++2T39wmHQDNa/roOL1ioW+P7lshMxgy20qZzf+7GDFb0mqSR8gm9++7XAQrDo2 G1HS6G7EryW06+brPLaxU2TGPgu5+EgSQr4UNXXs= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Chuck Lever , Anna Schumaker , Sasha Levin , linux-nfs@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 311/330] NFS: nfs_xdr_status should record the procedure name Date: Thu, 17 Sep 2020 22:00:51 -0400 Message-Id: <20200918020110.2063155-311-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200918020110.2063155-1-sashal@kernel.org> References: <20200918020110.2063155-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Chuck Lever [ Upstream commit 5be5945864ea143fda628e8179c8474457af1f43 ] When sunrpc trace points are not enabled, the recorded task ID information alone is not helpful. Signed-off-by: Chuck Lever Signed-off-by: Anna Schumaker Signed-off-by: Sasha Levin --- fs/nfs/nfstrace.h | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/fs/nfs/nfstrace.h b/fs/nfs/nfstrace.h index 361cc10d6f95d..c8081d2b4166a 100644 --- a/fs/nfs/nfstrace.h +++ b/fs/nfs/nfstrace.h @@ -1147,7 +1147,12 @@ TRACE_EVENT(nfs_xdr_status, __field(unsigned int, task_id) __field(unsigned int, client_id) __field(u32, xid) + __field(int, version) __field(unsigned long, error) + __string(program, + xdr->rqst->rq_task->tk_client->cl_program->name) + __string(procedure, + xdr->rqst->rq_task->tk_msg.rpc_proc->p_name) ), TP_fast_assign( @@ -1157,13 +1162,19 @@ TRACE_EVENT(nfs_xdr_status, __entry->task_id = task->tk_pid; __entry->client_id = task->tk_client->cl_clid; __entry->xid = be32_to_cpu(rqstp->rq_xid); + __entry->version = task->tk_client->cl_vers; __entry->error = error; + __assign_str(program, + task->tk_client->cl_program->name) + __assign_str(procedure, task->tk_msg.rpc_proc->p_name) ), TP_printk( - "task:%u@%d xid=0x%08x error=%ld (%s)", + "task:%u@%d xid=0x%08x %sv%d %s error=%ld (%s)", __entry->task_id, __entry->client_id, __entry->xid, - -__entry->error, nfs_show_status(__entry->error) + __get_str(program), __entry->version, + __get_str(procedure), -__entry->error, + nfs_show_status(__entry->error) ) ); -- 2.25.1