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;
Message-ID: <60bf9c24-a944-17c0-6f54-6dbb53970f44@oracle.com>
Date:   Thu, 12 Nov 2020 19:45:30 +0000
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:84.0)
 Gecko/20100101 Thunderbird/84.0a1
Cc:     Calum Mackay <calum.mackay@oracle.com>
Subject: Re: [PATCH v1 2/4] NFSD: Clean up the show_nf_may macro
Content-Language: en-GB
To:     Chuck Lever <chuck.lever@oracle.com>, linux-nfs@vger.kernel.org
References: <160519319763.1658.12613346131541001302.stgit@klimt.1015granger.net>
 <160519326660.1658.18351054451047271453.stgit@klimt.1015granger.net>
From:   Calum Mackay <calum.mackay@oracle.com>
Organization: Oracle
In-Reply-To: <160519326660.1658.18351054451047271453.stgit@klimt.1015granger.net>
Content-Type: multipart/signed; micalg=pgp-sha256;
 protocol="application/pgp-signature";
 boundary="lMK4odPS55z3U9Zh8mnQw2zAdxY4MqWvR"
Precedence: bulk

This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
--lMK4odPS55z3U9Zh8mnQw2zAdxY4MqWvR
Content-Type: multipart/mixed; boundary="DMj5b3nnqMPEVPkhSq34S9V9TKMSa8i8B";
 protected-headers="v1"
From: Calum Mackay <calum.mackay@oracle.com>
To: Chuck Lever <chuck.lever@oracle.com>, linux-nfs@vger.kernel.org
Cc: Calum Mackay <calum.mackay@oracle.com>
Message-ID: <60bf9c24-a944-17c0-6f54-6dbb53970f44@oracle.com>
Subject: Re: [PATCH v1 2/4] NFSD: Clean up the show_nf_may macro
References: <160519319763.1658.12613346131541001302.stgit@klimt.1015granger.net>
 <160519326660.1658.18351054451047271453.stgit@klimt.1015granger.net>
In-Reply-To: <160519326660.1658.18351054451047271453.stgit@klimt.1015granger.net>

--DMj5b3nnqMPEVPkhSq34S9V9TKMSa8i8B
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: quoted-printable

On 12/11/2020 3:01 pm, Chuck Lever wrote:
> Display all currently possible NFSD_MAY permission flags.
>=20
> Move and rename show_nf_may with a more generic name because the
> NFSD_MAY permission flags are used in other places besides the file
> cache.
>=20
> Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
> ---
>   fs/nfsd/trace.h |   40 ++++++++++++++++++++++++++--------------
>   1 file changed, 26 insertions(+), 14 deletions(-)
>=20
> diff --git a/fs/nfsd/trace.h b/fs/nfsd/trace.h
> index 99bf07800cd0..532b66a4b7f1 100644
> --- a/fs/nfsd/trace.h
> +++ b/fs/nfsd/trace.h
> @@ -12,6 +12,22 @@
>   #include "export.h"
>   #include "nfsfh.h"
>  =20
> +#define show_nfsd_may_flags(x)						\
> +	__print_flags(x, "|",						\
> +		{ NFSD_MAY_EXEC,		"EXEC" },		\
> +		{ NFSD_MAY_WRITE,		"WRITE" },		\
> +		{ NFSD_MAY_READ,		"READ" },		\
> +		{ NFSD_MAY_SATTR,		"SATTR" },		\
> +		{ NFSD_MAY_TRUNC,		"TRUNC" },		\
> +		{ NFSD_MAY_LOCK,		"LOCK" },		\
> +		{ NFSD_MAY_OWNER_OVERRIDE,	"OWNER_OVERRIDE" },	\
> +		{ NFSD_MAY_LOCAL_ACCESS,	"LOCAL_ACCESS" },	\
> +		{ NFSD_MAY_BYPASS_GSS_ON_ROOT,	"BYPASS_GSS_ON_ROOT" },	\
> +		{ NFSD_MAY_NOT_BREAK_LEASE,	"NOT_BREAD_LEASE" },	\

typo :)

> +		{ NFSD_MAY_BYPASS_GSS,		"BYPASS_GSS" },		\
> +		{ NFSD_MAY_READ_IF_EXEC,	"READ_IF_EXEC" },	\
> +		{ NFSD_MAY_64BIT_COOKIE,	"64BIT_COOKIE" })
> +
>   TRACE_EVENT(nfsd_compound,
>   	TP_PROTO(const struct svc_rqst *rqst,
>   		 u32 args_opcnt),
> @@ -421,6 +437,9 @@ TRACE_EVENT(nfsd_clid_inuse_err,
>   		__entry->cl_boot, __entry->cl_id)
>   )
>  =20
> +/*
> + * from fs/nfsd/filecache.h
> + */
>   TRACE_DEFINE_ENUM(NFSD_FILE_HASHED);
>   TRACE_DEFINE_ENUM(NFSD_FILE_PENDING);
>   TRACE_DEFINE_ENUM(NFSD_FILE_BREAK_READ);
> @@ -435,13 +454,6 @@ TRACE_DEFINE_ENUM(NFSD_FILE_REFERENCED);
>   		{ 1 << NFSD_FILE_BREAK_WRITE,	"BREAK_WRITE" },	\
>   		{ 1 << NFSD_FILE_REFERENCED,	"REFERENCED"})
>  =20
> -/* FIXME: This should probably be fleshed out in the future. */
> -#define show_nf_may(val)						\
> -	__print_flags(val, "|",						\
> -		{ NFSD_MAY_READ,		"READ" },		\
> -		{ NFSD_MAY_WRITE,		"WRITE" },		\
> -		{ NFSD_MAY_NOT_BREAK_LEASE,	"NOT_BREAK_LEASE" })
> -
>   DECLARE_EVENT_CLASS(nfsd_file_class,
>   	TP_PROTO(struct nfsd_file *nf),
>   	TP_ARGS(nf),
> @@ -466,7 +478,7 @@ DECLARE_EVENT_CLASS(nfsd_file_class,
>   		__entry->nf_inode,
>   		__entry->nf_ref,
>   		show_nf_flags(__entry->nf_flags),
> -		show_nf_may(__entry->nf_may),
> +		show_nfsd_may_flags(__entry->nf_may),
>   		__entry->nf_file)
>   )
>  =20
> @@ -492,10 +504,10 @@ TRACE_EVENT(nfsd_file_acquire,
>   		__field(u32, xid)
>   		__field(unsigned int, hash)
>   		__field(void *, inode)
> -		__field(unsigned int, may_flags)
> +		__field(unsigned long, may_flags)
>   		__field(int, nf_ref)
>   		__field(unsigned long, nf_flags)
> -		__field(unsigned char, nf_may)
> +		__field(unsigned long, nf_may)
>   		__field(struct file *, nf_file)
>   		__field(u32, status)
>   	),
> @@ -514,10 +526,10 @@ TRACE_EVENT(nfsd_file_acquire,
>  =20
>   	TP_printk("xid=3D0x%x hash=3D0x%x inode=3D0x%p may_flags=3D%s ref=3D=
%d nf_flags=3D%s nf_may=3D%s nf_file=3D0x%p status=3D%u",
>   			__entry->xid, __entry->hash, __entry->inode,
> -			show_nf_may(__entry->may_flags), __entry->nf_ref,
> -			show_nf_flags(__entry->nf_flags),
> -			show_nf_may(__entry->nf_may), __entry->nf_file,
> -			__entry->status)
> +			show_nfsd_may_flags(__entry->may_flags),
> +			__entry->nf_ref, show_nf_flags(__entry->nf_flags),
> +			show_nfsd_may_flags(__entry->nf_may),
> +			__entry->nf_file, __entry->status)
>   );
>  =20
>   DECLARE_EVENT_CLASS(nfsd_file_search_class,
>=20
>=20

--=20
Calum Mackay
Linux Kernel Engineering
Oracle Linux and Virtualisation

--DMj5b3nnqMPEVPkhSq34S9V9TKMSa8i8B--

--lMK4odPS55z3U9Zh8mnQw2zAdxY4MqWvR
Content-Type: application/pgp-signature; name="OpenPGP_signature.asc"
Content-Description: OpenPGP digital signature
Content-Disposition: attachment; filename="OpenPGP_signature"

-----BEGIN PGP SIGNATURE-----

wsF5BAABCAAjFiEE1GBbrQYgx8o9Vdw+hSPvAG3BU+IFAl+tkNsFAwAAAAAACgkQhSPvAG3BU+Kz
FQ//bzyLP2PuKdGEGV/ix0DyVmG1t6SENjrOr0yA6g2pJ80QX9BhF7iGxqJrctzaDa8qTqVHI++b
0Zom7/AhmsAmFz+hWNtofhKtDT96zzTIljEG93RM6dmQ8OpknyJnyHgpPZIiQ9yJDXW1fZVGWPld
NejcyzU1xRzI5GL4lLOAXb/sVfVdIeYArcmIvemTjdQErkLdixENY7xAjjks5hKhC9bLo9ZhCTDw
EjKSuc/Ludl2k2aIKau+y1dmz44hjaFidunHqbxOurGuuOPVYxLmVZjHtZrJnlxWpI8jU378jqeR
a7E03Dp7ASUgO8Dok9L0v72/myTBqkTDWyNXjltXV530tI6WpqalPvtnamZ2+DTfVcNsxGjz0nC3
8Ow4K4K6keRYKDBn30VMA0P+OMylBI+wM6/51Xxqs5Jvtm9jsiVYEUR6JlGSsjD05TIwMli9Xeb4
57gl9yOXYmGhNRNkCBiyqNQqZS4IcW76cw5Mjvgqd2ATaoFmS2DKKTiVCxYGXy64Ezby+/uLeSj2
ES/f/tC/uauxkBOr4NO7k9FDdINX2cLPLVHVjphbvBU4wIi/OufYgj/HdI7KcYIwQhZLhCmaqTm8
hrhdY7pGaXdAYLhSAQRkyMkAUEhnuGWv7MnMRsUKHqzrm+xBfolIAGMuudbBrsQYSjnJYcrh8hfM
EYg=
=9m3n
-----END PGP SIGNATURE-----

--lMK4odPS55z3U9Zh8mnQw2zAdxY4MqWvR--