netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jason Xing <kerneljasonxing@gmail.com>
To: davem@davemloft.net, edumazet@google.com, kuba@kernel.org,
	pabeni@redhat.com, dsahern@kernel.org, kuniyu@amazon.com
Cc: netdev@vger.kernel.org, kerneljasonxing@gmail.com,
	Jason Xing <kernelxing@tencent.com>
Subject: [PATCH net-next v7 05/11] tcp: use drop reasons in cookie check for ipv6
Date: Wed, 21 Feb 2024 10:57:25 +0800	[thread overview]
Message-ID: <20240221025732.68157-6-kerneljasonxing@gmail.com> (raw)
In-Reply-To: <20240221025732.68157-1-kerneljasonxing@gmail.com>

From: Jason Xing <kernelxing@tencent.com>

Like what I did to ipv4 mode, refine this part: adding more drop
reasons for better tracing.

Signed-off-by: Jason Xing <kernelxing@tencent.com>
--
v6:
Link: https://lore.kernel.org/netdev/20240215210922.19969-1-kuniyu@amazon.com/
1. Not use NOMEM because of MPTCP (Kuniyuki). I chose to use NO_SOCKET as
an indicator which can be used as three kinds of cases to tell people that we're
unable to get a valid one. It's a relatively general reason like what we did
to TCP_FLAGS.

v5:
Link: https://lore.kernel.org/netdev/CANn89i+iELpsoea6+C-08m6+=JkneEEM=nAj-28eNtcOCkwQjw@mail.gmail.com/
1. Reuse SKB_DROP_REASON_NOMEM to handle failure of request socket allocation (Eric)
2. Reuse NO_SOCKET instead of introducing COOKIE_NOCHILD
3. Reuse IP_OUTNOROUTES instead of INVALID_DST (Eric)
---
 net/ipv6/syncookies.c | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/net/ipv6/syncookies.c b/net/ipv6/syncookies.c
index ea0d9954a29f..8bad0a44a0a6 100644
--- a/net/ipv6/syncookies.c
+++ b/net/ipv6/syncookies.c
@@ -190,16 +190,20 @@ struct sock *cookie_v6_check(struct sock *sk, struct sk_buff *skb)
 		if (IS_ERR(req))
 			goto out;
 	}
-	if (!req)
+	if (!req) {
+		SKB_DR_SET(reason, NO_SOCKET);
 		goto out_drop;
+	}
 
 	ireq = inet_rsk(req);
 
 	ireq->ir_v6_rmt_addr = ipv6_hdr(skb)->saddr;
 	ireq->ir_v6_loc_addr = ipv6_hdr(skb)->daddr;
 
-	if (security_inet_conn_request(sk, skb, req))
+	if (security_inet_conn_request(sk, skb, req)) {
+		SKB_DR_SET(reason, SECURITY_HOOK);
 		goto out_free;
+	}
 
 	if (ipv6_opt_accepted(sk, skb, &TCP_SKB_CB(skb)->header.h6) ||
 	    np->rxopt.bits.rxinfo || np->rxopt.bits.rxoinfo ||
@@ -236,8 +240,10 @@ struct sock *cookie_v6_check(struct sock *sk, struct sk_buff *skb)
 		security_req_classify_flow(req, flowi6_to_flowi_common(&fl6));
 
 		dst = ip6_dst_lookup_flow(net, sk, &fl6, final_p);
-		if (IS_ERR(dst))
+		if (IS_ERR(dst)) {
+			SKB_DR_SET(reason, IP_OUTNOROUTES);
 			goto out_free;
+		}
 	}
 
 	req->rsk_window_clamp = tp->window_clamp ? :dst_metric(dst, RTAX_WINDOW);
@@ -257,8 +263,10 @@ struct sock *cookie_v6_check(struct sock *sk, struct sk_buff *skb)
 	ireq->ecn_ok &= cookie_ecn_ok(net, dst);
 
 	ret = tcp_get_cookie_sock(sk, skb, req, dst);
-	if (!ret)
+	if (!ret) {
+		SKB_DR_SET(reason, NO_SOCKET);
 		goto out_drop;
+	}
 out:
 	return ret;
 out_free:
-- 
2.37.3


  parent reply	other threads:[~2024-02-21  2:58 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-02-21  2:57 [PATCH net-next v7 00/11] introduce drop reasons for tcp receive path Jason Xing
2024-02-21  2:57 ` [PATCH net-next v7 01/11] tcp: add a dropreason definitions and prepare for cookie check Jason Xing
2024-02-21  9:35   ` Eric Dumazet
2024-02-21  2:57 ` [PATCH net-next v7 02/11] tcp: directly drop skb in cookie check for ipv4 Jason Xing
2024-02-21  9:28   ` Eric Dumazet
2024-02-21  2:57 ` [PATCH net-next v7 03/11] tcp: use drop reasons " Jason Xing
2024-02-21  9:34   ` Eric Dumazet
2024-02-22  2:52     ` Jason Xing
2024-02-21  2:57 ` [PATCH net-next v7 04/11] tcp: directly drop skb in cookie check for ipv6 Jason Xing
2024-02-21  9:36   ` Eric Dumazet
2024-02-21  2:57 ` Jason Xing [this message]
2024-02-21  9:37   ` [PATCH net-next v7 05/11] tcp: use drop reasons " Eric Dumazet
2024-02-21  2:57 ` [PATCH net-next v7 06/11] tcp: introduce dropreasons in receive path Jason Xing
2024-02-21  2:57 ` [PATCH net-next v7 07/11] tcp: add more specific possible drop reasons in tcp_rcv_synsent_state_process() Jason Xing
2024-02-21  9:59   ` Eric Dumazet
2024-02-21  2:57 ` [PATCH net-next v7 08/11] tcp: add dropreasons in tcp_rcv_state_process() Jason Xing
2024-02-21 10:12   ` Eric Dumazet
2024-02-21  2:57 ` [PATCH net-next v7 09/11] tcp: make the dropreason really work when calling tcp_rcv_state_process() Jason Xing
2024-02-21 14:42   ` Eric Dumazet
2024-02-21  2:57 ` [PATCH net-next v7 10/11] tcp: make dropreason in tcp_child_process() work Jason Xing
2024-02-21 14:44   ` Eric Dumazet
2024-02-22  2:25     ` Jason Xing
2024-02-21  2:57 ` [PATCH net-next v7 11/11] tcp: get rid of NOT_SPECIFIED reason in tcp_v4/6_do_rcv Jason Xing
2024-02-21 14:47   ` Eric Dumazet
2024-02-22  2:16     ` Jason Xing

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=20240221025732.68157-6-kerneljasonxing@gmail.com \
    --to=kerneljasonxing@gmail.com \
    --cc=davem@davemloft.net \
    --cc=dsahern@kernel.org \
    --cc=edumazet@google.com \
    --cc=kernelxing@tencent.com \
    --cc=kuba@kernel.org \
    --cc=kuniyu@amazon.com \
    --cc=netdev@vger.kernel.org \
    --cc=pabeni@redhat.com \
    /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).