NFSD: Put cache get-reqs dump attrs under reply
Subsystems (4)
Chuck Lever
maintainerPATCH 1/1 NFSD: Put cache get-reqs dump attrs under reply
From: Chuck Lever <[email protected]>
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.
--- 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(-)
Documentation/netlink/specs/nfsd.yaml +2 -2
@@ -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 -
Documentation/netlink/specs/sunrpc_cache.yaml +2 -2
@@ -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 -
fs/nfsd/netlink.c +6 -20
@@ -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,
net/sunrpc/netlink.c +6 -20
@@ -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,
Signature · 1 line
2.53.0
Quoted 10 lines · Chuck Lever
From: Chuck Lever <[email protected]>
The new get-reqs dump operations added to
sunrpc_cache.yamlandnfsd.yamlplace 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.
Quoted 2 lines
This first surfaced when Thorsten Leemhuis built
tools/net/ynlagainst -next:
Thx for the quick fix, this makes things work. In case anybody cares:
Ciao, Thorsten
Quoted 180 lines
nfsd-user.h:746: error: field 'obj' has incomplete type
structnfsd_svc_export_get_reqs_rspobj ...
nfsd-user.h:826: error: field 'obj' has incomplete type
structnfsd_expkey_get_reqs_rspobj ...
nfsd-user.c:1211: error: 'nfsd_svc_export_get_reqs_rsp_parse'
undeclared
sunrpc_cache.yamlhas the same defect in ip-map-get-reqs and unix-gid-get-reqs, butnfsd.yamlerrors 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 <[email protected]>Fixes 1045ccf519ce30 ("sunrpc: add netlink upcall for the auth.unix.ip cache")Signed-off-by Chuck Lever <[email protected]>--- 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(-)Documentation/netlink/specs/nfsd.yaml +2
-2@@ -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 -Documentation/netlink/specs/sunrpc_cache.yaml +2
-2@@ -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 -fs/nfsd/netlink.c +6
-20@@ -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,net/sunrpc/netlink.c +6
-20@@ -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,
Quoted 11 lines · Thorsten Leemhuis
Quoted 10 lines · Chuck Lever
From: Chuck Lever <[email protected]>
The new get-reqs dump operations added to
sunrpc_cache.yamlandnfsd.yamlplace 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.
Quoted 6 lines
Quoted 2 lines
This first surfaced when Thorsten Leemhuis built
tools/net/ynlagainst -next:Thx for the quick fix, this makes things work. In case anybody cares:
Tested-by Thorsten Leemhuis <[email protected]>
Thanks! Applied to nfsd-next.
Signature · 1 line
Chuck Lever
Jeff Layton
maintainerQuoted 12 lines · Chuck Lever
Quoted 11 lines · Thorsten Leemhuis
Quoted 10 lines · Chuck Lever
From: Chuck Lever <[email protected]>
The new get-reqs dump operations added to
sunrpc_cache.yamlandnfsd.yamlplace 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.
Quoted 10 lines
Quoted 6 lines
Quoted 2 lines
This first surfaced when Thorsten Leemhuis built
tools/net/ynlagainst -next:Thx for the quick fix, this makes things work. In case anybody cares:
Tested-by Thorsten Leemhuis <[email protected]>Thanks! Applied to nfsd-next.
Many thanks! I was just sitting down to look at Thorsten's mail.
Signature · 1 line
Jeff Layton <[email protected]>
Chuck Lever
maintainerQuoted 18 lines · Jeff Layton
Quoted 17 lines · Chuck Lever
Quoted 16 lines · Thorsten Leemhuis
Quoted 10 lines · Chuck Lever
From: Chuck Lever <[email protected]>
The new get-reqs dump operations added to
sunrpc_cache.yamlandnfsd.yamlplace 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.Quoted 2 lines
This first surfaced when Thorsten Leemhuis built
tools/net/ynlagainst -next:Thx for the quick fix, this makes things work. In case anybody cares:
Quoted 7 lines
Quoted 5 lines
Quoted 1 line
Tested-by Thorsten Leemhuis <[email protected]>Thanks! Applied to nfsd-next.
Many thanks! I was just sitting down to look at Thorsten's mail.
'Twas my own damn fault: it was a merge-resolution-gone-wrong.
Signature · 1 line
Chuck Lever