niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

net: team: use policy generated by YAML spec

Browse source 
generated with:

 $ ./tools/net/ynl/ynl-gen-c.py --mode kernel \
 > --spec Documentation/netlink/specs/team.yaml --source \
 > -o drivers/net/team/team_nl.c
 $ ./tools/net/ynl/ynl-gen-c.py --mode kernel \
 > --spec Documentation/netlink/specs/team.yaml --header \
 > -o drivers/net/team/team_nl.h

The TEAM_ATTR_LIST_PORT in team_nl_policy is removed as it is only in the
port list reply attributes.

Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
Reviewed-by: Jiri Pirko <jiri@nvidia.com>
Link: https://lore.kernel.org/r/20240401031004.1159713-4-liuhangbin@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Hangbin Liu 2024-04-01 11:10:03 +08:00 • committed by Jakub Kicinski
parent a0393e3e3d
commit 948dbafc15
4 changed files with 98 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/net/team/Makefile
View file

@ -3,7 +3,7 @@
# Makefile for the network team driver # Makefile for the network team driver
# #
team-y:= team_core.o team-y:= team_core.o team_nl.o
obj-$(CONFIG_NET_TEAM) += team.o obj-$(CONFIG_NET_TEAM) += team.o
obj-$(CONFIG_NET_TEAM_MODE_BROADCAST) += team_mode_broadcast.o obj-$(CONFIG_NET_TEAM_MODE_BROADCAST) += team_mode_broadcast.o
obj-$(CONFIG_NET_TEAM_MODE_ROUNDROBIN) += team_mode_roundrobin.o obj-$(CONFIG_NET_TEAM_MODE_ROUNDROBIN) += team_mode_roundrobin.o

63
drivers/net/team/team_core.c
View file

@ -27,6 +27,8 @@
#include <net/sch_generic.h> #include <net/sch_generic.h>
#include <linux/if_team.h> #include <linux/if_team.h>
#include "team_nl.h"
#define DRV_NAME "team" #define DRV_NAME "team"
@ -2254,28 +2256,7 @@ static struct rtnl_link_ops team_link_ops __read_mostly = {
static struct genl_family team_nl_family; static struct genl_family team_nl_family;
static const struct nla_policy team_nl_policy[TEAM_ATTR_MAX + 1] = { int team_nl_noop_doit(struct sk_buff *skb, struct genl_info *info)
[TEAM_ATTR_UNSPEC] = { .type = NLA_UNSPEC, },
[TEAM_ATTR_TEAM_IFINDEX] = { .type = NLA_U32 },
[TEAM_ATTR_LIST_OPTION] = { .type = NLA_NESTED },
[TEAM_ATTR_LIST_PORT] = { .type = NLA_NESTED },
};
static const struct nla_policy
team_nl_option_policy[TEAM_ATTR_OPTION_MAX + 1] = {
[TEAM_ATTR_OPTION_UNSPEC] = { .type = NLA_UNSPEC, },
[TEAM_ATTR_OPTION_NAME] = {
.type = NLA_STRING,
.len = TEAM_STRING_MAX_LEN,
},
[TEAM_ATTR_OPTION_CHANGED] = { .type = NLA_FLAG },
[TEAM_ATTR_OPTION_TYPE] = { .type = NLA_U8 },
[TEAM_ATTR_OPTION_DATA] = { .type = NLA_BINARY },
[TEAM_ATTR_OPTION_PORT_IFINDEX] = { .type = NLA_U32 },
[TEAM_ATTR_OPTION_ARRAY_INDEX] = { .type = NLA_U32 },
};
static int team_nl_cmd_noop(struct sk_buff *skb, struct genl_info *info)
{ {
struct sk_buff *msg; struct sk_buff *msg;
void *hdr; void *hdr;
@ -2513,7 +2494,7 @@ errout:
return err; return err;
} }
static int team_nl_cmd_options_get(struct sk_buff *skb, struct genl_info *info) int team_nl_options_get_doit(struct sk_buff *skb, struct genl_info *info)
{ {
struct team *team; struct team *team;
struct team_option_inst *opt_inst; struct team_option_inst *opt_inst;
@ -2538,7 +2519,7 @@ static int team_nl_cmd_options_get(struct sk_buff *skb, struct genl_info *info)
static int team_nl_send_event_options_get(struct team *team, static int team_nl_send_event_options_get(struct team *team,
struct list_head *sel_opt_inst_list); struct list_head *sel_opt_inst_list);
static int team_nl_cmd_options_set(struct sk_buff *skb, struct genl_info *info) int team_nl_options_set_doit(struct sk_buff *skb, struct genl_info *info)
{ {
struct team *team; struct team *team;
int err = 0; int err = 0;
@ -2579,7 +2560,7 @@ static int team_nl_cmd_options_set(struct sk_buff *skb, struct genl_info *info)
err = nla_parse_nested_deprecated(opt_attrs, err = nla_parse_nested_deprecated(opt_attrs,
TEAM_ATTR_OPTION_MAX, TEAM_ATTR_OPTION_MAX,
nl_option, nl_option,
team_nl_option_policy, team_attr_option_nl_policy,
info->extack); info->extack);
if (err) if (err)
goto team_put; goto team_put;
@ -2802,8 +2783,8 @@ errout:
return err; return err;
} }
static int team_nl_cmd_port_list_get(struct sk_buff *skb, int team_nl_port_list_get_doit(struct sk_buff *skb,
struct genl_info *info) struct genl_info *info)
{ {
struct team *team; struct team *team;
int err; int err;
@ -2820,32 +2801,6 @@ static int team_nl_cmd_port_list_get(struct sk_buff *skb,
return err; return err;
} }
static const struct genl_small_ops team_nl_ops[] = {
{
.cmd = TEAM_CMD_NOOP,
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
.doit = team_nl_cmd_noop,
},
{
.cmd = TEAM_CMD_OPTIONS_SET,
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
.doit = team_nl_cmd_options_set,
.flags = GENL_ADMIN_PERM,
},
{
.cmd = TEAM_CMD_OPTIONS_GET,
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
.doit = team_nl_cmd_options_get,
.flags = GENL_ADMIN_PERM,
},
{
.cmd = TEAM_CMD_PORT_LIST_GET,
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
.doit = team_nl_cmd_port_list_get,
.flags = GENL_ADMIN_PERM,
},
};
static const struct genl_multicast_group team_nl_mcgrps[] = { static const struct genl_multicast_group team_nl_mcgrps[] = {
{ .name = TEAM_GENL_CHANGE_EVENT_MC_GRP_NAME, }, { .name = TEAM_GENL_CHANGE_EVENT_MC_GRP_NAME, },
}; };
@ -2853,7 +2808,7 @@ static const struct genl_multicast_group team_nl_mcgrps[] = {
static struct genl_family team_nl_family __ro_after_init = { static struct genl_family team_nl_family __ro_after_init = {
.name = TEAM_GENL_NAME, .name = TEAM_GENL_NAME,
.version = TEAM_GENL_VERSION, .version = TEAM_GENL_VERSION,
.maxattr = TEAM_ATTR_MAX, .maxattr = ARRAY_SIZE(team_nl_policy),
.policy = team_nl_policy, .policy = team_nl_policy,
.netnsok = true, .netnsok = true,
.module = THIS_MODULE, .module = THIS_MODULE,

59
drivers/net/team/team_nl.c Normal file
View file

@ -0,0 +1,59 @@
// SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause)
/* Do not edit directly, auto-generated from: */
/* Documentation/netlink/specs/team.yaml */
/* YNL-GEN kernel source */
#include <net/netlink.h>
#include <net/genetlink.h>
#include "team_nl.h"
#include <uapi/linux/if_team.h>
/* Common nested types */
const struct nla_policy team_attr_option_nl_policy[TEAM_ATTR_OPTION_ARRAY_INDEX + 1] = {
[TEAM_ATTR_OPTION_NAME] = { .type = NLA_STRING, .len = TEAM_STRING_MAX_LEN, },
[TEAM_ATTR_OPTION_CHANGED] = { .type = NLA_FLAG, },
[TEAM_ATTR_OPTION_TYPE] = { .type = NLA_U8, },
[TEAM_ATTR_OPTION_DATA] = { .type = NLA_BINARY, },
[TEAM_ATTR_OPTION_REMOVED] = { .type = NLA_FLAG, },
[TEAM_ATTR_OPTION_PORT_IFINDEX] = { .type = NLA_U32, },
[TEAM_ATTR_OPTION_ARRAY_INDEX] = { .type = NLA_U32, },
};
const struct nla_policy team_item_option_nl_policy[TEAM_ATTR_ITEM_OPTION + 1] = {
[TEAM_ATTR_ITEM_OPTION] = NLA_POLICY_NESTED(team_attr_option_nl_policy),
};
/* Global operation policy for team */
const struct nla_policy team_nl_policy[TEAM_ATTR_LIST_OPTION + 1] = {
[TEAM_ATTR_TEAM_IFINDEX] = { .type = NLA_U32, },
[TEAM_ATTR_LIST_OPTION] = NLA_POLICY_NESTED(team_item_option_nl_policy),
};
/* Ops table for team */
const struct genl_small_ops team_nl_ops[4] = {
{
.cmd = TEAM_CMD_NOOP,
.validate = GENL_DONT_VALIDATE_STRICT,
.doit = team_nl_noop_doit,
},
{
.cmd = TEAM_CMD_OPTIONS_SET,
.validate = GENL_DONT_VALIDATE_STRICT,
.doit = team_nl_options_set_doit,
.flags = GENL_ADMIN_PERM,
},
{
.cmd = TEAM_CMD_OPTIONS_GET,
.validate = GENL_DONT_VALIDATE_STRICT,
.doit = team_nl_options_get_doit,
.flags = GENL_ADMIN_PERM,
},
{
.cmd = TEAM_CMD_PORT_LIST_GET,
.validate = GENL_DONT_VALIDATE_STRICT,
.doit = team_nl_port_list_get_doit,
.flags = GENL_ADMIN_PERM,
},
};

29
drivers/net/team/team_nl.h Normal file
View file

@ -0,0 +1,29 @@
/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
/* Do not edit directly, auto-generated from: */
/* Documentation/netlink/specs/team.yaml */
/* YNL-GEN kernel header */
#ifndef _LINUX_TEAM_GEN_H
#define _LINUX_TEAM_GEN_H
#include <net/netlink.h>
#include <net/genetlink.h>
#include <uapi/linux/if_team.h>
/* Common nested types */
extern const struct nla_policy team_attr_option_nl_policy[TEAM_ATTR_OPTION_ARRAY_INDEX + 1];
extern const struct nla_policy team_item_option_nl_policy[TEAM_ATTR_ITEM_OPTION + 1];
/* Global operation policy for team */
extern const struct nla_policy team_nl_policy[TEAM_ATTR_LIST_OPTION + 1];
/* Ops table for team */
extern const struct genl_small_ops team_nl_ops[4];
int team_nl_noop_doit(struct sk_buff *skb, struct genl_info *info);
int team_nl_options_set_doit(struct sk_buff *skb, struct genl_info *info);
int team_nl_options_get_doit(struct sk_buff *skb, struct genl_info *info);
int team_nl_port_list_get_doit(struct sk_buff *skb, struct genl_info *info);
#endif /* _LINUX_TEAM_GEN_H */