tcp: support rstreason for passive reset

Reuse the dropreason logic to show the exact reason of tcp reset,
so we can finally display the corresponding item in enum sk_reset_reason
instead of reinventing new reset reasons. This patch replaces all
the prior NOT_SPECIFIED reasons.

Signed-off-by: Jason Xing <kernelxing@tencent.com>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/include/net/rstreason.h b/include/net/rstreason.h
index bc53b5a245054bc5149633cee30f7b73b9e5011f..df3b6ac0c9b3fe233bd637ef51d564e57caa75b0 100644 (file)
--- a/include/net/rstreason.h
+++ b/include/net/rstreason.h
@@ -103,4 +103,19 @@ enum sk_rst_reason {
         */
        SK_RST_REASON_MAX,
 };
+
+/* Convert skb drop reasons to enum sk_rst_reason type */
+static inline enum sk_rst_reason
+sk_rst_convert_drop_reason(enum skb_drop_reason reason)
+{
+       switch (reason) {
+       case SKB_DROP_REASON_NOT_SPECIFIED:
+               return SK_RST_REASON_NOT_SPECIFIED;
+       case SKB_DROP_REASON_NO_SOCKET:
+               return SK_RST_REASON_NO_SOCKET;
+       default:
+               /* If we don't have our own corresponding reason */
+               return SK_RST_REASON_NOT_SPECIFIED;
+       }
+}
 #endif

diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index 202f6dfa958b74a1b7f0a5345d2f23e93726d858..621879ba916d8d95b76f281ce6376871de250692 100644 (file)
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -1936,7 +1936,7 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb)
        return 0;
 
 reset:
-       tcp_v4_send_reset(rsk, skb, SK_RST_REASON_NOT_SPECIFIED);
+       tcp_v4_send_reset(rsk, skb, sk_rst_convert_drop_reason(reason));
 discard:
        kfree_skb_reason(skb, reason);
        /* Be careful here. If this function gets more complicated and
@@ -2287,7 +2287,10 @@ lookup:
                } else {
                        drop_reason = tcp_child_process(sk, nsk, skb);
                        if (drop_reason) {
-                               tcp_v4_send_reset(nsk, skb, SK_RST_REASON_NOT_SPECIFIED);
+                               enum sk_rst_reason rst_reason;
+
+                               rst_reason = sk_rst_convert_drop_reason(drop_reason);
+                               tcp_v4_send_reset(nsk, skb, rst_reason);
                                goto discard_and_relse;
                        }
                        sock_put(sk);
@@ -2366,7 +2369,7 @@ csum_error:
 bad_packet:
                __TCP_INC_STATS(net, TCP_MIB_INERRS);
        } else {
-               tcp_v4_send_reset(NULL, skb, SK_RST_REASON_NOT_SPECIFIED);
+               tcp_v4_send_reset(NULL, skb, sk_rst_convert_drop_reason(drop_reason));
        }
 
 discard_it:
@@ -2418,7 +2421,7 @@ do_time_wait:
                tcp_v4_timewait_ack(sk, skb);
                break;
        case TCP_TW_RST:
-               tcp_v4_send_reset(sk, skb, SK_RST_REASON_NOT_SPECIFIED);
+               tcp_v4_send_reset(sk, skb, sk_rst_convert_drop_reason(drop_reason));
                inet_twsk_deschedule_put(inet_twsk(sk));
                goto discard_it;
        case TCP_TW_SUCCESS:;

diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 017f6293b5f4617a5c459cd15a6b09047a254eea..317d7a6e6b01d9058b1b6d003d56b918066dddcb 100644 (file)
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -1680,7 +1680,7 @@ int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb)
        return 0;
 
 reset:
-       tcp_v6_send_reset(sk, skb, SK_RST_REASON_NOT_SPECIFIED);
+       tcp_v6_send_reset(sk, skb, sk_rst_convert_drop_reason(reason));
 discard:
        if (opt_skb)
                __kfree_skb(opt_skb);
@@ -1865,7 +1865,10 @@ lookup:
                } else {
                        drop_reason = tcp_child_process(sk, nsk, skb);
                        if (drop_reason) {
-                               tcp_v6_send_reset(nsk, skb, SK_RST_REASON_NOT_SPECIFIED);
+                               enum sk_rst_reason rst_reason;
+
+                               rst_reason = sk_rst_convert_drop_reason(drop_reason);
+                               tcp_v6_send_reset(nsk, skb, rst_reason);
                                goto discard_and_relse;
                        }
                        sock_put(sk);
@@ -1942,7 +1945,7 @@ csum_error:
 bad_packet:
                __TCP_INC_STATS(net, TCP_MIB_INERRS);
        } else {
-               tcp_v6_send_reset(NULL, skb, SK_RST_REASON_NOT_SPECIFIED);
+               tcp_v6_send_reset(NULL, skb, sk_rst_convert_drop_reason(drop_reason));
        }
 
 discard_it:
@@ -1998,7 +2001,7 @@ do_time_wait:
                tcp_v6_timewait_ack(sk, skb);
                break;
        case TCP_TW_RST:
-               tcp_v6_send_reset(sk, skb, SK_RST_REASON_NOT_SPECIFIED);
+               tcp_v6_send_reset(sk, skb, sk_rst_convert_drop_reason(drop_reason));
                inet_twsk_deschedule_put(inet_twsk(sk));
                goto discard_it;
        case TCP_TW_SUCCESS: