Skip to content

Commit 0f9f696

Browse files
geliangtangkuba-moo
authored andcommitted
mptcp: add set_flags command in PM netlink
This patch added a new command MPTCP_PM_CMD_SET_FLAGS in PM netlink: In mptcp_nl_cmd_set_flags, parse the input address, get the backup value according to whether the address's FLAG_BACKUP flag is set from the user-space. Then check whether this address had been added in the local address list. If it had been, then call mptcp_nl_addr_backup to deal with this address. In mptcp_nl_addr_backup, traverse all the existing msk sockets to find the relevant sockets, and call mptcp_pm_nl_mp_prio_send_ack to send out a MP_PRIO ACK packet. Finally in mptcp_nl_cmd_set_flags, set or clear the address's FLAG_BACKUP flag. Signed-off-by: Geliang Tang <[email protected]> Signed-off-by: Mat Martineau <[email protected]> Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 40453a5 commit 0f9f696

File tree

2 files changed

+66
-0
lines changed

2 files changed

+66
-0
lines changed

include/uapi/linux/mptcp.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ enum {
8282
MPTCP_PM_CMD_FLUSH_ADDRS,
8383
MPTCP_PM_CMD_SET_LIMITS,
8484
MPTCP_PM_CMD_GET_LIMITS,
85+
MPTCP_PM_CMD_SET_FLAGS,
8586

8687
__MPTCP_PM_CMD_AFTER_LAST
8788
};

net/mptcp/pm_netlink.c

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1164,6 +1164,66 @@ mptcp_nl_cmd_get_limits(struct sk_buff *skb, struct genl_info *info)
11641164
return -EMSGSIZE;
11651165
}
11661166

1167+
static int mptcp_nl_addr_backup(struct net *net,
1168+
struct mptcp_addr_info *addr,
1169+
u8 bkup)
1170+
{
1171+
long s_slot = 0, s_num = 0;
1172+
struct mptcp_sock *msk;
1173+
int ret = -EINVAL;
1174+
1175+
while ((msk = mptcp_token_iter_next(net, &s_slot, &s_num)) != NULL) {
1176+
struct sock *sk = (struct sock *)msk;
1177+
1178+
if (list_empty(&msk->conn_list))
1179+
goto next;
1180+
1181+
lock_sock(sk);
1182+
spin_lock_bh(&msk->pm.lock);
1183+
ret = mptcp_pm_nl_mp_prio_send_ack(msk, addr, bkup);
1184+
spin_unlock_bh(&msk->pm.lock);
1185+
release_sock(sk);
1186+
1187+
next:
1188+
sock_put(sk);
1189+
cond_resched();
1190+
}
1191+
1192+
return ret;
1193+
}
1194+
1195+
static int mptcp_nl_cmd_set_flags(struct sk_buff *skb, struct genl_info *info)
1196+
{
1197+
struct nlattr *attr = info->attrs[MPTCP_PM_ATTR_ADDR];
1198+
struct pm_nl_pernet *pernet = genl_info_pm_nl(info);
1199+
struct mptcp_pm_addr_entry addr, *entry;
1200+
struct net *net = sock_net(skb->sk);
1201+
u8 bkup = 0;
1202+
int ret;
1203+
1204+
ret = mptcp_pm_parse_addr(attr, info, true, &addr);
1205+
if (ret < 0)
1206+
return ret;
1207+
1208+
if (addr.addr.flags & MPTCP_PM_ADDR_FLAG_BACKUP)
1209+
bkup = 1;
1210+
1211+
list_for_each_entry(entry, &pernet->local_addr_list, list) {
1212+
if (addresses_equal(&entry->addr, &addr.addr, true)) {
1213+
ret = mptcp_nl_addr_backup(net, &entry->addr, bkup);
1214+
if (ret)
1215+
return ret;
1216+
1217+
if (bkup)
1218+
entry->addr.flags |= MPTCP_PM_ADDR_FLAG_BACKUP;
1219+
else
1220+
entry->addr.flags &= ~MPTCP_PM_ADDR_FLAG_BACKUP;
1221+
}
1222+
}
1223+
1224+
return 0;
1225+
}
1226+
11671227
static const struct genl_small_ops mptcp_pm_ops[] = {
11681228
{
11691229
.cmd = MPTCP_PM_CMD_ADD_ADDR,
@@ -1194,6 +1254,11 @@ static const struct genl_small_ops mptcp_pm_ops[] = {
11941254
.cmd = MPTCP_PM_CMD_GET_LIMITS,
11951255
.doit = mptcp_nl_cmd_get_limits,
11961256
},
1257+
{
1258+
.cmd = MPTCP_PM_CMD_SET_FLAGS,
1259+
.doit = mptcp_nl_cmd_set_flags,
1260+
.flags = GENL_ADMIN_PERM,
1261+
},
11971262
};
11981263

11991264
static struct genl_family mptcp_genl_family __ro_after_init = {

0 commit comments

Comments
 (0)