public inbox for linux-nfs@vger.kernel.org
 help / color / mirror / Atom feed
From: Jeff Layton <jlayton@kernel.org>
To: Chuck Lever <cel@kernel.org>, Christian Brauner <brauner@kernel.org>
Cc: NeilBrown <neilb@ownmail.net>,
	Olga Kornievskaia <okorniev@redhat.com>,
	 Dai Ngo <dai.ngo@oracle.com>, Tom Talpey <tom@talpey.com>,
	linux-nfs@vger.kernel.org, Chuck Lever	 <chuck.lever@oracle.com>,
	Thorsten Leemhuis <linux@leemhuis.info>
Subject: Re: [PATCH] NFSD: Put cache get-reqs dump attrs under reply
Date: Thu, 23 Apr 2026 14:18:03 -0400	[thread overview]
Message-ID: <1b19222916046a63b2e85489b3c50ff006d96433.camel@kernel.org> (raw)
In-Reply-To: <20260423181505.742554-3-cel@kernel.org>

On Thu, 2026-04-23 at 14:15 -0400, Chuck Lever wrote:
> From: Chuck Lever <chuck.lever@oracle.com>
> 
> The new get-reqs dump operations added to sunrpc_cache.yaml and
> nfsd.yaml place the "requests" nested attribute under dump.request.
> A netlink dump carries an empty request; its payload travels back
> in the reply. Because the spec names no reply attributes, the YNL
> C code generator synthesizes a forward reference to a
> <op>_rsp struct that is never defined, breaking any consumer of
> these specs.
> 
> This first surfaced when Thorsten Leemhuis built tools/net/ynl
> against -next:
> 
>   nfsd-user.h:746: error: field 'obj' has incomplete type
>     struct nfsd_svc_export_get_reqs_rsp obj ...
>   nfsd-user.h:826: error: field 'obj' has incomplete type
>     struct nfsd_expkey_get_reqs_rsp obj ...
>   nfsd-user.c:1211: error: 'nfsd_svc_export_get_reqs_rsp_parse'
>     undeclared
> 
> sunrpc_cache.yaml has the same defect in ip-map-get-reqs and
> unix-gid-get-reqs, but nfsd.yaml errors out first in the Makefile's
> alphabetical build order and hides the sunrpc failures.
> 
> These bugs were introduced by incorrect merge conflict resolution.
> 
> Reported-by: Thorsten Leemhuis <linux@leemhuis.info>
> Closes: https://lore.kernel.org/linux-nfs/f6a3ca6d-e5cb-4a5c-9af2-8d2b1ce33ef0@leemhuis.info/
> Fixes: 1045ccf519ce30 ("sunrpc: add netlink upcall for the auth.unix.ip cache")
> Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
> ---
>  Documentation/netlink/specs/nfsd.yaml         |  4 +--
>  Documentation/netlink/specs/sunrpc_cache.yaml |  4 +--
>  fs/nfsd/netlink.c                             | 26 +++++--------------
>  net/sunrpc/netlink.c                          | 26 +++++--------------
>  4 files changed, 16 insertions(+), 44 deletions(-)
> 
> diff --git a/Documentation/netlink/specs/nfsd.yaml b/Documentation/netlink/specs/nfsd.yaml
> index 17e714ef683d..8f36fadd68f7 100644
> --- a/Documentation/netlink/specs/nfsd.yaml
> +++ b/Documentation/netlink/specs/nfsd.yaml
> @@ -445,7 +445,7 @@ operations:
>        attribute-set: svc-export-reqs
>        flags: [admin-perm]
>        dump:
> -          request:
> +          reply:
>              attributes:
>                - requests
>      -
> @@ -463,7 +463,7 @@ operations:
>        attribute-set: expkey-reqs
>        flags: [admin-perm]
>        dump:
> -          request:
> +          reply:
>              attributes:
>                - requests
>      -
> diff --git a/Documentation/netlink/specs/sunrpc_cache.yaml b/Documentation/netlink/specs/sunrpc_cache.yaml
> index 55dabc914dbc..f22ff22b9418 100644
> --- a/Documentation/netlink/specs/sunrpc_cache.yaml
> +++ b/Documentation/netlink/specs/sunrpc_cache.yaml
> @@ -101,7 +101,7 @@ operations:
>        attribute-set: ip-map-reqs
>        flags: [admin-perm]
>        dump:
> -          request:
> +          reply:
>              attributes:
>                - requests
>      -
> @@ -119,7 +119,7 @@ operations:
>        attribute-set: unix-gid-reqs
>        flags: [admin-perm]
>        dump:
> -          request:
> +          reply:
>              attributes:
>                - requests
>      -
> diff --git a/fs/nfsd/netlink.c b/fs/nfsd/netlink.c
> index df5b0e2fb286..fbee3676d253 100644
> --- a/fs/nfsd/netlink.c
> +++ b/fs/nfsd/netlink.c
> @@ -88,21 +88,11 @@ static const struct nla_policy nfsd_pool_mode_set_nl_policy[NFSD_A_POOL_MODE_MOD
>  	[NFSD_A_POOL_MODE_MODE] = { .type = NLA_NUL_STRING, },
>  };
>  
> -/* NFSD_CMD_SVC_EXPORT_GET_REQS - dump */
> -static const struct nla_policy nfsd_svc_export_get_reqs_nl_policy[NFSD_A_SVC_EXPORT_REQS_REQUESTS + 1] = {
> -	[NFSD_A_SVC_EXPORT_REQS_REQUESTS] = NLA_POLICY_NESTED(nfsd_svc_export_nl_policy),
> -};
> -
>  /* NFSD_CMD_SVC_EXPORT_SET_REQS - do */
>  static const struct nla_policy nfsd_svc_export_set_reqs_nl_policy[NFSD_A_SVC_EXPORT_REQS_REQUESTS + 1] = {
>  	[NFSD_A_SVC_EXPORT_REQS_REQUESTS] = NLA_POLICY_NESTED(nfsd_svc_export_nl_policy),
>  };
>  
> -/* NFSD_CMD_EXPKEY_GET_REQS - dump */
> -static const struct nla_policy nfsd_expkey_get_reqs_nl_policy[NFSD_A_EXPKEY_REQS_REQUESTS + 1] = {
> -	[NFSD_A_EXPKEY_REQS_REQUESTS] = NLA_POLICY_NESTED(nfsd_expkey_nl_policy),
> -};
> -
>  /* NFSD_CMD_EXPKEY_SET_REQS - do */
>  static const struct nla_policy nfsd_expkey_set_reqs_nl_policy[NFSD_A_EXPKEY_REQS_REQUESTS + 1] = {
>  	[NFSD_A_EXPKEY_REQS_REQUESTS] = NLA_POLICY_NESTED(nfsd_expkey_nl_policy),
> @@ -184,11 +174,9 @@ static const struct genl_split_ops nfsd_nl_ops[] = {
>  		.flags	= GENL_CMD_CAP_DO,
>  	},
>  	{
> -		.cmd		= NFSD_CMD_SVC_EXPORT_GET_REQS,
> -		.dumpit		= nfsd_nl_svc_export_get_reqs_dumpit,
> -		.policy		= nfsd_svc_export_get_reqs_nl_policy,
> -		.maxattr	= NFSD_A_SVC_EXPORT_REQS_REQUESTS,
> -		.flags		= GENL_ADMIN_PERM | GENL_CMD_CAP_DUMP,
> +		.cmd	= NFSD_CMD_SVC_EXPORT_GET_REQS,
> +		.dumpit	= nfsd_nl_svc_export_get_reqs_dumpit,
> +		.flags	= GENL_ADMIN_PERM | GENL_CMD_CAP_DUMP,
>  	},
>  	{
>  		.cmd		= NFSD_CMD_SVC_EXPORT_SET_REQS,
> @@ -198,11 +186,9 @@ static const struct genl_split_ops nfsd_nl_ops[] = {
>  		.flags		= GENL_ADMIN_PERM | GENL_CMD_CAP_DO,
>  	},
>  	{
> -		.cmd		= NFSD_CMD_EXPKEY_GET_REQS,
> -		.dumpit		= nfsd_nl_expkey_get_reqs_dumpit,
> -		.policy		= nfsd_expkey_get_reqs_nl_policy,
> -		.maxattr	= NFSD_A_EXPKEY_REQS_REQUESTS,
> -		.flags		= GENL_ADMIN_PERM | GENL_CMD_CAP_DUMP,
> +		.cmd	= NFSD_CMD_EXPKEY_GET_REQS,
> +		.dumpit	= nfsd_nl_expkey_get_reqs_dumpit,
> +		.flags	= GENL_ADMIN_PERM | GENL_CMD_CAP_DUMP,
>  	},
>  	{
>  		.cmd		= NFSD_CMD_EXPKEY_SET_REQS,
> diff --git a/net/sunrpc/netlink.c b/net/sunrpc/netlink.c
> index 5ccf0967809c..ce09ecc0faa2 100644
> --- a/net/sunrpc/netlink.c
> +++ b/net/sunrpc/netlink.c
> @@ -29,21 +29,11 @@ const struct nla_policy sunrpc_unix_gid_nl_policy[SUNRPC_A_UNIX_GID_EXPIRY + 1]
>  	[SUNRPC_A_UNIX_GID_EXPIRY] = { .type = NLA_U64, },
>  };
>  
> -/* SUNRPC_CMD_IP_MAP_GET_REQS - dump */
> -static const struct nla_policy sunrpc_ip_map_get_reqs_nl_policy[SUNRPC_A_IP_MAP_REQS_REQUESTS + 1] = {
> -	[SUNRPC_A_IP_MAP_REQS_REQUESTS] = NLA_POLICY_NESTED(sunrpc_ip_map_nl_policy),
> -};
> -
>  /* SUNRPC_CMD_IP_MAP_SET_REQS - do */
>  static const struct nla_policy sunrpc_ip_map_set_reqs_nl_policy[SUNRPC_A_IP_MAP_REQS_REQUESTS + 1] = {
>  	[SUNRPC_A_IP_MAP_REQS_REQUESTS] = NLA_POLICY_NESTED(sunrpc_ip_map_nl_policy),
>  };
>  
> -/* SUNRPC_CMD_UNIX_GID_GET_REQS - dump */
> -static const struct nla_policy sunrpc_unix_gid_get_reqs_nl_policy[SUNRPC_A_UNIX_GID_REQS_REQUESTS + 1] = {
> -	[SUNRPC_A_UNIX_GID_REQS_REQUESTS] = NLA_POLICY_NESTED(sunrpc_unix_gid_nl_policy),
> -};
> -
>  /* SUNRPC_CMD_UNIX_GID_SET_REQS - do */
>  static const struct nla_policy sunrpc_unix_gid_set_reqs_nl_policy[SUNRPC_A_UNIX_GID_REQS_REQUESTS + 1] = {
>  	[SUNRPC_A_UNIX_GID_REQS_REQUESTS] = NLA_POLICY_NESTED(sunrpc_unix_gid_nl_policy),
> @@ -57,11 +47,9 @@ static const struct nla_policy sunrpc_cache_flush_nl_policy[SUNRPC_A_CACHE_FLUSH
>  /* Ops table for sunrpc */
>  static const struct genl_split_ops sunrpc_nl_ops[] = {
>  	{
> -		.cmd		= SUNRPC_CMD_IP_MAP_GET_REQS,
> -		.dumpit		= sunrpc_nl_ip_map_get_reqs_dumpit,
> -		.policy		= sunrpc_ip_map_get_reqs_nl_policy,
> -		.maxattr	= SUNRPC_A_IP_MAP_REQS_REQUESTS,
> -		.flags		= GENL_ADMIN_PERM | GENL_CMD_CAP_DUMP,
> +		.cmd	= SUNRPC_CMD_IP_MAP_GET_REQS,
> +		.dumpit	= sunrpc_nl_ip_map_get_reqs_dumpit,
> +		.flags	= GENL_ADMIN_PERM | GENL_CMD_CAP_DUMP,
>  	},
>  	{
>  		.cmd		= SUNRPC_CMD_IP_MAP_SET_REQS,
> @@ -71,11 +59,9 @@ static const struct genl_split_ops sunrpc_nl_ops[] = {
>  		.flags		= GENL_ADMIN_PERM | GENL_CMD_CAP_DO,
>  	},
>  	{
> -		.cmd		= SUNRPC_CMD_UNIX_GID_GET_REQS,
> -		.dumpit		= sunrpc_nl_unix_gid_get_reqs_dumpit,
> -		.policy		= sunrpc_unix_gid_get_reqs_nl_policy,
> -		.maxattr	= SUNRPC_A_UNIX_GID_REQS_REQUESTS,
> -		.flags		= GENL_ADMIN_PERM | GENL_CMD_CAP_DUMP,
> +		.cmd	= SUNRPC_CMD_UNIX_GID_GET_REQS,
> +		.dumpit	= sunrpc_nl_unix_gid_get_reqs_dumpit,
> +		.flags	= GENL_ADMIN_PERM | GENL_CMD_CAP_DUMP,
>  	},
>  	{
>  		.cmd		= SUNRPC_CMD_UNIX_GID_SET_REQS,

Reviewed-by: Jeff Layton <jlayton@kernel.org>

  parent reply	other threads:[~2026-04-23 18:18 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-04-23 18:15 [PATCH 0/4] cleanup block-style layouts exports v3 Chuck Lever
2026-04-23 18:15 ` [PATCH 1/4] nfsd/blocklayout: always ignore loca_time_modify Chuck Lever
2026-04-23 18:15 ` [PATCH] NFSD: Put cache get-reqs dump attrs under reply Chuck Lever
2026-04-23 18:16   ` Chuck Lever
2026-04-23 18:18   ` Jeff Layton [this message]
2026-04-23 18:15 ` [PATCH 2/4] exportfs: split out the ops for layout-based block device access Chuck Lever
2026-04-23 18:15 ` [PATCH 3/4] exportfs: don't pass struct iattr to ->commit_blocks Chuck Lever
2026-04-23 18:15 ` [PATCH 4/4] exportfs,nfsd: rework checking for layout-based block device access support Chuck Lever
  -- strict thread matches above, loose matches on Subject: below --
2026-04-23 17:17 [PATCH] NFSD: Put cache get-reqs dump attrs under reply Chuck Lever
2026-04-23 17:24 ` Thorsten Leemhuis
2026-04-23 17:26   ` Chuck Lever
2026-04-23 17:50     ` Jeff Layton
2026-04-23 17:57       ` Chuck Lever

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1b19222916046a63b2e85489b3c50ff006d96433.camel@kernel.org \
    --to=jlayton@kernel.org \
    --cc=brauner@kernel.org \
    --cc=cel@kernel.org \
    --cc=chuck.lever@oracle.com \
    --cc=dai.ngo@oracle.com \
    --cc=linux-nfs@vger.kernel.org \
    --cc=linux@leemhuis.info \
    --cc=neilb@ownmail.net \
    --cc=okorniev@redhat.com \
    --cc=tom@talpey.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox