X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fptlrpc%2Fservice.c;h=8609e3f01faacdfef62eeb6b0d928f305bfb546e;hb=f625f670afbe954030ff81f0f8522137d6cdd335;hp=08827eb25d68c3cb6292b9fb38e86ebbf6e61de6;hpb=da6a28fc59a70226dd89bac95880f7791f1db075;p=fs%2Flustre-release.git diff --git a/lustre/ptlrpc/service.c b/lustre/ptlrpc/service.c index 08827eb..8609e3f 100644 --- a/lustre/ptlrpc/service.c +++ b/lustre/ptlrpc/service.c @@ -27,7 +27,7 @@ * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * - * Copyright (c) 2010, 2013, Intel Corporation. + * Copyright (c) 2010, 2014, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -35,9 +35,6 @@ */ #define DEBUG_SUBSYSTEM S_RPC -#ifndef __KERNEL__ -#include -#endif #include #include #include @@ -68,11 +65,11 @@ static void ptlrpc_server_hpreq_fini(struct ptlrpc_request *req); static void ptlrpc_at_remove_timed(struct ptlrpc_request *req); /** Holds a list of all PTLRPC services */ -CFS_LIST_HEAD(ptlrpc_all_services); +struct list_head ptlrpc_all_services; /** Used to protect the \e ptlrpc_all_services list */ struct mutex ptlrpc_all_services_mutex; -struct ptlrpc_request_buffer_desc * +static struct ptlrpc_request_buffer_desc * ptlrpc_alloc_rqbd(struct ptlrpc_service_part *svcpt) { struct ptlrpc_service *svc = svcpt->scp_service; @@ -86,7 +83,7 @@ ptlrpc_alloc_rqbd(struct ptlrpc_service_part *svcpt) rqbd->rqbd_refcount = 0; rqbd->rqbd_cbid.cbid_fn = request_in_callback; rqbd->rqbd_cbid.cbid_arg = rqbd; - CFS_INIT_LIST_HEAD(&rqbd->rqbd_reqs); + INIT_LIST_HEAD(&rqbd->rqbd_reqs); OBD_CPT_ALLOC_LARGE(rqbd->rqbd_buffer, svc->srv_cptable, svcpt->scp_cpt, svc->srv_buf_size); if (rqbd->rqbd_buffer == NULL) { @@ -95,23 +92,23 @@ ptlrpc_alloc_rqbd(struct ptlrpc_service_part *svcpt) } spin_lock(&svcpt->scp_lock); - cfs_list_add(&rqbd->rqbd_list, &svcpt->scp_rqbd_idle); + list_add(&rqbd->rqbd_list, &svcpt->scp_rqbd_idle); svcpt->scp_nrqbds_total++; spin_unlock(&svcpt->scp_lock); return rqbd; } -void +static void ptlrpc_free_rqbd(struct ptlrpc_request_buffer_desc *rqbd) { struct ptlrpc_service_part *svcpt = rqbd->rqbd_svcpt; LASSERT(rqbd->rqbd_refcount == 0); - LASSERT(cfs_list_empty(&rqbd->rqbd_reqs)); + LASSERT(list_empty(&rqbd->rqbd_reqs)); spin_lock(&svcpt->scp_lock); - cfs_list_del(&rqbd->rqbd_list); + list_del(&rqbd->rqbd_list); svcpt->scp_nrqbds_total--; spin_unlock(&svcpt->scp_lock); @@ -119,7 +116,7 @@ ptlrpc_free_rqbd(struct ptlrpc_request_buffer_desc *rqbd) OBD_FREE_PTR(rqbd); } -int +static int ptlrpc_grow_req_bufs(struct ptlrpc_service_part *svcpt, int post) { struct ptlrpc_service *svc = svcpt->scp_service; @@ -204,7 +201,6 @@ ptlrpc_save_lock(struct ptlrpc_request *req, } EXPORT_SYMBOL(ptlrpc_save_lock); -#ifdef __KERNEL__ struct ptlrpc_hr_partition; @@ -212,15 +208,15 @@ struct ptlrpc_hr_thread { int hrt_id; /* thread ID */ spinlock_t hrt_lock; wait_queue_head_t hrt_waitq; - cfs_list_t hrt_queue; /* RS queue */ + struct list_head hrt_queue; /* RS queue */ struct ptlrpc_hr_partition *hrt_partition; }; struct ptlrpc_hr_partition { /* # of started threads */ - cfs_atomic_t hrp_nstarted; + atomic_t hrp_nstarted; /* # of stopped threads */ - cfs_atomic_t hrp_nstopped; + atomic_t hrp_nstopped; /* cpu partition id */ int hrp_cpt; /* round-robin rotor for choosing thread */ @@ -247,7 +243,7 @@ struct ptlrpc_hr_service { }; struct rs_batch { - cfs_list_t rsb_replies; + struct list_head rsb_replies; unsigned int rsb_n_replies; struct ptlrpc_service_part *rsb_svcpt; }; @@ -267,8 +263,8 @@ static struct ptlrpc_hr_service ptlrpc_hr; */ static void rs_batch_init(struct rs_batch *b) { - memset(b, 0, sizeof *b); - CFS_INIT_LIST_HEAD(&b->rsb_replies); + memset(b, 0, sizeof *b); + INIT_LIST_HEAD(&b->rsb_replies); } /** @@ -310,7 +306,7 @@ static void rs_batch_dispatch(struct rs_batch *b) hrt = ptlrpc_hr_select(b->rsb_svcpt); spin_lock(&hrt->hrt_lock); - cfs_list_splice_init(&b->rsb_replies, &hrt->hrt_queue); + list_splice_init(&b->rsb_replies, &hrt->hrt_queue); spin_unlock(&hrt->hrt_lock); wake_up(&hrt->hrt_waitq); @@ -340,7 +336,7 @@ static void rs_batch_add(struct rs_batch *b, struct ptlrpc_reply_state *rs) spin_lock(&rs->rs_lock); rs->rs_scheduled_ever = 1; if (rs->rs_scheduled == 0) { - cfs_list_move(&rs->rs_list, &b->rsb_replies); + list_move(&rs->rs_list, &b->rsb_replies); rs->rs_scheduled = 1; b->rsb_n_replies++; } @@ -365,14 +361,6 @@ static void rs_batch_fini(struct rs_batch *b) #define DECLARE_RS_BATCH(b) struct rs_batch b -#else /* __KERNEL__ */ - -#define rs_batch_init(b) do{}while(0) -#define rs_batch_fini(b) do{}while(0) -#define rs_batch_add(b, r) ptlrpc_schedule_difficult_reply(r) -#define DECLARE_RS_BATCH(b) - -#endif /* __KERNEL__ */ /** * Put reply state into a queue for processing because we received @@ -380,23 +368,19 @@ static void rs_batch_fini(struct rs_batch *b) */ void ptlrpc_dispatch_difficult_reply(struct ptlrpc_reply_state *rs) { -#ifdef __KERNEL__ struct ptlrpc_hr_thread *hrt; ENTRY; - LASSERT(cfs_list_empty(&rs->rs_list)); + LASSERT(list_empty(&rs->rs_list)); hrt = ptlrpc_hr_select(rs->rs_svcpt); spin_lock(&hrt->hrt_lock); - cfs_list_add_tail(&rs->rs_list, &hrt->hrt_queue); + list_add_tail(&rs->rs_list, &hrt->hrt_queue); spin_unlock(&hrt->hrt_lock); wake_up(&hrt->hrt_waitq); EXIT; -#else - cfs_list_add_tail(&rs->rs_list, &rs->rs_svcpt->scp_rep_queue); -#endif } void @@ -404,8 +388,8 @@ ptlrpc_schedule_difficult_reply(struct ptlrpc_reply_state *rs) { ENTRY; - LASSERT(spin_is_locked(&rs->rs_svcpt->scp_rep_lock)); - LASSERT(spin_is_locked(&rs->rs_lock)); + assert_spin_locked(&rs->rs_svcpt->scp_rep_lock); + assert_spin_locked(&rs->rs_lock); LASSERT (rs->rs_difficult); rs->rs_scheduled_ever = 1; /* flag any notification attempt */ @@ -415,7 +399,7 @@ ptlrpc_schedule_difficult_reply(struct ptlrpc_reply_state *rs) } rs->rs_scheduled = 1; - cfs_list_del_init(&rs->rs_list); + list_del_init(&rs->rs_list); ptlrpc_dispatch_difficult_reply(rs); EXIT; } @@ -433,13 +417,13 @@ void ptlrpc_commit_replies(struct obd_export *exp) /* CAVEAT EMPTOR: spinlock ordering!!! */ spin_lock(&exp->exp_uncommitted_replies_lock); - cfs_list_for_each_entry_safe(rs, nxt, &exp->exp_uncommitted_replies, + list_for_each_entry_safe(rs, nxt, &exp->exp_uncommitted_replies, rs_obd_list) { LASSERT (rs->rs_difficult); /* VBR: per-export last_committed */ LASSERT(rs->rs_export); if (rs->rs_transno <= exp->exp_last_committed) { - cfs_list_del_init(&rs->rs_obd_list); + list_del_init(&rs->rs_obd_list); rs_batch_add(&batch, rs); } } @@ -447,7 +431,6 @@ void ptlrpc_commit_replies(struct obd_export *exp) rs_batch_fini(&batch); EXIT; } -EXPORT_SYMBOL(ptlrpc_commit_replies); static int ptlrpc_server_post_idle_rqbds(struct ptlrpc_service_part *svcpt) @@ -459,19 +442,19 @@ ptlrpc_server_post_idle_rqbds(struct ptlrpc_service_part *svcpt) for (;;) { spin_lock(&svcpt->scp_lock); - if (cfs_list_empty(&svcpt->scp_rqbd_idle)) { + if (list_empty(&svcpt->scp_rqbd_idle)) { spin_unlock(&svcpt->scp_lock); return posted; } - rqbd = cfs_list_entry(svcpt->scp_rqbd_idle.next, + rqbd = list_entry(svcpt->scp_rqbd_idle.next, struct ptlrpc_request_buffer_desc, rqbd_list); - cfs_list_del(&rqbd->rqbd_list); + list_del(&rqbd->rqbd_list); /* assume we will post successfully */ svcpt->scp_nrqbds_posted++; - cfs_list_add(&rqbd->rqbd_list, &svcpt->scp_rqbd_posted); + list_add(&rqbd->rqbd_list, &svcpt->scp_rqbd_posted); spin_unlock(&svcpt->scp_lock); @@ -485,8 +468,8 @@ ptlrpc_server_post_idle_rqbds(struct ptlrpc_service_part *svcpt) spin_lock(&svcpt->scp_lock); svcpt->scp_nrqbds_posted--; - cfs_list_del(&rqbd->rqbd_list); - cfs_list_add_tail(&rqbd->rqbd_list, &svcpt->scp_rqbd_idle); + list_del(&rqbd->rqbd_list); + list_add_tail(&rqbd->rqbd_list, &svcpt->scp_rqbd_idle); /* Don't complain if no request buffers are posted right now; LNET * won't drop requests because we set the portal lazy! */ @@ -511,7 +494,6 @@ static void ptlrpc_server_nthreads_check(struct ptlrpc_service *svc, struct ptlrpc_service_conf *conf) { -#ifdef __KERNEL__ struct ptlrpc_service_thr_conf *tc = &conf->psc_thr; unsigned init; unsigned total; @@ -608,7 +590,6 @@ ptlrpc_server_nthreads_check(struct ptlrpc_service *svc, svc->srv_name, nthrs * svc->srv_ncpts, tc->tc_nthrs_max); } -#endif } /** @@ -624,30 +605,27 @@ ptlrpc_service_part_init(struct ptlrpc_service *svc, int rc; svcpt->scp_cpt = cpt; - CFS_INIT_LIST_HEAD(&svcpt->scp_threads); + INIT_LIST_HEAD(&svcpt->scp_threads); /* rqbd and incoming request queue */ spin_lock_init(&svcpt->scp_lock); - CFS_INIT_LIST_HEAD(&svcpt->scp_rqbd_idle); - CFS_INIT_LIST_HEAD(&svcpt->scp_rqbd_posted); - CFS_INIT_LIST_HEAD(&svcpt->scp_req_incoming); + INIT_LIST_HEAD(&svcpt->scp_rqbd_idle); + INIT_LIST_HEAD(&svcpt->scp_rqbd_posted); + INIT_LIST_HEAD(&svcpt->scp_req_incoming); init_waitqueue_head(&svcpt->scp_waitq); /* history request & rqbd list */ - CFS_INIT_LIST_HEAD(&svcpt->scp_hist_reqs); - CFS_INIT_LIST_HEAD(&svcpt->scp_hist_rqbds); + INIT_LIST_HEAD(&svcpt->scp_hist_reqs); + INIT_LIST_HEAD(&svcpt->scp_hist_rqbds); /* acitve requests and hp requests */ spin_lock_init(&svcpt->scp_req_lock); /* reply states */ spin_lock_init(&svcpt->scp_rep_lock); - CFS_INIT_LIST_HEAD(&svcpt->scp_rep_active); -#ifndef __KERNEL__ - CFS_INIT_LIST_HEAD(&svcpt->scp_rep_queue); -#endif - CFS_INIT_LIST_HEAD(&svcpt->scp_rep_idle); + INIT_LIST_HEAD(&svcpt->scp_rep_active); + INIT_LIST_HEAD(&svcpt->scp_rep_idle); init_waitqueue_head(&svcpt->scp_rep_waitq); - cfs_atomic_set(&svcpt->scp_nreps_difficult, 0); + atomic_set(&svcpt->scp_nreps_difficult, 0); /* adaptive timeout */ spin_lock_init(&svcpt->scp_at_lock); @@ -660,12 +638,12 @@ ptlrpc_service_part_init(struct ptlrpc_service *svc, /* allocate memory for scp_at_array (ptlrpc_at_array) */ OBD_CPT_ALLOC(array->paa_reqs_array, - svc->srv_cptable, cpt, sizeof(cfs_list_t) * size); + svc->srv_cptable, cpt, sizeof(struct list_head) * size); if (array->paa_reqs_array == NULL) return -ENOMEM; for (index = 0; index < size; index++) - CFS_INIT_LIST_HEAD(&array->paa_reqs_array[index]); + INIT_LIST_HEAD(&array->paa_reqs_array[index]); OBD_CPT_ALLOC(array->paa_reqs_count, svc->srv_cptable, cpt, sizeof(__u32) * size); @@ -696,7 +674,7 @@ ptlrpc_service_part_init(struct ptlrpc_service *svc, if (array->paa_reqs_array != NULL) { OBD_FREE(array->paa_reqs_array, - sizeof(cfs_list_t) * array->paa_size); + sizeof(struct list_head) * array->paa_size); array->paa_reqs_array = NULL; } @@ -710,7 +688,7 @@ ptlrpc_service_part_init(struct ptlrpc_service *svc, */ struct ptlrpc_service * ptlrpc_register_service(struct ptlrpc_service_conf *conf, - cfs_proc_dir_entry_t *proc_entry) + struct proc_dir_entry *proc_entry) { struct ptlrpc_service_cpt_conf *cconf = &conf->psc_cpt; struct ptlrpc_service *service; @@ -780,7 +758,7 @@ ptlrpc_register_service(struct ptlrpc_service_conf *conf, spin_lock_init(&service->srv_lock); service->srv_name = conf->psc_name; service->srv_watchdog_factor = conf->psc_watchdog_factor; - CFS_INIT_LIST_HEAD(&service->srv_list); /* for safty of cleanup */ + INIT_LIST_HEAD(&service->srv_list); /* for safty of cleanup */ /* buffer configuration */ service->srv_nbuf_per_group = test_req_buffer_pressure ? @@ -824,7 +802,7 @@ ptlrpc_register_service(struct ptlrpc_service_conf *conf, LASSERT(rc == 0); mutex_lock(&ptlrpc_all_services_mutex); - cfs_list_add (&service->srv_list, &ptlrpc_all_services); + list_add(&service->srv_list, &ptlrpc_all_services); mutex_unlock(&ptlrpc_all_services_mutex); if (proc_entry != NULL) @@ -837,14 +815,12 @@ ptlrpc_register_service(struct ptlrpc_service_conf *conf, CDEBUG(D_NET, "%s: Started, listening on portal %d\n", service->srv_name, service->srv_req_portal); -#ifdef __KERNEL__ rc = ptlrpc_start_threads(service); if (rc != 0) { CERROR("Failed to start threads for service %s: %d\n", service->srv_name, rc); GOTO(failed, rc); } -#endif RETURN(service); failed: @@ -859,16 +835,16 @@ EXPORT_SYMBOL(ptlrpc_register_service); */ static void ptlrpc_server_free_request(struct ptlrpc_request *req) { - LASSERT(cfs_atomic_read(&req->rq_refcount) == 0); - LASSERT(cfs_list_empty(&req->rq_timed_list)); + LASSERT(atomic_read(&req->rq_refcount) == 0); + LASSERT(list_empty(&req->rq_timed_list)); - /* DEBUG_REQ() assumes the reply state of a request with a valid - * ref will not be destroyed until that reference is dropped. */ - ptlrpc_req_drop_rs(req); + /* DEBUG_REQ() assumes the reply state of a request with a valid + * ref will not be destroyed until that reference is dropped. */ + ptlrpc_req_drop_rs(req); - sptlrpc_svc_ctx_decref(req); + sptlrpc_svc_ctx_decref(req); - if (req != &req->rq_rqbd->rqbd_req) { + if (req != &req->rq_rqbd->rqbd_req) { /* NB request buffers use an embedded * req if the incoming req unlinked the * MD; this isn't one of them! */ @@ -885,12 +861,17 @@ void ptlrpc_server_drop_request(struct ptlrpc_request *req) struct ptlrpc_request_buffer_desc *rqbd = req->rq_rqbd; struct ptlrpc_service_part *svcpt = rqbd->rqbd_svcpt; struct ptlrpc_service *svc = svcpt->scp_service; - int refcount; - cfs_list_t *tmp; - cfs_list_t *nxt; + int refcount; + struct list_head *tmp; + struct list_head *nxt; - if (!cfs_atomic_dec_and_test(&req->rq_refcount)) - return; + if (!atomic_dec_and_test(&req->rq_refcount)) + return; + + if (req->rq_session.lc_state == LCS_ENTERED) { + lu_context_exit(&req->rq_session); + lu_context_fini(&req->rq_session); + } if (req->rq_at_linked) { spin_lock(&svcpt->scp_at_lock); @@ -901,76 +882,74 @@ void ptlrpc_server_drop_request(struct ptlrpc_request *req) spin_unlock(&svcpt->scp_at_lock); } - LASSERT(cfs_list_empty(&req->rq_timed_list)); + LASSERT(list_empty(&req->rq_timed_list)); - /* finalize request */ - if (req->rq_export) { - class_export_put(req->rq_export); - req->rq_export = NULL; - } + /* finalize request */ + if (req->rq_export) { + class_export_put(req->rq_export); + req->rq_export = NULL; + } spin_lock(&svcpt->scp_lock); - cfs_list_add(&req->rq_list, &rqbd->rqbd_reqs); + list_add(&req->rq_list, &rqbd->rqbd_reqs); - refcount = --(rqbd->rqbd_refcount); - if (refcount == 0) { - /* request buffer is now idle: add to history */ - cfs_list_del(&rqbd->rqbd_list); + refcount = --(rqbd->rqbd_refcount); + if (refcount == 0) { + /* request buffer is now idle: add to history */ + list_del(&rqbd->rqbd_list); - cfs_list_add_tail(&rqbd->rqbd_list, &svcpt->scp_hist_rqbds); + list_add_tail(&rqbd->rqbd_list, &svcpt->scp_hist_rqbds); svcpt->scp_hist_nrqbds++; /* cull some history? * I expect only about 1 or 2 rqbds need to be recycled here */ while (svcpt->scp_hist_nrqbds > svc->srv_hist_nrqbds_cpt_max) { - rqbd = cfs_list_entry(svcpt->scp_hist_rqbds.next, - struct ptlrpc_request_buffer_desc, - rqbd_list); + rqbd = list_entry(svcpt->scp_hist_rqbds.next, + struct ptlrpc_request_buffer_desc, + rqbd_list); - cfs_list_del(&rqbd->rqbd_list); + list_del(&rqbd->rqbd_list); svcpt->scp_hist_nrqbds--; - /* remove rqbd's reqs from svc's req history while - * I've got the service lock */ - cfs_list_for_each(tmp, &rqbd->rqbd_reqs) { - req = cfs_list_entry(tmp, struct ptlrpc_request, - rq_list); - /* Track the highest culled req seq */ + /* remove rqbd's reqs from svc's req history while + * I've got the service lock */ + list_for_each(tmp, &rqbd->rqbd_reqs) { + req = list_entry(tmp, struct ptlrpc_request, + rq_list); + /* Track the highest culled req seq */ if (req->rq_history_seq > svcpt->scp_hist_seq_culled) { svcpt->scp_hist_seq_culled = req->rq_history_seq; } - cfs_list_del(&req->rq_history_list); + list_del(&req->rq_history_list); } spin_unlock(&svcpt->scp_lock); - cfs_list_for_each_safe(tmp, nxt, &rqbd->rqbd_reqs) { - req = cfs_list_entry(rqbd->rqbd_reqs.next, - struct ptlrpc_request, - rq_list); - cfs_list_del(&req->rq_list); - ptlrpc_server_free_request(req); - } + list_for_each_safe(tmp, nxt, &rqbd->rqbd_reqs) { + req = list_entry(rqbd->rqbd_reqs.next, + struct ptlrpc_request, + rq_list); + list_del(&req->rq_list); + ptlrpc_server_free_request(req); + } spin_lock(&svcpt->scp_lock); /* * now all reqs including the embedded req has been * disposed, schedule request buffer for re-use. */ - LASSERT(cfs_atomic_read(&rqbd->rqbd_req.rq_refcount) == - 0); - cfs_list_add_tail(&rqbd->rqbd_list, - &svcpt->scp_rqbd_idle); + LASSERT(atomic_read(&rqbd->rqbd_req.rq_refcount) == 0); + list_add_tail(&rqbd->rqbd_list, &svcpt->scp_rqbd_idle); } spin_unlock(&svcpt->scp_lock); } else if (req->rq_reply_state && req->rq_reply_state->rs_prealloc) { /* If we are low on memory, we are not interested in history */ - cfs_list_del(&req->rq_list); - cfs_list_del_init(&req->rq_history_list); + list_del(&req->rq_list); + list_del_init(&req->rq_history_list); /* Track the highest culled req seq */ if (req->rq_history_seq > svcpt->scp_hist_seq_culled) @@ -989,19 +968,21 @@ void ptlrpc_request_change_export(struct ptlrpc_request *req, struct obd_export *export) { if (req->rq_export != NULL) { - if (!cfs_list_empty(&req->rq_exp_list)) { - /* remove rq_exp_list from last export */ - spin_lock_bh(&req->rq_export->exp_rpc_lock); - cfs_list_del_init(&req->rq_exp_list); - spin_unlock_bh(&req->rq_export->exp_rpc_lock); + LASSERT(!list_empty(&req->rq_exp_list)); + /* remove rq_exp_list from last export */ + spin_lock_bh(&req->rq_export->exp_rpc_lock); + list_del_init(&req->rq_exp_list); + spin_unlock_bh(&req->rq_export->exp_rpc_lock); + /* export has one reference already, so it`s safe to + * add req to export queue here and get another + * reference for request later */ + spin_lock_bh(&export->exp_rpc_lock); + if (req->rq_ops != NULL) /* hp request */ + list_add(&req->rq_exp_list, &export->exp_hp_rpcs); + else + list_add(&req->rq_exp_list, &export->exp_reg_rpcs); + spin_unlock_bh(&export->exp_rpc_lock); - /* export has one reference already, so it`s safe to - * add req to export queue here and get another - * reference for request later */ - spin_lock_bh(&export->exp_rpc_lock); - cfs_list_add(&req->rq_exp_list, &export->exp_hp_rpcs); - spin_unlock_bh(&export->exp_rpc_lock); - } class_export_rpc_dec(req->rq_export); class_export_put(req->rq_export); } @@ -1022,16 +1003,11 @@ static void ptlrpc_server_finish_request(struct ptlrpc_service_part *svcpt, { ptlrpc_server_hpreq_fini(req); - if (req->rq_session.lc_thread != NULL) { - lu_context_exit(&req->rq_session); - lu_context_fini(&req->rq_session); - } - ptlrpc_server_drop_request(req); } /** - * to finish a active request: stop sending more early replies, and release + * to finish an active request: stop sending more early replies, and release * the request. should be called after we finished handling the request. */ static void ptlrpc_server_finish_active_request( @@ -1058,7 +1034,7 @@ static void ptlrpc_server_finish_active_request( * This function is only called when some export receives a message (i.e., * the network is up.) */ -static void ptlrpc_update_export_timer(struct obd_export *exp, long extra_delay) +void ptlrpc_update_export_timer(struct obd_export *exp, long extra_delay) { struct obd_export *oldest_exp; time_t oldest_time, new_time; @@ -1079,27 +1055,24 @@ static void ptlrpc_update_export_timer(struct obd_export *exp, long extra_delay) RETURN_EXIT; exp->exp_last_request_time = new_time; - CDEBUG(D_HA, "updating export %s at "CFS_TIME_T" exp %p\n", - exp->exp_client_uuid.uuid, - exp->exp_last_request_time, exp); - /* exports may get disconnected from the chain even though the - export has references, so we must keep the spin lock while - manipulating the lists */ + /* exports may get disconnected from the chain even though the + export has references, so we must keep the spin lock while + manipulating the lists */ spin_lock(&exp->exp_obd->obd_dev_lock); - if (cfs_list_empty(&exp->exp_obd_chain_timed)) { + if (list_empty(&exp->exp_obd_chain_timed)) { /* this one is not timed */ spin_unlock(&exp->exp_obd->obd_dev_lock); - RETURN_EXIT; - } + RETURN_EXIT; + } - cfs_list_move_tail(&exp->exp_obd_chain_timed, - &exp->exp_obd->obd_exports_timed); + list_move_tail(&exp->exp_obd_chain_timed, + &exp->exp_obd->obd_exports_timed); - oldest_exp = cfs_list_entry(exp->exp_obd->obd_exports_timed.next, - struct obd_export, exp_obd_chain_timed); - oldest_time = oldest_exp->exp_last_request_time; + oldest_exp = list_entry(exp->exp_obd->obd_exports_timed.next, + struct obd_export, exp_obd_chain_timed); + oldest_time = oldest_exp->exp_last_request_time; spin_unlock(&exp->exp_obd->obd_dev_lock); if (exp->exp_obd->obd_recovering) { @@ -1120,7 +1093,7 @@ static void ptlrpc_update_export_timer(struct obd_export *exp, long extra_delay) exp->exp_obd->obd_eviction_timer = cfs_time_current_sec() + 3 * PING_INTERVAL; CDEBUG(D_HA, "%s: Think about evicting %s from "CFS_TIME_T"\n", - exp->exp_obd->obd_name, + exp->exp_obd->obd_name, obd_export_nid2str(oldest_exp), oldest_time); } } else { @@ -1143,7 +1116,8 @@ static void ptlrpc_update_export_timer(struct obd_export *exp, long extra_delay) */ static int ptlrpc_check_req(struct ptlrpc_request *req) { - int rc = 0; + struct obd_device *obd = req->rq_export->exp_obd; + int rc = 0; if (unlikely(lustre_msg_get_conn_cnt(req->rq_reqmsg) < req->rq_export->exp_conn_cnt)) { @@ -1153,22 +1127,21 @@ static int ptlrpc_check_req(struct ptlrpc_request *req) req->rq_export->exp_conn_cnt); return -EEXIST; } - if (unlikely(req->rq_export->exp_obd && - req->rq_export->exp_obd->obd_fail)) { - /* Failing over, don't handle any more reqs, send - error response instead. */ - CDEBUG(D_RPCTRACE, "Dropping req %p for failed obd %s\n", - req, req->rq_export->exp_obd->obd_name); + if (unlikely(obd == NULL || obd->obd_fail)) { + /* Failing over, don't handle any more reqs, + * send error response instead. */ + CDEBUG(D_RPCTRACE, "Dropping req %p for failed obd %s\n", + req, (obd != NULL) ? obd->obd_name : "unknown"); rc = -ENODEV; } else if (lustre_msg_get_flags(req->rq_reqmsg) & (MSG_REPLAY | MSG_REQ_REPLAY_DONE) && - !(req->rq_export->exp_obd->obd_recovering)) { + !obd->obd_recovering) { DEBUG_REQ(D_ERROR, req, "Invalid replay without recovery"); class_fail_export(req->rq_export); rc = -ENODEV; } else if (lustre_msg_get_transno(req->rq_reqmsg) != 0 && - !(req->rq_export->exp_obd->obd_recovering)) { + !obd->obd_recovering) { DEBUG_REQ(D_ERROR, req, "Invalid req with transno " LPU64" without recovery", lustre_msg_get_transno(req->rq_reqmsg)); @@ -1223,17 +1196,17 @@ static int ptlrpc_at_add_timed(struct ptlrpc_request *req) return(-ENOSYS); spin_lock(&svcpt->scp_at_lock); - LASSERT(cfs_list_empty(&req->rq_timed_list)); + LASSERT(list_empty(&req->rq_timed_list)); index = (unsigned long)req->rq_deadline % array->paa_size; if (array->paa_reqs_count[index] > 0) { /* latest rpcs will have the latest deadlines in the list, * so search backward. */ - cfs_list_for_each_entry_reverse(rq, + list_for_each_entry_reverse(rq, &array->paa_reqs_array[index], rq_timed_list) { if (req->rq_deadline >= rq->rq_deadline) { - cfs_list_add(&req->rq_timed_list, + list_add(&req->rq_timed_list, &rq->rq_timed_list); break; } @@ -1241,8 +1214,8 @@ static int ptlrpc_at_add_timed(struct ptlrpc_request *req) } /* Add the request at the head of the list */ - if (cfs_list_empty(&req->rq_timed_list)) - cfs_list_add(&req->rq_timed_list, + if (list_empty(&req->rq_timed_list)) + list_add(&req->rq_timed_list, &array->paa_reqs_array[index]); spin_lock(&req->rq_lock); @@ -1268,8 +1241,8 @@ ptlrpc_at_remove_timed(struct ptlrpc_request *req) array = &req->rq_rqbd->rqbd_svcpt->scp_at_array; /* NB: must call with hold svcpt::scp_at_lock */ - LASSERT(!cfs_list_empty(&req->rq_timed_list)); - cfs_list_del_init(&req->rq_timed_list); + LASSERT(!list_empty(&req->rq_timed_list)); + list_del_init(&req->rq_timed_list); spin_lock(&req->rq_lock); req->rq_at_linked = 0; @@ -1279,15 +1252,25 @@ ptlrpc_at_remove_timed(struct ptlrpc_request *req) array->paa_count--; } +/* + * Attempt to extend the request deadline by sending an early reply to the + * client. + */ static int ptlrpc_at_send_early_reply(struct ptlrpc_request *req) { struct ptlrpc_service_part *svcpt = req->rq_rqbd->rqbd_svcpt; - struct ptlrpc_request *reqcopy; - struct lustre_msg *reqmsg; - cfs_duration_t olddl = req->rq_deadline - cfs_time_current_sec(); - time_t newdl; - int rc; - ENTRY; + struct ptlrpc_request *reqcopy; + struct lustre_msg *reqmsg; + cfs_duration_t olddl = req->rq_deadline - cfs_time_current_sec(); + time_t newdl; + int rc; + + ENTRY; + + if (CFS_FAIL_CHECK(OBD_FAIL_TGT_REPLAY_RECONNECT)) { + /* don't send early reply */ + RETURN(1); + } /* deadline is when the client expects us to reply, margin is the difference between clients' and servers' expectations */ @@ -1315,39 +1298,45 @@ static int ptlrpc_at_send_early_reply(struct ptlrpc_request *req) RETURN(-ENOSYS); } - if (req->rq_export && - lustre_msg_get_flags(req->rq_reqmsg) & - (MSG_REPLAY | MSG_REQ_REPLAY_DONE | MSG_LOCK_REPLAY_DONE)) { - /* During recovery, we don't want to send too many early - * replies, but on the other hand we want to make sure the - * client has enough time to resend if the rpc is lost. So - * during the recovery period send at least 4 early replies, - * spacing them every at_extra if we can. at_estimate should - * always equal this fixed value during recovery. */ - at_measured(&svcpt->scp_at_estimate, min(at_extra, - req->rq_export->exp_obd->obd_recovery_timeout / 4)); + if (req->rq_export && + lustre_msg_get_flags(req->rq_reqmsg) & + (MSG_REPLAY | MSG_REQ_REPLAY_DONE | MSG_LOCK_REPLAY_DONE)) { + /* During recovery, we don't want to send too many early + * replies, but on the other hand we want to make sure the + * client has enough time to resend if the rpc is lost. So + * during the recovery period send at least 4 early replies, + * spacing them every at_extra if we can. at_estimate should + * always equal this fixed value during recovery. */ + /* Don't account request processing time into AT history + * during recovery, it is not service time we need but + * includes also waiting time for recovering clients */ + newdl = cfs_time_current_sec() + min(at_extra, + req->rq_export->exp_obd->obd_recovery_timeout / 4); } else { - /* Fake our processing time into the future to ask the clients - * for some extra amount of time */ + /* We want to extend the request deadline by at_extra seconds, + * so we set our service estimate to reflect how much time has + * passed since this request arrived plus an additional + * at_extra seconds. The client will calculate the new deadline + * based on this service estimate (plus some additional time to + * account for network latency). See ptlrpc_at_recv_early_reply + */ at_measured(&svcpt->scp_at_estimate, at_extra + cfs_time_current_sec() - req->rq_arrival_time.tv_sec); + newdl = req->rq_arrival_time.tv_sec + + at_get(&svcpt->scp_at_estimate); + } - /* Check to see if we've actually increased the deadline - - * we may be past adaptive_max */ - if (req->rq_deadline >= req->rq_arrival_time.tv_sec + - at_get(&svcpt->scp_at_estimate)) { - DEBUG_REQ(D_WARNING, req, "Couldn't add any time " - "(%ld/%ld), not sending early reply\n", - olddl, req->rq_arrival_time.tv_sec + - at_get(&svcpt->scp_at_estimate) - - cfs_time_current_sec()); - RETURN(-ETIMEDOUT); - } + /* Check to see if we've actually increased the deadline - + * we may be past adaptive_max */ + if (req->rq_deadline >= newdl) { + DEBUG_REQ(D_WARNING, req, "Couldn't add any time " + "(%ld/%ld), not sending early reply\n", + olddl, newdl - cfs_time_current_sec()); + RETURN(-ETIMEDOUT); } - newdl = cfs_time_current_sec() + at_get(&svcpt->scp_at_estimate); - reqcopy = ptlrpc_request_cache_alloc(__GFP_IO); + reqcopy = ptlrpc_request_cache_alloc(GFP_NOFS); if (reqcopy == NULL) RETURN(-ENOMEM); OBD_ALLOC_LARGE(reqmsg, req->rq_reqlen); @@ -1365,13 +1354,21 @@ static int ptlrpc_at_send_early_reply(struct ptlrpc_request *req) reqcopy->rq_reqmsg = reqmsg; memcpy(reqmsg, req->rq_reqmsg, req->rq_reqlen); - LASSERT(cfs_atomic_read(&req->rq_refcount)); - /** if it is last refcount then early reply isn't needed */ - if (cfs_atomic_read(&req->rq_refcount) == 1) { - DEBUG_REQ(D_ADAPTTO, reqcopy, "Normal reply already sent out, " - "abort sending early reply\n"); - GOTO(out, rc = -EINVAL); - } + /* + * tgt_brw_read() and tgt_brw_write() may have decided not to reply. + * Without this check, we would fail the rq_no_reply assertion in + * ptlrpc_send_reply(). + */ + if (reqcopy->rq_no_reply) + GOTO(out, rc = -ETIMEDOUT); + + LASSERT(atomic_read(&req->rq_refcount)); + /** if it is last refcount then early reply isn't needed */ + if (atomic_read(&req->rq_refcount) == 1) { + DEBUG_REQ(D_ADAPTTO, reqcopy, "Normal reply already sent out, " + "abort sending early reply\n"); + GOTO(out, rc = -EINVAL); + } /* Connection ref */ reqcopy->rq_export = class_conn2export( @@ -1391,13 +1388,13 @@ static int ptlrpc_at_send_early_reply(struct ptlrpc_request *req) rc = ptlrpc_send_reply(reqcopy, PTLRPC_REPLY_EARLY); - if (!rc) { - /* Adjust our own deadline to what we told the client */ - req->rq_deadline = newdl; - req->rq_early_count++; /* number sent, server side */ - } else { - DEBUG_REQ(D_ERROR, req, "Early reply send failed %d", rc); - } + if (!rc) { + /* Adjust our own deadline to what we told the client */ + req->rq_deadline = newdl; + req->rq_early_count++; /* number sent, server side */ + } else { + DEBUG_REQ(D_ERROR, req, "Early reply send failed %d", rc); + } /* Free the (early) reply state from lustre_pack_reply. (ptlrpc_send_reply takes it's own rs ref, so this is safe here) */ @@ -1420,7 +1417,7 @@ static int ptlrpc_at_check_timed(struct ptlrpc_service_part *svcpt) { struct ptlrpc_at_array *array = &svcpt->scp_at_array; struct ptlrpc_request *rq, *n; - cfs_list_t work_list; + struct list_head work_list; __u32 index, count; time_t deadline; time_t now = cfs_time_current_sec(); @@ -1450,17 +1447,17 @@ static int ptlrpc_at_check_timed(struct ptlrpc_service_part *svcpt) RETURN(0); } - /* We're close to a timeout, and we don't know how much longer the - server will take. Send early replies to everyone expiring soon. */ - CFS_INIT_LIST_HEAD(&work_list); - deadline = -1; - index = (unsigned long)array->paa_deadline % array->paa_size; - count = array->paa_count; - while (count > 0) { - count -= array->paa_reqs_count[index]; - cfs_list_for_each_entry_safe(rq, n, - &array->paa_reqs_array[index], - rq_timed_list) { + /* We're close to a timeout, and we don't know how much longer the + server will take. Send early replies to everyone expiring soon. */ + INIT_LIST_HEAD(&work_list); + deadline = -1; + index = (unsigned long)array->paa_deadline % array->paa_size; + count = array->paa_count; + while (count > 0) { + count -= array->paa_reqs_count[index]; + list_for_each_entry_safe(rq, n, + &array->paa_reqs_array[index], + rq_timed_list) { if (rq->rq_deadline > now + at_early_margin) { /* update the earliest deadline */ if (deadline == -1 || @@ -1475,15 +1472,15 @@ static int ptlrpc_at_check_timed(struct ptlrpc_service_part *svcpt) * refcount to 0 already. Let's check this and * don't add entry to work_list */ - if (likely(cfs_atomic_inc_not_zero(&rq->rq_refcount))) - cfs_list_add(&rq->rq_timed_list, &work_list); + if (likely(atomic_inc_not_zero(&rq->rq_refcount))) + list_add(&rq->rq_timed_list, &work_list); counter++; - } + } - if (++index >= array->paa_size) - index = 0; - } - array->paa_deadline = deadline; + if (++index >= array->paa_size) + index = 0; + } + array->paa_deadline = deadline; /* we have a new earliest deadline, restart the timer */ ptlrpc_at_set_timer(svcpt); @@ -1506,10 +1503,10 @@ static int ptlrpc_at_check_timed(struct ptlrpc_service_part *svcpt) /* we took additional refcount so entries can't be deleted from list, no * locking is needed */ - while (!cfs_list_empty(&work_list)) { - rq = cfs_list_entry(work_list.next, struct ptlrpc_request, + while (!list_empty(&work_list)) { + rq = list_entry(work_list.next, struct ptlrpc_request, rq_timed_list); - cfs_list_del_init(&rq->rq_timed_list); + list_del_init(&rq->rq_timed_list); if (ptlrpc_at_send_early_reply(rq) == 0) ptlrpc_at_add_timed(rq); @@ -1527,7 +1524,7 @@ static int ptlrpc_server_check_resend_in_progress(struct ptlrpc_request *req) struct ptlrpc_request *tmp = NULL; if (!(lustre_msg_get_flags(req->rq_reqmsg) & MSG_RESENT) || - (cfs_atomic_read(&req->rq_export->exp_rpc_count) == 0)) + (atomic_read(&req->rq_export->exp_rpc_count) == 0)) return 0; /* bulk request are aborted upon reconnect, don't try to @@ -1539,13 +1536,13 @@ static int ptlrpc_server_check_resend_in_progress(struct ptlrpc_request *req) * flights on the client, so it is not all that long. * Also we only hit this codepath in case of a resent * request which makes it even more rarely hit */ - cfs_list_for_each_entry(tmp, &req->rq_export->exp_reg_rpcs, + list_for_each_entry(tmp, &req->rq_export->exp_reg_rpcs, rq_exp_list) { /* Found duplicate one */ if (tmp->rq_xid == req->rq_xid) goto found; } - cfs_list_for_each_entry(tmp, &req->rq_export->exp_hp_rpcs, + list_for_each_entry(tmp, &req->rq_export->exp_hp_rpcs, rq_exp_list) { /* Found duplicate one */ if (tmp->rq_xid == req->rq_xid) @@ -1554,8 +1551,8 @@ static int ptlrpc_server_check_resend_in_progress(struct ptlrpc_request *req) return 0; found: - DEBUG_REQ(D_HA, req, "Found duplicate req in processing\n"); - DEBUG_REQ(D_HA, tmp, "Request being processed\n"); + DEBUG_REQ(D_HA, req, "Found duplicate req in processing"); + DEBUG_REQ(D_HA, tmp, "Request being processed"); return -EBUSY; } @@ -1566,7 +1563,7 @@ found: static int ptlrpc_server_hpreq_init(struct ptlrpc_service_part *svcpt, struct ptlrpc_request *req) { - cfs_list_t *list; + struct list_head *list; int rc, hp = 0; ENTRY; @@ -1614,7 +1611,7 @@ static int ptlrpc_server_hpreq_init(struct ptlrpc_service_part *svcpt, spin_unlock_bh(&req->rq_export->exp_rpc_lock); RETURN(rc); } - cfs_list_add(&req->rq_exp_list, list); + list_add(&req->rq_exp_list, list); spin_unlock_bh(&req->rq_export->exp_rpc_lock); } @@ -1634,7 +1631,7 @@ static void ptlrpc_server_hpreq_fini(struct ptlrpc_request *req) req->rq_ops->hpreq_fini(req); spin_lock_bh(&req->rq_export->exp_rpc_lock); - cfs_list_del_init(&req->rq_exp_list); + list_del_init(&req->rq_exp_list); spin_unlock_bh(&req->rq_export->exp_rpc_lock); } EXIT; @@ -1674,6 +1671,13 @@ static int ptlrpc_server_request_add(struct ptlrpc_service_part *svcpt, if (rc < 0) RETURN(rc); + /* the current thread is not the processing thread for this request + * since that, but request is in exp_hp_list and can be find there. + * Remove all relations between request and old thread. */ + req->rq_svc_thread->t_env->le_ses = NULL; + req->rq_svc_thread = NULL; + req->rq_session.lc_thread = NULL; + ptlrpc_nrs_req_add(svcpt, req, !!rc); RETURN(0); @@ -1695,6 +1699,9 @@ static bool ptlrpc_server_allow_high(struct ptlrpc_service_part *svcpt, if (force) return true; + if (ptlrpc_nrs_req_throttling_nolock(svcpt, true)) + return false; + if (unlikely(svcpt->scp_service->srv_req_portal == MDS_REQUEST_PORTAL && CFS_FAIL_PRECHECK(OBD_FAIL_PTLRPC_CANCEL_RESEND))) { /* leave just 1 thread for normal RPCs */ @@ -1733,10 +1740,6 @@ static bool ptlrpc_server_allow_normal(struct ptlrpc_service_part *svcpt, bool force) { int running = svcpt->scp_nthrs_running; -#ifndef __KERNEL__ - if (1) /* always allow to handle normal request for liblustre */ - return true; -#endif if (unlikely(svcpt->scp_service->srv_req_portal == MDS_REQUEST_PORTAL && CFS_FAIL_PRECHECK(OBD_FAIL_PTLRPC_CANCEL_RESEND))) { /* leave just 1 thread for normal RPCs */ @@ -1745,8 +1748,13 @@ static bool ptlrpc_server_allow_normal(struct ptlrpc_service_part *svcpt, running += 1; } - if (force || - svcpt->scp_nreqs_active < running - 2) + if (force) + return true; + + if (ptlrpc_nrs_req_throttling_nolock(svcpt, false)) + return false; + + if (svcpt->scp_nreqs_active < running - 2) return true; if (svcpt->scp_nreqs_active >= running - 1) @@ -1789,13 +1797,6 @@ ptlrpc_server_request_get(struct ptlrpc_service_part *svcpt, bool force) ENTRY; spin_lock(&svcpt->scp_req_lock); -#ifndef __KERNEL__ - /* !@%$# liblustre only has 1 thread */ - if (cfs_atomic_read(&svcpt->scp_nreps_difficult) != 0) { - spin_unlock(&svcpt->scp_req_lock); - RETURN(NULL); - } -#endif if (ptlrpc_server_high_pending(svcpt, force)) { req = ptlrpc_nrs_req_get_nolock(svcpt, true, force); @@ -1846,14 +1847,14 @@ ptlrpc_server_handle_req_in(struct ptlrpc_service_part *svcpt, ENTRY; spin_lock(&svcpt->scp_lock); - if (cfs_list_empty(&svcpt->scp_req_incoming)) { + if (list_empty(&svcpt->scp_req_incoming)) { spin_unlock(&svcpt->scp_lock); RETURN(0); } - req = cfs_list_entry(svcpt->scp_req_incoming.next, + req = list_entry(svcpt->scp_req_incoming.next, struct ptlrpc_request, rq_list); - cfs_list_del_init(&req->rq_list); + list_del_init(&req->rq_list); svcpt->scp_nreqs_incoming--; /* Consider this still a "queued" request as far as stats are * concerned */ @@ -1951,12 +1952,17 @@ ptlrpc_server_handle_req_in(struct ptlrpc_service_part *svcpt, MSGHDR_AT_SUPPORT) ? /* The max time the client expects us to take */ lustre_msg_get_timeout(req->rq_reqmsg) : obd_timeout; + req->rq_deadline = req->rq_arrival_time.tv_sec + deadline; if (unlikely(deadline == 0)) { DEBUG_REQ(D_ERROR, req, "Dropping request with 0 timeout"); goto err_req; } + /* Skip early reply */ + if (OBD_FAIL_PRECHECK(OBD_FAIL_MDS_RESEND)) + req->rq_deadline += obd_timeout; + req->rq_svc_thread = thread; if (thread != NULL) { /* initialize request session, it is needed for request @@ -1970,7 +1976,7 @@ ptlrpc_server_handle_req_in(struct ptlrpc_service_part *svcpt, } req->rq_session.lc_thread = thread; lu_context_enter(&req->rq_session); - req->rq_svc_thread->t_env->le_ses = &req->rq_session; + thread->t_env->le_ses = &req->rq_session; } ptlrpc_at_add_timed(req); @@ -2062,7 +2068,7 @@ ptlrpc_server_handle_request(struct ptlrpc_service_part *svcpt, (request->rq_export ? (char *)request->rq_export->exp_client_uuid.uuid : "0"), (request->rq_export ? - cfs_atomic_read(&request->rq_export->exp_refcount) : -99), + atomic_read(&request->rq_export->exp_refcount) : -99), lustre_msg_get_status(request->rq_reqmsg), request->rq_xid, libcfs_id2str(request->rq_peer), lustre_msg_get_opc(request->rq_reqmsg)); @@ -2075,9 +2081,8 @@ ptlrpc_server_handle_request(struct ptlrpc_service_part *svcpt, /* re-assign request and sesson thread to the current one */ request->rq_svc_thread = thread; if (thread != NULL) { - LASSERT(request->rq_session.lc_thread != NULL); + LASSERT(request->rq_session.lc_thread == NULL); request->rq_session.lc_thread = thread; - request->rq_session.lc_cookie = 0x55; thread->t_env->le_ses = &request->rq_session; } svc->srv_ops.so_req_handler(request); @@ -2104,7 +2109,7 @@ put_conn: (request->rq_export ? (char *)request->rq_export->exp_client_uuid.uuid : "0"), (request->rq_export ? - cfs_atomic_read(&request->rq_export->exp_refcount) : -99), + atomic_read(&request->rq_export->exp_refcount) : -99), lustre_msg_get_status(request->rq_reqmsg), request->rq_xid, libcfs_id2str(request->rq_peer), @@ -2154,15 +2159,15 @@ ptlrpc_handle_rs(struct ptlrpc_reply_state *rs) int been_handled; ENTRY; - exp = rs->rs_export; + exp = rs->rs_export; - LASSERT (rs->rs_difficult); - LASSERT (rs->rs_scheduled); - LASSERT (cfs_list_empty(&rs->rs_list)); + LASSERT(rs->rs_difficult); + LASSERT(rs->rs_scheduled); + LASSERT(list_empty(&rs->rs_list)); spin_lock(&exp->exp_lock); /* Noop if removed already */ - cfs_list_del_init (&rs->rs_exp_list); + list_del_init(&rs->rs_exp_list); spin_unlock(&exp->exp_lock); /* The disk commit callback holds exp_uncommitted_replies_lock while it @@ -2189,7 +2194,7 @@ ptlrpc_handle_rs(struct ptlrpc_reply_state *rs) */ if (!rs->rs_committed) { spin_lock(&exp->exp_uncommitted_replies_lock); - cfs_list_del_init(&rs->rs_obd_list); + list_del_init(&rs->rs_obd_list); spin_unlock(&exp->exp_uncommitted_replies_lock); } @@ -2232,10 +2237,10 @@ ptlrpc_handle_rs(struct ptlrpc_reply_state *rs) /* Off the net */ spin_unlock(&rs->rs_lock); - class_export_put (exp); - rs->rs_export = NULL; - ptlrpc_rs_decref (rs); - if (cfs_atomic_dec_and_test(&svcpt->scp_nreps_difficult) && + class_export_put (exp); + rs->rs_export = NULL; + ptlrpc_rs_decref(rs); + if (atomic_dec_and_test(&svcpt->scp_nreps_difficult) && svc->srv_is_stopping) wake_up_all(&svcpt->scp_waitq); RETURN(1); @@ -2246,81 +2251,6 @@ ptlrpc_handle_rs(struct ptlrpc_reply_state *rs) RETURN(1); } -#ifndef __KERNEL__ - -/** - * Check whether given service has a reply available for processing - * and process it. - * - * \param svc a ptlrpc service - * \retval 0 no replies processed - * \retval 1 one reply processed - */ -static int -ptlrpc_server_handle_reply(struct ptlrpc_service_part *svcpt) -{ - struct ptlrpc_reply_state *rs = NULL; - ENTRY; - - spin_lock(&svcpt->scp_rep_lock); - if (!cfs_list_empty(&svcpt->scp_rep_queue)) { - rs = cfs_list_entry(svcpt->scp_rep_queue.prev, - struct ptlrpc_reply_state, - rs_list); - cfs_list_del_init(&rs->rs_list); - } - spin_unlock(&svcpt->scp_rep_lock); - if (rs != NULL) - ptlrpc_handle_rs(rs); - RETURN(rs != NULL); -} - -/* FIXME make use of timeout later */ -int -liblustre_check_services (void *arg) -{ - int did_something = 0; - int rc; - cfs_list_t *tmp, *nxt; - ENTRY; - - /* I'm relying on being single threaded, not to have to lock - * ptlrpc_all_services etc */ - cfs_list_for_each_safe (tmp, nxt, &ptlrpc_all_services) { - struct ptlrpc_service *svc = - cfs_list_entry (tmp, struct ptlrpc_service, srv_list); - struct ptlrpc_service_part *svcpt; - - LASSERT(svc->srv_ncpts == 1); - svcpt = svc->srv_parts[0]; - - if (svcpt->scp_nthrs_running != 0) /* I've recursed */ - continue; - - /* service threads can block for bulk, so this limits us - * (arbitrarily) to recursing 1 stack frame per service. - * Note that the problem with recursion is that we have to - * unwind completely before our caller can resume. */ - - svcpt->scp_nthrs_running++; - - do { - rc = ptlrpc_server_handle_req_in(svcpt, NULL); - rc |= ptlrpc_server_handle_reply(svcpt); - rc |= ptlrpc_at_check_timed(svcpt); - rc |= ptlrpc_server_handle_request(svcpt, NULL); - rc |= (ptlrpc_server_post_idle_rqbds(svcpt) > 0); - did_something |= rc; - } while (rc); - - svcpt->scp_nthrs_running--; - } - - RETURN(did_something); -} -#define ptlrpc_stop_all_threads(s) do {} while (0) - -#else /* __KERNEL__ */ static void ptlrpc_check_rqbd_pool(struct ptlrpc_service_part *svcpt) @@ -2395,7 +2325,7 @@ ptlrpc_thread_stopping(struct ptlrpc_thread *thread) static inline int ptlrpc_rqbd_pending(struct ptlrpc_service_part *svcpt) { - return !cfs_list_empty(&svcpt->scp_rqbd_idle) && + return !list_empty(&svcpt->scp_rqbd_idle) && svcpt->scp_rqbd_timeout == 0; } @@ -2413,7 +2343,7 @@ ptlrpc_at_check(struct ptlrpc_service_part *svcpt) static inline int ptlrpc_server_request_incoming(struct ptlrpc_service_part *svcpt) { - return !cfs_list_empty(&svcpt->scp_req_incoming); + return !list_empty(&svcpt->scp_req_incoming); } static __attribute__((__noinline__)) int @@ -2455,9 +2385,7 @@ static int ptlrpc_main(void *arg) struct ptlrpc_service_part *svcpt = thread->t_svcpt; struct ptlrpc_service *svc = svcpt->scp_service; struct ptlrpc_reply_state *rs; -#ifdef WITH_GROUP_INFO struct group_info *ginfo = NULL; -#endif struct lu_env *env; int counter = 0, rc = 0; ENTRY; @@ -2474,7 +2402,6 @@ static int ptlrpc_main(void *arg) svc->srv_name, thread->t_name, svcpt->scp_cpt); } -#ifdef WITH_GROUP_INFO ginfo = groups_alloc(0); if (!ginfo) { rc = -ENOMEM; @@ -2483,7 +2410,6 @@ static int ptlrpc_main(void *arg) set_current_groups(ginfo); put_group_info(ginfo); -#endif if (svc->srv_ops.so_thr_init != NULL) { rc = svc->srv_ops.so_thr_init(thread); @@ -2506,7 +2432,7 @@ static int ptlrpc_main(void *arg) env->le_ctx.lc_thread = thread; env->le_ctx.lc_cookie = 0x6; - while (!cfs_list_empty(&svcpt->scp_rqbd_idle)) { + while (!list_empty(&svcpt->scp_rqbd_idle)) { rc = ptlrpc_server_post_idle_rqbds(svcpt); if (rc >= 0) continue; @@ -2546,7 +2472,7 @@ static int ptlrpc_main(void *arg) NULL, NULL); spin_lock(&svcpt->scp_rep_lock); - cfs_list_add(&rs->rs_list, &svcpt->scp_rep_idle); + list_add(&rs->rs_list, &svcpt->scp_rep_idle); wake_up(&svcpt->scp_rep_waitq); spin_unlock(&svcpt->scp_rep_lock); @@ -2565,10 +2491,11 @@ static int ptlrpc_main(void *arg) ptlrpc_start_thread(svcpt, 0); } + /* reset le_ses to initial state */ + env->le_ses = NULL; /* Process all incoming reqs before handling any */ if (ptlrpc_server_request_incoming(svcpt)) { lu_context_enter(&env->le_ctx); - env->le_ses = NULL; ptlrpc_server_handle_req_in(svcpt, thread); lu_context_exit(&env->le_ctx); @@ -2635,14 +2562,14 @@ out: } static int hrt_dont_sleep(struct ptlrpc_hr_thread *hrt, - cfs_list_t *replies) + struct list_head *replies) { int result; spin_lock(&hrt->hrt_lock); - cfs_list_splice_init(&hrt->hrt_queue, replies); - result = ptlrpc_hr.hr_stopping || !cfs_list_empty(replies); + list_splice_init(&hrt->hrt_queue, replies); + result = ptlrpc_hr.hr_stopping || !list_empty(replies); spin_unlock(&hrt->hrt_lock); return result; @@ -2656,10 +2583,11 @@ static int ptlrpc_hr_main(void *arg) { struct ptlrpc_hr_thread *hrt = (struct ptlrpc_hr_thread *)arg; struct ptlrpc_hr_partition *hrp = hrt->hrt_partition; - CFS_LIST_HEAD (replies); + struct list_head replies; char threadname[20]; int rc; + INIT_LIST_HEAD(&replies); snprintf(threadname, sizeof(threadname), "ptlrpc_hr%02d_%03d", hrp->hrp_cpt, hrt->hrt_id); unshare_fs_struct(); @@ -2670,24 +2598,24 @@ static int ptlrpc_hr_main(void *arg) threadname, hrp->hrp_cpt, ptlrpc_hr.hr_cpt_table, rc); } - cfs_atomic_inc(&hrp->hrp_nstarted); + atomic_inc(&hrp->hrp_nstarted); wake_up(&ptlrpc_hr.hr_waitq); while (!ptlrpc_hr.hr_stopping) { l_wait_condition(hrt->hrt_waitq, hrt_dont_sleep(hrt, &replies)); - while (!cfs_list_empty(&replies)) { - struct ptlrpc_reply_state *rs; + while (!list_empty(&replies)) { + struct ptlrpc_reply_state *rs; - rs = cfs_list_entry(replies.prev, - struct ptlrpc_reply_state, - rs_list); - cfs_list_del_init(&rs->rs_list); - ptlrpc_handle_rs(rs); - } - } + rs = list_entry(replies.prev, + struct ptlrpc_reply_state, + rs_list); + list_del_init(&rs->rs_list); + ptlrpc_handle_rs(rs); + } + } - cfs_atomic_inc(&hrp->hrp_nstopped); + atomic_inc(&hrp->hrp_nstopped); wake_up(&ptlrpc_hr.hr_waitq); return 0; @@ -2712,8 +2640,8 @@ static void ptlrpc_stop_hr_threads(void) if (hrp->hrp_thrs == NULL) continue; /* uninitialized */ wait_event(ptlrpc_hr.hr_waitq, - cfs_atomic_read(&hrp->hrp_nstopped) == - cfs_atomic_read(&hrp->hrp_nstarted)); + atomic_read(&hrp->hrp_nstopped) == + atomic_read(&hrp->hrp_nstarted)); } } @@ -2728,25 +2656,31 @@ static int ptlrpc_start_hr_threads(void) int rc = 0; for (j = 0; j < hrp->hrp_nthrs; j++) { - struct ptlrpc_hr_thread *hrt = &hrp->hrp_thrs[j]; - rc = PTR_ERR(kthread_run(ptlrpc_hr_main, - &hrp->hrp_thrs[j], - "ptlrpc_hr%02d_%03d", - hrp->hrp_cpt, - hrt->hrt_id)); - if (IS_ERR_VALUE(rc)) + struct ptlrpc_hr_thread *hrt = &hrp->hrp_thrs[j]; + struct task_struct *task; + + task = kthread_run(ptlrpc_hr_main, + &hrp->hrp_thrs[j], + "ptlrpc_hr%02d_%03d", + hrp->hrp_cpt, + hrt->hrt_id); + if (IS_ERR(task)) { + rc = PTR_ERR(task); break; + } } + wait_event(ptlrpc_hr.hr_waitq, - cfs_atomic_read(&hrp->hrp_nstarted) == j); - if (!IS_ERR_VALUE(rc)) - continue; + atomic_read(&hrp->hrp_nstarted) == j); - CERROR("Reply handling thread %d:%d Failed on starting: " - "rc = %d\n", i, j, rc); - ptlrpc_stop_hr_threads(); - RETURN(rc); + if (rc < 0) { + CERROR("cannot start reply handler thread %d:%d: " + "rc = %d\n", i, j, rc); + ptlrpc_stop_hr_threads(); + RETURN(rc); + } } + RETURN(0); } @@ -2754,13 +2688,14 @@ static void ptlrpc_svcpt_stop_threads(struct ptlrpc_service_part *svcpt) { struct l_wait_info lwi = { 0 }; struct ptlrpc_thread *thread; - CFS_LIST_HEAD (zombie); + struct list_head zombie; ENTRY; CDEBUG(D_INFO, "Stopping threads for service %s\n", svcpt->scp_service->srv_name); + INIT_LIST_HEAD(&zombie); spin_lock(&svcpt->scp_lock); /* let the thread know that we would like it to stop asap */ list_for_each_entry(thread, &svcpt->scp_threads, t_link) { @@ -2771,12 +2706,12 @@ static void ptlrpc_svcpt_stop_threads(struct ptlrpc_service_part *svcpt) wake_up_all(&svcpt->scp_waitq); - while (!cfs_list_empty(&svcpt->scp_threads)) { - thread = cfs_list_entry(svcpt->scp_threads.next, + while (!list_empty(&svcpt->scp_threads)) { + thread = list_entry(svcpt->scp_threads.next, struct ptlrpc_thread, t_link); if (thread_is_stopped(thread)) { - cfs_list_del(&thread->t_link); - cfs_list_add(&thread->t_link, &zombie); + list_del(&thread->t_link); + list_add(&thread->t_link, &zombie); continue; } spin_unlock(&svcpt->scp_lock); @@ -2791,10 +2726,10 @@ static void ptlrpc_svcpt_stop_threads(struct ptlrpc_service_part *svcpt) spin_unlock(&svcpt->scp_lock); - while (!cfs_list_empty(&zombie)) { - thread = cfs_list_entry(zombie.next, + while (!list_empty(&zombie)) { + thread = list_entry(zombie.next, struct ptlrpc_thread, t_link); - cfs_list_del(&thread->t_link); + list_del(&thread->t_link); OBD_FREE_PTR(thread); } EXIT; @@ -2816,7 +2751,6 @@ void ptlrpc_stop_all_threads(struct ptlrpc_service *svc) EXIT; } -EXPORT_SYMBOL(ptlrpc_stop_all_threads); int ptlrpc_start_threads(struct ptlrpc_service *svc) { @@ -2848,13 +2782,13 @@ int ptlrpc_start_threads(struct ptlrpc_service *svc) ptlrpc_stop_all_threads(svc); RETURN(rc); } -EXPORT_SYMBOL(ptlrpc_start_threads); int ptlrpc_start_thread(struct ptlrpc_service_part *svcpt, int wait) { struct l_wait_info lwi = { 0 }; struct ptlrpc_thread *thread; struct ptlrpc_service *svc; + struct task_struct *task; int rc; ENTRY; @@ -2910,7 +2844,7 @@ int ptlrpc_start_thread(struct ptlrpc_service_part *svcpt, int wait) thread_add_flags(thread, SVC_STARTING); thread->t_svcpt = svcpt; - cfs_list_add(&thread->t_link, &svcpt->scp_threads); + list_add(&thread->t_link, &svcpt->scp_threads); spin_unlock(&svcpt->scp_lock); if (svcpt->scp_cpt >= 0) { @@ -2922,9 +2856,10 @@ int ptlrpc_start_thread(struct ptlrpc_service_part *svcpt, int wait) } CDEBUG(D_RPCTRACE, "starting thread '%s'\n", thread->t_name); - rc = PTR_ERR(kthread_run(ptlrpc_main, thread, thread->t_name)); - if (IS_ERR_VALUE(rc)) { - CERROR("cannot start thread '%s': rc %d\n", + task = kthread_run(ptlrpc_main, thread, "%s", thread->t_name); + if (IS_ERR(task)) { + rc = PTR_ERR(task); + CERROR("cannot start thread '%s': rc = %d\n", thread->t_name, rc); spin_lock(&svcpt->scp_lock); --svcpt->scp_nthrs_starting; @@ -2936,7 +2871,7 @@ int ptlrpc_start_thread(struct ptlrpc_service_part *svcpt, int wait) wake_up(&thread->t_ctl_waitq); spin_unlock(&svcpt->scp_lock); } else { - cfs_list_del(&thread->t_link); + list_del(&thread->t_link); spin_unlock(&svcpt->scp_lock); OBD_FREE_PTR(thread); } @@ -2961,6 +2896,7 @@ int ptlrpc_hr_init(void) int rc; int i; int j; + int weight; ENTRY; memset(&ptlrpc_hr, 0, sizeof(ptlrpc_hr)); @@ -2973,14 +2909,16 @@ int ptlrpc_hr_init(void) init_waitqueue_head(&ptlrpc_hr.hr_waitq); + weight = cfs_cpu_ht_nsiblings(0); + cfs_percpt_for_each(hrp, i, ptlrpc_hr.hr_partitions) { hrp->hrp_cpt = i; - cfs_atomic_set(&hrp->hrp_nstarted, 0); - cfs_atomic_set(&hrp->hrp_nstopped, 0); + atomic_set(&hrp->hrp_nstarted, 0); + atomic_set(&hrp->hrp_nstopped, 0); hrp->hrp_nthrs = cfs_cpt_weight(ptlrpc_hr.hr_cpt_table, i); - hrp->hrp_nthrs /= cfs_cpu_ht_nsiblings(0); + hrp->hrp_nthrs /= weight; LASSERT(hrp->hrp_nthrs > 0); OBD_CPT_ALLOC(hrp->hrp_thrs, ptlrpc_hr.hr_cpt_table, i, @@ -2995,7 +2933,7 @@ int ptlrpc_hr_init(void) hrt->hrt_partition = hrp; init_waitqueue_head(&hrt->hrt_waitq); spin_lock_init(&hrt->hrt_lock); - CFS_INIT_LIST_HEAD(&hrt->hrt_queue); + INIT_LIST_HEAD(&hrt->hrt_queue); } } @@ -3027,7 +2965,6 @@ void ptlrpc_hr_fini(void) ptlrpc_hr.hr_partitions = NULL; } -#endif /* __KERNEL__ */ /** * Wait until all already scheduled replies are processed. @@ -3040,7 +2977,7 @@ static void ptlrpc_wait_replies(struct ptlrpc_service_part *svcpt) NULL, NULL); rc = l_wait_event(svcpt->scp_waitq, - cfs_atomic_read(&svcpt->scp_nreps_difficult) == 0, &lwi); + atomic_read(&svcpt->scp_nreps_difficult) == 0, &lwi); if (rc == 0) break; CWARN("Unexpectedly long timeout %s %p\n", @@ -3083,7 +3020,7 @@ ptlrpc_service_unlink_rqbd(struct ptlrpc_service *svc) /* Unlink all the request buffers. This forces a 'final' * event with its 'unlink' flag set for each posted rqbd */ - cfs_list_for_each_entry(rqbd, &svcpt->scp_rqbd_posted, + list_for_each_entry(rqbd, &svcpt->scp_rqbd_posted, rqbd_list) { rc = LNetMDUnlink(rqbd->rqbd_md_h); LASSERT(rc == 0 || rc == -ENOENT); @@ -3132,8 +3069,8 @@ ptlrpc_service_purge_all(struct ptlrpc_service *svc) break; spin_lock(&svcpt->scp_rep_lock); - while (!cfs_list_empty(&svcpt->scp_rep_active)) { - rs = cfs_list_entry(svcpt->scp_rep_active.next, + while (!list_empty(&svcpt->scp_rep_active)) { + rs = list_entry(svcpt->scp_rep_active.next, struct ptlrpc_reply_state, rs_list); spin_lock(&rs->rs_lock); ptlrpc_schedule_difficult_reply(rs); @@ -3144,11 +3081,11 @@ ptlrpc_service_purge_all(struct ptlrpc_service *svc) /* purge the request queue. NB No new replies (rqbds * all unlinked) and no service threads, so I'm the only * thread noodling the request queue now */ - while (!cfs_list_empty(&svcpt->scp_req_incoming)) { - req = cfs_list_entry(svcpt->scp_req_incoming.next, + while (!list_empty(&svcpt->scp_req_incoming)) { + req = list_entry(svcpt->scp_req_incoming.next, struct ptlrpc_request, rq_list); - cfs_list_del(&req->rq_list); + list_del(&req->rq_list); svcpt->scp_nreqs_incoming--; ptlrpc_server_finish_request(svcpt, req); } @@ -3158,7 +3095,7 @@ ptlrpc_service_purge_all(struct ptlrpc_service *svc) ptlrpc_server_finish_active_request(svcpt, req); } - LASSERT(cfs_list_empty(&svcpt->scp_rqbd_posted)); + LASSERT(list_empty(&svcpt->scp_rqbd_posted)); LASSERT(svcpt->scp_nreqs_incoming == 0); LASSERT(svcpt->scp_nreqs_active == 0); /* history should have been culled by @@ -3168,19 +3105,19 @@ ptlrpc_service_purge_all(struct ptlrpc_service *svc) /* Now free all the request buffers since nothing * references them any more... */ - while (!cfs_list_empty(&svcpt->scp_rqbd_idle)) { - rqbd = cfs_list_entry(svcpt->scp_rqbd_idle.next, + while (!list_empty(&svcpt->scp_rqbd_idle)) { + rqbd = list_entry(svcpt->scp_rqbd_idle.next, struct ptlrpc_request_buffer_desc, rqbd_list); ptlrpc_free_rqbd(rqbd); } ptlrpc_wait_replies(svcpt); - while (!cfs_list_empty(&svcpt->scp_rep_idle)) { - rs = cfs_list_entry(svcpt->scp_rep_idle.next, + while (!list_empty(&svcpt->scp_rep_idle)) { + rs = list_entry(svcpt->scp_rep_idle.next, struct ptlrpc_reply_state, rs_list); - cfs_list_del(&rs->rs_list); + list_del(&rs->rs_list); OBD_FREE_LARGE(rs, svc->srv_max_reply_size); } } @@ -3203,7 +3140,7 @@ ptlrpc_service_free(struct ptlrpc_service *svc) if (array->paa_reqs_array != NULL) { OBD_FREE(array->paa_reqs_array, - sizeof(cfs_list_t) * array->paa_size); + sizeof(struct list_head) * array->paa_size); array->paa_reqs_array = NULL; } @@ -3233,7 +3170,7 @@ int ptlrpc_unregister_service(struct ptlrpc_service *service) service->srv_is_stopping = 1; mutex_lock(&ptlrpc_all_services_mutex); - cfs_list_del_init(&service->srv_list); + list_del_init(&service->srv_list); mutex_unlock(&ptlrpc_all_services_mutex); ptlrpc_service_del_atimer(service); @@ -3257,7 +3194,7 @@ EXPORT_SYMBOL(ptlrpc_unregister_service); * Right now, it just checks to make sure that requests aren't languishing * in the queue. We'll use this health check to govern whether a node needs * to be shot, so it's intentionally non-aggressive. */ -int ptlrpc_svcpt_health_check(struct ptlrpc_service_part *svcpt) +static int ptlrpc_svcpt_health_check(struct ptlrpc_service_part *svcpt) { struct ptlrpc_request *request = NULL; struct timeval right_now;