Commit 364eac0c authored by David S. Miller's avatar David S. Miller

Merge tag 'rxrpc-rewrite-20160913-2' of...

Merge tag 'rxrpc-rewrite-20160913-2' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs

David Howells says:

====================
rxrpc: Support IPv6

Here is a set of patches that add IPv6 support.  They need to be applied on
top of the just-posted miscellaneous fix patches.  They are:

 (1) Make autobinding of an unconnected socket work when sendmsg() is
     called to initiate a client call.

 (2) Don't specify the protocol when creating the client socket, but rather
     take the default instead.

 (3) Use rxrpc_extract_addr_from_skb() in a couple of places that were
     doing the same thing manually.  This allows the IPv6 address
     extraction to be done in fewer places.

 (4) Add IPv6 support.  With this, calls can be made to IPv6 servers from
     userspace AF_RXRPC programs; AFS, however, can't use IPv6 yet as the
     RPC calls need to be upgradeable.
====================
Reviewed-by: default avatarSteve Wise <swise@opengridcomputing.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 39caa8bf 75b54cb5
...@@ -106,19 +106,23 @@ static int rxrpc_validate_address(struct rxrpc_sock *rx, ...@@ -106,19 +106,23 @@ static int rxrpc_validate_address(struct rxrpc_sock *rx,
case AF_INET: case AF_INET:
if (srx->transport_len < sizeof(struct sockaddr_in)) if (srx->transport_len < sizeof(struct sockaddr_in))
return -EINVAL; return -EINVAL;
_debug("INET: %x @ %pI4",
ntohs(srx->transport.sin.sin_port),
&srx->transport.sin.sin_addr);
tail = offsetof(struct sockaddr_rxrpc, transport.sin.__pad); tail = offsetof(struct sockaddr_rxrpc, transport.sin.__pad);
break; break;
case AF_INET6: case AF_INET6:
if (srx->transport_len < sizeof(struct sockaddr_in6))
return -EINVAL;
tail = offsetof(struct sockaddr_rxrpc, transport) +
sizeof(struct sockaddr_in6);
break;
default: default:
return -EAFNOSUPPORT; return -EAFNOSUPPORT;
} }
if (tail < len) if (tail < len)
memset((void *)srx + tail, 0, len - tail); memset((void *)srx + tail, 0, len - tail);
_debug("INET: %pISp", &srx->transport);
return 0; return 0;
} }
...@@ -401,6 +405,21 @@ static int rxrpc_sendmsg(struct socket *sock, struct msghdr *m, size_t len) ...@@ -401,6 +405,21 @@ static int rxrpc_sendmsg(struct socket *sock, struct msghdr *m, size_t len)
switch (rx->sk.sk_state) { switch (rx->sk.sk_state) {
case RXRPC_UNBOUND: case RXRPC_UNBOUND:
rx->srx.srx_family = AF_RXRPC;
rx->srx.srx_service = 0;
rx->srx.transport_type = SOCK_DGRAM;
rx->srx.transport.family = rx->family;
switch (rx->family) {
case AF_INET:
rx->srx.transport_len = sizeof(struct sockaddr_in);
break;
case AF_INET6:
rx->srx.transport_len = sizeof(struct sockaddr_in6);
break;
default:
ret = -EAFNOSUPPORT;
goto error_unlock;
}
local = rxrpc_lookup_local(&rx->srx); local = rxrpc_lookup_local(&rx->srx);
if (IS_ERR(local)) { if (IS_ERR(local)) {
ret = PTR_ERR(local); ret = PTR_ERR(local);
...@@ -551,7 +570,7 @@ static int rxrpc_create(struct net *net, struct socket *sock, int protocol, ...@@ -551,7 +570,7 @@ static int rxrpc_create(struct net *net, struct socket *sock, int protocol,
return -EAFNOSUPPORT; return -EAFNOSUPPORT;
/* we support transport protocol UDP/UDP6 only */ /* we support transport protocol UDP/UDP6 only */
if (protocol != PF_INET) if (protocol != PF_INET && protocol != PF_INET6)
return -EPROTONOSUPPORT; return -EPROTONOSUPPORT;
if (sock->type != SOCK_DGRAM) if (sock->type != SOCK_DGRAM)
......
...@@ -134,6 +134,14 @@ struct rxrpc_connection *rxrpc_find_connection_rcu(struct rxrpc_local *local, ...@@ -134,6 +134,14 @@ struct rxrpc_connection *rxrpc_find_connection_rcu(struct rxrpc_local *local,
srx.transport.sin.sin_addr.s_addr) srx.transport.sin.sin_addr.s_addr)
goto not_found; goto not_found;
break; break;
case AF_INET6:
if (peer->srx.transport.sin6.sin6_port !=
srx.transport.sin6.sin6_port ||
memcmp(&peer->srx.transport.sin6.sin6_addr,
&srx.transport.sin6.sin6_addr,
sizeof(struct in6_addr)) != 0)
goto not_found;
break;
default: default:
BUG(); BUG();
} }
......
...@@ -15,8 +15,6 @@ ...@@ -15,8 +15,6 @@
#include <linux/net.h> #include <linux/net.h>
#include <linux/skbuff.h> #include <linux/skbuff.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/udp.h>
#include <linux/ip.h>
#include <net/sock.h> #include <net/sock.h>
#include <net/af_rxrpc.h> #include <net/af_rxrpc.h>
#include <generated/utsrelease.h> #include <generated/utsrelease.h>
...@@ -33,7 +31,7 @@ static void rxrpc_send_version_request(struct rxrpc_local *local, ...@@ -33,7 +31,7 @@ static void rxrpc_send_version_request(struct rxrpc_local *local,
{ {
struct rxrpc_wire_header whdr; struct rxrpc_wire_header whdr;
struct rxrpc_skb_priv *sp = rxrpc_skb(skb); struct rxrpc_skb_priv *sp = rxrpc_skb(skb);
struct sockaddr_in sin; struct sockaddr_rxrpc srx;
struct msghdr msg; struct msghdr msg;
struct kvec iov[2]; struct kvec iov[2];
size_t len; size_t len;
...@@ -41,12 +39,11 @@ static void rxrpc_send_version_request(struct rxrpc_local *local, ...@@ -41,12 +39,11 @@ static void rxrpc_send_version_request(struct rxrpc_local *local,
_enter(""); _enter("");
sin.sin_family = AF_INET; if (rxrpc_extract_addr_from_skb(&srx, skb) < 0)
sin.sin_port = udp_hdr(skb)->source; return;
sin.sin_addr.s_addr = ip_hdr(skb)->saddr;
msg.msg_name = &sin; msg.msg_name = &srx.transport;
msg.msg_namelen = sizeof(sin); msg.msg_namelen = srx.transport_len;
msg.msg_control = NULL; msg.msg_control = NULL;
msg.msg_controllen = 0; msg.msg_controllen = 0;
msg.msg_flags = 0; msg.msg_flags = 0;
......
...@@ -58,6 +58,15 @@ static long rxrpc_local_cmp_key(const struct rxrpc_local *local, ...@@ -58,6 +58,15 @@ static long rxrpc_local_cmp_key(const struct rxrpc_local *local,
memcmp(&local->srx.transport.sin.sin_addr, memcmp(&local->srx.transport.sin.sin_addr,
&srx->transport.sin.sin_addr, &srx->transport.sin.sin_addr,
sizeof(struct in_addr)); sizeof(struct in_addr));
case AF_INET6:
/* If the choice of UDP6 port is left up to the transport, then
* the endpoint record doesn't match.
*/
return ((u16 __force)local->srx.transport.sin6.sin6_port -
(u16 __force)srx->transport.sin6.sin6_port) ?:
memcmp(&local->srx.transport.sin6.sin6_addr,
&srx->transport.sin6.sin6_addr,
sizeof(struct in6_addr));
default: default:
BUG(); BUG();
} }
...@@ -100,11 +109,12 @@ static int rxrpc_open_socket(struct rxrpc_local *local) ...@@ -100,11 +109,12 @@ static int rxrpc_open_socket(struct rxrpc_local *local)
struct sock *sock; struct sock *sock;
int ret, opt; int ret, opt;
_enter("%p{%d}", local, local->srx.transport_type); _enter("%p{%d,%d}",
local, local->srx.transport_type, local->srx.transport.family);
/* create a socket to represent the local endpoint */ /* create a socket to represent the local endpoint */
ret = sock_create_kern(&init_net, PF_INET, local->srx.transport_type, ret = sock_create_kern(&init_net, local->srx.transport.family,
IPPROTO_UDP, &local->socket); local->srx.transport_type, 0, &local->socket);
if (ret < 0) { if (ret < 0) {
_leave(" = %d [socket]", ret); _leave(" = %d [socket]", ret);
return ret; return ret;
...@@ -169,18 +179,8 @@ struct rxrpc_local *rxrpc_lookup_local(const struct sockaddr_rxrpc *srx) ...@@ -169,18 +179,8 @@ struct rxrpc_local *rxrpc_lookup_local(const struct sockaddr_rxrpc *srx)
long diff; long diff;
int ret; int ret;
if (srx->transport.family == AF_INET) { _enter("{%d,%d,%pISp}",
_enter("{%d,%u,%pI4+%hu}", srx->transport_type, srx->transport.family, &srx->transport);
srx->transport_type,
srx->transport.family,
&srx->transport.sin.sin_addr,
ntohs(srx->transport.sin.sin_port));
} else {
_enter("{%d,%u}",
srx->transport_type,
srx->transport.family);
return ERR_PTR(-EAFNOSUPPORT);
}
mutex_lock(&rxrpc_local_mutex); mutex_lock(&rxrpc_local_mutex);
...@@ -233,13 +233,8 @@ struct rxrpc_local *rxrpc_lookup_local(const struct sockaddr_rxrpc *srx) ...@@ -233,13 +233,8 @@ struct rxrpc_local *rxrpc_lookup_local(const struct sockaddr_rxrpc *srx)
found: found:
mutex_unlock(&rxrpc_local_mutex); mutex_unlock(&rxrpc_local_mutex);
_net("LOCAL %s %d {%d,%u,%pI4+%hu}", _net("LOCAL %s %d {%pISp}",
age, age, local->debug_id, &local->srx.transport);
local->debug_id,
local->srx.transport_type,
local->srx.transport.family,
&local->srx.transport.sin.sin_addr,
ntohs(local->srx.transport.sin.sin_port));
_leave(" = %p", local); _leave(" = %p", local);
return local; return local;
......
...@@ -15,8 +15,6 @@ ...@@ -15,8 +15,6 @@
#include <linux/gfp.h> #include <linux/gfp.h>
#include <linux/skbuff.h> #include <linux/skbuff.h>
#include <linux/export.h> #include <linux/export.h>
#include <linux/udp.h>
#include <linux/ip.h>
#include <net/sock.h> #include <net/sock.h>
#include <net/af_rxrpc.h> #include <net/af_rxrpc.h>
#include "ar-internal.h" #include "ar-internal.h"
...@@ -260,6 +258,22 @@ int rxrpc_send_data_packet(struct rxrpc_connection *conn, struct sk_buff *skb) ...@@ -260,6 +258,22 @@ int rxrpc_send_data_packet(struct rxrpc_connection *conn, struct sk_buff *skb)
(char *)&opt, sizeof(opt)); (char *)&opt, sizeof(opt));
} }
break; break;
case AF_INET6:
opt = IPV6_PMTUDISC_DONT;
ret = kernel_setsockopt(conn->params.local->socket,
SOL_IPV6, IPV6_MTU_DISCOVER,
(char *)&opt, sizeof(opt));
if (ret == 0) {
ret = kernel_sendmsg(conn->params.local->socket, &msg,
iov, 1, iov[0].iov_len);
opt = IPV6_PMTUDISC_DO;
kernel_setsockopt(conn->params.local->socket,
SOL_IPV6, IPV6_MTU_DISCOVER,
(char *)&opt, sizeof(opt));
}
break;
} }
up_write(&conn->params.local->defrag_sem); up_write(&conn->params.local->defrag_sem);
...@@ -272,10 +286,7 @@ int rxrpc_send_data_packet(struct rxrpc_connection *conn, struct sk_buff *skb) ...@@ -272,10 +286,7 @@ int rxrpc_send_data_packet(struct rxrpc_connection *conn, struct sk_buff *skb)
*/ */
void rxrpc_reject_packets(struct rxrpc_local *local) void rxrpc_reject_packets(struct rxrpc_local *local)
{ {
union { struct sockaddr_rxrpc srx;
struct sockaddr sa;
struct sockaddr_in sin;
} sa;
struct rxrpc_skb_priv *sp; struct rxrpc_skb_priv *sp;
struct rxrpc_wire_header whdr; struct rxrpc_wire_header whdr;
struct sk_buff *skb; struct sk_buff *skb;
...@@ -292,32 +303,21 @@ void rxrpc_reject_packets(struct rxrpc_local *local) ...@@ -292,32 +303,21 @@ void rxrpc_reject_packets(struct rxrpc_local *local)
iov[1].iov_len = sizeof(code); iov[1].iov_len = sizeof(code);
size = sizeof(whdr) + sizeof(code); size = sizeof(whdr) + sizeof(code);
msg.msg_name = &sa; msg.msg_name = &srx.transport;
msg.msg_control = NULL; msg.msg_control = NULL;
msg.msg_controllen = 0; msg.msg_controllen = 0;
msg.msg_flags = 0; msg.msg_flags = 0;
memset(&sa, 0, sizeof(sa));
sa.sa.sa_family = local->srx.transport.family;
switch (sa.sa.sa_family) {
case AF_INET:
msg.msg_namelen = sizeof(sa.sin);
break;
default:
msg.msg_namelen = 0;
break;
}
memset(&whdr, 0, sizeof(whdr)); memset(&whdr, 0, sizeof(whdr));
whdr.type = RXRPC_PACKET_TYPE_ABORT; whdr.type = RXRPC_PACKET_TYPE_ABORT;
while ((skb = skb_dequeue(&local->reject_queue))) { while ((skb = skb_dequeue(&local->reject_queue))) {
rxrpc_see_skb(skb); rxrpc_see_skb(skb);
sp = rxrpc_skb(skb); sp = rxrpc_skb(skb);
switch (sa.sa.sa_family) {
case AF_INET: if (rxrpc_extract_addr_from_skb(&srx, skb) == 0) {
sa.sin.sin_port = udp_hdr(skb)->source; msg.msg_namelen = srx.transport_len;
sa.sin.sin_addr.s_addr = ip_hdr(skb)->saddr;
code = htonl(skb->priority); code = htonl(skb->priority);
whdr.epoch = htonl(sp->hdr.epoch); whdr.epoch = htonl(sp->hdr.epoch);
...@@ -329,10 +329,6 @@ void rxrpc_reject_packets(struct rxrpc_local *local) ...@@ -329,10 +329,6 @@ void rxrpc_reject_packets(struct rxrpc_local *local)
whdr.flags &= RXRPC_CLIENT_INITIATED; whdr.flags &= RXRPC_CLIENT_INITIATED;
kernel_sendmsg(local->socket, &msg, iov, 2, size); kernel_sendmsg(local->socket, &msg, iov, 2, size);
break;
default:
break;
} }
rxrpc_free_skb(skb); rxrpc_free_skb(skb);
......
...@@ -66,6 +66,30 @@ static struct rxrpc_peer *rxrpc_lookup_peer_icmp_rcu(struct rxrpc_local *local, ...@@ -66,6 +66,30 @@ static struct rxrpc_peer *rxrpc_lookup_peer_icmp_rcu(struct rxrpc_local *local,
} }
break; break;
case AF_INET6:
srx.transport.sin6.sin6_port = serr->port;
srx.transport_len = sizeof(struct sockaddr_in6);
switch (serr->ee.ee_origin) {
case SO_EE_ORIGIN_ICMP6:
_net("Rx ICMP6");
memcpy(&srx.transport.sin6.sin6_addr,
skb_network_header(skb) + serr->addr_offset,
sizeof(struct in6_addr));
break;
case SO_EE_ORIGIN_ICMP:
_net("Rx ICMP on v6 sock");
memcpy(&srx.transport.sin6.sin6_addr.s6_addr + 12,
skb_network_header(skb) + serr->addr_offset,
sizeof(struct in_addr));
break;
default:
memcpy(&srx.transport.sin6.sin6_addr,
&ipv6_hdr(skb)->saddr,
sizeof(struct in6_addr));
break;
}
break;
default: default:
BUG(); BUG();
} }
......
...@@ -16,12 +16,14 @@ ...@@ -16,12 +16,14 @@
#include <linux/skbuff.h> #include <linux/skbuff.h>
#include <linux/udp.h> #include <linux/udp.h>
#include <linux/in.h> #include <linux/in.h>
#include <linux/in6.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/hashtable.h> #include <linux/hashtable.h>
#include <net/sock.h> #include <net/sock.h>
#include <net/af_rxrpc.h> #include <net/af_rxrpc.h>
#include <net/ip.h> #include <net/ip.h>
#include <net/route.h> #include <net/route.h>
#include <net/ip6_route.h>
#include "ar-internal.h" #include "ar-internal.h"
static DEFINE_HASHTABLE(rxrpc_peer_hash, 10); static DEFINE_HASHTABLE(rxrpc_peer_hash, 10);
...@@ -50,6 +52,11 @@ static unsigned long rxrpc_peer_hash_key(struct rxrpc_local *local, ...@@ -50,6 +52,11 @@ static unsigned long rxrpc_peer_hash_key(struct rxrpc_local *local,
size = sizeof(srx->transport.sin.sin_addr); size = sizeof(srx->transport.sin.sin_addr);
p = (u16 *)&srx->transport.sin.sin_addr; p = (u16 *)&srx->transport.sin.sin_addr;
break; break;
case AF_INET6:
hash_key += (u16 __force)srx->transport.sin.sin_port;
size = sizeof(srx->transport.sin6.sin6_addr);
p = (u16 *)&srx->transport.sin6.sin6_addr;
break;
default: default:
WARN(1, "AF_RXRPC: Unsupported transport address family\n"); WARN(1, "AF_RXRPC: Unsupported transport address family\n");
return 0; return 0;
...@@ -93,6 +100,12 @@ static long rxrpc_peer_cmp_key(const struct rxrpc_peer *peer, ...@@ -93,6 +100,12 @@ static long rxrpc_peer_cmp_key(const struct rxrpc_peer *peer,
memcmp(&peer->srx.transport.sin.sin_addr, memcmp(&peer->srx.transport.sin.sin_addr,
&srx->transport.sin.sin_addr, &srx->transport.sin.sin_addr,
sizeof(struct in_addr)); sizeof(struct in_addr));
case AF_INET6:
return ((u16 __force)peer->srx.transport.sin6.sin6_port -
(u16 __force)srx->transport.sin6.sin6_port) ?:
memcmp(&peer->srx.transport.sin6.sin6_addr,
&srx->transport.sin6.sin6_addr,
sizeof(struct in6_addr));
default: default:
BUG(); BUG();
} }
...@@ -130,17 +143,7 @@ struct rxrpc_peer *rxrpc_lookup_peer_rcu(struct rxrpc_local *local, ...@@ -130,17 +143,7 @@ struct rxrpc_peer *rxrpc_lookup_peer_rcu(struct rxrpc_local *local,
peer = __rxrpc_lookup_peer_rcu(local, srx, hash_key); peer = __rxrpc_lookup_peer_rcu(local, srx, hash_key);
if (peer) { if (peer) {
switch (srx->transport.family) { _net("PEER %d {%pISp}", peer->debug_id, &peer->srx.transport);
case AF_INET:
_net("PEER %d {%d,%u,%pI4+%hu}",
peer->debug_id,
peer->srx.transport_type,
peer->srx.transport.family,
&peer->srx.transport.sin.sin_addr,
ntohs(peer->srx.transport.sin.sin_port));
break;
}
_leave(" = %p {u=%d}", peer, atomic_read(&peer->usage)); _leave(" = %p {u=%d}", peer, atomic_read(&peer->usage));
} }
return peer; return peer;
...@@ -152,22 +155,49 @@ struct rxrpc_peer *rxrpc_lookup_peer_rcu(struct rxrpc_local *local, ...@@ -152,22 +155,49 @@ struct rxrpc_peer *rxrpc_lookup_peer_rcu(struct rxrpc_local *local,
*/ */
static void rxrpc_assess_MTU_size(struct rxrpc_peer *peer) static void rxrpc_assess_MTU_size(struct rxrpc_peer *peer)
{ {
struct dst_entry *dst;
struct rtable *rt; struct rtable *rt;
struct flowi4 fl4; struct flowi fl;
struct flowi4 *fl4 = &fl.u.ip4;
struct flowi6 *fl6 = &fl.u.ip6;
peer->if_mtu = 1500; peer->if_mtu = 1500;
rt = ip_route_output_ports(&init_net, &fl4, NULL, memset(&fl, 0, sizeof(fl));
switch (peer->srx.transport.family) {
case AF_INET:
rt = ip_route_output_ports(
&init_net, fl4, NULL,
peer->srx.transport.sin.sin_addr.s_addr, 0, peer->srx.transport.sin.sin_addr.s_addr, 0,
htons(7000), htons(7001), htons(7000), htons(7001), IPPROTO_UDP, 0, 0);
IPPROTO_UDP, 0, 0);
if (IS_ERR(rt)) { if (IS_ERR(rt)) {
_leave(" [route err %ld]", PTR_ERR(rt)); _leave(" [route err %ld]", PTR_ERR(rt));
return; return;
} }
dst = &rt->dst;
break;
case AF_INET6:
fl6->flowi6_iif = LOOPBACK_IFINDEX;
fl6->flowi6_scope = RT_SCOPE_UNIVERSE;
fl6->flowi6_proto = IPPROTO_UDP;
memcpy(&fl6->daddr, &peer->srx.transport.sin6.sin6_addr,
sizeof(struct in6_addr));
fl6->fl6_dport = htons(7001);
fl6->fl6_sport = htons(7000);
dst = ip6_route_output(&init_net, NULL, fl6);
if (IS_ERR(dst)) {
_leave(" [route err %ld]", PTR_ERR(dst));
return;
}
break;
default:
BUG();
}
peer->if_mtu = dst_mtu(&rt->dst); peer->if_mtu = dst_mtu(dst);
dst_release(&rt->dst); dst_release(dst);
_leave(" [if_mtu %u]", peer->if_mtu); _leave(" [if_mtu %u]", peer->if_mtu);
} }
...@@ -207,18 +237,23 @@ static void rxrpc_init_peer(struct rxrpc_peer *peer, unsigned long hash_key) ...@@ -207,18 +237,23 @@ static void rxrpc_init_peer(struct rxrpc_peer *peer, unsigned long hash_key)
rxrpc_assess_MTU_size(peer); rxrpc_assess_MTU_size(peer);
peer->mtu = peer->if_mtu; peer->mtu = peer->if_mtu;
if (peer->srx.transport.family == AF_INET) { switch (peer->srx.transport.family) {
case AF_INET:
peer->hdrsize = sizeof(struct iphdr); peer->hdrsize = sizeof(struct iphdr);
break;
case AF_INET6:
peer->hdrsize = sizeof(struct ipv6hdr);
break;
default:
BUG();
}
switch (peer->srx.transport_type) { switch (peer->srx.transport_type) {
case SOCK_DGRAM: case SOCK_DGRAM:
peer->hdrsize += sizeof(struct udphdr); peer->hdrsize += sizeof(struct udphdr);
break; break;
default: default:
BUG(); BUG();
break;
}
} else {
BUG();
} }
peer->hdrsize += sizeof(struct rxrpc_wire_header); peer->hdrsize += sizeof(struct rxrpc_wire_header);
...@@ -285,11 +320,7 @@ struct rxrpc_peer *rxrpc_lookup_peer(struct rxrpc_local *local, ...@@ -285,11 +320,7 @@ struct rxrpc_peer *rxrpc_lookup_peer(struct rxrpc_local *local,
struct rxrpc_peer *peer, *candidate; struct rxrpc_peer *peer, *candidate;
unsigned long hash_key = rxrpc_peer_hash_key(local, srx); unsigned long hash_key = rxrpc_peer_hash_key(local, srx);
_enter("{%d,%d,%pI4+%hu}", _enter("{%pISp}", &srx->transport);
srx->transport_type,
srx->transport_len,
&srx->transport.sin.sin_addr,
ntohs(srx->transport.sin.sin_port));
/* search the peer list first */ /* search the peer list first */
rcu_read_lock(); rcu_read_lock();
...@@ -326,11 +357,7 @@ struct rxrpc_peer *rxrpc_lookup_peer(struct rxrpc_local *local, ...@@ -326,11 +357,7 @@ struct rxrpc_peer *rxrpc_lookup_peer(struct rxrpc_local *local,
peer = candidate; peer = candidate;
} }
_net("PEER %d {%d,%pI4+%hu}", _net("PEER %d {%pISp}", peer->debug_id, &peer->srx.transport);
peer->debug_id,
peer->srx.transport_type,
&peer->srx.transport.sin.sin_addr,
ntohs(peer->srx.transport.sin.sin_port));
_leave(" = %p {u=%d}", peer, atomic_read(&peer->usage)); _leave(" = %p {u=%d}", peer, atomic_read(&peer->usage));
return peer; return peer;
......
...@@ -52,11 +52,12 @@ static int rxrpc_call_seq_show(struct seq_file *seq, void *v) ...@@ -52,11 +52,12 @@ static int rxrpc_call_seq_show(struct seq_file *seq, void *v)
struct rxrpc_sock *rx; struct rxrpc_sock *rx;
struct rxrpc_peer *peer; struct rxrpc_peer *peer;
struct rxrpc_call *call; struct rxrpc_call *call;
char lbuff[4 + 4 + 4 + 4 + 5 + 1], rbuff[4 + 4 + 4 + 4 + 5 + 1]; char lbuff[50], rbuff[50];
if (v == &rxrpc_calls) { if (v == &rxrpc_calls) {
seq_puts(seq, seq_puts(seq,
"Proto Local Remote " "Proto Local "
" Remote "
" SvID ConnID CallID End Use State Abort " " SvID ConnID CallID End Use State Abort "
" UserID\n"); " UserID\n");
return 0; return 0;
...@@ -68,9 +69,7 @@ static int rxrpc_call_seq_show(struct seq_file *seq, void *v) ...@@ -68,9 +69,7 @@ static int rxrpc_call_seq_show(struct seq_file *seq, void *v)
if (rx) { if (rx) {
local = READ_ONCE(rx->local); local = READ_ONCE(rx->local);
if (local) if (local)
sprintf(lbuff, "%pI4:%u", sprintf(lbuff, "%pISpc", &local->srx.transport);
&local->srx.transport.sin.sin_addr,
ntohs(local->srx.transport.sin.sin_port));
else else
strcpy(lbuff, "no_local"); strcpy(lbuff, "no_local");
} else { } else {
...@@ -79,14 +78,12 @@ static int rxrpc_call_seq_show(struct seq_file *seq, void *v) ...@@ -79,14 +78,12 @@ static int rxrpc_call_seq_show(struct seq_file *seq, void *v)
peer = call->peer; peer = call->peer;
if (peer) if (peer)
sprintf(rbuff, "%pI4:%u", sprintf(rbuff, "%pISpc", &peer->srx.transport);
&peer->srx.transport.sin.sin_addr,
ntohs(peer->srx.transport.sin.sin_port));
else else
strcpy(rbuff, "no_connection"); strcpy(rbuff, "no_connection");
seq_printf(seq, seq_printf(seq,
"UDP %-22.22s %-22.22s %4x %08x %08x %s %3u" "UDP %-47.47s %-47.47s %4x %08x %08x %s %3u"
" %-8.8s %08x %lx\n", " %-8.8s %08x %lx\n",
lbuff, lbuff,
rbuff, rbuff,
...@@ -145,11 +142,12 @@ static void rxrpc_connection_seq_stop(struct seq_file *seq, void *v) ...@@ -145,11 +142,12 @@ static void rxrpc_connection_seq_stop(struct seq_file *seq, void *v)
static int rxrpc_connection_seq_show(struct seq_file *seq, void *v) static int rxrpc_connection_seq_show(struct seq_file *seq, void *v)
{ {
struct rxrpc_connection *conn; struct rxrpc_connection *conn;
char lbuff[4 + 4 + 4 + 4 + 5 + 1], rbuff[4 + 4 + 4 + 4 + 5 + 1]; char lbuff[50], rbuff[50];
if (v == &rxrpc_connection_proc_list) { if (v == &rxrpc_connection_proc_list) {
seq_puts(seq, seq_puts(seq,
"Proto Local Remote " "Proto Local "
" Remote "
" SvID ConnID End Use State Key " " SvID ConnID End Use State Key "
" Serial ISerial\n" " Serial ISerial\n"
); );
...@@ -163,16 +161,12 @@ static int rxrpc_connection_seq_show(struct seq_file *seq, void *v) ...@@ -163,16 +161,12 @@ static int rxrpc_connection_seq_show(struct seq_file *seq, void *v)
goto print; goto print;
} }
sprintf(lbuff, "%pI4:%u", sprintf(lbuff, "%pISpc", &conn->params.local->srx.transport);
&conn->params.local->srx.transport.sin.sin_addr,
ntohs(conn->params.local->srx.transport.sin.sin_port));
sprintf(rbuff, "%pI4:%u", sprintf(rbuff, "%pISpc", &conn->params.peer->srx.transport);
&conn->params.peer->srx.transport.sin.sin_addr,
ntohs(conn->params.peer->srx.transport.sin.sin_port));
print: print:
seq_printf(seq, seq_printf(seq,
"UDP %-22.22s %-22.22s %4x %08x %s %3u" "UDP %-47.47s %-47.47s %4x %08x %s %3u"
" %s %08x %08x %08x\n", " %s %08x %08x %08x\n",
lbuff, lbuff,
rbuff, rbuff,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment