tcp: rstreason: fully support in tcp_rcv_state_process()
authorJason Xing <kernelxing@tencent.com>
Fri, 10 May 2024 12:25:00 +0000 (20:25 +0800)
committerJakub Kicinski <kuba@kernel.org>
Tue, 14 May 2024 00:33:57 +0000 (17:33 -0700)
Like the previous patch does in this series, finish the conversion map is
enough to let rstreason mechanism work in this function.

Signed-off-by: Jason Xing <kernelxing@tencent.com>
Link: https://lore.kernel.org/r/20240510122502.27850-4-kerneljasonxing@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
include/net/rstreason.h

index 69404c14f45d45f3345b26f8f94c25f70a045e2c..fc1b99702771fc32cd110caaddf647fe373cca4c 100644 (file)
@@ -12,6 +12,9 @@
        FN(TCP_RFC7323_PAWS)            \
        FN(TCP_TOO_OLD_ACK)             \
        FN(TCP_ACK_UNSENT_DATA)         \
+       FN(TCP_FLAGS)                   \
+       FN(TCP_OLD_ACK)                 \
+       FN(TCP_ABORT_ON_DATA)           \
        FN(MPTCP_RST_EUNSPEC)           \
        FN(MPTCP_RST_EMPTCP)            \
        FN(MPTCP_RST_ERESOURCE)         \
@@ -59,6 +62,15 @@ enum sk_rst_reason {
         * sent yet
         */
        SK_RST_REASON_TCP_ACK_UNSENT_DATA,
+       /** @SK_RST_REASON_TCP_FLAGS: TCP flags invalid */
+       SK_RST_REASON_TCP_FLAGS,
+       /** @SK_RST_REASON_TCP_OLD_ACK: TCP ACK is old, but in window */
+       SK_RST_REASON_TCP_OLD_ACK,
+       /**
+        * @SK_RST_REASON_TCP_ABORT_ON_DATA: abort on data
+        * corresponding to LINUX_MIB_TCPABORTONDATA
+        */
+       SK_RST_REASON_TCP_ABORT_ON_DATA,
 
        /* Copy from include/uapi/linux/mptcp.h.
         * These reset fields will not be changed since they adhere to
@@ -143,6 +155,12 @@ sk_rst_convert_drop_reason(enum skb_drop_reason reason)
                return SK_RST_REASON_TCP_TOO_OLD_ACK;
        case SKB_DROP_REASON_TCP_ACK_UNSENT_DATA:
                return SK_RST_REASON_TCP_ACK_UNSENT_DATA;
+       case SKB_DROP_REASON_TCP_FLAGS:
+               return SK_RST_REASON_TCP_FLAGS;
+       case SKB_DROP_REASON_TCP_OLD_ACK:
+               return SK_RST_REASON_TCP_OLD_ACK;
+       case SKB_DROP_REASON_TCP_ABORT_ON_DATA:
+               return SK_RST_REASON_TCP_ABORT_ON_DATA;
        default:
                /* If we don't have our own corresponding reason */
                return SK_RST_REASON_NOT_SPECIFIED;