tcp: add TCP_OLD_SEQUENCE drop reason
Subsystems (3)
PATCH 1/1 tcp: add TCP_OLD_SEQUENCE drop reason
tcp_sequence() uses two conditions to decide to drop a packet, and we currently report generic TCP_INVALID_SEQUENCE drop reason.
Duplicates are common, we need to distinguish them from the other case.
I chose to not reuse TCP_OLD_DATA, and instead added TCP_OLD_SEQUENCE drop reason.
--- include/net/dropreason-core.h | 3 +++ net/ipv4/tcp_input.c | 16 +++++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-)
include/net/dropreason-core.h +3 -0
@@ -30,6 +30,7 @@ FN(TCP_OVERWINDOW) \ FN(TCP_OFOMERGE) \ FN(TCP_RFC7323_PAWS) \ + FN(TCP_OLD_SEQUENCE) \ FN(TCP_INVALID_SEQUENCE) \ FN(TCP_RESET) \ FN(TCP_INVALID_SYN) \
@@ -188,6 +189,8 @@ enum skb_drop_reason {* LINUX_MIB_PAWSESTABREJECTED */ SKB_DROP_REASON_TCP_RFC7323_PAWS , +/** @SKB_DROP_REASON_TCP_OLD_SEQUENCE: Old SEQ field (duplicate packet) */ +SKB_DROP_REASON_TCP_OLD_SEQUENCE ,/** @SKB_DROP_REASON_TCP_INVALID_SEQUENCE: Not acceptable SEQ field */ SKB_DROP_REASON_TCP_INVALID_SEQUENCE,/** @SKB_DROP_REASON_TCP_RESET: Invalid RST packet */
net/ipv4/tcp_input.c +11 -5
@@ -4313,10 +4313,16 @@ static inline bool tcp_paws_discard(const struct sock *sk,* (borrowed from freebsd) */ -static inline bool tcp_sequence (const struct tcp_sock *tp,u32 seq,u32 end_seq) +static enum skb_drop_reason tcp_sequence (const struct tcp_sock *tp, +u32 seq,u32 end_seq) { -return !before (end_seq, tp->rcv_wup) && - !after (seq, tp->rcv_nxt +tcp_receive_window (tp)); +if (before (end_seq, tp->rcv_wup)) +return SKB_DROP_REASON_TCP_OLD_SEQUENCE ; + +if (after (seq, tp->rcv_nxt +tcp_receive_window (tp))) +return SKB_DROP_REASON_TCP_INVALID_SEQUENCE ; + +return SKB_NOT_DROPPED_YET ; }/* When we get a reset we do this. */
@@ -5739,7 +5745,8 @@ static bool tcp_validate_incoming(struct sock *sk, struct sk_buff *skb, }/* Step 1: check sequence number */ -if (!tcp_sequence (tp,TCP_SKB_CB (skb)->seq,TCP_SKB_CB (skb)->end_seq)) { + reason =tcp_sequence (tp,TCP_SKB_CB (skb)->seq,TCP_SKB_CB (skb)->end_seq); +if (reason) {/* RFC793, page 37: "In all states except SYN-SENT, all reset * (RST) segments are validated by checking their SEQ-fields." * And page 69: "If an incoming segment is not acceptable,
@@ -5756,7 +5763,6 @@ static bool tcp_validate_incoming(struct sock *sk, struct sk_buff *skb, }else if (tcp_reset_check (sk, skb)) { goto reset; } -SKB_DR_SET (reason,TCP_INVALID_SEQUENCE ); goto discard; }
Signature · 1 line
2.41.0.255.g8b1d071c50-goog
This patch was applied to netdev/net-next.git (main) by Paolo Abeni <[email protected]>:
Hello:
This patch was applied to netdev/net-next.git (main) by Paolo Abeni <[email protected]>:
Quoted 10 lines · On Wed, 19 Jul 2023 06:47:54 +0000 you wrote:
tcp_sequence()uses two conditions to decide to drop a packet, and we currently report genericTCP_INVALID_SEQUENCEdrop reason.Duplicates are common, we need to distinguish them from the other case.
I chose to not reuse
TCP_OLD_DATA, and instead addedTCP_OLD_SEQUENCEdrop reason.[...]
Here is the summary with links:
- [net-next] tcp: add TCP_OLD_SEQUENCE drop reason
https://git.kernel.org/netdev/net-next/c/b44693495af8
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html