-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
* GPL HEADER START
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
/* PROTO MAGIC for LNDs */
#define LNET_PROTO_IB_MAGIC 0x0be91b91
-#define LNET_PROTO_OPENIB_MAGIC LNET_PROTO_IB_MAGIC
-#define LNET_PROTO_IIB_MAGIC LNET_PROTO_IB_MAGIC
-#define LNET_PROTO_VIB_MAGIC LNET_PROTO_IB_MAGIC
#define LNET_PROTO_RA_MAGIC 0x0be91b92
#define LNET_PROTO_QSW_MAGIC 0x0be91b93
+#define LNET_PROTO_GNI_MAGIC 0xb00fbabe /* ask Kim */
#define LNET_PROTO_TCP_MAGIC 0xeebc0ded
#define LNET_PROTO_PTL_MAGIC 0x50746C4E /* 'PtlN' unique magic */
#define LNET_PROTO_MX_MAGIC 0x4d583130 /* 'MX10'! */
#define LNET_COOKIE_TYPE_MD 1
#define LNET_COOKIE_TYPE_ME 2
#define LNET_COOKIE_TYPE_EQ 3
-#define LNET_COOKIE_TYPES 4
+#define LNET_COOKIE_TYPE_BITS 2
+#define LNET_COOKIE_TYPES (1 << LNET_COOKIE_TYPE_BITS)
/* LNET_COOKIE_TYPES must be a power of 2, so the cookie type can be
* extracted by masking with (LNET_COOKIE_TYPES - 1) */
/* query of peer aliveness */
void (*lnd_query)(struct lnet_ni *ni, lnet_nid_t peer, cfs_time_t *when);
-#if defined(__KERNEL__) || defined(HAVE_PTHREAD)
+#if defined(__KERNEL__) || defined(HAVE_LIBPTHREAD)
/* accept a new connection */
int (*lnd_accept)(struct lnet_ni *ni, cfs_socket_t *sock);
#endif
/* Options for lnet_portal_t::ptl_options */
#define LNET_PTL_LAZY (1 << 0)
+#define LNET_PTL_MATCH_UNIQUE (1 << 1) /* unique match, for RDMA */
+#define LNET_PTL_MATCH_WILDCARD (1 << 2) /* wildcard match, request portal */
+
+/* ME hash of RDMA portal */
+#define LNET_PORTAL_HASH_BITS 8
+#define LNET_PORTAL_HASH_SIZE (1 << LNET_PORTAL_HASH_BITS)
+
typedef struct {
- cfs_list_t ptl_ml; /* match list */
- cfs_list_t ptl_msgq; /* messages blocking for MD */
- __u64 ptl_ml_version; /* validity stamp, only changed for new attached MD */
- __u64 ptl_msgq_version; /* validity stamp */
- unsigned int ptl_options;
+ cfs_list_t *ptl_mhash; /* match hash */
+ cfs_list_t ptl_mlist; /* match list */
+ cfs_list_t ptl_msgq; /* messages blocking for MD */
+ __u64 ptl_ml_version; /* validity stamp, only changed for new attached MD */
+ __u64 ptl_msgq_version; /* validity stamp */
+ unsigned int ptl_options;
} lnet_portal_t;
+#define LNET_LH_HASH_BITS 12
+#define LNET_LH_HASH_SIZE (1ULL << LNET_LH_HASH_BITS)
+#define LNET_LH_HASH_MASK (LNET_LH_HASH_SIZE - 1)
+
+/* resource container (ME, MD, EQ) */
+struct lnet_res_container {
+ unsigned int rec_type; /* container type */
+ __u64 rec_lh_cookie; /* cookie generator */
+ cfs_list_t rec_active; /* active resource list */
+ cfs_list_t *rec_lh_hash; /* handle hash */
+#ifdef LNET_USE_LIB_FREELIST
+ lnet_freelist_t rec_freelist; /* freelist for resources */
+#endif
+};
+
/* Router Checker states */
#define LNET_RC_STATE_SHUTDOWN 0 /* not started */
#define LNET_RC_STATE_RUNNING 1 /* started up OK */
#ifdef __KERNEL__
cfs_spinlock_t ln_lock;
cfs_waitq_t ln_waitq;
- cfs_semaphore_t ln_api_mutex;
- cfs_semaphore_t ln_lnd_mutex;
+ cfs_mutex_t ln_api_mutex;
+ cfs_mutex_t ln_lnd_mutex;
#else
-# ifndef HAVE_PTHREAD
+# ifndef HAVE_LIBPTHREAD
int ln_lock;
int ln_api_mutex;
int ln_lnd_mutex;
pthread_mutex_t ln_lnd_mutex;
# endif
#endif
+ /* ME container */
+ struct lnet_res_container ln_me_container;
+ /* MD container */
+ struct lnet_res_container ln_md_container;
+ /* Event Queue container */
+ struct lnet_res_container ln_eq_container;
/* Stuff initialised at LNetNIInit() */
int ln_routing; /* am I a router? */
lnet_rtrbufpool_t ln_rtrpools[LNET_NRBPOOLS]; /* router buffer pools */
- int ln_lh_hash_size; /* size of lib handle hash table */
- cfs_list_t *ln_lh_hash_table; /* all extant lib handles, this interface */
- __u64 ln_next_object_cookie; /* cookie generator */
__u64 ln_interface_cookie; /* uniquely identifies this ni in this epoch */
char *ln_network_tokens; /* space for network names */
lnet_ping_info_t *ln_ping_info;
#ifdef __KERNEL__
- cfs_semaphore_t ln_rc_signal; /* serialise startup/shutdown */
+ cfs_semaphore_t ln_rc_signal; /* serialise startup/shutdown */
#endif
- int ln_rc_state; /* router checker startup/shutdown state */
- lnet_handle_eq_t ln_rc_eqh; /* router checker's event queue */
- lnet_handle_md_t ln_rc_mdh;
- cfs_list_t ln_zombie_rcd;
-
+ int ln_rc_state; /* router checker startup/shutdown state */
+ lnet_handle_eq_t ln_rc_eqh; /* router checker's event queue */
+ lnet_handle_md_t ln_rc_mdh;
+ cfs_list_t ln_zombie_rcd;
#ifdef LNET_USE_LIB_FREELIST
- lnet_freelist_t ln_free_mes;
lnet_freelist_t ln_free_msgs;
- lnet_freelist_t ln_free_mds;
- lnet_freelist_t ln_free_eqs;
#endif
cfs_list_t ln_active_msgs;
- cfs_list_t ln_active_mds;
- cfs_list_t ln_active_eqs;
lnet_counters_t ln_counters;