Skip to content

Commit

Permalink
mptcp: convert netlink from small_ops to ops
Browse files Browse the repository at this point in the history 
this prepares MPTCP control plane to be described as YAML spec.

Link: multipath-tcp/mptcp_net-next#340
Signed-off-by: Davide Caratti <[email protected]>
  • Loading branch information
@dcaratti @intel-lab-lkp
dcaratti authored and intel-lab-lkp committed Jun 27, 2023
1 parent e7e88d6 commit 7b2cb79
Show file tree
Hide file tree
Showing 3 changed files with 131 additions and 72 deletions.
197 changes: 127 additions & 70 deletions net/mptcp/pm_netlink.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,46 @@ struct pm_nl_pernet {
#define MPTCP_PM_ADDR_MAX 8
#define ADD_ADDR_RETRANS_MAX 3

const struct nla_policy mptcp_pm_add_addr_nl_policy[MPTCP_PM_ADDR_ATTR_IF_IDX + 1] = {
[MPTCP_PM_ADDR_ATTR_FAMILY] = { .type = NLA_U16, },
[MPTCP_PM_ADDR_ATTR_ADDR4] = { .type = NLA_U32, },
[MPTCP_PM_ADDR_ATTR_ADDR6] = { .len = 16, },
[MPTCP_PM_ADDR_ATTR_ID] = { .type = NLA_U8, },
[MPTCP_PM_ADDR_ATTR_PORT] = { .type = NLA_U16, },
[MPTCP_PM_ADDR_ATTR_IF_IDX] = { .type = NLA_S32, },
[MPTCP_PM_ADDR_ATTR_FLAGS] = { .type = NLA_U32, },
};

/* MPTCP_PM_CMD_ADD_ADDR / DEL / GET / FLUSH - do */
static const struct nla_policy mptcp_pm_endpoint_nl_policy[MPTCP_PM_ATTR_ADDR + 1] = {
[MPTCP_PM_ATTR_ADDR] = NLA_POLICY_NESTED(mptcp_pm_add_addr_nl_policy),
};

/* MPTCP_PM_CMD_SET_LIMITS - do */
static const struct nla_policy mptcp_pm_set_limits_nl_policy[MPTCP_PM_ATTR_SUBFLOWS + 1] = {
[MPTCP_PM_ATTR_RCV_ADD_ADDRS] = { .type = NLA_U32, },
[MPTCP_PM_ATTR_SUBFLOWS] = { .type = NLA_U32, },
};

/* MPTCP_PM_CMD_ANNOUNCE - do */
static const struct nla_policy mptcp_pm_announce_nl_policy[MPTCP_PM_ATTR_TOKEN + 1] = {
[MPTCP_PM_ATTR_TOKEN] = { .type = NLA_U32, },
[MPTCP_PM_ATTR_ADDR] = NLA_POLICY_NESTED(mptcp_pm_add_addr_nl_policy),
};

/* MPTCP_PM_CMD_REMOVE - do */
static const struct nla_policy mptcp_pm_remove_nl_policy[MPTCP_PM_ATTR_LOC_ID + 1] = {
[MPTCP_PM_ATTR_TOKEN] = { .type = NLA_U32, },
[MPTCP_PM_ATTR_LOC_ID] = { .type = NLA_U8, },
};

/* MPTCP_PM_CMD_SUBFLOW_CREATE / DESTROY - do */
static const struct nla_policy mptcp_pm_subflow_create_nl_policy[MPTCP_PM_ATTR_ADDR_REMOTE + 1] = {
[MPTCP_PM_ATTR_ADDR_REMOTE] = NLA_POLICY_NESTED(mptcp_pm_add_addr_nl_policy),
[MPTCP_PM_ATTR_TOKEN] = { .type = NLA_U32, },
[MPTCP_PM_ATTR_ADDR] = NLA_POLICY_NESTED(mptcp_pm_add_addr_nl_policy),
};

static struct pm_nl_pernet *pm_nl_get_pernet(const struct net *net)
{
return net_generic(net, pm_nl_pernet_id);
Expand Down Expand Up @@ -1100,29 +1140,6 @@ static const struct genl_multicast_group mptcp_pm_mcgrps[] = {
},
};

static const struct nla_policy
mptcp_pm_addr_policy[MPTCP_PM_ADDR_ATTR_MAX + 1] = {
[MPTCP_PM_ADDR_ATTR_FAMILY] = { .type = NLA_U16, },
[MPTCP_PM_ADDR_ATTR_ID] = { .type = NLA_U8, },
[MPTCP_PM_ADDR_ATTR_ADDR4] = { .type = NLA_U32, },
[MPTCP_PM_ADDR_ATTR_ADDR6] =
NLA_POLICY_EXACT_LEN(sizeof(struct in6_addr)),
[MPTCP_PM_ADDR_ATTR_PORT] = { .type = NLA_U16 },
[MPTCP_PM_ADDR_ATTR_FLAGS] = { .type = NLA_U32 },
[MPTCP_PM_ADDR_ATTR_IF_IDX] = { .type = NLA_S32 },
};

static const struct nla_policy mptcp_pm_policy[MPTCP_PM_ATTR_MAX + 1] = {
[MPTCP_PM_ATTR_ADDR] =
NLA_POLICY_NESTED(mptcp_pm_addr_policy),
[MPTCP_PM_ATTR_RCV_ADD_ADDRS] = { .type = NLA_U32, },
[MPTCP_PM_ATTR_SUBFLOWS] = { .type = NLA_U32, },
[MPTCP_PM_ATTR_TOKEN] = { .type = NLA_U32, },
[MPTCP_PM_ATTR_LOC_ID] = { .type = NLA_U8, },
[MPTCP_PM_ATTR_ADDR_REMOTE] =
NLA_POLICY_NESTED(mptcp_pm_addr_policy),
};

void mptcp_pm_nl_subflow_chk_stale(const struct mptcp_sock *msk, struct sock *ssk)
{
struct mptcp_subflow_context *iter, *subflow = mptcp_subflow_ctx(ssk);
Expand Down Expand Up @@ -1172,6 +1189,7 @@ static int mptcp_pm_family_to_addr(int family)
static int mptcp_pm_parse_pm_addr_attr(struct nlattr *tb[],
const struct nlattr *attr,
struct genl_info *info,
const struct nla_policy *nla_policy,
struct mptcp_addr_info *addr,
bool require_family)
{
Expand All @@ -1184,7 +1202,7 @@ static int mptcp_pm_parse_pm_addr_attr(struct nlattr *tb[],

/* no validation needed - was already done via nested policy */
err = nla_parse_nested_deprecated(tb, MPTCP_PM_ADDR_ATTR_MAX, attr,
mptcp_pm_addr_policy, info->extack);
nla_policy, info->extack);
if (err)
return err;

Expand Down Expand Up @@ -1237,19 +1255,20 @@ int mptcp_pm_parse_addr(struct nlattr *attr, struct genl_info *info,

memset(addr, 0, sizeof(*addr));

return mptcp_pm_parse_pm_addr_attr(tb, attr, info, addr, true);
return mptcp_pm_parse_pm_addr_attr(tb, attr, info, mptcp_pm_add_addr_nl_policy, addr, true);
}

int mptcp_pm_parse_entry(struct nlattr *attr, struct genl_info *info,
bool require_family,
struct mptcp_pm_addr_entry *entry)
const struct nla_policy *nla_policy,
bool require_family, struct mptcp_pm_addr_entry *entry)
{
struct nlattr *tb[MPTCP_PM_ADDR_ATTR_MAX + 1];
int err;

memset(entry, 0, sizeof(*entry));

err = mptcp_pm_parse_pm_addr_attr(tb, attr, info, &entry->addr, require_family);
err = mptcp_pm_parse_pm_addr_attr(tb, attr, info, nla_policy,
&entry->addr, require_family);
if (err)
return err;

Expand Down Expand Up @@ -1306,7 +1325,7 @@ static int mptcp_nl_cmd_add_addr(struct sk_buff *skb, struct genl_info *info)
struct mptcp_pm_addr_entry addr, *entry;
int ret;

ret = mptcp_pm_parse_entry(attr, info, true, &addr);
ret = mptcp_pm_parse_entry(attr, info, mptcp_pm_add_addr_nl_policy, true, &addr);
if (ret < 0)
return ret;

Expand Down Expand Up @@ -1488,7 +1507,8 @@ static int mptcp_nl_cmd_del_addr(struct sk_buff *skb, struct genl_info *info)
unsigned int addr_max;
int ret;

ret = mptcp_pm_parse_entry(attr, info, false, &addr);
ret = mptcp_pm_parse_entry(attr, info, mptcp_pm_add_addr_nl_policy,
false, &addr);
if (ret < 0)
return ret;

Expand Down Expand Up @@ -1680,7 +1700,8 @@ static int mptcp_nl_cmd_get_addr(struct sk_buff *skb, struct genl_info *info)
void *reply;
int ret;

ret = mptcp_pm_parse_entry(attr, info, false, &addr);
ret = mptcp_pm_parse_entry(attr, info, mptcp_pm_add_addr_nl_policy,
false, &addr);
if (ret < 0)
return ret;

Expand Down Expand Up @@ -1926,12 +1947,15 @@ static int mptcp_nl_cmd_set_flags(struct sk_buff *skb, struct genl_info *info)
u8 bkup = 0;
int ret;

ret = mptcp_pm_parse_entry(attr, info, false, &addr);
ret = mptcp_pm_parse_entry(attr, info, mptcp_pm_add_addr_nl_policy,
false, &addr);
if (ret < 0)
return ret;

if (attr_rem) {
ret = mptcp_pm_parse_entry(attr_rem, info, false, &remote);
ret = mptcp_pm_parse_entry(attr_rem, info,
mptcp_pm_add_addr_nl_policy, false,
&remote);
if (ret < 0)
return ret;
}
Expand Down Expand Up @@ -2279,72 +2303,105 @@ void mptcp_event(enum mptcp_event_type type, const struct mptcp_sock *msk,
nlmsg_free(skb);
}

static const struct genl_small_ops mptcp_pm_ops[] = {

static const struct genl_ops mptcp_pm_ops[] = {
{
.cmd = MPTCP_PM_CMD_ADD_ADDR,
.doit = mptcp_nl_cmd_add_addr,
.flags = GENL_UNS_ADMIN_PERM,
.cmd = MPTCP_PM_CMD_ADD_ADDR,
.validate = GENL_DONT_VALIDATE_STRICT,
.doit = mptcp_nl_cmd_add_addr,
.policy = mptcp_pm_endpoint_nl_policy,
.maxattr = MPTCP_PM_ADDR_ATTR_IF_IDX,
.flags = GENL_UNS_ADMIN_PERM,
},
{
.cmd = MPTCP_PM_CMD_DEL_ADDR,
.doit = mptcp_nl_cmd_del_addr,
.flags = GENL_UNS_ADMIN_PERM,
.cmd = MPTCP_PM_CMD_DEL_ADDR,
.validate = GENL_DONT_VALIDATE_STRICT,
.doit = mptcp_nl_cmd_del_addr,
.policy = mptcp_pm_endpoint_nl_policy,
.maxattr = MPTCP_PM_ADDR_ATTR_IF_IDX,
.flags = GENL_UNS_ADMIN_PERM,
},
{
.cmd = MPTCP_PM_CMD_FLUSH_ADDRS,
.doit = mptcp_nl_cmd_flush_addrs,
.flags = GENL_UNS_ADMIN_PERM,
.cmd = MPTCP_PM_CMD_GET_ADDR,
.validate = GENL_DONT_VALIDATE_STRICT,
.doit = mptcp_nl_cmd_get_addr,
.dumpit = mptcp_nl_cmd_dump_addrs,
.policy = mptcp_pm_endpoint_nl_policy,
.maxattr = MPTCP_PM_ADDR_ATTR_IF_IDX,
.flags = GENL_UNS_ADMIN_PERM,
},
{
.cmd = MPTCP_PM_CMD_GET_ADDR,
.doit = mptcp_nl_cmd_get_addr,
.dumpit = mptcp_nl_cmd_dump_addrs,
.cmd = MPTCP_PM_CMD_FLUSH_ADDRS,
.validate = GENL_DONT_VALIDATE_STRICT,
.doit = mptcp_nl_cmd_flush_addrs,
.policy = mptcp_pm_endpoint_nl_policy,
.maxattr = MPTCP_PM_ADDR_ATTR_IF_IDX,
.flags = GENL_UNS_ADMIN_PERM,
},
{
.cmd = MPTCP_PM_CMD_SET_LIMITS,
.doit = mptcp_nl_cmd_set_limits,
.flags = GENL_UNS_ADMIN_PERM,
.cmd = MPTCP_PM_CMD_SET_LIMITS,
.validate = GENL_DONT_VALIDATE_STRICT,
.doit = mptcp_nl_cmd_set_limits,
.policy = mptcp_pm_set_limits_nl_policy,
.maxattr = MPTCP_PM_ATTR_SUBFLOWS,
.flags = GENL_UNS_ADMIN_PERM,
},
{
.cmd = MPTCP_PM_CMD_GET_LIMITS,
.doit = mptcp_nl_cmd_get_limits,
.cmd = MPTCP_PM_CMD_GET_LIMITS,
.validate = GENL_DONT_VALIDATE_STRICT,
.doit = mptcp_nl_cmd_get_limits,
.policy = mptcp_pm_set_limits_nl_policy,
.maxattr = MPTCP_PM_ATTR_SUBFLOWS,
},
{
.cmd = MPTCP_PM_CMD_SET_FLAGS,
.doit = mptcp_nl_cmd_set_flags,
.flags = GENL_UNS_ADMIN_PERM,
.cmd = MPTCP_PM_CMD_SET_FLAGS,
.validate = GENL_DONT_VALIDATE_STRICT,
.doit = mptcp_nl_cmd_set_flags,
.policy = mptcp_pm_endpoint_nl_policy,
.maxattr = MPTCP_PM_ADDR_ATTR_IF_IDX,
.flags = GENL_UNS_ADMIN_PERM,
},
{
.cmd = MPTCP_PM_CMD_ANNOUNCE,
.doit = mptcp_nl_cmd_announce,
.flags = GENL_UNS_ADMIN_PERM,
.cmd = MPTCP_PM_CMD_ANNOUNCE,
.validate = GENL_DONT_VALIDATE_STRICT,
.doit = mptcp_nl_cmd_announce,
.policy = mptcp_pm_announce_nl_policy,
.maxattr = MPTCP_PM_ATTR_TOKEN,
.flags = GENL_UNS_ADMIN_PERM,
},
{
.cmd = MPTCP_PM_CMD_REMOVE,
.doit = mptcp_nl_cmd_remove,
.flags = GENL_UNS_ADMIN_PERM,
.cmd = MPTCP_PM_CMD_REMOVE,
.validate = GENL_DONT_VALIDATE_STRICT,
.doit = mptcp_nl_cmd_remove,
.policy = mptcp_pm_remove_nl_policy,
.maxattr = MPTCP_PM_ATTR_LOC_ID,
.flags = GENL_UNS_ADMIN_PERM,
},
{
.cmd = MPTCP_PM_CMD_SUBFLOW_CREATE,
.doit = mptcp_nl_cmd_sf_create,
.flags = GENL_UNS_ADMIN_PERM,
.cmd = MPTCP_PM_CMD_SUBFLOW_CREATE,
.validate = GENL_DONT_VALIDATE_STRICT,
.doit = mptcp_nl_cmd_sf_create,
.policy = mptcp_pm_subflow_create_nl_policy,
.maxattr = MPTCP_PM_ATTR_ADDR_REMOTE,
.flags = GENL_UNS_ADMIN_PERM,
},
{
.cmd = MPTCP_PM_CMD_SUBFLOW_DESTROY,
.doit = mptcp_nl_cmd_sf_destroy,
.flags = GENL_UNS_ADMIN_PERM,
.cmd = MPTCP_PM_CMD_SUBFLOW_DESTROY,
.validate = GENL_DONT_VALIDATE_STRICT,
.doit = mptcp_nl_cmd_sf_destroy,
.policy = mptcp_pm_subflow_create_nl_policy,
.maxattr = MPTCP_PM_ATTR_ADDR_REMOTE,
.flags = GENL_UNS_ADMIN_PERM,
},
};

static struct genl_family mptcp_genl_family __ro_after_init = {
.name = MPTCP_PM_NAME,
.version = MPTCP_PM_VER,
.maxattr = MPTCP_PM_ATTR_MAX,
.policy = mptcp_pm_policy,
.netnsok = true,
.module = THIS_MODULE,
.small_ops = mptcp_pm_ops,
.n_small_ops = ARRAY_SIZE(mptcp_pm_ops),
.ops = mptcp_pm_ops,
.n_ops = ARRAY_SIZE(mptcp_pm_ops),
.resv_start_op = MPTCP_PM_CMD_SUBFLOW_DESTROY + 1,
.mcgrps = mptcp_pm_mcgrps,
.n_mcgrps = ARRAY_SIZE(mptcp_pm_mcgrps),
Expand Down
2 changes: 1 addition & 1 deletion net/mptcp/pm_userspace.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ int mptcp_nl_cmd_announce(struct sk_buff *skb, struct genl_info *info)
goto announce_err;
}

err = mptcp_pm_parse_entry(addr, info, true, &addr_val);
err = mptcp_pm_parse_entry(addr, info, mptcp_pm_add_addr_nl_policy, true, &addr_val);
if (err < 0) {
GENL_SET_ERR_MSG(info, "error parsing local address");
goto announce_err;
Expand Down
4 changes: 3 additions & 1 deletion net/mptcp/protocol.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -336,6 +336,8 @@ struct mptcp_sock {
#define mptcp_for_each_subflow_safe(__msk, __subflow, __tmp) \
list_for_each_entry_safe(__subflow, __tmp, &((__msk)->conn_list), node)

extern const struct nla_policy mptcp_pm_add_addr_nl_policy[];

static inline void msk_owned_by_me(const struct mptcp_sock *msk)
{
sock_owned_by_me((const struct sock *)msk);
Expand Down Expand Up @@ -800,7 +802,7 @@ void mptcp_pm_data_reset(struct mptcp_sock *msk);
int mptcp_pm_parse_addr(struct nlattr *attr, struct genl_info *info,
struct mptcp_addr_info *addr);
int mptcp_pm_parse_entry(struct nlattr *attr, struct genl_info *info,
bool require_family,
const struct nla_policy *nlap, bool require_family,
struct mptcp_pm_addr_entry *entry);
bool mptcp_pm_addr_families_match(const struct sock *sk,
const struct mptcp_addr_info *loc,
Expand Down

0 comments on commit 7b2cb79

Please sign in to comment.