ADD_ADDR: ports support
Subsystems (3)
Geliang Tang
cover ADD_ADDR: ports support
This series is the first version of ADD_ADDR ports support. I have solved the listener problem which I mentioned at the meeting on 15th of October by adding a new listening socket from the userspace (see patch 8). Up to now this patchset works well.
TODO:
I added 2 octets padding in ADD_ADDR port suboption for alignment. (see patch 1). We need to drop this padding.
Geliang Tang (8):
mptcp: add ADD_ADDR port support for writing options
mptcp: add the outgoing ADD_ADDR port support
mptcp: send out ack for ADD_ADDR with port
mptcp: add port argument for mptcp_pm_announce_addr
mptcp: add the incoming ADD_ADDR port support
mptcp: add ADD_ADDR port support for netlink
selftests: mptcp: add ADD_ADDR port support for pm_nl_ctl
selftests: mptcp: add testcases for ADD_ADDR with port
include/net/mptcp.h | 1 + net/mptcp/options.c | 80 +++++++++++++++---- net/mptcp/pm.c | 14 ++-- net/mptcp/pm_netlink.c | 28 +++++-- net/mptcp/protocol.h | 31 ++++--- .../testing/selftests/net/mptcp/mptcp_join.sh | 26 +++++- tools/testing/selftests/net/mptcp/pm_nl_ctl.c | 18 +++++ 7 files changed, 162 insertions(+), 36 deletions(-)
Signature · 1 line
2.26.2
Geliang Tang
PATCH 1/8 mptcp: add ADD_ADDR port support for writing options
This patch added ADD_ADDR port support for writing options.
In rfc8684, the length of ADD_ADDR suboption with IPv4 address and port is 18 octets:
1 2 3
0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+---------------+---------------+-------+-------+---------------+ | Kind | Length |Subtype|(rsv)|E| Address ID | +---------------+---------------+-------+-------+---------------+ | Address (IPv4: 4 octets / IPv6: 16 octets) | +-------------------------------+-------------------------------+ | Port (2 octets, optional) | | +-------------------------------+ | | Truncated HMAC (8 octets, if E=0) | | +-------------------------------+ | | +-------------------------------+
But mptcp_write_options is 32-bit aligned, so we need to pad it to 20 octets.
--- include/net/mptcp.h | 1 + net/mptcp/options.c | 64 +++++++++++++++++++++++++++++++++++++------- net/mptcp/protocol.h | 10 +++---- 3 files changed, 60 insertions(+), 15 deletions(-)
include/net/mptcp.h +1 -0
@@ -46,6 +46,7 @@ struct mptcp_out_options {#endif };u8 addr_id; +__be16 port;u64 ahmac;u8 rm_id;u8 join_id;
net/mptcp/options.c +54 -10
93 lines not on this page · raw message
net/mptcp/protocol.h +5 -5
@@ -49,14 +49,14 @@#define TCPOLEN_MPTCP_DSS_MAP64 14#define TCPOLEN_MPTCP_DSS_CHECKSUM 2#define TCPOLEN_MPTCP_ADD_ADDR 16 -#define TCPOLEN_MPTCP_ADD_ADDR_PORT 18 +#define TCPOLEN_MPTCP_ADD_ADDR_PORT 20#define TCPOLEN_MPTCP_ADD_ADDR_BASE 8 -#define TCPOLEN_MPTCP_ADD_ADDR_BASE_PORT 10 +#define TCPOLEN_MPTCP_ADD_ADDR_BASE_PORT 12#define TCPOLEN_MPTCP_ADD_ADDR6 28 -#define TCPOLEN_MPTCP_ADD_ADDR6_PORT 30 +#define TCPOLEN_MPTCP_ADD_ADDR6_PORT 32#define TCPOLEN_MPTCP_ADD_ADDR6_BASE 20 -#define TCPOLEN_MPTCP_ADD_ADDR6_BASE_PORT 22 -#define TCPOLEN_MPTCP_PORT_LEN 2 +#define TCPOLEN_MPTCP_ADD_ADDR6_BASE_PORT 24 +#define TCPOLEN_MPTCP_PORT_LEN 4#define TCPOLEN_MPTCP_RM_ADDR_BASE 4/* MPTCP MP_JOIN flags */
Signature · 1 line
2.26.2
Geliang Tang
PATCH 2/8 mptcp: add the outgoing ADD_ADDR port support
This patch added a new add_addr_signal type named MPTCP_ADD_ADDR_PORT, to identify this is an address with port.
It also added a new argument 'port' for both mptcp_add_addr_len and mptcp_pm_add_addr_signal.
--- net/mptcp/options.c | 10 +++++++--- net/mptcp/pm.c | 5 +++-- net/mptcp/protocol.h | 17 +++++++++++++++-- 3 files changed, 25 insertions(+), 7 deletions(-)
net/mptcp/options.c +7 -3
@@ -586,6 +586,7 @@ static bool mptcp_established_options_add_addr(struct sock *sk, struct sk_buff *unsigned int opt_size = *size;struct mptcp_addr_info saddr;bool echo; +bool port;int len; if (mptcp_pm_should_add_signal_ipv6(msk) &&
@@ -597,10 +598,10 @@ static bool mptcp_established_options_add_addr(struct sock *sk, struct sk_buff * }if (!mptcp_pm_should_add_signal (msk) || - !(mptcp_pm_add_addr_signal (msk, remaining, &saddr, &echo))) + !(mptcp_pm_add_addr_signal (msk, remaining, &saddr, &echo, &port)))return false; - len =mptcp_add_addr_len (saddr.family, echo); + len =mptcp_add_addr_len (saddr.family, echo, port);if (remaining < len)return false;
@@ -608,6 +609,8 @@ static bool mptcp_established_options_add_addr(struct sock *sk, struct sk_buff *if (drop_other_suboptions) *size -= opt_size; opts->addr_id = saddr.id; +if (port) + opts->port = saddr.port;if (saddr.family ==AF_INET ) { opts->suboptions |=OPTION_MPTCP_ADD_ADDR ; opts->addr = saddr.addr;
@@ -630,7 +633,8 @@ static bool mptcp_established_options_add_addr(struct sock *sk, struct sk_buff * } }#endif -pr_debug ("addr_id=%d, ahmac=%llu, echo=%d" , opts->addr_id, opts->ahmac, echo); +pr_debug ("addr_id=%d, ahmac=%llu, echo=%d, port=%d" , + opts->addr_id, opts->ahmac, echo,ntohs (opts->port));return true; }
net/mptcp/pm.c +3 -2
@@ -188,7 +188,7 @@ void mptcp_pm_rm_addr_received(struct mptcp_sock *msk, u8 rm_id)/* path manager helpers */ bool mptcp_pm_add_addr_signal (struct mptcp_sock *msk,unsigned int remaining, -struct mptcp_addr_info *saddr,bool *echo) +struct mptcp_addr_info *saddr,bool *echo,bool *port) {int ret = false;
@@ -199,8 +199,9 @@ bool mptcp_pm_add_addr_signal(struct mptcp_sock *msk, unsigned int remaining, goto out_unlock; *echo =mptcp_pm_should_add_signal_echo (msk); + *port =mptcp_pm_should_add_signal_port (msk); -if (remaining <mptcp_add_addr_len (msk->pm.local.family, *echo)) +if (remaining <mptcp_add_addr_len (msk->pm.local.family, *echo, *port)) goto out_unlock; *saddr = msk->pm.local;
net/mptcp/protocol.h +15 -2
@@ -171,6 +171,7 @@ enum mptcp_add_addr_status {MPTCP_ADD_ADDR_SIGNAL ,MPTCP_ADD_ADDR_ECHO ,MPTCP_ADD_ADDR_IPV6 , + MPTCP_ADD_ADDR_PORT, }; struct mptcp_pm_data {
@@ -539,13 +540,25 @@ static inline bool mptcp_pm_should_add_signal_ipv6(struct mptcp_sock *msk)return READ_ONCE (msk->pm.add_addr_signal) &BIT (MPTCP_ADD_ADDR_IPV6 ); } +static inline bool mptcp_pm_should_add_signal_port (struct mptcp_sock *msk) +{ +return READ_ONCE (msk->pm.add_addr_signal) &BIT (MPTCP_ADD_ADDR_PORT ); +} +static inline bool mptcp_pm_should_rm_signal (struct mptcp_sock *msk) {return READ_ONCE (msk->pm.rm_addr_signal); } -static inline unsigned int mptcp_add_addr_len (int family,bool echo) +static inline unsigned int mptcp_add_addr_len (int family,bool echo,bool port) { +if (port) { +if (family ==AF_INET ) +return echo ?TCPOLEN_MPTCP_ADD_ADDR_BASE_PORT + :TCPOLEN_MPTCP_ADD_ADDR_PORT ; +return echo ?TCPOLEN_MPTCP_ADD_ADDR6_BASE_PORT :TCPOLEN_MPTCP_ADD_ADDR6_PORT ; + } +if (family ==AF_INET )return echo ?TCPOLEN_MPTCP_ADD_ADDR_BASE :TCPOLEN_MPTCP_ADD_ADDR ;
@@ -553,7 +566,7 @@ static inline unsigned int mptcp_add_addr_len(int family, bool echo) }bool mptcp_pm_add_addr_signal (struct mptcp_sock *msk,unsigned int remaining, -struct mptcp_addr_info *saddr,bool *echo); +struct mptcp_addr_info *saddr,bool *echo,bool *port);bool mptcp_pm_rm_addr_signal (struct mptcp_sock *msk,unsigned int remaining,u8 *rm_id);int mptcp_pm_get_local_id (struct mptcp_sock *msk,struct sock_common *skc);
Signature · 1 line
2.26.2
Geliang Tang
PATCH 3/8 mptcp: send out ack for ADD_ADDR with port
Like ADD_ADDR IPv6, this patch also sent out a pure ack for ADD_ADDR with port.
--- net/mptcp/options.c | 3 ++- net/mptcp/pm.c | 3 ++- net/mptcp/pm_netlink.c | 14 +++++++++++--- 3 files changed, 15 insertions(+), 5 deletions(-)
net/mptcp/options.c +2 -1
@@ -589,7 +589,8 @@ static bool mptcp_established_options_add_addr(struct sock *sk, struct sk_buff *bool port;int len; -if (mptcp_pm_should_add_signal_ipv6 (msk) && +if ((mptcp_pm_should_add_signal_ipv6 (msk) || +mptcp_pm_should_add_signal_port (msk)) && skb &&skb_is_tcp_pure_ack (skb)) {pr_debug ("drop other suboptions" ); opts->suboptions =0 ;
net/mptcp/pm.c +2 -1
@@ -167,7 +167,8 @@ void mptcp_pm_add_addr_received(struct mptcp_sock *msk,void mptcp_pm_add_addr_send_ack (struct mptcp_sock *msk) { -if (!mptcp_pm_should_add_signal_ipv6 (msk)) +if (!mptcp_pm_should_add_signal_ipv6 (msk) && + !mptcp_pm_should_add_signal_port (msk))return ;mptcp_pm_schedule_work (msk,MPTCP_PM_ADD_ADDR_SEND_ACK );
net/mptcp/pm_netlink.c +11 -3
@@ -408,7 +408,8 @@ void mptcp_pm_nl_add_addr_send_ack(struct mptcp_sock *msk) {struct mptcp_subflow_context *subflow; -if (!mptcp_pm_should_add_signal_ipv6 (msk)) +if (!mptcp_pm_should_add_signal_ipv6 (msk) && + !mptcp_pm_should_add_signal_port (msk))return ;__mptcp_flush_join_list (msk);
@@ -418,14 +419,21 @@ void mptcp_pm_nl_add_addr_send_ack(struct mptcp_sock *msk)u8 add_addr;spin_unlock_bh (&msk->pm.lock); -pr_debug ("send ack for add_addr6" ); +if (mptcp_pm_should_add_signal_ipv6 (msk)) +pr_debug ("send ack for add_addr6" ); +if (mptcp_pm_should_add_signal_port (msk)) +pr_debug ("send ack for add_addr_port" ); +lock_sock (ssk);tcp_send_ack (ssk);release_sock (ssk);spin_lock_bh (&msk->pm.lock); add_addr =READ_ONCE (msk->pm.add_addr_signal); - add_addr &= ~BIT (MPTCP_ADD_ADDR_IPV6 ); +if (mptcp_pm_should_add_signal_ipv6 (msk)) + add_addr &= ~BIT (MPTCP_ADD_ADDR_IPV6 ); +if (mptcp_pm_should_add_signal_port (msk)) + add_addr &= ~BIT (MPTCP_ADD_ADDR_PORT );WRITE_ONCE (msk->pm.add_addr_signal, add_addr); } }
Signature · 1 line
2.26.2
Geliang Tang
PATCH 4/8 mptcp: add port argument for mptcp_pm_announce_addr
This patch added a new argument 'port' for mptcp_pm_announce_addr. If this argument is true, we set the MPTCP_ADD_ADDR_PORT bit.
--- net/mptcp/pm.c | 6 ++++-- net/mptcp/pm_netlink.c | 9 ++++++--- net/mptcp/protocol.h | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-)
net/mptcp/pm.c +4 -2
@@ -14,7 +14,7 @@int mptcp_pm_announce_addr (struct mptcp_sock *msk,const struct mptcp_addr_info *addr, -bool echo) +bool echo,bool port) {u8 add_addr =READ_ONCE (msk->pm.add_addr_signal);
@@ -26,6 +26,8 @@ int mptcp_pm_announce_addr(struct mptcp_sock *msk, add_addr |=BIT (MPTCP_ADD_ADDR_ECHO );if (addr->family ==AF_INET6 ) add_addr |=BIT (MPTCP_ADD_ADDR_IPV6 ); +if (port) + add_addr |=BIT (MPTCP_ADD_ADDR_PORT );WRITE_ONCE (msk->pm.add_addr_signal, add_addr);return 0 ; }
@@ -156,7 +158,7 @@ void mptcp_pm_add_addr_received(struct mptcp_sock *msk,spin_lock_bh (&pm->lock);if (!READ_ONCE (pm->accept_addr)) { -mptcp_pm_announce_addr (msk, addr, true); +mptcp_pm_announce_addr (msk, addr, true, addr->port);mptcp_pm_add_addr_send_ack (msk); }else if (mptcp_pm_schedule_work (msk,MPTCP_PM_ADD_ADDR_RECEIVED )) { pm->remote = *addr;
net/mptcp/pm_netlink.c +6 -3
@@ -228,7 +228,7 @@ static void mptcp_pm_add_timer(struct timer_list *timer)if (!mptcp_pm_should_add_signal (msk)) {pr_debug ("retransmit ADD_ADDR id=%d" , entry->addr.id); -mptcp_pm_announce_addr (msk, &entry->addr, false); +mptcp_pm_announce_addr (msk, &entry->addr, false, entry->addr.port);mptcp_pm_add_addr_send_ack (msk); entry->retrans_times++; }
@@ -329,7 +329,7 @@ static void mptcp_pm_create_subflow_or_signal_addr(struct mptcp_sock *msk)if (local) {if (mptcp_pm_alloc_anno_list (msk, local)) { msk->pm.add_addr_signaled++; -mptcp_pm_announce_addr (msk, &local->addr, false); +mptcp_pm_announce_addr (msk, &local->addr, false, local->addr.port);mptcp_pm_nl_add_addr_send_ack (msk); } }else {
@@ -377,6 +377,7 @@ void mptcp_pm_nl_add_addr_received(struct mptcp_sock *msk)struct sock *sk = (struct sock *)msk;struct mptcp_addr_info remote;struct mptcp_addr_info local; +bool use_port = false; pr_debug("accepted %d:%d remote family %d", msk->pm.add_addr_accepted, msk->pm.add_addr_accept_max,
@@ -393,6 +394,8 @@ void mptcp_pm_nl_add_addr_received(struct mptcp_sock *msk) remote = msk->pm.remote;if (!remote.port) remote.port = sk->sk_dport; +else + use_port = true;memset (&local,0 ,sizeof (local)); local.family = remote.family;
@@ -400,7 +403,7 @@ void mptcp_pm_nl_add_addr_received(struct mptcp_sock *msk)__mptcp_subflow_connect ((struct sock *)msk, &local, &remote);spin_lock_bh (&msk->pm.lock); -mptcp_pm_announce_addr (msk, &remote, true); +mptcp_pm_announce_addr (msk, &remote, true, use_port);mptcp_pm_nl_add_addr_send_ack (msk); }
net/mptcp/protocol.h +1 -1
@@ -521,7 +521,7 @@ mptcp_pm_del_add_timer(struct mptcp_sock *msk,int mptcp_pm_announce_addr (struct mptcp_sock *msk,const struct mptcp_addr_info *addr, -bool echo); +bool echo,bool port);int mptcp_pm_remove_addr (struct mptcp_sock *msk,u8 local_id);int mptcp_pm_remove_subflow (struct mptcp_sock *msk,u8 local_id);
Signature · 1 line
2.26.2
Geliang Tang
PATCH 5/8 mptcp: add the incoming ADD_ADDR port support
The port field in mptcp_options_received should be big-endian, since we use the following assignment statement in mptcp_parse_option:
mp_opt->port = get_unaligned_be16(ptr);
And the addr.port is also big-endian, so we need to drop htons in mptcp_incoming_options.
--- net/mptcp/options.c | 3 ++- net/mptcp/protocol.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)
net/mptcp/options.c +2 -1
@@ -269,6 +269,7 @@ static void mptcp_parse_option(const struct sk_buff *skb, mp_opt->ahmac =get_unaligned_be64 (ptr); ptr +=8 ; } +pr_debug ("port=%d, ahmac=%llu" ,ntohs (mp_opt->port), mp_opt->ahmac);break ;case MPTCPOPT_RM_ADDR :
@@ -936,7 +937,7 @@ void mptcp_incoming_options(struct sock *sk, struct sk_buff *skb)if (mp_opt.add_addr &&add_addr_hmac_valid (msk, &mp_opt)) {struct mptcp_addr_info addr; - addr.port =htons (mp_opt.port); + addr.port = mp_opt.port; addr.id = mp_opt.addr_id;if (mp_opt.family ==MPTCP_ADDR_IPVERSION_4 ) { addr.family =AF_INET ;
net/mptcp/protocol.h +1 -1
@@ -136,7 +136,7 @@ struct mptcp_options_received {#endif };u64 ahmac; -u16 port; +__be16 port; };static inline __be32 mptcp_option (u8 subopt,u8 len,u8 nib,u8 field)
Signature · 1 line
2.26.2
Geliang Tang
PATCH 6/8 mptcp: add ADD_ADDR port support for netlink
This patch added ADD_ADDR port support for netlink.
--- net/mptcp/pm_netlink.c | 5 +++++ 1 file changed, 5 insertions(+)
net/mptcp/pm_netlink.c +5 -0
@@ -725,6 +725,9 @@ static int mptcp_pm_parse_addr(struct nlattr *attr, struct genl_info *info,if (tb[MPTCP_PM_ADDR_ATTR_FLAGS ]) entry->addr.flags =nla_get_u32 (tb[MPTCP_PM_ADDR_ATTR_FLAGS ]); +if (tb[MPTCP_PM_ADDR_ATTR_PORT ]) + entry->addr.port =htons (nla_get_u16 (tb[MPTCP_PM_ADDR_ATTR_PORT ])); +return 0 ; }
@@ -911,6 +914,8 @@ static int mptcp_nl_fill_addr(struct sk_buff *skb,if (nla_put_u16 (skb,MPTCP_PM_ADDR_ATTR_FAMILY , addr->family)) goto nla_put_failure; +if (nla_put_u16 (skb,MPTCP_PM_ADDR_ATTR_PORT ,ntohs (addr->port))) + goto nla_put_failure;if (nla_put_u8 (skb,MPTCP_PM_ADDR_ATTR_ID , addr->id)) goto nla_put_failure;if (nla_put_u32 (skb,MPTCP_PM_ADDR_ATTR_FLAGS , entry->addr.flags))
Signature · 1 line
2.26.2
Geliang Tang
PATCH 7/8 selftests: mptcp: add ADD_ADDR port support for pm_nl_ctl
This patch added ADD_ADDR port support for pm_nl_ctl.
--- tools/testing/selftests/net/mptcp/pm_nl_ctl.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
tools/testing/selftests/net/mptcp/pm_nl_ctl.c +18 -0
@@ -178,6 +178,7 @@ int add_addr(int fd, int pm_family, int argc, char *argv[])struct nlmsghdr *nh;u_int16_t family;u_int32_t flags; +u_int16_t port;int nest_start;u_int8_t id;int off =0 ;
@@ -271,6 +272,16 @@ int add_addr(int fd, int pm_family, int argc, char *argv[]) rta->rta_len =RTA_LENGTH (4 );memcpy (RTA_DATA (rta), &ifindex,4 ); off +=NLMSG_ALIGN (rta->rta_len); + }else if (!strcmp (argv[arg],"port" )) { +if (++arg >= argc) +error (1 ,0 ," missing port value" ); + + port =atoi (argv[arg]); + rta = (void *)(data + off); + rta->rta_type =MPTCP_PM_ADDR_ATTR_PORT ; + rta->rta_len =RTA_LENGTH (2 ); +memcpy (RTA_DATA (rta), &port,2 ); + off +=NLMSG_ALIGN (rta->rta_len); }else error (1 ,0 ,"unknown keyword %s" , argv[arg]); }
@@ -323,6 +334,7 @@ int del_addr(int fd, int pm_family, int argc, char *argv[])static void print_addr (struct rtattr *attrs,int len) {uint16_t family =0 ; +uint16_t port =0 ;char str[1024 ];uint32_t flags;uint8_t id;
@@ -330,12 +342,16 @@ static void print_addr(struct rtattr *attrs, int len)while (RTA_OK (attrs, len)) {if (attrs->rta_type ==MPTCP_PM_ADDR_ATTR_FAMILY )memcpy (&family,RTA_DATA (attrs),2 ); +if (attrs->rta_type ==MPTCP_PM_ADDR_ATTR_PORT ) +memcpy (&port,RTA_DATA (attrs),2 );if (attrs->rta_type ==MPTCP_PM_ADDR_ATTR_ADDR4 ) {if (family !=AF_INET )error (1 , errno,"wrong IP (v4) for family %d" , family);inet_ntop (AF_INET ,RTA_DATA (attrs), str,sizeof (str));printf ("%s" , str); +if (port) +printf (" %d" , port); }if (attrs->rta_type ==MPTCP_PM_ADDR_ATTR_ADDR6 ) {if (family !=AF_INET6 )
@@ -343,6 +359,8 @@ static void print_addr(struct rtattr *attrs, int len) family);inet_ntop (AF_INET6 ,RTA_DATA (attrs), str,sizeof (str));printf ("%s" , str); +if (port) +printf (" %d" , port); }if (attrs->rta_type ==MPTCP_PM_ADDR_ATTR_ID ) {memcpy (&id,RTA_DATA (attrs),1 );
Signature · 1 line
2.26.2
Geliang Tang
PATCH 8/8 selftests: mptcp: add testcases for ADD_ADDR with port
This patch added testcases for ADD_ADDR with port.
--- .../testing/selftests/net/mptcp/mptcp_join.sh | 26 ++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-)
tools/testing/selftests/net/mptcp/mptcp_join.sh +25 -1
@@ -212,6 +212,7 @@ do_transfer() rm_nr_ns1="$7" rm_nr_ns2="$8" speed="$9" + with_port="${10}" port=$((10000+$TEST_COUNT)) TEST_COUNT=$((TEST_COUNT+1))
@@ -253,6 +254,11 @@ do_transfer() -s ${srv_proto} ${local_addr} < "$sin" > "$sout" & spid=$! + if [ "$with_port" -gt 0 ];then + ip netns exec ${listener_ns} $mptcp_connect -t $timeout -l -p $with_port \ + -s ${srv_proto} ${local_addr} < "$sin" > "$sout" & + fi + sleep 1 if [ "$test_link_fail" -eq 0 ];then
@@ -348,6 +354,7 @@ run_tests() rm_nr_ns1="${5:-0}" rm_nr_ns2="${6:-0}" speed="${7:-fast}" + with_port="${8:-0}" lret=0 oldin=""
@@ -362,7 +369,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} ${with_port} lret=$? if [ "$test_linkfail" -eq 1 ];then
@@ -717,6 +724,23 @@ chk_join_nr "remove subflow and signal IPv6" 2 2 2 chk_add_nr 1 1 chk_rm_nr 1 1 +# subflow with port +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 port 10100 +run_tests $ns1 $ns2 10.0.1.1 +chk_join_nr "single subflow with port" 1 1 1 + +# signal address with port +reset +ip netns exec $ns1 ./pm_nl_ctl limits 0 1 +ip netns exec $ns2 ./pm_nl_ctl limits 1 1 +ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal port 10100 +run_tests $ns1 $ns2 10.0.1.1 0 0 0 fast 10100 +chk_join_nr "signal address with port" 1 1 1 +chk_add_nr 1 1 + # single subflow, syncookies reset_with_cookies ip netns exec $ns1 ./pm_nl_ctl limits 0 1
Signature · 1 line
2.26.2
Geliang Tang
cover ADD_ADDR: ports support
In reply to Geliang Tang---------- Forwarded message ---------
发件人: Geliang Tang <geliangtang(a)gmail.com>
Date: 2020年10月29日周四 下午2:39
Subject: [MPTCP][PATCH mptcp-next 0/8] ADD_ADDR: ports support
To: <mptcp(a)lists.01.org>
Cc: Geliang Tang <geliangtang(a)gmail.com>
This series is the first version of ADD_ADDR ports support. I have solved the listener problem which I mentioned at the meeting on 15th of October by adding a new listening socket from the userspace (see patch 8). Up to now this patchset works well.
TODO:
I added 2 octets padding in ADD_ADDR port suboption for alignment. (see patch 1). We need to drop this padding.
Geliang Tang (8):
mptcp: add ADD_ADDR port support for writing options
mptcp: add the outgoing ADD_ADDR port support
mptcp: send out ack for ADD_ADDR with port
mptcp: add port argument for mptcp_pm_announce_addr
mptcp: add the incoming ADD_ADDR port support
mptcp: add ADD_ADDR port support for netlink
selftests: mptcp: add ADD_ADDR port support for pm_nl_ctl
selftests: mptcp: add testcases for ADD_ADDR with port
include/net/mptcp.h | 1 + net/mptcp/options.c | 80 +++++++++++++++---- net/mptcp/pm.c | 14 ++-- net/mptcp/pm_netlink.c | 28 +++++-- net/mptcp/protocol.h | 31 ++++--- .../testing/selftests/net/mptcp/mptcp_join.sh | 26 +++++- tools/testing/selftests/net/mptcp/pm_nl_ctl.c | 18 +++++ 7 files changed, 162 insertions(+), 36 deletions(-)
--
2.26.2
Mat Martineau
[MPTCP] Re: [MPTCP][PATCH mptcp-next 1/8] mptcp: add ADD_ADDR port support for writing options
In reply to Geliang TangQuoted 34 lines · Geliang Tang
This patch added
ADD_ADDRport support for writing options.In rfc8684, the length of
ADD_ADDRsuboption with IPv4 address and port is 18 octets:1 2 3
0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1+---------------+---------------+-------+-------+---------------+ | Kind | Length |Subtype|(rsv)|E| Address ID | +---------------+---------------+-------+-------+---------------+ | Address (IPv4: 4 octets / IPv6: 16 octets) | +-------------------------------+-------------------------------+ | Port (2 octets, optional) | | +-------------------------------+ | | Truncated HMAC (8 octets, if E=0) | | +-------------------------------+ | | +-------------------------------+But
mptcp_write_optionsis 32-bit aligned, so we need to pad it to 20 octets.Signed-off-by Geliang Tang <geliangtang(a)gmail.com>---
include/net/mptcp.h | 1 + net/mptcp/options.c | 64 +++++++++++++++++++++++++++++++++++++------- net/mptcp/protocol.h | 10 +++---- 3 files changed, 60 insertions(+), 15 deletions(-)include/net/mptcp.h +0
-0
include/net/mptcp.h struct mptcp_out_options { · line 49
Quoted 4 lines
include/net/mptcp.h +1
-0@@ -46,6 +46,7 @@ struct mptcp_out_options {#endif };u8 addr_id; +__be16 port;
This should be a u16 (all the members in this struct use CPU byte order). The put_unaligned_be16() calls below also assume this is in CPU order.
Quoted 36 lines
include/net/mptcp.h +0
-0u64 ahmac;u8 rm_id;u8 join_id;net/mptcp/options.c +0
-0@@ -1067,39 +1067,83 @@ void mptcp_write_options(__be32 *ptr, const struct tcp_sock *tp,
mp_capable_done:if (OPTION_MPTCP_ADD_ADDR & opts->suboptions) {net/mptcp/options.c +10
-0+int add_len, echo_len; + +if (!opts->port) { + add_len =TCPOLEN_MPTCP_ADD_ADDR ; + echo_len =TCPOLEN_MPTCP_ADD_ADDR_BASE ; + }else { + add_len =TCPOLEN_MPTCP_ADD_ADDR_PORT ; + echo_len =TCPOLEN_MPTCP_ADD_ADDR_BASE_PORT ; + } +if (opts->ahmac) *ptr++ = mptcp_option(MPTCPOPT_ADD_ADDR,net/mptcp/options.c +1
-1- TCPOLEN_MPTCP_ADD_ADDR, 0, + add_len, 0,opts->addr_id); else *ptr++ = mptcp_option(MPTCPOPT_ADD_ADDR,net/mptcp/options.c +1
-1- TCPOLEN_MPTCP_ADD_ADDR_BASE, + echo_len,MPTCP_ADDR_ECHO, opts->addr_id); memcpy((u8 *)ptr, (u8 *)&opts->addr.s_addr, 4); ptr += 1;net/mptcp/options.c +0
-2-if (opts->ahmac) { -put_unaligned_be64 (opts->ahmac, ptr);
net/mptcp/options.c void mptcp_write_options(__be32 *ptr, const struct tcp_sock *tp, · line 1099
Quoted 10 lines
net/mptcp/options.c +9
-1- ptr +=2 ; + +if (!opts->port) { +if (opts->ahmac) { +put_unaligned_be64 (opts->ahmac, ptr); + ptr +=2 ; + } + }else { +if (opts->ahmac) { +put_unaligned_be32 (opts->port <<16 | opts->ahmac >>48 , ptr);
It doesn't work to bitwise-or these values before the endianness conversion. They need to have endianness converted first, then populate the headers in network byte order.
net/mptcp/options.c
Quoted 2 lines
net/mptcp/options.c +2
-0+ ptr +=1 ; +put_unaligned_be64 (opts->ahmac <<16 |TCPOPT_NOP , ptr);
Same issue here - need to make sure the byte order conversion happens first. For two bytes of padding, will need two bytes of TCPOPT_NOP.
net/mptcp/options.c void mptcp_write_options(__be32 *ptr, const struct tcp_sock *tp, · line 1105
Quoted 4 lines
net/mptcp/options.c +4
-0+ ptr +=2 ; + }else { +put_unaligned_be16 (opts->port, ptr); + ptr +=1 ;
Will need padding here too.
Quoted 35 lines
net/mptcp/options.c +1
-0+ }} }#if IS_ENABLED(CONFIG_MPTCP_IPV6) if (OPTION_MPTCP_ADD_ADDR6 & opts->suboptions) {net/mptcp/options.c +9
-0+int add_len, echo_len; + +if (!opts->port) { + add_len =TCPOLEN_MPTCP_ADD_ADDR6 ; + echo_len =TCPOLEN_MPTCP_ADD_ADDR6_BASE ; + }else { + add_len =TCPOLEN_MPTCP_ADD_ADDR6_PORT ; + echo_len =TCPOLEN_MPTCP_ADD_ADDR6_BASE_PORT ; + }if (opts->ahmac) *ptr++ = mptcp_option(MPTCPOPT_ADD_ADDR,net/mptcp/options.c +1
-1- TCPOLEN_MPTCP_ADD_ADDR6, 0, + add_len, 0,opts->addr_id); else *ptr++ = mptcp_option(MPTCPOPT_ADD_ADDR,net/mptcp/options.c +1
-1- TCPOLEN_MPTCP_ADD_ADDR6_BASE, + echo_len,MPTCP_ADDR_ECHO, opts->addr_id); memcpy((u8 *)ptr, opts->addr6.s6_addr, 16); ptr += 4;net/mptcp/options.c +4
-3-if (opts->ahmac) { -put_unaligned_be64 (opts->ahmac, ptr); - ptr +=2 ; +if (!opts->port) { +if (opts->ahmac) { +put_unaligned_be64 (opts->ahmac, ptr); + ptr +=2 ;
net/mptcp/options.c void mptcp_write_options(__be32 *ptr, const struct tcp_sock *tp, · line 1105
Quoted 10 lines
net/mptcp/options.c +10
-0+ } + }else { +if (opts->ahmac) { +put_unaligned_be32 (opts->port <<16 | opts->ahmac >>48 , ptr); + ptr +=1 ; +put_unaligned_be64 (opts->ahmac <<16 |TCPOPT_NOP , ptr); + ptr +=2 ; + }else { +put_unaligned_be16 (opts->port, ptr); + ptr +=1 ;
Same issues as above with bitwise operations and byte order conversion. Maybe a new helper function to populate these bytes? The helper could use a local u8 pointer to make it easier to align the values using separate put_unaligned_* calls rather than using the bitwise-or.
Quoted 30 lines
net/mptcp/options.c +1
-0+ }} }#endif
net/mptcp/protocol.h +5
-5@@ -49,14 +49,14 @@#define TCPOLEN_MPTCP_DSS_MAP64 14#define TCPOLEN_MPTCP_DSS_CHECKSUM 2#define TCPOLEN_MPTCP_ADD_ADDR 16 -#define TCPOLEN_MPTCP_ADD_ADDR_PORT 18 +#define TCPOLEN_MPTCP_ADD_ADDR_PORT 20#define TCPOLEN_MPTCP_ADD_ADDR_BASE 8 -#define TCPOLEN_MPTCP_ADD_ADDR_BASE_PORT 10 +#define TCPOLEN_MPTCP_ADD_ADDR_BASE_PORT 12#define TCPOLEN_MPTCP_ADD_ADDR6 28 -#define TCPOLEN_MPTCP_ADD_ADDR6_PORT 30 +#define TCPOLEN_MPTCP_ADD_ADDR6_PORT 32#define TCPOLEN_MPTCP_ADD_ADDR6_BASE 20 -#define TCPOLEN_MPTCP_ADD_ADDR6_BASE_PORT 22 -#define TCPOLEN_MPTCP_PORT_LEN 2 +#define TCPOLEN_MPTCP_ADD_ADDR6_BASE_PORT 24 +#define TCPOLEN_MPTCP_PORT_LEN 4#define TCPOLEN_MPTCP_RM_ADDR_BASE 4/* MPTCP MP_JOIN flags */ Signature · 1 line
2.26.2
Thanks for the patches.
(Note: I haven't reviewed the rest of the series yet, will continue tomorrow)
--
Mat Martineau
Intel
Mat Martineau
[MPTCP] Re: [MPTCP][PATCH mptcp-next 2/8] mptcp: add the outgoing ADD_ADDR port support
In reply to Geliang TangQuoted 48 lines · Geliang Tang
This patch added a new
add_addr_signaltype namedMPTCP_ADD_ADDR_PORT, to identify this is an address with port.It also added a new argument 'port' for both
mptcp_add_addr_lenandmptcp_pm_add_addr_signal.Signed-off-by Geliang Tang <geliangtang(a)gmail.com>---
net/mptcp/options.c | 10 +++++++--- net/mptcp/pm.c | 5 +++-- net/mptcp/protocol.h | 17 +++++++++++++++-- 3 files changed, 25 insertions(+), 7 deletions(-)net/mptcp/options.c +5
-2@@ -586,6 +586,7 @@ static bool mptcp_established_options_add_addr(struct sock *sk, struct sk_buff *unsigned int opt_size = *size;struct mptcp_addr_info saddr;bool echo; +bool port;int len; if (mptcp_pm_should_add_signal_ipv6(msk) &&@@ -597,10 +598,10 @@ static bool mptcp_established_options_add_addr(struct sock *sk, struct sk_buff * }if (!mptcp_pm_should_add_signal (msk) || - !(mptcp_pm_add_addr_signal (msk, remaining, &saddr, &echo))) + !(mptcp_pm_add_addr_signal (msk, remaining, &saddr, &echo, &port)))return false; - len =mptcp_add_addr_len (saddr.family, echo); + len =mptcp_add_addr_len (saddr.family, echo, port);if (remaining < len)return false;@@ -608,6 +609,8 @@ static bool mptcp_established_options_add_addr(struct sock *sk, struct sk_buff *if (drop_other_suboptions) *size -= opt_size; opts->addr_id = saddr.id; +if (port) + opts->port = saddr.port;if (saddr.family ==AF_INET ) { opts->suboptions |=OPTION_MPTCP_ADD_ADDR ; opts->addr = saddr.addr;
net/mptcp/options.c static bool mptcp_established_options_add_addr(struct sock *sk, struct sk_buff * · line 637
Quoted 6 lines
net/mptcp/options.c +2
-1@@ -630,7 +633,8 @@ static bool mptcp_established_options_add_addr(struct sock *sk, struct sk_buff * } }#endif -pr_debug ("addr_id=%d, ahmac=%llu, echo=%d" , opts->addr_id, opts->ahmac, echo); +pr_debug ("addr_id=%d, ahmac=%llu, echo=%d, port=%d" , + opts->addr_id, opts->ahmac, echo,ntohs (opts->port));
Remove ntohs() if opts->port converted to u16.
Quoted 56 lines
net/mptcp/options.c +0
-0return true; }net/mptcp/pm.c +3
-2@@ -188,7 +188,7 @@ void mptcp_pm_rm_addr_received(struct mptcp_sock *msk, u8 rm_id)/* path manager helpers */ bool mptcp_pm_add_addr_signal (struct mptcp_sock *msk,unsigned int remaining, -struct mptcp_addr_info *saddr,bool *echo) +struct mptcp_addr_info *saddr,bool *echo,bool *port) {int ret = false;@@ -199,8 +199,9 @@ bool mptcp_pm_add_addr_signal(struct mptcp_sock *msk, unsigned int remaining, goto out_unlock; *echo =mptcp_pm_should_add_signal_echo (msk); + *port =mptcp_pm_should_add_signal_port (msk); -if (remaining <mptcp_add_addr_len (msk->pm.local.family, *echo)) +if (remaining <mptcp_add_addr_len (msk->pm.local.family, *echo, *port)) goto out_unlock; *saddr = msk->pm.local;net/mptcp/protocol.h +7
-1@@ -171,6 +171,7 @@ enum mptcp_add_addr_status {MPTCP_ADD_ADDR_SIGNAL ,MPTCP_ADD_ADDR_ECHO ,MPTCP_ADD_ADDR_IPV6 , + MPTCP_ADD_ADDR_PORT, }; struct mptcp_pm_data {@@ -539,13 +540,25 @@ static inline bool mptcp_pm_should_add_signal_ipv6(struct mptcp_sock *msk)return READ_ONCE (msk->pm.add_addr_signal) &BIT (MPTCP_ADD_ADDR_IPV6 ); } +static inline bool mptcp_pm_should_add_signal_port (struct mptcp_sock *msk) +{ +return READ_ONCE (msk->pm.add_addr_signal) &BIT (MPTCP_ADD_ADDR_PORT ); +} +static inline bool mptcp_pm_should_rm_signal (struct mptcp_sock *msk) {return READ_ONCE (msk->pm.rm_addr_signal); } -static inline unsigned int mptcp_add_addr_len (int family,bool echo) +static inline unsigned int mptcp_add_addr_len (int family,bool echo,bool port) {
net/mptcp/protocol.h static inline bool mptcp_pm_should_add_signal_ipv6(struct mptcp_sock *msk) · line 564
Quoted 10 lines
net/mptcp/protocol.h +7
-0+if (port) { +if (family ==AF_INET ) +return echo ?TCPOLEN_MPTCP_ADD_ADDR_BASE_PORT + :TCPOLEN_MPTCP_ADD_ADDR_PORT ; +return echo ?TCPOLEN_MPTCP_ADD_ADDR6_BASE_PORT :TCPOLEN_MPTCP_ADD_ADDR6_PORT ; + } +if (family ==AF_INET )return echo ?TCPOLEN_MPTCP_ADD_ADDR_BASE :TCPOLEN_MPTCP_ADD_ADDR ;
This helper function is getting kind of complicated for what it does. Can you convert it to add up the correct size rather than returning one of the eight constants?
Like:
unsigned int len = TCPOLEN_MPTCP_ADD_ADDR_BASE;
if (echo)
len += 8;
if (family == AF_INET6)
len += 12;
...
Quoted 11 lines
net/mptcp/protocol.h +1
-1@@ -553,7 +566,7 @@ static inline unsigned int mptcp_add_addr_len(int family, bool echo) }bool mptcp_pm_add_addr_signal (struct mptcp_sock *msk,unsigned int remaining, -struct mptcp_addr_info *saddr,bool *echo); +struct mptcp_addr_info *saddr,bool *echo,bool *port);bool mptcp_pm_rm_addr_signal (struct mptcp_sock *msk,unsigned int remaining,u8 *rm_id);int mptcp_pm_get_local_id (struct mptcp_sock *msk,struct sock_common *skc);Signature · 1 line
2.26.2
--
Mat Martineau
Intel
Mat Martineau
[MPTCP] Re: [MPTCP][PATCH mptcp-next 5/8] mptcp: add the incoming ADD_ADDR port support
In reply to Geliang TangQuoted 8 lines · Geliang Tang
The port field in
mptcp_options_receivedshould be big-endian, since we use the following assignment statement inmptcp_parse_option:
mp_opt->port=get_unaligned_be16(ptr);And the addr.port is also big-endian, so we need to drop htons in
mptcp_incoming_options.
Please keep mp_opt->port in CPU byte order and adjust other code to fit that. get_unaligned_be16 does the byte order conversion if needed.
Quoted 42 lines
Signed-off-by Geliang Tang <geliangtang(a)gmail.com>---
net/mptcp/options.c| 3 ++-net/mptcp/protocol.h| 2 +-2 files changed, 3 insertions(+), 2 deletions(-)net/mptcp/options.c +2
-1@@ -269,6 +269,7 @@ static void mptcp_parse_option(const struct sk_buff *skb, mp_opt->ahmac =get_unaligned_be64 (ptr); ptr +=8 ; } +pr_debug ("port=%d, ahmac=%llu" ,ntohs (mp_opt->port), mp_opt->ahmac);break ;case MPTCPOPT_RM_ADDR :@@ -936,7 +937,7 @@ void mptcp_incoming_options(struct sock *sk, struct sk_buff *skb)if (mp_opt.add_addr &&add_addr_hmac_valid (msk, &mp_opt)) {struct mptcp_addr_info addr; - addr.port =htons (mp_opt.port); + addr.port = mp_opt.port; addr.id = mp_opt.addr_id;if (mp_opt.family ==MPTCP_ADDR_IPVERSION_4 ) { addr.family =AF_INET ;net/mptcp/protocol.h +1
-1@@ -136,7 +136,7 @@ struct mptcp_options_received {#endif };u64 ahmac; -u16 port; +__be16 port; };static inline __be32 mptcp_option (u8 subopt,u8 len,u8 nib,u8 field)Signature · 1 line
2.26.2
--
Mat Martineau
Intel
Mat Martineau
[MPTCP] Re: [MPTCP][PATCH mptcp-next 1/8] mptcp: add ADD_ADDR port support for writing options
In reply to Mat MartineauQuoted 32 lines · Mat Martineau
Quoted 29 lines · Geliang Tang
This patch added
ADD_ADDRport support for writing options.In rfc8684, the length of
ADD_ADDRsuboption with IPv4 address and port is 18 octets:1 2 3
0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1+---------------+---------------+-------+-------+---------------+ | Kind | Length |Subtype|(rsv)|E| Address ID | +---------------+---------------+-------+-------+---------------+ | Address (IPv4: 4 octets / IPv6: 16 octets) | +-------------------------------+-------------------------------+ | Port (2 octets, optional) | | +-------------------------------+ | | Truncated HMAC (8 octets, if E=0) | | +-------------------------------+ | | +-------------------------------+But
mptcp_write_optionsis 32-bit aligned, so we need to pad it to 20 octets.Signed-off-by Geliang Tang <geliangtang(a)gmail.com>---
include/net/mptcp.h | 1 + net/mptcp/options.c | 64 +++++++++++++++++++++++++++++++++++++------- net/mptcp/protocol.h | 10 +++---- 3 files changed, 60 insertions(+), 15 deletions(-)
Quoted 13 lines
include/net/mptcp.h struct mptcp_out_options { · line 49
Quoted 9 lines
include/net/mptcp.h +1
-0@@ -46,6 +46,7 @@ struct mptcp_out_options {#endif };u8 addr_id; +__be16 port;This should be a u16 (all the members in this struct use CPU byte order). The
put_unaligned_be16()calls below also assume this is in CPU order.
Looking at later patches in the patch set, I see now that __be16 is used in other places for the port number. __be16 is also used for inet_dport in various places. We should make sure the port number is handled consistently within the MPTCP code, and to make sure it is also consistent with the other IP code. Anyone else have an opinion here?
If you keep using __be16, it does remain an issue that you don't want to use get_unaligned_be16() and put_unaligned_be16() with that data type.
--
Mat Martineau
Intel