* Author: Eric Barton <eric@bartonsoftware.com>
*/
-#include "socklnd.h"
#include <linux/inetdevice.h>
+#include "socklnd.h"
+#include <linux/sunrpc/addr.h>
-static struct lnet_lnd the_ksocklnd;
+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 struct ksock_interface *
+ksocknal_index2iface(struct lnet_ni *ni, int index)
+{
+ struct ksock_net *net = ni->ni_data;
+ int i;
+ struct ksock_interface *iface;
+
+ for (i = 0; i < net->ksnn_ninterfaces; i++) {
+ LASSERT(i < LNET_INTERFACES_NUM);
+ iface = &net->ksnn_interfaces[i];
+
+ if (iface->ksni_index == index)
+ return iface;
+ }
+
+ return NULL;
+}
+
+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);
+ struct in_device *in_dev;
+
+ if (flags & IFF_LOOPBACK) /* skip the loopback IF */
+ continue;
+
+ if (!(flags & IFF_UP))
+ continue;
+
+ in_dev = __in_dev_get_rcu(dev);
+ if (!in_dev)
+ continue;
+
+ in_dev_for_each_ifa_rcu(ifa, in_dev) {
+ if (ifa->ifa_local ==
+ ((struct sockaddr_in *)addr)->sin_addr.s_addr)
+ ret = dev->ifindex;
+ }
+ endfor_ifa(in_dev);
+ if (ret >= 0)
+ break;
+ }
+ rcu_read_unlock();
+
+ return ret;
+}
+
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;
- route->ksnr_port = port;
- route->ksnr_scheduled = 0;
- route->ksnr_connecting = 0;
- route->ksnr_connected = 0;
- route->ksnr_deleted = 0;
- route->ksnr_conn_count = 0;
- route->ksnr_share_count = 0;
-
- return (route);
+ 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_scheduled = 0;
+ route->ksnr_connecting = 0;
+ route->ksnr_connected = 0;
+ route->ksnr_deleted = 0;
+ route->ksnr_conn_count = 0;
+ route->ksnr_share_count = 0;
+
+ return route;
}
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);
LIBCFS_FREE (route, sizeof (*route));
}
-static int
-ksocknal_create_peer(struct ksock_peer_ni **peerp, struct lnet_ni *ni,
- struct lnet_process_id id)
+static struct ksock_peer_ni *
+ksocknal_create_peer(struct lnet_ni *ni, struct lnet_process_id id)
{
int cpt = lnet_cpt_of_nid(id.nid, ni);
struct ksock_net *net = ni->ni_data;
LASSERT(id.pid != LNET_PID_ANY);
LASSERT(!in_interrupt());
+ if (!atomic_inc_unless_negative(&net->ksnn_npeers)) {
+ CERROR("Can't create peer_ni: network shutdown\n");
+ return ERR_PTR(-ESHUTDOWN);
+ }
+
LIBCFS_CPT_ALLOC(peer_ni, lnet_cpt_table(), cpt, sizeof(*peer_ni));
- if (peer_ni == NULL)
- return -ENOMEM;
+ if (!peer_ni) {
+ atomic_dec(&net->ksnn_npeers);
+ return ERR_PTR(-ENOMEM);
+ }
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;
INIT_LIST_HEAD(&peer_ni->ksnp_zc_req_list);
spin_lock_init(&peer_ni->ksnp_lock);
- spin_lock_bh(&net->ksnn_lock);
-
- if (net->ksnn_shutdown) {
- spin_unlock_bh(&net->ksnn_lock);
-
- LIBCFS_FREE(peer_ni, sizeof(*peer_ni));
- CERROR("Can't create peer_ni: network shutdown\n");
- return -ESHUTDOWN;
- }
-
- net->ksnn_npeers++;
-
- spin_unlock_bh(&net->ksnn_lock);
-
- *peerp = peer_ni;
- return 0;
+ return peer_ni;
}
void
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));
LIBCFS_FREE(peer_ni, sizeof(*peer_ni));
- /* NB a peer_ni's connections and routes keep a reference on their peer_ni
- * until they are destroyed, so we can be assured that _all_ state to
- * do with this peer_ni has been cleaned up when its refcount drops to
- * zero. */
- spin_lock_bh(&net->ksnn_lock);
- net->ksnn_npeers--;
- spin_unlock_bh(&net->ksnn_lock);
+ /* NB a peer_ni's connections and routes keep a reference on their
+ * peer_ni until they are destroyed, so we can be assured that _all_
+ * state to do with this peer_ni has been cleaned up when its refcount
+ * drops to zero.
+ */
+ if (atomic_dec_and_test(&net->ksnn_npeers))
+ wake_up_var(&net->ksnn_npeers);
}
struct ksock_peer_ni *
ksocknal_find_peer_locked(struct lnet_ni *ni, struct lnet_process_id id)
{
- struct list_head *peer_list = ksocknal_nid2peerlist(id.nid);
- struct list_head *tmp;
struct ksock_peer_ni *peer_ni;
- list_for_each(tmp, peer_list) {
- peer_ni = list_entry(tmp, struct ksock_peer_ni, ksnp_list);
-
+ hash_for_each_possible(ksocknal_data.ksnd_peers, peer_ni,
+ ksnp_list, id.nid) {
LASSERT(!peer_ni->ksnp_closing);
if (peer_ni->ksnp_ni != ni)
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.
LASSERT(list_empty(&peer_ni->ksnp_routes));
LASSERT(!peer_ni->ksnp_closing);
peer_ni->ksnp_closing = 1;
- list_del(&peer_ni->ksnp_list);
+ hlist_del(&peer_ni->ksnp_list);
/* lose peerlist's ref */
ksocknal_peer_decref(peer_ni);
}
int *port, int *conn_count, int *share_count)
{
struct ksock_peer_ni *peer_ni;
- struct list_head *ptmp;
struct ksock_route *route;
struct list_head *rtmp;
int i;
read_lock(&ksocknal_data.ksnd_global_lock);
- for (i = 0; i < ksocknal_data.ksnd_peer_hash_size; i++) {
- list_for_each(ptmp, &ksocknal_data.ksnd_peers[i]) {
- peer_ni = list_entry(ptmp, struct ksock_peer_ni, ksnp_list);
+ hash_for_each(ksocknal_data.ksnd_peers, i, peer_ni, ksnp_list) {
- if (peer_ni->ksnp_ni != ni)
- continue;
-
- if (peer_ni->ksnp_n_passive_ips == 0 &&
- list_empty(&peer_ni->ksnp_routes)) {
- if (index-- > 0)
- continue;
+ if (peer_ni->ksnp_ni != ni)
+ continue;
- *id = peer_ni->ksnp_id;
- *myip = 0;
- *peer_ip = 0;
- *port = 0;
- *conn_count = 0;
- *share_count = 0;
- rc = 0;
- goto out;
- }
+ if (peer_ni->ksnp_n_passive_ips == 0 &&
+ list_empty(&peer_ni->ksnp_routes)) {
+ if (index-- > 0)
+ continue;
- for (j = 0; j < peer_ni->ksnp_n_passive_ips; j++) {
- if (index-- > 0)
- continue;
+ *id = peer_ni->ksnp_id;
+ *myip = 0;
+ *peer_ip = 0;
+ *port = 0;
+ *conn_count = 0;
+ *share_count = 0;
+ rc = 0;
+ goto out;
+ }
- *id = peer_ni->ksnp_id;
- *myip = peer_ni->ksnp_passive_ips[j];
- *peer_ip = 0;
- *port = 0;
- *conn_count = 0;
- *share_count = 0;
- rc = 0;
- goto out;
- }
+ for (j = 0; j < peer_ni->ksnp_n_passive_ips; j++) {
+ if (index-- > 0)
+ continue;
- list_for_each(rtmp, &peer_ni->ksnp_routes) {
- if (index-- > 0)
- continue;
+ *id = peer_ni->ksnp_id;
+ *myip = peer_ni->ksnp_passive_ips[j];
+ *peer_ip = 0;
+ *port = 0;
+ *conn_count = 0;
+ *share_count = 0;
+ rc = 0;
+ goto out;
+ }
- route = list_entry(rtmp, struct ksock_route,
- ksnr_list);
+ list_for_each(rtmp, &peer_ni->ksnp_routes) {
+ if (index-- > 0)
+ continue;
- *id = peer_ni->ksnp_id;
- *myip = route->ksnr_myipaddr;
- *peer_ip = route->ksnr_ipaddr;
- *port = route->ksnr_port;
- *conn_count = route->ksnr_conn_count;
- *share_count = route->ksnr_share_count;
- rc = 0;
- goto out;
+ route = list_entry(rtmp, struct ksock_route,
+ ksnr_list);
+
+ *id = peer_ni->ksnp_id;
+ 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;
}
}
out:
}
static void
-ksocknal_associate_route_conn_locked(struct ksock_route *route, struct ksock_conn *conn)
+ksocknal_associate_route_conn_locked(struct ksock_route *route,
+ struct ksock_conn *conn)
{
struct ksock_peer_ni *peer_ni = route->ksnr_peer;
int type = conn->ksnc_type;
struct ksock_interface *iface;
+ 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_myipaddr != conn->ksnc_myipaddr) {
- if (route->ksnr_myipaddr == 0) {
+ 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 %pI4h\n",
+ CDEBUG(D_NET, "Binding %s %pIS to interface %d\n",
libcfs_id2str(peer_ni->ksnp_id),
- &route->ksnr_ipaddr,
- &conn->ksnc_myipaddr);
+ &route->ksnr_addr,
+ conn_iface);
} else {
- CDEBUG(D_NET, "Rebinding %s %pI4h from %pI4h "
- "to %pI4h\n", libcfs_id2str(peer_ni->ksnp_id),
- &route->ksnr_ipaddr,
- &route->ksnr_myipaddr,
- &conn->ksnc_myipaddr);
-
- iface = ksocknal_ip2iface(route->ksnr_peer->ksnp_ni,
- route->ksnr_myipaddr);
- if (iface != NULL)
- iface->ksni_nroutes--;
- }
- route->ksnr_myipaddr = conn->ksnc_myipaddr;
- iface = ksocknal_ip2iface(route->ksnr_peer->ksnp_ni,
- route->ksnr_myipaddr);
- if (iface != NULL)
- iface->ksni_nroutes++;
- }
+ CDEBUG(D_NET,
+ "Rebinding %s %pIS from interface %d to %d\n",
+ libcfs_id2str(peer_ni->ksnp_id),
+ &route->ksnr_addr,
+ route->ksnr_myiface,
+ conn_iface);
+
+ iface = ksocknal_index2iface(route->ksnr_peer->ksnp_ni,
+ route->ksnr_myiface);
+ if (iface)
+ iface->ksni_nroutes--;
+ }
+ route->ksnr_myiface = conn_iface;
+ iface = ksocknal_index2iface(route->ksnr_peer->ksnp_ni,
+ route->ksnr_myiface);
+ if (iface)
+ iface->ksni_nroutes++;
+ }
- route->ksnr_connected |= (1<<type);
- route->ksnr_conn_count++;
+ route->ksnr_connected |= (1<<type);
+ route->ksnr_conn_count++;
- /* Successful connection => further attempts can
- * proceed immediately */
- route->ksnr_retry_interval = 0;
+ /* Successful connection => further attempts can
+ * proceed immediately
+ */
+ route->ksnr_retry_interval = 0;
}
static void
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;
ksocknal_close_conn_locked(conn, 0);
}
- if (route->ksnr_myipaddr != 0) {
- iface = ksocknal_ip2iface(route->ksnr_peer->ksnp_ni,
- route->ksnr_myipaddr);
- if (iface != NULL)
+ if (route->ksnr_myiface >= 0) {
+ iface = ksocknal_index2iface(route->ksnr_peer->ksnp_ni,
+ route->ksnr_myiface);
+ if (iface)
iface->ksni_nroutes--;
}
}
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_peer_ni *peer2;
struct ksock_route *route;
struct ksock_route *route2;
- int rc;
- 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... */
- rc = ksocknal_create_peer(&peer_ni, ni, id);
- if (rc != 0)
- return rc;
+ /* 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 */
- LASSERT(((struct ksock_net *) ni->ni_data)->ksnn_shutdown == 0);
+ /* 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);
peer2 = ksocknal_find_peer_locked(ni, id);
if (peer2 != NULL) {
peer_ni = peer2;
} else {
/* peer_ni table takes my ref on peer_ni */
- list_add_tail(&peer_ni->ksnp_list,
- ksocknal_nid2peerlist(id.nid));
+ hash_add(ksocknal_data.ksnd_peers, &peer_ni->ksnp_list, id.nid);
}
route2 = NULL;
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);
static int
ksocknal_del_peer(struct lnet_ni *ni, struct lnet_process_id id, __u32 ip)
{
- struct list_head zombies = LIST_HEAD_INIT(zombies);
- struct list_head *ptmp;
- struct list_head *pnxt;
+ LIST_HEAD(zombies);
+ struct hlist_node *pnxt;
struct ksock_peer_ni *peer_ni;
int lo;
int hi;
write_lock_bh(&ksocknal_data.ksnd_global_lock);
if (id.nid != LNET_NID_ANY) {
- hi = (int)(ksocknal_nid2peerlist(id.nid) -
- ksocknal_data.ksnd_peers);
- lo = hi;
+ lo = hash_min(id.nid, HASH_BITS(ksocknal_data.ksnd_peers));
+ hi = lo;
} else {
lo = 0;
- hi = ksocknal_data.ksnd_peer_hash_size - 1;
+ hi = HASH_SIZE(ksocknal_data.ksnd_peers) - 1;
}
for (i = lo; i <= hi; i++) {
- list_for_each_safe(ptmp, pnxt,
- &ksocknal_data.ksnd_peers[i]) {
- peer_ni = list_entry(ptmp, struct ksock_peer_ni, ksnp_list);
-
+ hlist_for_each_entry_safe(peer_ni, pnxt,
+ &ksocknal_data.ksnd_peers[i],
+ ksnp_list) {
if (peer_ni->ksnp_ni != ni)
continue;
ksocknal_get_conn_by_idx(struct lnet_ni *ni, int index)
{
struct ksock_peer_ni *peer_ni;
- struct list_head *ptmp;
struct ksock_conn *conn;
struct list_head *ctmp;
int i;
read_lock(&ksocknal_data.ksnd_global_lock);
- for (i = 0; i < ksocknal_data.ksnd_peer_hash_size; i++) {
- list_for_each(ptmp, &ksocknal_data.ksnd_peers[i]) {
- peer_ni = list_entry(ptmp, struct ksock_peer_ni, ksnp_list);
+ hash_for_each(ksocknal_data.ksnd_peers, i, peer_ni, ksnp_list) {
+ LASSERT(!peer_ni->ksnp_closing);
- LASSERT(!peer_ni->ksnp_closing);
+ if (peer_ni->ksnp_ni != ni)
+ continue;
- if (peer_ni->ksnp_ni != ni)
+ list_for_each(ctmp, &peer_ni->ksnp_conns) {
+ if (index-- > 0)
continue;
- list_for_each(ctmp, &peer_ni->ksnp_conns) {
- if (index-- > 0)
- continue;
-
- conn = list_entry(ctmp, struct ksock_conn,
- ksnc_list);
- ksocknal_conn_addref(conn);
- read_unlock(&ksocknal_data. \
- ksnd_global_lock);
- return conn;
- }
+ conn = list_entry(ctmp, struct ksock_conn,
+ ksnc_list);
+ ksocknal_conn_addref(conn);
+ read_unlock(&ksocknal_data.ksnd_global_lock);
+ return conn;
}
}
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;
+
+ sa = (struct sockaddr_in *)&iface->ksni_addr;
+ LASSERT(sa->sin_family == AF_INET);
+ ip = ntohl(sa->sin_addr.s_addr);
- for (i = 0; i < nips; i++) {
- if (ips[i] == 0)
- continue;
+ for (i = 0; i < nips; i++) {
+ if (ips[i] == 0)
+ continue;
- this_xor = (ips[i] ^ iface->ksni_ipaddr);
- this_netmatch = ((this_xor & iface->ksni_netmask) == 0) ? 1 : 0;
+ this_xor = ips[i] ^ ip;
+ this_netmatch = ((this_xor & iface->ksni_netmask) == 0) ? 1 : 0;
- if (!(best < 0 ||
- best_netmatch < this_netmatch ||
- (best_netmatch == this_netmatch &&
- best_xor > this_xor)))
- continue;
+ 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;
- }
+ best = i;
+ best_netmatch = this_netmatch;
+ best_xor = this_xor;
+ }
- LASSERT (best >= 0);
- return (best);
+ LASSERT(best >= 0);
+ return best;
}
static int
LASSERT(net->ksnn_ninterfaces <= LNET_INTERFACES_NUM);
/* Only match interfaces for additional connections
- * if I have > 1 interface */
- n_ips = (net->ksnn_ninterfaces < 2) ? 0 :
- MIN(n_peerips, net->ksnn_ninterfaces);
+ * if I have > 1 interface
+ */
+ n_ips = (net->ksnn_ninterfaces < 2) ? 0 :
+ min(n_peerips, net->ksnn_ninterfaces);
for (i = 0; peer_ni->ksnp_n_passive_ips < n_ips; i++) {
/* ^ yes really... */
* 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};
- /* peer_ni passive ips are kept up to date */
- LASSERT(best_iface != NULL);
+ 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);
} 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? */
route = list_entry(rtmp, struct ksock_route,
ksnr_list);
- if (route->ksnr_myipaddr == iface->ksni_ipaddr)
+ if (route->ksnr_myiface == iface->ksni_index)
break;
route = NULL;
}
if (route != NULL)
continue;
+ if (iface->ksni_addr.ss_family != AF_INET)
+ continue;
+ if (newroute->ksnr_addr.ss_family != AF_INET)
+ continue;
- this_netmatch = (((iface->ksni_ipaddr ^
- newroute->ksnr_ipaddr) &
- iface->ksni_netmask) == 0) ? 1 : 0;
+ 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);
- if (!(best_iface == NULL ||
- best_netmatch < this_netmatch ||
- (best_netmatch == this_netmatch &&
- best_nroutes > iface->ksni_nroutes)))
- continue;
+ this_netmatch = (((iface_ip ^ route_ip) &
+ iface->ksni_netmask) == 0) ? 1 : 0;
- best_iface = iface;
- best_netmatch = this_netmatch;
- best_nroutes = iface->ksni_nroutes;
- }
+ if (!(best_iface == NULL ||
+ best_netmatch < this_netmatch ||
+ (best_netmatch == this_netmatch &&
+ best_nroutes > iface->ksni_nroutes)))
+ continue;
+
+ best_iface = iface;
+ best_netmatch = this_netmatch;
+ best_nroutes = iface->ksni_nroutes;
+ }
- if (best_iface == NULL)
- continue;
+ if (best_iface == NULL)
+ continue;
- newroute->ksnr_myipaddr = best_iface->ksni_ipaddr;
- best_iface->ksni_nroutes++;
+ newroute->ksnr_myiface = best_iface->ksni_index;
+ best_iface->ksni_nroutes++;
- ksocknal_add_route_locked(peer_ni, newroute);
- newroute = NULL;
- }
+ ksocknal_add_route_locked(peer_ni, newroute);
+ newroute = NULL;
+ }
write_unlock_bh(global_lock);
- if (newroute != NULL)
- ksocknal_route_decref(newroute);
+ if (newroute != NULL)
+ ksocknal_route_decref(newroute);
}
int
{
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;
struct socket *sock, int type)
{
rwlock_t *global_lock = &ksocknal_data.ksnd_global_lock;
- struct list_head zombies = LIST_HEAD_INIT(zombies);
+ LIST_HEAD(zombies);
struct lnet_process_id peerid;
struct list_head *tmp;
u64 incarnation;
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;
cpt = lnet_cpt_of_nid(peerid.nid, ni);
- if (active) {
- ksocknal_peer_addref(peer_ni);
+ if (active) {
+ ksocknal_peer_addref(peer_ni);
write_lock_bh(global_lock);
- } else {
- rc = ksocknal_create_peer(&peer_ni, ni, peerid);
- if (rc != 0)
- goto failed_1;
+ } else {
+ peer_ni = ksocknal_create_peer(ni, peerid);
+ if (IS_ERR(peer_ni)) {
+ rc = PTR_ERR(peer_ni);
+ goto failed_1;
+ }
write_lock_bh(global_lock);
- /* called with a ref on ni, so shutdown can't have started */
- LASSERT(((struct ksock_net *) ni->ni_data)->ksnn_shutdown == 0);
+ /* called with a ref on ni, so shutdown can't have started */
+ LASSERT(atomic_read(&((struct ksock_net *)ni->ni_data)->ksnn_npeers) >= 0);
peer2 = ksocknal_find_peer_locked(ni, peerid);
if (peer2 == NULL) {
/* NB this puts an "empty" peer_ni in the peer_ni
* table (which takes my ref) */
- list_add_tail(&peer_ni->ksnp_list,
- ksocknal_nid2peerlist(peerid.nid));
+ hash_add(ksocknal_data.ksnd_peers,
+ &peer_ni->ksnp_list, peerid.nid);
} else {
ksocknal_peer_decref(peer_ni);
peer_ni = peer2;
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);
-
- if (active) {
- /* additional routes after interface exchange? */
- ksocknal_create_routes(peer_ni, conn->ksnc_port,
- hello->kshm_ips, hello->kshm_nips);
+ &conn->ksnc_myaddr, &conn->ksnc_peeraddr,
+ incarnation, cpt);
+
+ 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 (!peer_ni->ksnp_closing &&
list_empty(&peer_ni->ksnp_conns) &&
list_empty(&peer_ni->ksnp_routes)) {
- list_add(&zombies, &peer_ni->ksnp_tx_queue);
- list_del_init(&peer_ni->ksnp_tx_queue);
+ list_splice_init(&peer_ni->ksnp_tx_queue, &zombies);
ksocknal_unlink_peer_locked(peer_ni);
}
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;
}
struct ksock_peer_ni *peer_ni = conn->ksnc_peer;
struct ksock_tx *tx;
struct ksock_tx *tmp;
- struct list_head zlist = LIST_HEAD_INIT(zlist);
+ LIST_HEAD(zlist);
/* NB safe to finalize TXs because closing of socket will
* abort all buffered data */
tx->tx_msg.ksm_zc_cookies[0] = 0;
tx->tx_zc_aborted = 1; /* mark it as not-acked */
- list_del(&tx->tx_zc_list);
- list_add(&tx->tx_zc_list, &zlist);
+ list_move(&tx->tx_zc_list, &zlist);
}
spin_unlock(&peer_ni->ksnp_lock);
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
ksocknal_close_matching_conns(struct lnet_process_id id, __u32 ipaddr)
{
struct ksock_peer_ni *peer_ni;
- struct list_head *ptmp;
- struct list_head *pnxt;
+ struct hlist_node *pnxt;
int lo;
int hi;
int i;
int count = 0;
+ struct sockaddr_in sa = {.sin_family = AF_INET};
write_lock_bh(&ksocknal_data.ksnd_global_lock);
- if (id.nid != LNET_NID_ANY)
- lo = hi = (int)(ksocknal_nid2peerlist(id.nid) - ksocknal_data.ksnd_peers);
- else {
- lo = 0;
- hi = ksocknal_data.ksnd_peer_hash_size - 1;
- }
-
- for (i = lo; i <= hi; i++) {
- list_for_each_safe(ptmp, pnxt, &ksocknal_data.ksnd_peers[i]) {
+ if (id.nid != LNET_NID_ANY) {
+ lo = hash_min(id.nid, HASH_BITS(ksocknal_data.ksnd_peers));
+ hi = lo;
+ } else {
+ lo = 0;
+ hi = HASH_SIZE(ksocknal_data.ksnd_peers) - 1;
+ }
- peer_ni = list_entry(ptmp, struct ksock_peer_ni, ksnp_list);
+ 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],
+ ksnp_list) {
- if (!((id.nid == LNET_NID_ANY || id.nid == peer_ni->ksnp_id.nid) &&
- (id.pid == LNET_PID_ANY || id.pid == peer_ni->ksnp_id.pid)))
- continue;
+ if (!((id.nid == LNET_NID_ANY ||
+ id.nid == peer_ni->ksnp_id.nid) &&
+ (id.pid == LNET_PID_ANY ||
+ 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);
+ }
+ }
write_unlock_bh(&ksocknal_data.ksnd_global_lock);
- /* wildcards always succeed */
- if (id.nid == LNET_NID_ANY || id.pid == LNET_PID_ANY || ipaddr == 0)
- return (0);
+ /* wildcards always succeed */
+ if (id.nid == LNET_NID_ANY || id.pid == LNET_PID_ANY || ipaddr == 0)
+ return 0;
- return (count == 0 ? -ENOENT : 0);
+ return (count == 0 ? -ENOENT : 0);
}
void
* if we have autroutes, and these connect on demand. */
}
-void
-ksocknal_query(struct lnet_ni *ni, lnet_nid_t nid, time64_t *when)
-{
- int connect = 1;
- time64_t last_alive = 0;
- time64_t now = ktime_get_seconds();
- struct ksock_peer_ni *peer_ni = NULL;
- rwlock_t *glock = &ksocknal_data.ksnd_global_lock;
- struct lnet_process_id id = {
- .nid = nid,
- .pid = LNET_PID_LUSTRE,
- };
-
- read_lock(glock);
-
- peer_ni = ksocknal_find_peer_locked(ni, id);
- if (peer_ni != NULL) {
- struct list_head *tmp;
- struct ksock_conn *conn;
- int bufnob;
-
- list_for_each(tmp, &peer_ni->ksnp_conns) {
- conn = list_entry(tmp, struct ksock_conn, ksnc_list);
- bufnob = conn->ksnc_sock->sk->sk_wmem_queued;
-
- if (bufnob < conn->ksnc_tx_bufnob) {
- /* something got ACKed */
- conn->ksnc_tx_deadline = ktime_get_seconds() +
- lnet_get_lnd_timeout();
- peer_ni->ksnp_last_alive = now;
- conn->ksnc_tx_bufnob = bufnob;
- }
- }
-
- last_alive = peer_ni->ksnp_last_alive;
- if (ksocknal_find_connectable_route_locked(peer_ni) == NULL)
- connect = 0;
- }
-
- read_unlock(glock);
-
- if (last_alive != 0)
- *when = last_alive;
-
- CDEBUG(D_NET, "peer_ni %s %p, alive %lld secs ago, connect %d\n",
- libcfs_nid2str(nid), peer_ni,
- last_alive ? now - last_alive : -1,
- connect);
-
- if (!connect)
- return;
-
- ksocknal_add_peer(ni, id, LNET_NIDADDR(nid), lnet_acceptor_port());
-
- write_lock_bh(glock);
-
- peer_ni = ksocknal_find_peer_locked(ni, id);
- if (peer_ni != NULL)
- ksocknal_launch_all_connections_locked(peer_ni);
-
- write_unlock_bh(glock);
- return;
-}
-
static void
ksocknal_push_peer(struct ksock_peer_ni *peer_ni)
{
static int
ksocknal_push(struct lnet_ni *ni, struct lnet_process_id id)
{
- struct list_head *start;
- struct list_head *end;
- struct list_head *tmp;
- int rc = -ENOENT;
- unsigned int hsize = ksocknal_data.ksnd_peer_hash_size;
+ int lo;
+ int hi;
+ int bkt;
+ int rc = -ENOENT;
- if (id.nid == LNET_NID_ANY) {
- start = &ksocknal_data.ksnd_peers[0];
- end = &ksocknal_data.ksnd_peers[hsize - 1];
+ if (id.nid != LNET_NID_ANY) {
+ lo = hash_min(id.nid, HASH_BITS(ksocknal_data.ksnd_peers));
+ hi = lo;
} else {
- start = end = ksocknal_nid2peerlist(id.nid);
+ lo = 0;
+ hi = HASH_SIZE(ksocknal_data.ksnd_peers) - 1;
}
- for (tmp = start; tmp <= end; tmp++) {
- int peer_off; /* searching offset in peer_ni hash table */
+ for (bkt = lo; bkt <= hi; bkt++) {
+ int peer_off; /* searching offset in peer_ni hash table */
for (peer_off = 0; ; peer_off++) {
struct ksock_peer_ni *peer_ni;
int i = 0;
read_lock(&ksocknal_data.ksnd_global_lock);
- list_for_each_entry(peer_ni, tmp, ksnp_list) {
+ hlist_for_each_entry(peer_ni,
+ &ksocknal_data.ksnd_peers[bkt],
+ ksnp_list) {
if (!((id.nid == LNET_NID_ANY ||
id.nid == peer_ni->ksnp_id.nid) &&
(id.pid == LNET_PID_ANY ||
{
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;
- struct list_head *ptmp;
struct ksock_peer_ni *peer_ni;
struct list_head *rtmp;
struct ksock_route *route;
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_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;
- for (i = 0; i < ksocknal_data.ksnd_peer_hash_size; i++) {
- list_for_each(ptmp, &ksocknal_data.ksnd_peers[i]) {
- peer_ni = list_entry(ptmp, struct ksock_peer_ni,
- ksnp_list);
-
- for (j = 0; j < peer_ni->ksnp_n_passive_ips; j++)
- if (peer_ni->ksnp_passive_ips[j] == ipaddress)
- iface->ksni_npeers++;
+ hash_for_each(ksocknal_data.ksnd_peers, i, peer_ni, ksnp_list) {
+ for (j = 0; j < peer_ni->ksnp_n_passive_ips; j++)
+ if (peer_ni->ksnp_passive_ips[j] == ipaddress)
+ iface->ksni_npeers++;
- list_for_each(rtmp, &peer_ni->ksnp_routes) {
- route = list_entry(rtmp,
- struct ksock_route,
- ksnr_list);
+ list_for_each(rtmp, &peer_ni->ksnp_routes) {
+ route = list_entry(rtmp,
+ struct ksock_route,
+ ksnr_list);
- if (route->ksnr_myipaddr == ipaddress)
- iface->ksni_nroutes++;
- }
+ if (route->ksnr_myiface ==
+ iface->ksni_index)
+ iface->ksni_nroutes++;
}
}
rc = 0;
- /* NB only new connections will pay attention to the new interface! */
+ /* NB only new connections will pay attention to the new
+ * interface!
+ */
}
write_unlock_bh(&ksocknal_data.ksnd_global_lock);
}
static void
-ksocknal_peer_del_interface_locked(struct ksock_peer_ni *peer_ni, __u32 ipaddr)
+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);
-
- if (route->ksnr_myipaddr != ipaddr)
- continue;
-
- if (route->ksnr_share_count != 0) {
- /* Manually created; keep, but unbind */
- route->ksnr_myipaddr = 0;
- } else {
- ksocknal_del_route_locked(route);
- }
- }
+ 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 (route->ksnr_share_count != 0) {
+ /* Manually created; keep, but unbind */
+ route->ksnr_myiface = -1;
+ } else {
+ ksocknal_del_route_locked(route);
+ }
+ }
- 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 ksock_net *net = ni->ni_data;
int rc = -ENOENT;
- struct list_head *tmp;
- struct list_head *nxt;
+ 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;
+ 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;
+ for (i = 0; i < net->ksnn_ninterfaces; i++) {
+ struct sockaddr_in *sa =
+ (void *)&net->ksnn_interfaces[i].ksni_addr;
- if (!(ipaddress == 0 ||
- ipaddress == this_ip))
- continue;
+ if (sa->sin_family != AF_INET)
+ continue;
+ this_ip = ntohl(sa->sin_addr.s_addr);
- rc = 0;
+ if (!(ipaddress == 0 ||
+ ipaddress == this_ip))
+ continue;
- for (j = i+1; j < net->ksnn_ninterfaces; j++)
- net->ksnn_interfaces[j-1] =
- net->ksnn_interfaces[j];
+ rc = 0;
- net->ksnn_ninterfaces--;
+ for (j = i+1; j < net->ksnn_ninterfaces; j++)
+ net->ksnn_interfaces[j-1] =
+ net->ksnn_interfaces[j];
- for (j = 0; j < ksocknal_data.ksnd_peer_hash_size; j++) {
- list_for_each_safe(tmp, nxt,
- &ksocknal_data.ksnd_peers[j]) {
- peer_ni = list_entry(tmp, struct ksock_peer_ni,
- ksnp_list);
+ net->ksnn_ninterfaces--;
- if (peer_ni->ksnp_ni != ni)
- continue;
+ hash_for_each_safe(ksocknal_data.ksnd_peers, j,
+ nxt, peer_ni, ksnp_list) {
+ if (peer_ni->ksnp_ni != ni)
+ continue;
- ksocknal_peer_del_interface_locked(peer_ni, this_ip);
- }
- }
- }
+ ksocknal_peer_del_interface_locked(peer_ni,
+ this_ip, index);
+ }
+ }
write_unlock_bh(&ksocknal_data.ksnd_global_lock);
- return (rc);
+ return rc;
}
int
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;
if (ksocknal_data.ksnd_schedulers != NULL)
cfs_percpt_free(ksocknal_data.ksnd_schedulers);
- LIBCFS_FREE (ksocknal_data.ksnd_peers,
- sizeof(struct list_head) *
- ksocknal_data.ksnd_peer_hash_size);
-
spin_lock(&ksocknal_data.ksnd_tx_lock);
if (!list_empty(&ksocknal_data.ksnd_idle_noop_txs)) {
- struct list_head zlist;
+ LIST_HEAD(zlist);
struct ksock_tx *tx;
- list_add(&zlist, &ksocknal_data.ksnd_idle_noop_txs);
- list_del_init(&ksocknal_data.ksnd_idle_noop_txs);
+ list_splice_init(&ksocknal_data.ksnd_idle_noop_txs, &zlist);
spin_unlock(&ksocknal_data.ksnd_tx_lock);
while (!list_empty(&zlist)) {
ksocknal_base_shutdown(void)
{
struct ksock_sched *sched;
+ 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) {
case SOCKNAL_INIT_ALL:
case SOCKNAL_INIT_DATA:
- LASSERT(ksocknal_data.ksnd_peers != NULL);
- for (i = 0; i < ksocknal_data.ksnd_peer_hash_size; i++)
- LASSERT(list_empty(&ksocknal_data.ksnd_peers[i]));
+ hash_for_each(ksocknal_data.ksnd_peers, i, peer_ni, ksnp_list)
+ LASSERT(0);
LASSERT(list_empty(&ksocknal_data.ksnd_nets));
LASSERT(list_empty(&ksocknal_data.ksnd_enomem_conns));
wake_up_all(&sched->kss_waitq);
}
- i = 4;
- read_lock(&ksocknal_data.ksnd_global_lock);
- while (ksocknal_data.ksnd_nthreads != 0) {
- i++;
- /* power of 2? */
- CDEBUG(((i & (-i)) == i) ? D_WARNING : D_NET,
- "waiting for %d threads to terminate\n",
- ksocknal_data.ksnd_nthreads);
- read_unlock(&ksocknal_data.ksnd_global_lock);
- set_current_state(TASK_UNINTERRUPTIBLE);
- schedule_timeout(cfs_time_seconds(1));
- read_lock(&ksocknal_data.ksnd_global_lock);
- }
- read_unlock(&ksocknal_data.ksnd_global_lock);
+ wait_var_event_warning(&ksocknal_data.ksnd_nthreads,
+ atomic_read(&ksocknal_data.ksnd_nthreads) == 0,
+ "waiting for %d threads to terminate\n",
+ atomic_read(&ksocknal_data.ksnd_nthreads));
- ksocknal_free_buffers();
+ ksocknal_free_buffers();
- ksocknal_data.ksnd_init = SOCKNAL_INIT_NOTHING;
- break;
- }
+ ksocknal_data.ksnd_init = SOCKNAL_INIT_NOTHING;
+ 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);
}
int rc;
int i;
- LASSERT (ksocknal_data.ksnd_init == SOCKNAL_INIT_NOTHING);
- LASSERT (ksocknal_data.ksnd_nnets == 0);
-
- memset (&ksocknal_data, 0, sizeof (ksocknal_data)); /* zero pointers */
+ LASSERT(ksocknal_data.ksnd_init == SOCKNAL_INIT_NOTHING);
+ LASSERT(ksocknal_data.ksnd_nnets == 0);
- ksocknal_data.ksnd_peer_hash_size = SOCKNAL_PEER_HASH_SIZE;
- LIBCFS_ALLOC(ksocknal_data.ksnd_peers,
- sizeof(struct list_head) *
- ksocknal_data.ksnd_peer_hash_size);
- if (ksocknal_data.ksnd_peers == NULL)
- return -ENOMEM;
+ memset(&ksocknal_data, 0, sizeof(ksocknal_data)); /* zero pointers */
- for (i = 0; i < ksocknal_data.ksnd_peer_hash_size; i++)
- INIT_LIST_HEAD(&ksocknal_data.ksnd_peers[i]);
+ hash_init(ksocknal_data.ksnd_peers);
rwlock_init(&ksocknal_data.ksnd_global_lock);
INIT_LIST_HEAD(&ksocknal_data.ksnd_nets);
/* flag lists/ptrs/locks initialised */
ksocknal_data.ksnd_init = SOCKNAL_INIT_DATA;
- try_module_get(THIS_MODULE);
+ if (!try_module_get(THIS_MODULE))
+ goto failed;
/* Create a scheduler block per available CPT */
ksocknal_data.ksnd_schedulers = cfs_percpt_alloc(lnet_cpt_table(),
return -ENETDOWN;
}
-static void
+static int
ksocknal_debug_peerhash(struct lnet_ni *ni)
{
- struct ksock_peer_ni *peer_ni = NULL;
- struct list_head *tmp;
+ struct ksock_peer_ni *peer_ni;
int i;
read_lock(&ksocknal_data.ksnd_global_lock);
- for (i = 0; i < ksocknal_data.ksnd_peer_hash_size; i++) {
- list_for_each(tmp, &ksocknal_data.ksnd_peers[i]) {
- peer_ni = list_entry(tmp, struct ksock_peer_ni, ksnp_list);
-
- if (peer_ni->ksnp_ni == ni)
- break;
-
- peer_ni = NULL;
- }
- }
-
- if (peer_ni != NULL) {
+ hash_for_each(ksocknal_data.ksnd_peers, i, peer_ni, ksnp_list) {
struct ksock_route *route;
- struct ksock_conn *conn;
+ struct ksock_conn *conn;
+
+ if (peer_ni->ksnp_ni != ni)
+ continue;
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_tx_queue),
!list_empty(&peer_ni->ksnp_zc_req_list));
- list_for_each(tmp, &peer_ni->ksnp_routes) {
- route = list_entry(tmp, struct ksock_route, ksnr_list);
- CWARN("Route: ref %d, schd %d, conn %d, cnted %d, "
- "del %d\n", atomic_read(&route->ksnr_refcount),
+ list_for_each_entry(route, &peer_ni->ksnp_routes, ksnr_list) {
+ 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(tmp, &peer_ni->ksnp_conns) {
- conn = list_entry(tmp, struct ksock_conn, ksnc_list);
+ 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;
}
read_unlock(&ksocknal_data.ksnd_global_lock);
- return;
+ return 0;
}
void
};
int i;
- LASSERT(ksocknal_data.ksnd_init == SOCKNAL_INIT_ALL);
- LASSERT(ksocknal_data.ksnd_nnets > 0);
+ LASSERT(ksocknal_data.ksnd_init == SOCKNAL_INIT_ALL);
+ LASSERT(ksocknal_data.ksnd_nnets > 0);
- spin_lock_bh(&net->ksnn_lock);
- net->ksnn_shutdown = 1; /* prevent new peers */
- spin_unlock_bh(&net->ksnn_lock);
+ /* prevent new peers */
+ atomic_add(SOCKNAL_SHUTDOWN_BIAS, &net->ksnn_npeers);
/* Delete all peers */
ksocknal_del_peer(ni, anyid, 0);
/* Wait for all peer_ni state to clean up */
- i = 2;
- spin_lock_bh(&net->ksnn_lock);
- while (net->ksnn_npeers != 0) {
- spin_unlock_bh(&net->ksnn_lock);
-
- i++;
- CDEBUG(((i & (-i)) == i) ? D_WARNING : D_NET, /* power of 2? */
- "waiting for %d peers to disconnect\n",
- net->ksnn_npeers);
- set_current_state(TASK_UNINTERRUPTIBLE);
- schedule_timeout(cfs_time_seconds(1));
-
- ksocknal_debug_peerhash(ni);
+ wait_var_event_warning(&net->ksnn_npeers,
+ atomic_read(&net->ksnn_npeers) ==
+ SOCKNAL_SHUTDOWN_BIAS,
+ "waiting for %d peers to disconnect\n",
+ ksocknal_debug_peerhash(ni) +
+ atomic_read(&net->ksnn_npeers) -
+ SOCKNAL_SHUTDOWN_BIAS);
- spin_lock_bh(&net->ksnn_lock);
+ for (i = 0; i < net->ksnn_ninterfaces; i++) {
+ LASSERT(net->ksnn_interfaces[i].ksni_npeers == 0);
+ LASSERT(net->ksnn_interfaces[i].ksni_nroutes == 0);
}
- spin_unlock_bh(&net->ksnn_lock);
-
- for (i = 0; i < net->ksnn_ninterfaces; i++) {
- LASSERT (net->ksnn_interfaces[i].ksni_npeers == 0);
- LASSERT (net->ksnn_interfaces[i].ksni_nroutes == 0);
- }
list_del(&net->ksnn_list);
LIBCFS_FREE(net, sizeof(*net));
- ksocknal_data.ksnd_nnets--;
- if (ksocknal_data.ksnd_nnets == 0)
- ksocknal_base_shutdown();
+ ksocknal_data.ksnd_nnets--;
+ if (ksocknal_data.ksnd_nnets == 0)
+ ksocknal_base_shutdown();
}
static int
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)
return rc;
}
- LIBCFS_ALLOC(net, sizeof(*net));
- if (net == NULL)
- goto fail_0;
+ LIBCFS_ALLOC(net, sizeof(*net));
+ if (net == NULL)
+ goto fail_0;
- spin_lock_init(&net->ksnn_lock);
net->ksnn_incarnation = ktime_get_real_ns();
ni->ni_data = net;
net_tunables = &ni->ni_net->net_tunables;
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;
}
lnet_unregister_lnd(&the_ksocklnd);
}
+static const struct lnet_lnd the_ksocklnd = {
+ .lnd_type = SOCKLND,
+ .lnd_startup = ksocknal_startup,
+ .lnd_shutdown = ksocknal_shutdown,
+ .lnd_ctl = ksocknal_ctl,
+ .lnd_send = ksocknal_send,
+ .lnd_recv = ksocknal_recv,
+ .lnd_notify_peer_down = ksocknal_notify_gw_down,
+ .lnd_accept = ksocknal_accept,
+};
+
static int __init ksocklnd_init(void)
{
int rc;
/* check ksnr_connected/connecting field large enough */
- CLASSERT(SOCKLND_CONN_NTYPES <= 4);
- CLASSERT(SOCKLND_CONN_ACK == SOCKLND_CONN_BULK_IN);
-
- /* initialize the_ksocklnd */
- the_ksocklnd.lnd_type = SOCKLND;
- the_ksocklnd.lnd_startup = ksocknal_startup;
- the_ksocklnd.lnd_shutdown = ksocknal_shutdown;
- the_ksocklnd.lnd_ctl = ksocknal_ctl;
- the_ksocklnd.lnd_send = ksocknal_send;
- the_ksocklnd.lnd_recv = ksocknal_recv;
- the_ksocklnd.lnd_notify_peer_down = ksocknal_notify_gw_down;
- the_ksocklnd.lnd_query = ksocknal_query;
- the_ksocklnd.lnd_accept = ksocknal_accept;
+ BUILD_BUG_ON(SOCKLND_CONN_NTYPES > 4);
+ BUILD_BUG_ON(SOCKLND_CONN_ACK != SOCKLND_CONN_BULK_IN);
rc = ksocknal_tunables_init();
if (rc != 0)
git://git.whamcloud.com / fs / lustre-release.git / blobdiff