int (*lnd_eager_recv)(struct lnet_ni *ni, void *private,
struct lnet_msg *msg, void **new_privatep);
- /* notification of peer health */
- void (*lnd_notify)(struct lnet_ni *ni, lnet_nid_t peer, int alive);
+ /* notification of peer down */
+ void (*lnd_notify_peer_down)(lnet_nid_t peer);
/* query of peer aliveness */
void (*lnd_query)(struct lnet_ni *ni, lnet_nid_t peer, time64_t *when);
#define LNET_PING_INFO_TO_BUFFER(PINFO) \
container_of((PINFO), struct lnet_ping_buffer, pb_info)
-/* router checker data, per router */
-struct lnet_rc_data {
- /* chain on the_lnet.ln_zombie_rcd or ln_deathrow_rcd */
- struct list_head rcd_list;
- struct lnet_handle_md rcd_mdh; /* ping buffer MD */
- struct lnet_peer_ni *rcd_gateway; /* reference to gateway */
- struct lnet_ping_buffer *rcd_pingbuffer;/* ping buffer */
- int rcd_nnis; /* desired size of buffer */
-};
-
struct lnet_peer_ni {
/* chain on lpn_peer_nis */
struct list_head lpni_peer_nis;
int lpni_minrtrcredits;
/* bytes queued for sending */
long lpni_txqnob;
- /* alive/dead? */
- bool lpni_alive;
- /* notification outstanding? */
- bool lpni_notify;
- /* outstanding notification for LND? */
- bool lpni_notifylnd;
- /* some thread is handling notification */
- bool lpni_notifying;
- /* # times router went dead<->alive. Protected with lpni_lock */
- int lpni_alive_count;
- /* time of last aliveness news */
- time64_t lpni_timestamp;
- /* when I was last alive */
- time64_t lpni_last_alive;
- /* when lpni_ni was queried last time */
- time64_t lpni_last_query;
/* network peer is on */
struct lnet_net *lpni_net;
/* peer's NID */
int lpni_cpt;
/* state flags -- protected by lpni_lock */
unsigned lpni_state;
+ /* status of the peer NI as reported by the peer */
+ __u32 lpni_ns_status;
/* sequence number used to round robin over peer nis within a net */
__u32 lpni_seq;
/* sequence number used to round robin over gateways */
} lpni_pref;
/* number of preferred NIDs in lnpi_pref_nids */
__u32 lpni_pref_nnids;
- /* router checker state */
- struct lnet_rc_data *lpni_rcd;
};
/* Preferred path added due to traffic on non-MR peer_ni */
*
* A peer is marked NO_DISCOVERY if the LNET_PING_FEAT_DISCOVERY bit was
* NOT set when the peer was pinged by discovery.
+ *
+ * A peer is marked ROUTER if it indicates so in the feature bit.
*/
#define LNET_PEER_MULTI_RAIL (1 << 0) /* Multi-rail aware */
#define LNET_PEER_NO_DISCOVERY (1 << 1) /* Peer disabled discovery */
+#define LNET_PEER_ROUTER_ENABLED (1 << 2) /* router feature enabled */
+
/*
* A peer is marked CONFIGURED if it was configured by DLC.
*
* A peer that was created as the result of inbound traffic will not
* be marked at all.
*/
-#define LNET_PEER_CONFIGURED (1 << 2) /* Configured via DLC */
-#define LNET_PEER_DISCOVERED (1 << 3) /* Peer was discovered */
-#define LNET_PEER_REDISCOVER (1 << 4) /* Discovery was disabled */
+#define LNET_PEER_CONFIGURED (1 << 3) /* Configured via DLC */
+#define LNET_PEER_DISCOVERED (1 << 4) /* Peer was discovered */
+#define LNET_PEER_REDISCOVER (1 << 5) /* Discovery was disabled */
/*
* A peer is marked DISCOVERING when discovery is in progress.
* The other flags below correspond to stages of discovery.
*/
-#define LNET_PEER_DISCOVERING (1 << 5) /* Discovering */
-#define LNET_PEER_DATA_PRESENT (1 << 6) /* Remote peer data present */
-#define LNET_PEER_NIDS_UPTODATE (1 << 7) /* Remote peer info uptodate */
-#define LNET_PEER_PING_SENT (1 << 8) /* Waiting for REPLY to Ping */
-#define LNET_PEER_PUSH_SENT (1 << 9) /* Waiting for ACK of Push */
-#define LNET_PEER_PING_FAILED (1 << 10) /* Ping send failure */
-#define LNET_PEER_PUSH_FAILED (1 << 11) /* Push send failure */
+#define LNET_PEER_DISCOVERING (1 << 6) /* Discovering */
+#define LNET_PEER_DATA_PRESENT (1 << 7) /* Remote peer data present */
+#define LNET_PEER_NIDS_UPTODATE (1 << 8) /* Remote peer info uptodate */
+#define LNET_PEER_PING_SENT (1 << 9) /* Waiting for REPLY to Ping */
+#define LNET_PEER_PUSH_SENT (1 << 10) /* Waiting for ACK of Push */
+#define LNET_PEER_PING_FAILED (1 << 11) /* Ping send failure */
+#define LNET_PEER_PUSH_FAILED (1 << 12) /* Push send failure */
/*
* A ping can be forced as a way to fix up state, or as a manual
* intervention by an admin.
* A push can be forced in circumstances that would normally not
* allow for one to happen.
*/
-#define LNET_PEER_FORCE_PING (1 << 12) /* Forced Ping */
-#define LNET_PEER_FORCE_PUSH (1 << 13) /* Forced Push */
+#define LNET_PEER_FORCE_PING (1 << 13) /* Forced Ping */
+#define LNET_PEER_FORCE_PUSH (1 << 14) /* Forced Push */
struct lnet_peer_net {
/* chain on lp_peer_nets */
__u32 lr_net; /* remote network number */
__u32 lr_lnet; /* local network number */
int lr_seq; /* sequence for round-robin */
- unsigned int lr_downis; /* number of down NIs */
__u32 lr_hops; /* how far I am */
unsigned int lr_priority; /* route priority */
};
/* monitor thread startup/shutdown state */
int ln_mt_state;
- /* router checker's event queue */
- struct lnet_handle_eq ln_rc_eqh;
- /* rcd still pending on net */
- struct list_head ln_rcd_deathrow;
- /* rcd ready for free */
- struct list_head ln_rcd_zombie;
/* serialise startup/shutdown */
struct semaphore ln_mt_signal;
git://git.whamcloud.com / fs / lustre-release.git / blobdiff