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;
From:   Chuck Lever III <chuck.lever@oracle.com>
To:     Dai Ngo <dai.ngo@oracle.com>
CC:     "jlayton@kernel.org" <jlayton@kernel.org>,
        Linux NFS Mailing List <linux-nfs@vger.kernel.org>
Subject: Re: [PATCH v5 4/4] NFSD: add CB_RECALL_ANY tracepoints
Thread-Topic: [PATCH v5 4/4] NFSD: add CB_RECALL_ANY tracepoints
Thread-Index: AQHY+jb4qFY3nMgir0eCHrW4yufb265DMfqA
Date:   Thu, 17 Nov 2022 14:45:15 +0000
Message-ID: <D3D8A1E2-942A-4A5C-B938-160AD8DB25E8@oracle.com>
References: <1668656688-22507-1-git-send-email-dai.ngo@oracle.com>
 <1668656688-22507-5-git-send-email-dai.ngo@oracle.com>
In-Reply-To: <1668656688-22507-5-git-send-email-dai.ngo@oracle.com>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?HbFBR7zrljSX0lFrwirKCESx10ODved575tGZWIh2zn2e20jTA5rjEJCkpIy?=
 =?us-ascii?Q?AwwR+iyMd8Eeo4Oew1E5Q0Jst5lq8IRRK879wLTkx6fi+h/xpciAo9D1Mn/u?=
 =?us-ascii?Q?y1UpK+X51pzTfMDRxGaalK0TQcYgMGCK+drM/83+YQ8WRgC9QBGyn5fcpTk0?=
 =?us-ascii?Q?SkAODbCh/60oO5Vgi5U1937Z7Razy7CtKLPXTNZAIn5fCoxiTXi1dyiAcKHi?=
 =?us-ascii?Q?7KI7c3CdF2KxbrVv9FBjA0VT7mVnd7PiAa8AnSLNWVMLyTOe6W1Q1GGTccuf?=
 =?us-ascii?Q?RYoNjs0iZlPRyB417b/gQ/2uXQTZFb94OZkYRBchBjXMmltZUWl+6H3vlovn?=
 =?us-ascii?Q?8lfmqE+VxLhEgaKQwH6M6O0FWjBxOl77w00E4hfBmwMKvCc8c981PexvHQne?=
 =?us-ascii?Q?oYk+jbApd5h8KQEud4J8NT7RFGHkrc2sbU2ko+jBVmu2DndpMxzp3/8srdz6?=
 =?us-ascii?Q?OeZHxyasgCIQG9AsoIdn4efZiesbg8u9aiWvFKXIkvTPevxIfh9U6H931Dum?=
 =?us-ascii?Q?QxvZQl6Lfn5lsJzZN3OHMj75ZrJiu4ZW29/RXZ2/BWg/Vcj2mczg7/LNHscL?=
 =?us-ascii?Q?jkWaX2ckZse1A+ImTv8ggjinF75fcC+ve9Tvf8OFbq2RQcWnj56ZgeXTOKM2?=
 =?us-ascii?Q?DZ9mF6hbVytirnik3nOS6vcmy5wYInPtTF/2TxRsP4tWSd7Zde+O5WVdKfXX?=
 =?us-ascii?Q?nSlX24vHAvUtP5QEai2gT/t/IUt8+WLrSmAAWg9uNfd9qwLl3ryMQG5PEXNF?=
 =?us-ascii?Q?DojYJH6GGTQwsiRmLcd9/u3SxJklJP2o7hdYETHOYZk+twyN5XAdmQLzCUrK?=
 =?us-ascii?Q?rUz6PJUAJ/CZ25RmTvHGqT8aYc5VY8qOp5flNhUn/kreMrJtWzvgixG4NlwF?=
 =?us-ascii?Q?EnPeif9NFxkVnqrM0sLTt06LdfnFCCewGOHANz6aIzMGrg8togl5dhCKFNtO?=
 =?us-ascii?Q?C2LsE6W8Xci5AiTK33LbJfSVo5ZK00IPJHR4vJ6aDrws+7FQfbp+1plaSvLI?=
 =?us-ascii?Q?/MsIAPxIKarLaWcwgppfNvck+INd8CH3cJJuqsdUNhxbNrgnhOPBRS+3VWba?=
 =?us-ascii?Q?Iv5guArvBrCdl1DL89mjErZeyfLd73oAaIHiRkSULY8Tcg2XnPTMKn9scb9o?=
 =?us-ascii?Q?GWgF2UeC6a2cA9sZiE/q69FcFkpfW432xisNbYavTgXKTR4rJraec520UnNT?=
 =?us-ascii?Q?Jrnl4+JoWgiP33abm7SYgazArfJkequ1QMwIKvJHb1mD3NX+zr/8+PxSc00F?=
 =?us-ascii?Q?GQyZbUeUKd5P5O1GMjhYPybSSFLFcqCFOXUC1D93zshVWS6JjFj8vIP/6QGP?=
 =?us-ascii?Q?mtkDwPM3wofinij8dcXTFcgKpZGxkw7Cb0oPW+GSCJR/VUbXxpAIST7Jie8w?=
 =?us-ascii?Q?9r08VRW1DNwi0vr/zEB9mKlgi0HQCdskNEWe6g1mbquzr7+m//uTMKplyvy7?=
 =?us-ascii?Q?wrKO8vnhRDRPAvHYgPoZXd7GGEk40cbpQLLFXM5Z6//Q9ijVQFhXYC8KBHIJ?=
 =?us-ascii?Q?aURAz4JbLkcihIWkeoEUpYrBtuPbouqwRY100x6dhviAwCPvmVLd0aCV1jas?=
 =?us-ascii?Q?To2DNb+OZHK4WBNtPwuRMoAzY8Xtz0L56XpFXIglYsfw9eO9ltwvKpQNfv14?=
 =?us-ascii?Q?3g=3D=3D?=
Content-Type: text/plain; charset="us-ascii"
Content-ID: <1CB503095745644584D66537E20E3BF7@namprd10.prod.outlook.com>
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: Jc/eWFEMpHzxBdUtVpQzkA2mtS5OSqUyp4gxwFLGYDw91uW5ht7mn9axWormEDkADaSjHuFuCAR9tZtRMBqRfKQqdCvj1/nE8w8/+od16CGkQjDUmwh2i7YQtxVvY2hxv5wGo8NOxcMztyJ2SDAKHdfBLMAts0wYA+rtfojm/AOhz2cBpUDVEDW1mSAtuQbh1DQlE13CmdFzmR8nHu/i6jsUBilJvGEjTN363B1+D1XQ3+fKD/lDufxkv1DVIq/zLfdG0h5eTqDjPo/bNlqFQL6vpWJJaSvBt3WG3BJxOYJX9w1KbF2zt8PrV1eh1bNHUmMxK6ny3VHcIpsDDLArr9hGF9ZfJsXWoY0pOEzUMMnjtMi2/5iuzb3V1KcbEe5MXvCDpIlYPn8XtiwL/sOXHIOSLJc63ZzwMmU+BCO0tgdtgbtO3sNI0uSL3IKVkawFgLSSqZNKkBh22z/CKGHCiqc26ELItvo2OTtCvW0sNb7ebNCd30AMigJe225F8JxKydrCDOXGG/+OuxXMQqJvYu2QSjAD8jGGwxVYNmvJ8TLsr5kU9llZbGRG1nWqkqlJvetbq/+5o0le0rPnrKEz6bcshvtB/dyiKLc9EiGI0o6hsr29KYWDlYZVy4Y0jtkbMZmlwZNRenZn4WsnA722JXZg4iqQbsoe07CU0PsSkzlTqQkkCpbjyVcXXxP4lz6lVKIdx7YXT+CP0TZq+KbEMlIxMxcIzJbLaCn2U2W6cWU57Ydtgp2Q59V/QoTJbZbb95mkZ1oEcJ70jz9KZUtD5saafkFlVkBQuLzxEQQxOuw=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: BN0PR10MB5128.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 7fc9523b-8a70-45e8-51b2-08dac8aa56f5
X-MS-Exchange-CrossTenant-originalarrivaltime: 17 Nov 2022 14:45:15.4947
 (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: ROX8dxILtaLh4OXI4MdFI/6AK/anWYCi1SknaW9vFbQYcawl9X/j6frYdjjWSwbgGIVP34Yc9scRxuc0wKD/Sg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA2PR10MB4426
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 mlxlogscore=999 bulkscore=0 mlxscore=0
 phishscore=0 suspectscore=0 spamscore=0 adultscore=0 malwarescore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2210170000
 definitions=main-2211170111
X-Proofpoint-GUID: 9ECgga5WJ7hcv4gQ0Wu5CmnA83DWSF-0
X-Proofpoint-ORIG-GUID: 9ECgga5WJ7hcv4gQ0Wu5CmnA83DWSF-0
X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,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 Nov 16, 2022, at 10:44 PM, Dai Ngo <dai.ngo@oracle.com> wrote:
>=20
> Add tracepoints to trace start and end of CB_RECALL_ANY operation.
>=20
> Signed-off-by: Dai Ngo <dai.ngo@oracle.com>
> ---
> fs/nfsd/nfs4state.c |  2 ++
> fs/nfsd/trace.h     | 49 ++++++++++++++++++++++++++++++++++++++++++++++++=
+
> 2 files changed, 51 insertions(+)
>=20
> 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 =3D 0;
> 		clp->cl_ra->ra_bmval[0] =3D 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
>=20
> #include <linux/tracepoint.h>
> +#include <linux/sunrpc/xprt.h>
>=20
> #include "export.h"
> #include "nfsfh.h"
> +#include "xdr4.h"
>=20
> #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)
> );
>=20
> +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 =3D ra->ra_cb.cb_clp->cl_clientid.cl_boot;
> +		__entry->cl_id =3D ra->ra_cb.cb_clp->cl_clientid.cl_id;
> +		__entry->ra_keep =3D ra->ra_keep;
> +		__entry->ra_bmval =3D ra->ra_bmval[0];
> +		__assign_sockaddr(addr, &ra->ra_cb.cb_clp->cl_addr,
> +				  sizeof(struct sockaddr_storage))
> +	),
> +	TP_printk("Client %08x:%08x addr=3D%pISpc ra_keep=3D%d ra_bmval=3D0x%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.


> +	)
> +);
> +
> +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 =3D task->tk_status;
> +		__entry->cl_boot =3D cb->cb_clp->cl_clientid.cl_boot;
> +		__entry->cl_id =3D cb->cb_clp->cl_clientid.cl_id;
> +	),
> +	TP_printk("client %08x:%08x status=3D%d",
> +		__entry->cl_boot, __entry->cl_id, __entry->status
> +	)
> +);
> +
> DECLARE_EVENT_CLASS(nfsd_cb_done_class,
> 	TP_PROTO(
> 		const stateid_t *stp,
> --=20
> 2.9.5
>=20

--
Chuck Lever