X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Finclude%2Flustre_net.h;h=5e8d0d54b8b4e30f4a5ed5ec00eed492e5fa538c;hp=18d0df0ec47b8c231f54ca95c7c61ed43b9e1b8b;hb=fb4073bc3cfbf1a7ad17b03270e986098a2869ee;hpb=962304a1dafb62ed040445559e6bf52241c60f2b diff --git a/lustre/include/lustre_net.h b/lustre/include/lustre_net.h index 18d0df0..5e8d0d5 100644 --- a/lustre/include/lustre_net.h +++ b/lustre/include/lustre_net.h @@ -37,6 +37,11 @@ #ifndef _LUSTRE_NET_H #define _LUSTRE_NET_H +/** \defgroup net net + * + * @{ + */ + #if defined(__linux__) #include #elif defined(__APPLE__) @@ -59,6 +64,7 @@ #include #include +#include /* MD flags we _always_ use */ #define PTLRPC_MD_OPTIONS 0 @@ -105,9 +111,10 @@ */ #define LDLM_THREADS_AUTO_MIN (2) -#define LDLM_THREADS_AUTO_MAX min(num_online_cpus()*num_online_cpus()*32, 128) +#define LDLM_THREADS_AUTO_MAX min_t(unsigned, cfs_num_online_cpus() * \ + cfs_num_online_cpus() * 32, 128) #define LDLM_BL_THREADS LDLM_THREADS_AUTO_MIN -#define LDLM_NBUFS (64 * num_online_cpus()) +#define LDLM_NBUFS (64 * cfs_num_online_cpus()) #define LDLM_BUFSIZE (8 * 1024) #define LDLM_MAXREQSIZE (5 * 1024) #define LDLM_MAXREPSIZE (1024) @@ -115,17 +122,14 @@ #define MDT_MIN_THREADS 2UL #define MDT_MAX_THREADS 512UL #define MDT_NUM_THREADS max(min_t(unsigned long, MDT_MAX_THREADS, \ - num_physpages >> (25 - CFS_PAGE_SHIFT)), 2UL) -#define FLD_NUM_THREADS max(min_t(unsigned long, MDT_MAX_THREADS, \ - num_physpages >> (25 - CFS_PAGE_SHIFT)), 2UL) -#define SEQ_NUM_THREADS max(min_t(unsigned long, MDT_MAX_THREADS, \ - num_physpages >> (25 - CFS_PAGE_SHIFT)), 2UL) + cfs_num_physpages >> (25 - CFS_PAGE_SHIFT)), \ + 2UL) /* Absolute limits */ #define MDS_THREADS_MIN 2 #define MDS_THREADS_MAX 512 #define MDS_THREADS_MIN_READPAGE 2 -#define MDS_NBUFS (64 * num_online_cpus()) +#define MDS_NBUFS (64 * cfs_num_online_cpus()) #define MDS_BUFSIZE (8 * 1024) /* Assume file name length = FNAME_MAX = 256 (true for ext3). * path name length = PATH_MAX = 4096 @@ -160,9 +164,10 @@ /* SEQ_MAXREPSIZE == lustre_msg + ptlrpc_body + lu_range */ #define SEQ_MAXREPSIZE (152) -#define MGS_THREADS_AUTO_MIN 2 +/* MGS threads must be >= 3, see bug 22458 comment #28 */ +#define MGS_THREADS_AUTO_MIN 3 #define MGS_THREADS_AUTO_MAX 32 -#define MGS_NBUFS (64 * num_online_cpus()) +#define MGS_NBUFS (64 * cfs_num_online_cpus()) #define MGS_BUFSIZE (8 * 1024) #define MGS_MAXREQSIZE (7 * 1024) #define MGS_MAXREPSIZE (9 * 1024) @@ -170,7 +175,7 @@ /* Absolute limits */ #define OSS_THREADS_MIN 3 /* difficult replies, HPQ, others */ #define OSS_THREADS_MAX 512 -#define OST_NBUFS (64 * num_online_cpus()) +#define OST_NBUFS (64 * cfs_num_online_cpus()) #define OST_BUFSIZE (8 * 1024) /* OST_MAXREQSIZE ~= 4768 bytes = * lustre_msg + obdo + 16 * obd_ioobj + 256 * niobuf_remote @@ -185,11 +190,11 @@ #define ptlrpc_req_async_args(req) ((void *)&req->rq_async_args) struct ptlrpc_connection { - struct hlist_node c_hash; + cfs_hlist_node_t c_hash; lnet_nid_t c_self; lnet_process_id_t c_peer; struct obd_uuid c_remote_uuid; - atomic_t c_refcount; + cfs_atomic_t c_refcount; }; struct ptlrpc_client { @@ -219,21 +224,21 @@ struct ptlrpc_request_set; typedef int (*set_interpreter_func)(struct ptlrpc_request_set *, void *, int); struct ptlrpc_request_set { - int set_remaining; /* # uncompleted requests */ - cfs_waitq_t set_waitq; - cfs_waitq_t *set_wakeup_ptr; - struct list_head set_requests; - struct list_head set_cblist; /* list of completion callbacks */ - set_interpreter_func set_interpret; /* completion callback */ - void *set_arg; /* completion context */ + cfs_atomic_t set_remaining; /* # uncompleted requests */ + cfs_waitq_t set_waitq; + cfs_waitq_t *set_wakeup_ptr; + cfs_list_t set_requests; + cfs_list_t set_cblist; /* list of completion callbacks */ + set_interpreter_func set_interpret; /* completion callback */ + void *set_arg; /* completion context */ /* locked so that any old caller can communicate requests to * the set holder who can then fold them into the lock-free set */ - spinlock_t set_new_req_lock; - struct list_head set_new_requests; + cfs_spinlock_t set_new_req_lock; + cfs_list_t set_new_requests; }; struct ptlrpc_set_cbdata { - struct list_head psc_item; + cfs_list_t psc_item; set_interpreter_func psc_interpret; void *psc_data; }; @@ -253,14 +258,14 @@ struct ptlrpc_cb_id { struct ptlrpc_reply_state { struct ptlrpc_cb_id rs_cb_id; - struct list_head rs_list; - struct list_head rs_exp_list; - struct list_head rs_obd_list; + cfs_list_t rs_list; + cfs_list_t rs_exp_list; + cfs_list_t rs_obd_list; #if RS_DEBUG - struct list_head rs_debug_list; + cfs_list_t rs_debug_list; #endif /* A spinlock to protect the reply state flags */ - spinlock_t rs_lock; + cfs_spinlock_t rs_lock; /* Reply state flags */ unsigned long rs_difficult:1; /* ACK/commit stuff */ unsigned long rs_no_ack:1; /* no ACK, even for @@ -270,14 +275,17 @@ struct ptlrpc_reply_state { unsigned long rs_handled:1; /* been handled yet? */ unsigned long rs_on_net:1; /* reply_out_callback pending? */ unsigned long rs_prealloc:1; /* rs from prealloc list */ - + unsigned long rs_committed:1;/* the transaction was committed + and the rs was dispatched + by ptlrpc_commit_replies */ int rs_size; + __u32 rs_opc; __u64 rs_transno; __u64 rs_xid; struct obd_export *rs_export; struct ptlrpc_service *rs_service; lnet_handle_md_t rs_md_h; - atomic_t rs_refcount; + cfs_atomic_t rs_refcount; struct ptlrpc_svc_ctx *rs_svc_ctx; struct lustre_msg *rs_repbuf; /* wrapper */ @@ -309,8 +317,8 @@ typedef int (*ptlrpc_interpterer_t)(const struct lu_env *env, void *arg, int rc); struct ptlrpc_request_pool { - spinlock_t prp_lock; - struct list_head prp_req_list; /* list of ptlrpc_request structs */ + cfs_spinlock_t prp_lock; + cfs_list_t prp_req_list; /* list of ptlrpc_request structs */ int prp_rq_size; void (*prp_populate)(struct ptlrpc_request_pool *, int); }; @@ -337,16 +345,16 @@ struct ptlrpc_hpreq_ops { */ struct ptlrpc_request { int rq_type; /* one of PTL_RPC_MSG_* */ - struct list_head rq_list; - struct list_head rq_timed_list; /* server-side early replies */ - struct list_head rq_history_list; /* server-side history */ - struct list_head rq_exp_list; /* server-side per-export list */ - struct ptlrpc_hpreq_ops *rq_ops; /* server-side hp handlers */ - __u64 rq_history_seq; /* history sequence # */ + cfs_list_t rq_list; + cfs_list_t rq_timed_list; /* server-side early replies */ + cfs_list_t rq_history_list; /* server-side history */ + cfs_list_t rq_exp_list; /* server-side per-export list */ + struct ptlrpc_hpreq_ops *rq_ops; /* server-side hp handlers */ + __u64 rq_history_seq; /* history sequence # */ /* the index of service's srv_at_array into which request is linked */ time_t rq_at_index; int rq_status; - spinlock_t rq_lock; + cfs_spinlock_t rq_lock; /* client-side flags are serialized by rq_lock */ unsigned long rq_intr:1, rq_replied:1, rq_err:1, rq_timedout:1, rq_resend:1, rq_restart:1, @@ -363,24 +371,29 @@ struct ptlrpc_request { rq_no_resend:1, rq_waiting:1, rq_receiving_reply:1, rq_no_delay:1, rq_net_err:1, rq_wait_ctx:1, rq_early:1, rq_must_unlink:1, + rq_fake:1, /* this fake req */ /* server-side flags */ rq_packed_final:1, /* packed final reply */ - rq_sent_final:1, /* stop sending early replies */ rq_hp:1, /* high priority RPC */ - rq_at_linked:1; /* link into service's srv_at_array */ + rq_at_linked:1, /* link into service's srv_at_array */ + rq_reply_truncate:1, + rq_committed:1, + /* whether the "rq_set" is a valid one */ + rq_invalid_rqset:1; enum rq_phase rq_phase; /* one of RQ_PHASE_* */ enum rq_phase rq_next_phase; /* one of RQ_PHASE_* to be used next */ - atomic_t rq_refcount; /* client-side refcount for SENT race, - server-side refcounf for multiple replies */ + cfs_atomic_t rq_refcount;/* client-side refcount for SENT race, + server-side refcounf for multiple replies */ struct ptlrpc_thread *rq_svc_thread; /* initial thread servicing req */ int rq_request_portal; /* XXX FIXME bug 249 */ int rq_reply_portal; /* XXX FIXME bug 249 */ - int rq_nob_received; /* client-side # reply bytes actually received */ - + int rq_nob_received; /* client-side: + * !rq_truncate : # reply bytes actually received, + * rq_truncate : required repbuf_len for resend */ int rq_reqlen; struct lustre_msg *rq_reqmsg; @@ -388,11 +401,11 @@ struct ptlrpc_request { struct lustre_msg *rq_repmsg; __u64 rq_transno; __u64 rq_xid; - struct list_head rq_replay_list; + cfs_list_t rq_replay_list; struct ptlrpc_cli_ctx *rq_cli_ctx; /* client's half ctx */ struct ptlrpc_svc_ctx *rq_svc_ctx; /* server's half ctx */ - struct list_head rq_ctx_chain; /* link to waited ctx */ + cfs_list_t rq_ctx_chain; /* link to waited ctx */ struct sptlrpc_flavor rq_flvr; /* client & server */ enum lustre_sec_part rq_sp_from; @@ -411,7 +424,8 @@ struct ptlrpc_request { rq_pack_udesc:1, rq_pack_bulk:1, /* doesn't expect reply FIXME */ - rq_no_reply:1; + rq_no_reply:1, + rq_pill_init:1; /* pill initialized */ uid_t rq_auth_uid; /* authed uid */ uid_t rq_auth_mapped_uid; /* authed uid mapped to */ @@ -445,6 +459,8 @@ struct ptlrpc_request { /* client+server request */ lnet_handle_md_t rq_req_md_h; struct ptlrpc_cb_id rq_req_cbid; + cfs_duration_t rq_delay_limit; /* optional time limit for send attempts */ + cfs_time_t rq_queued_time; /* time request was first queued */ /* server-side... */ struct timeval rq_arrival_time; /* request arrival time */ @@ -482,7 +498,8 @@ struct ptlrpc_request { int rq_timeout; /* service time estimate (secs) */ /* Multi-rpc bits */ - struct list_head rq_set_chain; + cfs_list_t rq_set_chain; + cfs_waitq_t rq_set_waitq; struct ptlrpc_request_set *rq_set; /** Async completion handler */ ptlrpc_interpterer_t rq_interpret_reply; @@ -490,35 +507,58 @@ struct ptlrpc_request { struct ptlrpc_request_pool *rq_pool; /* Pool if request from preallocated list */ struct lu_context rq_session; + struct lu_context rq_recov_session; /* request format */ struct req_capsule rq_pill; }; -static inline void lustre_set_req_swabbed(struct ptlrpc_request *req, int index) +static inline int ptlrpc_req_interpret(const struct lu_env *env, + struct ptlrpc_request *req, int rc) +{ + if (req->rq_interpret_reply != NULL) { + req->rq_status = req->rq_interpret_reply(env, req, + &req->rq_async_args, + rc); + return req->rq_status; + } + return rc; +} + +static inline int lustre_req_swabbed(struct ptlrpc_request *req, int index) { LASSERT(index < sizeof(req->rq_req_swab_mask) * 8); - LASSERT((req->rq_req_swab_mask & (1 << index)) == 0); - req->rq_req_swab_mask |= 1 << index; + return req->rq_req_swab_mask & (1 << index); } -static inline void lustre_set_rep_swabbed(struct ptlrpc_request *req, int index) +static inline int lustre_rep_swabbed(struct ptlrpc_request *req, int index) { LASSERT(index < sizeof(req->rq_rep_swab_mask) * 8); - LASSERT((req->rq_rep_swab_mask & (1 << index)) == 0); - req->rq_rep_swab_mask |= 1 << index; + return req->rq_rep_swab_mask & (1 << index); } -static inline int lustre_req_swabbed(struct ptlrpc_request *req, int index) +static inline int ptlrpc_req_need_swab(struct ptlrpc_request *req) +{ + return lustre_req_swabbed(req, MSG_PTLRPC_HEADER_OFF); +} + +static inline int ptlrpc_rep_need_swab(struct ptlrpc_request *req) +{ + return lustre_rep_swabbed(req, MSG_PTLRPC_HEADER_OFF); +} + +static inline void lustre_set_req_swabbed(struct ptlrpc_request *req, int index) { LASSERT(index < sizeof(req->rq_req_swab_mask) * 8); - return req->rq_req_swab_mask & (1 << index); + LASSERT((req->rq_req_swab_mask & (1 << index)) == 0); + req->rq_req_swab_mask |= 1 << index; } -static inline int lustre_rep_swabbed(struct ptlrpc_request *req, int index) +static inline void lustre_set_rep_swabbed(struct ptlrpc_request *req, int index) { LASSERT(index < sizeof(req->rq_rep_swab_mask) * 8); - return req->rq_rep_swab_mask & (1 << index); + LASSERT((req->rq_rep_swab_mask & (1 << index)) == 0); + req->rq_rep_swab_mask |= 1 << index; } static inline const char * @@ -559,9 +599,10 @@ ptlrpc_rqphase2str(struct ptlrpc_request *req) FLAG(req->rq_restart, "T"), FLAG(req->rq_replay, "P"), \ FLAG(req->rq_no_resend, "N"), \ FLAG(req->rq_waiting, "W"), \ - FLAG(req->rq_wait_ctx, "C"), FLAG(req->rq_hp, "H") + FLAG(req->rq_wait_ctx, "C"), FLAG(req->rq_hp, "H"), \ + FLAG(req->rq_committed, "M") -#define REQ_FLAGS_FMT "%s:%s%s%s%s%s%s%s%s%s%s%s" +#define REQ_FLAGS_FMT "%s:%s%s%s%s%s%s%s%s%s%s%s%s" void _debug_req(struct ptlrpc_request *req, __u32 mask, struct libcfs_debug_msg_data *data, const char *fmt, ...) @@ -569,7 +610,7 @@ void _debug_req(struct ptlrpc_request *req, __u32 mask, #define debug_req(cdls, level, req, file, func, line, fmt, a...) \ do { \ - CHECK_STACK(); \ + CFS_CHECK_STACK(); \ \ if (((level) & D_CANTMASK) != 0 || \ ((libcfs_debug & (level)) != 0 && \ @@ -593,7 +634,7 @@ do { \ } while (0) struct ptlrpc_bulk_page { - struct list_head bp_link; + cfs_list_t bp_link; int bp_buflen; int bp_pageoffset; /* offset within a page */ struct page *bp_page; @@ -609,7 +650,7 @@ struct ptlrpc_bulk_desc { unsigned long bd_network_rw:1; /* accessible to the network */ unsigned long bd_type:2; /* {put,get}{source,sink} */ unsigned long bd_registered:1; /* client side */ - spinlock_t bd_lock; /* serialise with callback */ + cfs_spinlock_t bd_lock; /* serialise with callback */ int bd_import_generation; struct obd_export *bd_export; struct obd_import *bd_import; @@ -643,7 +684,7 @@ struct ptlrpc_thread { /** * active threads in svc->srv_threads */ - struct list_head t_link; + cfs_list_t t_link; /** * thread-private data (preallocated memory) */ @@ -654,6 +695,10 @@ struct ptlrpc_thread { */ unsigned int t_id; /** + * service thread pid + */ + pid_t t_pid; + /** * put watchdog in the structure per thread b=14840 */ struct lc_watchdog *t_watchdog; @@ -666,8 +711,8 @@ struct ptlrpc_thread { }; struct ptlrpc_request_buffer_desc { - struct list_head rqbd_list; - struct list_head rqbd_reqs; + cfs_list_t rqbd_list; + cfs_list_t rqbd_reqs; struct ptlrpc_service *rqbd_service; lnet_handle_md_t rqbd_md_h; int rqbd_refcount; @@ -683,7 +728,7 @@ typedef int (*svc_hpreq_handler_t)(struct ptlrpc_request *); #define PTLRPC_SVC_HP_RATIO 10 struct ptlrpc_service { - struct list_head srv_list; /* chain thru all services */ + cfs_list_t srv_list; /* chain thru all services */ int srv_max_req_size; /* biggest request to receive */ int srv_max_reply_size; /* biggest reply to send */ int srv_buf_size; /* size of individual buffers */ @@ -693,11 +738,11 @@ struct ptlrpc_service { int srv_threads_max; /* thread upper limit */ int srv_threads_started; /* index of last started thread */ int srv_threads_running; /* # running threads */ - atomic_t srv_n_difficult_replies; /* # 'difficult' replies */ + cfs_atomic_t srv_n_difficult_replies; /* # 'difficult' replies */ int srv_n_active_reqs; /* # reqs being served */ int srv_n_hpreq; /* # HPreqs being served */ cfs_duration_t srv_rqbd_timeout; /* timeout before re-posting reqs, in tick */ - int srv_watchdog_factor; /* soft watchdog timeout mutiplier */ + int srv_watchdog_factor; /* soft watchdog timeout multiplier */ unsigned srv_cpu_affinity:1; /* bind threads to CPUs */ unsigned srv_at_check:1; /* check early replies */ unsigned srv_is_stopping:1; /* under unregister_service */ @@ -708,61 +753,61 @@ struct ptlrpc_service { /* AT stuff */ struct adaptive_timeout srv_at_estimate;/* estimated rpc service time */ - spinlock_t srv_at_lock; + cfs_spinlock_t srv_at_lock; struct ptlrpc_at_array srv_at_array; /* reqs waiting for replies */ - cfs_timer_t srv_at_timer; /* early reply timer */ - - int srv_n_queued_reqs; /* # reqs in either of the queues below */ - int srv_hpreq_count; /* # hp requests handled */ - int srv_hpreq_ratio; /* # hp per lp reqs to handle */ - struct list_head srv_req_in_queue; /* incoming reqs */ - struct list_head srv_request_queue; /* reqs waiting for service */ - struct list_head srv_request_hpq; /* high priority queue */ - - struct list_head srv_request_history; /* request history */ - __u64 srv_request_seq; /* next request sequence # */ - __u64 srv_request_max_cull_seq; /* highest seq culled from history */ - svcreq_printfn_t srv_request_history_print_fn; /* service-specific print fn */ - - struct list_head srv_idle_rqbds; /* request buffers to be reposted */ - struct list_head srv_active_rqbds; /* req buffers receiving */ - struct list_head srv_history_rqbds; /* request buffer history */ - int srv_nrqbd_receiving; /* # posted request buffers */ - int srv_n_history_rqbds; /* # request buffers in history */ - int srv_max_history_rqbds;/* max # request buffers in history */ - - atomic_t srv_outstanding_replies; - struct list_head srv_active_replies; /* all the active replies */ + cfs_timer_t srv_at_timer; /* early reply timer */ + + int srv_n_queued_reqs; /* # reqs in either of the queues below */ + int srv_hpreq_count; /* # hp requests handled */ + int srv_hpreq_ratio; /* # hp per lp reqs to handle */ + cfs_list_t srv_req_in_queue; /* incoming reqs */ + cfs_list_t srv_request_queue; /* reqs waiting for service */ + cfs_list_t srv_request_hpq; /* high priority queue */ + + cfs_list_t srv_request_history; /* request history */ + __u64 srv_request_seq; /* next request sequence # */ + __u64 srv_request_max_cull_seq; /* highest seq culled from history */ + svcreq_printfn_t srv_request_history_print_fn; /* service-specific print fn */ + + cfs_list_t srv_idle_rqbds; /* request buffers to be reposted */ + cfs_list_t srv_active_rqbds; /* req buffers receiving */ + cfs_list_t srv_history_rqbds; /* request buffer history */ + int srv_nrqbd_receiving; /* # posted request buffers */ + int srv_n_history_rqbds; /* # request buffers in history */ + int srv_max_history_rqbds;/* max # request buffers in history */ + + cfs_atomic_t srv_outstanding_replies; + cfs_list_t srv_active_replies; /* all the active replies */ #ifndef __KERNEL__ - struct list_head srv_reply_queue; /* replies waiting for service */ + cfs_list_t srv_reply_queue; /* replies waiting for service */ #endif - cfs_waitq_t srv_waitq; /* all threads sleep on this. This - * wait-queue is signalled when new - * incoming request arrives and when - * difficult reply has to be handled. */ + cfs_waitq_t srv_waitq; /* all threads sleep on this. This + * wait-queue is signalled when new + * incoming request arrives and when + * difficult reply has to be handled. */ - struct list_head srv_threads; /* service thread list */ - svc_handler_t srv_handler; - svc_hpreq_handler_t srv_hpreq_handler; /* hp request handler */ + cfs_list_t srv_threads; /* service thread list */ + svc_handler_t srv_handler; + svc_hpreq_handler_t srv_hpreq_handler; /* hp request handler */ char *srv_name; /* only statically allocated strings here; we don't clean them */ char *srv_thread_name; /* only statically allocated strings here; we don't clean them */ - spinlock_t srv_lock; + cfs_spinlock_t srv_lock; - cfs_proc_dir_entry_t *srv_procroot; - struct lprocfs_stats *srv_stats; + cfs_proc_dir_entry_t *srv_procroot; + struct lprocfs_stats *srv_stats; /* List of free reply_states */ - struct list_head srv_free_rs_list; + cfs_list_t srv_free_rs_list; /* waitq to run, when adding stuff to srv_free_rs_list */ - cfs_waitq_t srv_free_rs_waitq; + cfs_waitq_t srv_free_rs_waitq; /* * Tags for lu_context associated with this thread, see struct * lu_context. */ - __u32 srv_ctx_tags; + __u32 srv_ctx_tags; /* * if non-NULL called during thread creation (ptlrpc_start_thread()) * to initialize service specific per-thread state. @@ -785,15 +830,15 @@ struct ptlrpcd_ctl { /** * Thread lock protecting structure fields. */ - spinlock_t pc_lock; + cfs_spinlock_t pc_lock; /** * Start completion. */ - struct completion pc_starting; + cfs_completion_t pc_starting; /** * Stop completion. */ - struct completion pc_finishing; + cfs_completion_t pc_finishing; /** * Thread requests set. */ @@ -882,9 +927,9 @@ static inline int ptlrpc_server_bulk_active(struct ptlrpc_bulk_desc *desc) LASSERT(desc != NULL); - spin_lock(&desc->bd_lock); + cfs_spin_lock(&desc->bd_lock); rc = desc->bd_network_rw; - spin_unlock(&desc->bd_lock); + cfs_spin_unlock(&desc->bd_lock); return rc; } @@ -902,9 +947,9 @@ static inline int ptlrpc_client_bulk_active(struct ptlrpc_request *req) if (!desc) return 0; - spin_lock(&desc->bd_lock); + cfs_spin_lock(&desc->bd_lock); rc = desc->bd_network_rw; - spin_unlock(&desc->bd_lock); + cfs_spin_unlock(&desc->bd_lock); return rc; } @@ -969,6 +1014,11 @@ struct ptlrpc_request *ptlrpc_request_alloc_pack(struct obd_import *imp, int ptlrpc_request_bufs_pack(struct ptlrpc_request *request, __u32 version, int opcode, char **bufs, struct ptlrpc_cli_ctx *ctx); +struct ptlrpc_request *ptlrpc_prep_fakereq(struct obd_import *imp, + unsigned int timeout, + ptlrpc_interpterer_t interpreter); +void ptlrpc_fakereq_finished(struct ptlrpc_request *req); + struct ptlrpc_request *ptlrpc_prep_req(struct obd_import *imp, __u32 version, int opcode, int count, __u32 *lengths, char **bufs); @@ -1036,6 +1086,9 @@ int liblustre_check_services (void *arg); void ptlrpc_daemonize(char *name); int ptlrpc_service_health_check(struct ptlrpc_service *); void ptlrpc_hpreq_reorder(struct ptlrpc_request *req); +void ptlrpc_server_active_request_inc(struct ptlrpc_request *req); +void ptlrpc_server_active_request_dec(struct ptlrpc_request *req); +void ptlrpc_server_drop_request(struct ptlrpc_request *req); #ifdef __KERNEL__ int ptlrpc_hr_init(void); @@ -1060,7 +1113,15 @@ int ptlrpc_import_recovery_state_machine(struct obd_import *imp); /* ptlrpc/pack_generic.c */ int ptlrpc_reconnect_import(struct obd_import *imp); -int lustre_msg_swabbed(struct lustre_msg *msg); + +/** ptlrpc mgs buffer swab interface */ +int ptlrpc_buf_need_swab(struct ptlrpc_request *req, const int inout, + int index); +void ptlrpc_buf_set_swabbed(struct ptlrpc_request *req, const int inout, + int index); +int ptlrpc_unpack_rep_msg(struct ptlrpc_request *req, int len); +int ptlrpc_unpack_req_msg(struct ptlrpc_request *req, int len); + int lustre_msg_check_version(struct lustre_msg *msg, __u32 version); void lustre_init_msg_v2(struct lustre_msg_v2 *msg, int count, __u32 *lens, char **bufs); @@ -1076,23 +1137,18 @@ int lustre_pack_reply_flags(struct ptlrpc_request *, int count, __u32 *lens, int lustre_shrink_msg(struct lustre_msg *msg, int segment, unsigned int newlen, int move_data); void lustre_free_reply_state(struct ptlrpc_reply_state *rs); +int __lustre_unpack_msg(struct lustre_msg *m, int len); int lustre_msg_hdr_size(__u32 magic, int count); int lustre_msg_size(__u32 magic, int count, __u32 *lengths); int lustre_msg_size_v2(int count, __u32 *lengths); int lustre_packed_msg_size(struct lustre_msg *msg); int lustre_msg_early_size(void); -int lustre_unpack_msg(struct lustre_msg *m, int len); void *lustre_msg_buf_v2(struct lustre_msg_v2 *m, int n, int min_size); void *lustre_msg_buf(struct lustre_msg *m, int n, int minlen); int lustre_msg_buflen(struct lustre_msg *m, int n); void lustre_msg_set_buflen(struct lustre_msg *m, int n, int len); int lustre_msg_bufcount(struct lustre_msg *m); char *lustre_msg_string (struct lustre_msg *m, int n, int max_len); -void *lustre_swab_buf(struct lustre_msg *, int n, int minlen, void *swabber); -void *lustre_swab_reqbuf(struct ptlrpc_request *req, int n, int minlen, - void *swabber); -void *lustre_swab_repbuf(struct ptlrpc_request *req, int n, int minlen, - void *swabber); __u32 lustre_msghdr_get_flags(struct lustre_msg *msg); void lustre_msghdr_set_flags(struct lustre_msg *msg, __u32 flags); __u32 lustre_msg_get_flags(struct lustre_msg *msg); @@ -1122,7 +1178,12 @@ __u32 lustre_msg_get_magic(struct lustre_msg *msg); __u32 lustre_msg_get_timeout(struct lustre_msg *msg); __u32 lustre_msg_get_service_time(struct lustre_msg *msg); __u32 lustre_msg_get_cksum(struct lustre_msg *msg); +#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 0, 0) +__u32 lustre_msg_calc_cksum(struct lustre_msg *msg, int compat18); +#else +# warning "remove checksum compatibility support for b1_8" __u32 lustre_msg_calc_cksum(struct lustre_msg *msg); +#endif void lustre_msg_set_handle(struct lustre_msg *msg,struct lustre_handle *handle); void lustre_msg_set_type(struct lustre_msg *msg, __u32 type); void lustre_msg_set_opc(struct lustre_msg *msg, __u32 opc); @@ -1157,15 +1218,15 @@ ptlrpc_rqphase_move(struct ptlrpc_request *req, enum rq_phase new_phase) if (new_phase == RQ_PHASE_UNREGISTERING) { req->rq_next_phase = req->rq_phase; if (req->rq_import) - atomic_inc(&req->rq_import->imp_unregistering); + cfs_atomic_inc(&req->rq_import->imp_unregistering); } if (req->rq_phase == RQ_PHASE_UNREGISTERING) { if (req->rq_import) - atomic_dec(&req->rq_import->imp_unregistering); + cfs_atomic_dec(&req->rq_import->imp_unregistering); } - DEBUG_REQ(D_RPCTRACE, req, "move req \"%s\" -> \"%s\"", + DEBUG_REQ(D_INFO, req, "move req \"%s\" -> \"%s\"", ptlrpc_rqphase2str(req), ptlrpc_phase2str(new_phase)); req->rq_phase = new_phase; @@ -1203,14 +1264,14 @@ ptlrpc_client_recv_or_unlink(struct ptlrpc_request *req) { int rc; - spin_lock(&req->rq_lock); + cfs_spin_lock(&req->rq_lock); if (OBD_FAIL_CHECK(OBD_FAIL_PTLRPC_LONG_REPL_UNLINK) && req->rq_reply_deadline > cfs_time_current_sec()) { - spin_unlock(&req->rq_lock); + cfs_spin_unlock(&req->rq_lock); return 1; } rc = req->rq_receiving_reply || req->rq_must_unlink; - spin_unlock(&req->rq_lock); + cfs_spin_unlock(&req->rq_lock); return rc; } @@ -1226,15 +1287,15 @@ ptlrpc_client_wake_req(struct ptlrpc_request *req) static inline void ptlrpc_rs_addref(struct ptlrpc_reply_state *rs) { - LASSERT(atomic_read(&rs->rs_refcount) > 0); - atomic_inc(&rs->rs_refcount); + LASSERT(cfs_atomic_read(&rs->rs_refcount) > 0); + cfs_atomic_inc(&rs->rs_refcount); } static inline void ptlrpc_rs_decref(struct ptlrpc_reply_state *rs) { - LASSERT(atomic_read(&rs->rs_refcount) > 0); - if (atomic_dec_and_test(&rs->rs_refcount)) + LASSERT(cfs_atomic_read(&rs->rs_refcount) > 0); + if (cfs_atomic_dec_and_test(&rs->rs_refcount)) lustre_free_reply_state(rs); } @@ -1265,6 +1326,27 @@ static inline int ptlrpc_req_get_repsize(struct ptlrpc_request *req) } } +static inline int ptlrpc_send_limit_expired(struct ptlrpc_request *req) +{ + if (req->rq_delay_limit != 0 && + cfs_time_before(cfs_time_add(req->rq_queued_time, + cfs_time_seconds(req->rq_delay_limit)), + cfs_time_current())) { + return 1; + } + return 0; +} + +static inline int ptlrpc_no_resend(struct ptlrpc_request *req) +{ + if (!req->rq_no_resend && ptlrpc_send_limit_expired(req)) { + cfs_spin_lock(&req->rq_lock); + req->rq_no_resend = 1; + cfs_spin_unlock(&req->rq_lock); + } + return req->rq_no_resend; +} + /* ldlm/ldlm_lib.c */ int client_obd_setup(struct obd_device *obddev, struct lustre_cfg *lcfg); int client_obd_cleanup(struct obd_device *obddev); @@ -1279,6 +1361,8 @@ int client_import_del_conn(struct obd_import *imp, struct obd_uuid *uuid); int import_set_conn_priority(struct obd_import *imp, struct obd_uuid *uuid); void client_destroy_import(struct obd_import *imp); +int server_disconnect_export(struct obd_export *exp); + /* ptlrpc/pinger.c */ enum timeout_event { TIMEOUT_GRANT = 1 @@ -1289,8 +1373,8 @@ int ptlrpc_pinger_add_import(struct obd_import *imp); int ptlrpc_pinger_del_import(struct obd_import *imp); int ptlrpc_add_timeout_client(int time, enum timeout_event event, timeout_cb_t cb, void *data, - struct list_head *obd_list); -int ptlrpc_del_timeout_client(struct list_head *obd_list, + cfs_list_t *obd_list); +int ptlrpc_del_timeout_client(cfs_list_t *obd_list, enum timeout_event event); struct ptlrpc_request * ptlrpc_prep_ping(struct obd_import *imp); int ptlrpc_obd_ping(struct obd_device *obd); @@ -1323,7 +1407,7 @@ enum ptlrpcd_scope { int ptlrpcd_start(const char *name, struct ptlrpcd_ctl *pc); void ptlrpcd_stop(struct ptlrpcd_ctl *pc, int force); void ptlrpcd_wake(struct ptlrpc_request *req); -void ptlrpcd_add_req(struct ptlrpc_request *req, enum ptlrpcd_scope scope); +int ptlrpcd_add_req(struct ptlrpc_request *req, enum ptlrpcd_scope scope); void ptlrpcd_add_rqset(struct ptlrpc_request_set *set); int ptlrpcd_addref(void); void ptlrpcd_decref(void); @@ -1353,4 +1437,6 @@ int llog_catinfo(struct ptlrpc_request *req); /* ptlrpc/llog_client.c */ extern struct llog_operations llog_client_ops; +/** @} net */ + #endif