net: sock: add tracers for inet socket errors
Subsystems (24)
v2 cover net: sock: add tracers for inet socket errors
Hi,
this patch series introduce tracers for sk_error_report socket callback calls. The use-case is that a user space application can monitor them and making an own heuristic about bad peer connections even over a socket lifetime. To make a specific example it could be use in the Linux cluster world to fence a "bad" behaving node. For now it's okay to only trace inet sockets. Other socket families can introduce their own tracers easily.
Example output with trace-cmd:
<idle>-0 [003] 201.799437: inet_sk_error_report: family=AF_INET protocol=IPPROTO_TCP sport=21064 dport=38941 saddr=192.168.122.57 daddr=192.168.122.251 saddrv6=::ffff:192.168.122.57 daddrv6=::ffff:192.168.122.251 error=104
- Alex
changes since v2:
- change "sk.sk_error_report(&ipc->sk);" to "sk_error_report(&ipc->sk);" in net/qrtr/qrtr.c
Alexander Aring (2):
net: sock: introduce sk_error_report
net: sock: add trace for socket errors
.../chelsio/inline_crypto/chtls/chtls_cm.c | 2 +- drivers/vhost/vsock.c | 2 +- include/linux/skmsg.h | 2 +- include/net/sock.h | 2 + include/net/tls.h | 2 +- include/trace/events/sock.h | 60 +++++++++++++++++++ net/caif/caif_socket.c | 2 +- net/can/bcm.c | 4 +- net/can/isotp.c | 20 +++---- net/can/j1939/socket.c | 4 +- net/can/raw.c | 6 +- net/core/skbuff.c | 6 +- net/core/sock.c | 16 +++++ net/dccp/ipv4.c | 4 +- net/dccp/ipv6.c | 4 +- net/dccp/proto.c | 2 +- net/dccp/timer.c | 2 +- net/ipv4/ping.c | 2 +- net/ipv4/raw.c | 4 +- net/ipv4/tcp.c | 4 +- net/ipv4/tcp_input.c | 2 +- net/ipv4/tcp_ipv4.c | 4 +- net/ipv4/tcp_timer.c | 2 +- net/ipv4/udp.c | 4 +- net/ipv6/raw.c | 2 +- net/ipv6/tcp_ipv6.c | 4 +- net/ipv6/udp.c | 2 +- net/kcm/kcmsock.c | 2 +- net/mptcp/subflow.c | 2 +- net/netlink/af_netlink.c | 8 +-- net/nfc/rawsock.c | 2 +- net/packet/af_packet.c | 4 +- net/qrtr/qrtr.c | 2 +- net/sctp/input.c | 2 +- net/sctp/ipv6.c | 2 +- net/smc/af_smc.c | 2 +- net/strparser/strparser.c | 2 +- net/unix/af_unix.c | 2 +- net/vmw_vsock/af_vsock.c | 2 +- net/vmw_vsock/virtio_transport.c | 2 +- net/vmw_vsock/virtio_transport_common.c | 2 +- net/vmw_vsock/vmci_transport.c | 4 +- net/xdp/xsk.c | 2 +- 43 files changed, 145 insertions(+), 67 deletions(-)
Signature · 1 line
2.26.3
PATCH v2 1/2 net: sock: introduce sk_error_report
This patch introduces a function wrapper to call the sk_error_report callback. That will prepare to add additional handling whenever sk_error_report is called, for example to trace socket errors.
--- .../chelsio/inline_crypto/chtls/chtls_cm.c | 2 +- drivers/vhost/vsock.c | 2 +- include/linux/skmsg.h | 2 +- include/net/sock.h | 2 ++ include/net/tls.h | 2 +- net/caif/caif_socket.c | 2 +- net/can/bcm.c | 4 ++-- net/can/isotp.c | 20 +++++++++---------- net/can/j1939/socket.c | 4 ++-- net/can/raw.c | 6 +++--- net/core/skbuff.c | 6 +++--- net/core/sock.c | 6 ++++++ net/dccp/ipv4.c | 4 ++-- net/dccp/ipv6.c | 4 ++-- net/dccp/proto.c | 2 +- net/dccp/timer.c | 2 +- net/ipv4/ping.c | 2 +- net/ipv4/raw.c | 4 ++-- net/ipv4/tcp.c | 4 ++-- net/ipv4/tcp_input.c | 2 +- net/ipv4/tcp_ipv4.c | 4 ++-- net/ipv4/tcp_timer.c | 2 +- net/ipv4/udp.c | 4 ++-- net/ipv6/raw.c | 2 +- net/ipv6/tcp_ipv6.c | 4 ++-- net/ipv6/udp.c | 2 +- net/kcm/kcmsock.c | 2 +- net/mptcp/subflow.c | 2 +- net/netlink/af_netlink.c | 8 ++++---- net/nfc/rawsock.c | 2 +- net/packet/af_packet.c | 4 ++-- net/qrtr/qrtr.c | 2 +- net/sctp/input.c | 2 +- net/sctp/ipv6.c | 2 +- net/smc/af_smc.c | 2 +- net/strparser/strparser.c | 2 +- net/unix/af_unix.c | 2 +- net/vmw_vsock/af_vsock.c | 2 +- net/vmw_vsock/virtio_transport.c | 2 +- net/vmw_vsock/virtio_transport_common.c | 2 +- net/vmw_vsock/vmci_transport.c | 4 ++-- net/xdp/xsk.c | 2 +- 42 files changed, 75 insertions(+), 67 deletions(-)
drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_cm.c +1 -1
@@ -2134,7 +2134,7 @@ static void chtls_abort_req_rss(struct sock *sk, struct sk_buff *skb) sk->sk_err =ETIMEDOUT ;if (!sock_flag (sk,SOCK_DEAD )) - sk->sk_error_report (sk); +sk_error_report (sk);if (sk->sk_state ==TCP_SYN_RECV && !abort_syn_rcv (sk, skb))return ;
drivers/vhost/vsock.c +1 -1
@@ -734,7 +734,7 @@ static void vhost_vsock_reset_orphans(struct sock *sk) vsk->peer_shutdown =SHUTDOWN_MASK ; sk->sk_state =SS_UNCONNECTED ; sk->sk_err =ECONNRESET ; - sk->sk_error_report (sk); +sk_error_report (sk); }static int vhost_vsock_dev_release (struct inode *inode,struct file *file)
include/linux/skmsg.h +1 -1
@@ -347,7 +347,7 @@ static inline void sk_psock_report_error(struct sk_psock *psock, int err)struct sock *sk = psock->sk; sk->sk_err = err; - sk->sk_error_report (sk); +sk_error_report (sk); }struct sk_psock *sk_psock_init (struct sock *sk,int node);
include/net/sock.h +2 -0
@@ -2281,6 +2281,8 @@ static inline int sock_error(struct sock *sk)return -err; } +void sk_error_report (struct sock *sk); +static inline unsigned long sock_wspace (struct sock *sk) {int amt =0 ;
include/net/tls.h +1 -1
@@ -469,7 +469,7 @@ static inline bool tls_is_sk_tx_device_offloaded(struct sock *sk)static inline void tls_err_abort (struct sock *sk,int err) { sk->sk_err = err; - sk->sk_error_report (sk); +sk_error_report (sk); }static inline bool tls_bigint_increment (unsigned char *seq,int len)
net/caif/caif_socket.c +1 -1
@@ -243,7 +243,7 @@ static void caif_ctrl_cb(struct cflayer *layr, cf_sk->sk.sk_shutdown =SHUTDOWN_MASK ; cf_sk->sk.sk_err =ECONNRESET ;set_rx_flow_on (cf_sk); - cf_sk->sk.sk_error_report (&cf_sk->sk); +sk_error_report (&cf_sk->sk);break ;default :
net/can/bcm.c +2 -2
@@ -1417,7 +1417,7 @@ static void bcm_notify(struct bcm_sock *bo, unsigned long msg,if (notify_enodev) { sk->sk_err =ENODEV ;if (!sock_flag (sk,SOCK_DEAD )) - sk->sk_error_report (sk); +sk_error_report (sk); }break ;
@@ -1425,7 +1425,7 @@ static void bcm_notify(struct bcm_sock *bo, unsigned long msg,if (bo->bound && bo->ifindex == dev->ifindex) { sk->sk_err =ENETDOWN ;if (!sock_flag (sk,SOCK_DEAD )) - sk->sk_error_report (sk); +sk_error_report (sk); } } }
net/can/isotp.c +10 -10
@@ -168,7 +168,7 @@ static enum hrtimer_restart isotp_rx_timer_handler(struct hrtimer *hrtimer)/* report 'connection timed out' */ sk->sk_err =ETIMEDOUT ;if (!sock_flag (sk,SOCK_DEAD )) - sk->sk_error_report (sk); +sk_error_report (sk);/* reset rx state */ so->rx.state =ISOTP_IDLE ;
@@ -339,7 +339,7 @@ static int isotp_rcv_fc(struct isotp_sock *so, struct canfd_frame *cf, int ae)/* malformed PDU - report 'not a data message' */ sk->sk_err =EBADMSG ;if (!sock_flag (sk,SOCK_DEAD )) - sk->sk_error_report (sk); +sk_error_report (sk); so->tx.state =ISOTP_IDLE ;wake_up_interruptible (&so->wait);
@@ -392,7 +392,7 @@ static int isotp_rcv_fc(struct isotp_sock *so, struct canfd_frame *cf, int ae)/* overflow on receiver side - report 'message too long' */ sk->sk_err =EMSGSIZE ;if (!sock_flag (sk,SOCK_DEAD )) - sk->sk_error_report (sk); +sk_error_report (sk); fallthrough;default :
@@ -420,7 +420,7 @@ static int isotp_rcv_sf(struct sock *sk, struct canfd_frame *cf, int pcilen,/* malformed PDU - report 'not a data message' */ sk->sk_err =EBADMSG ;if (!sock_flag (sk,SOCK_DEAD )) - sk->sk_error_report (sk); +sk_error_report (sk);return 1 ; }
@@ -535,7 +535,7 @@ static int isotp_rcv_cf(struct sock *sk, struct canfd_frame *cf, int ae,/* wrong sn detected - report 'illegal byte sequence' */ sk->sk_err =EILSEQ ;if (!sock_flag (sk,SOCK_DEAD )) - sk->sk_error_report (sk); +sk_error_report (sk);/* reset rx state */ so->rx.state =ISOTP_IDLE ;
@@ -559,7 +559,7 @@ static int isotp_rcv_cf(struct sock *sk, struct canfd_frame *cf, int ae,/* malformed PDU - report 'not a data message' */ sk->sk_err =EBADMSG ;if (!sock_flag (sk,SOCK_DEAD )) - sk->sk_error_report (sk); +sk_error_report (sk);return 1 ; }
@@ -758,7 +758,7 @@ static enum hrtimer_restart isotp_tx_timer_handler(struct hrtimer *hrtimer)/* report 'communication error on send' */ sk->sk_err =ECOMM ;if (!sock_flag (sk,SOCK_DEAD )) - sk->sk_error_report (sk); +sk_error_report (sk);/* reset tx state */ so->tx.state =ISOTP_IDLE ;
@@ -1157,7 +1157,7 @@ static int isotp_bind(struct socket *sock, struct sockaddr *uaddr, int len)if (notify_enetdown) { sk->sk_err =ENETDOWN ;if (!sock_flag (sk,SOCK_DEAD )) - sk->sk_error_report (sk); +sk_error_report (sk); }return err;
@@ -1356,13 +1356,13 @@ static void isotp_notify(struct isotp_sock *so, unsigned long msg, sk->sk_err =ENODEV ;if (!sock_flag (sk,SOCK_DEAD )) - sk->sk_error_report (sk); +sk_error_report (sk);break ;case NETDEV_DOWN : sk->sk_err =ENETDOWN ;if (!sock_flag (sk,SOCK_DEAD )) - sk->sk_error_report (sk); +sk_error_report (sk);break ; } }
net/can/j1939/socket.c +2 -2
@@ -1009,7 +1009,7 @@ void j1939_sk_send_loop_abort(struct sock *sk, int err) { sk->sk_err = err; - sk->sk_error_report (sk); +sk_error_report (sk); } static int j1939_sk_send_loop(struct j1939_priv *priv, struct sock *sk,
@@ -1189,7 +1189,7 @@ void j1939_sk_netdev_event_netdown(struct j1939_priv *priv)list_for_each_entry (jsk, &priv->j1939_socks, list) { jsk->sk.sk_err = error_code;if (!sock_flag (&jsk->sk,SOCK_DEAD )) - jsk->sk.sk_error_report (&jsk->sk); +sk_error_report (&jsk->sk);j1939_sk_queue_drop_all (priv, jsk, error_code); }
net/can/raw.c +3 -3
@@ -295,13 +295,13 @@ static void raw_notify(struct raw_sock *ro, unsigned long msg, sk->sk_err =ENODEV ;if (!sock_flag (sk,SOCK_DEAD )) - sk->sk_error_report (sk); +sk_error_report (sk);break ;case NETDEV_DOWN : sk->sk_err =ENETDOWN ;if (!sock_flag (sk,SOCK_DEAD )) - sk->sk_error_report (sk); +sk_error_report (sk);break ; } }
@@ -488,7 +488,7 @@ static int raw_bind(struct socket *sock, struct sockaddr *uaddr, int len)if (notify_enetdown) { sk->sk_err =ENETDOWN ;if (!sock_flag (sk,SOCK_DEAD )) - sk->sk_error_report (sk); +sk_error_report (sk); }return err;
net/core/skbuff.c +3 -3
@@ -1294,7 +1294,7 @@ static void __msg_zerocopy_callback(struct ubuf_info *uarg) }spin_unlock_irqrestore (&q->lock, flags); - sk->sk_error_report (sk); +sk_error_report (sk); release:consume_skb (skb);
@@ -4685,7 +4685,7 @@ int sock_queue_err_skb(struct sock *sk, struct sk_buff *skb)skb_queue_tail (&sk->sk_error_queue, skb);if (!sock_flag (sk,SOCK_DEAD )) - sk->sk_error_report (sk); +sk_error_report (sk);return 0 ; }EXPORT_SYMBOL (sock_queue_err_skb);
@@ -4716,7 +4716,7 @@ struct sk_buff *sock_dequeue_err_skb(struct sock *sk) sk->sk_err =0 ;if (skb_next) - sk->sk_error_report (sk); +sk_error_report (sk);return skb; }
net/core/sock.c +6 -0
@@ -331,6 +331,12 @@ int __sk_backlog_rcv(struct sock *sk, struct sk_buff *skb) }EXPORT_SYMBOL (__sk_backlog_rcv); +void sk_error_report (struct sock *sk) +{ + sk->sk_error_report (sk); +} +EXPORT_SYMBOL (sk_error_report); +static int sock_get_timeout (long timeo,void *optval,bool old_timeval) {struct __kernel_sock_timeval tv;
net/dccp/ipv4.c +2 -2
@@ -329,7 +329,7 @@ static int dccp_v4_err(struct sk_buff *skb, u32 info)__DCCP_INC_STATS (DCCP_MIB_ATTEMPTFAILS ); sk->sk_err = err; - sk->sk_error_report (sk); +sk_error_report (sk);dccp_done (sk); }else
@@ -356,7 +356,7 @@ static int dccp_v4_err(struct sk_buff *skb, u32 info) inet =inet_sk (sk);if (!sock_owned_by_user (sk) && inet->recverr) { sk->sk_err = err; - sk->sk_error_report (sk); +sk_error_report (sk); }else /* Only an error on timeout */ sk->sk_err_soft = err; out:
net/dccp/ipv6.c +2 -2
@@ -172,7 +172,7 @@ static int dccp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,* Wake people up to see the error * (see connect in sock.c) */ - sk->sk_error_report (sk); +sk_error_report (sk);dccp_done (sk); }else sk->sk_err_soft = err;
@@ -181,7 +181,7 @@ static int dccp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,if (!sock_owned_by_user (sk) && np->recverr) { sk->sk_err = err; - sk->sk_error_report (sk); +sk_error_report (sk); }else sk->sk_err_soft = err;
net/dccp/proto.c +1 -1
@@ -302,7 +302,7 @@ int dccp_disconnect(struct sock *sk, int flags)WARN_ON (inet->inet_num && !icsk->icsk_bind_hash); - sk->sk_error_report (sk); +sk_error_report (sk);return 0 ; }
net/dccp/timer.c +1 -1
@@ -20,7 +20,7 @@ int sysctl_dccp_retries2 __read_mostly = TCP_RETR2;static void dccp_write_err (struct sock *sk) { sk->sk_err = sk->sk_err_soft ? :ETIMEDOUT ; - sk->sk_error_report (sk); +sk_error_report (sk);dccp_send_reset (sk,DCCP_RESET_CODE_ABORTED );dccp_done (sk);
net/ipv4/ping.c +1 -1
@@ -573,7 +573,7 @@ void ping_err(struct sk_buff *skb, int offset, u32 info) } } sk->sk_err = err; - sk->sk_error_report (sk); +sk_error_report (sk); out:sock_put (sk); }
net/ipv4/raw.c +2 -2
@@ -280,7 +280,7 @@ static void raw_err(struct sock *sk, struct sk_buff *skb, u32 info)if (inet->recverr || harderr) { sk->sk_err = err; - sk->sk_error_report (sk); +sk_error_report (sk); } }
@@ -929,7 +929,7 @@ int raw_abort(struct sock *sk, int err)lock_sock (sk); sk->sk_err = err; - sk->sk_error_report (sk); +sk_error_report (sk);__udp_disconnect (sk,0 );release_sock (sk);
net/ipv4/tcp.c +2 -2
@@ -3059,7 +3059,7 @@ int tcp_disconnect(struct sock *sk, int flags) sk->sk_frag.offset =0 ; } - sk->sk_error_report (sk); +sk_error_report (sk);return 0 ; }EXPORT_SYMBOL (tcp_disconnect);
@@ -4448,7 +4448,7 @@ int tcp_abort(struct sock *sk, int err) sk->sk_err = err;/* This barrier is coupled with smp_rmb() in tcp_poll() */ smp_wmb (); - sk->sk_error_report (sk); +sk_error_report (sk);if (tcp_need_reset (sk->sk_state))tcp_send_active_reset (sk,GFP_ATOMIC );tcp_done (sk);
net/ipv4/tcp_input.c +1 -1
@@ -4270,7 +4270,7 @@ void tcp_reset(struct sock *sk, struct sk_buff *skb)tcp_done (sk);if (!sock_flag (sk,SOCK_DEAD )) - sk->sk_error_report (sk); +sk_error_report (sk); }/*
net/ipv4/tcp_ipv4.c +2 -2
@@ -585,7 +585,7 @@ int tcp_v4_err(struct sk_buff *skb, u32 info)if (!sock_owned_by_user (sk)) { sk->sk_err = err; - sk->sk_error_report (sk); +sk_error_report (sk);tcp_done (sk); }else {
@@ -613,7 +613,7 @@ int tcp_v4_err(struct sk_buff *skb, u32 info) inet =inet_sk (sk);if (!sock_owned_by_user (sk) && inet->recverr) { sk->sk_err = err; - sk->sk_error_report (sk); +sk_error_report (sk); }else {/* Only an error on timeout */ sk->sk_err_soft = err; }
net/ipv4/tcp_timer.c +1 -1
@@ -68,7 +68,7 @@ u32 tcp_clamp_probe0_to_user_timeout(const struct sock *sk, u32 when)static void tcp_write_err (struct sock *sk) { sk->sk_err = sk->sk_err_soft ? :ETIMEDOUT ; - sk->sk_error_report (sk); +sk_error_report (sk);tcp_write_queue_purge (sk);tcp_done (sk);
net/ipv4/udp.c +2 -2
@@ -776,7 +776,7 @@ int __udp4_lib_err(struct sk_buff *skb, u32 info, struct udp_table *udptable)ip_icmp_error (sk, skb, err, uh->dest, info, (u8 *)(uh+1 )); sk->sk_err = err; - sk->sk_error_report (sk); +sk_error_report (sk); out:return 0 ; }
@@ -2867,7 +2867,7 @@ int udp_abort(struct sock *sk, int err) goto out; sk->sk_err = err; - sk->sk_error_report (sk); +sk_error_report (sk);__udp_disconnect (sk,0 ); out:
net/ipv6/raw.c +1 -1
@@ -354,7 +354,7 @@ static void rawv6_err(struct sock *sk, struct sk_buff *skb,if (np->recverr || harderr) { sk->sk_err = err; - sk->sk_error_report (sk); +sk_error_report (sk); } }
net/ipv6/tcp_ipv6.c +2 -2
@@ -467,7 +467,7 @@ static int tcp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,if (!sock_owned_by_user (sk)) { sk->sk_err = err; - sk->sk_error_report (sk);/* Wake people up to see the error (see connect in sock.c) */ +sk_error_report (sk);/* Wake people up to see the error (see connect in sock.c) */ tcp_done (sk); }else
@@ -486,7 +486,7 @@ static int tcp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,if (!sock_owned_by_user (sk) && np->recverr) { sk->sk_err = err; - sk->sk_error_report (sk); +sk_error_report (sk); }else sk->sk_err_soft = err;
net/ipv6/udp.c +1 -1
@@ -610,7 +610,7 @@ int __udp6_lib_err(struct sk_buff *skb, struct inet6_skb_parm *opt, } sk->sk_err = err; - sk->sk_error_report (sk); +sk_error_report (sk); out:return 0 ; }
net/kcm/kcmsock.c +1 -1
@@ -47,7 +47,7 @@ static inline struct kcm_tx_msg *kcm_tx_msg(struct sk_buff *skb)static void report_csk_error (struct sock *csk,int err) { csk->sk_err =EPIPE ; - csk->sk_error_report (csk); +sk_error_report (csk); } static void kcm_abort_tx_psock(struct kcm_psock *psock, int err,
net/mptcp/subflow.c +1 -1
@@ -1240,7 +1240,7 @@ void __mptcp_error_report(struct sock *sk)/* This barrier is coupled with smp_rmb() in mptcp_poll() */ smp_wmb (); - sk->sk_error_report (sk); +sk_error_report (sk);break ; } }
net/netlink/af_netlink.c +4 -4
@@ -351,7 +351,7 @@ static void netlink_overrun(struct sock *sk)if (!test_and_set_bit (NETLINK_S_CONGESTED , &nlk_sk (sk)->state)) { sk->sk_err =ENOBUFS ; - sk->sk_error_report (sk); +sk_error_report (sk); } }atomic_inc (&sk->sk_drops);
@@ -1576,7 +1576,7 @@ static int do_one_set_err(struct sock *sk, struct netlink_set_err_data *p) } sk->sk_err = p->code; - sk->sk_error_report (sk); +sk_error_report (sk); out:return ret; }
@@ -2012,7 +2012,7 @@ static int netlink_recvmsg(struct socket *sock, struct msghdr *msg, size_t len, ret =netlink_dump (sk);if (ret) { sk->sk_err = -ret; - sk->sk_error_report (sk); +sk_error_report (sk); } }
@@ -2439,7 +2439,7 @@ void netlink_ack(struct sk_buff *in_skb, struct nlmsghdr *nlh, int err, skb =nlmsg_new (payload + tlvlen,GFP_KERNEL );if (!skb) {NETLINK_CB (in_skb).sk->sk_err =ENOBUFS ; -NETLINK_CB (in_skb).sk->sk_error_report (NETLINK_CB (in_skb).sk); +sk_error_report (NETLINK_CB (in_skb).sk);return ; }
net/nfc/rawsock.c +1 -1
@@ -49,7 +49,7 @@ static void rawsock_report_error(struct sock *sk, int err) sk->sk_shutdown =SHUTDOWN_MASK ; sk->sk_err = -err; - sk->sk_error_report (sk); +sk_error_report (sk);rawsock_write_queue_purge (sk); }
net/packet/af_packet.c +2 -2
@@ -3206,7 +3206,7 @@ static int packet_do_bind(struct sock *sk, const char *name, int ifindex, }else { sk->sk_err =ENETDOWN ;if (!sock_flag (sk,SOCK_DEAD )) - sk->sk_error_report (sk); +sk_error_report (sk); } out_unlock:
@@ -4103,7 +4103,7 @@ static int packet_notifier(struct notifier_block *this,__unregister_prot_hook (sk, false); sk->sk_err =ENETDOWN ;if (!sock_flag (sk,SOCK_DEAD )) - sk->sk_error_report (sk); +sk_error_report (sk); }if (msg ==NETDEV_UNREGISTER ) {packet_cached_dev_reset (po);
net/qrtr/qrtr.c +1 -1
@@ -751,7 +751,7 @@ static void qrtr_reset_ports(void)xa_for_each_start (&qrtr_ports, index, ipc,1 ) {sock_hold (&ipc->sk); ipc->sk.sk_err =ENETRESET ; - ipc->sk.sk_error_report (&ipc->sk); +sk_error_report (&ipc->sk);sock_put (&ipc->sk); }rcu_read_unlock ();
net/sctp/input.c +1 -1
@@ -593,7 +593,7 @@ static void sctp_v4_err_handle(struct sctp_transport *t, struct sk_buff *skb, }if (!sock_owned_by_user (sk) &&inet_sk (sk)->recverr) { sk->sk_err = err; - sk->sk_error_report (sk); +sk_error_report (sk); }else {/* Only an error on timeout */ sk->sk_err_soft = err; }
net/sctp/ipv6.c +1 -1
@@ -152,7 +152,7 @@ static void sctp_v6_err_handle(struct sctp_transport *t, struct sk_buff *skb,icmpv6_err_convert (type, code, &err);if (!sock_owned_by_user (sk) && np->recverr) { sk->sk_err = err; - sk->sk_error_report (sk); +sk_error_report (sk); }else { sk->sk_err_soft = err; }
net/smc/af_smc.c +1 -1
@@ -2218,7 +2218,7 @@ static int smc_setsockopt(struct socket *sock, int level, int optname, optval, optlen);if (smc->clcsock->sk->sk_err) { sk->sk_err = smc->clcsock->sk->sk_err; - sk->sk_error_report (sk); +sk_error_report (sk); }if (optlen <sizeof (int ))
net/strparser/strparser.c +1 -1
@@ -58,7 +58,7 @@ static void strp_abort_strp(struct strparser *strp, int err)/* Report an error on the lower socket */ sk->sk_err = -err; - sk->sk_error_report (sk); +sk_error_report (sk); } }
net/unix/af_unix.c +1 -1
@@ -491,7 +491,7 @@ static void unix_dgram_disconnected(struct sock *sk, struct sock *other)*/ if (!sock_flag (other,SOCK_DEAD ) &&unix_peer (other) == sk) { other->sk_err =ECONNRESET ; - other->sk_error_report (other); +sk_error_report (other); } } }
net/vmw_vsock/af_vsock.c +1 -1
@@ -1281,7 +1281,7 @@ static void vsock_connect_timeout(struct work_struct *work) (sk->sk_shutdown != SHUTDOWN_MASK)) { sk->sk_state =TCP_CLOSE ; sk->sk_err =ETIMEDOUT ; - sk->sk_error_report (sk); +sk_error_report (sk);vsock_transport_cancel_pkt (vsk); }release_sock (sk);
net/vmw_vsock/virtio_transport.c +1 -1
@@ -360,7 +360,7 @@ static void virtio_vsock_reset_sock(struct sock *sk)lock_sock (sk); sk->sk_state =TCP_CLOSE ; sk->sk_err =ECONNRESET ; - sk->sk_error_report (sk); +sk_error_report (sk);release_sock (sk); }
net/vmw_vsock/virtio_transport_common.c +1 -1
@@ -1007,7 +1007,7 @@ virtio_transport_recv_connecting(struct sock *sk,virtio_transport_reset (vsk, pkt); sk->sk_state =TCP_CLOSE ; sk->sk_err = skerr; - sk->sk_error_report (sk); +sk_error_report (sk);return err; }
net/vmw_vsock/vmci_transport.c +2 -2
@@ -831,7 +831,7 @@ static void vmci_transport_handle_detach(struct sock *sk) sk->sk_state =TCP_CLOSE ; sk->sk_err =ECONNRESET ; - sk->sk_error_report (sk); +sk_error_report (sk);return ; } sk->sk_state =TCP_CLOSE ;
@@ -1365,7 +1365,7 @@ vmci_transport_recv_connecting_client(struct sock *sk, sk->sk_state =TCP_CLOSE ; sk->sk_err = skerr; - sk->sk_error_report (sk); +sk_error_report (sk);return err; }
net/xdp/xsk.c +1 -1
@@ -1313,7 +1313,7 @@ static int xsk_notifier(struct notifier_block *this,if (xs->dev == dev) { sk->sk_err =ENETDOWN ;if (!sock_flag (sk,SOCK_DEAD )) - sk->sk_error_report (sk); +sk_error_report (sk);xsk_unbind_dev (xs);
Signature · 1 line
2.26.3
PATCH v2 2/2 net: sock: add trace for socket errors
In reply to Alexander AringThis patch will add tracers to trace inet socket errors only. A user space monitor application can track connection errors indepedent from socket lifetime and do additional handling. For example a cluster manager can fence a node if errors occurs in a specific heuristic.
--- include/trace/events/sock.h | 60 +++++++++++++++++++++++++++++++++++++ net/core/sock.c | 10 +++++++ 2 files changed, 70 insertions(+)
include/trace/events/sock.h +60 -0
@@ -201,6 +201,66 @@ TRACE_EVENT(inet_sock_set_state, show_tcp_state_name(__entry->newstate)) ); +TRACE_EVENT (inet_sk_error_report, + + TP_PROTO(const struct sock *sk), + +TP_ARGS (sk), + +TP_STRUCT__entry ( + __field(int, error) + __field(__u16, sport) + __field(__u16, dport) + __field(__u16, family) + __field(__u16, protocol) + __array(__u8, saddr, 4) + __array(__u8, daddr, 4) + __array(__u8, saddr_v6, 16) +__array (__u8, daddr_v6,16 ) + ), + +TP_fast_assign ( + struct inet_sock *inet = inet_sk(sk); + struct in6_addr *pin6; + __be32 *p32; + + __entry->error = sk->sk_err; + __entry->family = sk->sk_family; + __entry->protocol = sk->sk_protocol; + __entry->sport = ntohs(inet->inet_sport); + __entry->dport = ntohs(inet->inet_dport); + + p32 = (__be32 *) __entry->saddr; + *p32 = inet->inet_saddr; + + p32 = (__be32 *) __entry->daddr; + *p32 = inet->inet_daddr; + +#if IS_ENABLED(CONFIG_IPV6) + if (sk->sk_family == AF_INET6) { + pin6 = (struct in6_addr *)__entry->saddr_v6; + *pin6 = sk->sk_v6_rcv_saddr; + pin6 = (struct in6_addr *)__entry->daddr_v6; + *pin6 = sk->sk_v6_daddr; + } else +#endif + { + pin6 = (struct in6_addr *)__entry->saddr_v6; +ipv6_addr_set_v4mapped (inet->inet_saddr, pin6); + pin6 = (struct in6_addr *)__entry->daddr_v6; +ipv6_addr_set_v4mapped (inet->inet_daddr, pin6); + } + ), + +TP_printk ("family=%s protocol=%s sport=%hu dport=%hu saddr=%pI4 daddr=%pI4 saddrv6=%pI6c daddrv6=%pI6c error=%d" , +show_family_name (__entry->family), +show_inet_protocol_name (__entry->protocol), + __entry->sport, __entry->dport, + __entry->saddr, __entry->daddr, + __entry->saddr_v6, __entry->daddr_v6, + __entry->error) +); +#endif /* _TRACE_SOCK_H */ /* This part must be outside protection */
net/core/sock.c +10 -0
@@ -334,6 +334,16 @@ EXPORT_SYMBOL(__sk_backlog_rcv);void sk_error_report (struct sock *sk) { sk->sk_error_report (sk); + +switch (sk->sk_family) { +case AF_INET : + fallthrough; +case AF_INET6 : +trace_inet_sk_error_report (sk); +break ; +default : +break ; + } }EXPORT_SYMBOL (sk_error_report);
Signature · 1 line
2.26.3