#include <lnet/lib-lnet.h>
#include <lnet/socklnd.h>
+#include <libcfs/linux/linux-net.h>
+
#ifndef NETIF_F_CSUM_MASK
# define NETIF_F_CSUM_MASK NETIF_F_ALL_CSUM
#endif
# define SOCKNAL_RISK_KMAP_DEADLOCK 1
#endif
+enum ksocklnd_ni_lnd_tunables_attr {
+ LNET_NET_SOCKLND_TUNABLES_ATTR_UNSPEC = 0,
+
+ LNET_NET_SOCKLND_TUNABLES_ATTR_CONNS_PER_PEER,
+ LNET_NET_SOCKLND_TUNABLES_ATTR_LND_TIMEOUT,
+ LNET_NET_SOCKLND_TUNABLES_ATTR_LND_TOS,
+ __LNET_NET_SOCKLND_TUNABLES_ATTR_MAX_PLUS_ONE,
+};
+
+#define LNET_NET_SOCKLND_TUNABLES_ATTR_MAX (__LNET_NET_SOCKLND_TUNABLES_ATTR_MAX_PLUS_ONE - 1)
+
/* per scheduler state */
struct ksock_sched {
/* serialise */
struct ksock_interface { /* in-use interface */
int ksni_index; /* Linux interface index */
- __u32 ksni_ipaddr; /* interface's IP address */
+ struct sockaddr_storage ksni_addr; /* interface's address */
__u32 ksni_netmask; /* interface's network mask */
int ksni_nroutes; /* # routes using (active) */
int ksni_npeers; /* # peers using (passive) */
#if SOCKNAL_VERSION_DEBUG
int *ksnd_protocol; /* protocol version */
#endif
+ int *ksnd_conns_per_peer; /* for typed mode, yields:
+ * 1 + 2*conns_per_peer total
+ * for untyped:
+ * conns_per_peer total
+ */
};
struct ksock_net {
__u64 ksnn_incarnation; /* my epoch */
struct list_head ksnn_list; /* chain on global list */
atomic_t ksnn_npeers; /* # peers */
- int ksnn_ninterfaces; /* IP interfaces */
- struct ksock_interface ksnn_interfaces[LNET_INTERFACES_NUM];
+ struct ksock_interface ksnn_interface; /* IP interface */
+ struct lnet_ni *ksnn_ni;
};
/* When the ksock_net is shut down, this (negative) bias is added to
* ksnn_npeers, which prevents new peers from being added.
/* hash table of all my known peers */
DECLARE_HASHTABLE(ksnd_peers, SOCKNAL_PEER_HASH_BITS);
- int ksnd_nthreads; /* # live threads */
+ atomic_t ksnd_nthreads; /* # live threads */
int ksnd_shuttingdown; /* tell threads to exit */
/* schedulers information */
struct ksock_sched **ksnd_schedulers;
* received into struct bio_vec fragments.
*/
struct ksock_conn; /* forward ref */
-struct ksock_route; /* forward ref */
+struct ksock_conn_cb; /* forward ref */
struct ksock_proto; /* forward ref */
struct ksock_tx { /* transmit packet */
struct ksock_conn {
struct ksock_peer_ni *ksnc_peer; /* owning peer_ni */
- struct ksock_route *ksnc_route; /* owning route */
+ struct ksock_conn_cb *ksnc_conn_cb; /* owning conn control block */
struct list_head ksnc_list; /* on peer_ni's conn list */
struct socket *ksnc_sock; /* actual socket */
void *ksnc_saved_data_ready; /* socket's original
refcount_t ksnc_sock_refcount; /* sock refcount */
struct ksock_sched *ksnc_scheduler; /* who schedules this
* connection */
- __u32 ksnc_myipaddr; /* my IP */
- __u32 ksnc_ipaddr; /* peer_ni's IP */
- int ksnc_port; /* peer_ni's port */
+ struct sockaddr_storage ksnc_myaddr; /* my address */
+ struct sockaddr_storage ksnc_peeraddr; /* peer_ni's address */
signed int ksnc_type:3; /* type of connection,
* should be signed
* value */
* V2.x message takes the
* whole struct
* V1.x message is a bare
- * struct lnet_hdr, it's stored
- * in ksnc_msg.ksm_u.lnetmsg
+ * struct lnet_hdr_nid4, it's
+ * stored in
+ * ksnc_msg.ksm_u.lnetmsg
*/
/* -- WRITER -- */
/* where I enq waiting for output space */
time64_t ksnc_tx_last_post;
};
-struct ksock_route {
- struct list_head ksnr_list; /* chain on peer_ni route list*/
+#define SOCKNAL_CONN_COUNT_MAX_BITS 8 /* max conn count bits */
+#define SOCKNAL_MAX_BUSY_RETRIES 3
+
+struct ksock_conn_cb {
struct list_head ksnr_connd_list;/* chain on ksnr_connd_routes */
struct ksock_peer_ni *ksnr_peer; /* owning peer_ni */
refcount_t ksnr_refcount; /* # users */
* can happen next
*/
time64_t ksnr_retry_interval;/* secs between retries */
- int ksnr_myiface; /* interface index */
- __u32 ksnr_ipaddr; /* IP address to connect to */
- int ksnr_port; /* port to connect to */
+ struct sockaddr_storage ksnr_addr; /* IP address to connect to */
unsigned int ksnr_scheduled:1;/* scheduled for attention */
unsigned int ksnr_connecting:1;/* connection in progress */
unsigned int ksnr_connected:4;/* connections by type */
unsigned int ksnr_deleted:1; /* been removed from peer_ni? */
- unsigned int ksnr_share_count;/* created explicitly? */
- int ksnr_conn_count;/* # conns for this route */
+ unsigned int ksnr_ctrl_conn_count:2; /* # conns by type */
+ unsigned int ksnr_blki_conn_count:8;
+ unsigned int ksnr_blko_conn_count:8;
+ int ksnr_conn_count;/* total # conns for this cb */
+ unsigned int ksnr_max_conns; /* conns_per_peer at peer
+ * creation
+ */
+ unsigned int ksnr_busy_retry_count;/* counts retry attempts
+ * due to EALREADY rc
+ */
};
#define SOCKNAL_KEEPALIVE_PING 1 /* cookie for keepalive ping */
struct ksock_peer_ni {
struct hlist_node ksnp_list; /* stash on global peer_ni list */
time64_t ksnp_last_alive;/* when (in seconds) I was last alive */
- struct lnet_process_id ksnp_id; /* who's on the other end(s) */
+ struct lnet_processid ksnp_id; /* who's on the other end(s) */
refcount_t ksnp_refcount; /* # users */
int ksnp_closing; /* being closed */
int ksnp_accepting; /* # passive connections pending */
__u64 ksnp_incarnation; /* latest known peer_ni incarnation */
const struct ksock_proto *ksnp_proto; /* latest known protocol */
struct list_head ksnp_conns; /* all active connections */
- struct list_head ksnp_routes; /* routes */
+ struct ksock_conn_cb *ksnp_conn_cb; /* conn control block */
struct list_head ksnp_tx_queue; /* waiting packets */
spinlock_t ksnp_lock; /* serialize, g_lock unsafe */
/* zero copy requests wait for ACK */
struct list_head ksnp_zc_req_list;
time64_t ksnp_send_keepalive; /* time to send keepalive */
struct lnet_ni *ksnp_ni; /* which network */
- int ksnp_n_passive_ips; /* # of... */
- __u32 ksnp_passive_ips[LNET_INTERFACES_NUM]; /* preferred local interfaces */
};
struct ksock_connreq {
extern struct ksock_nal_data ksocknal_data;
extern struct ksock_tunables ksocknal_tunables;
+extern struct lnet_ioctl_config_socklnd_tunables ksock_default_tunables;
#define SOCKNAL_MATCH_NO 0 /* TX can't match type of connection */
#define SOCKNAL_MATCH_YES 1 /* TX matches type of connection */
int (*pro_send_hello)(struct ksock_conn *, struct ksock_hello_msg *); /* handshake function */
int (*pro_recv_hello)(struct ksock_conn *, struct ksock_hello_msg *, int);/* handshake function */
void (*pro_pack)(struct ksock_tx *); /* message pack */
- void (*pro_unpack)(struct ksock_msg *); /* message unpack */
+ void (*pro_unpack)(struct ksock_msg *, struct lnet_hdr *); /* message unpack */
struct ksock_tx *(*pro_queue_tx_msg)(struct ksock_conn *, struct ksock_tx *); /* queue tx on the connection */
int (*pro_queue_tx_zcack)(struct ksock_conn *, struct ksock_tx *, __u64); /* queue ZC ack on the connection */
int (*pro_handle_zcreq)(struct ksock_conn *, __u64, int); /* handle ZC request */
extern const struct ksock_proto ksocknal_protocol_v1x;
extern const struct ksock_proto ksocknal_protocol_v2x;
extern const struct ksock_proto ksocknal_protocol_v3x;
+extern const struct ksock_proto ksocknal_protocol_v4x;
#define KSOCK_PROTO_V1_MAJOR LNET_PROTO_TCP_VERSION_MAJOR
#define KSOCK_PROTO_V1_MINOR LNET_PROTO_TCP_VERSION_MINOR
#define CPU_MASK_NONE 0UL
#endif
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 11, 0)
+#undef netdev_notifier_info_to_dev
+#define netdev_notifier_info_to_dev(ndev) ndev
+#endif
+
static inline __u32 ksocknal_csum(__u32 crc, unsigned char const *p, size_t len)
{
#if 1
}
static inline int
-ksocknal_route_mask(void)
+ksocknal_conn_cb_mask(void)
{
if (!*ksocknal_tunables.ksnd_typed_conns)
return BIT(SOCKLND_CONN_ANY);
}
static inline void
-ksocknal_route_addref(struct ksock_route *route)
+ksocknal_conn_cb_addref(struct ksock_conn_cb *conn_cb)
{
- refcount_inc(&route->ksnr_refcount);
+ refcount_inc(&conn_cb->ksnr_refcount);
}
-extern void ksocknal_destroy_route(struct ksock_route *route);
+extern void ksocknal_destroy_conn_cb(struct ksock_conn_cb *conn_cb);
static inline void
-ksocknal_route_decref(struct ksock_route *route)
+ksocknal_conn_cb_decref(struct ksock_conn_cb *conn_cb)
{
- if (refcount_dec_and_test(&route->ksnr_refcount))
- ksocknal_destroy_route (route);
+ if (refcount_dec_and_test(&conn_cb->ksnr_refcount))
+ ksocknal_destroy_conn_cb(conn_cb);
}
static inline void
static inline int ksocknal_timeout(void)
{
- return *ksocknal_tunables.ksnd_timeout ?
- *ksocknal_tunables.ksnd_timeout :
- lnet_get_lnd_timeout();
+ return *ksocknal_tunables.ksnd_timeout ?: lnet_get_lnd_timeout();
+}
+
+static inline int ksocknal_conns_per_peer(void)
+{
+ return *ksocknal_tunables.ksnd_conns_per_peer ?: 1;
}
int ksocknal_startup(struct lnet_ni *ni);
unsigned int offset, unsigned int mlen, unsigned int rlen);
int ksocknal_accept(struct lnet_ni *ni, struct socket *sock);
-int ksocknal_add_peer(struct lnet_ni *ni, struct lnet_process_id id, __u32 ip,
- int port);
+unsigned int ksocknal_get_conn_count_by_type(struct ksock_conn_cb *conn_cb,
+ int type);
+int ksocknal_add_peer(struct lnet_ni *ni, struct lnet_processid *id,
+ struct sockaddr *addr);
struct ksock_peer_ni *ksocknal_find_peer_locked(struct lnet_ni *ni,
- struct lnet_process_id id);
+ struct lnet_processid *id);
struct ksock_peer_ni *ksocknal_find_peer(struct lnet_ni *ni,
- struct lnet_process_id id);
+ struct lnet_processid *id);
extern void ksocknal_peer_failed(struct ksock_peer_ni *peer_ni);
-extern int ksocknal_create_conn(struct lnet_ni *ni, struct ksock_route *route,
+extern int ksocknal_create_conn(struct lnet_ni *ni,
+ struct ksock_conn_cb *conn_cb,
struct socket *sock, int type);
extern void ksocknal_close_conn_locked(struct ksock_conn *conn, int why);
extern void ksocknal_terminate_conn(struct ksock_conn *conn);
extern void ksocknal_destroy_conn(struct ksock_conn *conn);
extern int ksocknal_close_peer_conns_locked(struct ksock_peer_ni *peer_ni,
- __u32 ipaddr, int why);
+ struct sockaddr *peer, int why);
extern int ksocknal_close_conn_and_siblings(struct ksock_conn *conn, int why);
-int ksocknal_close_matching_conns(struct lnet_process_id id, __u32 ipaddr);
+int ksocknal_close_matching_conns(struct lnet_processid *id, __u32 ipaddr);
extern struct ksock_conn *ksocknal_find_conn_locked(struct ksock_peer_ni *peer_ni,
struct ksock_tx *tx, int nonblk);
extern int ksocknal_launch_packet(struct lnet_ni *ni, struct ksock_tx *tx,
- struct lnet_process_id id);
+ struct lnet_processid *id);
extern struct ksock_tx *ksocknal_alloc_tx(int type, int size);
extern void ksocknal_free_tx(struct ksock_tx *tx);
extern struct ksock_tx *ksocknal_alloc_tx_noop(__u64 cookie, int nonblk);
extern void ksocknal_queue_tx_locked(struct ksock_tx *tx, struct ksock_conn *conn);
extern void ksocknal_txlist_done(struct lnet_ni *ni, struct list_head *txlist,
int error);
-extern void ksocknal_notify(lnet_nid_t gw_nid);
-extern void ksocknal_query(struct lnet_ni *ni, lnet_nid_t nid, time64_t *when);
-extern int ksocknal_thread_start(int (*fn)(void *arg), void *arg, char *name);
+#define ksocknal_thread_start(fn, data, namefmt, arg...) \
+ ({ \
+ struct task_struct *__task = kthread_run(fn, data, \
+ namefmt, ##arg); \
+ if (!IS_ERR(__task)) \
+ atomic_inc(&ksocknal_data.ksnd_nthreads); \
+ PTR_ERR_OR_ZERO(__task); \
+ })
+
extern void ksocknal_thread_fini(void);
extern void ksocknal_launch_all_connections_locked(struct ksock_peer_ni *peer_ni);
-extern struct ksock_route *ksocknal_find_connectable_route_locked(struct ksock_peer_ni *peer_ni);
-extern struct ksock_route *ksocknal_find_connecting_route_locked(struct ksock_peer_ni *peer_ni);
+extern struct ksock_conn_cb *ksocknal_find_connectable_conn_cb_locked(struct ksock_peer_ni *peer_ni);
+extern struct ksock_conn_cb *ksocknal_find_connecting_conn_cb_locked(struct ksock_peer_ni *peer_ni);
extern int ksocknal_new_packet(struct ksock_conn *conn, int skip);
extern int ksocknal_scheduler(void *arg);
extern int ksocknal_connd(void *arg);
extern int ksocknal_reaper(void *arg);
int ksocknal_send_hello(struct lnet_ni *ni, struct ksock_conn *conn,
- lnet_nid_t peer_nid, struct ksock_hello_msg *hello);
+ struct lnet_nid *peer_nid,
+ struct ksock_hello_msg *hello);
int ksocknal_recv_hello(struct lnet_ni *ni, struct ksock_conn *conn,
struct ksock_hello_msg *hello,
- struct lnet_process_id *id,
+ struct lnet_processid *id,
__u64 *incarnation);
extern void ksocknal_read_callback(struct ksock_conn *conn);
extern void ksocknal_write_callback(struct ksock_conn *conn);
struct ksock_conn *conn);
extern void ksocknal_lib_push_conn(struct ksock_conn *conn);
extern int ksocknal_lib_get_conn_addrs(struct ksock_conn *conn);
-extern int ksocknal_lib_setup_sock(struct socket *so);
+extern int ksocknal_lib_setup_sock(struct socket *sock, struct lnet_ni *ni);
extern int ksocknal_lib_send_hdr(struct ksock_conn *conn, struct ksock_tx *tx,
struct kvec *scratch_iov);
extern int ksocknal_lib_send_kiov(struct ksock_conn *conn, struct ksock_tx *tx,
int *rxmem, int *nagle);
extern int ksocknal_tunables_init(void);
+extern void ksocknal_tunables_setup(struct lnet_ni *ni);
extern void ksocknal_lib_csum_tx(struct ksock_tx *tx);
extern int ksocknal_lib_memory_pressure(struct ksock_conn *conn);
-extern int ksocknal_lib_bind_thread_to_cpu(int id);
#endif /* _SOCKLND_SOCKLND_H_ */