diff mbox series

[net-next,v7,10/11] tcp: make dropreason in tcp_child_process() work

Message ID 20240221025732.68157-11-kerneljasonxing@gmail.com (mailing list archive)
State Superseded
Delegated to: Netdev Maintainers
Headers show
Series introduce drop reasons for tcp receive path | expand

Checks

Context Check Description
netdev/series_format success Posting correctly formatted
netdev/tree_selection success Clearly marked for net-next, async
netdev/ynl success Generated files up to date; no warnings/errors; no diff in generated;
netdev/fixes_present success Fixes tag not required for -next series
netdev/header_inline success No static functions without inline keyword in header files
netdev/build_32bit success Errors and warnings before: 961 this patch: 961
netdev/build_tools success No tools touched, skip
netdev/cc_maintainers success CCed 5 of 5 maintainers
netdev/build_clang success Errors and warnings before: 958 this patch: 958
netdev/verify_signedoff success Signed-off-by tag matches author and committer
netdev/deprecated_api success None detected
netdev/check_selftest success No net selftest shell script
netdev/verify_fixes success No Fixes tag
netdev/build_allmodconfig_warn success Errors and warnings before: 978 this patch: 978
netdev/checkpatch success total: 0 errors, 0 warnings, 0 checks, 62 lines checked
netdev/build_clang_rust success No Rust files in patch. Skipping build
netdev/kdoc success Errors and warnings before: 0 this patch: 0
netdev/source_inline success Was 0 now: 0
netdev/contest success net-next-2024-02-21--12-00 (tests: 1454)

Commit Message

Jason Xing Feb. 21, 2024, 2:57 a.m. UTC 
From: Jason Xing <kernelxing@tencent.com>

It's time to let it work right now. We've already prepared for this:)

Signed-off-by: Jason Xing <kernelxing@tencent.com>
--
v7
Link: https://lore.kernel.org/all/20240219043815.98410-1-kuniyu@amazon.com/
1. adjust the related part of code only since patch [04/11] is changed.
---
 net/ipv4/tcp_ipv4.c | 16 ++++++++++------
 net/ipv6/tcp_ipv6.c | 20 +++++++++++++-------
 2 files changed, 23 insertions(+), 13 deletions(-)

Comments

Eric Dumazet Feb. 21, 2024, 2:44 p.m. UTC | #1 
On Wed, Feb 21, 2024 at 3:58 AM Jason Xing <kerneljasonxing@gmail.com> wrote:
>
> From: Jason Xing <kernelxing@tencent.com>
>
> It's time to let it work right now. We've already prepared for this:)
>
> Signed-off-by: Jason Xing <kernelxing@tencent.com>
> --
> v7
> Link: https://lore.kernel.org/all/20240219043815.98410-1-kuniyu@amazon.com/
> 1. adjust the related part of code only since patch [04/11] is changed.
> ---
>  net/ipv4/tcp_ipv4.c | 16 ++++++++++------
>  net/ipv6/tcp_ipv6.c | 20 +++++++++++++-------
>  2 files changed, 23 insertions(+), 13 deletions(-)
>
> diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
> index c79e25549972..c886c671fae9 100644
> --- a/net/ipv4/tcp_ipv4.c
> +++ b/net/ipv4/tcp_ipv4.c
> @@ -1917,7 +1917,8 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb)
>                 if (!nsk)
>                         return 0;
>                 if (nsk != sk) {
> -                       if (tcp_child_process(sk, nsk, skb)) {
> +                       reason = tcp_child_process(sk, nsk, skb);
> +                       if (reason) {
>                                 rsk = nsk;
>                                 goto reset;
>                         }
> @@ -2276,12 +2277,15 @@ int tcp_v4_rcv(struct sk_buff *skb)
>                 if (nsk == sk) {
>                         reqsk_put(req);
>                         tcp_v4_restore_cb(skb);
> -               } else if (tcp_child_process(sk, nsk, skb)) {
> -                       tcp_v4_send_reset(nsk, skb);
> -                       goto discard_and_relse;
>                 } else {
> -                       sock_put(sk);
> -                       return 0;
> +                       drop_reason = tcp_child_process(sk, nsk, skb);
> +                       if (drop_reason) {
> +                               tcp_v4_send_reset(nsk, skb);
> +                               goto discard_and_relse;
> +                       } else {

No need for else after a goto (or a return)

> +                               sock_put(sk);
> +                               return 0;
> +                       }
>                 }
>         }
>
> diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
> index 4f8464e04b7f..f260c28e5b18 100644
> --- a/net/ipv6/tcp_ipv6.c
> +++ b/net/ipv6/tcp_ipv6.c
> @@ -1654,8 +1654,11 @@ int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb)
>                 struct sock *nsk = tcp_v6_cookie_check(sk, skb);
>
>                 if (nsk != sk) {
> -                       if (nsk && tcp_child_process(sk, nsk, skb))
> -                               goto reset;
> +                       if (nsk) {
> +                               reason = tcp_child_process(sk, nsk, skb);
> +                               if (reason)
> +                                       goto reset;
> +                       }
>                         if (opt_skb)
>                                 __kfree_skb(opt_skb);
>                         return 0;
> @@ -1854,12 +1857,15 @@ INDIRECT_CALLABLE_SCOPE int tcp_v6_rcv(struct sk_buff *skb)
>                 if (nsk == sk) {
>                         reqsk_put(req);
>                         tcp_v6_restore_cb(skb);
> -               } else if (tcp_child_process(sk, nsk, skb)) {
> -                       tcp_v6_send_reset(nsk, skb);
> -                       goto discard_and_relse;
>                 } else {
> -                       sock_put(sk);
> -                       return 0;
> +                       drop_reason = tcp_child_process(sk, nsk, skb);
> +                       if (drop_reason) {
> +                               tcp_v6_send_reset(nsk, skb);
> +                               goto discard_and_relse;
> +                       } else {


 Same here

> +                               sock_put(sk);
> +                               return 0;
> +                       }
>                 }
>         }
>
> --
> 2.37.3
>
Jason Xing Feb. 22, 2024, 2:25 a.m. UTC | #2 
On Wed, Feb 21, 2024 at 10:44 PM Eric Dumazet <edumazet@google.com> wrote:
>
> On Wed, Feb 21, 2024 at 3:58 AM Jason Xing <kerneljasonxing@gmail.com> wrote:
> >
> > From: Jason Xing <kernelxing@tencent.com>
> >
> > It's time to let it work right now. We've already prepared for this:)
> >
> > Signed-off-by: Jason Xing <kernelxing@tencent.com>
> > --
> > v7
> > Link: https://lore.kernel.org/all/20240219043815.98410-1-kuniyu@amazon.com/
> > 1. adjust the related part of code only since patch [04/11] is changed.
> > ---
> >  net/ipv4/tcp_ipv4.c | 16 ++++++++++------
> >  net/ipv6/tcp_ipv6.c | 20 +++++++++++++-------
> >  2 files changed, 23 insertions(+), 13 deletions(-)
> >
> > diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
> > index c79e25549972..c886c671fae9 100644
> > --- a/net/ipv4/tcp_ipv4.c
> > +++ b/net/ipv4/tcp_ipv4.c
> > @@ -1917,7 +1917,8 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb)
> >                 if (!nsk)
> >                         return 0;
> >                 if (nsk != sk) {
> > -                       if (tcp_child_process(sk, nsk, skb)) {
> > +                       reason = tcp_child_process(sk, nsk, skb);
> > +                       if (reason) {
> >                                 rsk = nsk;
> >                                 goto reset;
> >                         }
> > @@ -2276,12 +2277,15 @@ int tcp_v4_rcv(struct sk_buff *skb)
> >                 if (nsk == sk) {
> >                         reqsk_put(req);
> >                         tcp_v4_restore_cb(skb);
> > -               } else if (tcp_child_process(sk, nsk, skb)) {
> > -                       tcp_v4_send_reset(nsk, skb);
> > -                       goto discard_and_relse;
> >                 } else {
> > -                       sock_put(sk);
> > -                       return 0;
> > +                       drop_reason = tcp_child_process(sk, nsk, skb);
> > +                       if (drop_reason) {
> > +                               tcp_v4_send_reset(nsk, skb);
> > +                               goto discard_and_relse;
> > +                       } else {
>
> No need for else after a goto (or a return)

Thanks, I will do it soon.

>
> > +                               sock_put(sk);
> > +                               return 0;
> > +                       }
> >                 }
> >         }
> >
> > diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
> > index 4f8464e04b7f..f260c28e5b18 100644
> > --- a/net/ipv6/tcp_ipv6.c
> > +++ b/net/ipv6/tcp_ipv6.c
> > @@ -1654,8 +1654,11 @@ int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb)
> >                 struct sock *nsk = tcp_v6_cookie_check(sk, skb);
> >
> >                 if (nsk != sk) {
> > -                       if (nsk && tcp_child_process(sk, nsk, skb))
> > -                               goto reset;
> > +                       if (nsk) {
> > +                               reason = tcp_child_process(sk, nsk, skb);
> > +                               if (reason)
> > +                                       goto reset;
> > +                       }
> >                         if (opt_skb)
> >                                 __kfree_skb(opt_skb);
> >                         return 0;
> > @@ -1854,12 +1857,15 @@ INDIRECT_CALLABLE_SCOPE int tcp_v6_rcv(struct sk_buff *skb)
> >                 if (nsk == sk) {
> >                         reqsk_put(req);
> >                         tcp_v6_restore_cb(skb);
> > -               } else if (tcp_child_process(sk, nsk, skb)) {
> > -                       tcp_v6_send_reset(nsk, skb);
> > -                       goto discard_and_relse;
> >                 } else {
> > -                       sock_put(sk);
> > -                       return 0;
> > +                       drop_reason = tcp_child_process(sk, nsk, skb);
> > +                       if (drop_reason) {
> > +                               tcp_v6_send_reset(nsk, skb);
> > +                               goto discard_and_relse;
> > +                       } else {
>
>
>  Same here

Got it.

>
> > +                               sock_put(sk);
> > +                               return 0;
> > +                       }
> >                 }
> >         }
> >
> > --
> > 2.37.3
> >
diff mbox series

Patch

diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index c79e25549972..c886c671fae9 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -1917,7 +1917,8 @@  int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb)
 		if (!nsk)
 			return 0;
 		if (nsk != sk) {
-			if (tcp_child_process(sk, nsk, skb)) {
+			reason = tcp_child_process(sk, nsk, skb);
+			if (reason) {
 				rsk = nsk;
 				goto reset;
 			}
@@ -2276,12 +2277,15 @@  int tcp_v4_rcv(struct sk_buff *skb)
 		if (nsk == sk) {
 			reqsk_put(req);
 			tcp_v4_restore_cb(skb);
-		} else if (tcp_child_process(sk, nsk, skb)) {
-			tcp_v4_send_reset(nsk, skb);
-			goto discard_and_relse;
 		} else {
-			sock_put(sk);
-			return 0;
+			drop_reason = tcp_child_process(sk, nsk, skb);
+			if (drop_reason) {
+				tcp_v4_send_reset(nsk, skb);
+				goto discard_and_relse;
+			} else {
+				sock_put(sk);
+				return 0;
+			}
 		}
 	}
 
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 4f8464e04b7f..f260c28e5b18 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -1654,8 +1654,11 @@  int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb)
 		struct sock *nsk = tcp_v6_cookie_check(sk, skb);
 
 		if (nsk != sk) {
-			if (nsk && tcp_child_process(sk, nsk, skb))
-				goto reset;
+			if (nsk) {
+				reason = tcp_child_process(sk, nsk, skb);
+				if (reason)
+					goto reset;
+			}
 			if (opt_skb)
 				__kfree_skb(opt_skb);
 			return 0;
@@ -1854,12 +1857,15 @@  INDIRECT_CALLABLE_SCOPE int tcp_v6_rcv(struct sk_buff *skb)
 		if (nsk == sk) {
 			reqsk_put(req);
 			tcp_v6_restore_cb(skb);
-		} else if (tcp_child_process(sk, nsk, skb)) {
-			tcp_v6_send_reset(nsk, skb);
-			goto discard_and_relse;
 		} else {
-			sock_put(sk);
-			return 0;
+			drop_reason = tcp_child_process(sk, nsk, skb);
+			if (drop_reason) {
+				tcp_v6_send_reset(nsk, skb);
+				goto discard_and_relse;
+			} else {
+				sock_put(sk);
+				return 0;
+			}
 		}
 	}