Implement reset reason mechanism to detect
Subsystems (5)
cover Implement reset reason mechanism to detect
From: Jason Xing <[email protected]>
In production, there are so many cases about why the RST skb is sent but we don't have a very convenient/fast method to detect the exact underlying reasons.
RST is implemented in two kinds: passive kind (like tcp_v4_send_reset()) and active kind (like tcp_send_active_reset()). The former can be traced carefully 1) in TCP, with the help of drop reasons, which is based on Eric's idea[1], 2) in MPTCP, with the help of reset options defined in RFC 8684. The latter is relatively independent, which should be implemented on our own.
In this series, I focus on the fundamental implement mostly about how the rstreason mechnism and the detailed passive part works as an example, not including the active reset part. In future, we can go further and refine those NOT_SPECIFIED reasons.
Here are some examples when tracing:
<idle>-0 [002] ..s1. 1830.262425: tcp_send_reset: skbaddr=x
skaddr=x src=x dest=x state=x reason=NOT_SPECIFIED
<idle>-0 [002] ..s1. 1830.262425: tcp_send_reset: skbaddr=x
skaddr=x src=x dest=x state=x reason=NO_SOCKET
v2
1. rebase against the latest net-next tree
Jason Xing (6):
net: introduce rstreason to detect why the RST is sent
rstreason: prepare for passive reset
rstreason: prepare for active reset
tcp: support rstreason for passive reset
mptcp: support rstreason for passive reset
rstreason: make it work in trace world
include/net/request_sock.h | 3 +- include/net/rstreason.h | 93 ++++++++++++++++++++++++++++++++++++++ include/net/tcp.h | 2 +- include/trace/events/tcp.h | 37 +++++++++++++-- net/dccp/ipv4.c | 10 ++-- net/dccp/ipv6.c | 10 ++-- net/dccp/minisocks.c | 3 +- net/ipv4/tcp.c | 15 ++++-- net/ipv4/tcp_ipv4.c | 14 +++--- net/ipv4/tcp_minisocks.c | 3 +- net/ipv4/tcp_output.c | 4 +- net/ipv4/tcp_timer.c | 9 ++-- net/ipv6/tcp_ipv6.c | 17 ++++--- net/mptcp/protocol.c | 4 +- net/mptcp/subflow.c | 33 ++++++++++---- 15 files changed, 209 insertions(+), 48 deletions(-) create mode 100644 include/net/rstreason.h
Signature · 1 line
2.37.3
PATCH v2 1/6 net: introduce rstreason to detect why the RST is sent
From: Jason Xing <[email protected]>
Add a new standalone file for the easy future extension to support both active reset and passive reset in the TCP/DCCP/MPTCP protocols.
This patch only does the preparations for reset reason mechanism, nothing else changes.
The reset reasons are divided into three parts:
1) reuse drop reasons for passive reset in TCP
2) reuse MP_TCPRST option for MPTCP
3) our own reasons
I will implement the basic codes of active/passive reset reason in those three protocols, which is not complete for this moment. But it provides a new chance to let other people add more reasons into it:)
--- include/net/rstreason.h | 93 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) create mode 100644 include/net/rstreason.h
include/net/rstreason.h new file +93 -0
@@ -0,0 +1,93 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#ifndef _LINUX_RSTREASON_H +#define _LINUX_RSTREASON_H +#include <net/dropreason-core.h> + +#define DEFINE_RST_REASON (FN , FNe) \ + FN(MPTCP_RST_EUNSPEC) \ + FN(MPTCP_RST_EMPTCP) \ + FN(MPTCP_RST_ERESOURCE) \ + FN(MPTCP_RST_EPROHIBIT) \ + FN(MPTCP_RST_EWQ2BIG) \ + FN(MPTCP_RST_EBADPERF) \ + FN(MPTCP_RST_EMIDDLEBOX) \ + FN(NOT_SPECIFIED) \ + FNe(MAX) + +#define RST_REASON_START (SKB_DROP_REASON_MAX + 1) + +/* There are three parts in order: +* 1) 0 - SKB_DROP_REASON_MAX: rely on drop reasons for passive reset in TCP +* 2) SKB_DROP_REASON_MAX + 1 - MPTCP_RST_EMIDDLEBOX: for MPTCP use +* 3) MPTCP_RST_EMIDDLEBOX - SK_RST_REASON_MAX: independent reset reason +*/ +enum sk_rst_reason { +/* Leave this 'blank' part (0-SKB_DROP_REASON_MAX) for the reuse +* of skb drop reason because rst reason relies on what drop reason +* indicates exactly why it could happen. +*/ + +/* Copy from include/uapi/linux/mptcp.h. +* These reset fields will not be changed since they adhere to +* RFC 8684. So do not touch them. I'm going to list each definition +* of them respectively. +*/ +/* Unspecified error. +* This is the default error; it implies that the subflow is no +* longer available. The presence of this option shows that the +* RST was generated by an MPTCP-aware device. +*/ +SK_RST_REASON_MPTCP_RST_EUNSPEC =RST_REASON_START , +/* MPTCP-specific error. +* An error has been detected in the processing of MPTCP options. +* This is the usual reason code to return in the cases where a RST +* is being sent to close a subflow because of an invalid response. +*/ +SK_RST_REASON_MPTCP_RST_EMPTCP , +/* Lack of resources. +* This code indicates that the sending host does not have enough +* resources to support the terminated subflow. +*/ +SK_RST_REASON_MPTCP_RST_ERESOURCE , +/* Administratively prohibited. +* This code indicates that the requested subflow is prohibited by +* the policies of the sending host. +*/ +SK_RST_REASON_MPTCP_RST_EPROHIBIT , +/* Too much outstanding data. +* This code indicates that there is an excessive amount of data +* that needs to be transmitted over the terminated subflow while +* having already been acknowledged over one or more other subflows. +* This may occur if a path has been unavailable for a short period +* and it is more efficient to reset and start again than it is to +* retransmit the queued data. +*/ +SK_RST_REASON_MPTCP_RST_EWQ2BIG , +/* Unacceptable performance. +* This code indicates that the performance of this subflow was +* too low compared to the other subflows of this Multipath TCP +* connection. +*/ +SK_RST_REASON_MPTCP_RST_EBADPERF , +/* Middlebox interference. +* Middlebox interference has been detected over this subflow, +* making MPTCP signaling invalid. For example, this may be sent +* if the checksum does not validate. +*/ +SK_RST_REASON_MPTCP_RST_EMIDDLEBOX , + +/* For the real standalone socket reset reason, we start from here */ +SK_RST_REASON_NOT_SPECIFIED , + +/* Maximum of socket reset reasons. +* It shouldn't be used as a real 'reason'. +*/ +SK_RST_REASON_MAX , +}; + +static inline int convert_mptcp_reason (int reason) +{ +return reason +=RST_REASON_START ; +} +#endif
Signature · 1 line
2.37.3
PATCH v2 2/6 rstreason: prepare for passive reset
In reply to Jason XingFrom: Jason Xing <[email protected]>
Adjust the paramenter and support passing reason of reset which is for now NOT_SPECIFIED. No functional changes.
--- include/net/request_sock.h | 3 ++- net/dccp/ipv4.c | 10 ++++++---- net/dccp/ipv6.c | 10 ++++++---- net/dccp/minisocks.c | 3 ++- net/ipv4/tcp_ipv4.c | 12 +++++++----- net/ipv4/tcp_minisocks.c | 3 ++- net/ipv6/tcp_ipv6.c | 15 +++++++++------ net/mptcp/subflow.c | 8 +++++--- 8 files changed, 39 insertions(+), 25 deletions(-)
include/net/request_sock.h +2 -1
@@ -34,7 +34,8 @@ struct request_sock_ops {void (*send_ack)(const struct sock *sk,struct sk_buff *skb,struct request_sock *req);void (*send_reset)(const struct sock *sk, -struct sk_buff *skb); +struct sk_buff *skb, +int reason);void (*destructor)(struct request_sock *req);void (*syn_ack_timeout)(const struct request_sock *req); };
net/dccp/ipv4.c +6 -4
@@ -24,6 +24,7 @@#include <net/xfrm.h> #include <net/secure_seq.h> #include <net/netns/generic.h> +#include <net/rstreason.h> #include "ackvec.h" #include "ccid.h"
@@ -521,7 +522,8 @@ static int dccp_v4_send_response(const struct sock *sk, struct request_sock *reqreturn err; } -static void dccp_v4_ctl_send_reset (const struct sock *sk,struct sk_buff *rxskb) +static void dccp_v4_ctl_send_reset (const struct sock *sk,struct sk_buff *rxskb, +int reason) {int err;const struct iphdr *rxiph;
@@ -706,7 +708,7 @@ int dccp_v4_do_rcv(struct sock *sk, struct sk_buff *skb)return 0 ; reset: -dccp_v4_ctl_send_reset (sk, skb); +dccp_v4_ctl_send_reset (sk, skb,SK_RST_REASON_NOT_SPECIFIED );kfree_skb (skb);return 0 ; }
@@ -869,7 +871,7 @@ static int dccp_v4_rcv(struct sk_buff *skb)if (nsk == sk) {reqsk_put (req); }else if (dccp_child_process (sk, nsk, skb)) { -dccp_v4_ctl_send_reset (sk, skb); +dccp_v4_ctl_send_reset (sk, skb,SK_RST_REASON_NOT_SPECIFIED ); goto discard_and_relse; }else {sock_put (sk);
@@ -909,7 +911,7 @@ static int dccp_v4_rcv(struct sk_buff *skb)if (dh->dccph_type !=DCCP_PKT_RESET ) {DCCP_SKB_CB (skb)->dccpd_reset_code =DCCP_RESET_CODE_NO_CONNECTION ; -dccp_v4_ctl_send_reset (sk, skb); +dccp_v4_ctl_send_reset (sk, skb,SK_RST_REASON_NOT_SPECIFIED ); } discard_it:
net/dccp/ipv6.c +6 -4
@@ -29,6 +29,7 @@#include <net/secure_seq.h> #include <net/netns/generic.h> #include <net/sock.h> +#include <net/rstreason.h> #include "dccp.h" #include "ipv6.h"
@@ -256,7 +257,8 @@ static void dccp_v6_reqsk_destructor(struct request_sock *req)kfree_skb (inet_rsk (req)->pktopts); } -static void dccp_v6_ctl_send_reset (const struct sock *sk,struct sk_buff *rxskb) +static void dccp_v6_ctl_send_reset (const struct sock *sk,struct sk_buff *rxskb, +int reason) {const struct ipv6hdr *rxip6h;struct sk_buff *skb;
@@ -656,7 +658,7 @@ static int dccp_v6_do_rcv(struct sock *sk, struct sk_buff *skb)return 0 ; reset: -dccp_v6_ctl_send_reset (sk, skb); +dccp_v6_ctl_send_reset (sk, skb,SK_RST_REASON_NOT_SPECIFIED ); discard:if (opt_skb !=NULL )__kfree_skb (opt_skb);
@@ -762,7 +764,7 @@ static int dccp_v6_rcv(struct sk_buff *skb)if (nsk == sk) {reqsk_put (req); }else if (dccp_child_process (sk, nsk, skb)) { -dccp_v6_ctl_send_reset (sk, skb); +dccp_v6_ctl_send_reset (sk, skb,SK_RST_REASON_NOT_SPECIFIED ); goto discard_and_relse; }else {sock_put (sk);
@@ -801,7 +803,7 @@ static int dccp_v6_rcv(struct sk_buff *skb)if (dh->dccph_type !=DCCP_PKT_RESET ) {DCCP_SKB_CB (skb)->dccpd_reset_code =DCCP_RESET_CODE_NO_CONNECTION ; -dccp_v6_ctl_send_reset (sk, skb); +dccp_v6_ctl_send_reset (sk, skb,SK_RST_REASON_NOT_SPECIFIED ); } discard_it:
net/dccp/minisocks.c +2 -1
@@ -15,6 +15,7 @@#include <net/sock.h> #include <net/xfrm.h> #include <net/inet_timewait_sock.h> +#include <net/rstreason.h> #include "ackvec.h" #include "ccid.h"
@@ -202,7 +203,7 @@ struct sock *dccp_check_req(struct sock *sk, struct sk_buff *skb,DCCP_SKB_CB (skb)->dccpd_reset_code =DCCP_RESET_CODE_TOO_BUSY ; drop:if (dccp_hdr (skb)->dccph_type !=DCCP_PKT_RESET ) - req->rsk_ops->send_reset (sk, skb); + req->rsk_ops->send_reset (sk, skb,SK_RST_REASON_NOT_SPECIFIED );inet_csk_reqsk_queue_drop (sk, req); out:
net/ipv4/tcp_ipv4.c +7 -5
@@ -70,6 +70,7 @@#include <net/xfrm.h> #include <net/secure_seq.h> #include <net/busy_poll.h> +#include <net/rstreason.h> #include <linux/inet.h> #include <linux/ipv6.h>
@@ -723,7 +724,8 @@ static bool tcp_v4_ao_sign_reset(const struct sock *sk, struct sk_buff *skb,* Exception: precedence violation. We do not implement it in any case. */ -static void tcp_v4_send_reset (const struct sock *sk,struct sk_buff *skb) +static void tcp_v4_send_reset (const struct sock *sk,struct sk_buff *skb, +int reason) {const struct tcphdr *th =tcp_hdr (skb);struct {
@@ -1933,7 +1935,7 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb)return 0 ; reset: -tcp_v4_send_reset (rsk, skb); +tcp_v4_send_reset (rsk, skb,SK_RST_REASON_NOT_SPECIFIED ); discard:kfree_skb_reason (skb, reason);/* Be careful here. If this function gets more complicated and
@@ -2278,7 +2280,7 @@ int tcp_v4_rcv(struct sk_buff *skb) }else { drop_reason =tcp_child_process (sk, nsk, skb);if (drop_reason) { -tcp_v4_send_reset (nsk, skb); +tcp_v4_send_reset (nsk, skb,SK_RST_REASON_NOT_SPECIFIED ); goto discard_and_relse; }sock_put (sk);
@@ -2356,7 +2358,7 @@ int tcp_v4_rcv(struct sk_buff *skb) bad_packet:__TCP_INC_STATS (net,TCP_MIB_INERRS ); }else { -tcp_v4_send_reset (NULL , skb); +tcp_v4_send_reset (NULL , skb,SK_RST_REASON_NOT_SPECIFIED ); } discard_it:
@@ -2407,7 +2409,7 @@ int tcp_v4_rcv(struct sk_buff *skb)tcp_v4_timewait_ack (sk, skb);break ;case TCP_TW_RST : -tcp_v4_send_reset (sk, skb); +tcp_v4_send_reset (sk, skb,SK_RST_REASON_NOT_SPECIFIED );inet_twsk_deschedule_put (inet_twsk (sk)); goto discard_it;case TCP_TW_SUCCESS :;
net/ipv4/tcp_minisocks.c +2 -1
@@ -22,6 +22,7 @@#include <net/tcp.h> #include <net/xfrm.h> #include <net/busy_poll.h> +#include <net/rstreason.h> static bool tcp_in_window (u32 seq,u32 end_seq,u32 s_win,u32 e_win) {
@@ -879,7 +880,7 @@ struct sock *tcp_check_req(struct sock *sk, struct sk_buff *skb,* avoid becoming vulnerable to outside attack aiming at * resetting legit local connections. */ - req->rsk_ops->send_reset (sk, skb); + req->rsk_ops->send_reset (sk, skb,SK_RST_REASON_NOT_SPECIFIED ); }else if (fastopen) {/* received a valid RST pkt */ reqsk_fastopen_remove (sk, req, true);tcp_reset (sk, skb);
net/ipv6/tcp_ipv6.c +9 -6
@@ -60,6 +60,7 @@#include <net/secure_seq.h> #include <net/hotdata.h> #include <net/busy_poll.h> +#include <net/rstreason.h> #include <linux/proc_fs.h> #include <linux/seq_file.h>
@@ -69,7 +70,8 @@#include <trace/events/tcp.h> -static void tcp_v6_send_reset (const struct sock *sk,struct sk_buff *skb); +static void tcp_v6_send_reset (const struct sock *sk,struct sk_buff *skb, +int reason);static void tcp_v6_reqsk_send_ack (const struct sock *sk,struct sk_buff *skb,struct request_sock *req);
@@ -1006,7 +1008,8 @@ static void tcp_v6_send_response(const struct sock *sk, struct sk_buff *skb, u32kfree_skb (buff); } -static void tcp_v6_send_reset (const struct sock *sk,struct sk_buff *skb) +static void tcp_v6_send_reset (const struct sock *sk,struct sk_buff *skb, +int reason) {const struct tcphdr *th =tcp_hdr (skb);struct ipv6hdr *ipv6h =ipv6_hdr (skb);
@@ -1675,7 +1678,7 @@ int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb)return 0 ; reset: -tcp_v6_send_reset (sk, skb); +tcp_v6_send_reset (sk, skb,SK_RST_REASON_NOT_SPECIFIED ); discard:if (opt_skb)__kfree_skb (opt_skb);
@@ -1861,7 +1864,7 @@ INDIRECT_CALLABLE_SCOPE int tcp_v6_rcv(struct sk_buff *skb) }else { drop_reason =tcp_child_process (sk, nsk, skb);if (drop_reason) { -tcp_v6_send_reset (nsk, skb); +tcp_v6_send_reset (nsk, skb,SK_RST_REASON_NOT_SPECIFIED ); goto discard_and_relse; }sock_put (sk);
@@ -1937,7 +1940,7 @@ INDIRECT_CALLABLE_SCOPE int tcp_v6_rcv(struct sk_buff *skb) bad_packet:__TCP_INC_STATS (net,TCP_MIB_INERRS ); }else { -tcp_v6_send_reset (NULL , skb); +tcp_v6_send_reset (NULL , skb,SK_RST_REASON_NOT_SPECIFIED ); } discard_it:
@@ -1992,7 +1995,7 @@ INDIRECT_CALLABLE_SCOPE int tcp_v6_rcv(struct sk_buff *skb)tcp_v6_timewait_ack (sk, skb);break ;case TCP_TW_RST : -tcp_v6_send_reset (sk, skb); +tcp_v6_send_reset (sk, skb,SK_RST_REASON_NOT_SPECIFIED );inet_twsk_deschedule_put (inet_twsk (sk)); goto discard_it;case TCP_TW_SUCCESS :
net/mptcp/subflow.c +5 -3
@@ -20,6 +20,8 @@#include <net/transp_v6.h> #endif #include <net/mptcp.h> +#include <net/rstreason.h> +#include "protocol.h" #include "mib.h"
@@ -302,7 +304,7 @@ static struct dst_entry *subflow_v4_route_req(const struct sock *sk,dst_release (dst);if (!req->syncookie) - tcp_request_sock_ops.send_reset (sk, skb); + tcp_request_sock_ops.send_reset (sk, skb,SK_RST_REASON_NOT_SPECIFIED );return NULL ; }
@@ -369,7 +371,7 @@ static struct dst_entry *subflow_v6_route_req(const struct sock *sk,dst_release (dst);if (!req->syncookie) - tcp6_request_sock_ops.send_reset (sk, skb); + tcp6_request_sock_ops.send_reset (sk, skb,SK_RST_REASON_NOT_SPECIFIED ); return NULL; }#endif
@@ -899,7 +901,7 @@ static struct sock *subflow_syn_recv_sock(const struct sock *sk,tcp_rsk (req)->drop_req = true;inet_csk_prepare_for_destroy_sock (child);tcp_done (child); - req->rsk_ops->send_reset (sk, skb); + req->rsk_ops->send_reset (sk, skb,SK_RST_REASON_NOT_SPECIFIED );/* The last child reference will be released by the caller */ return child;
Signature · 1 line
2.37.3
PATCH v2 3/6 rstreason: prepare for active reset
In reply to Jason XingFrom: Jason Xing <[email protected]>
Like what we did to passive reset:
only passing possible reset reason in each active reset path.
No functional changes.
--- include/net/tcp.h | 2 +- net/ipv4/tcp.c | 15 ++++++++++----- net/ipv4/tcp_output.c | 2 +- net/ipv4/tcp_timer.c | 9 ++++++--- net/mptcp/protocol.c | 4 +++- net/mptcp/subflow.c | 5 +++-- 6 files changed, 24 insertions(+), 13 deletions(-)
include/net/tcp.h +1 -1
@@ -667,7 +667,7 @@ int tcp_fragment(struct sock *sk, enum tcp_queue tcp_queue,void tcp_send_probe0 (struct sock *);int tcp_write_wakeup (struct sock *,int mib);void tcp_send_fin (struct sock *sk); -void tcp_send_active_reset (struct sock *sk,gfp_t priority); +void tcp_send_active_reset (struct sock *sk,gfp_t priority,int reason);int tcp_send_synack (struct sock *);void tcp_push_one (struct sock *,unsigned int mss_now);void __tcp_send_ack (struct sock *sk,u32 rcv_nxt);
net/ipv4/tcp.c +10 -5
@@ -275,6 +275,7 @@#include <net/xfrm.h> #include <net/ip.h> #include <net/sock.h> +#include <net/rstreason.h> #include <linux/uaccess.h> #include <asm/ioctls.h>
@@ -2805,7 +2806,8 @@ void __tcp_close(struct sock *sk, long timeout)/* Unread data was tossed, zap the connection. */ NET_INC_STATS (sock_net (sk),LINUX_MIB_TCPABORTONCLOSE );tcp_set_state (sk,TCP_CLOSE ); -tcp_send_active_reset (sk, sk->sk_allocation); +tcp_send_active_reset (sk, sk->sk_allocation, +SK_RST_REASON_NOT_SPECIFIED ); }else if (sock_flag (sk,SOCK_LINGER ) && !sk->sk_lingertime) {/* Check zero linger _after_ checking for unread data. */ sk->sk_prot->disconnect (sk,0 );
@@ -2879,7 +2881,8 @@ void __tcp_close(struct sock *sk, long timeout)struct tcp_sock *tp =tcp_sk (sk);if (READ_ONCE (tp->linger2) <0 ) {tcp_set_state (sk,TCP_CLOSE ); -tcp_send_active_reset (sk,GFP_ATOMIC ); +tcp_send_active_reset (sk,GFP_ATOMIC , +SK_RST_REASON_NOT_SPECIFIED );__NET_INC_STATS (sock_net (sk),LINUX_MIB_TCPABORTONLINGER ); }else {
@@ -2897,7 +2900,8 @@ void __tcp_close(struct sock *sk, long timeout)if (sk->sk_state !=TCP_CLOSE ) {if (tcp_check_oom (sk,0 )) {tcp_set_state (sk,TCP_CLOSE ); -tcp_send_active_reset (sk,GFP_ATOMIC ); +tcp_send_active_reset (sk,GFP_ATOMIC , +SK_RST_REASON_NOT_SPECIFIED );__NET_INC_STATS (sock_net (sk),LINUX_MIB_TCPABORTONMEMORY ); }else if (!check_net (sock_net (sk))) {
@@ -3001,7 +3005,7 @@ int tcp_disconnect(struct sock *sk, int flags)/* The last check adjusts for discrepancy of Linux wrt. RFC * states */ -tcp_send_active_reset (sk,gfp_any ()); +tcp_send_active_reset (sk,gfp_any (),SK_RST_REASON_NOT_SPECIFIED );WRITE_ONCE (sk->sk_err,ECONNRESET ); }else if (old_state ==TCP_SYN_SENT )WRITE_ONCE (sk->sk_err,ECONNRESET );
@@ -4557,7 +4561,8 @@ int tcp_abort(struct sock *sk, int err)smp_wmb ();sk_error_report (sk);if (tcp_need_reset (sk->sk_state)) -tcp_send_active_reset (sk,GFP_ATOMIC ); +tcp_send_active_reset (sk,GFP_ATOMIC , +SK_RST_REASON_NOT_SPECIFIED );tcp_done (sk); }
net/ipv4/tcp_output.c +1 -1
@@ -3583,7 +3583,7 @@ void tcp_send_fin(struct sock *sk)* was unread data in the receive queue. This behavior is recommended * by RFC 2525, section 2.17. -DaveM */ -void tcp_send_active_reset (struct sock *sk,gfp_t priority) +void tcp_send_active_reset (struct sock *sk,gfp_t priority,int reason) {struct sk_buff *skb;
net/ipv4/tcp_timer.c +6 -3
@@ -22,6 +22,7 @@#include <linux/module.h> #include <linux/gfp.h> #include <net/tcp.h> +#include <net/rstreason.h> static u32 tcp_clamp_rto_to_user_timeout (const struct sock *sk) {
@@ -127,7 +128,8 @@ static int tcp_out_of_resources(struct sock *sk, bool do_reset) (!tp->snd_wnd && !tp->packets_out)) do_reset = true;if (do_reset) -tcp_send_active_reset (sk,GFP_ATOMIC ); +tcp_send_active_reset (sk,GFP_ATOMIC , +SK_RST_REASON_NOT_SPECIFIED );tcp_done (sk);__NET_INC_STATS (sock_net (sk),LINUX_MIB_TCPABORTONMEMORY );return 1 ;
@@ -768,7 +770,7 @@ static void tcp_keepalive_timer (struct timer_list *t) goto out; } } -tcp_send_active_reset (sk,GFP_ATOMIC ); +tcp_send_active_reset (sk,GFP_ATOMIC ,SK_RST_REASON_NOT_SPECIFIED ); goto death; }
@@ -795,7 +797,8 @@ static void tcp_keepalive_timer (struct timer_list *t) icsk->icsk_probes_out > 0) || (user_timeout == 0 && icsk->icsk_probes_out >= keepalive_probes(tp))) { -tcp_send_active_reset (sk,GFP_ATOMIC ); +tcp_send_active_reset (sk,GFP_ATOMIC , +SK_RST_REASON_NOT_SPECIFIED );tcp_write_err (sk); goto out; }
net/mptcp/protocol.c +3 -1
@@ -21,6 +21,7 @@#endif #include <net/mptcp.h> #include <net/xfrm.h> +#include <net/rstreason.h> #include <asm/ioctls.h> #include "protocol.h" #include "mib.h"
@@ -2565,7 +2566,8 @@ static void mptcp_check_fastclose(struct mptcp_sock *msk) slow =lock_sock_fast (tcp_sk);if (tcp_sk->sk_state !=TCP_CLOSE ) { -tcp_send_active_reset (tcp_sk,GFP_ATOMIC ); +tcp_send_active_reset (tcp_sk,GFP_ATOMIC , +SK_RST_REASON_NOT_SPECIFIED );tcp_set_state (tcp_sk,TCP_CLOSE ); }unlock_sock_fast (tcp_sk, slow);
net/mptcp/subflow.c +3 -2
@@ -407,7 +407,7 @@ void mptcp_subflow_reset(struct sock *ssk)/* must hold: tcp_done() could drop last reference on parent */ sock_hold (sk); -tcp_send_active_reset (ssk,GFP_ATOMIC ); +tcp_send_active_reset (ssk,GFP_ATOMIC ,SK_RST_REASON_NOT_SPECIFIED );tcp_done (ssk);if (!test_and_set_bit (MPTCP_WORK_CLOSE_SUBFLOW , &mptcp_sk (sk)->flags))mptcp_schedule_work (sk);
@@ -1336,7 +1336,8 @@ static bool subflow_check_data_avail(struct sock *ssk)tcp_set_state (ssk,TCP_CLOSE );while ((skb =skb_peek (&ssk->sk_receive_queue)))sk_eat_skb (ssk, skb); -tcp_send_active_reset (ssk,GFP_ATOMIC ); +tcp_send_active_reset (ssk,GFP_ATOMIC , +SK_RST_REASON_NOT_SPECIFIED );WRITE_ONCE (subflow->data_avail, false);return false; }
Signature · 1 line
2.37.3
PATCH v2 4/6 tcp: support rstreason for passive reset
In reply to Jason XingFrom: Jason Xing <[email protected]>
Reuse the dropreason logic to show the exact reason of tcp reset, so we don't need to implement those duplicated reset reasons. This patch replaces all the prior NOT_SPECIFIED reasons.
--- net/ipv4/tcp_ipv4.c | 8 ++++---- net/ipv6/tcp_ipv6.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-)
net/ipv4/tcp_ipv4.c +4 -4
@@ -1935,7 +1935,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, reason); discard:kfree_skb_reason (skb, reason);/* Be careful here. If this function gets more complicated and
@@ -2280,7 +2280,7 @@ int tcp_v4_rcv(struct sk_buff *skb) }else { drop_reason =tcp_child_process (sk, nsk, skb);if (drop_reason) { -tcp_v4_send_reset (nsk, skb,SK_RST_REASON_NOT_SPECIFIED ); +tcp_v4_send_reset (nsk, skb, drop_reason); goto discard_and_relse; }sock_put (sk);
@@ -2358,7 +2358,7 @@ int tcp_v4_rcv(struct sk_buff *skb) 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, drop_reason); } discard_it:
@@ -2409,7 +2409,7 @@ int tcp_v4_rcv(struct sk_buff *skb)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, drop_reason);inet_twsk_deschedule_put (inet_twsk (sk)); goto discard_it;case TCP_TW_SUCCESS :;
net/ipv6/tcp_ipv6.c +4 -4
@@ -1678,7 +1678,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, reason); discard:if (opt_skb)__kfree_skb (opt_skb);
@@ -1864,7 +1864,7 @@ INDIRECT_CALLABLE_SCOPE int tcp_v6_rcv(struct sk_buff *skb) }else { drop_reason =tcp_child_process (sk, nsk, skb);if (drop_reason) { -tcp_v6_send_reset (nsk, skb,SK_RST_REASON_NOT_SPECIFIED ); +tcp_v6_send_reset (nsk, skb, drop_reason); goto discard_and_relse; }sock_put (sk);
@@ -1940,7 +1940,7 @@ INDIRECT_CALLABLE_SCOPE int tcp_v6_rcv(struct sk_buff *skb) 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, drop_reason); } discard_it:
@@ -1995,7 +1995,7 @@ INDIRECT_CALLABLE_SCOPE int tcp_v6_rcv(struct sk_buff *skb)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, drop_reason);inet_twsk_deschedule_put (inet_twsk (sk)); goto discard_it;case TCP_TW_SUCCESS :
Signature · 1 line
2.37.3
PATCH v2 5/6 mptcp: support rstreason for passive reset
In reply to Jason XingFrom: Jason Xing <[email protected]>
It relys on what reset options in MPTCP does as rfc8684 says. Reusing this logic can save us much energy. This patch replaces all the prior NOT_SPECIFIED reasons.
--- net/mptcp/subflow.c | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-)
net/mptcp/subflow.c +20 -6
@@ -304,7 +304,10 @@ static struct dst_entry *subflow_v4_route_req(const struct sock *sk,dst_release (dst);if (!req->syncookie) - tcp_request_sock_ops.send_reset (sk, skb,SK_RST_REASON_NOT_SPECIFIED ); +/* According to RFC 8684, 3.2. Starting a New Subflow, +* we should use an "MPTCP specific error" reason code. +*/ + tcp_request_sock_ops.send_reset (sk, skb,SK_RST_REASON_MPTCP_RST_EMPTCP );return NULL ; }
@@ -371,7 +374,10 @@ static struct dst_entry *subflow_v6_route_req(const struct sock *sk,dst_release (dst);if (!req->syncookie) - tcp6_request_sock_ops.send_reset (sk, skb,SK_RST_REASON_NOT_SPECIFIED ); +/* According to RFC 8684, 3.2. Starting a New Subflow, +* we should use an "MPTCP specific error" reason code. +*/ + tcp6_request_sock_ops.send_reset (sk, skb,SK_RST_REASON_MPTCP_RST_EMPTCP ); return NULL; }#endif
@@ -778,6 +784,7 @@ static struct sock *subflow_syn_recv_sock(const struct sock *sk,bool fallback, fallback_is_fatal;struct mptcp_sock *owner;struct sock *child; +int reason;pr_debug ("listener=%p, req=%p, conn=%p" , listener, req, listener->conn);
@@ -833,7 +840,8 @@ static struct sock *subflow_syn_recv_sock(const struct sock *sk,*/ if (!ctx || fallback) {if (fallback_is_fatal) { -subflow_add_reset_reason (skb,MPTCP_RST_EMPTCP ); + reason =MPTCP_RST_EMPTCP ; +subflow_add_reset_reason (skb, reason); goto dispose_child; } goto fallback;
@@ -861,7 +869,8 @@ static struct sock *subflow_syn_recv_sock(const struct sock *sk, }else if (ctx->mp_join) { owner = subflow_req->msk;if (!owner) { -subflow_add_reset_reason (skb,MPTCP_RST_EPROHIBIT ); + reason =MPTCP_RST_EPROHIBIT ; +subflow_add_reset_reason (skb, reason); goto dispose_child; }
@@ -875,13 +884,18 @@ static struct sock *subflow_syn_recv_sock(const struct sock *sk, ntohs(inet_sk((struct sock *)owner)->inet_sport));if (!mptcp_pm_sport_in_anno_list (owner, sk)) {SUBFLOW_REQ_INC_STATS (req,MPTCP_MIB_MISMATCHPORTACKRX ); + reason =MPTCP_RST_EUNSPEC ; goto dispose_child; }SUBFLOW_REQ_INC_STATS (req,MPTCP_MIB_JOINPORTACKRX ); } -if (!mptcp_finish_join (child)) +if (!mptcp_finish_join (child)) { +struct mptcp_subflow_context *subflow =mptcp_subflow_ctx (sk); + + reason = subflow->reset_reason; goto dispose_child; + }SUBFLOW_REQ_INC_STATS (req,MPTCP_MIB_JOINACKRX );tcp_rsk (req)->drop_req = true;
@@ -901,7 +915,7 @@ static struct sock *subflow_syn_recv_sock(const struct sock *sk,tcp_rsk (req)->drop_req = true;inet_csk_prepare_for_destroy_sock (child);tcp_done (child); - req->rsk_ops->send_reset (sk, skb,SK_RST_REASON_NOT_SPECIFIED ); + req->rsk_ops->send_reset (sk, skb,convert_mptcp_reason (reason));/* The last child reference will be released by the caller */ return child;
Signature · 1 line
2.37.3
Mat Martineau
maintainerRe: [PATCH net-next v2 5/6] mptcp: support rstreason for passive reset
Quoted 16 lines · Jason Xing
From: Jason Xing <[email protected]>
It relys on what reset options in MPTCP does as rfc8684 says. Reusing this logic can save us much energy. This patch replaces all the prior
NOT_SPECIFIEDreasons.Signed-off-by Jason Xing <[email protected]>---
net/mptcp/subflow.c| 26 ++++++++++++++++++++------1 file changed, 20 insertions(+), 6 deletions(-)net/mptcp/subflow.c +0
-0
net/mptcp/subflow.c static struct dst_entry *subflow_v4_route_req(const struct sock *sk, · line 310
Quoted 8 lines
net/mptcp/subflow.c +4
-1@@ -304,7 +304,10 @@ static struct dst_entry *subflow_v4_route_req(const struct sock *sk,dst_release (dst);if (!req->syncookie) - tcp_request_sock_ops.send_reset (sk, skb,SK_RST_REASON_NOT_SPECIFIED ); +/* According to RFC 8684, 3.2. Starting a New Subflow, +* we should use an "MPTCP specific error" reason code. +*/ + tcp_request_sock_ops.send_reset (sk, skb,SK_RST_REASON_MPTCP_RST_EMPTCP );
Hi Jason -
In this case, the MPTCP reset reason is set in subflow_check_req(). Looks like it uses EMPTCP but that isn't guaranteed to stay the same. I think it would be better to extract the reset reason from the skb extension or the subflow context "reset_reason" field.
net/mptcp/subflow.c static struct dst_entry *subflow_v6_route_req(const struct sock *sk, · line 380
Quoted 12 lines
net/mptcp/subflow.c +4
-1return NULL ; }@@ -371,7 +374,10 @@ static struct dst_entry *subflow_v6_route_req(const struct sock *sk,dst_release (dst);if (!req->syncookie) - tcp6_request_sock_ops.send_reset (sk, skb,SK_RST_REASON_NOT_SPECIFIED ); +/* According to RFC 8684, 3.2. Starting a New Subflow, +* we should use an "MPTCP specific error" reason code. +*/ + tcp6_request_sock_ops.send_reset (sk, skb,SK_RST_REASON_MPTCP_RST_EMPTCP );
Same issue here.
Quoted 32 lines
net/mptcp/subflow.c +5
-2return NULL; }#endif @@ -778,6 +784,7 @@ static struct sock *subflow_syn_recv_sock(const struct sock *sk,bool fallback, fallback_is_fatal;struct mptcp_sock *owner;struct sock *child; +int reason;pr_debug ("listener=%p, req=%p, conn=%p" , listener, req, listener->conn);@@ -833,7 +840,8 @@ static struct sock *subflow_syn_recv_sock(const struct sock *sk,*/ if (!ctx || fallback) {if (fallback_is_fatal) { -subflow_add_reset_reason (skb,MPTCP_RST_EMPTCP ); + reason =MPTCP_RST_EMPTCP ; +subflow_add_reset_reason (skb, reason); goto dispose_child; } goto fallback;@@ -861,7 +869,8 @@ static struct sock *subflow_syn_recv_sock(const struct sock *sk, }else if (ctx->mp_join) { owner = subflow_req->msk;if (!owner) { -subflow_add_reset_reason (skb,MPTCP_RST_EPROHIBIT ); + reason =MPTCP_RST_EPROHIBIT ; +subflow_add_reset_reason (skb, reason); goto dispose_child; }
net/mptcp/subflow.c static struct sock *subflow_syn_recv_sock(const struct sock *sk, · line 887
Quoted 4 lines
net/mptcp/subflow.c +1
-0@@ -875,13 +884,18 @@ static struct sock *subflow_syn_recv_sock(const struct sock *sk, ntohs(inet_sk((struct sock *)owner)->inet_sport));if (!mptcp_pm_sport_in_anno_list (owner, sk)) {SUBFLOW_REQ_INC_STATS (req,MPTCP_MIB_MISMATCHPORTACKRX ); + reason =MPTCP_RST_EUNSPEC ;
I think the MPTCP code here should have been using MPTCP_RST_EPROHIBIT.
- Mat
Quoted 29 lines
net/mptcp/subflow.c +6
-2goto dispose_child; }SUBFLOW_REQ_INC_STATS (req,MPTCP_MIB_JOINPORTACKRX ); } -if (!mptcp_finish_join (child)) +if (!mptcp_finish_join (child)) { +struct mptcp_subflow_context *subflow =mptcp_subflow_ctx (sk); + + reason = subflow->reset_reason; goto dispose_child; + }SUBFLOW_REQ_INC_STATS (req,MPTCP_MIB_JOINACKRX );tcp_rsk (req)->drop_req = true;@@ -901,7 +915,7 @@ static struct sock *subflow_syn_recv_sock(const struct sock *sk,tcp_rsk (req)->drop_req = true;inet_csk_prepare_for_destroy_sock (child);tcp_done (child); - req->rsk_ops->send_reset (sk, skb,SK_RST_REASON_NOT_SPECIFIED ); + req->rsk_ops->send_reset (sk, skb,convert_mptcp_reason (reason));/* The last child reference will be released by the caller */ return child;Signature · 1 line
2.37.3
Re: [PATCH net-next v2 5/6] mptcp: support rstreason for passive reset
Hello Mat,
Quoted 30 lines · Mat Martineau
Quoted 16 lines · Jason Xing
From: Jason Xing <[email protected]>
It relys on what reset options in MPTCP does as rfc8684 says. Reusing this logic can save us much energy. This patch replaces all the prior
NOT_SPECIFIEDreasons.Signed-off-by Jason Xing <[email protected]>---
net/mptcp/subflow.c| 26 ++++++++++++++++++++------1 file changed, 20 insertions(+), 6 deletions(-)net/mptcp/subflow.c +0
-0net/mptcp/subflow.c static struct dst_entry *subflow_v4_route_req(const struct sock *sk, · line 310
Quoted 8 lines
net/mptcp/subflow.c +4
-1@@ -304,7 +304,10 @@ static struct dst_entry *subflow_v4_route_req(const struct sock *sk,dst_release (dst);if (!req->syncookie) - tcp_request_sock_ops.send_reset (sk, skb,SK_RST_REASON_NOT_SPECIFIED ); +/* According to RFC 8684, 3.2. Starting a New Subflow, +* we should use an "MPTCP specific error" reason code. +*/ + tcp_request_sock_ops.send_reset (sk, skb,SK_RST_REASON_MPTCP_RST_EMPTCP );Hi Jason -
Quoted 4 lines
In this case, the MPTCP reset reason is set in
subflow_check_req(). Looks like it uses EMPTCP but that isn't guaranteed to stay the same. I think it would be better to extract the reset reason from the skb extension or the subflow context "reset_reason" field.
Good suggestions :)
Quoted 7 lines
Quoted 7 lines
net/mptcp/subflow.c +0
-0return NULL ; }@@ -371,7 +374,10 @@ static struct dst_entry *subflow_v6_route_req(const struct sock *sk,
Quoted 9 lines
net/mptcp/subflow.c static struct dst_entry *subflow_v6_route_req(const struct sock *sk, · line 380
Quoted 7 lines
net/mptcp/subflow.c +4
-1dst_release (dst);if (!req->syncookie) - tcp6_request_sock_ops.send_reset (sk, skb,SK_RST_REASON_NOT_SPECIFIED ); +/* According to RFC 8684, 3.2. Starting a New Subflow, +* we should use an "MPTCP specific error" reason code. +*/ + tcp6_request_sock_ops.send_reset (sk, skb,SK_RST_REASON_MPTCP_RST_EMPTCP );Same issue here.
Got it.
Quoted 32 lines
Quoted 32 lines
net/mptcp/subflow.c +5
-2return NULL; }#endif @@ -778,6 +784,7 @@ static struct sock *subflow_syn_recv_sock(const struct sock *sk,bool fallback, fallback_is_fatal;struct mptcp_sock *owner;struct sock *child; +int reason;pr_debug ("listener=%p, req=%p, conn=%p" , listener, req, listener->conn);@@ -833,7 +840,8 @@ static struct sock *subflow_syn_recv_sock(const struct sock *sk,*/ if (!ctx || fallback) {if (fallback_is_fatal) { -subflow_add_reset_reason (skb,MPTCP_RST_EMPTCP ); + reason =MPTCP_RST_EMPTCP ; +subflow_add_reset_reason (skb, reason); goto dispose_child; } goto fallback;@@ -861,7 +869,8 @@ static struct sock *subflow_syn_recv_sock(const struct sock *sk, }else if (ctx->mp_join) { owner = subflow_req->msk;if (!owner) { -subflow_add_reset_reason (skb,MPTCP_RST_EPROHIBIT ); + reason =MPTCP_RST_EPROHIBIT ; +subflow_add_reset_reason (skb, reason); goto dispose_child; }
Quoted 7 lines
net/mptcp/subflow.c static struct sock *subflow_syn_recv_sock(const struct sock *sk, · line 887
Quoted 5 lines
net/mptcp/subflow.c +1
-0@@ -875,13 +884,18 @@ static struct sock *subflow_syn_recv_sock(const struct sock *sk, ntohs(inet_sk((struct sock *)owner)->inet_sport));if (!mptcp_pm_sport_in_anno_list (owner, sk)) {SUBFLOW_REQ_INC_STATS (req,MPTCP_MIB_MISMATCHPORTACKRX ); + reason =MPTCP_RST_EUNSPEC ;I think the MPTCP code here should have been using
MPTCP_RST_EPROHIBIT.
I'll update in the V2 of the patch.
Thanks,
Jason
PATCH v2 6/6 rstreason: make it work in trace world
In reply to Jason XingFrom: Jason Xing <[email protected]>
At last, we should let it work by introducing this reset reason in trace world.
One of the possible expected outputs is:
... tcp_send_reset: skbaddr=xxx skaddr=xxx src=xxx dest=xxx state=TCP_ESTABLISHED reason=NOT_SPECIFIED
--- include/trace/events/tcp.h | 37 +++++++++++++++++++++++++++++++++---- net/ipv4/tcp_ipv4.c | 2 +- net/ipv4/tcp_output.c | 2 +- net/ipv6/tcp_ipv6.c | 2 +- 4 files changed, 36 insertions(+), 7 deletions(-)
include/trace/events/tcp.h +33 -4
@@ -11,6 +11,7 @@#include <net/ipv6.h> #include <net/tcp.h> #include <linux/sock_diag.h> +#include <net/rstreason.h> /* * tcp event with arguments sk and skb
@@ -74,20 +75,38 @@ DEFINE_EVENT(tcp_event_sk_skb, tcp_retransmit_skb,TP_ARGS (sk, skb) ); +#undef FN1 +#define FN1 (reason) TRACE_DEFINE_ENUM(SK_RST_REASON_##reason); +#undef FN2 +#define FN2 (reason) TRACE_DEFINE_ENUM(SKB_DROP_REASON_##reason); +DEFINE_RST_REASON(FN1, FN1) + +#undef FN1 +#undef FNe1 +#define FN1 (reason) { SK_RST_REASON_##reason, #reason }, +#define FNe1 (reason) { SK_RST_REASON_##reason, #reason } + +#undef FN2 +#undef FNe2 +#define FN2 (reason) { SKB_DROP_REASON_##reason, #reason }, +#define FNe2 (reason) { SKB_DROP_REASON_##reason, #reason }/* * skb of trace_tcp_send_reset is the skb that caused RST. In case of * active reset, skb should be NULL */ TRACE_EVENT(tcp_send_reset, - TP_PROTO(const struct sock *sk, const struct sk_buff *skb), + TP_PROTO(const struct sock *sk, + const struct sk_buff *skb, + const int reason), - TP_ARGS(sk, skb), + TP_ARGS(sk, skb, reason), TP_STRUCT__entry( __field(const void *, skbaddr) __field(const void *, skaddr) __field(int, state) + __field(int, reason) __array(__u8, saddr, sizeof(struct sockaddr_in6)) __array(__u8, daddr, sizeof(struct sockaddr_in6)) ),
@@ -113,14 +132,24 @@ TRACE_EVENT(tcp_send_reset,*/ TP_STORE_ADDR_PORTS_SKB (skb, th, entry->daddr, entry->saddr); } + __entry->reason = reason; ), -TP_printk ("skbaddr=%p skaddr=%p src=%pISpc dest=%pISpc state=%s" , +TP_printk ("skbaddr=%p skaddr=%p src=%pISpc dest=%pISpc state=%s reason=%s" , __entry->skbaddr, __entry->skaddr, __entry->saddr, __entry->daddr, - __entry->state ?show_tcp_state_name (__entry->state) :"UNKNOWN" ) + __entry->state ?show_tcp_state_name (__entry->state) :"UNKNOWN" , + __entry->reason <RST_REASON_START ? +__print_symbolic (__entry->reason,DEFINE_DROP_REASON (FN2 , FNe2)) : +__print_symbolic (__entry->reason,DEFINE_RST_REASON (FN1 , FNe1))) ); +#undef FN1 +#undef FNe1 + +#undef FN2 +#undef FNe2 +/* * tcp event with arguments sk *
net/ipv4/tcp_ipv4.c +1 -1
@@ -871,7 +871,7 @@ static void tcp_v4_send_reset(const struct sock *sk, struct sk_buff *skb,if (sk) arg.bound_dev_if = sk->sk_bound_dev_if; -trace_tcp_send_reset (sk, skb); +trace_tcp_send_reset (sk, skb, reason);BUILD_BUG_ON (offsetof(struct sock , sk_bound_dev_if) != offsetof(struct inet_timewait_sock , tw_bound_dev_if));
net/ipv4/tcp_output.c +1 -1
@@ -3608,7 +3608,7 @@ void tcp_send_active_reset(struct sock *sk, gfp_t priority, int reason)/* skb of trace_tcp_send_reset() keeps the skb that caused RST, * skb here is different to the troublesome skb, so use NULL */ -trace_tcp_send_reset (sk,NULL ); +trace_tcp_send_reset (sk,NULL ,SK_RST_REASON_NOT_SPECIFIED ); }/* Send a crossed SYN-ACK during socket establishment.
net/ipv6/tcp_ipv6.c +1 -1
@@ -1131,7 +1131,7 @@ static void tcp_v6_send_reset(const struct sock *sk, struct sk_buff *skb, label =ip6_flowlabel (ipv6h); } -trace_tcp_send_reset (sk, skb); +trace_tcp_send_reset (sk, skb, reason); tcp_v6_send_response(sk, skb, seq, ack_seq, 0, 0, 0, oif, 1, ipv6_get_dsfield(ipv6h), label, priority, txhash,
Signature · 1 line
2.37.3
Hi Jason,
Thank you for your modifications, that's great!
Our CI did some validations and here is its report:
- KVM Validation: normal: Success! ✅
- KVM Validation: debug: Success! ✅
- KVM Validation: btf (only bpftest_all): Success! ✅
- Task: https://github.com/multipath-tcp/mptcp_net-next/actions/runs/8550992244
Initiator: Patchew Applier
Commits: https://github.com/multipath-tcp/mptcp_net-next/commits/6b1f99284a95
Patchwork: https://patchwork.kernel.org/project/mptcp/list/?series=841302
If there are some issues, you can reproduce them using the same environment as the one used by the CI thanks to a docker image, e.g.:
$ cd [kernel source code]
$ docker run -v "${PWD}:${PWD}:rw" -w "${PWD}" --privileged --rm -it \
--pull always mptcp/mptcp-upstream-virtme-docker:latest \
auto-normalFor more details:
https://github.com/multipath-tcp/mptcp-upstream-virtme-docker
Please note that despite all the efforts that have been already done to have a stable tests suite when executed on a public CI like here, it is possible some reported issues are not due to your modifications. Still, do not hesitate to help us improve that ;-)
Cheers,
MPTCP GH Action bot
Bot operated by Matthieu Baerts (NGI0 Core)