From: menglong8.dong@gmail.com
To: dsahern@kernel.org, kuba@kernel.org
Cc: edumazet@google.com, davem@davemloft.net, rostedt@goodmis.org,
mingo@redhat.com, yoshfuji@linux-ipv6.org, ast@kernel.org,
daniel@iogearbox.net, hawk@kernel.org, john.fastabend@gmail.com,
imagedong@tencent.com, talalahmad@google.com,
keescook@chromium.org, ilias.apalodimas@linaro.org,
alobakin@pm.me, memxor@gmail.com, atenart@kernel.org,
bigeasy@linutronix.de, pabeni@redhat.com, linyunsheng@huawei.com,
arnd@arndb.de, yajun.deng@linux.dev, roopa@nvidia.com,
willemb@google.com, vvs@virtuozzo.com, cong.wang@bytedance.com,
luiz.von.dentz@intel.com, linux-kernel@vger.kernel.org,
netdev@vger.kernel.org, bpf@vger.kernel.org,
flyingpeng@tencent.com
Subject: [PATCH net-next 09/19] net: tcp: use tcp_drop_reason() for tcp_data_queue_ofo()
Date: Tue, 15 Feb 2022 19:28:02 +0800 [thread overview]
Message-ID: <20220215112812.2093852-10-imagedong@tencent.com> (raw)
In-Reply-To: <20220215112812.2093852-1-imagedong@tencent.com>
From: Menglong Dong <imagedong@tencent.com>
Replace tcp_drop() used in tcp_data_queue_ofo with tcp_drop_reason().
Following drop reasons are introduced:
SKB_DROP_REASON_TCP_OFOMERGE
Signed-off-by: Menglong Dong <imagedong@tencent.com>
---
include/linux/skbuff.h | 3 +++
include/trace/events/skb.h | 1 +
net/ipv4/tcp_input.c | 10 ++++++----
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 62a0d7d78f6f..73ed01d87e43 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -371,6 +371,9 @@ enum skb_drop_reason {
* the right edges of receive
* window
*/
+ SKB_DROP_REASON_TCP_OFOMERGE, /* the data of skb is already in
+ * the ofo queue.
+ */
SKB_DROP_REASON_MAX,
};
diff --git a/include/trace/events/skb.h b/include/trace/events/skb.h
index cc1c8f7eaf72..2ab7193313aa 100644
--- a/include/trace/events/skb.h
+++ b/include/trace/events/skb.h
@@ -36,6 +36,7 @@
EM(SKB_DROP_REASON_TCP_ZEROWINDOW, TCP_ZEROWINDOW) \
EM(SKB_DROP_REASON_TCP_OLD_DATA, TCP_OLD_DATA) \
EM(SKB_DROP_REASON_TCP_OVERWINDOW, TCP_OVERWINDOW) \
+ EM(SKB_DROP_REASON_TCP_OFOMERGE, TCP_OFOMERGE) \
EMe(SKB_DROP_REASON_MAX, MAX)
#undef EM
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index c042711fb5a2..cb6ad47733f1 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -4782,7 +4782,7 @@ static void tcp_data_queue_ofo(struct sock *sk, struct sk_buff *skb)
if (unlikely(tcp_try_rmem_schedule(sk, skb, skb->truesize))) {
NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPOFODROP);
sk->sk_data_ready(sk);
- tcp_drop(sk, skb);
+ tcp_drop_reason(sk, skb, SKB_DROP_REASON_PROTO_MEM);
return;
}
@@ -4845,7 +4845,8 @@ static void tcp_data_queue_ofo(struct sock *sk, struct sk_buff *skb)
/* All the bits are present. Drop. */
NET_INC_STATS(sock_net(sk),
LINUX_MIB_TCPOFOMERGE);
- tcp_drop(sk, skb);
+ tcp_drop_reason(sk, skb,
+ SKB_DROP_REASON_TCP_OFOMERGE);
skb = NULL;
tcp_dsack_set(sk, seq, end_seq);
goto add_sack;
@@ -4864,7 +4865,8 @@ static void tcp_data_queue_ofo(struct sock *sk, struct sk_buff *skb)
TCP_SKB_CB(skb1)->end_seq);
NET_INC_STATS(sock_net(sk),
LINUX_MIB_TCPOFOMERGE);
- tcp_drop(sk, skb1);
+ tcp_drop_reason(sk, skb1,
+ SKB_DROP_REASON_TCP_OFOMERGE);
goto merge_right;
}
} else if (tcp_ooo_try_coalesce(sk, skb1,
@@ -4892,7 +4894,7 @@ static void tcp_data_queue_ofo(struct sock *sk, struct sk_buff *skb)
tcp_dsack_extend(sk, TCP_SKB_CB(skb1)->seq,
TCP_SKB_CB(skb1)->end_seq);
NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPOFOMERGE);
- tcp_drop(sk, skb1);
+ tcp_drop_reason(sk, skb1, SKB_DROP_REASON_TCP_OFOMERGE);
}
/* If there is no skb after us, we are the last_skb ! */
if (!skb1)
--
2.34.1
next prev parent reply other threads:[~2022-02-15 11:32 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-15 11:27 [PATCH net-next 00/19] net: add skb drop reasons for TCP, IP, dev and neigh menglong8.dong
2022-02-15 11:27 ` [PATCH net-next 01/19] net: tcp: introduce tcp_drop_reason() menglong8.dong
2022-02-15 17:34 ` Eric Dumazet
2022-02-15 18:47 ` David Ahern
2022-02-16 2:38 ` Menglong Dong
2022-02-16 2:31 ` Menglong Dong
2022-02-15 11:27 ` [PATCH net-next 02/19] net: tcp: add skb drop reasons to tcp_v4_rcv() menglong8.dong
2022-02-15 11:27 ` [PATCH net-next 03/19] net: tcp: use kfree_skb_reason() for tcp_v6_rcv() menglong8.dong
2022-02-15 11:27 ` [PATCH net-next 04/19] net: tcp: add skb drop reasons to tcp_v{4,6}_inbound_md5_hash() menglong8.dong
2022-02-15 11:27 ` [PATCH net-next 05/19] net: tcp: add skb drop reasons to tcp_add_backlog() menglong8.dong
2022-02-15 11:27 ` [PATCH net-next 06/19] net: tcp: use kfree_skb_reason() for tcp_v{4,6}_do_rcv() menglong8.dong
2022-02-15 11:28 ` [PATCH net-next 07/19] net: tcp: use tcp_drop_reason() for tcp_rcv_established() menglong8.dong
2022-02-15 11:28 ` [PATCH net-next 08/19] net: tcp: use tcp_drop_reason() for tcp_data_queue() menglong8.dong
2022-02-15 11:28 ` menglong8.dong [this message]
2022-02-15 11:28 ` [PATCH net-next 10/19] net: ip: add skb drop reasons during ip outputting menglong8.dong
2022-02-15 11:28 ` [PATCH net-next 11/19] net: neigh: use kfree_skb_reason() for __neigh_event_send() menglong8.dong
2022-02-15 11:28 ` [PATCH net-next 12/19] net: neigh: add skb drop reasons to arp_error_report() menglong8.dong
2022-02-15 11:28 ` [PATCH net-next 13/19] net: dev: use kfree_skb_reason() for sch_handle_egress() menglong8.dong
2022-02-15 11:28 ` [PATCH net-next 14/19] net: skb: introduce the function kfree_skb_list_reason() menglong8.dong
2022-02-15 11:28 ` [PATCH net-next 15/19] net: dev: add skb drop reasons to __dev_xmit_skb() menglong8.dong
2022-02-15 11:28 ` [PATCH net-next 16/19] net: dev: use kfree_skb_reason() for enqueue_to_backlog() menglong8.dong
2022-02-15 11:28 ` [PATCH net-next 17/19] net: dev: use kfree_skb_reason() for do_xdp_generic() menglong8.dong
2022-02-15 11:28 ` [PATCH net-next 18/19] net: dev: use kfree_skb_reason() for sch_handle_ingress() menglong8.dong
2022-02-15 11:28 ` [PATCH net-next 19/19] net: dev: use kfree_skb_reason() for __netif_receive_skb_core() menglong8.dong
2022-02-15 16:04 ` [PATCH net-next 00/19] net: add skb drop reasons for TCP, IP, dev and neigh Jakub Kicinski
2022-02-15 16:09 ` David Ahern
2022-02-16 1:55 ` Menglong Dong
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=20220215112812.2093852-10-imagedong@tencent.com \
--to=menglong8.dong@gmail.com \
--cc=alobakin@pm.me \
--cc=arnd@arndb.de \
--cc=ast@kernel.org \
--cc=atenart@kernel.org \
--cc=bigeasy@linutronix.de \
--cc=bpf@vger.kernel.org \
--cc=cong.wang@bytedance.com \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=dsahern@kernel.org \
--cc=edumazet@google.com \
--cc=flyingpeng@tencent.com \
--cc=hawk@kernel.org \
--cc=ilias.apalodimas@linaro.org \
--cc=imagedong@tencent.com \
--cc=john.fastabend@gmail.com \
--cc=keescook@chromium.org \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linyunsheng@huawei.com \
--cc=luiz.von.dentz@intel.com \
--cc=memxor@gmail.com \
--cc=mingo@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=roopa@nvidia.com \
--cc=rostedt@goodmis.org \
--cc=talalahmad@google.com \
--cc=vvs@virtuozzo.com \
--cc=willemb@google.com \
--cc=yajun.deng@linux.dev \
--cc=yoshfuji@linux-ipv6.org \
/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).