From: Yonglong Li <liyonglong@chinatelecom.cn>
To: mptcp@lists.linux.dev
Cc: mathew.j.martineau@linux.intel.com, geliangtang@gmail.com,
Yonglong Li <liyonglong@chinatelecom.cn>
Subject: [PATCH v7 3/5] mptcp: build ADD_ADDR/echo-ADD_ADDR option according pm.add_signal
Date: Wed, 30 Jun 2021 18:24:11 +0800 [thread overview]
Message-ID: <1625048653-6825-4-git-send-email-liyonglong@chinatelecom.cn> (raw)
In-Reply-To: <1625048653-6825-1-git-send-email-liyonglong@chinatelecom.cn>
according MPTCP_ADD_ADDR_SIGNAL and MPTCP_ADD_ADDR_ECHO flag build
ADD_ADDR/echo-ADD_ADDR option
add a suboptions type OPTION_MPTCP_ADD_ECHO to mark as echo option
Signed-off-by: Yonglong Li <liyonglong@chinatelecom.cn>
---
include/net/mptcp.h | 3 ++-
net/mptcp/options.c | 54 +++++++++++++++++++++++++++++-----------------------
net/mptcp/pm.c | 35 +++++++++++++++++++++++-----------
net/mptcp/protocol.h | 25 ++++++++++++++++--------
4 files changed, 73 insertions(+), 44 deletions(-)
diff --git a/include/net/mptcp.h b/include/net/mptcp.h
index d61bbbf..d2c6ebe 100644
--- a/include/net/mptcp.h
+++ b/include/net/mptcp.h
@@ -61,7 +61,8 @@ struct mptcp_out_options {
u64 sndr_key;
u64 rcvr_key;
u64 ahmac;
- struct mptcp_addr_info addr;
+ struct mptcp_addr_info local;
+ struct mptcp_addr_info remote;
struct mptcp_rm_list rm_list;
u8 join_id;
u8 backup;
diff --git a/net/mptcp/options.c b/net/mptcp/options.c
index 1aec016..cceff0a 100644
--- a/net/mptcp/options.c
+++ b/net/mptcp/options.c
@@ -655,13 +655,16 @@ static bool mptcp_established_options_add_addr(struct sock *sk, struct sk_buff *
struct mptcp_sock *msk = mptcp_sk(subflow->conn);
bool drop_other_suboptions = false;
unsigned int opt_size = *size;
- bool echo;
- bool port;
- int len;
+ u8 add_addr;
+ int len = 0;
- if ((mptcp_pm_should_add_signal_ipv6(msk) ||
- mptcp_pm_should_add_signal_port(msk) ||
- mptcp_pm_should_add_signal_echo(msk)) &&
+ if (!mptcp_pm_should_add_signal(msk) ||
+ !mptcp_pm_add_addr_signal(msk, skb, opt_size, remaining, opts, &add_addr))
+ return false;
+
+ if (((add_addr & BIT(MPTCP_ADD_ADDR_ECHO)) ||
+ ((add_addr & BIT(MPTCP_ADD_ADDR_SIGNAL)) &&
+ (opts->local.family == AF_INET6 || opts->local.port))) &&
skb && skb_is_tcp_pure_ack(skb)) {
pr_debug("drop other suboptions");
opts->suboptions = 0;
@@ -671,11 +674,7 @@ static bool mptcp_established_options_add_addr(struct sock *sk, struct sk_buff *
drop_other_suboptions = true;
}
- if (!mptcp_pm_should_add_signal(msk) ||
- !(mptcp_pm_add_addr_signal(msk, remaining, &opts->addr, &echo, &port)))
- return false;
-
- len = mptcp_add_addr_len(opts->addr.family, echo, port);
+ len = mptcp_add_addr_len(msk, opts);
if (remaining < len)
return false;
@@ -683,13 +682,16 @@ static bool mptcp_established_options_add_addr(struct sock *sk, struct sk_buff *
if (drop_other_suboptions)
*size -= opt_size;
opts->suboptions |= OPTION_MPTCP_ADD_ADDR;
- if (!echo) {
+ if (!(add_addr & BIT(MPTCP_ADD_ADDR_ECHO)) &&
+ (add_addr & BIT(MPTCP_ADD_ADDR_SIGNAL))) {
opts->ahmac = add_addr_generate_hmac(msk->local_key,
msk->remote_key,
- &opts->addr);
+ &opts->local);
}
- pr_debug("addr_id=%d, ahmac=%llu, echo=%d, port=%d",
- opts->addr.id, opts->ahmac, echo, ntohs(opts->addr.port));
+
+ pr_debug("addr_signal:%x, echo=%d, local_addr_id=%d, ahmac=%llu, local_port=%d, remote_addr_id=%d, remote_port=%d",
+ add_addr, (opts->ahmac == 0), opts->local.id,
+ opts->ahmac, ntohs(opts->local.port), opts->remote.id, ntohs(opts->remote.port));
return true;
}
@@ -1229,15 +1231,19 @@ void mptcp_write_options(__be32 *ptr, const struct tcp_sock *tp,
mp_capable_done:
if (OPTION_MPTCP_ADD_ADDR & opts->suboptions) {
+ struct mptcp_addr_info *addr = &opts->remote;
u8 len = TCPOLEN_MPTCP_ADD_ADDR_BASE;
u8 echo = MPTCP_ADDR_ECHO;
+ if (opts->ahmac)
+ addr = &opts->local;
+
#if IS_ENABLED(CONFIG_MPTCP_IPV6)
- if (opts->addr.family == AF_INET6)
+ if (addr->family == AF_INET6)
len = TCPOLEN_MPTCP_ADD_ADDR6_BASE;
#endif
- if (opts->addr.port)
+ if (addr->port)
len += TCPOLEN_MPTCP_PORT_LEN;
if (opts->ahmac) {
@@ -1246,25 +1252,25 @@ void mptcp_write_options(__be32 *ptr, const struct tcp_sock *tp,
}
*ptr++ = mptcp_option(MPTCPOPT_ADD_ADDR,
- len, echo, opts->addr.id);
- if (opts->addr.family == AF_INET) {
- memcpy((u8 *)ptr, (u8 *)&opts->addr.addr.s_addr, 4);
+ len, echo, addr->id);
+ if (addr->family == AF_INET) {
+ memcpy((u8 *)ptr, (u8 *)&addr->addr.s_addr, 4);
ptr += 1;
}
#if IS_ENABLED(CONFIG_MPTCP_IPV6)
- else if (opts->addr.family == AF_INET6) {
- memcpy((u8 *)ptr, opts->addr.addr6.s6_addr, 16);
+ else if (addr->family == AF_INET6) {
+ memcpy((u8 *)ptr, addr->addr6.s6_addr, 16);
ptr += 4;
}
#endif
- if (!opts->addr.port) {
+ if (!addr->port) {
if (opts->ahmac) {
put_unaligned_be64(opts->ahmac, ptr);
ptr += 2;
}
} else {
- u16 port = ntohs(opts->addr.port);
+ u16 port = ntohs(addr->port);
if (opts->ahmac) {
u8 *bptr = (u8 *)ptr;
diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c
index 0dc9021..9c5b15c 100644
--- a/net/mptcp/pm.c
+++ b/net/mptcp/pm.c
@@ -253,11 +253,11 @@ void mptcp_pm_mp_prio_received(struct sock *sk, u8 bkup)
/* path manager helpers */
-bool mptcp_pm_add_addr_signal(struct mptcp_sock *msk, unsigned int remaining,
- struct mptcp_addr_info *saddr, bool *echo, bool *port)
+bool mptcp_pm_add_addr_signal(struct mptcp_sock *msk, struct sk_buff *skb,
+ unsigned int opt_size, unsigned int remaining,
+ struct mptcp_out_options *opts, u8 *add_addr)
{
- int ret = false;
- u8 add_addr;
+ int ret = false, len;
spin_lock_bh(&msk->pm.lock);
@@ -265,18 +265,31 @@ bool mptcp_pm_add_addr_signal(struct mptcp_sock *msk, unsigned int remaining,
if (!mptcp_pm_should_add_signal(msk))
goto out_unlock;
- *echo = mptcp_pm_should_add_signal_echo(msk);
- *port = mptcp_pm_should_add_signal_port(msk);
+ opts->local = msk->pm.local;
+ opts->remote = msk->pm.remote;
+ *add_addr = msk->pm.addr_signal;
+
+ if (((msk->pm.addr_signal & BIT(MPTCP_ADD_ADDR_ECHO)) ||
+ ((msk->pm.addr_signal & BIT(MPTCP_ADD_ADDR_SIGNAL)) &&
+ (msk->pm.local.family == AF_INET6 || msk->pm.local.port))) &&
+ skb && skb_is_tcp_pure_ack(skb)) {
+ remaining += opt_size;
+ }
- if (remaining < mptcp_add_addr_len(msk->pm.local.family, *echo, *port))
+ len = mptcp_add_addr_len(msk, opts);
+ if (remaining < len)
goto out_unlock;
- *saddr = msk->pm.local;
- add_addr = msk->pm.addr_signal & ~(BIT(MPTCP_ADD_ADDR_SIGNAL) | BIT(MPTCP_ADD_ADDR_ECHO));
- WRITE_ONCE(msk->pm.addr_signal, add_addr);
- ret = true;
+ if ((msk->pm.addr_signal & BIT(MPTCP_ADD_ADDR_ECHO)))
+ WRITE_ONCE(msk->pm.addr_signal, msk->pm.addr_signal & ~BIT(MPTCP_ADD_ADDR_ECHO));
+ else
+ WRITE_ONCE(msk->pm.addr_signal, msk->pm.addr_signal & ~BIT(MPTCP_ADD_ADDR_SIGNAL));
+ ret = true;
out_unlock:
+ if ((mptcp_pm_should_add_signal_echo(msk)) && (mptcp_pm_should_add_signal_addr(msk)))
+ mptcp_pm_schedule_work(msk, MPTCP_PM_ADD_ADDR_SEND_ACK);
+
spin_unlock_bh(&msk->pm.lock);
return ret;
}
diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
index a0b0ec0..caa4a60 100644
--- a/net/mptcp/protocol.h
+++ b/net/mptcp/protocol.h
@@ -737,16 +737,24 @@ static inline bool mptcp_pm_should_rm_signal(struct mptcp_sock *msk)
return READ_ONCE(msk->pm.addr_signal) & BIT(MPTCP_RM_ADDR_SIGNAL);
}
-static inline unsigned int mptcp_add_addr_len(int family, bool echo, bool port)
+static inline unsigned int mptcp_add_addr_len(struct mptcp_sock *msk,
+ struct mptcp_out_options *opts)
{
- u8 len = TCPOLEN_MPTCP_ADD_ADDR_BASE;
+ u8 len = 0;
+ struct mptcp_addr_info *addr = &opts->remote;
- if (family == AF_INET6)
- len = TCPOLEN_MPTCP_ADD_ADDR6_BASE;
- if (!echo)
+ if (mptcp_pm_should_add_signal_addr(msk)) {
+ addr = &opts->local;
len += MPTCPOPT_THMAC_LEN;
+ }
+
+ if (addr->family == AF_INET6)
+ len += TCPOLEN_MPTCP_ADD_ADDR6_BASE;
+ else
+ len += TCPOLEN_MPTCP_ADD_ADDR_BASE;
+
/* account for 2 trailing 'nop' options */
- if (port)
+ if (addr->port)
len += TCPOLEN_MPTCP_PORT_LEN + TCPOLEN_MPTCP_PORT_ALIGN;
return len;
@@ -760,8 +768,9 @@ static inline int mptcp_rm_addr_len(const struct mptcp_rm_list *rm_list)
return TCPOLEN_MPTCP_RM_ADDR_BASE + roundup(rm_list->nr - 1, 4) + 1;
}
-bool mptcp_pm_add_addr_signal(struct mptcp_sock *msk, unsigned int remaining,
- struct mptcp_addr_info *saddr, bool *echo, bool *port);
+bool mptcp_pm_add_addr_signal(struct mptcp_sock *msk, struct sk_buff *skb,
+ unsigned int opt_size, unsigned int remaining,
+ struct mptcp_out_options *opts, u8 *add_addr);
bool mptcp_pm_rm_addr_signal(struct mptcp_sock *msk, unsigned int remaining,
struct mptcp_rm_list *rm_list);
int mptcp_pm_get_local_id(struct mptcp_sock *msk, struct sock_common *skc);
--
1.8.3.1
next prev parent reply other threads:[~2021-06-30 10:24 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-30 10:24 [PATCH v7 0/4] mptcp: fix conflicts when using pm.add_signal in ADD_ADDR/echo and RM_ADDR process Yonglong Li
2021-06-30 10:24 ` [PATCH v7 1/5] mptcp: fix ADD_ADDR and RM_ADDR maybe flush addr_signal each other Yonglong Li
2021-06-30 10:37 ` Geliang Tang
2021-07-02 6:23 ` Yonglong Li
2021-06-30 10:24 ` [PATCH v7 2/5] mptcp: make MPTCP_ADD_ADDR_SIGNAL and MPTCP_ADD_ADDR_ECHO separate Yonglong Li
2021-06-30 10:24 ` Yonglong Li [this message]
2021-06-30 11:14 ` [PATCH v7 3/5] mptcp: build ADD_ADDR/echo-ADD_ADDR option according pm.add_signal Geliang Tang
2021-07-02 6:15 ` Yonglong Li
2021-06-30 10:24 ` [PATCH v7 4/5] mptcp: remove some double-check Yonglong Li
2021-06-30 10:57 ` Geliang Tang
2021-07-02 6:22 ` Yonglong Li
2021-07-02 8:06 ` Geliang Tang
2021-06-30 10:24 ` [PATCH v7 5/5] mptcp: remove MPTCP_ADD_ADDR_IPV6 and MPTCP_ADD_ADDR_PORT Yonglong Li
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1625048653-6825-4-git-send-email-liyonglong@chinatelecom.cn \
--to=liyonglong@chinatelecom.cn \
--cc=geliangtang@gmail.com \
--cc=mathew.j.martineau@linux.intel.com \
--cc=mptcp@lists.linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).