Commit 0319c026 authored by Geliang Tang's avatar Geliang Tang Committed by Geliang Tang
Browse files

net: mptcp: rename netlink handlers to mptcp_pm_nl_<blah>_{doit,dumpit} 

mainline inclusion
from mainline-v6.7-rc1
commit 1e07938e29c587eaae069f6c624daa4c2a56331c
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I9VYQ9
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=1e07938e29c587eaae069f6c624daa4c2a56331c

--------------------------------

so that they will match names generated from YAML spec.

Link: https://github.com/multipath-tcp/mptcp_net-next/issues/340


Suggested-by: default avatarPaolo Abeni <pabeni@redhat.com>
Acked-by: default avatarPaolo Abeni <pabeni@redhat.com>
Signed-off-by: default avatarDavide Caratti <dcaratti@redhat.com>
Signed-off-by: default avatarMat Martineau <martineau@kernel.org>
Link: https://lore.kernel.org/r/20231023-send-net-next-20231023-1-v2-6-16b1f701f900@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Reviewed-by: default avatarJackie Liu <liuyun01@kylinos.cn>
Signed-off-by: default avatarGeliang Tang <tanggeliang@kylinos.cn>
parent 607142f6

net/mptcp/pm_netlink.c

+24 −24
Original line number Diff line number Diff line
@@ -1355,7 +1355,7 @@ static bool mptcp_pm_has_addr_attr_id(const struct nlattr *attr, 
	return false;

}



static int mptcp_nl_cmd_add_addr(struct sk_buff *skb, struct genl_info *info)

static int mptcp_pm_nl_add_addr_doit(struct sk_buff *skb, struct genl_info *info)

{

	struct nlattr *attr = info->attrs[MPTCP_PM_ENDPOINT_ADDR];

	struct pm_nl_pernet *pernet = genl_info_pm_nl(info);
@@ -1537,7 +1537,7 @@ static int mptcp_nl_remove_id_zero_address(struct net *net, 
	return 0;

}



static int mptcp_nl_cmd_del_addr(struct sk_buff *skb, struct genl_info *info)

static int mptcp_pm_nl_del_addr_doit(struct sk_buff *skb, struct genl_info *info)

{

	struct nlattr *attr = info->attrs[MPTCP_PM_ENDPOINT_ADDR];

	struct pm_nl_pernet *pernet = genl_info_pm_nl(info);
@@ -1673,7 +1673,7 @@ static void __reset_counters(struct pm_nl_pernet *pernet) 
	pernet->addrs = 0;

}



static int mptcp_nl_cmd_flush_addrs(struct sk_buff *skb, struct genl_info *info)

static int mptcp_pm_nl_flush_addrs_doit(struct sk_buff *skb, struct genl_info *info)

{

	struct pm_nl_pernet *pernet = genl_info_pm_nl(info);

	LIST_HEAD(free_list);
@@ -1729,7 +1729,7 @@ static int mptcp_nl_fill_addr(struct sk_buff *skb, 
	return -EMSGSIZE;

}



static int mptcp_nl_cmd_get_addr(struct sk_buff *skb, struct genl_info *info)

static int mptcp_pm_nl_get_addr_doit(struct sk_buff *skb, struct genl_info *info)

{

	struct nlattr *attr = info->attrs[MPTCP_PM_ENDPOINT_ADDR];

	struct pm_nl_pernet *pernet = genl_info_pm_nl(info);
@@ -1779,7 +1779,7 @@ static int mptcp_nl_cmd_get_addr(struct sk_buff *skb, struct genl_info *info) 
	return ret;

}



static int mptcp_nl_cmd_dump_addrs(struct sk_buff *msg,

static int mptcp_pm_nl_get_addr_dumpit(struct sk_buff *msg,

				       struct netlink_callback *cb)

{

	struct net *net = sock_net(msg->sk);
@@ -1838,7 +1838,7 @@ static int parse_limit(struct genl_info *info, int id, unsigned int *limit) 
}



static int

mptcp_nl_cmd_set_limits(struct sk_buff *skb, struct genl_info *info)

mptcp_pm_nl_set_limits_doit(struct sk_buff *skb, struct genl_info *info)

{

	struct pm_nl_pernet *pernet = genl_info_pm_nl(info);

	unsigned int rcv_addrs, subflows;
@@ -1864,7 +1864,7 @@ mptcp_nl_cmd_set_limits(struct sk_buff *skb, struct genl_info *info) 
}



static int

mptcp_nl_cmd_get_limits(struct sk_buff *skb, struct genl_info *info)

mptcp_pm_nl_get_limits_doit(struct sk_buff *skb, struct genl_info *info)

{

	struct pm_nl_pernet *pernet = genl_info_pm_nl(info);

	struct sk_buff *msg;
@@ -1973,7 +1973,7 @@ int mptcp_pm_nl_set_flags(struct net *net, struct mptcp_pm_addr_entry *addr, u8 
	return 0;

}



static int mptcp_nl_cmd_set_flags(struct sk_buff *skb, struct genl_info *info)

static int mptcp_pm_nl_set_flags_doit(struct sk_buff *skb, struct genl_info *info)

{

	struct mptcp_pm_addr_entry remote = { .addr = { .family = AF_UNSPEC }, };

	struct mptcp_pm_addr_entry addr = { .addr = { .family = AF_UNSPEC }, };
@@ -2337,11 +2337,11 @@ void mptcp_event(enum mptcp_event_type type, const struct mptcp_sock *msk, 
	nlmsg_free(skb);

}



static const struct genl_ops mptcp_pm_ops[] = {

static const struct genl_ops mptcp_pm_nl_ops[] = {

	{

		.cmd		= MPTCP_PM_CMD_ADD_ADDR,

		.validate	= GENL_DONT_VALIDATE_STRICT,

		.doit		= mptcp_nl_cmd_add_addr,

		.doit		= mptcp_pm_nl_add_addr_doit,

		.policy		= mptcp_pm_endpoint_nl_policy,

		.maxattr	= MPTCP_PM_ENDPOINT_ADDR,

		.flags		= GENL_UNS_ADMIN_PERM,
@@ -2349,7 +2349,7 @@ static const struct genl_ops mptcp_pm_ops[] = { 
	{

		.cmd		= MPTCP_PM_CMD_DEL_ADDR,

		.validate	= GENL_DONT_VALIDATE_STRICT,

		.doit		= mptcp_nl_cmd_del_addr,

		.doit		= mptcp_pm_nl_del_addr_doit,

		.policy		= mptcp_pm_endpoint_nl_policy,

		.maxattr	= MPTCP_PM_ENDPOINT_ADDR,

		.flags		= GENL_UNS_ADMIN_PERM,
@@ -2357,8 +2357,8 @@ static const struct genl_ops mptcp_pm_ops[] = { 
	{

		.cmd		= MPTCP_PM_CMD_GET_ADDR,

		.validate	= GENL_DONT_VALIDATE_STRICT,

		.doit		= mptcp_nl_cmd_get_addr,

		.dumpit		= mptcp_nl_cmd_dump_addrs,

		.doit		= mptcp_pm_nl_get_addr_doit,

		.dumpit		= mptcp_pm_nl_get_addr_dumpit,

		.policy		= mptcp_pm_endpoint_nl_policy,

		.maxattr	= MPTCP_PM_ENDPOINT_ADDR,

		.flags		= GENL_UNS_ADMIN_PERM,
@@ -2366,7 +2366,7 @@ static const struct genl_ops mptcp_pm_ops[] = { 
	{

		.cmd		= MPTCP_PM_CMD_FLUSH_ADDRS,

		.validate	= GENL_DONT_VALIDATE_STRICT,

		.doit		= mptcp_nl_cmd_flush_addrs,

		.doit		= mptcp_pm_nl_flush_addrs_doit,

		.policy		= mptcp_pm_endpoint_nl_policy,

		.maxattr	= MPTCP_PM_ENDPOINT_ADDR,

		.flags		= GENL_UNS_ADMIN_PERM,
@@ -2374,7 +2374,7 @@ static const struct genl_ops mptcp_pm_ops[] = { 
	{

		.cmd		= MPTCP_PM_CMD_SET_LIMITS,

		.validate	= GENL_DONT_VALIDATE_STRICT,

		.doit		= mptcp_nl_cmd_set_limits,

		.doit		= mptcp_pm_nl_set_limits_doit,

		.policy		= mptcp_pm_set_limits_nl_policy,

		.maxattr	= MPTCP_PM_ATTR_SUBFLOWS,

		.flags		= GENL_UNS_ADMIN_PERM,
@@ -2382,14 +2382,14 @@ static const struct genl_ops mptcp_pm_ops[] = { 
	{

		.cmd		= MPTCP_PM_CMD_GET_LIMITS,

		.validate	= GENL_DONT_VALIDATE_STRICT,

		.doit		= mptcp_nl_cmd_get_limits,

		.doit		= mptcp_pm_nl_get_limits_doit,

		.policy		= mptcp_pm_set_limits_nl_policy,

		.maxattr	= MPTCP_PM_ATTR_SUBFLOWS,

	},

	{

		.cmd		= MPTCP_PM_CMD_SET_FLAGS,

		.validate	= GENL_DONT_VALIDATE_STRICT,

		.doit		= mptcp_nl_cmd_set_flags,

		.doit		= mptcp_pm_nl_set_flags_doit,

		.policy		= mptcp_pm_set_flags_nl_policy,

		.maxattr	= MPTCP_PM_ATTR_ADDR_REMOTE,

		.flags		= GENL_UNS_ADMIN_PERM,
@@ -2397,7 +2397,7 @@ static const struct genl_ops mptcp_pm_ops[] = { 
	{

		.cmd		= MPTCP_PM_CMD_ANNOUNCE,

		.validate	= GENL_DONT_VALIDATE_STRICT,

		.doit		= mptcp_nl_cmd_announce,

		.doit		= mptcp_pm_nl_announce_doit,

		.policy		= mptcp_pm_announce_nl_policy,

		.maxattr	= MPTCP_PM_ATTR_TOKEN,

		.flags		= GENL_UNS_ADMIN_PERM,
@@ -2405,7 +2405,7 @@ static const struct genl_ops mptcp_pm_ops[] = { 
	{

		.cmd		= MPTCP_PM_CMD_REMOVE,

		.validate	= GENL_DONT_VALIDATE_STRICT,

		.doit		= mptcp_nl_cmd_remove,

		.doit		= mptcp_pm_nl_remove_doit,

		.policy		= mptcp_pm_remove_nl_policy,

		.maxattr	= MPTCP_PM_ATTR_LOC_ID,

		.flags		= GENL_UNS_ADMIN_PERM,
@@ -2413,7 +2413,7 @@ static const struct genl_ops mptcp_pm_ops[] = { 
	{

		.cmd		= MPTCP_PM_CMD_SUBFLOW_CREATE,

		.validate	= GENL_DONT_VALIDATE_STRICT,

		.doit		= mptcp_nl_cmd_sf_create,

		.doit		= mptcp_pm_nl_subflow_create_doit,

		.policy		= mptcp_pm_subflow_create_nl_policy,

		.maxattr	= MPTCP_PM_ATTR_ADDR_REMOTE,

		.flags		= GENL_UNS_ADMIN_PERM,
@@ -2421,7 +2421,7 @@ static const struct genl_ops mptcp_pm_ops[] = { 
	{

		.cmd		= MPTCP_PM_CMD_SUBFLOW_DESTROY,

		.validate	= GENL_DONT_VALIDATE_STRICT,

		.doit		= mptcp_nl_cmd_sf_destroy,

		.doit		= mptcp_pm_nl_subflow_destroy_doit,

		.policy		= mptcp_pm_subflow_create_nl_policy,

		.maxattr	= MPTCP_PM_ATTR_ADDR_REMOTE,

		.flags		= GENL_UNS_ADMIN_PERM,
@@ -2433,8 +2433,8 @@ static struct genl_family mptcp_genl_family __ro_after_init = { 
	.version	= MPTCP_PM_VER,

	.netnsok	= true,

	.module		= THIS_MODULE,

	.ops		= mptcp_pm_ops,

	.n_ops		= ARRAY_SIZE(mptcp_pm_ops),

	.ops		= mptcp_pm_nl_ops,

	.n_ops		= ARRAY_SIZE(mptcp_pm_nl_ops),

	.resv_start_op	= MPTCP_PM_CMD_SUBFLOW_DESTROY + 1,

	.mcgrps		= mptcp_pm_mcgrps,

	.n_mcgrps	= ARRAY_SIZE(mptcp_pm_mcgrps),

net/mptcp/pm_userspace.c

+4 −4
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ int mptcp_userspace_pm_get_local_id(struct mptcp_sock *msk, 
	return mptcp_userspace_pm_append_new_local_addr(msk, &new_entry, true);

}



int mptcp_nl_cmd_announce(struct sk_buff *skb, struct genl_info *info)

int mptcp_pm_nl_announce_doit(struct sk_buff *skb, struct genl_info *info)

{

	struct nlattr *token = info->attrs[MPTCP_PM_ATTR_TOKEN];

	struct nlattr *addr = info->attrs[MPTCP_PM_ATTR_ADDR];
@@ -254,7 +254,7 @@ static int mptcp_userspace_pm_remove_id_zero_address(struct mptcp_sock *msk, 
	return err;

}



int mptcp_nl_cmd_remove(struct sk_buff *skb, struct genl_info *info)

int mptcp_pm_nl_remove_doit(struct sk_buff *skb, struct genl_info *info)

{

	struct nlattr *token = info->attrs[MPTCP_PM_ATTR_TOKEN];

	struct nlattr *id = info->attrs[MPTCP_PM_ATTR_LOC_ID];
@@ -321,7 +321,7 @@ int mptcp_nl_cmd_remove(struct sk_buff *skb, struct genl_info *info) 
	return err;

}



int mptcp_nl_cmd_sf_create(struct sk_buff *skb, struct genl_info *info)

int mptcp_pm_nl_subflow_create_doit(struct sk_buff *skb, struct genl_info *info)

{

	struct nlattr *raddr = info->attrs[MPTCP_PM_ATTR_ADDR_REMOTE];

	struct nlattr *token = info->attrs[MPTCP_PM_ATTR_TOKEN];
@@ -445,7 +445,7 @@ static struct sock *mptcp_nl_find_ssk(struct mptcp_sock *msk, 
	return NULL;

}



int mptcp_nl_cmd_sf_destroy(struct sk_buff *skb, struct genl_info *info)

int mptcp_pm_nl_subflow_destroy_doit(struct sk_buff *skb, struct genl_info *info)

{

	struct nlattr *raddr = info->attrs[MPTCP_PM_ATTR_ADDR_REMOTE];

	struct nlattr *token = info->attrs[MPTCP_PM_ATTR_TOKEN];

net/mptcp/protocol.h

+4 −4
Original line number Diff line number Diff line
@@ -927,10 +927,10 @@ void mptcp_pm_remove_addrs_and_subflows(struct mptcp_sock *msk, 
					struct list_head *rm_list);



void mptcp_free_local_addr_list(struct mptcp_sock *msk);

int mptcp_nl_cmd_announce(struct sk_buff *skb, struct genl_info *info);

int mptcp_nl_cmd_remove(struct sk_buff *skb, struct genl_info *info);

int mptcp_nl_cmd_sf_create(struct sk_buff *skb, struct genl_info *info);

int mptcp_nl_cmd_sf_destroy(struct sk_buff *skb, struct genl_info *info);

int mptcp_pm_nl_announce_doit(struct sk_buff *skb, struct genl_info *info);

int mptcp_pm_nl_remove_doit(struct sk_buff *skb, struct genl_info *info);

int mptcp_pm_nl_subflow_create_doit(struct sk_buff *skb, struct genl_info *info);

int mptcp_pm_nl_subflow_destroy_doit(struct sk_buff *skb, struct genl_info *info);



void mptcp_event(enum mptcp_event_type type, const struct mptcp_sock *msk,

		 const struct sock *ssk, gfp_t gfp);