mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: menglong8.dong@gmail.com
To: edumazet@google.com, kuba@kernel.org
Cc: davem@davemloft.net, pabeni@redhat.com, yoshfuji@linux-ipv6.org,
	dsahern@kernel.org, imagedong@tencent.com, kafai@fb.com,
	asml.silence@gmail.com, keescook@chromium.org,
	linux-kernel@vger.kernel.org, netdev@vger.kernel.org
Subject: [PATCH net-next 8/9] net: tcp: store drop reasons in route_req
Date: Sat, 29 Oct 2022 21:09:56 +0800	[thread overview]
Message-ID: <20221029130957.1292060-9-imagedong@tencent.com> (raw)
In-Reply-To: <20221029130957.1292060-1-imagedong@tencent.com>

From: Menglong Dong <imagedong@tencent.com>

Add skb drop reasons to tcp_v4_route_req() and tcp_v6_route_req().

And the new reason SKB_DROP_REASON_LSM is added, which is used when
skb is dropped by LSM.

Signed-off-by: Menglong Dong <imagedong@tencent.com>
---
 include/net/dropreason.h |  5 +++++
 net/ipv4/tcp_ipv4.c      | 11 +++++++++--
 net/ipv6/tcp_ipv6.c      | 11 +++++++++--
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/include/net/dropreason.h b/include/net/dropreason.h
index 364811bce63f..a5de00d02213 100644
--- a/include/net/dropreason.h
+++ b/include/net/dropreason.h
@@ -74,6 +74,7 @@
 	FN(TCP_REQQFULLDROP)		\
 	FN(TCP_ABORTONDATA)		\
 	FN(TCP_ABORTONLINGER)		\
+	FN(LSM)				\
 	FNe(MAX)
 
 /**
@@ -336,6 +337,10 @@ enum skb_drop_reason {
 	 * LINUX_MIB_TCPABORTONLINGER
 	 */
 	SKB_DROP_REASON_TCP_ABORTONLINGER,
+	/**
+	 * @SKB_DROP_REASON_LSM: dropped by LSM
+	 */
+	SKB_DROP_REASON_LSM,
 	/**
 	 * @SKB_DROP_REASON_MAX: the maximum of drop reason, which shouldn't be
 	 * used as a real 'reason'
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index a85bc7483c5a..8fdea8e6207f 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -1447,12 +1447,19 @@ static struct dst_entry *tcp_v4_route_req(const struct sock *sk,
 					  struct flowi *fl,
 					  struct request_sock *req)
 {
+	struct dst_entry *dst;
+
 	tcp_v4_init_req(req, sk, skb);
 
-	if (security_inet_conn_request(sk, skb, req))
+	if (security_inet_conn_request(sk, skb, req)) {
+		TCP_SKB_DR(skb, LSM);
 		return NULL;
+	}
 
-	return inet_csk_route_req(sk, &fl->u.ip4, req);
+	dst = inet_csk_route_req(sk, &fl->u.ip4, req);
+	if (!dst)
+		TCP_SKB_DR(skb, IP_OUTNOROUTES);
+	return dst;
 }
 
 struct request_sock_ops tcp_request_sock_ops __read_mostly = {
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 2c2048832714..44c4aa2789d6 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -823,12 +823,19 @@ static struct dst_entry *tcp_v6_route_req(const struct sock *sk,
 					  struct flowi *fl,
 					  struct request_sock *req)
 {
+	struct dst_entry *dst;
+
 	tcp_v6_init_req(req, sk, skb);
 
-	if (security_inet_conn_request(sk, skb, req))
+	if (security_inet_conn_request(sk, skb, req)) {
+		TCP_SKB_DR(skb, LSM);
 		return NULL;
+	}
 
-	return inet6_csk_route_req(sk, &fl->u.ip6, req, IPPROTO_TCP);
+	dst = inet6_csk_route_req(sk, &fl->u.ip6, req, IPPROTO_TCP);
+	if (!dst)
+		TCP_SKB_DR(skb, IP_OUTNOROUTES);
+	return dst;
 }
 
 struct request_sock_ops tcp6_request_sock_ops __read_mostly = {
-- 
2.37.2


  parent reply	other threads:[~2022-10-29 13:12 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-10-29 13:09 [PATCH net-next 0/9] net: tcp: add skb drop reasons to tcp state process menglong8.dong
2022-10-29 13:09 ` [PATCH net-next 1/9] net: skb: introduce try_kfree_skb() menglong8.dong
2022-10-29 15:30   ` Eric Dumazet
2022-10-31  2:35     ` Menglong Dong
2022-10-29 13:09 ` [PATCH net-next 2/9] net: tcp: add 'drop_reason' field to struct tcp_skb_cb menglong8.dong
2022-10-29 15:23   ` Eric Dumazet
2022-10-31  3:08     ` Menglong Dong
2022-10-29 13:09 ` [PATCH net-next 3/9] net: tcp: use the drop reasons stored in tcp_skb_cb menglong8.dong
2022-10-29 13:09 ` [PATCH net-next 4/9] net: tcp: store drop reasons in tcp_rcv_synsent_state_process() menglong8.dong
2022-10-29 13:09 ` [PATCH net-next 5/9] net: tcp: store drop reasons in tcp_timewait_state_process() menglong8.dong
2022-10-29 13:09 ` [PATCH net-next 6/9] net: tcp: store drop reasons in tcp_conn_request() menglong8.dong
2022-10-29 13:09 ` [PATCH net-next 7/9] net: tcp: store drop reasons in tcp_rcv_state_process() menglong8.dong
2022-10-29 13:09 ` menglong8.dong [this message]
2022-10-29 13:09 ` [PATCH net-next 9/9] net: tcp: use LINUX_MIB_TCPABORTONLINGER " menglong8.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=20221029130957.1292060-9-imagedong@tencent.com \
    --to=menglong8.dong@gmail.com \
    --cc=asml.silence@gmail.com \
    --cc=davem@davemloft.net \
    --cc=dsahern@kernel.org \
    --cc=edumazet@google.com \
    --cc=imagedong@tencent.com \
    --cc=kafai@fb.com \
    --cc=keescook@chromium.org \
    --cc=kuba@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=pabeni@redhat.com \
    --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

all inboxes | Powered by JetHome®