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 v10 05/10] tcp: use drop reasons in cookie check for ipv6
Date: Mon, 26 Feb 2024 11:22:22 +0800 [thread overview]
Message-ID: <20240226032227.15255-6-kerneljasonxing@gmail.com> (raw)
In-Reply-To: <20240226032227.15255-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>
Reviewed-by: Eric Dumazet <edumazet@google•com>
Reviewed-by: David Ahern <dsahern@kernel•org>
Reviewed-by: Kuniyuki Iwashima <kuniyu@amazon•com>
--
v9
Link: https://lore.kernel.org/netdev/c5640fc4-16dc-4058-97c6-bd84bae4fda1@kernel.org/
1. add reviewed-by tag (David)
v8
Link: https://lore.kernel.org/netdev/CANn89i+b+bYqX0aVv9KtSm=nLmEQznamZmqaOzfqtJm_ux9JBw@mail.gmail.com/
1. add reviewed-by tag (Eric)
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
next prev parent reply other threads:[~2024-02-26 3:23 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-26 3:22 [PATCH net-next v10 00/10] introduce drop reasons for tcp receive path Jason Xing
2024-02-26 3:22 ` [PATCH net-next v10 01/10] tcp: add a dropreason definitions and prepare for cookie check Jason Xing
2024-02-26 3:22 ` [PATCH net-next v10 02/10] tcp: directly drop skb in cookie check for ipv4 Jason Xing
2024-02-26 3:22 ` [PATCH net-next v10 03/10] tcp: use drop reasons " Jason Xing
2024-02-26 3:22 ` [PATCH net-next v10 04/10] tcp: directly drop skb in cookie check for ipv6 Jason Xing
2024-02-26 3:22 ` Jason Xing [this message]
2024-02-26 3:22 ` [PATCH net-next v10 06/10] tcp: introduce dropreasons in receive path Jason Xing
2024-02-26 3:22 ` [PATCH net-next v10 07/10] tcp: add more specific possible drop reasons in tcp_rcv_synsent_state_process() Jason Xing
2024-02-26 3:22 ` [PATCH net-next v10 08/10] tcp: add dropreasons in tcp_rcv_state_process() Jason Xing
2024-02-26 3:22 ` [PATCH net-next v10 09/10] tcp: make the dropreason really work when calling tcp_rcv_state_process() Jason Xing
2024-02-26 3:22 ` [PATCH net-next v10 10/10] tcp: make dropreason in tcp_child_process() work Jason Xing
2024-02-28 10:50 ` [PATCH net-next v10 00/10] introduce drop reasons for tcp receive path patchwork-bot+netdevbpf
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=20240226032227.15255-6-kerneljasonxing@gmail.com \
--to=kerneljasonxing@gmail$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=dsahern@kernel$(echo .)org \
--cc=edumazet@google$(echo .)com \
--cc=kernelxing@tencent$(echo .)com \
--cc=kuba@kernel$(echo .)org \
--cc=kuniyu@amazon$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
--cc=pabeni@redhat$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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