diff options
| author | David S. Miller <davem@davemloft.net> | 2021-06-22 09:57:45 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-06-22 09:57:45 -0700 |
| commit | 1a77de09b71fe522191b241cfc9fedb5ebab5c69 (patch) | |
| tree | a6c0e15320a6182e81d18fdc92a2db37b5a418af /net/mptcp/subflow.c | |
| parent | 070258effa3b9603ac0cd6a40297b00a01ea5fd8 (diff) | |
| parent | a4debc4772f44737358ea4210f6fca1f19f5c783 (diff) | |
Merge branch 'mptcp-optimizations'
Mat Martineau says:
====================
mptcp: A few optimizations
Here is a set of patches that we've accumulated and tested in the MPTCP
tree.
Patch 1 removes the MPTCP-level tx skb cache that added complexity but
did not provide a meaningful benefit.
Patch 2 uses the fast socket lock in more places.
Patch 3 improves handling of a data-ready flag.
Patch 4 deletes an unnecessary and racy connection state check.
Patch 5 adds a MIB counter for one type of invalid MPTCP header.
Patch 6 improves self test failure output.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mptcp/subflow.c')
| -rw-r--r-- | net/mptcp/subflow.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c index 8976ff586b87..585951e7e52f 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -1046,8 +1046,10 @@ validate_seq: /* we revalidate valid mapping on new skb, because we must ensure * the current skb is completely covered by the available mapping */ - if (!validate_mapping(ssk, skb)) + if (!validate_mapping(ssk, skb)) { + MPTCP_INC_STATS(sock_net(ssk), MPTCP_MIB_DSSTCPMISMATCH); return MAPPING_INVALID; + } skb_ext_del(skb, SKB_EXT_MPTCP); |