p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

genetlink: use .start callback for dumppolicy 

The structure of ctrl_dumppolicy() is clearly split into
init and dumping. Move the init to a .start callback
for clarity, it's a more idiomatic netlink dump code structure.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Reviewed-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jakub Kicinski 2020-10-02 14:49:56 -07:00 committed by David S. Miller
parent adc848450f
commit 78ade619c1
1 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
net/netlink/genetlink.c
View File

@ -1107,35 +1107,31 @@ struct ctrl_dump_policy_ctx {
u16 fam_id; u16 fam_id;
}; };
static int ctrl_dumppolicy(struct sk_buff *skb, struct netlink_callback *cb) static int ctrl_dumppolicy_start(struct netlink_callback *cb)
{ {
struct ctrl_dump_policy_ctx *ctx = (void *)cb->ctx; struct ctrl_dump_policy_ctx *ctx = (void *)cb->ctx;
struct nlattr *tb[CTRL_ATTR_MAX + 1];
const struct genl_family *rt; const struct genl_family *rt;
int err; int err;
BUILD_BUG_ON(sizeof(*ctx) > sizeof(cb->ctx)); BUILD_BUG_ON(sizeof(*ctx) > sizeof(cb->ctx));
if (!ctx->fam_id) { err = genlmsg_parse(cb->nlh, &genl_ctrl, tb, genl_ctrl.maxattr,
struct nlattr *tb[CTRL_ATTR_MAX + 1]; genl_ctrl.policy, cb->extack);
if (err)
return err;
err = genlmsg_parse(cb->nlh, &genl_ctrl, tb, if (!tb[CTRL_ATTR_FAMILY_ID] && !tb[CTRL_ATTR_FAMILY_NAME])
genl_ctrl.maxattr, return -EINVAL;
genl_ctrl.policy, cb->extack);
if (err)
return err;
if (!tb[CTRL_ATTR_FAMILY_ID] && !tb[CTRL_ATTR_FAMILY_NAME]) if (tb[CTRL_ATTR_FAMILY_ID]) {
return -EINVAL; ctx->fam_id = nla_get_u16(tb[CTRL_ATTR_FAMILY_ID]);
} else {
if (tb[CTRL_ATTR_FAMILY_ID]) { rt = genl_family_find_byname(
ctx->fam_id = nla_get_u16(tb[CTRL_ATTR_FAMILY_ID]); nla_data(tb[CTRL_ATTR_FAMILY_NAME]));
} else { if (!rt)
rt = genl_family_find_byname( return -ENOENT;
nla_data(tb[CTRL_ATTR_FAMILY_NAME])); ctx->fam_id = rt->id;
if (!rt)
return -ENOENT;
ctx->fam_id = rt->id;
}
} }
rt = genl_family_find_byid(ctx->fam_id); rt = genl_family_find_byid(ctx->fam_id);
@ -1145,9 +1141,12 @@ static int ctrl_dumppolicy(struct sk_buff *skb, struct netlink_callback *cb)
if (!rt->policy) if (!rt->policy)
return -ENODATA; return -ENODATA;
err = netlink_policy_dump_start(rt->policy, rt->maxattr, &ctx->state); return netlink_policy_dump_start(rt->policy, rt->maxattr, &ctx->state);
if (err) }
return err;
static int ctrl_dumppolicy(struct sk_buff *skb, struct netlink_callback *cb)
{
struct ctrl_dump_policy_ctx *ctx = (void *)cb->ctx;
while (netlink_policy_dump_loop(ctx->state)) { while (netlink_policy_dump_loop(ctx->state)) {
void *hdr; void *hdr;
@ -1159,7 +1158,7 @@ static int ctrl_dumppolicy(struct sk_buff *skb, struct netlink_callback *cb)
if (!hdr) if (!hdr)
goto nla_put_failure; goto nla_put_failure;
if (nla_put_u16(skb, CTRL_ATTR_FAMILY_ID, rt->id)) if (nla_put_u16(skb, CTRL_ATTR_FAMILY_ID, ctx->fam_id))
goto nla_put_failure; goto nla_put_failure;
nest = nla_nest_start(skb, CTRL_ATTR_POLICY); nest = nla_nest_start(skb, CTRL_ATTR_POLICY);
@ -1199,6 +1198,7 @@ static const struct genl_ops genl_ctrl_ops[] = {
}, },
{ {
.cmd = CTRL_CMD_GETPOLICY, .cmd = CTRL_CMD_GETPOLICY,
.start = ctrl_dumppolicy_start,
.dumpit = ctrl_dumppolicy, .dumpit = ctrl_dumppolicy,
.done = ctrl_dumppolicy_done, .done = ctrl_dumppolicy_done,
}, },