From: Chuck Lever Date: Thu, 23 Apr 2026 17:13:14 +0000 (-0400) Subject: NFSD: Put cache get-reqs dump attrs under reply X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=80ec8054fe14ec024ab2e2073cb4a88d20abe7c0;p=thirdparty%2Flinux.git NFSD: Put cache get-reqs dump attrs under reply 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 _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 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") Tested-by: Thorsten Leemhuis Reviewed-by: Jeff Layton Signed-off-by: Chuck Lever --- diff --git a/Documentation/netlink/specs/nfsd.yaml b/Documentation/netlink/specs/nfsd.yaml index 40eca7c156803..25497b5331857 100644 --- a/Documentation/netlink/specs/nfsd.yaml +++ b/Documentation/netlink/specs/nfsd.yaml @@ -416,7 +416,7 @@ operations: attribute-set: svc-export-reqs flags: [admin-perm] dump: - request: + reply: attributes: - requests - @@ -434,7 +434,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 55dabc914dbc8..f22ff22b9418f 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 30c4f8be3df98..f99add477cc7a 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), @@ -169,11 +159,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, @@ -183,11 +171,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 5ccf0967809c4..ce09ecc0faa2c 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,