| Message ID | a39b8f2a49c2798d4ff80ed527cd8990e64f8def.1627464017.git.geliangtang@xiaomi.com (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers | show |
| Series | MP_FAIL support | expand |
On Wed, 2021-07-28 at 17:35 +0800, Geliang Tang wrote: > From: Geliang Tang <geliangtang@xiaomi.com> > > This patch added handling for receiving MP_FAIL suboption. > > Add a new members mp_fail and fail_seq in struct mptcp_options_received. > When MP_FAIL suboption is received, set mp_fail to 1 and save the sequence > number to fail_seq. > > Then invoke mptcp_pm_mp_fail_received to deal with the MP_FAIL suboption. > > Signed-off-by: Geliang Tang <geliangtang@xiaomi.com> > --- > net/mptcp/options.c | 16 ++++++++++++++++ > net/mptcp/pm.c | 5 +++++ > net/mptcp/protocol.h | 3 +++ > 3 files changed, 24 insertions(+) > > diff --git a/net/mptcp/options.c b/net/mptcp/options.c > index 2b15063c8009..cd9ec4acf127 100644 > --- a/net/mptcp/options.c > +++ b/net/mptcp/options.c > @@ -336,6 +336,16 @@ static void mptcp_parse_option(const struct sk_buff *skb, > mp_opt->reset_reason = *ptr; > break; > > + case MPTCPOPT_MP_FAIL: > + if (opsize != TCPOLEN_MPTCP_FAIL) > + break; > + > + ptr += 2; > + mp_opt->mp_fail = 1; > + mp_opt->fail_seq = get_unaligned_be64(ptr); > + pr_debug("MP_FAIL: data_seq=%llu", mp_opt->fail_seq); > + break; > + > default: > break; > } > @@ -364,6 +374,7 @@ void mptcp_get_options(const struct sock *sk, > mp_opt->reset = 0; > mp_opt->csum_reqd = READ_ONCE(msk->csum_enabled); > mp_opt->deny_join_id0 = 0; > + mp_opt->mp_fail = 0; > > length = (th->doff * 4) - sizeof(struct tcphdr); > ptr = (const unsigned char *)(th + 1); > @@ -1147,6 +1158,11 @@ bool mptcp_incoming_options(struct sock *sk, struct sk_buff *skb) > mp_opt.mp_prio = 0; > } > > + if (mp_opt.mp_fail) { > + mptcp_pm_mp_fail_received(sk, mp_opt.fail_seq); > + mp_opt.mp_fail = 0; > + } > + Side note not specifically related to this patch: usually we get a single MPTCP subopt per packet: a DSS. So we could optimize this code path with something alike: if (unlikely(any subopt other than dss is present)) // go checking all of them individually To do the above we likely need to wrap all the 'mp_capable', 'fastclose', 'rm_addr' flags in a single bitmask. e.v. using a union. /P
Hi Paolo, Paolo Abeni <pabeni@redhat.com> 于2021年7月28日周三 下午6:36写道： > > On Wed, 2021-07-28 at 17:35 +0800, Geliang Tang wrote: > > From: Geliang Tang <geliangtang@xiaomi.com> > > > > This patch added handling for receiving MP_FAIL suboption. > > > > Add a new members mp_fail and fail_seq in struct mptcp_options_received. > > When MP_FAIL suboption is received, set mp_fail to 1 and save the sequence > > number to fail_seq. > > > > Then invoke mptcp_pm_mp_fail_received to deal with the MP_FAIL suboption. > > > > Signed-off-by: Geliang Tang <geliangtang@xiaomi.com> > > --- > > net/mptcp/options.c | 16 ++++++++++++++++ > > net/mptcp/pm.c | 5 +++++ > > net/mptcp/protocol.h | 3 +++ > > 3 files changed, 24 insertions(+) > > > > diff --git a/net/mptcp/options.c b/net/mptcp/options.c > > index 2b15063c8009..cd9ec4acf127 100644 > > --- a/net/mptcp/options.c > > +++ b/net/mptcp/options.c > > @@ -336,6 +336,16 @@ static void mptcp_parse_option(const struct sk_buff *skb, > > mp_opt->reset_reason = *ptr; > > break; > > > > + case MPTCPOPT_MP_FAIL: > > + if (opsize != TCPOLEN_MPTCP_FAIL) > > + break; > > + > > + ptr += 2; > > + mp_opt->mp_fail = 1; > > + mp_opt->fail_seq = get_unaligned_be64(ptr); > > + pr_debug("MP_FAIL: data_seq=%llu", mp_opt->fail_seq); > > + break; > > + > > default: > > break; > > } > > @@ -364,6 +374,7 @@ void mptcp_get_options(const struct sock *sk, > > mp_opt->reset = 0; > > mp_opt->csum_reqd = READ_ONCE(msk->csum_enabled); > > mp_opt->deny_join_id0 = 0; > > + mp_opt->mp_fail = 0; > > > > length = (th->doff * 4) - sizeof(struct tcphdr); > > ptr = (const unsigned char *)(th + 1); > > @@ -1147,6 +1158,11 @@ bool mptcp_incoming_options(struct sock *sk, struct sk_buff *skb) > > mp_opt.mp_prio = 0; > > } > > > > + if (mp_opt.mp_fail) { > > + mptcp_pm_mp_fail_received(sk, mp_opt.fail_seq); > > + mp_opt.mp_fail = 0; > > + } > > + > > Side note not specifically related to this patch: usually we get a > single MPTCP subopt per packet: a DSS. So we could optimize this code > path with something alike: > > if (unlikely(any subopt other than dss is present)) > // go checking all of them individually How about simply doing it like this: if (unlikely(mp_opt.fastclose || mp_opt.add_addr || mp_opt.rm_addr || mp_opt.mp_prio || mp_opt.mp_fail || mp_opt.reset)) { // go checking all of them individually } I just sent out a patch for this named "mptcp: use unlikely for non-DSS suboptions" to ML. Please review it. Thanks, -Geliang > > To do the above we likely need to wrap all the 'mp_capable', > 'fastclose', 'rm_addr' flags in a single bitmask. e.v. using a union. > > /P >
diff --git a/net/mptcp/options.c b/net/mptcp/options.c index 2b15063c8009..cd9ec4acf127 100644 --- a/net/mptcp/options.c +++ b/net/mptcp/options.c @@ -336,6 +336,16 @@ static void mptcp_parse_option(const struct sk_buff *skb, mp_opt->reset_reason = *ptr; break; + case MPTCPOPT_MP_FAIL: + if (opsize != TCPOLEN_MPTCP_FAIL) + break; + + ptr += 2; + mp_opt->mp_fail = 1; + mp_opt->fail_seq = get_unaligned_be64(ptr); + pr_debug("MP_FAIL: data_seq=%llu", mp_opt->fail_seq); + break; + default: break; } @@ -364,6 +374,7 @@ void mptcp_get_options(const struct sock *sk, mp_opt->reset = 0; mp_opt->csum_reqd = READ_ONCE(msk->csum_enabled); mp_opt->deny_join_id0 = 0; + mp_opt->mp_fail = 0; length = (th->doff * 4) - sizeof(struct tcphdr); ptr = (const unsigned char *)(th + 1); @@ -1147,6 +1158,11 @@ bool mptcp_incoming_options(struct sock *sk, struct sk_buff *skb) mp_opt.mp_prio = 0; } + if (mp_opt.mp_fail) { + mptcp_pm_mp_fail_received(sk, mp_opt.fail_seq); + mp_opt.mp_fail = 0; + } + if (mp_opt.reset) { subflow->reset_seen = 1; subflow->reset_reason = mp_opt.reset_reason; diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c index da0c4c925350..6ab386ff3294 100644 --- a/net/mptcp/pm.c +++ b/net/mptcp/pm.c @@ -249,6 +249,11 @@ void mptcp_pm_mp_prio_received(struct sock *sk, u8 bkup) mptcp_event(MPTCP_EVENT_SUB_PRIORITY, mptcp_sk(subflow->conn), sk, GFP_ATOMIC); } +void mptcp_pm_mp_fail_received(struct sock *sk, u64 fail_seq) +{ + pr_debug("fail_seq=%llu", fail_seq); +} + /* path manager helpers */ bool mptcp_pm_add_addr_signal(struct mptcp_sock *msk, struct sk_buff *skb, diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index b389fec18c89..09d0e9406ea9 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -140,6 +140,7 @@ struct mptcp_options_received { add_addr : 1, rm_addr : 1, mp_prio : 1, + mp_fail : 1, echo : 1, csum_reqd : 1, backup : 1, @@ -161,6 +162,7 @@ struct mptcp_options_received { u64 ahmac; u8 reset_reason:4; u8 reset_transient:1; + u64 fail_seq; }; static inline __be32 mptcp_option(u8 subopt, u8 len, u8 nib, u8 field) @@ -727,6 +729,7 @@ 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); +void mptcp_pm_mp_fail_received(struct sock *sk, u64 fail_seq); void mptcp_pm_free_anno_list(struct mptcp_sock *msk); bool mptcp_pm_sport_in_anno_list(struct mptcp_sock *msk, const struct sock *sk); struct mptcp_pm_add_entry *