* Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2012, 2015, Intel Corporation.
+ * Copyright (c) 2012, 2016, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
struct list_head msg_list; /* Q for credits/MD */
lnet_process_id_t msg_target;
+ /* Primary NID of the source. */
+ lnet_nid_t msg_initiator;
/* where is it from, it's only for building event */
lnet_nid_t msg_from;
__u32 msg_type;
/* ready for pending on RX delay list */
unsigned int msg_rx_ready_delay:1;
- unsigned int msg_vmflush:1; /* VM trying to free memory */
- unsigned int msg_target_is_router:1; /* sending to a router */
- unsigned int msg_routing:1; /* being forwarded */
- unsigned int msg_ack:1; /* ack on finalize (PUT) */
- unsigned int msg_sending:1; /* outgoing message */
- unsigned int msg_receiving:1; /* being received */
- unsigned int msg_txcredit:1; /* taken an NI send credit */
- unsigned int msg_peertxcredit:1; /* taken a peer send credit */
- unsigned int msg_rtrcredit:1; /* taken a globel router credit */
- unsigned int msg_peerrtrcredit:1; /* taken a peer router credit */
- unsigned int msg_onactivelist:1; /* on the activelist */
+ unsigned int msg_vmflush:1; /* VM trying to free memory */
+ unsigned int msg_target_is_router:1; /* sending to a router */
+ unsigned int msg_routing:1; /* being forwarded */
+ unsigned int msg_ack:1; /* ack on finalize (PUT) */
+ unsigned int msg_sending:1; /* outgoing message */
+ unsigned int msg_receiving:1; /* being received */
+ unsigned int msg_txcredit:1; /* taken an NI send credit */
+ unsigned int msg_peertxcredit:1; /* taken a peer send credit */
+ unsigned int msg_rtrcredit:1; /* taken a globel router credit */
+ unsigned int msg_peerrtrcredit:1; /* taken a peer router credit */
+ unsigned int msg_onactivelist:1; /* on the activelist */
unsigned int msg_rdma_get:1;
- struct lnet_peer *msg_txpeer; /* peer I'm sending to */
- struct lnet_peer *msg_rxpeer; /* peer I received from */
+ struct lnet_peer_ni *msg_txpeer; /* peer I'm sending to */
+ struct lnet_peer_ni *msg_rxpeer; /* peer I received from */
- void *msg_private;
+ void *msg_private;
struct lnet_libmd *msg_md;
-
- unsigned int msg_len;
- unsigned int msg_wanted;
- unsigned int msg_offset;
- unsigned int msg_niov;
+ /* the NI the message was sent or received over */
+ struct lnet_ni *msg_txni;
+ struct lnet_ni *msg_rxni;
+
+ unsigned int msg_len;
+ unsigned int msg_wanted;
+ unsigned int msg_offset;
+ unsigned int msg_niov;
struct kvec *msg_iov;
- lnet_kiov_t *msg_kiov;
+ lnet_kiov_t *msg_kiov;
- lnet_event_t msg_ev;
- lnet_hdr_t msg_hdr;
+ lnet_event_t msg_ev;
+ lnet_hdr_t msg_hdr;
} lnet_msg_t;
int (*lnd_accept)(struct lnet_ni *ni, struct socket *sock);
} lnd_t;
-typedef struct {
+typedef struct lnet_ni_status {
lnet_nid_t ns_nid;
__u32 ns_status;
__u32 ns_unused;
struct list_head tq_delayed; /* delayed TXs */
};
+enum lnet_net_state {
+ /* set when net block is allocated */
+ LNET_NET_STATE_INIT = 0,
+ /* set when NIs in net are started successfully */
+ LNET_NET_STATE_ACTIVE,
+ /* set if all NIs in net are in FAILED state */
+ LNET_NET_STATE_INACTIVE,
+ /* set when shutting down a NET */
+ LNET_NET_STATE_DELETING
+};
+
+enum lnet_ni_state {
+ /* set when NI block is allocated */
+ LNET_NI_STATE_INIT = 0,
+ /* set when NI is started successfully */
+ LNET_NI_STATE_ACTIVE,
+ /* set when LND notifies NI failed */
+ LNET_NI_STATE_FAILED,
+ /* set when LND notifies NI degraded */
+ LNET_NI_STATE_DEGRADED,
+ /* set when shuttding down NI */
+ LNET_NI_STATE_DELETING
+};
+
+struct lnet_element_stats {
+ atomic_t send_count;
+ atomic_t recv_count;
+ atomic_t drop_count;
+};
+
+struct lnet_net {
+ /* chain on the ln_nets */
+ struct list_head net_list;
+
+ /* net ID, which is composed of
+ * (net_type << 16) | net_num.
+ * net_type can be one of the enumerated types defined in
+ * lnet/include/lnet/nidstr.h */
+ __u32 net_id;
+
+ /* priority of the network */
+ __u32 net_prio;
+
+ /* total number of CPTs in the array */
+ __u32 net_ncpts;
+
+ /* cumulative CPTs of all NIs in this net */
+ __u32 *net_cpts;
+
+ /* network tunables */
+ struct lnet_ioctl_config_lnd_cmn_tunables net_tunables;
+
+ /*
+ * boolean to indicate that the tunables have been set and
+ * shouldn't be reset
+ */
+ bool net_tunables_set;
+
+ /* procedural interface */
+ lnd_t *net_lnd;
+
+ /* list of NIs on this net */
+ struct list_head net_ni_list;
+
+ /* list of NIs being added, but not started yet */
+ struct list_head net_ni_added;
+
+ /* dying LND instances */
+ struct list_head net_ni_zombie;
+
+ /* network state */
+ enum lnet_net_state net_state;
+};
+
typedef struct lnet_ni {
+ /* chain on the lnet_net structure */
+ struct list_head ni_netlist;
+
+ /* chain on net_ni_cpt */
+ struct list_head ni_cptlist;
+
spinlock_t ni_lock;
- struct list_head ni_list; /* chain on ln_nis */
- struct list_head ni_cptlist; /* chain on ln_nis_cpt */
- int ni_maxtxcredits; /* # tx credits */
- /* # per-peer send credits */
- int ni_peertxcredits;
- /* # per-peer router buffer credits */
- int ni_peerrtrcredits;
- /* seconds to consider peer dead */
- int ni_peertimeout;
- int ni_ncpts; /* number of CPTs */
- __u32 *ni_cpts; /* bond NI on some CPTs */
- lnet_nid_t ni_nid; /* interface's NID */
- void *ni_data; /* instance-specific data */
- lnd_t *ni_lnd; /* procedural interface */
- struct lnet_tx_queue **ni_tx_queues; /* percpt TX queues */
- int **ni_refs; /* percpt reference count */
- long ni_last_alive; /* when I was last alive */
- lnet_ni_status_t *ni_status; /* my health status */
+
+ /* number of CPTs */
+ int ni_ncpts;
+
+ /* bond NI on some CPTs */
+ __u32 *ni_cpts;
+
+ /* interface's NID */
+ lnet_nid_t ni_nid;
+
+ /* instance-specific data */
+ void *ni_data;
+
+ /* per ni credits */
+ atomic_t ni_tx_credits;
+
+ /* percpt TX queues */
+ struct lnet_tx_queue **ni_tx_queues;
+
+ /* percpt reference count */
+ int **ni_refs;
+
+ /* when I was last alive */
+ long ni_last_alive;
+
+ /* pointer to parent network */
+ struct lnet_net *ni_net;
+
+ /* my health status */
+ lnet_ni_status_t *ni_status;
+
+ /* NI FSM */
+ enum lnet_ni_state ni_state;
+
/* per NI LND tunables */
- struct lnet_ioctl_config_lnd_tunables *ni_lnd_tunables;
- /* equivalent interfaces to use */
+ struct lnet_lnd_tunables ni_lnd_tunables;
+
+ /* lnd tunables set explicitly */
+ bool ni_lnd_tunables_set;
+
+ /* NI statistics */
+ struct lnet_element_stats ni_stats;
+
+ /* physical device CPT */
+ int dev_cpt;
+
+ /* sequence number used to round robin over nis within a net */
+ __u32 ni_seq;
+
+ /*
+ * equivalent interfaces to use
+ * This is an array because socklnd bonding can still be configured
+ */
char *ni_interfaces[LNET_MAX_INTERFACES];
struct net *ni_net_ns; /* original net namespace */
} lnet_ni_t;
#define LNET_PING_FEAT_MASK (LNET_PING_FEAT_BASE | \
LNET_PING_FEAT_NI_STATUS)
-typedef struct {
+typedef struct lnet_ping_info {
__u32 pi_magic;
__u32 pi_features;
lnet_pid_t pi_pid;
__u32 pi_nnis;
- lnet_ni_status_t pi_ni[0];
+ struct lnet_ni_status pi_ni[0];
} WIRE_ATTR lnet_ping_info_t;
/* router checker data, per router */
#define LNET_MAX_RTR_NIS 16
-#define LNET_PINGINFO_SIZE offsetof(lnet_ping_info_t, pi_ni[LNET_MAX_RTR_NIS])
+#define LNET_PINGINFO_SIZE offsetof(struct lnet_ping_info, pi_ni[LNET_MAX_RTR_NIS])
typedef struct {
/* chain on the_lnet.ln_zombie_rcd or ln_deathrow_rcd */
struct list_head rcd_list;
lnet_handle_md_t rcd_mdh; /* ping buffer MD */
- struct lnet_peer *rcd_gateway; /* reference to gateway */
- lnet_ping_info_t *rcd_pinginfo; /* ping buffer */
+ struct lnet_peer_ni *rcd_gateway; /* reference to gateway */
+ struct lnet_ping_info *rcd_pinginfo; /* ping buffer */
} lnet_rc_data_t;
-typedef struct lnet_peer {
+struct lnet_peer_ni {
+ /* chain on peer_net */
+ struct list_head lpni_on_peer_net_list;
+ /* chain on remote peer list */
+ struct list_head lpni_on_remote_peer_ni_list;
/* chain on peer hash */
- struct list_head lp_hashlist;
+ struct list_head lpni_hashlist;
/* messages blocking for tx credits */
- struct list_head lp_txq;
+ struct list_head lpni_txq;
/* messages blocking for router credits */
- struct list_head lp_rtrq;
+ struct list_head lpni_rtrq;
/* chain on router list */
- struct list_head lp_rtr_list;
+ struct list_head lpni_rtr_list;
+ /* pointer to peer net I'm part of */
+ struct lnet_peer_net *lpni_peer_net;
+ /* statistics kept on each peer NI */
+ struct lnet_element_stats lpni_stats;
+ /* spin lock protecting credits and lpni_txq / lpni_rtrq */
+ spinlock_t lpni_lock;
/* # tx credits available */
- int lp_txcredits;
+ int lpni_txcredits;
/* low water mark */
- int lp_mintxcredits;
+ int lpni_mintxcredits;
/* # router credits */
- int lp_rtrcredits;
+ int lpni_rtrcredits;
/* low water mark */
- int lp_minrtrcredits;
+ int lpni_minrtrcredits;
/* alive/dead? */
- unsigned int lp_alive:1;
+ bool lpni_alive;
/* notification outstanding? */
- unsigned int lp_notify:1;
+ bool lpni_notify;
/* outstanding notification for LND? */
- unsigned int lp_notifylnd:1;
+ bool lpni_notifylnd;
/* some thread is handling notification */
- unsigned int lp_notifying:1;
+ bool lpni_notifying;
/* SEND event outstanding from ping */
- unsigned int lp_ping_notsent;
- /* # times router went dead<->alive */
- int lp_alive_count;
+ bool lpni_ping_notsent;
+ /* # times router went dead<->alive. Protected with lpni_lock */
+ int lpni_alive_count;
/* bytes queued for sending */
- long lp_txqnob;
+ long lpni_txqnob;
/* time of last aliveness news */
- cfs_time_t lp_timestamp;
+ cfs_time_t lpni_timestamp;
/* time of last ping attempt */
- cfs_time_t lp_ping_timestamp;
+ cfs_time_t lpni_ping_timestamp;
/* != 0 if ping reply expected */
- cfs_time_t lp_ping_deadline;
+ cfs_time_t lpni_ping_deadline;
/* when I was last alive */
- cfs_time_t lp_last_alive;
- /* when lp_ni was queried last time */
- cfs_time_t lp_last_query;
- /* interface peer is on */
- lnet_ni_t *lp_ni;
- lnet_nid_t lp_nid; /* peer's NID */
- int lp_refcount; /* # refs */
- int lp_cpt; /* CPT this peer attached on */
+ cfs_time_t lpni_last_alive;
+ /* when lpni_ni was queried last time */
+ cfs_time_t lpni_last_query;
+ /* network peer is on */
+ struct lnet_net *lpni_net;
+ /* peer's NID */
+ lnet_nid_t lpni_nid;
+ /* # refs */
+ atomic_t lpni_refcount;
+ /* CPT this peer attached on */
+ int lpni_cpt;
/* # refs from lnet_route_t::lr_gateway */
- int lp_rtr_refcount;
- /* returned RC ping features */
- unsigned int lp_ping_feats;
- struct list_head lp_routes; /* routers on this peer */
- lnet_rc_data_t *lp_rcd; /* router checker state */
-} lnet_peer_t;
+ int lpni_rtr_refcount;
+ /* sequence number used to round robin over peer nis within a net */
+ __u32 lpni_seq;
+ /* health flag */
+ bool lpni_healthy;
+ /* returned RC ping features. Protected with lpni_lock */
+ unsigned int lpni_ping_feats;
+ /* routes on this peer */
+ struct list_head lpni_routes;
+ /* array of preferred local nids */
+ lnet_nid_t *lpni_pref_nids;
+ /* number of preferred NIDs in lnpi_pref_nids */
+ __u32 lpni_pref_nnids;
+ /* router checker state */
+ lnet_rc_data_t *lpni_rcd;
+};
+
+struct lnet_peer {
+ /* chain on global peer list */
+ struct list_head lp_on_lnet_peer_list;
+
+ /* list of peer nets */
+ struct list_head lp_peer_nets;
+
+ /* primary NID of the peer */
+ lnet_nid_t lp_primary_nid;
+
+ /* peer is Multi-Rail enabled peer */
+ bool lp_multi_rail;
+};
+
+struct lnet_peer_net {
+ /* chain on peer block */
+ struct list_head lpn_on_peer_list;
+
+ /* list of peer_nis on this network */
+ struct list_head lpn_peer_nis;
+
+ /* pointer to the peer I'm part of */
+ struct lnet_peer *lpn_peer;
+
+ /* Net ID */
+ __u32 lpn_net_id;
+
+ /* health flag */
+ bool lpn_healthy;
+};
/* peer hash size */
#define LNET_PEER_HASH_BITS 9
/* peer hash table */
struct lnet_peer_table {
int pt_version; /* /proc validity stamp */
- int pt_number; /* # peers extant */
- int pt_zombies; /* # zombies to go to deathrow
- * (and not there yet) */
- struct list_head pt_deathrow; /* zombie peers */
+ atomic_t pt_number; /* # peers extant */
struct list_head *pt_hash; /* NID->peer hash */
+ struct list_head pt_zombie_list; /* zombie peers */
+ int pt_zombies; /* # zombie peers */
+ spinlock_t pt_zombie_lock; /* protect list and count */
};
/* peer aliveness is enabled only on routers for peers in a network where the
* lnet_ni_t::ni_peertimeout has been set to a positive value */
#define lnet_peer_aliveness_enabled(lp) (the_lnet.ln_routing != 0 && \
- (lp)->lp_ni->ni_peertimeout > 0)
+ (lp)->lpni_net->net_tunables.lct_peer_timeout > 0)
typedef struct {
struct list_head lr_list; /* chain on net */
struct list_head lr_gwlist; /* chain on gateway */
- lnet_peer_t *lr_gateway; /* router node */
+ struct lnet_peer_ni *lr_gateway; /* router node */
__u32 lr_net; /* remote network number */
int lr_seq; /* sequence for round-robin */
unsigned int lr_downis; /* number of down NIs */
struct lnet_match_info {
__u64 mi_mbits;
lnet_process_id_t mi_id;
+ unsigned int mi_cpt;
unsigned int mi_opc;
unsigned int mi_portal;
unsigned int mi_rlength;
struct lnet_msg_container **ln_msg_containers;
lnet_counters_t **ln_counters;
struct lnet_peer_table **ln_peer_tables;
+ /* list of configured or discovered peers */
+ struct list_head ln_peers;
+ /* list of peer nis not on a local network */
+ struct list_head ln_remote_peer_ni_list;
/* failure simulation */
struct list_head ln_test_peers;
struct list_head ln_drop_rules;
struct list_head ln_delay_rules;
-
- struct list_head ln_nis; /* LND instances */
- /* NIs bond on specific CPT(s) */
- struct list_head ln_nis_cpt;
- /* dying LND instances */
- struct list_head ln_nis_zombie;
- lnet_ni_t *ln_loni; /* the loopback NI */
+ /* LND instances */
+ struct list_head ln_nets;
+ /* the loopback NI */
+ struct lnet_ni *ln_loni;
+ /* network zombie list */
+ struct list_head ln_net_zombie;
/* remote networks with routes to them */
struct list_head *ln_remote_nets_hash;
lnet_handle_md_t ln_ping_target_md;
lnet_handle_eq_t ln_ping_target_eq;
- lnet_ping_info_t *ln_ping_info;
+ struct lnet_ping_info *ln_ping_info;
/* router checker startup/shutdown state */
int ln_rc_state;
git://git.whamcloud.com / fs / lustre-release.git / blobdiff