dlm: print kernel message when we get an error from kernel_sendpage
PATCH 1/1 dlm: print kernel message when we get an error from kernel_sendpage
In reply to a message not in the archiveHi,
This patch prints out a kernel message when we get a bad return code from kernel_sendpage and need to close the connection.
Regards,
Bob Peterson
Red Hat File Systems
Signed-off-by Bob Peterson <[email protected]>
--- fs/dlm/lowcomms.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+)
fs/dlm/lowcomms.c +40 -0
@@ -126,6 +126,7 @@ struct connection {struct work_struct rwork;/* Receive workqueue */ struct work_struct swork;/* Send workqueue */ bool try_new_addr; +void (*orig_error_report)(struct sock *sk); };#define sock2con (x) ((struct connection *)(x)->sk_user_data)
@@ -481,6 +482,43 @@ int dlm_lowcomms_connect_node(int nodeid)return 0 ; } +static void lowcomms_error_report (struct sock *sk) +{ +struct connection *con =sock2con (sk); +struct sockaddr_storage saddr; + +if (nodeid_to_addr (con->nodeid, &saddr,NULL , false)) { +printk_ratelimited (KERN_ERR "dlm: node %d: socket error " +"sending to node %d, port %d, " +"sk_err=%d/%d\n" ,dlm_our_nodeid (), + con->nodeid, dlm_config.ci_tcp_port, + sk->sk_err, sk->sk_err_soft); +return ; + }else if (saddr.ss_family ==AF_INET ) { +struct sockaddr_in *sin4 = (struct sockaddr_in *)&saddr; + +printk_ratelimited (KERN_ERR "dlm: node %d: socket error " +"sending to node %d at %pI4, port %d, " +"sk_err=%d/%d\n" ,dlm_our_nodeid (), + con->nodeid, &sin4->sin_addr.s_addr, + dlm_config.ci_tcp_port, sk->sk_err, + sk->sk_err_soft); + }else { +struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)&saddr; + +printk_ratelimited (KERN_ERR "dlm: node %d: socket error " +"sending to node %d at %u.%u.%u.%u, " +"port %d, sk_err=%d/%d\n" ,dlm_our_nodeid (), + con->nodeid, sin6->sin6_addr.s6_addr32[0 ], + sin6->sin6_addr.s6_addr32[1 ], + sin6->sin6_addr.s6_addr32[2 ], + sin6->sin6_addr.s6_addr32[3 ], + dlm_config.ci_tcp_port, sk->sk_err, + sk->sk_err_soft); + } + con->orig_error_report (sk); +} +/* Make a socket active */ static void add_sock (struct socket *sock,struct connection *con) {
@@ -492,6 +530,8 @@ static void add_sock(struct socket *sock, struct connection *con) con->sock->sk->sk_state_change = lowcomms_state_change; con->sock->sk->sk_user_data = con; con->sock->sk->sk_allocation =GFP_NOFS ; + con->orig_error_report = con->sock->sk->sk_error_report; + con->sock->sk->sk_error_report = lowcomms_error_report; }/* Add the port number to an IPv6 or 4 sockaddr and return the address