*
* You should have received a copy of the GNU General Public License
* version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
*
* GPL HEADER END
*/
* Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2011, 2014, Intel Corporation.
+ * Copyright (c) 2011, 2016, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
*
* @{
*/
-
-#include <lustre_handles.h>
-#include <lustre/lustre_idl.h>
-
+#include <linux/atomic.h>
+#include <linux/list.h>
+#include <linux/mutex.h>
+#include <linux/spinlock.h>
+#include <linux/time.h>
+#include <linux/types.h>
+#include <linux/workqueue.h>
+#include <libcfs/libcfs.h>
+#include <uapi/linux/lustre/lustre_idl.h>
/**
* Adaptive Timeout stuff
#define AT_FLG_NOHIST 0x1 /* use last reported value only */
struct adaptive_timeout {
- time_t at_binstart; /* bin start time */
+ time64_t at_binstart; /* bin start time */
unsigned int at_hist[AT_BINS]; /* timeout history bins */
unsigned int at_flags;
unsigned int at_current; /* current timeout value */
unsigned int at_worst_ever; /* worst-ever timeout value */
- time_t at_worst_time; /* worst-ever timeout timestamp */
+ time64_t at_worst_time; /* worst-ever timeout timestamp */
spinlock_t at_lock;
};
struct list_head *paa_reqs_array; /** array to hold requests */
__u32 paa_size; /** the size of array */
__u32 paa_count; /** the total count of reqs */
- time_t paa_deadline; /** the earliest deadline of reqs */
+ time64_t paa_deadline; /** the earliest deadline of reqs */
__u32 *paa_reqs_count; /** the count of reqs in each entry */
};
LUSTRE_IMP_RECOVER = 8,
LUSTRE_IMP_FULL = 9,
LUSTRE_IMP_EVICTED = 10,
+ LUSTRE_IMP_IDLE = 11,
+ LUSTRE_IMP_LAST
};
/** Returns test string representation of numeric import state \a state */
static inline char * ptlrpc_import_state_name(enum lustre_imp_state state)
{
- static char* import_state_names[] = {
- "<UNKNOWN>", "CLOSED", "NEW", "DISCONN",
- "CONNECTING", "REPLAY", "REPLAY_LOCKS", "REPLAY_WAIT",
- "RECOVER", "FULL", "EVICTED",
- };
-
- LASSERT (state <= LUSTRE_IMP_EVICTED);
- return import_state_names[state];
+ static char *import_state_names[] = {
+ "<UNKNOWN>", "CLOSED", "NEW", "DISCONN",
+ "CONNECTING", "REPLAY", "REPLAY_LOCKS", "REPLAY_WAIT",
+ "RECOVER", "FULL", "EVICTED", "IDLE",
+ };
+
+ LASSERT(state < LUSTRE_IMP_LAST);
+ return import_state_names[state];
}
/**
/** uuid of remote side */
struct obd_uuid oic_uuid;
/**
- * Time (64 bit jiffies) of last connection attempt on this connection
+ * Time (64 bit seconds) of last connection attempt on this connection
*/
- __u64 oic_last_attempt;
+ time64_t oic_last_attempt;
};
/* state history */
#define IMP_STATE_HIST_LEN 16
struct import_state_hist {
- enum lustre_imp_state ish_state;
- time_t ish_time;
+ enum lustre_imp_state ish_state;
+ time64_t ish_time;
};
/**
* Imports are representing client-side view to remote target.
*/
struct obd_import {
- /** Local handle (== id) for this import. */
- struct portals_handle imp_handle;
/** Reference counter */
atomic_t imp_refcount;
struct lustre_handle imp_dlm_handle; /* client's ldlm export */
struct ptlrpc_client *imp_client;
/** List element for linking into pinger chain */
struct list_head imp_pinger_chain;
- /** List element for linking into chain for destruction */
- struct list_head imp_zombie_chain;
+ /** work struct for destruction of import */
+ struct work_struct imp_zombie_work;
/**
* Lists of requests that are retained for replay, waiting for a reply,
* some seciruty-related fields
* @{
*/
- struct ptlrpc_sec *imp_sec;
+ struct ptlrpc_sec *imp_sec;
struct mutex imp_sec_mutex;
- cfs_time_t imp_sec_expire;
+ time64_t imp_sec_expire;
+ pid_t imp_sec_refpid;
/** @} */
/** Wait queue for those who need to wait for recovery completion */
int imp_state_hist_idx;
/** Current import generation. Incremented on every reconnect */
int imp_generation;
+ /** Idle connection initiated at this generation */
+ int imp_initiated_at;
/** Incremented every time we send reconnection request */
__u32 imp_conn_cnt;
/**
*/
struct lustre_handle imp_remote_handle;
/** When to perform next ping. time in jiffies. */
- cfs_time_t imp_next_ping;
+ time64_t imp_next_ping;
/** When we last successfully connected. time in 64bit jiffies */
- __u64 imp_last_success_conn;
+ time64_t imp_last_success_conn;
/** List of all possible connection for import. */
struct list_head imp_conn_list;
imp_server_timeout:1,
/* VBR: imp in delayed recovery */
imp_delayed_recovery:1,
- /* VBR: if gap was found then no lock replays
- */
- imp_no_lock_replay:1,
/* recovery by versions was failed */
imp_vbr_failed:1,
/* force an immidiate ping */
imp_resend_replay:1,
/* disable normal recovery, for test only. */
imp_no_pinger_recover:1,
-#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 0, 53, 0)
- /* need IR MNE swab */
- imp_need_mne_swab:1,
-#endif
/* import must be reconnected instead of
* chouse new connection */
imp_force_reconnect:1,
imp_connect_tried:1,
/* connected but not FULL yet */
imp_connected:1;
- __u32 imp_connect_op;
- struct obd_connect_data imp_connect_data;
- __u64 imp_connect_flags_orig;
- int imp_connect_error;
-
- __u32 imp_msg_magic;
- __u32 imp_msghdr_flags; /* adjusted based on server capability */
-
- struct imp_at imp_at; /* adaptive timeout data */
- time_t imp_last_reply_time; /* for health check */
+ u32 imp_connect_op;
+ u32 imp_idle_timeout;
+ u32 imp_idle_debug;
+ struct obd_connect_data imp_connect_data;
+ __u64 imp_connect_flags_orig;
+ __u64 imp_connect_flags2_orig;
+ int imp_connect_error;
+
+ enum lustre_msg_magic imp_msg_magic;
+ /* adjusted based on server capability */
+ enum lustre_msghdr imp_msghdr_flags;
+
+ /* adaptive timeout data */
+ struct imp_at imp_at;
+ time64_t imp_last_reply_time; /* for health check */
};
/* import.c */
{
at->at_current = val;
at->at_worst_ever = val;
- at->at_worst_time = cfs_time_current_sec();
+ at->at_worst_time = ktime_get_real_seconds();
}
static inline void at_reset(struct adaptive_timeout *at, int val)
/* genops.c */
struct obd_export;
extern struct obd_import *class_exp2cliimp(struct obd_export *);
-extern struct obd_import *class_conn2cliimp(struct lustre_handle *);
/** @} import */
git://git.whamcloud.com / fs / lustre-release.git / blobdiff