MP_PRIO support
Subsystems (3)
Geliang Tang
v2 cover MP_PRIO support
v2:
- add set_flags command
v1:
- add MP_PRIO PM netlink support
Geliang Tang (6):
mptcp: add the outgoing MP_PRIO support
mptcp: add the incoming MP_PRIO support
mptcp: add set_flags command in PM netlink
selftests: mptcp: add set_flags command in pm_nl_ctl
mptcp: add the mibs for MP_PRIO
selftests: mptcp: add the MP_PRIO testcases
include/uapi/linux/mptcp.h | 2 + net/mptcp/mib.c | 2 + net/mptcp/mib.h | 2 + net/mptcp/options.c | 56 ++++++++++ net/mptcp/pm.c | 8 ++ net/mptcp/pm_netlink.c | 102 ++++++++++++++++++ net/mptcp/protocol.h | 13 ++- .../testing/selftests/net/mptcp/mptcp_join.sh | 72 ++++++++++++- tools/testing/selftests/net/mptcp/pm_nl_ctl.c | 87 ++++++++++++++- 9 files changed, 341 insertions(+), 3 deletions(-)
Signature · 1 line
2.26.2
Geliang Tang
PATCH v2 1/6 mptcp: add the outgoing MP_PRIO support
This patch added the outgoing MP_PRIO logic:
In mptcp_pm_nl_mp_prio_send_ack, find the related subflow and subsocket according to the input parameter addr. Save the input priority value to suflow's backup, then set subflow's send_mp_prio flag to true, and save the input priority value to suflow's request_bkup. Finally, send out a pure ACK on the related subsocket.
In mptcp_established_options_mp_prio, check whether the subflow's send_mp_prio is set. If it is, this is the packet for sending MP_PRIO. So save subflow->request_bkup value to mptcp_out_options's backup, and change the option type to OPTION_MPTCP_PRIO.
In mptcp_write_options, clear the send_mp_prio flag and send out the MP_PRIO suboption with mptcp_out_options's backup value.
--- net/mptcp/options.c | 40 ++++++++++++++++++++++++++++++++++++++++ net/mptcp/pm_netlink.c | 34 ++++++++++++++++++++++++++++++++++ net/mptcp/protocol.h | 8 +++++++- 3 files changed, 81 insertions(+), 1 deletion(-)
net/mptcp/options.c +40 -0
@@ -677,6 +677,28 @@ static bool mptcp_established_options_rm_addr(struct sock *sk,return true; } +static bool mptcp_established_options_mp_prio (struct sock *sk, +unsigned int *size, +unsigned int remaining, +struct mptcp_out_options *opts) +{ +struct mptcp_subflow_context *subflow =mptcp_subflow_ctx (sk); + +if (!subflow->send_mp_prio) +return false; + +if (remaining <TCPOLEN_MPTCP_PRIO ) +return false; + + *size =TCPOLEN_MPTCP_PRIO ; + opts->suboptions |=OPTION_MPTCP_PRIO ; + opts->backup = subflow->request_bkup; + +pr_debug ("prio=%d" , opts->backup); + +return true; +} +bool mptcp_established_options (struct sock *sk,struct sk_buff *skb,unsigned int *size,unsigned int remaining,struct mptcp_out_options *opts)
@@ -719,6 +741,12 @@ bool mptcp_established_options(struct sock *sk, struct sk_buff *skb, ret = true; } +if (mptcp_established_options_mp_prio (sk, &opt_size, remaining, opts)) { + *size += opt_size; + remaining -= opt_size; + ret = true; + } +return ret; }
@@ -1163,6 +1191,18 @@ void mptcp_write_options(__be32 *ptr, const struct tcp_sock *tp, 0, opts->rm_id); } +if (OPTION_MPTCP_PRIO & opts->suboptions) { +const struct sock *ssk = (const struct sock *)tp; +struct mptcp_subflow_context *subflow; + + subflow =mptcp_subflow_ctx (ssk); + subflow->send_mp_prio =0 ; + + *ptr++ =mptcp_option (MPTCPOPT_MP_PRIO , +TCPOLEN_MPTCP_PRIO , + opts->backup,TCPOPT_NOP ); + } +if (OPTION_MPTCP_MPJ_SYN & opts->suboptions) { *ptr++ = mptcp_option(MPTCPOPT_MP_JOIN, TCPOLEN_MPTCP_MPJ_SYN,
net/mptcp/pm_netlink.c +34 -0
@@ -442,6 +442,40 @@ void mptcp_pm_nl_add_addr_send_ack(struct mptcp_sock *msk) } } +int mptcp_pm_nl_mp_prio_send_ack (struct mptcp_sock *msk, +struct mptcp_addr_info *addr, +u8 bkup) +{ +struct mptcp_subflow_context *subflow; + +pr_debug ("bkup=%d" , bkup); + +mptcp_for_each_subflow (msk, subflow) { +struct sock *ssk =mptcp_subflow_tcp_sock (subflow); +struct sock *sk = (struct sock *)msk; +struct mptcp_addr_info local; + +local_address ((struct sock_common *)ssk, &local); +if (!addresses_equal (&local, addr, addr->port)) +continue ; + + subflow->backup = bkup; + subflow->send_mp_prio =1 ; + subflow->request_bkup = bkup; + +spin_unlock_bh (&msk->pm.lock); +pr_debug ("send ack for mp_prio" ); +lock_sock (ssk); +tcp_send_ack (ssk); +release_sock (ssk); +spin_lock_bh (&msk->pm.lock); + +return 0 ; + } + +return -EINVAL ; +} +void mptcp_pm_nl_rm_addr_received (struct mptcp_sock *msk) {struct mptcp_subflow_context *subflow, *tmp;
net/mptcp/protocol.h +7 -1
@@ -23,7 +23,8 @@#define OPTION_MPTCP_ADD_ADDR BIT(6)#define OPTION_MPTCP_ADD_ADDR6 BIT(7)#define OPTION_MPTCP_RM_ADDR BIT(8) -#define OPTION_MPTCP_FASTCLOSE BIT(9) +#define OPTION_MPTCP_PRIO BIT(9) +#define OPTION_MPTCP_FASTCLOSE BIT(10)/* MPTCP option subtypes */ #define MPTCPOPT_MP_CAPABLE 0
@@ -59,6 +60,7 @@#define TCPOLEN_MPTCP_ADD_ADDR6_BASE_PORT 24#define TCPOLEN_MPTCP_PORT_LEN 4#define TCPOLEN_MPTCP_RM_ADDR_BASE 4 +#define TCPOLEN_MPTCP_PRIO 4#define TCPOLEN_MPTCP_FASTCLOSE 12/* MPTCP MP_JOIN flags */
@@ -396,6 +398,7 @@ struct mptcp_subflow_context { map_valid : 1, mpc_map : 1, backup : 1, + send_mp_prio : 1, rx_eof : 1, can_ack : 1, /* only after processing the remote a key */ disposable : 1; /* ctx can be free at ulp release time */
@@ -550,6 +553,9 @@ void mptcp_pm_add_addr_received(struct mptcp_sock *msk, const struct mptcp_addr_info *addr);void mptcp_pm_add_addr_send_ack (struct mptcp_sock *msk);void mptcp_pm_rm_addr_received (struct mptcp_sock *msk,u8 rm_id); +int mptcp_pm_nl_mp_prio_send_ack (struct mptcp_sock *msk, +struct mptcp_addr_info *addr, +u8 bkup);void mptcp_pm_free_anno_list (struct mptcp_sock *msk);struct mptcp_pm_add_entry * mptcp_pm_del_add_timer(struct mptcp_sock *msk,
Signature · 1 line
2.26.2
Geliang Tang
PATCH v2 2/6 mptcp: add the incoming MP_PRIO support
This patch added the incoming MP_PRIO logic:
Added a flag named mp_prio in struct mptcp_options_received, to mark the MP_PRIO is received, and save the priority value to struct mptcp_options_received's backup member. Then invoke mptcp_pm_mp_prio_received with the receiving subsocket and the backup value.
In mptcp_pm_mp_prio_received, get the subflow context according the input subsocket, and change the subflow's backup as the incoming priority value.
--- net/mptcp/options.c | 15 +++++++++++++++ net/mptcp/pm.c | 8 ++++++++ net/mptcp/protocol.h | 5 +++++ 3 files changed, 28 insertions(+)
net/mptcp/options.c +15 -0
@@ -282,6 +282,15 @@ static void mptcp_parse_option(const struct sk_buff *skb,pr_debug ("RM_ADDR: id=%d" , mp_opt->rm_id);break ; +case MPTCPOPT_MP_PRIO : +if (opsize !=TCPOLEN_MPTCP_PRIO ) +break ; + + mp_opt->mp_prio =1 ; + mp_opt->backup = *ptr++ &MPTCP_PRIO_BKUP ; +pr_debug ("MP_PRIO: prio=%d" , mp_opt->backup); +break ; +case MPTCPOPT_MP_FASTCLOSE :if (opsize !=TCPOLEN_MPTCP_FASTCLOSE )break ;
@@ -313,6 +322,7 @@ void mptcp_get_options(const struct sk_buff *skb, mp_opt->port =0 ; mp_opt->rm_addr =0 ; mp_opt->dss =0 ; + mp_opt->mp_prio =0 ; length = (th->doff *4 ) -sizeof (struct tcphdr ); ptr = (const unsigned char *)(th +1 );
@@ -1017,6 +1027,11 @@ void mptcp_incoming_options(struct sock *sk, struct sk_buff *skb) mp_opt.rm_addr =0 ; } +if (mp_opt.mp_prio) { +mptcp_pm_mp_prio_received (sk, mp_opt.backup); + mp_opt.mp_prio =0 ; + } +if (!mp_opt.dss)return ;
net/mptcp/pm.c +8 -0
@@ -207,6 +207,14 @@ void mptcp_pm_rm_addr_received(struct mptcp_sock *msk, u8 rm_id)spin_unlock_bh (&pm->lock); } +void mptcp_pm_mp_prio_received (struct sock *sk,u8 bkup) +{ +struct mptcp_subflow_context *subflow =mptcp_subflow_ctx (sk); + +pr_debug ("subflow->backup=%d, bkup=%d\n" , subflow->backup, bkup); + subflow->backup = bkup; +} +/* path manager helpers */ bool mptcp_pm_add_addr_signal(struct mptcp_sock *msk, unsigned int remaining,
net/mptcp/protocol.h +5 -0
@@ -88,6 +88,9 @@#define MPTCP_ADDR_IPVERSION_4 4#define MPTCP_ADDR_IPVERSION_6 6 +/* MPTCP MP_PRIO flags */ +#define MPTCP_PRIO_BKUP BIT(0) +/* MPTCP socket flags */ #define MPTCP_DATA_READY 0#define MPTCP_NOSPACE 1
@@ -118,6 +121,7 @@ struct mptcp_options_received { dss : 1, add_addr : 1, rm_addr : 1, + mp_prio : 1, family : 4, echo : 1, backup : 1;
@@ -553,6 +557,7 @@ void mptcp_pm_add_addr_received(struct mptcp_sock *msk, const struct mptcp_addr_info *addr);void mptcp_pm_add_addr_send_ack (struct mptcp_sock *msk);void mptcp_pm_rm_addr_received (struct mptcp_sock *msk,u8 rm_id); +void mptcp_pm_mp_prio_received (struct sock *sk,u8 bkup);int mptcp_pm_nl_mp_prio_send_ack (struct mptcp_sock *msk,struct mptcp_addr_info *addr,u8 bkup);
Signature · 1 line
2.26.2
Geliang Tang
PATCH v2 3/6 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 or FLAG_NOBACKUP 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.
--- include/uapi/linux/mptcp.h | 2 ++ net/mptcp/pm_netlink.c | 67 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+)
include/uapi/linux/mptcp.h +2 -0
@@ -72,6 +72,7 @@ enum {#define MPTCP_PM_ADDR_FLAG_SIGNAL (1 << 0)#define MPTCP_PM_ADDR_FLAG_SUBFLOW (1 << 1)#define MPTCP_PM_ADDR_FLAG_BACKUP (1 << 2) +#define MPTCP_PM_ADDR_FLAG_NOBACKUP (1 << 3)enum {MPTCP_PM_CMD_UNSPEC ,
@@ -82,6 +83,7 @@ enum {MPTCP_PM_CMD_FLUSH_ADDRS ,MPTCP_PM_CMD_SET_LIMITS ,MPTCP_PM_CMD_GET_LIMITS , +MPTCP_PM_CMD_SET_FLAGS , __MPTCP_PM_CMD_AFTER_LAST };
net/mptcp/pm_netlink.c +67 -0
79 lines not on this page · raw message
Signature · 1 line
2.26.2
Geliang Tang
PATCH v2 4/6 selftests: mptcp: add set_flags command in pm_nl_ctl
This patch added the set_flags command in pm_nl_ctl, currently we can only set two flags: backup and nobackup. The set_flags command can be used like this:
# pm_nl_ctl set 10.0.0.1 flags backup # pm_nl_ctl set 10.0.0.1 flags nobackup
--- tools/testing/selftests/net/mptcp/pm_nl_ctl.c | 87 ++++++++++++++++++- 1 file changed, 86 insertions(+), 1 deletion(-)
tools/testing/selftests/net/mptcp/pm_nl_ctl.c +86 -1
@@ -24,10 +24,11 @@static void syntax (char *argv[]) { -fprintf (stderr,"%s add|get|del|flush|dump|accept [<args>]\n" , argv[0 ]); +fprintf (stderr,"%s add|get|set|del|flush|dump|accept [<args>]\n" , argv[0 ]);fprintf (stderr,"\tadd [flags signal|subflow|backup] [id <nr>] [dev <name>] <ip>\n" );fprintf (stderr,"\tdel <id>\n" );fprintf (stderr,"\tget <id>\n" ); +fprintf (stderr,"\tset <ip> [flags backup|nobackup]\n" );fprintf (stderr,"\tflush\n" );fprintf (stderr,"\tdump\n" );fprintf (stderr,"\tlimits [<rcv addr max> <subflow max>]\n" );
@@ -584,6 +585,88 @@ int get_set_limits(int fd, int pm_family, int argc, char *argv[])return 0 ; } +int set_flags (int fd,int pm_family,int argc,char *argv[]) +{ +char data[NLMSG_ALIGN (sizeof (struct nlmsghdr )) + +NLMSG_ALIGN (sizeof (struct genlmsghdr )) + +1024 ]; +struct rtattr *rta, *nest; +struct nlmsghdr *nh; +u_int32_t flags =0 ; +u_int16_t family; +int nest_start; +int off =0 ; +int arg; + +memset (data,0 ,sizeof (data)); + nh = (void *)data; + off =init_genl_req (data, pm_family,MPTCP_PM_CMD_SET_FLAGS , +MPTCP_PM_VER ); + +if (argc <3 ) +syntax (argv); + + nest_start = off; + nest = (void *)(data + off); + nest->rta_type =NLA_F_NESTED |MPTCP_PM_ATTR_ADDR ; + nest->rta_len =RTA_LENGTH (0 ); + off +=NLMSG_ALIGN (nest->rta_len); + +/* addr data */ + rta = (void *)(data + off); +if (inet_pton (AF_INET , argv[2 ],RTA_DATA (rta))) { + family =AF_INET ; + rta->rta_type =MPTCP_PM_ADDR_ATTR_ADDR4 ; + rta->rta_len =RTA_LENGTH (4 ); + }else if (inet_pton (AF_INET6 , argv[2 ],RTA_DATA (rta))) { + family =AF_INET6 ; + rta->rta_type =MPTCP_PM_ADDR_ATTR_ADDR6 ; + rta->rta_len =RTA_LENGTH (16 ); + }else +error (1 , errno,"can't parse ip %s" , argv[2 ]); + off +=NLMSG_ALIGN (rta->rta_len); + +/* family */ + rta = (void *)(data + off); + rta->rta_type =MPTCP_PM_ADDR_ATTR_FAMILY ; + rta->rta_len =RTA_LENGTH (2 ); +memcpy (RTA_DATA (rta), &family,2 ); + off +=NLMSG_ALIGN (rta->rta_len); + +for (arg =3 ; arg < argc; arg++) { +if (!strcmp (argv[arg],"flags" )) { +char *tok, *str; + +/* flags */ +if (++arg >= argc) +error (1 ,0 ," missing flags value" ); + +/* do not support flag list yet */ +for (str = argv[arg]; (tok =strtok (str,"," )); + str =NULL ) { +if (!strcmp (tok,"backup" )) + flags |=MPTCP_PM_ADDR_FLAG_BACKUP ; +else if (!strcmp (tok,"nobackup" )) + flags |=MPTCP_PM_ADDR_FLAG_NOBACKUP ; +else +error (1 , errno, +"unknown flag %s" , argv[arg]); + } + + rta = (void *)(data + off); + rta->rta_type =MPTCP_PM_ADDR_ATTR_FLAGS ; + rta->rta_len =RTA_LENGTH (4 ); +memcpy (RTA_DATA (rta), &flags,4 ); + off +=NLMSG_ALIGN (rta->rta_len); + }else +error (1 ,0 ,"unknown keyword %s" , argv[arg]); + } + nest->rta_len = off - nest_start; + +do_nl_req (fd, nh, off,0 ); +return 0 ; +} +int main (int argc,char *argv[]) {int fd, pm_family;
@@ -609,6 +692,8 @@ int main(int argc, char *argv[])return dump_addrs (fd, pm_family, argc, argv); else if (!strcmp(argv[1], "limits")) return get_set_limits(fd, pm_family, argc, argv); + else if (!strcmp(argv[1], "set")) + return set_flags(fd, pm_family, argc, argv);fprintf (stderr,"unknown sub-command: %s" , argv[1 ]);syntax (argv);
Signature · 1 line
2.26.2
Geliang Tang
PATCH v2 5/6 mptcp: add the mibs for MP_PRIO
This patch added the mibs for MP_PRIO, MPTCP_MIB_MPPRIOTX for transmitting of the MP_PRIO suboption, and MPTCP_MIB_MPPRIORX for receiving of it.
--- net/mptcp/mib.c | 2 ++ net/mptcp/mib.h | 2 ++ net/mptcp/options.c | 1 + net/mptcp/pm_netlink.c | 1 + 4 files changed, 6 insertions(+)
net/mptcp/mib.c +2 -0
@@ -31,6 +31,8 @@ static const struct snmp_mib mptcp_snmp_list[] = {SNMP_MIB_ITEM ("EchoAdd" ,MPTCP_MIB_ECHOADD ),SNMP_MIB_ITEM ("RmAddr" ,MPTCP_MIB_RMADDR ),SNMP_MIB_ITEM ("RmSubflow" ,MPTCP_MIB_RMSUBFLOW ), +SNMP_MIB_ITEM ("MPPrioTx" ,MPTCP_MIB_MPPRIOTX ), +SNMP_MIB_ITEM ("MPPrioRx" ,MPTCP_MIB_MPPRIORX ), SNMP_MIB_SENTINEL };
net/mptcp/mib.h +2 -0
@@ -24,6 +24,8 @@ enum linux_mptcp_mib_field {MPTCP_MIB_ECHOADD ,/* Received ADD_ADDR with echo-flag=1 */ MPTCP_MIB_RMADDR ,/* Received RM_ADDR */ MPTCP_MIB_RMSUBFLOW ,/* Remove a subflow */ +MPTCP_MIB_MPPRIOTX ,/* Transmit a MP_PRIO */ +MPTCP_MIB_MPPRIORX ,/* Received a MP_PRIO */ __MPTCP_MIB_MAX };
net/mptcp/options.c +1 -0
@@ -1029,6 +1029,7 @@ void mptcp_incoming_options(struct sock *sk, struct sk_buff *skb)if (mp_opt.mp_prio) {mptcp_pm_mp_prio_received (sk, mp_opt.backup); +MPTCP_INC_STATS (sock_net (sk),MPTCP_MIB_MPPRIORX ); mp_opt.mp_prio =0 ; }
net/mptcp/pm_netlink.c +1 -0
@@ -462,6 +462,7 @@ int mptcp_pm_nl_mp_prio_send_ack(struct mptcp_sock *msk, subflow->backup = bkup; subflow->send_mp_prio =1 ; subflow->request_bkup = bkup; +__MPTCP_INC_STATS (sock_net (sk),MPTCP_MIB_MPPRIOTX );spin_unlock_bh (&msk->pm.lock);pr_debug ("send ack for mp_prio" );
Signature · 1 line
2.26.2
Geliang Tang
PATCH v2 6/6 selftests: mptcp: add the MP_PRIO testcases
This patch added the MP_PRIO testcases:
Add a new argument bkup for run_tests and do_transfer, it can be set as "backup" or "nobackup", the default value is "".
Add a new function chk_prio_nr to check the MP_PRIO related MIB counters.
The output looks like this:
29 single subflow, backup syn[ ok ] - synack[ ok ] - ack[ ok ]
ptx[ ok ] - prx [ ok ]
30 single address, backup syn[ ok ] - synack[ ok ] - ack[ ok ]
add[ ok ] - echo [ ok ]
ptx[ ok ] - prx [ ok ]
--- .../testing/selftests/net/mptcp/mptcp_join.sh | 72 ++++++++++++++++++- 1 file changed, 71 insertions(+), 1 deletion(-)
tools/testing/selftests/net/mptcp/mptcp_join.sh +71 -1
@@ -212,6 +212,7 @@ do_transfer() rm_nr_ns1="$7" rm_nr_ns2="$8" speed="$9" + bkup="${10}" port=$((10000+$TEST_COUNT)) TEST_COUNT=$((TEST_COUNT+1))
@@ -297,6 +298,18 @@ do_transfer() fi fi + if [ ! -z $bkup ]; then + sleep 1 + for netns in "$ns1" "$ns2"; do + dump=(`ip netns exec $netns ./pm_nl_ctl dump`) + if [ ${#dump[@]} -gt 0 ]; then + addr=${dump[${#dump[@]} - 1]} + backup="ip netns exec $netns ./pm_nl_ctl set $addr flags $bkup" + $backup + fi + done + fi + wait $cpid retc=$? wait $spid
@@ -358,6 +371,7 @@ run_tests() rm_nr_ns1="${5:-0}" rm_nr_ns2="${6:-0}" speed="${7:-fast}" + bkup="${8:-""}" lret=0 oldin=""
@@ -372,7 +386,7 @@ run_tests() fi do_transfer ${listener_ns} ${connector_ns} MPTCP MPTCP ${connect_addr} \ - ${test_linkfail} ${rm_nr_ns1} ${rm_nr_ns2} ${speed} + ${test_linkfail} ${rm_nr_ns1} ${rm_nr_ns2} ${speed} ${bkup} lret=$? if [ "$test_linkfail" -eq 1 ];then
@@ -509,6 +523,43 @@ chk_rm_nr() fi } +chk_prio_nr() +{ + local mp_prio_nr_tx=$1 + local mp_prio_nr_rx=$2 + local count + local dump_stats + + printf "%-39s %s" " " "ptx" + count=`ip netns exec $ns1 nstat -as | grep MPTcpExtMPPrioTx | awk '{print $2}'` + [ -z "$count" ] && count=0 + if [ "$count" != "$mp_prio_nr_tx" ]; then + echo "[fail] got $count MP_PRIO[s] TX expected $mp_prio_nr_tx" + ret=1 + dump_stats=1 + else + echo -n "[ ok ]" + fi + + echo -n " - prx " + count=`ip netns exec $ns1 nstat -as | grep MPTcpExtMPPrioRx | awk '{print $2}'` + [ -z "$count" ] && count=0 + if [ "$count" != "$mp_prio_nr_rx" ]; then + echo "[fail] got $count MP_PRIO[s] RX expected $mp_prio_nr_rx" + ret=1 + dump_stats=1 + else + echo "[ ok ]" + fi + + if [ "${dump_stats}" = 1 ]; then + echo Server ns stats + ip netns exec $ns1 nstat -as | grep MPTcp + echo Client ns stats + ip netns exec $ns2 nstat -as | grep MPTcp + fi +} + sin=$(mktemp) sout=$(mktemp) cin=$(mktemp)
@@ -739,6 +790,25 @@ chk_join_nr "remove subflow and signal IPv6" 2 2 2 chk_add_nr 1 1 chk_rm_nr 1 1 +# single subflow, backup +reset +ip netns exec $ns1 ./pm_nl_ctl limits 0 1 +ip netns exec $ns2 ./pm_nl_ctl limits 0 1 +ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow,backup +run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow nobackup +chk_join_nr "single subflow, backup" 1 1 1 +chk_prio_nr 0 1 + +# single address, backup +reset +ip netns exec $ns1 ./pm_nl_ctl limits 0 1 +ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal +ip netns exec $ns2 ./pm_nl_ctl limits 1 1 +run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow backup +chk_join_nr "single address, backup" 1 1 1 +chk_add_nr 1 1 +chk_prio_nr 1 0 + # single subflow, syncookies reset_with_cookies ip netns exec $ns1 ./pm_nl_ctl limits 0 1
Signature · 1 line
2.26.2
Mat Martineau
[MPTCP] Re: [MPTCP][PATCH v2 mptcp-next 3/6] mptcp: add set_flags command in PM netlink
In reply to Geliang TangQuoted 26 lines · Geliang Tang
This patch added a new command
MPTCP_PM_CMD_SET_FLAGSin PM netlink:In
mptcp_nl_cmd_set_flags, parse the input address, get the backup value according to whether the address'sFLAG_BACKUPorFLAG_NOBACKUPflag is set from the user-space. Then check whether this address had been added in the local address list. If it had been, then callmptcp_nl_addr_backupto deal with this address.In
mptcp_nl_addr_backup, traverse all the existing msk sockets to find the relevant sockets, and callmptcp_pm_nl_mp_prio_send_ackto send out aMP_PRIOACK packet.Finally in
mptcp_nl_cmd_set_flags, set or clear the address'sFLAG_BACKUPflag.Signed-off-by Geliang Tang <geliangtang(a)gmail.com>---
include/uapi/linux/mptcp.h| 2 ++net/mptcp/pm_netlink.c| 67 ++++++++++++++++++++++++++++++++++++++2 files changed, 69 insertions(+)include/uapi/linux/mptcp.h +0
-0
include/uapi/linux/mptcp.h enum { · line 75
Quoted 4 lines
include/uapi/linux/mptcp.h +1
-0@@ -72,6 +72,7 @@ enum {#define MPTCP_PM_ADDR_FLAG_SIGNAL (1 << 0)#define MPTCP_PM_ADDR_FLAG_SUBFLOW (1 << 1)#define MPTCP_PM_ADDR_FLAG_BACKUP (1 << 2) +#define MPTCP_PM_ADDR_FLAG_NOBACKUP (1 << 3)
Hi Geliang -
My understanding of Paolo's suggestion was that 'nobackup' is helpful for the 'ip mptcp' command line syntax, but I don't think that means a separate flag at the netlink level is needed.
Mat
Quoted 98 lines
include/uapi/linux/mptcp.h +1
-0enum {MPTCP_PM_CMD_UNSPEC ,@@ -82,6 +83,7 @@ enum {MPTCP_PM_CMD_FLUSH_ADDRS ,MPTCP_PM_CMD_SET_LIMITS ,MPTCP_PM_CMD_GET_LIMITS , +MPTCP_PM_CMD_SET_FLAGS , __MPTCP_PM_CMD_AFTER_LAST };net/mptcp/pm_netlink.c +67
-0@@ -1153,6 +1153,68 @@ mptcp_nl_cmd_get_limits(struct sk_buff *skb, struct genl_info *info)return -EMSGSIZE ; } +static int mptcp_nl_addr_backup (struct net *net, +struct mptcp_addr_info *addr, +u8 bkup) +{ +long s_slot =0 , s_num =0 ; +struct mptcp_sock *msk; +int ret = -EINVAL ; + +while ((msk =mptcp_token_iter_next (net, &s_slot, &s_num)) !=NULL ) { +struct sock *sk = (struct sock *)msk; + +if (list_empty (&msk->conn_list)) + goto next; + +lock_sock (sk); +spin_lock_bh (&msk->pm.lock); + ret =mptcp_pm_nl_mp_prio_send_ack (msk, addr, bkup); +spin_unlock_bh (&msk->pm.lock); +release_sock (sk); + +next: +sock_put (sk); +cond_resched (); + } + +return ret; +} + +static int mptcp_nl_cmd_set_flags (struct sk_buff *skb,struct genl_info *info) +{ +struct nlattr *attr = info->attrs[MPTCP_PM_ATTR_ADDR ]; +struct pm_nl_pernet *pernet =genl_info_pm_nl (info); +struct mptcp_pm_addr_entry addr, *entry; +struct net *net =sock_net (skb->sk); +u8 bkup; +int ret; + + ret =mptcp_pm_parse_addr (attr, info, true, &addr); +if (ret <0 ) +return ret; + +if (addr.addr.flags &MPTCP_PM_ADDR_FLAG_BACKUP ) + bkup =1 ; +else if (addr.addr.flags &MPTCP_PM_ADDR_FLAG_NOBACKUP ) + bkup =0 ; + +list_for_each_entry (entry, &pernet->local_addr_list, list) { +if (addresses_equal (&entry->addr, &addr.addr, true)) { + ret =mptcp_nl_addr_backup (net, &entry->addr, bkup); +if (ret) +return ret; + +if (bkup) + entry->addr.flags |=MPTCP_PM_ADDR_FLAG_BACKUP ; +else + entry->addr.flags &= ~MPTCP_PM_ADDR_FLAG_BACKUP ; + } + } + +return 0 ; +} +static const struct genl_small_ops mptcp_pm_ops[] = { { .cmd =MPTCP_PM_CMD_ADD_ADDR ,@@ -1183,6 +1245,11 @@ static const struct genl_small_ops mptcp_pm_ops[] = { .cmd = MPTCP_PM_CMD_GET_LIMITS, .doit = mptcp_nl_cmd_get_limits, }, + { + .cmd = MPTCP_PM_CMD_SET_FLAGS, + .doit = mptcp_nl_cmd_set_flags, + .flags = GENL_ADMIN_PERM, + }, };static struct genl_family mptcp_genl_family__ro_after_init = {Signature · 1 line
2.26.2
--
Mat Martineau
Intel