From:   Chuck Lever III <chuck.lever@oracle.com>
To:     Jeff Layton <jlayton@kernel.org>
CC:     Linux NFS Mailing List <linux-nfs@vger.kernel.org>,
        Trond Myklebust <trond.myklebust@hammerspace.com>,
        Anna Schumaker <anna@kernel.org>,
        kernel test robot <lkp@intel.com>
Subject: Re: [PATCH] lockd: fix tracepoint status name definitions when
 CONFIG_LOCKD_V4 isn't defined
Thread-Topic: [PATCH] lockd: fix tracepoint status name definitions when
 CONFIG_LOCKD_V4 isn't defined
Thread-Index: AQHZU2WPXEMgsYXzs0GNgl0xs61HJq70Jp8A
Date:   Fri, 10 Mar 2023 15:41:00 +0000
Message-ID: <414ED508-BE73-4DB1-889B-9FD7C29E2481@oracle.com>
References: <20230310153238.77446-1-jlayton@kernel.org>
In-Reply-To: <20230310153238.77446-1-jlayton@kernel.org>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?LFf/04Ql5aIJJVyy+RQbmoyIJvGwlGbR+eWgsvPt/gJz+tnp/KL2vJ5KQD6C?=
 =?us-ascii?Q?y9L4ZcfmQnCvPeAvrJ2Id3aDwPCK4ZtQH3Y2ExzdJFnDgH7fJSGxothjco39?=
 =?us-ascii?Q?PihU8CMANla8kbpm81PRKA5l4P3SKDdVvR8uBsPcD/kesmPQi/NDxyu8iEjy?=
 =?us-ascii?Q?rP4q1ysqgaY1M6pbYRN1kCxK/7FlX+cEgjxkqBzwmy+MvRlCM8gg/8Sej1mD?=
 =?us-ascii?Q?kI6zRWViJxK1yWPymQtopI2WRhvdMciNteRool4MD5HBrQHVViqfMTg2lkGi?=
 =?us-ascii?Q?xjIeYq8SCM+CR/ZleDzw/9j/jVGyO8ZfhdENpNhZphQHUhNqiH5JuAOLPmvP?=
 =?us-ascii?Q?KpSZcMI3q5lSGsCU0NcT/r+OH8bFrfhTo/JMeoifhS7+RrSWFsAc8IxH9WJN?=
 =?us-ascii?Q?f2Y+jG83QeWB+jxWIT9ya8WTSJgYPwtcCV0SsnpAqdQrZeE5SLQ1OZSsJa9t?=
 =?us-ascii?Q?flwWtwg7Rvdp/0Uw4szTDezzMH4+LX+B2xNhf5lgFrKBJsHK3fp7UWo8qFMY?=
 =?us-ascii?Q?FR8MNd5e5PhF/ZUCA5hcb0eLx831js49vHSLNuqdApCHzunRUGmz5Q4SbVhT?=
 =?us-ascii?Q?nQvR/LjeqbCdL6jcPOonUGzyHKnC3AsRFM4xn8fPuQW9mkgt5kPE0q96uamV?=
 =?us-ascii?Q?/enSFHzB39pJhOl1mTC2W9sdqMyIXsMyZapwL4keP461Ez0kvh5KbWG2weQ0?=
 =?us-ascii?Q?iy1nPdTnsJtO8jUhzRmDpcAMl8siD30kGSEPxnWsgS8C6rCmx1CLsyTeCDgV?=
 =?us-ascii?Q?Snvs83xWxKkGtBYWolEyRsgZFoB542rIk+ly2bU6lbOjE4ahSsIyK1R0R3PZ?=
 =?us-ascii?Q?i717EArOnyxz/O8lpMDsUmHrGbqAiysRJScnsnNcbbimNFWArEVXBLhuOT13?=
 =?us-ascii?Q?V59R4k/pabu+a+ThK765MyoX7Ky86Ts0QrILH3wP3yD4+CewxR41LZSWaPex?=
 =?us-ascii?Q?bIIuw6J5l+YwJK2V8aStWB0LFlHBCEy+sracnzU7HNOyUhjSH3vBLdCnPZ0J?=
 =?us-ascii?Q?Brb6EJce34KwTF7Lqa/g7mzWGaVFSKL4MLyUWdVrtHazGycNccfzUr0kCLgR?=
 =?us-ascii?Q?9SUre6R8uEOWDsELMoXXQGWIIXbJQO8gjXKyzODKw4KUs22uET9zRzILHID/?=
 =?us-ascii?Q?ajjomVoqp4rOZU9CjiIDLrqLvMOP7elFzYK8SC8avbj7SEue9GJDk92ioS3E?=
 =?us-ascii?Q?iJ8BjX6JLdq/hwadW77nkHgXVkn6xCQudZqcdnMoNDTtZfub7Ldj8MXqB1XG?=
 =?us-ascii?Q?DWTsvm51yd/yfJMlDc1o6VtlrBFrp6OezCNzPR+XomzptSieojHMephS2nkF?=
 =?us-ascii?Q?Ex0xDqnLdYbJovDjXoB+/N8gL7/Qzy0r9jU+V16C/NgLCLYMW1xRIb/tMvUd?=
 =?us-ascii?Q?mwb2CKoplk5Ga7i7XZfBHILkjkGGh8lgKRRaGPp2090pKR5BetoUmGLXPGbM?=
 =?us-ascii?Q?44GGUYb3dNyeJuNTNQ771MshAlzihjtCMiNB9vvEJj0cj+jsQ1WzVtmO8cR6?=
 =?us-ascii?Q?NgULxbsOr53+1QT/5zYhqEZhyTNxHsSqnPB7I6RKoZyXYwby+9yYzYZRDO13?=
 =?us-ascii?Q?rFpwgd/V146LpD4AF12NJXsWxhPsajE19b9fHVHMwB9mkgOjtb5fm67jwh2H?=
 =?us-ascii?Q?Cg=3D=3D?=
Content-Type: text/plain; charset="us-ascii"
Content-ID: <37E31E047ADE4A49B5325444A0EEADD7@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: eE7zHTrL/+ZjE19a9Yi5xu2uNH3Ka0rKZTuhoh3HQxVBXfB2CL1/AAqWHXK/IBLiWArIj6+8sHKgulKM19DcfiNiOUUWoUKtkCB/upg0QCB0IZUkiLVymr8N1th6W6c6n/nSOfi7/S969nj/7VPN4LqpdRykHcUEmGd0DDaH+2PnjMoOV8UxzLorN9Z7SGINujOFmy6+TabiB04waaDEhtBzUNqd68Ju9xSqnJ0K7N6e9hdyOE28nqlHxnBAfxy8cFfXPFBmC7ckk4DLvPJ+Cmbmxs2quIXecM/zs9bRACQ5SVn3l8rx7VcvIuX7yVPjJRDp7vkTjxTxRrM2alJalikP7XWAUf7+BhlpfkWlP0LnaKxo5yE5jacME+GCRd63T4SJbu8hwds/W2V/BDsed2VPQyZeYkGhsBguzWT1u1mSx9nkhMjBrfZzAxE+CNpLgm2OOHbhsKGyxNBYIk7aZw/AHQWcEBpPZxQGVFPW1sJNZ+RAZgV4TuC7rzF3C39MOwjx3HQkmaPYokpnc7m1aP7azsO86b0a4dPJ/UMggB2VV6P1+zFv0DylQDVGwktvpVIds+X8a6/750hQ6UD6/tNGMowNSdrXqKvy9xSAeurgX41/DBjylSn9ctEprAKkJLaWu8+UClGzptqhYd2fD/l2HVQUSLN8/AEErVCvcxRvf7lh95offpBjE4Vr5qYqAkLQdPHhhr5Ixah9QnucRfZrR7n9yITSIB3gsxei7rNDno0W3qhWH4WNjHyr3/mfWntDcd1R+NkQWX1oMb9Gp8z3RfAZrgrXta12JxDKdpq4AjvZL1/AWlqU+UG7HEiccoGWjZMEpbhPv+1I+oodDdIWcWAGZfT0PiaXk0443OM=
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: 2a5a4c9d-9189-4fb8-1f04-08db217dd923
X-MS-Exchange-CrossTenant-originalarrivaltime: 10 Mar 2023 15:41:00.0487
 (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: C0GZPrk7h3qIb5irtD4cVJxQyhm2UmjFIEE+BHgVUUZfyzJyz3fSh3lRQia7J04s+2sVSwJvOnKhX1gfJPrD2w==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR10MB4759
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22
 definitions=2023-03-10_06,2023-03-10_01,2023-02-09_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 malwarescore=0 mlxscore=0
 mlxlogscore=993 adultscore=0 suspectscore=0 phishscore=0 bulkscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000
 definitions=main-2303100125
X-Proofpoint-ORIG-GUID: qJP696qk4MI-bHB07Wegox3627avDi5D
X-Proofpoint-GUID: qJP696qk4MI-bHB07Wegox3627avDi5D
Precedence: bulk
List-ID: <linux-nfs.vger.kernel.org>
X-Mailing-List: linux-nfs@vger.kernel.org


> On Mar 10, 2023, at 10:32 AM, Jeff Layton <jlayton@kernel.org> wrote:
>=20
> There is probably a better way to do this that doesn't repeat anything.
>=20
> Reported-by: kernel test robot <lkp@intel.com>
> Link: https://lore.kernel.org/oe-kbuild-all/202303071503.shUSoIpC-lkp@int=
el.com/
> Signed-off-by: Jeff Layton <jlayton@kernel.org>
> ---
> fs/lockd/trace.h | 10 ++++++++++
> 1 file changed, 10 insertions(+)
>=20
> Chuck, I'm fine if you want to just fold this into the original
> tracepoint patch too. Also, let me know if you see a way to express this
> better.

Interesting, I have the lockd tracepoint patch in nfsd-next, and
haven't heard a peep from the bots.

I'll fold something in.


> diff --git a/fs/lockd/trace.h b/fs/lockd/trace.h
> index 3e84e3efaf22..11f1381b566c 100644
> --- a/fs/lockd/trace.h
> +++ b/fs/lockd/trace.h
> @@ -10,6 +10,7 @@
> #include <linux/nfs.h>
> #include <linux/lockd/lockd.h>

Btw, here I think TRACE_DEFINE_ENUMs will be needed. I can confirm
that, and add if necessary.


> +#ifdef CONFIG_LOCKD_V4
> #define show_nlm_status(val)							\
> 	__print_symbolic(val,							\
> 		{ NLM_LCK_GRANTED,		"LCK_GRANTED" },		\
> @@ -22,6 +23,15 @@
> 		{ NLM_STALE_FH,			"STALE_FH" },			\
> 		{ NLM_FBIG,			"FBIG" },			\
> 		{ NLM_FAILED,			"FAILED" })
> +#else
> +#define show_nlm_status(val)							\
> +	__print_symbolic(val,							\
> +		{ NLM_LCK_GRANTED,		"LCK_GRANTED" },		\
> +		{ NLM_LCK_DENIED,		"LCK_DENIED" },			\
> +		{ NLM_LCK_DENIED_NOLOCKS,	"LCK_DENIED_NOLOCKS" },		\
> +		{ NLM_LCK_BLOCKED,		"LCK_BLOCKED" },		\
> +		{ NLM_LCK_DENIED_GRACE_PERIOD,	"LCK_DENIED_GRACE_PERIOD" })
> +#endif
>=20
> DECLARE_EVENT_CLASS(nlmclnt_lock_event,
> 		TP_PROTO(
> --=20
> 2.39.2
>=20

--
Chuck Lever