Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <1374aef8-4342-9404-8352-9661bde74a70@oracle.com>
Date:   Thu, 17 Nov 2022 08:50:05 -0800
User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0)
 Gecko/20100101 Thunderbird/102.4.2
Subject: Re: [PATCH v5 4/4] NFSD: add CB_RECALL_ANY tracepoints
Content-Language: en-US
To:     Chuck Lever III <chuck.lever@oracle.com>
Cc:     "jlayton@kernel.org" <jlayton@kernel.org>,
        Linux NFS Mailing List <linux-nfs@vger.kernel.org>
References: <1668656688-22507-1-git-send-email-dai.ngo@oracle.com>
 <1668656688-22507-5-git-send-email-dai.ngo@oracle.com>
 <D3D8A1E2-942A-4A5C-B938-160AD8DB25E8@oracle.com>
From:   dai.ngo@oracle.com
In-Reply-To: <D3D8A1E2-942A-4A5C-B938-160AD8DB25E8@oracle.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?MnI5N2wxZzdBMkJYYjBlTHIvaEVzTU5KKzhCcmdOQVhQS1hoc094SUFaUElq?=
 =?utf-8?B?Rk0za0FQUjBTVmhnRVVZQ002WStyaGdrZ3JnWTEvT3N0YU9lY3EyZmtDbkoy?=
 =?utf-8?B?UmJhYVR6bmRvR3QrS3pOaU94SnBkNEFsQzJDbFNCQXBXdFRFaHBWMjdEbWJl?=
 =?utf-8?B?UTJOWWpoR2dzZXpDRFVVSVllTitjbjZyeU1KL0taK1RJUWUxNGs0OHN0c0Nu?=
 =?utf-8?B?MEpxQlMrUmdIdHQxS0JUOGhLbTd1WGNveHVLZnBEVVRhSS9ZRHl6MWxaTEdl?=
 =?utf-8?B?aWptQ1lFUXJCWTMzK3hUOFBQWmNyVk10RmJHMHloYWxoWnV4d0JoYzhoLzI1?=
 =?utf-8?B?UVZRK0xDWStZcFVIZ09RUFdsWWtSL3FYTXpudnBJZ1J3MVBFbFYvVEJoKzdS?=
 =?utf-8?B?eDNDSmRBNFkxYXNkeG1iYU1uR3hUL0kycFJILzk2dG9rZnZDaGdZdHREcEN6?=
 =?utf-8?B?R2VRYXFuQm1saVRuQWZBUGdvM28xYnFMRS9qK3A2bXZpQlc3U0J1Tk05Vk9W?=
 =?utf-8?B?ZTMvZldLYTRKY3dwek1tcVpVMG1IcjFjWnhzM0Rsc09WODNnbDZ4VUZwWS90?=
 =?utf-8?B?QkI0alBXK1VSaklVRU5sSnFZRWpKSktaeFZ6bTFDejBJY0xnYkx5VzVjSVNR?=
 =?utf-8?B?MUp2TDM0aFdiZER0ZmxteXh3SFMra3k3bG9LcWhBekFkUC9aY2F3QXloSlli?=
 =?utf-8?B?bStHcURBYWdhYm1oWGdUT2lPbmVqbHBkZ1R5N21BUE1uK3UyM0kvcjhtczJR?=
 =?utf-8?B?ZFAzRHVGZnEyclhKZ3dxSWVLQ3FIVFQ3QzRhclkyYkNXMGcyYnpOOVNWS1Rw?=
 =?utf-8?B?KzNWd1pTL3ZZYmdLYnlmVFpYUGZwYXNHbHRZd3RGQm9vU0ZOZ1NBaWNDTVBO?=
 =?utf-8?B?NERzSnNidm02N1BtbFNqczFpYjFwdUZyU2g2ZkRnOVhZdTV2VkwvS1pqMnBX?=
 =?utf-8?B?NDFoOStXUTY3MzREYzFDdXVFS2pHTUdGeUsvZ2xDc0RUbnRMUzBWL0VONEI2?=
 =?utf-8?B?aC9Vd2pUOVNYZndPRGlqUklnSkJVOWhWb0J4Y2lZdm1SSFBmbjNSdFBTdE5D?=
 =?utf-8?B?ckw4MHQ0YUZpeGZiLzhaN1JlYW1WcnpXbDd4d2paUldjZ2R1TVIyQng2azh5?=
 =?utf-8?B?WmJGcVAyZkJTOHQ5VFhMWC9WNWpNZ1VCbXVudXFVOG1sRGxtdXBTRWF0cWpp?=
 =?utf-8?B?OUhrRXpGc2JxUlRtYWNCQVNCKzNoOXg0aUROZ3g2STJnbjNON3ZtYVpJY2xU?=
 =?utf-8?B?UjhqWTEwREJrb3l1UWI5U2h5RG9Xa2Z4MXVoUVRSY2RHcU93eFV5aEdNYmgx?=
 =?utf-8?B?RmVuUlc4cm1uTDVOb05jaVBwOTg1WE9RS3ZpUnlGdXhnTGtqVVFjenZhK1B6?=
 =?utf-8?B?NkU1dXRwb0MxdE1mWFBvZU5IbVdhTXRHdlBFcDFpM0FOQ0xWVlVuMTBYRVc3?=
 =?utf-8?B?d2FJaE00OGNHeFFXaGl3N21LeXZ6Ymo0SXAwUWJjSWJib2tPV3VPVVpUZzRF?=
 =?utf-8?B?VWoxQUpoYW8zM1c0MUpzR1lOSWhRMlhjcldCWXBNcTRNeDZ5V2dhSkFmNVpJ?=
 =?utf-8?B?RmlHaytrZTZqVGE4eGU1Z3ZLamt5a0tISzBtaWExZ2Y4Tkg3aXBKWi9NcXpa?=
 =?utf-8?B?V0FrL3k0MlByYko4dloxcUFwM1kxZEplSzUrL1VHT2ZvTGpaY2JQLzBpTGFu?=
 =?utf-8?B?Q1FnOW5YenhnWFNqQkpuZmlmSUxwekdzVVR3d3FuSGxiSldFUS9rcnhHYnpl?=
 =?utf-8?B?RFlveTJmMG1mSjUyYTBEdnhpRDB5Tk1yNEY2YWN5ZXhaNmI5bkFtZUtNZTYr?=
 =?utf-8?B?bDEyQldFM1lrbzUwK0pydGlXZmg4NE5xT1hxaktqTlE0OXFHVnpzSnhlMDMr?=
 =?utf-8?B?NkxlSWk0NVA0Y0lrQnI2OWdmS3h6a1FFMXAxcUZoZ2hOL1lzbTE3ZTl1Zy8w?=
 =?utf-8?B?WXJmK2I2bnVtT2RQZGlFYTNZV1d3UmF6b3ZOTGtjWkoxUk5PVFpXSlhyQTNx?=
 =?utf-8?B?MzdxZzdTaTFuQjlMWnNabGx0TTUzQWw3eGM1dHpZTjV2SnZMQmRtR2wzbXJR?=
 =?utf-8?B?N254bzh3djVPaDZsak1OQ2dhWFA0aXhRLytjZ3FnNmI0Q3QxMFJpanlNRmJz?=
 =?utf-8?Q?nIVDbSF7s95qH7IHjYDJp1FCS?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: If7EPyk7uJ4S8ShdIfpnoIY8wSl3groJWmX1vXoys6ODhhpVq1OHSJvip2SY7zmQZr8kG4K2XXGhaGRWD+MelyDcX3dou6tk8dwFCAizvoEpYvXO7GDReeM28S2aav8uQL6CtjI8H4RkqrOd7SVJbE10u2FLKov/OEUc3SlOKWOs1JIRwK6Ej8dfSbnEwbIUibScdfO1CW91Voh8WFDNeU5sVwA9uVFhwdOawjZK+5CWJFcHu05HN8VEUngsMcjTkDD9cSvlxG49SS+XW7NvepVy3FeCylB/updlqkl2k6g/T4EQzb1rPd2UwC7sjICcjsXeHluw7rG15X2vJJKtZy03KaZ/3P1B3247b1n0dMbyuGNhRqY4kt7GO98tCM26vgFvFxBDAPAia2FVt3vf+BHMWT2wFKTOXAl7FbQ+9IMLfhAjCWG/JRkGTFsYQJf6WBrtsPdpSPhlYQ7Vm+zAgA+HW2tZp+MzdUqBFlfaPhf2R5dZmG9RwB9ELcjVSzpvhNB2avdJ5oupwFsPy4CfplFn+u4RaKjQ8X5ooq4ZNBLCULMXWIZXopgGnu3k14MEanOM3t2zTh4SgLqyEoGs8iMJcGmZIEnohSem+v85uMWyTxMIEZgczPc6/jT2erlH2SYZDylNUXouGLOrMw8UaiznsY1SeVXsZM6J2/kAPKrmOEjRSbXGC46b+WoTLZ5d3xwwMCBiBBPEMJwVnsVNU69uQwh1/IaKbjVRE5izLvEyuC3KKoggYcRCN8+za3aL11FGPWceV4NB9k6NF9H2CXkP0aExYDI9t2lFb+gqc6Y=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: abaf7870-4833-464f-3d90-08dac8bbc821
X-MS-Exchange-CrossTenant-AuthSource: BY5PR10MB4257.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Nov 2022 16:50:07.1063
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: RdPgIkoRWYZXv6eaYb5atJaxCOkGu7/zigyRh3LSGSSroO+HxBDLLJkM7IcYsu4QeHvavAVSAXEJLrwAvVjtwA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR10MB6314
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.219,Aquarius:18.0.895,Hydra:6.0.545,FMLib:17.11.122.1
 definitions=2022-11-17_06,2022-11-17_01,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 phishscore=0
 malwarescore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=999
 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2210170000 definitions=main-2211170124
X-Proofpoint-ORIG-GUID: r7a3Sn2WOBHTzjIW9p7qo71l0kxDYxa7
X-Proofpoint-GUID: r7a3Sn2WOBHTzjIW9p7qo71l0kxDYxa7
X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,RCVD_IN_DNSWL_LOW,
        RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-nfs.vger.kernel.org>
X-Mailing-List: linux-nfs@vger.kernel.org


On 11/17/22 6:45 AM, Chuck Lever III wrote:
>
>> On Nov 16, 2022, at 10:44 PM, Dai Ngo <dai.ngo@oracle.com> wrote:
>>
>> Add tracepoints to trace start and end of CB_RECALL_ANY operation.
>>
>> Signed-off-by: Dai Ngo <dai.ngo@oracle.com>
>> ---
>> fs/nfsd/nfs4state.c |  2 ++
>> fs/nfsd/trace.h     | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
>> 2 files changed, 51 insertions(+)
>>
>> diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
>> index 13f326ae928c..935d669e2526 100644
>> --- a/fs/nfsd/nfs4state.c
>> +++ b/fs/nfsd/nfs4state.c
>> @@ -2859,6 +2859,7 @@ static int
>> nfsd4_cb_recall_any_done(struct nfsd4_callback *cb,
>> 				struct rpc_task *task)
>> {
>> +	trace_nfsd_cb_recall_any_done(cb, task);
>> 	switch (task->tk_status) {
>> 	case -NFS4ERR_DELAY:
>> 		rpc_delay(task, 2 * HZ);
>> @@ -6209,6 +6210,7 @@ deleg_reaper(struct nfsd_net *nn)
>> 		clp->cl_ra->ra_keep = 0;
>> 		clp->cl_ra->ra_bmval[0] = BIT(RCA4_TYPE_MASK_RDATA_DLG) |
>> 						BIT(RCA4_TYPE_MASK_WDATA_DLG);
>> +		trace_nfsd_cb_recall_any(clp->cl_ra);
>> 		nfsd4_run_cb(&clp->cl_ra->ra_cb);
>> 	}
>> }
>> diff --git a/fs/nfsd/trace.h b/fs/nfsd/trace.h
>> index 06a96e955bd0..bee951c335f1 100644
>> --- a/fs/nfsd/trace.h
>> +++ b/fs/nfsd/trace.h
>> @@ -9,9 +9,11 @@
>> #define _NFSD_TRACE_H
>>
>> #include <linux/tracepoint.h>
>> +#include <linux/sunrpc/xprt.h>
>>
>> #include "export.h"
>> #include "nfsfh.h"
>> +#include "xdr4.h"
>>
>> #define NFSD_TRACE_PROC_RES_FIELDS \
>> 		__field(unsigned int, netns_ino) \
>> @@ -1471,6 +1473,53 @@ TRACE_EVENT(nfsd_cb_offload,
>> 		__entry->fh_hash, __entry->count, __entry->status)
>> );
>>
>> +TRACE_EVENT(nfsd_cb_recall_any,
>> +	TP_PROTO(
>> +		const struct nfsd4_cb_recall_any *ra
>> +	),
>> +	TP_ARGS(ra),
>> +	TP_STRUCT__entry(
>> +		__field(u32, cl_boot)
>> +		__field(u32, cl_id)
>> +		__field(u32, ra_keep)
>> +		__field(u32, ra_bmval)
>> +		__sockaddr(addr, sizeof(struct sockaddr_storage))
>> +	),
>> +	TP_fast_assign(
>> +		__entry->cl_boot = ra->ra_cb.cb_clp->cl_clientid.cl_boot;
>> +		__entry->cl_id = ra->ra_cb.cb_clp->cl_clientid.cl_id;
>> +		__entry->ra_keep = ra->ra_keep;
>> +		__entry->ra_bmval = ra->ra_bmval[0];
>> +		__assign_sockaddr(addr, &ra->ra_cb.cb_clp->cl_addr,
>> +				  sizeof(struct sockaddr_storage))
>> +	),
>> +	TP_printk("Client %08x:%08x addr=%pISpc ra_keep=%d ra_bmval=0x%x",
>> +		__entry->cl_boot, __entry->cl_id,
>> +		__get_sockaddr(addr), __entry->ra_keep, __entry->ra_bmval
> This needs a "show_recall_any_bitmap" to convert to human-readable
> symbols.

Yes, it makes sense.

Thanks,
-Dai

>
>
>> +	)
>> +);
>> +
>> +TRACE_EVENT(nfsd_cb_recall_any_done,
>> +	TP_PROTO(
>> +		const struct nfsd4_callback *cb,
>> +		const struct rpc_task *task
>> +	),
>> +	TP_ARGS(cb, task),
>> +	TP_STRUCT__entry(
>> +		__field(u32, cl_boot)
>> +		__field(u32, cl_id)
>> +		__field(int, status)
>> +	),
>> +	TP_fast_assign(
>> +		__entry->status = task->tk_status;
>> +		__entry->cl_boot = cb->cb_clp->cl_clientid.cl_boot;
>> +		__entry->cl_id = cb->cb_clp->cl_clientid.cl_id;
>> +	),
>> +	TP_printk("client %08x:%08x status=%d",
>> +		__entry->cl_boot, __entry->cl_id, __entry->status
>> +	)
>> +);
>> +
>> DECLARE_EVENT_CLASS(nfsd_cb_done_class,
>> 	TP_PROTO(
>> 		const stateid_t *stp,
>> -- 
>> 2.9.5
>>
> --
> Chuck Lever
>
>
>