* Author: Eric Barton <eric@bartonsoftware.com>
*/
-#include "socklnd.h"
#include <linux/inetdevice.h>
+#include "socklnd.h"
+#include <linux/sunrpc/addr.h>
static const struct lnet_lnd the_ksocklnd;
struct ksock_nal_data ksocknal_data;
static struct ksock_interface *
-ksocknal_ip2iface(struct lnet_ni *ni, __u32 ip)
+ksocknal_ip2iface(struct lnet_ni *ni, struct sockaddr *addr)
{
struct ksock_net *net = ni->ni_data;
int i;
LASSERT(i < LNET_INTERFACES_NUM);
iface = &net->ksnn_interfaces[i];
- if (iface->ksni_ipaddr == ip)
+ if (rpc_cmp_addr((struct sockaddr *)&iface->ksni_addr, addr))
return iface;
}
return NULL;
}
-static int ksocknal_ip2index(__u32 ipaddress, struct lnet_ni *ni)
+static int ksocknal_ip2index(struct sockaddr *addr, struct lnet_ni *ni)
{
struct net_device *dev;
int ret = -1;
DECLARE_CONST_IN_IFADDR(ifa);
+ if (addr->sa_family != AF_INET)
+ /* No IPv6 support yet */
+ return ret;
+
rcu_read_lock();
for_each_netdev(ni->ni_net_ns, dev) {
int flags = dev_get_flags(dev);
continue;
in_dev_for_each_ifa_rcu(ifa, in_dev) {
- if (ntohl(ifa->ifa_local) == ipaddress)
+ if (ifa->ifa_local ==
+ ((struct sockaddr_in *)addr)->sin_addr.s_addr)
ret = dev->ifindex;
}
endfor_ifa(in_dev);
}
static struct ksock_route *
-ksocknal_create_route(__u32 ipaddr, int port)
+ksocknal_create_route(struct sockaddr *addr)
{
struct ksock_route *route;
if (route == NULL)
return (NULL);
- atomic_set (&route->ksnr_refcount, 1);
+ refcount_set(&route->ksnr_refcount, 1);
route->ksnr_peer = NULL;
route->ksnr_retry_interval = 0; /* OK to connect at any time */
- route->ksnr_ipaddr = ipaddr;
+ rpc_copy_addr((struct sockaddr *)&route->ksnr_addr, addr);
+ rpc_set_port((struct sockaddr *)&route->ksnr_addr, rpc_get_port(addr));
route->ksnr_myiface = -1;
- route->ksnr_port = port;
route->ksnr_scheduled = 0;
route->ksnr_connecting = 0;
route->ksnr_connected = 0;
void
ksocknal_destroy_route(struct ksock_route *route)
{
- LASSERT (atomic_read(&route->ksnr_refcount) == 0);
+ LASSERT(refcount_read(&route->ksnr_refcount) == 0);
if (route->ksnr_peer != NULL)
ksocknal_peer_decref(route->ksnr_peer);
peer_ni->ksnp_ni = ni;
peer_ni->ksnp_id = id;
- atomic_set(&peer_ni->ksnp_refcount, 1); /* 1 ref for caller */
+ refcount_set(&peer_ni->ksnp_refcount, 1); /* 1 ref for caller */
peer_ni->ksnp_closing = 0;
peer_ni->ksnp_accepting = 0;
peer_ni->ksnp_proto = NULL;
CDEBUG (D_NET, "peer_ni %s %p deleted\n",
libcfs_id2str(peer_ni->ksnp_id), peer_ni);
- LASSERT(atomic_read(&peer_ni->ksnp_refcount) == 0);
+ LASSERT(refcount_read(&peer_ni->ksnp_refcount) == 0);
LASSERT(peer_ni->ksnp_accepting == 0);
LASSERT(list_empty(&peer_ni->ksnp_conns));
LASSERT(list_empty(&peer_ni->ksnp_routes));
CDEBUG(D_NET, "got peer_ni [%p] -> %s (%d)\n",
peer_ni, libcfs_id2str(id),
- atomic_read(&peer_ni->ksnp_refcount));
+ refcount_read(&peer_ni->ksnp_refcount));
return peer_ni;
}
return NULL;
ksocknal_unlink_peer_locked(struct ksock_peer_ni *peer_ni)
{
int i;
- __u32 ip;
struct ksock_interface *iface;
for (i = 0; i < peer_ni->ksnp_n_passive_ips; i++) {
+ struct sockaddr_in sa = { .sin_family = AF_INET };
LASSERT(i < LNET_INTERFACES_NUM);
- ip = peer_ni->ksnp_passive_ips[i];
+ sa.sin_addr.s_addr = htonl(peer_ni->ksnp_passive_ips[i]);
- iface = ksocknal_ip2iface(peer_ni->ksnp_ni, ip);
+ iface = ksocknal_ip2iface(peer_ni->ksnp_ni,
+ (struct sockaddr *)&sa);
/*
* All IPs in peer_ni->ksnp_passive_ips[] come from the
* interface list, therefore the call must succeed.
ksnr_list);
*id = peer_ni->ksnp_id;
- rc = choose_ipv4_src(myip, route->ksnr_myiface,
- route->ksnr_ipaddr,
- ni->ni_net_ns);
- *peer_ip = route->ksnr_ipaddr;
- *port = route->ksnr_port;
+ if (route->ksnr_addr.ss_family == AF_INET) {
+ struct sockaddr_in *sa =
+ (void *)&route->ksnr_addr;
+ rc = choose_ipv4_src(
+ myip,
+ route->ksnr_myiface,
+ ntohl(sa->sin_addr.s_addr),
+ ni->ni_net_ns);
+ *peer_ip = ntohl(sa->sin_addr.s_addr);
+ *port = ntohs(sa->sin_port);
+ } else {
+ *myip = 0xFFFFFFFF;
+ *peer_ip = 0xFFFFFFFF;
+ *port = 0;
+ rc = -ENOTSUPP;
+ }
*conn_count = route->ksnr_conn_count;
*share_count = route->ksnr_share_count;
goto out;
struct ksock_peer_ni *peer_ni = route->ksnr_peer;
int type = conn->ksnc_type;
struct ksock_interface *iface;
- int conn_iface = ksocknal_ip2index(conn->ksnc_myipaddr,
- route->ksnr_peer->ksnp_ni);
+ int conn_iface =
+ ksocknal_ip2index((struct sockaddr *)&conn->ksnc_myaddr,
+ route->ksnr_peer->ksnp_ni);
conn->ksnc_route = route;
ksocknal_route_addref(route);
if (route->ksnr_myiface != conn_iface) {
if (route->ksnr_myiface < 0) {
/* route wasn't bound locally yet (the initial route) */
- CDEBUG(D_NET, "Binding %s %pI4h to interface %d\n",
+ CDEBUG(D_NET, "Binding %s %pIS to interface %d\n",
libcfs_id2str(peer_ni->ksnp_id),
- &route->ksnr_ipaddr,
+ &route->ksnr_addr,
conn_iface);
} else {
CDEBUG(D_NET,
- "Rebinding %s %pI4h from interface %d to %d\n",
+ "Rebinding %s %pIS from interface %d to %d\n",
libcfs_id2str(peer_ni->ksnp_id),
- &route->ksnr_ipaddr,
+ &route->ksnr_addr,
route->ksnr_myiface,
conn_iface);
struct list_head *tmp;
struct ksock_conn *conn;
struct ksock_route *route2;
+ struct ksock_net *net = peer_ni->ksnp_ni->ni_data;
LASSERT(!peer_ni->ksnp_closing);
LASSERT(route->ksnr_peer == NULL);
LASSERT(!route->ksnr_scheduled);
LASSERT(!route->ksnr_connecting);
LASSERT(route->ksnr_connected == 0);
+ LASSERT(net->ksnn_ninterfaces > 0);
/* LASSERT(unique) */
list_for_each(tmp, &peer_ni->ksnp_routes) {
route2 = list_entry(tmp, struct ksock_route, ksnr_list);
- if (route2->ksnr_ipaddr == route->ksnr_ipaddr) {
+ if (rpc_cmp_addr((struct sockaddr *)&route2->ksnr_addr,
+ (struct sockaddr *)&route->ksnr_addr)) {
CERROR("Duplicate route %s %pI4h\n",
libcfs_id2str(peer_ni->ksnp_id),
- &route->ksnr_ipaddr);
+ &route->ksnr_addr);
LBUG();
}
}
route->ksnr_peer = peer_ni;
ksocknal_peer_addref(peer_ni);
+
+ /* set the route's interface to the current net's interface */
+ route->ksnr_myiface = net->ksnn_interfaces[0].ksni_index;
+ net->ksnn_interfaces[0].ksni_nroutes++;
+
/* peer_ni's routelist takes over my ref on 'route' */
list_add_tail(&route->ksnr_list, &peer_ni->ksnp_routes);
list_for_each(tmp, &peer_ni->ksnp_conns) {
conn = list_entry(tmp, struct ksock_conn, ksnc_list);
- if (conn->ksnc_ipaddr != route->ksnr_ipaddr)
+ if (!rpc_cmp_addr((struct sockaddr *)&conn->ksnc_peeraddr,
+ (struct sockaddr *)&route->ksnr_addr))
continue;
ksocknal_associate_route_conn_locked(route, conn);
struct ksock_peer_ni *peer_ni = route->ksnr_peer;
struct ksock_interface *iface;
struct ksock_conn *conn;
- struct list_head *ctmp;
- struct list_head *cnxt;
+ struct ksock_conn *cnxt;
LASSERT(!route->ksnr_deleted);
/* Close associated conns */
- list_for_each_safe(ctmp, cnxt, &peer_ni->ksnp_conns) {
- conn = list_entry(ctmp, struct ksock_conn, ksnc_list);
-
+ list_for_each_entry_safe(conn, cnxt, &peer_ni->ksnp_conns, ksnc_list) {
if (conn->ksnc_route != route)
continue;
}
int
-ksocknal_add_peer(struct lnet_ni *ni, struct lnet_process_id id, __u32 ipaddr,
- int port)
+ksocknal_add_peer(struct lnet_ni *ni, struct lnet_process_id id,
+ struct sockaddr *addr)
{
struct list_head *tmp;
struct ksock_peer_ni *peer_ni;
struct ksock_route *route;
struct ksock_route *route2;
- if (id.nid == LNET_NID_ANY ||
- id.pid == LNET_PID_ANY)
- return (-EINVAL);
+ if (id.nid == LNET_NID_ANY ||
+ id.pid == LNET_PID_ANY)
+ return (-EINVAL);
/* Have a brand new peer_ni ready... */
peer_ni = ksocknal_create_peer(ni, id);
if (IS_ERR(peer_ni))
return PTR_ERR(peer_ni);
- route = ksocknal_create_route (ipaddr, port);
- if (route == NULL) {
- ksocknal_peer_decref(peer_ni);
- return (-ENOMEM);
- }
+ route = ksocknal_create_route(addr);
+ if (route == NULL) {
+ ksocknal_peer_decref(peer_ni);
+ return (-ENOMEM);
+ }
write_lock_bh(&ksocknal_data.ksnd_global_lock);
- /* always called with a ref on ni, so shutdown can't have started */
+ /* always called with a ref on ni, so shutdown can't have started */
LASSERT(atomic_read(&((struct ksock_net *)ni->ni_data)->ksnn_npeers)
>= 0);
list_for_each(tmp, &peer_ni->ksnp_routes) {
route2 = list_entry(tmp, struct ksock_route, ksnr_list);
- if (route2->ksnr_ipaddr == ipaddr)
+ if (rpc_cmp_addr(addr, (struct sockaddr *)&route2->ksnr_addr))
break;
route2 = NULL;
ksocknal_del_peer_locked(struct ksock_peer_ni *peer_ni, __u32 ip)
{
struct ksock_conn *conn;
+ struct ksock_conn *cnxt;
struct ksock_route *route;
- struct list_head *tmp;
- struct list_head *nxt;
+ struct ksock_route *rnxt;
int nshared;
LASSERT(!peer_ni->ksnp_closing);
/* Extra ref prevents peer_ni disappearing until I'm done with it */
ksocknal_peer_addref(peer_ni);
- list_for_each_safe(tmp, nxt, &peer_ni->ksnp_routes) {
- route = list_entry(tmp, struct ksock_route, ksnr_list);
-
+ list_for_each_entry_safe(route, rnxt, &peer_ni->ksnp_routes,
+ ksnr_list) {
/* no match */
- if (!(ip == 0 || route->ksnr_ipaddr == ip))
- continue;
+ if (ip) {
+ if (route->ksnr_addr.ss_family != AF_INET)
+ continue;
+ if (((struct sockaddr_in *)&route->ksnr_addr)
+ ->sin_addr.s_addr != htonl(ip))
+ continue;
+ }
route->ksnr_share_count = 0;
/* This deletes associated conns too */
}
nshared = 0;
- list_for_each_safe(tmp, nxt, &peer_ni->ksnp_routes) {
- route = list_entry(tmp, struct ksock_route, ksnr_list);
+ list_for_each_entry(route, &peer_ni->ksnp_routes, ksnr_list)
nshared += route->ksnr_share_count;
- }
if (nshared == 0) {
/* remove everything else if there are no explicit entries
- * left */
-
- list_for_each_safe(tmp, nxt, &peer_ni->ksnp_routes) {
- route = list_entry(tmp, struct ksock_route, ksnr_list);
-
+ * left
+ */
+ list_for_each_entry_safe(route, rnxt, &peer_ni->ksnp_routes,
+ ksnr_list) {
/* we should only be removing auto-entries */
LASSERT(route->ksnr_share_count == 0);
ksocknal_del_route_locked(route);
}
- list_for_each_safe(tmp, nxt, &peer_ni->ksnp_conns) {
- conn = list_entry(tmp, struct ksock_conn, ksnc_list);
-
+ list_for_each_entry_safe(conn, cnxt, &peer_ni->ksnp_conns,
+ ksnc_list)
ksocknal_close_conn_locked(conn, 0);
- }
}
ksocknal_peer_decref(peer_ni);
ksocknal_local_ipvec(struct lnet_ni *ni, __u32 *ipaddrs)
{
struct ksock_net *net = ni->ni_data;
- int i;
+ int i, j;
int nip;
read_lock(&ksocknal_data.ksnd_global_lock);
nip = net->ksnn_ninterfaces;
LASSERT(nip <= LNET_INTERFACES_NUM);
+ for (i = 0, j = 0; i < nip; i++)
+ if (net->ksnn_interfaces[i].ksni_addr.ss_family == AF_INET) {
+ struct sockaddr_in *sa =
+ (void *)&net->ksnn_interfaces[i].ksni_addr;
+
+ ipaddrs[j] = ntohl(sa->sin_addr.s_addr);
+ LASSERT(ipaddrs[j] != 0);
+ j += 1;
+ }
+ nip = j;
+
+ read_unlock(&ksocknal_data.ksnd_global_lock);
/*
* Only offer interfaces for additional connections if I have
* more than one.
*/
- if (nip < 2) {
- read_unlock(&ksocknal_data.ksnd_global_lock);
- return 0;
- }
-
- for (i = 0; i < nip; i++) {
- ipaddrs[i] = net->ksnn_interfaces[i].ksni_ipaddr;
- LASSERT(ipaddrs[i] != 0);
- }
-
- read_unlock(&ksocknal_data.ksnd_global_lock);
- return nip;
+ return nip < 2 ? 0 : nip;
}
static int
int this_xor;
int this_netmatch;
int i;
+ struct sockaddr_in *sa;
+ __u32 ip;
- for (i = 0; i < nips; i++) {
- if (ips[i] == 0)
- continue;
+ sa = (struct sockaddr_in *)&iface->ksni_addr;
+ LASSERT(sa->sin_family == AF_INET);
+ ip = ntohl(sa->sin_addr.s_addr);
- this_xor = (ips[i] ^ iface->ksni_ipaddr);
- this_netmatch = ((this_xor & iface->ksni_netmask) == 0) ? 1 : 0;
+ for (i = 0; i < nips; i++) {
+ if (ips[i] == 0)
+ continue;
- if (!(best < 0 ||
- best_netmatch < this_netmatch ||
- (best_netmatch == this_netmatch &&
- best_xor > this_xor)))
- continue;
+ this_xor = ips[i] ^ ip;
+ this_netmatch = ((this_xor & iface->ksni_netmask) == 0) ? 1 : 0;
- best = i;
- best_netmatch = this_netmatch;
- best_xor = this_xor;
- }
+ if (!(best < 0 ||
+ best_netmatch < this_netmatch ||
+ (best_netmatch == this_netmatch &&
+ best_xor > this_xor)))
+ continue;
+
+ best = i;
+ best_netmatch = this_netmatch;
+ best_xor = this_xor;
+ }
- LASSERT (best >= 0);
- return (best);
+ LASSERT(best >= 0);
+ return best;
}
static int
* We don't forget interfaces we've stopped using; we might
* start using them again... */
- if (i < peer_ni->ksnp_n_passive_ips) {
- /* Old interface. */
- ip = peer_ni->ksnp_passive_ips[i];
- best_iface = ksocknal_ip2iface(peer_ni->ksnp_ni, ip);
+ if (i < peer_ni->ksnp_n_passive_ips) {
+ /* Old interface. */
+ struct sockaddr_in sa = { .sin_family = AF_INET};
+
+ sa.sin_addr.s_addr =
+ htonl(peer_ni->ksnp_passive_ips[i]);
+ best_iface = ksocknal_ip2iface(peer_ni->ksnp_ni,
+ (struct sockaddr *)&sa);
- /* peer_ni passive ips are kept up to date */
- LASSERT(best_iface != NULL);
+ /* peer_ni passive ips are kept up to date */
+ LASSERT(best_iface != NULL);
} else {
/* choose a new interface */
+ struct sockaddr_in *sa;
+
LASSERT (i == peer_ni->ksnp_n_passive_ips);
best_iface = NULL;
best_netmatch = 0;
best_npeers = 0;
- for (j = 0; j < net->ksnn_ninterfaces; j++) {
- iface = &net->ksnn_interfaces[j];
- ip = iface->ksni_ipaddr;
+ for (j = 0; j < net->ksnn_ninterfaces; j++) {
+ iface = &net->ksnn_interfaces[j];
+ sa = (void *)&iface->ksni_addr;
+ if (sa->sin_family != AF_INET)
+ continue;
+ ip = ntohl(sa->sin_addr.s_addr);
for (k = 0; k < peer_ni->ksnp_n_passive_ips; k++)
if (peer_ni->ksnp_passive_ips[k] == ip)
LASSERT(best_iface != NULL);
- best_iface->ksni_npeers++;
- ip = best_iface->ksni_ipaddr;
- peer_ni->ksnp_passive_ips[i] = ip;
- peer_ni->ksnp_n_passive_ips = i+1;
+ best_iface->ksni_npeers++;
+ sa = (void *)&best_iface->ksni_addr;
+ ip = ntohl(sa->sin_addr.s_addr);
+ peer_ni->ksnp_passive_ips[i] = ip;
+ peer_ni->ksnp_n_passive_ips = i+1;
}
/* mark the best matching peer_ni IP used */
ksocknal_create_routes(struct ksock_peer_ni *peer_ni, int port,
__u32 *peer_ipaddrs, int npeer_ipaddrs)
{
- struct ksock_route *newroute = NULL;
+ struct ksock_route *newroute = NULL;
rwlock_t *global_lock = &ksocknal_data.ksnd_global_lock;
struct lnet_ni *ni = peer_ni->ksnp_ni;
struct ksock_net *net = ni->ni_data;
LASSERT(npeer_ipaddrs <= LNET_INTERFACES_NUM);
- for (i = 0; i < npeer_ipaddrs; i++) {
- if (newroute != NULL) {
- newroute->ksnr_ipaddr = peer_ipaddrs[i];
- } else {
+ for (i = 0; i < npeer_ipaddrs; i++) {
+ if (newroute) {
+ struct sockaddr_in *sa = (void *)&newroute->ksnr_addr;
+
+ memset(sa, 0, sizeof(*sa));
+ sa->sin_family = AF_INET;
+ sa->sin_addr.s_addr = htonl(peer_ipaddrs[i]);
+ } else {
+ struct sockaddr_in sa = {.sin_family = AF_INET};
+
write_unlock_bh(global_lock);
- newroute = ksocknal_create_route(peer_ipaddrs[i], port);
- if (newroute == NULL)
- return;
+ sa.sin_addr.s_addr = htonl(peer_ipaddrs[i]);
+ sa.sin_port = htons(port);
+ newroute =
+ ksocknal_create_route((struct sockaddr *)&sa);
+ if (!newroute)
+ return;
write_lock_bh(global_lock);
- }
+ }
- if (peer_ni->ksnp_closing) {
- /* peer_ni got closed under me */
- break;
- }
+ if (peer_ni->ksnp_closing) {
+ /* peer_ni got closed under me */
+ break;
+ }
/* Already got a route? */
route = NULL;
list_for_each(rtmp, &peer_ni->ksnp_routes) {
route = list_entry(rtmp, struct ksock_route, ksnr_list);
- if (route->ksnr_ipaddr == newroute->ksnr_ipaddr)
+ if (rpc_cmp_addr(
+ (struct sockaddr *)&route->ksnr_addr,
+ (struct sockaddr *)&newroute->ksnr_addr))
break;
route = NULL;
/* Select interface to connect from */
for (j = 0; j < net->ksnn_ninterfaces; j++) {
+ __u32 iface_ip, route_ip;
+
iface = &net->ksnn_interfaces[j];
/* Using this interface already? */
}
if (route != NULL)
continue;
+ if (iface->ksni_addr.ss_family != AF_INET)
+ continue;
+ if (newroute->ksnr_addr.ss_family != AF_INET)
+ continue;
+
+ iface_ip =
+ ntohl(((struct sockaddr_in *)
+ &iface->ksni_addr)->sin_addr.s_addr);
+ route_ip =
+ ntohl(((struct sockaddr_in *)
+ &newroute->ksnr_addr)->sin_addr.s_addr);
- this_netmatch = (((iface->ksni_ipaddr ^
- newroute->ksnr_ipaddr) &
+ this_netmatch = (((iface_ip ^ route_ip) &
iface->ksni_netmask) == 0) ? 1 : 0;
if (!(best_iface == NULL ||
{
struct ksock_connreq *cr;
int rc;
- u32 peer_ip;
- int peer_port;
+ struct sockaddr_storage peer;
- rc = lnet_sock_getaddr(sock, true, &peer_ip, &peer_port);
+ rc = lnet_sock_getaddr(sock, true, &peer);
LASSERT(rc == 0); /* we succeeded before */
LIBCFS_ALLOC(cr, sizeof(*cr));
if (cr == NULL) {
- LCONSOLE_ERROR_MSG(0x12f, "Dropping connection request from "
- "%pI4h: memory exhausted\n", &peer_ip);
+ LCONSOLE_ERROR_MSG(0x12f,
+ "Dropping connection request from %pIS: memory exhausted\n",
+ &peer);
return -ENOMEM;
}
}
static int
-ksocknal_connecting(struct ksock_peer_ni *peer_ni, __u32 ipaddr)
+ksocknal_connecting(struct ksock_peer_ni *peer_ni, struct sockaddr *sa)
{
struct ksock_route *route;
list_for_each_entry(route, &peer_ni->ksnp_routes, ksnr_list) {
- if (route->ksnr_ipaddr == ipaddr)
+ if (rpc_cmp_addr((struct sockaddr *)&route->ksnr_addr, sa))
return route->ksnr_connecting;
}
return 0;
conn->ksnc_sock = sock;
/* 2 ref, 1 for conn, another extra ref prevents socket
* being closed before establishment of connection */
- atomic_set (&conn->ksnc_sock_refcount, 2);
+ refcount_set(&conn->ksnc_sock_refcount, 2);
conn->ksnc_type = type;
ksocknal_lib_save_callback(sock, conn);
- atomic_set (&conn->ksnc_conn_refcount, 1); /* 1 ref for me */
+ refcount_set(&conn->ksnc_conn_refcount, 1); /* 1 ref for me */
conn->ksnc_rx_ready = 0;
conn->ksnc_rx_scheduled = 0;
ksocknal_peer_addref(peer_ni);
peer_ni->ksnp_accepting++;
- /* Am I already connecting to this guy? Resolve in
- * favour of higher NID... */
- if (peerid.nid < ni->ni_nid &&
- ksocknal_connecting(peer_ni, conn->ksnc_ipaddr)) {
- rc = EALREADY;
- warn = "connection race resolution";
- goto failed_2;
- }
+ /* Am I already connecting to this guy? Resolve in
+ * favour of higher NID...
+ */
+ if (peerid.nid < ni->ni_nid &&
+ ksocknal_connecting(peer_ni, ((struct sockaddr *)
+ &conn->ksnc_peeraddr))) {
+ rc = EALREADY;
+ warn = "connection race resolution";
+ goto failed_2;
+ }
}
if (peer_ni->ksnp_closing ||
peer_ni->ksnp_incarnation = incarnation;
}
- if (peer_ni->ksnp_proto != conn->ksnc_proto ||
- peer_ni->ksnp_incarnation != incarnation) {
- /* peer_ni rebooted or I've got the wrong protocol version */
- ksocknal_close_peer_conns_locked(peer_ni, 0, 0);
+ if (peer_ni->ksnp_proto != conn->ksnc_proto ||
+ peer_ni->ksnp_incarnation != incarnation) {
+ /* peer_ni rebooted or I've got the wrong protocol version */
+ ksocknal_close_peer_conns_locked(peer_ni, NULL, 0);
- peer_ni->ksnp_proto = NULL;
- rc = ESTALE;
- warn = peer_ni->ksnp_incarnation != incarnation ?
- "peer_ni rebooted" :
- "wrong proto version";
- goto failed_2;
- }
+ peer_ni->ksnp_proto = NULL;
+ rc = ESTALE;
+ warn = peer_ni->ksnp_incarnation != incarnation ?
+ "peer_ni rebooted" :
+ "wrong proto version";
+ goto failed_2;
+ }
switch (rc) {
default:
/* Refuse to duplicate an existing connection, unless this is a
* loopback connection */
- if (conn->ksnc_ipaddr != conn->ksnc_myipaddr) {
+ if (!rpc_cmp_addr((struct sockaddr *)&conn->ksnc_peeraddr,
+ (struct sockaddr *)&conn->ksnc_myaddr)) {
list_for_each(tmp, &peer_ni->ksnp_conns) {
conn2 = list_entry(tmp, struct ksock_conn, ksnc_list);
- if (conn2->ksnc_ipaddr != conn->ksnc_ipaddr ||
- conn2->ksnc_myipaddr != conn->ksnc_myipaddr ||
- conn2->ksnc_type != conn->ksnc_type)
- continue;
+ if (!rpc_cmp_addr(
+ (struct sockaddr *)&conn2->ksnc_peeraddr,
+ (struct sockaddr *)&conn->ksnc_peeraddr) ||
+ !rpc_cmp_addr(
+ (struct sockaddr *)&conn2->ksnc_myaddr,
+ (struct sockaddr *)&conn->ksnc_myaddr) ||
+ conn2->ksnc_type != conn->ksnc_type)
+ continue;
/* Reply on a passive connection attempt so the peer_ni
* realises we're connected. */
* address the route connected to, the connection/route matching
* code below probably isn't going to work. */
if (active &&
- route->ksnr_ipaddr != conn->ksnc_ipaddr) {
- CERROR("Route %s %pI4h connected to %pI4h\n",
- libcfs_id2str(peer_ni->ksnp_id),
- &route->ksnr_ipaddr,
- &conn->ksnc_ipaddr);
+ !rpc_cmp_addr((struct sockaddr *)&route->ksnr_addr,
+ (struct sockaddr *)&conn->ksnc_peeraddr)) {
+ CERROR("Route %s %pIS connected to %pIS\n",
+ libcfs_id2str(peer_ni->ksnp_id),
+ &route->ksnr_addr,
+ &conn->ksnc_peeraddr);
}
/* Search for a route corresponding to the new connection and
list_for_each(tmp, &peer_ni->ksnp_routes) {
route = list_entry(tmp, struct ksock_route, ksnr_list);
- if (route->ksnr_ipaddr != conn->ksnc_ipaddr)
+ if (!rpc_cmp_addr((struct sockaddr *)&route->ksnr_addr,
+ (struct sockaddr *)&conn->ksnc_peeraddr))
continue;
ksocknal_associate_route_conn_locked(route, conn);
/* Set the deadline for the outgoing HELLO to drain */
conn->ksnc_tx_bufnob = sock->sk->sk_wmem_queued;
conn->ksnc_tx_deadline = ktime_get_seconds() +
- lnet_get_lnd_timeout();
+ ksocknal_timeout();
smp_mb(); /* order with adding to peer_ni's conn list */
list_add(&conn->ksnc_list, &peer_ni->ksnp_conns);
* socket callbacks.
*/
- CDEBUG(D_NET, "New conn %s p %d.x %pI4h -> %pI4h/%d"
+ CDEBUG(D_NET, "New conn %s p %d.x %pIS -> %pISp"
" incarnation:%lld sched[%d]\n",
libcfs_id2str(peerid), conn->ksnc_proto->pro_version,
- &conn->ksnc_myipaddr, &conn->ksnc_ipaddr,
- conn->ksnc_port, incarnation, cpt);
+ &conn->ksnc_myaddr, &conn->ksnc_peeraddr,
+ incarnation, cpt);
- if (active) {
- /* additional routes after interface exchange? */
- ksocknal_create_routes(peer_ni, conn->ksnc_port,
- hello->kshm_ips, hello->kshm_nips);
+ if (active) {
+ /* additional routes after interface exchange? */
+ ksocknal_create_routes(
+ peer_ni,
+ rpc_get_port((struct sockaddr *)&conn->ksnc_peeraddr),
+ hello->kshm_ips, hello->kshm_nips);
} else {
hello->kshm_nips = ksocknal_select_ips(peer_ni, hello->kshm_ips,
hello->kshm_nips);
if (route != NULL) {
/* dissociate conn from route... */
LASSERT(!route->ksnr_deleted);
- LASSERT((route->ksnr_connected & (1 << conn->ksnc_type)) != 0);
+ LASSERT((route->ksnr_connected & BIT(conn->ksnc_type)) != 0);
conn2 = NULL;
list_for_each(tmp, &peer_ni->ksnp_conns) {
conn2 = NULL;
}
if (conn2 == NULL)
- route->ksnr_connected &= ~(1 << conn->ksnc_type);
+ route->ksnr_connected &= ~BIT(conn->ksnc_type);
conn->ksnc_route = NULL;
void
ksocknal_peer_failed(struct ksock_peer_ni *peer_ni)
{
- int notify = 0;
+ bool notify = false;
time64_t last_alive = 0;
/* There has been a connection failure or comms error; but I'll only
list_empty(&peer_ni->ksnp_conns) &&
peer_ni->ksnp_accepting == 0 &&
ksocknal_find_connecting_route_locked(peer_ni) == NULL) {
- notify = 1;
+ notify = true;
last_alive = peer_ni->ksnp_last_alive;
}
void
ksocknal_terminate_conn(struct ksock_conn *conn)
{
- /* This gets called by the reaper (guaranteed thread context) to
- * disengage the socket from its callbacks and close it.
- * ksnc_refcount will eventually hit zero, and then the reaper will
- * destroy it. */
+ /* This gets called by the reaper (guaranteed thread context) to
+ * disengage the socket from its callbacks and close it.
+ * ksnc_refcount will eventually hit zero, and then the reaper will
+ * destroy it.
+ */
struct ksock_peer_ni *peer_ni = conn->ksnc_peer;
struct ksock_sched *sched = conn->ksnc_scheduler;
- int failed = 0;
+ bool failed = false;
- LASSERT(conn->ksnc_closing);
+ LASSERT(conn->ksnc_closing);
- /* wake up the scheduler to "send" all remaining packets to /dev/null */
+ /* wake up the scheduler to "send" all remaining packets to /dev/null */
spin_lock_bh(&sched->kss_lock);
- /* a closing conn is always ready to tx */
- conn->ksnc_tx_ready = 1;
+ /* a closing conn is always ready to tx */
+ conn->ksnc_tx_ready = 1;
- if (!conn->ksnc_tx_scheduled &&
+ if (!conn->ksnc_tx_scheduled &&
!list_empty(&conn->ksnc_tx_queue)) {
list_add_tail(&conn->ksnc_tx_list,
- &sched->kss_tx_conns);
- conn->ksnc_tx_scheduled = 1;
- /* extra ref for scheduler */
+ &sched->kss_tx_conns);
+ conn->ksnc_tx_scheduled = 1;
+ /* extra ref for scheduler */
ksocknal_conn_addref(conn);
wake_up (&sched->kss_waitq);
/* serialise with callbacks */
write_lock_bh(&ksocknal_data.ksnd_global_lock);
- ksocknal_lib_reset_callback(conn->ksnc_sock, conn);
+ ksocknal_lib_reset_callback(conn->ksnc_sock, conn);
- /* OK, so this conn may not be completely disengaged from its
- * scheduler yet, but it _has_ committed to terminate... */
- conn->ksnc_scheduler->kss_nconns--;
+ /* OK, so this conn may not be completely disengaged from its
+ * scheduler yet, but it _has_ committed to terminate...
+ */
+ conn->ksnc_scheduler->kss_nconns--;
- if (peer_ni->ksnp_error != 0) {
- /* peer_ni's last conn closed in error */
+ if (peer_ni->ksnp_error != 0) {
+ /* peer_ni's last conn closed in error */
LASSERT(list_empty(&peer_ni->ksnp_conns));
- failed = 1;
- peer_ni->ksnp_error = 0; /* avoid multiple notifications */
- }
+ failed = true;
+ peer_ni->ksnp_error = 0; /* avoid multiple notifications */
+ }
write_unlock_bh(&ksocknal_data.ksnd_global_lock);
- if (failed)
- ksocknal_peer_failed(peer_ni);
+ if (failed)
+ ksocknal_peer_failed(peer_ni);
- /* The socket is closed on the final put; either here, or in
- * ksocknal_{send,recv}msg(). Since we set up the linger2 option
- * when the connection was established, this will close the socket
- * immediately, aborting anything buffered in it. Any hung
- * zero-copy transmits will therefore complete in finite time. */
- ksocknal_connsock_decref(conn);
+ /* The socket is closed on the final put; either here, or in
+ * ksocknal_{send,recv}msg(). Since we set up the linger2 option
+ * when the connection was established, this will close the socket
+ * immediately, aborting anything buffered in it. Any hung
+ * zero-copy transmits will therefore complete in finite time.
+ */
+ ksocknal_connsock_decref(conn);
}
void
ksocknal_queue_zombie_conn(struct ksock_conn *conn)
{
/* Queue the conn for the reaper to destroy */
- LASSERT(atomic_read(&conn->ksnc_conn_refcount) == 0);
+ LASSERT(refcount_read(&conn->ksnc_conn_refcount) == 0);
spin_lock_bh(&ksocknal_data.ksnd_reaper_lock);
list_add_tail(&conn->ksnc_list, &ksocknal_data.ksnd_zombie_conns);
/* Final coup-de-grace of the reaper */
CDEBUG (D_NET, "connection %p\n", conn);
- LASSERT (atomic_read (&conn->ksnc_conn_refcount) == 0);
- LASSERT (atomic_read (&conn->ksnc_sock_refcount) == 0);
+ LASSERT(refcount_read(&conn->ksnc_conn_refcount) == 0);
+ LASSERT(refcount_read(&conn->ksnc_sock_refcount) == 0);
LASSERT (conn->ksnc_sock == NULL);
LASSERT (conn->ksnc_route == NULL);
LASSERT (!conn->ksnc_tx_scheduled);
switch (conn->ksnc_rx_state) {
case SOCKNAL_RX_LNET_PAYLOAD:
last_rcv = conn->ksnc_rx_deadline -
- lnet_get_lnd_timeout();
- CERROR("Completing partial receive from %s[%d], "
- "ip %pI4h:%d, with error, wanted: %d, left: %d, "
- "last alive is %lld secs ago\n",
+ ksocknal_timeout();
+ CERROR("Completing partial receive from %s[%d], ip %pISp, with error, wanted: %d, left: %d, last alive is %lld secs ago\n",
libcfs_id2str(conn->ksnc_peer->ksnp_id), conn->ksnc_type,
- &conn->ksnc_ipaddr, conn->ksnc_port,
+ &conn->ksnc_peeraddr,
conn->ksnc_rx_nob_wanted, conn->ksnc_rx_nob_left,
ktime_get_seconds() - last_rcv);
if (conn->ksnc_lnet_msg)
LNET_MSG_STATUS_REMOTE_ERROR;
lnet_finalize(conn->ksnc_lnet_msg, -EIO);
break;
- case SOCKNAL_RX_LNET_HEADER:
- if (conn->ksnc_rx_started)
- CERROR("Incomplete receive of lnet header from %s, "
- "ip %pI4h:%d, with error, protocol: %d.x.\n",
- libcfs_id2str(conn->ksnc_peer->ksnp_id),
- &conn->ksnc_ipaddr, conn->ksnc_port,
- conn->ksnc_proto->pro_version);
- break;
+ case SOCKNAL_RX_LNET_HEADER:
+ if (conn->ksnc_rx_started)
+ CERROR("Incomplete receive of lnet header from %s, ip %pISp, with error, protocol: %d.x.\n",
+ libcfs_id2str(conn->ksnc_peer->ksnp_id),
+ &conn->ksnc_peeraddr,
+ conn->ksnc_proto->pro_version);
+ break;
case SOCKNAL_RX_KSM_HEADER:
if (conn->ksnc_rx_started)
- CERROR("Incomplete receive of ksock message from %s, "
- "ip %pI4h:%d, with error, protocol: %d.x.\n",
- libcfs_id2str(conn->ksnc_peer->ksnp_id),
- &conn->ksnc_ipaddr, conn->ksnc_port,
- conn->ksnc_proto->pro_version);
+ CERROR("Incomplete receive of ksock message from %s, ip %pISp, with error, protocol: %d.x.\n",
+ libcfs_id2str(conn->ksnc_peer->ksnp_id),
+ &conn->ksnc_peeraddr,
+ conn->ksnc_proto->pro_version);
break;
case SOCKNAL_RX_SLOP:
if (conn->ksnc_rx_started)
- CERROR("Incomplete receive of slops from %s, "
- "ip %pI4h:%d, with error\n",
- libcfs_id2str(conn->ksnc_peer->ksnp_id),
- &conn->ksnc_ipaddr, conn->ksnc_port);
+ CERROR("Incomplete receive of slops from %s, ip %pISp, with error\n",
+ libcfs_id2str(conn->ksnc_peer->ksnp_id),
+ &conn->ksnc_peeraddr);
break;
default:
LBUG ();
}
int
-ksocknal_close_peer_conns_locked(struct ksock_peer_ni *peer_ni, __u32 ipaddr, int why)
+ksocknal_close_peer_conns_locked(struct ksock_peer_ni *peer_ni,
+ struct sockaddr *addr, int why)
{
struct ksock_conn *conn;
- struct list_head *ctmp;
- struct list_head *cnxt;
+ struct ksock_conn *cnxt;
int count = 0;
- list_for_each_safe(ctmp, cnxt, &peer_ni->ksnp_conns) {
- conn = list_entry(ctmp, struct ksock_conn, ksnc_list);
-
- if (ipaddr == 0 ||
- conn->ksnc_ipaddr == ipaddr) {
- count++;
- ksocknal_close_conn_locked (conn, why);
- }
- }
+ list_for_each_entry_safe(conn, cnxt, &peer_ni->ksnp_conns, ksnc_list) {
+ if (!addr ||
+ rpc_cmp_addr(addr,
+ (struct sockaddr *)&conn->ksnc_peeraddr)) {
+ count++;
+ ksocknal_close_conn_locked(conn, why);
+ }
+ }
- return (count);
+ return count;
}
int
ksocknal_close_conn_and_siblings(struct ksock_conn *conn, int why)
{
struct ksock_peer_ni *peer_ni = conn->ksnc_peer;
- u32 ipaddr = conn->ksnc_ipaddr;
int count;
write_lock_bh(&ksocknal_data.ksnd_global_lock);
- count = ksocknal_close_peer_conns_locked (peer_ni, ipaddr, why);
+ count = ksocknal_close_peer_conns_locked(
+ peer_ni, (struct sockaddr *)&conn->ksnc_peeraddr, why);
write_unlock_bh(&ksocknal_data.ksnd_global_lock);
- return (count);
+ return count;
}
int
int hi;
int i;
int count = 0;
+ struct sockaddr_in sa = {.sin_family = AF_INET};
write_lock_bh(&ksocknal_data.ksnd_global_lock);
hi = HASH_SIZE(ksocknal_data.ksnd_peers) - 1;
}
+ sa.sin_addr.s_addr = htonl(ipaddr);
for (i = lo; i <= hi; i++) {
hlist_for_each_entry_safe(peer_ni, pnxt,
&ksocknal_data.ksnd_peers[i],
id.pid == peer_ni->ksnp_id.pid)))
continue;
- count += ksocknal_close_peer_conns_locked(peer_ni,
- ipaddr, 0);
+ count += ksocknal_close_peer_conns_locked(
+ peer_ni,
+ ipaddr ? (struct sockaddr *)&sa : NULL, 0);
}
}
{
struct ksock_net *net = ni->ni_data;
struct ksock_interface *iface;
+ struct sockaddr_in sa = { .sin_family = AF_INET };
int rc;
int i;
int j;
write_lock_bh(&ksocknal_data.ksnd_global_lock);
- iface = ksocknal_ip2iface(ni, ipaddress);
+ sa.sin_addr.s_addr = htonl(ipaddress);
+ iface = ksocknal_ip2iface(ni, (struct sockaddr *)&sa);
if (iface != NULL) {
/* silently ignore dups */
rc = 0;
} else {
iface = &net->ksnn_interfaces[net->ksnn_ninterfaces++];
- iface->ksni_index = ksocknal_ip2index(ipaddress, ni);
- iface->ksni_ipaddr = ipaddress;
+ iface->ksni_index = ksocknal_ip2index((struct sockaddr *)&sa,
+ ni);
+ rpc_copy_addr((struct sockaddr *)&iface->ksni_addr,
+ (struct sockaddr *)&sa);
iface->ksni_netmask = netmask;
iface->ksni_nroutes = 0;
iface->ksni_npeers = 0;
ksocknal_peer_del_interface_locked(struct ksock_peer_ni *peer_ni,
__u32 ipaddr, int index)
{
- struct list_head *tmp;
- struct list_head *nxt;
struct ksock_route *route;
+ struct ksock_route *rnxt;
struct ksock_conn *conn;
+ struct ksock_conn *cnxt;
int i;
int j;
break;
}
- list_for_each_safe(tmp, nxt, &peer_ni->ksnp_routes) {
- route = list_entry(tmp, struct ksock_route, ksnr_list);
-
+ list_for_each_entry_safe(route, rnxt, &peer_ni->ksnp_routes,
+ ksnr_list) {
if (route->ksnr_myiface != index)
continue;
}
}
- list_for_each_safe(tmp, nxt, &peer_ni->ksnp_conns) {
- conn = list_entry(tmp, struct ksock_conn, ksnc_list);
-
- if (conn->ksnc_myipaddr == ipaddr)
- ksocknal_close_conn_locked (conn, 0);
- }
+ list_for_each_entry_safe(conn, cnxt, &peer_ni->ksnp_conns, ksnc_list)
+ if (conn->ksnc_route->ksnr_myiface == index)
+ ksocknal_close_conn_locked (conn, 0);
}
static int
struct hlist_node *nxt;
struct ksock_peer_ni *peer_ni;
u32 this_ip;
+ struct sockaddr_in sa = {.sin_family = AF_INET };
int index;
int i;
int j;
- index = ksocknal_ip2index(ipaddress, ni);
+ sa.sin_addr.s_addr = htonl(ipaddress);
+ index = ksocknal_ip2index((struct sockaddr *)&sa, ni);
write_lock_bh(&ksocknal_data.ksnd_global_lock);
for (i = 0; i < net->ksnn_ninterfaces; i++) {
- this_ip = net->ksnn_interfaces[i].ksni_ipaddr;
+ struct sockaddr_in *sa =
+ (void *)&net->ksnn_interfaces[i].ksni_addr;
+
+ if (sa->sin_family != AF_INET)
+ continue;
+ this_ip = ntohl(sa->sin_addr.s_addr);
if (!(ipaddress == 0 ||
ipaddress == this_ip))
case IOC_LIBCFS_GET_INTERFACE: {
struct ksock_net *net = ni->ni_data;
struct ksock_interface *iface;
+ struct sockaddr_in *sa;
read_lock(&ksocknal_data.ksnd_global_lock);
rc = 0;
iface = &net->ksnn_interfaces[data->ioc_count];
- data->ioc_u32[0] = iface->ksni_ipaddr;
- data->ioc_u32[1] = iface->ksni_netmask;
- data->ioc_u32[2] = iface->ksni_npeers;
- data->ioc_u32[3] = iface->ksni_nroutes;
- }
+ sa = (void *)&iface->ksni_addr;
+ if (sa->sin_family == AF_INET)
+ data->ioc_u32[0] = ntohl(sa->sin_addr.s_addr);
+ else
+ data->ioc_u32[0] = 0xFFFFFFFF;
+ data->ioc_u32[1] = iface->ksni_netmask;
+ data->ioc_u32[2] = iface->ksni_npeers;
+ data->ioc_u32[3] = iface->ksni_nroutes;
+ }
read_unlock(&ksocknal_data.ksnd_global_lock);
return rc;
return 0;
}
- case IOC_LIBCFS_ADD_PEER:
- id.nid = data->ioc_nid;
- id.pid = LNET_PID_LUSTRE;
- return ksocknal_add_peer (ni, id,
- data->ioc_u32[0], /* IP */
- data->ioc_u32[1]); /* port */
+ case IOC_LIBCFS_ADD_PEER: {
+ struct sockaddr_in sa = {.sin_family = AF_INET};
+ id.nid = data->ioc_nid;
+ id.pid = LNET_PID_LUSTRE;
+ sa.sin_addr.s_addr = htonl(data->ioc_u32[0]);
+ sa.sin_port = htons(data->ioc_u32[1]);
+ return ksocknal_add_peer(ni, id, (struct sockaddr *)&sa);
+ }
case IOC_LIBCFS_DEL_PEER:
id.nid = data->ioc_nid;
id.pid = LNET_PID_ANY;
int rxmem;
int nagle;
struct ksock_conn *conn = ksocknal_get_conn_by_idx(ni, data->ioc_count);
+ struct sockaddr_in *psa = (void *)&conn->ksnc_peeraddr;
+ struct sockaddr_in *mysa = (void *)&conn->ksnc_myaddr;
if (conn == NULL)
return -ENOENT;
data->ioc_count = txmem;
data->ioc_nid = conn->ksnc_peer->ksnp_id.nid;
data->ioc_flags = nagle;
- data->ioc_u32[0] = conn->ksnc_ipaddr;
- data->ioc_u32[1] = conn->ksnc_port;
- data->ioc_u32[2] = conn->ksnc_myipaddr;
- data->ioc_u32[3] = conn->ksnc_type;
+ if (psa->sin_family == AF_INET)
+ data->ioc_u32[0] = ntohl(psa->sin_addr.s_addr);
+ else
+ data->ioc_u32[0] = 0xFFFFFFFF;
+ data->ioc_u32[1] = rpc_get_port((struct sockaddr *)
+ &conn->ksnc_peeraddr);
+ if (mysa->sin_family == AF_INET)
+ data->ioc_u32[2] = ntohl(mysa->sin_addr.s_addr);
+ else
+ data->ioc_u32[2] = 0xFFFFFFFF;
+ data->ioc_u32[3] = conn->ksnc_type;
data->ioc_u32[4] = conn->ksnc_scheduler->kss_cpt;
data->ioc_u32[5] = rxmem;
data->ioc_u32[6] = conn->ksnc_peer->ksnp_id.pid;
struct ksock_peer_ni *peer_ni;
int i;
- CDEBUG(D_MALLOC, "before NAL cleanup: kmem %d\n",
- atomic_read (&libcfs_kmemory));
+ CDEBUG(D_MALLOC, "before NAL cleanup: kmem %lld\n",
+ libcfs_kmem_read());
LASSERT (ksocknal_data.ksnd_nnets == 0);
switch (ksocknal_data.ksnd_init) {
}
wait_var_event_warning(&ksocknal_data.ksnd_nthreads,
- ksocknal_data.ksnd_nthreads == 0,
+ atomic_read(&ksocknal_data.ksnd_nthreads) == 0,
"waiting for %d threads to terminate\n",
- ksocknal_data.ksnd_nthreads);
+ atomic_read(&ksocknal_data.ksnd_nthreads));
ksocknal_free_buffers();
break;
}
- CDEBUG(D_MALLOC, "after NAL cleanup: kmem %d\n",
- atomic_read (&libcfs_kmemory));
+ CDEBUG(D_MALLOC, "after NAL cleanup: kmem %lld\n",
+ libcfs_kmem_read());
module_put(THIS_MODULE);
}
CWARN("Active peer_ni on shutdown: %s, ref %d, "
"closing %d, accepting %d, err %d, zcookie %llu, "
"txq %d, zc_req %d\n", libcfs_id2str(peer_ni->ksnp_id),
- atomic_read(&peer_ni->ksnp_refcount),
+ refcount_read(&peer_ni->ksnp_refcount),
peer_ni->ksnp_closing,
peer_ni->ksnp_accepting, peer_ni->ksnp_error,
peer_ni->ksnp_zc_next_cookie,
!list_empty(&peer_ni->ksnp_zc_req_list));
list_for_each_entry(route, &peer_ni->ksnp_routes, ksnr_list) {
- CWARN("Route: ref %d, schd %d, conn %d, cnted %d, "
- "del %d\n", atomic_read(&route->ksnr_refcount),
+ CWARN("Route: ref %d, schd %d, conn %d, cnted %d, del %d\n",
+ refcount_read(&route->ksnr_refcount),
route->ksnr_scheduled, route->ksnr_connecting,
route->ksnr_connected, route->ksnr_deleted);
}
list_for_each_entry(conn, &peer_ni->ksnp_conns, ksnc_list) {
CWARN("Conn: ref %d, sref %d, t %d, c %d\n",
- atomic_read(&conn->ksnc_conn_refcount),
- atomic_read(&conn->ksnc_sock_refcount),
+ refcount_read(&conn->ksnc_conn_refcount),
+ refcount_read(&conn->ksnc_sock_refcount),
conn->ksnc_type, conn->ksnc_closing);
}
break;
for (i = 0; i < net->ksnn_ninterfaces; i++) {
char *ifnam = &net->ksnn_interfaces[i].ksni_name[0];
char *colon = strchr(ifnam, ':');
- int found = 0;
+ bool found = false;
struct ksock_net *tmp;
int j;
*colon = 0;
list_for_each_entry(tmp, &ksocknal_data.ksnd_nets,
- ksnn_list) {
+ ksnn_list) {
for (j = 0; !found && j < tmp->ksnn_ninterfaces; j++) {
char *ifnam2 = &tmp->ksnn_interfaces[j].\
- ksni_name[0];
+ ksni_name[0];
char *colon2 = strchr(ifnam2, ':');
if (colon2 != NULL)
goto fail_1;
if (!ni->ni_interfaces[0]) {
+ struct sockaddr_in *sa;
+
ksi = &net->ksnn_interfaces[0];
+ sa = (void *)&ksi->ksni_addr;
/* Use the first discovered interface */
net->ksnn_ninterfaces = 1;
ni->ni_dev_cpt = ifaces[0].li_cpt;
- ksi->ksni_ipaddr = ifaces[0].li_ipaddr;
+ memset(sa, 0, sizeof(*sa));
+ sa->sin_family = AF_INET;
+ sa->sin_addr.s_addr = htonl(ifaces[0].li_ipaddr);
+ ksi->ksni_index = ksocknal_ip2index((struct sockaddr *)sa, ni);
ksi->ksni_netmask = ifaces[0].li_netmask;
strlcpy(ksi->ksni_name, ifaces[0].li_name,
sizeof(ksi->ksni_name));
}
for (j = 0; j < rc; j++) {
+ struct sockaddr_in *sa;
+
if (strcmp(ifaces[j].li_name,
ni->ni_interfaces[i]) != 0)
continue;
- ksi = &net->ksnn_interfaces[j];
+ ksi =
+ &net->ksnn_interfaces[net->ksnn_ninterfaces];
+ sa = (void *)&ksi->ksni_addr;
ni->ni_dev_cpt = ifaces[j].li_cpt;
- ksi->ksni_ipaddr = ifaces[j].li_ipaddr;
+ memset(sa, 0, sizeof(*sa));
+ sa->sin_family = AF_INET;
+ sa->sin_addr.s_addr =
+ htonl(ifaces[j].li_ipaddr);
+ ksi->ksni_index = ksocknal_ip2index(
+ (struct sockaddr *)sa, ni);
ksi->ksni_netmask = ifaces[j].li_netmask;
strlcpy(ksi->ksni_name, ifaces[j].li_name,
sizeof(ksi->ksni_name));
goto fail_1;
LASSERT(ksi);
- ni->ni_nid = LNET_MKNID(LNET_NIDNET(ni->ni_nid), ksi->ksni_ipaddr);
+ LASSERT(ksi->ksni_addr.ss_family == AF_INET);
+ ni->ni_nid = LNET_MKNID(
+ LNET_NIDNET(ni->ni_nid),
+ ntohl(((struct sockaddr_in *)
+ &ksi->ksni_addr)->sin_addr.s_addr));
list_add(&net->ksnn_list, &ksocknal_data.ksnd_nets);
- ksocknal_data.ksnd_nnets++;
+ ksocknal_data.ksnd_nnets++;
- return 0;
+ return 0;
- fail_1:
- LIBCFS_FREE(net, sizeof(*net));
- fail_0:
- if (ksocknal_data.ksnd_nnets == 0)
- ksocknal_base_shutdown();
+fail_1:
+ LIBCFS_FREE(net, sizeof(*net));
+fail_0:
+ if (ksocknal_data.ksnd_nnets == 0)
+ ksocknal_base_shutdown();
- return -ENETDOWN;
+ return -ENETDOWN;
}