X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fptlrpc%2Fservice.c;h=84f3474ded23409e066bd0fc435acc5e25369d36;hp=a38c51109ed3245c4ec12cba592f1f2b18065063;hb=07b8db220e48782369f48d86213c5d404a628ded;hpb=e70ffafc82fdcb23e0a6f93607dea55286c0eefe diff --git a/lustre/ptlrpc/service.c b/lustre/ptlrpc/service.c index a38c511..84f3474 100644 --- a/lustre/ptlrpc/service.c +++ b/lustre/ptlrpc/service.c @@ -1,6 +1,4 @@ -/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- - * vim:expandtab:shiftwidth=8:tabstop=8: - * +/* * GPL HEADER START * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -26,8 +24,10 @@ * GPL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. + * + * Copyright (c) 2011, 2012, Whamcloud, Inc. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -63,104 +63,100 @@ CFS_MODULE_PARM(at_extra, "i", int, 0644, /* forward ref */ -static int ptlrpc_server_post_idle_rqbds (struct ptlrpc_service *svc); +static int ptlrpc_server_post_idle_rqbds(struct ptlrpc_service_part *svcpt); +static void ptlrpc_hpreq_fini(struct ptlrpc_request *req); static CFS_LIST_HEAD(ptlrpc_all_services); cfs_spinlock_t ptlrpc_all_services_lock; -static char * -ptlrpc_alloc_request_buffer (int size) -{ - char *ptr; - - if (size > SVC_BUF_VMALLOC_THRESHOLD) - OBD_VMALLOC(ptr, size); - else - OBD_ALLOC(ptr, size); - - return (ptr); -} - -static void -ptlrpc_free_request_buffer (char *ptr, int size) -{ - if (size > SVC_BUF_VMALLOC_THRESHOLD) - OBD_VFREE(ptr, size); - else - OBD_FREE(ptr, size); -} - struct ptlrpc_request_buffer_desc * -ptlrpc_alloc_rqbd (struct ptlrpc_service *svc) +ptlrpc_alloc_rqbd(struct ptlrpc_service_part *svcpt) { - struct ptlrpc_request_buffer_desc *rqbd; + struct ptlrpc_service *svc = svcpt->scp_service; + struct ptlrpc_request_buffer_desc *rqbd; - OBD_ALLOC_PTR(rqbd); - if (rqbd == NULL) - return (NULL); + OBD_ALLOC_PTR(rqbd); + if (rqbd == NULL) + return NULL; - rqbd->rqbd_service = svc; + rqbd->rqbd_svcpt = 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); - rqbd->rqbd_buffer = ptlrpc_alloc_request_buffer(svc->srv_buf_size); + OBD_ALLOC_LARGE(rqbd->rqbd_buffer, svc->srv_buf_size); if (rqbd->rqbd_buffer == NULL) { OBD_FREE_PTR(rqbd); return (NULL); } - cfs_spin_lock(&svc->srv_lock); - cfs_list_add(&rqbd->rqbd_list, &svc->srv_idle_rqbds); - svc->srv_nbufs++; - cfs_spin_unlock(&svc->srv_lock); + cfs_spin_lock(&svcpt->scp_lock); + cfs_list_add(&rqbd->rqbd_list, &svcpt->scp_rqbd_idle); + svcpt->scp_nrqbds_total++; + cfs_spin_unlock(&svcpt->scp_lock); - return (rqbd); + return rqbd; } void -ptlrpc_free_rqbd (struct ptlrpc_request_buffer_desc *rqbd) +ptlrpc_free_rqbd(struct ptlrpc_request_buffer_desc *rqbd) { - struct ptlrpc_service *svc = rqbd->rqbd_service; + struct ptlrpc_service_part *svcpt = rqbd->rqbd_svcpt; - LASSERT (rqbd->rqbd_refcount == 0); - LASSERT (cfs_list_empty(&rqbd->rqbd_reqs)); + LASSERT(rqbd->rqbd_refcount == 0); + LASSERT(cfs_list_empty(&rqbd->rqbd_reqs)); - cfs_spin_lock(&svc->srv_lock); - cfs_list_del(&rqbd->rqbd_list); - svc->srv_nbufs--; - cfs_spin_unlock(&svc->srv_lock); + cfs_spin_lock(&svcpt->scp_lock); + cfs_list_del(&rqbd->rqbd_list); + svcpt->scp_nrqbds_total--; + cfs_spin_unlock(&svcpt->scp_lock); - ptlrpc_free_request_buffer (rqbd->rqbd_buffer, svc->srv_buf_size); - OBD_FREE_PTR(rqbd); + OBD_FREE_LARGE(rqbd->rqbd_buffer, svcpt->scp_service->srv_buf_size); + OBD_FREE_PTR(rqbd); } int -ptlrpc_grow_req_bufs(struct ptlrpc_service *svc) +ptlrpc_grow_req_bufs(struct ptlrpc_service_part *svcpt) { + struct ptlrpc_service *svc = svcpt->scp_service; struct ptlrpc_request_buffer_desc *rqbd; + int rc = 0; int i; - CDEBUG(D_RPCTRACE, "%s: allocate %d new %d-byte reqbufs (%d/%d left)\n", - svc->srv_name, svc->srv_nbuf_per_group, svc->srv_buf_size, - svc->srv_nrqbd_receiving, svc->srv_nbufs); for (i = 0; i < svc->srv_nbuf_per_group; i++) { - rqbd = ptlrpc_alloc_rqbd(svc); + /* NB: another thread might be doing this as well, we need to + * make sure that it wouldn't over-allocate, see LU-1212. */ + if (svcpt->scp_nrqbds_posted >= svc->srv_nbuf_per_group) + break; + + rqbd = ptlrpc_alloc_rqbd(svcpt); if (rqbd == NULL) { - CERROR ("%s: Can't allocate request buffer\n", - svc->srv_name); - return (-ENOMEM); + CERROR("%s: Can't allocate request buffer\n", + svc->srv_name); + rc = -ENOMEM; + break; } - if (ptlrpc_server_post_idle_rqbds(svc) < 0) - return (-EAGAIN); - } + if (ptlrpc_server_post_idle_rqbds(svcpt) < 0) { + rc = -EAGAIN; + break; + } + } + + CDEBUG(D_RPCTRACE, + "%s: allocate %d new %d-byte reqbufs (%d/%d left), rc = %d\n", + svc->srv_name, i, svc->srv_buf_size, + svcpt->scp_nrqbds_posted, svcpt->scp_nrqbds_total, rc); - return (0); + return rc; } +/** + * Part of Rep-Ack logic. + * Puts a lock and its mode into reply state assotiated to request reply. + */ void ptlrpc_save_lock(struct ptlrpc_request *req, struct lustre_handle *lock, int mode, int no_ack) @@ -203,9 +199,9 @@ struct ptlrpc_hr_service { }; struct rs_batch { - cfs_list_t rsb_replies; - struct ptlrpc_service *rsb_svc; - unsigned int rsb_n_replies; + cfs_list_t rsb_replies; + unsigned int rsb_n_replies; + struct ptlrpc_service_part *rsb_svcpt; }; /** @@ -230,6 +226,22 @@ static void rs_batch_init(struct rs_batch *b) } /** + * Choose an hr thread to dispatch requests to. + */ +static unsigned int get_hr_thread_index(struct ptlrpc_hr_service *hr) +{ + unsigned int idx; + + /* Concurrent modification of hr_index w/o any spinlock + protection is harmless as long as the result fits + [0..(hr_n_threads-1)] range and each thread gets near equal + load. */ + idx = hr->hr_index; + hr->hr_index = (idx >= hr->hr_n_threads - 1) ? 0 : idx + 1; + return idx; +} + +/** * Dispatch all replies accumulated in the batch to one from * dedicated reply handling threads. * @@ -241,9 +253,7 @@ static void rs_batch_dispatch(struct rs_batch *b) struct ptlrpc_hr_service *hr = ptlrpc_hr; int idx; - idx = hr->hr_index++; - if (hr->hr_index >= hr->hr_n_threads) - hr->hr_index = 0; + idx = get_hr_thread_index(hr); cfs_spin_lock(&hr->hr_threads[idx].hrt_lock); cfs_list_splice_init(&b->rsb_replies, @@ -263,15 +273,15 @@ static void rs_batch_dispatch(struct rs_batch *b) */ static void rs_batch_add(struct rs_batch *b, struct ptlrpc_reply_state *rs) { - struct ptlrpc_service *svc = rs->rs_service; + struct ptlrpc_service_part *svcpt = rs->rs_svcpt; - if (svc != b->rsb_svc || b->rsb_n_replies >= MAX_SCHEDULED) { - if (b->rsb_svc != NULL) { - rs_batch_dispatch(b); - cfs_spin_unlock(&b->rsb_svc->srv_lock); - } - cfs_spin_lock(&svc->srv_lock); - b->rsb_svc = svc; + if (svcpt != b->rsb_svcpt || b->rsb_n_replies >= MAX_SCHEDULED) { + if (b->rsb_svcpt != NULL) { + rs_batch_dispatch(b); + cfs_spin_unlock(&b->rsb_svcpt->scp_rep_lock); + } + cfs_spin_lock(&svcpt->scp_rep_lock); + b->rsb_svcpt = svcpt; } cfs_spin_lock(&rs->rs_lock); rs->rs_scheduled_ever = 1; @@ -293,10 +303,10 @@ static void rs_batch_add(struct rs_batch *b, struct ptlrpc_reply_state *rs) */ static void rs_batch_fini(struct rs_batch *b) { - if (b->rsb_svc != 0) { - rs_batch_dispatch(b); - cfs_spin_unlock(&b->rsb_svc->srv_lock); - } + if (b->rsb_svcpt != NULL) { + rs_batch_dispatch(b); + cfs_spin_unlock(&b->rsb_svcpt->scp_rep_lock); + } } #define DECLARE_RS_BATCH(b) struct rs_batch b @@ -310,6 +320,10 @@ static void rs_batch_fini(struct rs_batch *b) #endif /* __KERNEL__ */ +/** + * Put reply state into a queue for processing because we received + * ACK from the client + */ void ptlrpc_dispatch_difficult_reply(struct ptlrpc_reply_state *rs) { #ifdef __KERNEL__ @@ -319,30 +333,28 @@ void ptlrpc_dispatch_difficult_reply(struct ptlrpc_reply_state *rs) LASSERT(cfs_list_empty(&rs->rs_list)); - idx = hr->hr_index++; - if (hr->hr_index >= hr->hr_n_threads) - hr->hr_index = 0; + idx = get_hr_thread_index(hr); cfs_spin_lock(&hr->hr_threads[idx].hrt_lock); cfs_list_add_tail(&rs->rs_list, &hr->hr_threads[idx].hrt_queue); cfs_spin_unlock(&hr->hr_threads[idx].hrt_lock); cfs_waitq_signal(&hr->hr_threads[idx].hrt_wait); EXIT; #else - cfs_list_add_tail(&rs->rs_list, &rs->rs_service->srv_reply_queue); + cfs_list_add_tail(&rs->rs_list, &rs->rs_svcpt->scp_rep_queue); #endif } void -ptlrpc_schedule_difficult_reply (struct ptlrpc_reply_state *rs) +ptlrpc_schedule_difficult_reply(struct ptlrpc_reply_state *rs) { - ENTRY; + ENTRY; - LASSERT_SPIN_LOCKED(&rs->rs_service->srv_lock); + LASSERT_SPIN_LOCKED(&rs->rs_svcpt->scp_rep_lock); LASSERT_SPIN_LOCKED(&rs->rs_lock); LASSERT (rs->rs_difficult); - rs->rs_scheduled_ever = 1; /* flag any notification attempt */ + rs->rs_scheduled_ever = 1; /* flag any notification attempt */ - if (rs->rs_scheduled) { /* being set up or already notified */ + if (rs->rs_scheduled) { /* being set up or already notified */ EXIT; return; } @@ -381,198 +393,287 @@ void ptlrpc_commit_replies(struct obd_export *exp) } static int -ptlrpc_server_post_idle_rqbds (struct ptlrpc_service *svc) +ptlrpc_server_post_idle_rqbds(struct ptlrpc_service_part *svcpt) { - struct ptlrpc_request_buffer_desc *rqbd; - int rc; - int posted = 0; + struct ptlrpc_request_buffer_desc *rqbd; + int rc; + int posted = 0; - for (;;) { - cfs_spin_lock(&svc->srv_lock); + for (;;) { + cfs_spin_lock(&svcpt->scp_lock); - if (cfs_list_empty (&svc->srv_idle_rqbds)) { - cfs_spin_unlock(&svc->srv_lock); - return (posted); - } + if (cfs_list_empty(&svcpt->scp_rqbd_idle)) { + cfs_spin_unlock(&svcpt->scp_lock); + return posted; + } - rqbd = cfs_list_entry(svc->srv_idle_rqbds.next, - struct ptlrpc_request_buffer_desc, - rqbd_list); - cfs_list_del (&rqbd->rqbd_list); + rqbd = cfs_list_entry(svcpt->scp_rqbd_idle.next, + struct ptlrpc_request_buffer_desc, + rqbd_list); + cfs_list_del(&rqbd->rqbd_list); - /* assume we will post successfully */ - svc->srv_nrqbd_receiving++; - cfs_list_add (&rqbd->rqbd_list, &svc->srv_active_rqbds); + /* assume we will post successfully */ + svcpt->scp_nrqbds_posted++; + cfs_list_add(&rqbd->rqbd_list, &svcpt->scp_rqbd_posted); - cfs_spin_unlock(&svc->srv_lock); + cfs_spin_unlock(&svcpt->scp_lock); - rc = ptlrpc_register_rqbd(rqbd); - if (rc != 0) - break; + rc = ptlrpc_register_rqbd(rqbd); + if (rc != 0) + break; - posted = 1; - } + posted = 1; + } - cfs_spin_lock(&svc->srv_lock); + cfs_spin_lock(&svcpt->scp_lock); - svc->srv_nrqbd_receiving--; - cfs_list_del(&rqbd->rqbd_list); - cfs_list_add_tail(&rqbd->rqbd_list, &svc->srv_idle_rqbds); + svcpt->scp_nrqbds_posted--; + cfs_list_del(&rqbd->rqbd_list); + cfs_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! */ + /* Don't complain if no request buffers are posted right now; LNET + * won't drop requests because we set the portal lazy! */ - cfs_spin_unlock(&svc->srv_lock); + cfs_spin_unlock(&svcpt->scp_lock); - return (-1); + return -1; } -struct ptlrpc_service *ptlrpc_init_svc_conf(struct ptlrpc_service_conf *c, - svc_handler_t h, char *name, - struct proc_dir_entry *proc_entry, - svcreq_printfn_t prntfn, - char *threadname) +static void ptlrpc_at_timer(unsigned long castmeharder) { - return ptlrpc_init_svc(c->psc_nbufs, c->psc_bufsize, - c->psc_max_req_size, c->psc_max_reply_size, - c->psc_req_portal, c->psc_rep_portal, - c->psc_watchdog_factor, - h, name, proc_entry, - prntfn, c->psc_min_threads, c->psc_max_threads, - threadname, c->psc_ctx_tags, NULL); + struct ptlrpc_service_part *svcpt; + + svcpt = (struct ptlrpc_service_part *)castmeharder; + + svcpt->scp_at_check = 1; + svcpt->scp_at_checktime = cfs_time_current(); + cfs_waitq_signal(&svcpt->scp_waitq); } -EXPORT_SYMBOL(ptlrpc_init_svc_conf); -static void ptlrpc_at_timer(unsigned long castmeharder) +static void +ptlrpc_server_nthreads_check(struct ptlrpc_service_conf *conf, + int *min_p, int *max_p) { - struct ptlrpc_service *svc = (struct ptlrpc_service *)castmeharder; - svc->srv_at_check = 1; - svc->srv_at_checktime = cfs_time_current(); - cfs_waitq_signal(&svc->srv_waitq); +#ifdef __KERNEL__ + struct ptlrpc_service_thr_conf *tc = &conf->psc_thr; + int nthrs_min; + int nthrs; + + nthrs_min = PTLRPC_NTHRS_MIN + (conf->psc_ops.so_hpreq_handler != NULL); + nthrs_min = max_t(int, nthrs_min, tc->tc_nthrs_min); + + nthrs = tc->tc_nthrs_user; + if (nthrs != 0) { /* validate it */ + nthrs = min_t(int, nthrs, tc->tc_nthrs_max); + nthrs = max_t(int, nthrs, nthrs_min); + *min_p = *max_p = nthrs; + return; + } + + /* + * NB: we will add some common code here for estimating, for example: + * add a new member ptlrpc_service_thr_conf::tc_factor, and estimate + * threads number based on: + * (online_cpus * conf::tc_factor) + conf::tc_nthrs_base. + * + * So we can remove code block like estimation in ost_setup, also, + * we might estimate MDS threads number as well instead of using + * absolute number, and have more threads on fat servers to improve + * availability of service. + * + * Also, we will need to validate threads number at here for + * CPT affinity service (CPU ParTion) in the future. + * A service can have percpt thread-pool instead of a global thread + * pool for each service, which means user might not always get the + * threads number they want even they set it in conf::tc_nthrs_user, + * because we need to adjust threads number for each CPT, instead of + * just use (conf::tc_nthrs_user / NCPTS), to make sure each pool + * will be healthy. + */ + *max_p = tc->tc_nthrs_max; + *min_p = nthrs_min; +#else /* __KERNEL__ */ + *max_p = *min_p = 1; /* whatever */ +#endif } -/* @threadname should be 11 characters or less - 3 will be added on */ -struct ptlrpc_service * -ptlrpc_init_svc(int nbufs, int bufsize, int max_req_size, int max_reply_size, - int req_portal, int rep_portal, int watchdog_factor, - svc_handler_t handler, char *name, - cfs_proc_dir_entry_t *proc_entry, - svcreq_printfn_t svcreq_printfn, - int min_threads, int max_threads, - char *threadname, __u32 ctx_tags, - svc_hpreq_handler_t hp_handler) -{ - int rc; - struct ptlrpc_at_array *array; - struct ptlrpc_service *service; - unsigned int size, index; - ENTRY; - - LASSERT (nbufs > 0); - LASSERT (bufsize >= max_req_size + SPTLRPC_MAX_PAYLOAD); - LASSERT (ctx_tags != 0); - - OBD_ALLOC_PTR(service); - if (service == NULL) - RETURN(NULL); - - /* First initialise enough for early teardown */ - - service->srv_name = name; - cfs_spin_lock_init(&service->srv_lock); - CFS_INIT_LIST_HEAD(&service->srv_threads); - cfs_waitq_init(&service->srv_waitq); - - service->srv_nbuf_per_group = test_req_buffer_pressure ? 1 : nbufs; - service->srv_max_req_size = max_req_size + SPTLRPC_MAX_PAYLOAD; - service->srv_buf_size = bufsize; - service->srv_rep_portal = rep_portal; - service->srv_req_portal = req_portal; - service->srv_watchdog_factor = watchdog_factor; - service->srv_handler = handler; - service->srv_request_history_print_fn = svcreq_printfn; - service->srv_request_seq = 1; /* valid seq #s start at 1 */ - service->srv_request_max_cull_seq = 0; - service->srv_threads_min = min_threads; - service->srv_threads_max = max_threads; - service->srv_thread_name = threadname; - service->srv_ctx_tags = ctx_tags; - service->srv_hpreq_handler = hp_handler; - service->srv_hpreq_ratio = PTLRPC_SVC_HP_RATIO; - service->srv_hpreq_count = 0; - service->srv_n_hpreq = 0; - - rc = LNetSetLazyPortal(service->srv_req_portal); - LASSERT (rc == 0); - - CFS_INIT_LIST_HEAD(&service->srv_request_queue); - CFS_INIT_LIST_HEAD(&service->srv_request_hpq); - CFS_INIT_LIST_HEAD(&service->srv_idle_rqbds); - CFS_INIT_LIST_HEAD(&service->srv_active_rqbds); - CFS_INIT_LIST_HEAD(&service->srv_history_rqbds); - CFS_INIT_LIST_HEAD(&service->srv_request_history); - CFS_INIT_LIST_HEAD(&service->srv_active_replies); +/** + * Initialize percpt data for a service + */ +static int +ptlrpc_service_part_init(struct ptlrpc_service *svc, + struct ptlrpc_service_part *svcpt) +{ + struct ptlrpc_at_array *array; + int size; + int index; + int rc; + + CFS_INIT_LIST_HEAD(&svcpt->scp_threads); + + /* rqbd and incoming request queue */ + cfs_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); + cfs_waitq_init(&svcpt->scp_waitq); + /* history request & rqbd list */ + CFS_INIT_LIST_HEAD(&svcpt->scp_hist_reqs); + CFS_INIT_LIST_HEAD(&svcpt->scp_hist_rqbds); + + /* acitve requests and hp requests */ + cfs_spin_lock_init(&svcpt->scp_req_lock); + CFS_INIT_LIST_HEAD(&svcpt->scp_req_pending); + CFS_INIT_LIST_HEAD(&svcpt->scp_hreq_pending); + + /* reply states */ + cfs_spin_lock_init(&svcpt->scp_rep_lock); + CFS_INIT_LIST_HEAD(&svcpt->scp_rep_active); #ifndef __KERNEL__ - CFS_INIT_LIST_HEAD(&service->srv_reply_queue); + CFS_INIT_LIST_HEAD(&svcpt->scp_rep_queue); #endif - CFS_INIT_LIST_HEAD(&service->srv_free_rs_list); - cfs_waitq_init(&service->srv_free_rs_waitq); - cfs_atomic_set(&service->srv_n_difficult_replies, 0); - - cfs_spin_lock_init(&service->srv_at_lock); - CFS_INIT_LIST_HEAD(&service->srv_req_in_queue); - - array = &service->srv_at_array; - size = at_est2timeout(at_max); - array->paa_size = size; - array->paa_count = 0; - array->paa_deadline = -1; - - /* allocate memory for srv_at_array (ptlrpc_at_array) */ - OBD_ALLOC(array->paa_reqs_array, sizeof(cfs_list_t) * size); - if (array->paa_reqs_array == NULL) - GOTO(failed, NULL); - - for (index = 0; index < size; index++) - CFS_INIT_LIST_HEAD(&array->paa_reqs_array[index]); - - OBD_ALLOC(array->paa_reqs_count, sizeof(__u32) * size); - if (array->paa_reqs_count == NULL) - GOTO(failed, NULL); + CFS_INIT_LIST_HEAD(&svcpt->scp_rep_idle); + cfs_waitq_init(&svcpt->scp_rep_waitq); + cfs_atomic_set(&svcpt->scp_nreps_difficult, 0); + + /* adaptive timeout */ + cfs_spin_lock_init(&svcpt->scp_at_lock); + array = &svcpt->scp_at_array; + + size = at_est2timeout(at_max); + array->paa_size = size; + array->paa_count = 0; + array->paa_deadline = -1; + + /* allocate memory for scp_at_array (ptlrpc_at_array) */ + OBD_ALLOC(array->paa_reqs_array, sizeof(cfs_list_t) * size); + if (array->paa_reqs_array == NULL) + return -ENOMEM; + + for (index = 0; index < size; index++) + CFS_INIT_LIST_HEAD(&array->paa_reqs_array[index]); + + OBD_ALLOC(array->paa_reqs_count, sizeof(__u32) * size); + if (array->paa_reqs_count == NULL) + goto failed; + + cfs_timer_init(&svcpt->scp_at_timer, ptlrpc_at_timer, svcpt); + /* At SOW, service time should be quick; 10s seems generous. If client + * timeout is less than this, we'll be sending an early reply. */ + at_init(&svcpt->scp_at_estimate, 10, 0); + + /* assign this before call ptlrpc_grow_req_bufs */ + svcpt->scp_service = svc; + /* Now allocate the request buffers, but don't post them now */ + rc = ptlrpc_grow_req_bufs(svcpt); + /* We shouldn't be under memory pressure at startup, so + * fail if we can't allocate all our buffers at this time. */ + if (rc != 0) + goto failed; + + return 0; + + failed: + if (array->paa_reqs_count != NULL) { + OBD_FREE(array->paa_reqs_count, sizeof(__u32) * size); + array->paa_reqs_count = NULL; + } + + if (array->paa_reqs_array != NULL) { + OBD_FREE(array->paa_reqs_array, + sizeof(cfs_list_t) * array->paa_size); + array->paa_reqs_array = NULL; + } + + return -ENOMEM; +} - cfs_timer_init(&service->srv_at_timer, ptlrpc_at_timer, service); - /* At SOW, service time should be quick; 10s seems generous. If client - timeout is less than this, we'll be sending an early reply. */ - at_init(&service->srv_at_estimate, 10, 0); +/** + * Initialize service on a given portal. + * This includes starting serving threads , allocating and posting rqbds and + * so on. + */ +struct ptlrpc_service * +ptlrpc_register_service(struct ptlrpc_service_conf *conf, + cfs_proc_dir_entry_t *proc_entry) +{ + struct ptlrpc_service *service; + int rc; + ENTRY; + + LASSERT(conf->psc_buf.bc_nbufs > 0); + LASSERT(conf->psc_buf.bc_buf_size >= + conf->psc_buf.bc_req_max_size + SPTLRPC_MAX_PAYLOAD); + LASSERT(conf->psc_thr.tc_ctx_tags != 0); + + OBD_ALLOC_PTR(service); + if (service == NULL) + RETURN(ERR_PTR(-ENOMEM)); + + /* public members */ + cfs_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 */ + + /* buffer configuration */ + service->srv_nbuf_per_group = test_req_buffer_pressure ? + 1 : conf->psc_buf.bc_nbufs; + service->srv_max_req_size = conf->psc_buf.bc_req_max_size + + SPTLRPC_MAX_PAYLOAD; + service->srv_buf_size = conf->psc_buf.bc_buf_size; + service->srv_rep_portal = conf->psc_buf.bc_rep_portal; + service->srv_req_portal = conf->psc_buf.bc_req_portal; + + /* Increase max reply size to next power of two */ + service->srv_max_reply_size = 1; + while (service->srv_max_reply_size < + conf->psc_buf.bc_rep_max_size + SPTLRPC_MAX_PAYLOAD) + service->srv_max_reply_size <<= 1; + + ptlrpc_server_nthreads_check(conf, &service->srv_threads_min, + &service->srv_threads_max); + + service->srv_thread_name = conf->psc_thr.tc_thr_name; + service->srv_ctx_tags = conf->psc_thr.tc_ctx_tags; + service->srv_cpu_affinity = !!conf->psc_thr.tc_cpu_affinity; + service->srv_hpreq_ratio = PTLRPC_SVC_HP_RATIO; + service->srv_ops = conf->psc_ops; + + OBD_ALLOC_PTR(service->srv_part); + if (service->srv_part == NULL) + GOTO(failed, rc = -ENOMEM); + + rc = ptlrpc_service_part_init(service, service->srv_part); + if (rc != 0) + GOTO(failed, rc); + + rc = LNetSetLazyPortal(service->srv_req_portal); + LASSERT(rc == 0); cfs_spin_lock (&ptlrpc_all_services_lock); cfs_list_add (&service->srv_list, &ptlrpc_all_services); cfs_spin_unlock (&ptlrpc_all_services_lock); - /* Now allocate the request buffers */ - rc = ptlrpc_grow_req_bufs(service); - /* We shouldn't be under memory pressure at startup, so - * fail if we can't post all our buffers at this time. */ - if (rc != 0) - GOTO(failed, NULL); - - /* Now allocate pool of reply buffers */ - /* Increase max reply size to next power of two */ - service->srv_max_reply_size = 1; - while (service->srv_max_reply_size < - max_reply_size + SPTLRPC_MAX_PAYLOAD) - service->srv_max_reply_size <<= 1; - if (proc_entry != NULL) ptlrpc_lprocfs_register_service(proc_entry, service); CDEBUG(D_NET, "%s: Started, listening on portal %d\n", service->srv_name, service->srv_req_portal); - RETURN(service); +#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: - ptlrpc_unregister_service(service); - return NULL; + ptlrpc_unregister_service(service); + RETURN(ERR_PTR(rc)); } /** @@ -604,8 +705,9 @@ static void ptlrpc_server_free_request(struct ptlrpc_request *req) */ void ptlrpc_server_drop_request(struct ptlrpc_request *req) { - struct ptlrpc_request_buffer_desc *rqbd = req->rq_rqbd; - struct ptlrpc_service *svc = rqbd->rqbd_service; + 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; @@ -613,19 +715,24 @@ void ptlrpc_server_drop_request(struct ptlrpc_request *req) if (!cfs_atomic_dec_and_test(&req->rq_refcount)) return; - cfs_spin_lock(&svc->srv_at_lock); - if (req->rq_at_linked) { - struct ptlrpc_at_array *array = &svc->srv_at_array; + if (req->rq_at_linked) { + struct ptlrpc_at_array *array = &svcpt->scp_at_array; __u32 index = req->rq_at_index; + cfs_spin_lock(&svcpt->scp_at_lock); + LASSERT(!cfs_list_empty(&req->rq_timed_list)); cfs_list_del_init(&req->rq_timed_list); + cfs_spin_lock(&req->rq_lock); req->rq_at_linked = 0; + cfs_spin_unlock(&req->rq_lock); array->paa_reqs_count[index]--; array->paa_count--; - } else - LASSERT(cfs_list_empty(&req->rq_timed_list)); - cfs_spin_unlock(&svc->srv_at_lock); + + cfs_spin_unlock(&svcpt->scp_at_lock); + } else { + LASSERT(cfs_list_empty(&req->rq_timed_list)); + } /* finalize request */ if (req->rq_export) { @@ -633,27 +740,27 @@ void ptlrpc_server_drop_request(struct ptlrpc_request *req) req->rq_export = NULL; } - cfs_spin_lock(&svc->srv_lock); + cfs_spin_lock(&svcpt->scp_lock); - svc->srv_n_active_reqs--; cfs_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); - cfs_list_add_tail(&rqbd->rqbd_list, &svc->srv_history_rqbds); - svc->srv_n_history_rqbds++; - /* cull some history? - * I expect only about 1 or 2 rqbds need to be recycled here */ - while (svc->srv_n_history_rqbds > svc->srv_max_history_rqbds) { - rqbd = cfs_list_entry(svc->srv_history_rqbds.next, - struct ptlrpc_request_buffer_desc, - rqbd_list); + cfs_list_add_tail(&rqbd->rqbd_list, &svcpt->scp_hist_rqbds); + svcpt->scp_hist_nrqbds++; - cfs_list_del(&rqbd->rqbd_list); - svc->srv_n_history_rqbds--; + /* cull some history? + * I expect only about 1 or 2 rqbds need to be recycled here */ + while (svcpt->scp_hist_nrqbds > svc->srv_max_history_rqbds) { + rqbd = cfs_list_entry(svcpt->scp_hist_rqbds.next, + struct ptlrpc_request_buffer_desc, + rqbd_list); + + cfs_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 */ @@ -661,14 +768,15 @@ void ptlrpc_server_drop_request(struct ptlrpc_request *req) req = cfs_list_entry(tmp, struct ptlrpc_request, rq_list); /* Track the highest culled req seq */ - if (req->rq_history_seq > - svc->srv_request_max_cull_seq) - svc->srv_request_max_cull_seq = - req->rq_history_seq; - cfs_list_del(&req->rq_history_list); - } + 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); + } - cfs_spin_unlock(&svc->srv_lock); + cfs_spin_unlock(&svcpt->scp_lock); cfs_list_for_each_safe(tmp, nxt, &rqbd->rqbd_reqs) { req = cfs_list_entry(rqbd->rqbd_reqs.next, @@ -678,42 +786,54 @@ void ptlrpc_server_drop_request(struct ptlrpc_request *req) ptlrpc_server_free_request(req); } - cfs_spin_lock(&svc->srv_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, - &svc->srv_idle_rqbds); - } - - cfs_spin_unlock(&svc->srv_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); - cfs_spin_unlock(&svc->srv_lock); - - ptlrpc_server_free_request(req); - } else { - cfs_spin_unlock(&svc->srv_lock); - } + cfs_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); + } + + cfs_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); + + cfs_spin_unlock(&svcpt->scp_lock); + + ptlrpc_server_free_request(req); + } else { + cfs_spin_unlock(&svcpt->scp_lock); + } } /** * to finish a request: stop sending more early replies, and release * the request. should be called after we finished handling the request. */ -static void ptlrpc_server_finish_request(struct ptlrpc_request *req) +static void ptlrpc_server_finish_request(struct ptlrpc_service_part *svcpt, + struct ptlrpc_request *req) { - ptlrpc_server_drop_request(req); + ptlrpc_hpreq_fini(req); + + cfs_spin_lock(&svcpt->scp_req_lock); + svcpt->scp_nreqs_active--; + if (req->rq_hp) + svcpt->scp_nhreqs_active--; + cfs_spin_unlock(&svcpt->scp_req_lock); + + ptlrpc_server_drop_request(req); } -/* This function makes sure dead exports are evicted in a timely manner. - This function is only called when some export receives a message (i.e., - the network is up.) */ +/** + * This function makes sure dead exports are evicted in a timely manner. + * 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) { struct obd_export *oldest_exp; @@ -793,8 +913,14 @@ static void ptlrpc_update_export_timer(struct obd_export *exp, long extra_delay) EXIT; } +/** + * Sanity check request \a req. + * Return 0 if all is ok, error code otherwise. + */ static int ptlrpc_check_req(struct ptlrpc_request *req) { + int rc = 0; + if (unlikely(lustre_msg_get_conn_cnt(req->rq_reqmsg) < req->rq_export->exp_conn_cnt)) { DEBUG_REQ(D_ERROR, req, @@ -809,45 +935,59 @@ static int ptlrpc_check_req(struct ptlrpc_request *req) error response instead. */ CDEBUG(D_RPCTRACE, "Dropping req %p for failed obd %s\n", req, req->rq_export->exp_obd->obd_name); - req->rq_status = -ENODEV; + rc = -ENODEV; + } else if (lustre_msg_get_flags(req->rq_reqmsg) & + (MSG_REPLAY | MSG_REQ_REPLAY_DONE) && + !(req->rq_export->exp_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)) { + DEBUG_REQ(D_ERROR, req, "Invalid req with transno " + LPU64" without recovery", + lustre_msg_get_transno(req->rq_reqmsg)); + class_fail_export(req->rq_export); + rc = -ENODEV; + } + + if (unlikely(rc < 0)) { + req->rq_status = rc; ptlrpc_error(req); - return -ENODEV; } - - return 0; + return rc; } -static void ptlrpc_at_set_timer(struct ptlrpc_service *svc) +static void ptlrpc_at_set_timer(struct ptlrpc_service_part *svcpt) { - struct ptlrpc_at_array *array = &svc->srv_at_array; - __s32 next; - - cfs_spin_lock(&svc->srv_at_lock); - if (array->paa_count == 0) { - cfs_timer_disarm(&svc->srv_at_timer); - cfs_spin_unlock(&svc->srv_at_lock); - return; - } - - /* Set timer for closest deadline */ - next = (__s32)(array->paa_deadline - cfs_time_current_sec() - - at_early_margin); - if (next <= 0) - ptlrpc_at_timer((unsigned long)svc); - else - cfs_timer_arm(&svc->srv_at_timer, cfs_time_shift(next)); - cfs_spin_unlock(&svc->srv_at_lock); - CDEBUG(D_INFO, "armed %s at %+ds\n", svc->srv_name, next); + struct ptlrpc_at_array *array = &svcpt->scp_at_array; + __s32 next; + + if (array->paa_count == 0) { + cfs_timer_disarm(&svcpt->scp_at_timer); + return; + } + + /* Set timer for closest deadline */ + next = (__s32)(array->paa_deadline - cfs_time_current_sec() - + at_early_margin); + if (next <= 0) { + ptlrpc_at_timer((unsigned long)svcpt); + } else { + cfs_timer_arm(&svcpt->scp_at_timer, cfs_time_shift(next)); + CDEBUG(D_INFO, "armed %s at %+ds\n", + svcpt->scp_service->srv_name, next); + } } /* Add rpc to early reply check list */ static int ptlrpc_at_add_timed(struct ptlrpc_request *req) { - struct ptlrpc_service *svc = req->rq_rqbd->rqbd_service; + struct ptlrpc_service_part *svcpt = req->rq_rqbd->rqbd_svcpt; + struct ptlrpc_at_array *array = &svcpt->scp_at_array; struct ptlrpc_request *rq = NULL; - struct ptlrpc_at_array *array = &svc->srv_at_array; __u32 index; - int found = 0; if (AT_OFF) return(0); @@ -858,7 +998,7 @@ static int ptlrpc_at_add_timed(struct ptlrpc_request *req) if ((lustre_msghdr_get_flags(req->rq_reqmsg) & MSGHDR_AT_SUPPORT) == 0) return(-ENOSYS); - cfs_spin_lock(&svc->srv_at_lock); + cfs_spin_lock(&svcpt->scp_at_lock); LASSERT(cfs_list_empty(&req->rq_timed_list)); index = (unsigned long)req->rq_deadline % array->paa_size; @@ -881,25 +1021,24 @@ static int ptlrpc_at_add_timed(struct ptlrpc_request *req) cfs_list_add(&req->rq_timed_list, &array->paa_reqs_array[index]); + cfs_spin_lock(&req->rq_lock); req->rq_at_linked = 1; + cfs_spin_unlock(&req->rq_lock); req->rq_at_index = index; array->paa_reqs_count[index]++; array->paa_count++; if (array->paa_count == 1 || array->paa_deadline > req->rq_deadline) { array->paa_deadline = req->rq_deadline; - found = 1; - } - cfs_spin_unlock(&svc->srv_at_lock); + ptlrpc_at_set_timer(svcpt); + } + cfs_spin_unlock(&svcpt->scp_at_lock); - if (found) - ptlrpc_at_set_timer(svc); - - return 0; + return 0; } static int ptlrpc_at_send_early_reply(struct ptlrpc_request *req) { - struct ptlrpc_service *svc = req->rq_rqbd->rqbd_service; + 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(); @@ -912,8 +1051,8 @@ static int ptlrpc_at_send_early_reply(struct ptlrpc_request *req) DEBUG_REQ(D_ADAPTTO, req, "%ssending early reply (deadline %+lds, margin %+lds) for " "%d+%d", AT_OFF ? "AT off - not " : "", - olddl, olddl - at_get(&svc->srv_at_estimate), - at_get(&svc->srv_at_estimate), at_extra); + olddl, olddl - at_get(&svcpt->scp_at_estimate), + at_get(&svcpt->scp_at_estimate), at_extra); if (AT_OFF) RETURN(0); @@ -936,34 +1075,39 @@ static int ptlrpc_at_send_early_reply(struct ptlrpc_request *req) if (req->rq_export && lustre_msg_get_flags(req->rq_reqmsg) & (MSG_REPLAY | MSG_REQ_REPLAY_DONE | MSG_LOCK_REPLAY_DONE)) { - /** - * Use at_extra as early reply period for recovery requests but - * make sure it is not bigger than recovery time / 4 - */ - at_add(&svc->srv_at_estimate, - 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 */ - at_add(&svc->srv_at_estimate, at_extra); - } - - newdl = cfs_time_current_sec() + at_get(&svc->srv_at_estimate); - if (req->rq_deadline >= newdl) { - /* We're not adding any time, no need to send an early reply - (e.g. maybe at adaptive_max) */ - DEBUG_REQ(D_WARNING, req, "Couldn't add any time (" - CFS_DURATION_T"/"CFS_DURATION_T"), " - "not sending early reply\n", olddl, - cfs_time_sub(newdl, cfs_time_current_sec())); - RETURN(-ETIMEDOUT); - } + /* 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)); + } else { + /* Fake our processing time into the future to ask the clients + * for some extra amount of time */ + at_measured(&svcpt->scp_at_estimate, at_extra + + cfs_time_current_sec() - + req->rq_arrival_time.tv_sec); + + /* 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); + } + } + newdl = cfs_time_current_sec() + at_get(&svcpt->scp_at_estimate); OBD_ALLOC(reqcopy, sizeof *reqcopy); if (reqcopy == NULL) RETURN(-ENOMEM); - OBD_ALLOC(reqmsg, req->rq_reqlen); + OBD_ALLOC_LARGE(reqmsg, req->rq_reqlen); if (!reqmsg) { OBD_FREE(reqcopy, sizeof *reqcopy); RETURN(-ENOMEM); @@ -1023,18 +1167,18 @@ out_put: class_export_put(reqcopy->rq_export); out: sptlrpc_svc_ctx_decref(reqcopy); - OBD_FREE(reqmsg, req->rq_reqlen); + OBD_FREE_LARGE(reqmsg, req->rq_reqlen); OBD_FREE(reqcopy, sizeof *reqcopy); RETURN(rc); } /* Send early replies to everybody expiring within at_early_margin asking for at_extra time */ -static int ptlrpc_at_check_timed(struct ptlrpc_service *svc) +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 ptlrpc_at_array *array = &svc->srv_at_array; __u32 index, count; time_t deadline; time_t now = cfs_time_current_sec(); @@ -1042,27 +1186,27 @@ static int ptlrpc_at_check_timed(struct ptlrpc_service *svc) int first, counter = 0; ENTRY; - cfs_spin_lock(&svc->srv_at_lock); - if (svc->srv_at_check == 0) { - cfs_spin_unlock(&svc->srv_at_lock); - RETURN(0); - } - delay = cfs_time_sub(cfs_time_current(), svc->srv_at_checktime); - svc->srv_at_check = 0; - - if (array->paa_count == 0) { - cfs_spin_unlock(&svc->srv_at_lock); - RETURN(0); - } - - /* The timer went off, but maybe the nearest rpc already completed. */ - first = array->paa_deadline - now; - if (first > at_early_margin) { - /* We've still got plenty of time. Reset the timer. */ - cfs_spin_unlock(&svc->srv_at_lock); - ptlrpc_at_set_timer(svc); - RETURN(0); - } + cfs_spin_lock(&svcpt->scp_at_lock); + if (svcpt->scp_at_check == 0) { + cfs_spin_unlock(&svcpt->scp_at_lock); + RETURN(0); + } + delay = cfs_time_sub(cfs_time_current(), svcpt->scp_at_checktime); + svcpt->scp_at_check = 0; + + if (array->paa_count == 0) { + cfs_spin_unlock(&svcpt->scp_at_lock); + RETURN(0); + } + + /* The timer went off, but maybe the nearest rpc already completed. */ + first = array->paa_deadline - now; + if (first > at_early_margin) { + /* We've still got plenty of time. Reset the timer. */ + ptlrpc_at_set_timer(svcpt); + cfs_spin_unlock(&svcpt->scp_at_lock); + 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. */ @@ -1087,7 +1231,9 @@ static int ptlrpc_at_check_timed(struct ptlrpc_service *svc) counter++; array->paa_reqs_count[index]--; array->paa_count--; + cfs_spin_lock(&rq->rq_lock); rq->rq_at_linked = 0; + cfs_spin_unlock(&rq->rq_lock); continue; } @@ -1102,10 +1248,10 @@ static int ptlrpc_at_check_timed(struct ptlrpc_service *svc) index = 0; } array->paa_deadline = deadline; - cfs_spin_unlock(&svc->srv_at_lock); + /* we have a new earliest deadline, restart the timer */ + ptlrpc_at_set_timer(svcpt); - /* we have a new earliest deadline, restart the timer */ - ptlrpc_at_set_timer(svc); + cfs_spin_unlock(&svcpt->scp_at_lock); CDEBUG(D_ADAPTTO, "timeout in %+ds, asking for %d secs on %d early " "replies\n", first, at_extra, counter); @@ -1113,11 +1259,13 @@ static int ptlrpc_at_check_timed(struct ptlrpc_service *svc) /* We're already past request deadlines before we even get a chance to send early replies */ LCONSOLE_WARN("%s: This server is not able to keep up with " - "request traffic (cpu-bound).\n", svc->srv_name); - CWARN("earlyQ=%d reqQ=%d recA=%d, svcEst=%d, " - "delay="CFS_DURATION_T"(jiff)\n", - counter, svc->srv_n_queued_reqs, svc->srv_n_active_reqs, - at_get(&svc->srv_at_estimate), delay); + "request traffic (cpu-bound).\n", + svcpt->scp_service->srv_name); + CWARN("earlyQ=%d reqQ=%d recA=%d, svcEst=%d, " + "delay="CFS_DURATION_T"(jiff)\n", + counter, svcpt->scp_nreqs_incoming, + svcpt->scp_nreqs_active, + at_get(&svcpt->scp_at_estimate), delay); } /* we took additional refcount so entries can't be deleted from list, no @@ -1133,7 +1281,7 @@ static int ptlrpc_at_check_timed(struct ptlrpc_service *svc) ptlrpc_server_drop_request(rq); } - RETURN(0); + RETURN(1); /* return "did_something" for liblustre */ } /** @@ -1143,22 +1291,28 @@ static int ptlrpc_at_check_timed(struct ptlrpc_service *svc) static int ptlrpc_hpreq_init(struct ptlrpc_service *svc, struct ptlrpc_request *req) { - int rc; + int rc = 0; ENTRY; - if (svc->srv_hpreq_handler) { - rc = svc->srv_hpreq_handler(req); + if (svc->srv_ops.so_hpreq_handler) { + rc = svc->srv_ops.so_hpreq_handler(req); if (rc) RETURN(rc); } if (req->rq_export && req->rq_ops) { - cfs_spin_lock(&req->rq_export->exp_lock); + /* Perform request specific check. We should do this check + * before the request is added into exp_hp_rpcs list otherwise + * it may hit swab race at LU-1044. */ + if (req->rq_ops->hpreq_check) + rc = req->rq_ops->hpreq_check(req); + + cfs_spin_lock_bh(&req->rq_export->exp_rpc_lock); cfs_list_add(&req->rq_exp_list, - &req->rq_export->exp_queued_rpc); - cfs_spin_unlock(&req->rq_export->exp_lock); + &req->rq_export->exp_hp_rpcs); + cfs_spin_unlock_bh(&req->rq_export->exp_rpc_lock); } - RETURN(0); + RETURN(rc); } /** Remove the request from the export list. */ @@ -1166,9 +1320,14 @@ static void ptlrpc_hpreq_fini(struct ptlrpc_request *req) { ENTRY; if (req->rq_export && req->rq_ops) { - cfs_spin_lock(&req->rq_export->exp_lock); + /* refresh lock timeout again so that client has more + * room to send lock cancel RPC. */ + if (req->rq_ops->hpreq_fini) + req->rq_ops->hpreq_fini(req); + + cfs_spin_lock_bh(&req->rq_export->exp_rpc_lock); cfs_list_del_init(&req->rq_exp_list); - cfs_spin_unlock(&req->rq_export->exp_lock); + cfs_spin_unlock_bh(&req->rq_export->exp_rpc_lock); } EXIT; } @@ -1177,152 +1336,215 @@ static void ptlrpc_hpreq_fini(struct ptlrpc_request *req) * Make the request a high priority one. * * All the high priority requests are queued in a separate FIFO - * ptlrpc_service::srv_request_hpq list which is parallel to - * ptlrpc_service::srv_request_queue list but has a higher priority + * ptlrpc_service_part::scp_hpreq_pending list which is parallel to + * ptlrpc_service_part::scp_req_pending list but has a higher priority * for handling. * * \see ptlrpc_server_handle_request(). */ -static void ptlrpc_hpreq_reorder_nolock(struct ptlrpc_service *svc, +static void ptlrpc_hpreq_reorder_nolock(struct ptlrpc_service_part *svcpt, struct ptlrpc_request *req) { ENTRY; - LASSERT(svc != NULL); + cfs_spin_lock(&req->rq_lock); if (req->rq_hp == 0) { int opc = lustre_msg_get_opc(req->rq_reqmsg); /* Add to the high priority queue. */ - cfs_list_move_tail(&req->rq_list, &svc->srv_request_hpq); + cfs_list_move_tail(&req->rq_list, &svcpt->scp_hreq_pending); req->rq_hp = 1; if (opc != OBD_PING) - DEBUG_REQ(D_NET, req, "high priority req"); + DEBUG_REQ(D_RPCTRACE, req, "high priority req"); } cfs_spin_unlock(&req->rq_lock); EXIT; } +/** + * \see ptlrpc_hpreq_reorder_nolock + */ void ptlrpc_hpreq_reorder(struct ptlrpc_request *req) { - struct ptlrpc_service *svc = req->rq_rqbd->rqbd_service; - ENTRY; - - cfs_spin_lock(&svc->srv_lock); - /* It may happen that the request is already taken for the processing - * but still in the export list, do not re-add it into the HP list. */ - if (req->rq_phase == RQ_PHASE_NEW) - ptlrpc_hpreq_reorder_nolock(svc, req); - cfs_spin_unlock(&svc->srv_lock); - EXIT; + struct ptlrpc_service_part *svcpt = req->rq_rqbd->rqbd_svcpt; + ENTRY; + + cfs_spin_lock(&svcpt->scp_req_lock); + /* It may happen that the request is already taken for the processing + * but still in the export list, or the request is not in the request + * queue but in the export list already, do not add it into the + * HP list. */ + if (!cfs_list_empty(&req->rq_list)) + ptlrpc_hpreq_reorder_nolock(svcpt, req); + cfs_spin_unlock(&svcpt->scp_req_lock); + EXIT; } /** Check if the request is a high priority one. */ -static int ptlrpc_server_hpreq_check(struct ptlrpc_request *req) +static int ptlrpc_server_hpreq_check(struct ptlrpc_service *svc, + struct ptlrpc_request *req) { - int opc, rc = 0; ENTRY; /* Check by request opc. */ - opc = lustre_msg_get_opc(req->rq_reqmsg); - if (opc == OBD_PING) + if (OBD_PING == lustre_msg_get_opc(req->rq_reqmsg)) RETURN(1); - /* Perform request specific check. */ - if (req->rq_ops && req->rq_ops->hpreq_check) - rc = req->rq_ops->hpreq_check(req); - RETURN(rc); + RETURN(ptlrpc_hpreq_init(svc, req)); } /** Check if a request is a high priority one. */ -static int ptlrpc_server_request_add(struct ptlrpc_service *svc, - struct ptlrpc_request *req) +static int ptlrpc_server_request_add(struct ptlrpc_service_part *svcpt, + struct ptlrpc_request *req) { - int rc; - ENTRY; + int rc; + ENTRY; - rc = ptlrpc_server_hpreq_check(req); - if (rc < 0) - RETURN(rc); + rc = ptlrpc_server_hpreq_check(svcpt->scp_service, req); + if (rc < 0) + RETURN(rc); - cfs_spin_lock(&svc->srv_lock); - /* Before inserting the request into the queue, check if it is not - * inserted yet, or even already handled -- it may happen due to - * a racing ldlm_server_blocking_ast(). */ - if (req->rq_phase == RQ_PHASE_NEW && cfs_list_empty(&req->rq_list)) { - if (rc) - ptlrpc_hpreq_reorder_nolock(svc, req); - else - cfs_list_add_tail(&req->rq_list, - &svc->srv_request_queue); - } - cfs_spin_unlock(&svc->srv_lock); + cfs_spin_lock(&svcpt->scp_req_lock); - RETURN(0); + if (rc) + ptlrpc_hpreq_reorder_nolock(svcpt, req); + else + cfs_list_add_tail(&req->rq_list, &svcpt->scp_req_pending); + + cfs_spin_unlock(&svcpt->scp_req_lock); + + RETURN(0); +} + +/** + * Allow to handle high priority request + * User can call it w/o any lock but need to hold + * ptlrpc_service_part::scp_req_lock to get reliable result + */ +static int ptlrpc_server_allow_high(struct ptlrpc_service_part *svcpt, + int force) +{ + if (force) + return 1; + + if (svcpt->scp_nreqs_active >= svcpt->scp_nthrs_running - 1) + return 0; + + return cfs_list_empty(&svcpt->scp_req_pending) || + svcpt->scp_hreq_count < svcpt->scp_service->srv_hpreq_ratio; } -/* Only allow normal priority requests on a service that has a high-priority +static int ptlrpc_server_high_pending(struct ptlrpc_service_part *svcpt, + int force) +{ + return ptlrpc_server_allow_high(svcpt, force) && + !cfs_list_empty(&svcpt->scp_hreq_pending); +} + +/** + * Only allow normal priority requests on a service that has a high-priority * queue if forced (i.e. cleanup), if there are other high priority requests * already being processed (i.e. those threads can service more high-priority * requests), or if there are enough idle threads that a later thread can do - * a high priority request. */ -static int ptlrpc_server_allow_normal(struct ptlrpc_service *svc, int force) + * a high priority request. + * User can call it w/o any lock but need to hold + * ptlrpc_service_part::scp_req_lock to get reliable result + */ +static int ptlrpc_server_allow_normal(struct ptlrpc_service_part *svcpt, + int force) { - return force || !svc->srv_hpreq_handler || svc->srv_n_hpreq > 0 || - svc->srv_n_active_reqs < svc->srv_threads_running - 2; +#ifndef __KERNEL__ + if (1) /* always allow to handle normal request for liblustre */ + return 1; +#endif + if (force || + svcpt->scp_nreqs_active < svcpt->scp_nthrs_running - 2) + return 1; + + if (svcpt->scp_nreqs_active >= svcpt->scp_nthrs_running - 1) + return 0; + + return svcpt->scp_nhreqs_active > 0 || + svcpt->scp_service->srv_ops.so_hpreq_handler == NULL; } -static struct ptlrpc_request * -ptlrpc_server_request_get(struct ptlrpc_service *svc, int force) +static int ptlrpc_server_normal_pending(struct ptlrpc_service_part *svcpt, + int force) { - struct ptlrpc_request *req = NULL; - ENTRY; + return ptlrpc_server_allow_normal(svcpt, force) && + !cfs_list_empty(&svcpt->scp_req_pending); +} - if (ptlrpc_server_allow_normal(svc, force) && - !cfs_list_empty(&svc->srv_request_queue) && - (cfs_list_empty(&svc->srv_request_hpq) || - svc->srv_hpreq_count >= svc->srv_hpreq_ratio)) { - req = cfs_list_entry(svc->srv_request_queue.next, - struct ptlrpc_request, rq_list); - svc->srv_hpreq_count = 0; - } else if (!cfs_list_empty(&svc->srv_request_hpq)) { - req = cfs_list_entry(svc->srv_request_hpq.next, - struct ptlrpc_request, rq_list); - svc->srv_hpreq_count++; - } - RETURN(req); +/** + * Returns true if there are requests available in incoming + * request queue for processing and it is allowed to fetch them. + * User can call it w/o any lock but need to hold ptlrpc_service::scp_req_lock + * to get reliable result + * \see ptlrpc_server_allow_normal + * \see ptlrpc_server_allow high + */ +static inline int +ptlrpc_server_request_pending(struct ptlrpc_service_part *svcpt, int force) +{ + return ptlrpc_server_high_pending(svcpt, force) || + ptlrpc_server_normal_pending(svcpt, force); } -static int ptlrpc_server_request_pending(struct ptlrpc_service *svc, int force) +/** + * Fetch a request for processing from queue of unprocessed requests. + * Favors high-priority requests. + * Returns a pointer to fetched request. + */ +static struct ptlrpc_request * +ptlrpc_server_request_get(struct ptlrpc_service_part *svcpt, int force) { - return ((ptlrpc_server_allow_normal(svc, force) && - !cfs_list_empty(&svc->srv_request_queue)) || - !cfs_list_empty(&svc->srv_request_hpq)); + struct ptlrpc_request *req; + ENTRY; + + if (ptlrpc_server_high_pending(svcpt, force)) { + req = cfs_list_entry(svcpt->scp_hreq_pending.next, + struct ptlrpc_request, rq_list); + svcpt->scp_hreq_count++; + RETURN(req); + } + + if (ptlrpc_server_normal_pending(svcpt, force)) { + req = cfs_list_entry(svcpt->scp_req_pending.next, + struct ptlrpc_request, rq_list); + svcpt->scp_hreq_count = 0; + RETURN(req); + } + RETURN(NULL); } -/* Handle freshly incoming reqs, add to timed early reply list, - pass on to regular request queue */ +/** + * Handle freshly incoming reqs, add to timed early reply list, + * pass on to regular request queue. + * All incoming requests pass through here before getting into + * ptlrpc_server_handle_req later on. + */ static int -ptlrpc_server_handle_req_in(struct ptlrpc_service *svc) +ptlrpc_server_handle_req_in(struct ptlrpc_service_part *svcpt) { - struct ptlrpc_request *req; - __u32 deadline; - int rc; - ENTRY; - - LASSERT(svc); - - cfs_spin_lock(&svc->srv_lock); - if (cfs_list_empty(&svc->srv_req_in_queue)) { - cfs_spin_unlock(&svc->srv_lock); - RETURN(0); - } - - req = cfs_list_entry(svc->srv_req_in_queue.next, - struct ptlrpc_request, rq_list); - cfs_list_del_init (&req->rq_list); - /* Consider this still a "queued" request as far as stats are - concerned */ - cfs_spin_unlock(&svc->srv_lock); + struct ptlrpc_service *svc = svcpt->scp_service; + struct ptlrpc_request *req; + __u32 deadline; + int rc; + ENTRY; + + cfs_spin_lock(&svcpt->scp_lock); + if (cfs_list_empty(&svcpt->scp_req_incoming)) { + cfs_spin_unlock(&svcpt->scp_lock); + RETURN(0); + } + + req = cfs_list_entry(svcpt->scp_req_incoming.next, + struct ptlrpc_request, rq_list); + cfs_list_del_init(&req->rq_list); + svcpt->scp_nreqs_incoming--; + /* Consider this still a "queued" request as far as stats are + * concerned */ + cfs_spin_unlock(&svcpt->scp_lock); /* go through security check/transform */ rc = sptlrpc_svc_unwrap_request(req); @@ -1361,9 +1583,9 @@ ptlrpc_server_handle_req_in(struct ptlrpc_service *svc) } if (OBD_FAIL_CHECK(OBD_FAIL_PTLRPC_DROP_REQ_OPC) && - lustre_msg_get_opc(req->rq_reqmsg) == obd_fail_val) { + lustre_msg_get_opc(req->rq_reqmsg) == cfs_fail_val) { CERROR("drop incoming rpc opc %u, x"LPU64"\n", - obd_fail_val, req->rq_xid); + cfs_fail_val, req->rq_xid); goto err_req; } @@ -1382,11 +1604,12 @@ ptlrpc_server_handle_req_in(struct ptlrpc_service *svc) break; case MDS_READPAGE: case OST_READ: + case MGS_CONFIG_READ: req->rq_bulk_read = 1; break; } - CDEBUG(D_NET, "got req "LPU64"\n", req->rq_xid); + CDEBUG(D_RPCTRACE, "got req x"LPU64"\n", req->rq_xid); req->rq_export = class_conn2export( lustre_msg_get_handle(req->rq_reqmsg)); @@ -1422,65 +1645,57 @@ ptlrpc_server_handle_req_in(struct ptlrpc_service *svc) } ptlrpc_at_add_timed(req); - rc = ptlrpc_hpreq_init(svc, req); - if (rc) - GOTO(err_req, rc); /* Move it over to the request processing queue */ - rc = ptlrpc_server_request_add(svc, req); - if (rc) - GOTO(err_req, rc); - cfs_waitq_signal(&svc->srv_waitq); - RETURN(1); + rc = ptlrpc_server_request_add(svcpt, req); + if (rc) { + ptlrpc_hpreq_fini(req); + GOTO(err_req, rc); + } + cfs_waitq_signal(&svcpt->scp_waitq); + RETURN(1); err_req: - cfs_spin_lock(&svc->srv_lock); - svc->srv_n_queued_reqs--; - svc->srv_n_active_reqs++; - cfs_spin_unlock(&svc->srv_lock); - ptlrpc_server_finish_request(req); + cfs_spin_lock(&svcpt->scp_req_lock); + svcpt->scp_nreqs_active++; + cfs_spin_unlock(&svcpt->scp_req_lock); + ptlrpc_server_finish_request(svcpt, req); - RETURN(1); + RETURN(1); } +/** + * Main incoming request handling logic. + * Calls handler function from service to do actual processing. + */ static int -ptlrpc_server_handle_request(struct ptlrpc_service *svc, - struct ptlrpc_thread *thread) +ptlrpc_server_handle_request(struct ptlrpc_service_part *svcpt, + struct ptlrpc_thread *thread) { + struct ptlrpc_service *svc = svcpt->scp_service; struct obd_export *export = NULL; struct ptlrpc_request *request; struct timeval work_start; struct timeval work_end; long timediff; - int opc, rc; + int rc; int fail_opc = 0; ENTRY; - LASSERT(svc); - - cfs_spin_lock(&svc->srv_lock); - if (unlikely(!ptlrpc_server_request_pending(svc, 0) || - ( + cfs_spin_lock(&svcpt->scp_req_lock); #ifndef __KERNEL__ - /* !@%$# liblustre only has 1 thread */ - cfs_atomic_read(&svc->srv_n_difficult_replies) != 0 && + /* !@%$# liblustre only has 1 thread */ + if (cfs_atomic_read(&svcpt->scp_nreps_difficult) != 0) { + cfs_spin_unlock(&svcpt->scp_req_lock); + RETURN(0); + } #endif - svc->srv_n_active_reqs >= (svc->srv_threads_running - 1)))) { - /* Don't handle regular requests in the last thread, in order * re - * to handle difficult replies (which might block other threads) - * as well as handle any incoming reqs, early replies, etc. - * That means we always need at least 2 service threads. */ - cfs_spin_unlock(&svc->srv_lock); - RETURN(0); - } - - request = ptlrpc_server_request_get(svc, 0); - if (request == NULL) { - cfs_spin_unlock(&svc->srv_lock); + request = ptlrpc_server_request_get(svcpt, 0); + if (request == NULL) { + cfs_spin_unlock(&svcpt->scp_req_lock); RETURN(0); } - opc = lustre_msg_get_opc(request->rq_reqmsg); if (OBD_FAIL_CHECK(OBD_FAIL_PTLRPC_HPREQ_NOTIMEOUT)) fail_opc = OBD_FAIL_PTLRPC_HPREQ_NOTIMEOUT; else if (OBD_FAIL_CHECK(OBD_FAIL_PTLRPC_HPREQ_TIMEOUT)) @@ -1488,30 +1703,27 @@ ptlrpc_server_handle_request(struct ptlrpc_service *svc, if (unlikely(fail_opc)) { if (request->rq_export && request->rq_ops) { - cfs_spin_unlock(&svc->srv_lock); - OBD_FAIL_TIMEOUT(fail_opc, 4); - cfs_spin_lock(&svc->srv_lock); - request = ptlrpc_server_request_get(svc, 0); - if (request == NULL) { - cfs_spin_unlock(&svc->srv_lock); - RETURN(0); - } - LASSERT(ptlrpc_server_request_pending(svc, 0)); - } - } + cfs_spin_unlock(&svcpt->scp_req_lock); - cfs_list_del_init(&request->rq_list); - svc->srv_n_queued_reqs--; - svc->srv_n_active_reqs++; - if (request->rq_hp) - svc->srv_n_hpreq++; + OBD_FAIL_TIMEOUT(fail_opc, 4); - /* The phase is changed under the lock here because we need to know - * the request is under processing (see ptlrpc_hpreq_reorder()). */ - ptlrpc_rqphase_move(request, RQ_PHASE_INTERPRET); - cfs_spin_unlock(&svc->srv_lock); + cfs_spin_lock(&svcpt->scp_req_lock); + request = ptlrpc_server_request_get(svcpt, 0); + if (request == NULL) { + cfs_spin_unlock(&svcpt->scp_req_lock); + RETURN(0); + } + } + } + + cfs_list_del_init(&request->rq_list); + svcpt->scp_nreqs_active++; + if (request->rq_hp) + svcpt->scp_nhreqs_active++; - ptlrpc_hpreq_fini(request); + cfs_spin_unlock(&svcpt->scp_req_lock); + + ptlrpc_rqphase_move(request, RQ_PHASE_INTERPRET); if(OBD_FAIL_CHECK(OBD_FAIL_PTLRPC_DUMP_LOG)) libcfs_debug_dumplog(); @@ -1522,15 +1734,14 @@ ptlrpc_server_handle_request(struct ptlrpc_service *svc, lprocfs_counter_add(svc->srv_stats, PTLRPC_REQWAIT_CNTR, timediff); lprocfs_counter_add(svc->srv_stats, PTLRPC_REQQDEPTH_CNTR, - svc->srv_n_queued_reqs); - lprocfs_counter_add(svc->srv_stats, PTLRPC_REQACTIVE_CNTR, - svc->srv_n_active_reqs); - lprocfs_counter_add(svc->srv_stats, PTLRPC_TIMEOUT, - at_get(&svc->srv_at_estimate)); + svcpt->scp_nreqs_incoming); + lprocfs_counter_add(svc->srv_stats, PTLRPC_REQACTIVE_CNTR, + svcpt->scp_nreqs_active); + lprocfs_counter_add(svc->srv_stats, PTLRPC_TIMEOUT, + at_get(&svcpt->scp_at_estimate)); } - rc = lu_context_init(&request->rq_session, - LCT_SESSION|LCT_REMEMBER|LCT_NOREF); + rc = lu_context_init(&request->rq_session, LCT_SESSION | LCT_NOREF); if (rc) { CERROR("Failure to initialize session: %d\n", rc); goto out_req; @@ -1576,9 +1787,9 @@ ptlrpc_server_handle_request(struct ptlrpc_service *svc, lustre_msg_get_opc(request->rq_reqmsg)); if (lustre_msg_get_opc(request->rq_reqmsg) != OBD_PING) - OBD_FAIL_TIMEOUT_MS(OBD_FAIL_PTLRPC_PAUSE_REQ, obd_fail_val); + CFS_FAIL_TIMEOUT_MS(OBD_FAIL_PTLRPC_PAUSE_REQ, cfs_fail_val); - rc = svc->srv_handler(request); + rc = svc->srv_ops.so_req_handler(request); ptlrpc_rqphase_move(request, RQ_PHASE_COMPLETE); @@ -1641,30 +1852,25 @@ put_conn: } out_req: - cfs_spin_lock(&svc->srv_lock); - if (request->rq_hp) - svc->srv_n_hpreq--; - cfs_spin_unlock(&svc->srv_lock); - ptlrpc_server_finish_request(request); + ptlrpc_server_finish_request(svcpt, request); - RETURN(1); + RETURN(1); } /** * An internal function to process a single reply state object. */ static int -ptlrpc_handle_rs (struct ptlrpc_reply_state *rs) +ptlrpc_handle_rs(struct ptlrpc_reply_state *rs) { - struct ptlrpc_service *svc = rs->rs_service; + struct ptlrpc_service_part *svcpt = rs->rs_svcpt; + struct ptlrpc_service *svc = svcpt->scp_service; struct obd_export *exp; - struct obd_device *obd; int nlocks; int been_handled; ENTRY; exp = rs->rs_export; - obd = exp->exp_obd; LASSERT (rs->rs_difficult); LASSERT (rs->rs_scheduled); @@ -1746,16 +1952,15 @@ ptlrpc_handle_rs (struct ptlrpc_reply_state *rs) class_export_put (exp); rs->rs_export = NULL; ptlrpc_rs_decref (rs); - cfs_atomic_dec (&svc->srv_outstanding_replies); - if (cfs_atomic_dec_and_test(&svc->srv_n_difficult_replies) && - svc->srv_is_stopping) - cfs_waitq_broadcast(&svc->srv_waitq); - RETURN(1); - } - - /* still on the net; callback will schedule */ - cfs_spin_unlock(&rs->rs_lock); - RETURN(1); + if (cfs_atomic_dec_and_test(&svcpt->scp_nreps_difficult) && + svc->srv_is_stopping) + cfs_waitq_broadcast(&svcpt->scp_waitq); + RETURN(1); + } + + /* still on the net; callback will schedule */ + cfs_spin_unlock(&rs->rs_lock); + RETURN(1); } #ifndef __KERNEL__ @@ -1769,22 +1974,22 @@ ptlrpc_handle_rs (struct ptlrpc_reply_state *rs) * \retval 1 one reply processed */ static int -ptlrpc_server_handle_reply(struct ptlrpc_service *svc) +ptlrpc_server_handle_reply(struct ptlrpc_service_part *svcpt) { - struct ptlrpc_reply_state *rs = NULL; - ENTRY; - - cfs_spin_lock(&svc->srv_lock); - if (!cfs_list_empty(&svc->srv_reply_queue)) { - rs = cfs_list_entry(svc->srv_reply_queue.prev, - struct ptlrpc_reply_state, - rs_list); - cfs_list_del_init(&rs->rs_list); - } - cfs_spin_unlock(&svc->srv_lock); - if (rs != NULL) - ptlrpc_handle_rs(rs); - RETURN(rs != NULL); + struct ptlrpc_reply_state *rs = NULL; + ENTRY; + + cfs_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); + } + cfs_spin_unlock(&svcpt->scp_rep_lock); + if (rs != NULL) + ptlrpc_handle_rs(rs); + RETURN(rs != NULL); } /* FIXME make use of timeout later */ @@ -1801,41 +2006,44 @@ liblustre_check_services (void *arg) 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; - if (svc->srv_threads_running != 0) /* I've recursed */ - continue; + svcpt = svc->srv_part; - /* 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. */ + if (svcpt->scp_nthrs_running != 0) /* I've recursed */ + continue; - svc->srv_threads_running++; + /* 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. */ - do { - rc = ptlrpc_server_handle_req_in(svc); - rc |= ptlrpc_server_handle_reply(svc); - rc |= ptlrpc_at_check_timed(svc); - rc |= ptlrpc_server_handle_request(svc, NULL); - rc |= (ptlrpc_server_post_idle_rqbds(svc) > 0); - did_something |= rc; - } while (rc); + svcpt->scp_nthrs_running++; - svc->srv_threads_running--; - } + do { + rc = ptlrpc_server_handle_req_in(svcpt); + 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); - RETURN(did_something); + 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 *svc) +ptlrpc_check_rqbd_pool(struct ptlrpc_service_part *svcpt) { - int avail = svc->srv_nrqbd_receiving; - int low_water = test_req_buffer_pressure ? 0 : - svc->srv_nbuf_per_group/2; + int avail = svcpt->scp_nrqbds_posted; + int low_water = test_req_buffer_pressure ? 0 : + svcpt->scp_service->srv_nbuf_per_group / 2; /* NB I'm not locking; just looking. */ @@ -1845,38 +2053,132 @@ ptlrpc_check_rqbd_pool(struct ptlrpc_service *svc) * space. */ if (avail <= low_water) - ptlrpc_grow_req_bufs(svc); + ptlrpc_grow_req_bufs(svcpt); - if (svc->srv_stats) - lprocfs_counter_add(svc->srv_stats, PTLRPC_REQBUF_AVAIL_CNTR, - avail); + if (svcpt->scp_service->srv_stats) { + lprocfs_counter_add(svcpt->scp_service->srv_stats, + PTLRPC_REQBUF_AVAIL_CNTR, avail); + } } static int ptlrpc_retry_rqbds(void *arg) { - struct ptlrpc_service *svc = (struct ptlrpc_service *)arg; + struct ptlrpc_service_part *svcpt = (struct ptlrpc_service_part *)arg; + + svcpt->scp_rqbd_timeout = 0; + return -ETIMEDOUT; +} + +static inline int +ptlrpc_threads_enough(struct ptlrpc_service_part *svcpt) +{ + return svcpt->scp_nreqs_active < + svcpt->scp_nthrs_running - 1 - + (svcpt->scp_service->srv_ops.so_hpreq_handler != NULL); +} + +/** + * allowed to create more threads + * user can call it w/o any lock but need to hold + * ptlrpc_service_part::scp_lock to get reliable result + */ +static inline int +ptlrpc_threads_increasable(struct ptlrpc_service_part *svcpt) +{ + return svcpt->scp_nthrs_running + + svcpt->scp_nthrs_starting < svcpt->scp_service->srv_threads_max; +} + +/** + * too many requests and allowed to create more threads + */ +static inline int +ptlrpc_threads_need_create(struct ptlrpc_service_part *svcpt) +{ + return !ptlrpc_threads_enough(svcpt) && + ptlrpc_threads_increasable(svcpt); +} + +static inline int +ptlrpc_thread_stopping(struct ptlrpc_thread *thread) +{ + return thread_is_stopping(thread) || + thread->t_svcpt->scp_service->srv_is_stopping; +} + +static inline int +ptlrpc_rqbd_pending(struct ptlrpc_service_part *svcpt) +{ + return !cfs_list_empty(&svcpt->scp_rqbd_idle) && + svcpt->scp_rqbd_timeout == 0; +} - svc->srv_rqbd_timeout = 0; - return (-ETIMEDOUT); +static inline int +ptlrpc_at_check(struct ptlrpc_service_part *svcpt) +{ + return svcpt->scp_at_check; } +/** + * requests wait on preprocessing + * user can call it w/o any lock but need to hold + * ptlrpc_service_part::scp_lock to get reliable result + */ +static inline int +ptlrpc_server_request_incoming(struct ptlrpc_service_part *svcpt) +{ + return !cfs_list_empty(&svcpt->scp_req_incoming); +} + +static __attribute__((__noinline__)) int +ptlrpc_wait_event(struct ptlrpc_service_part *svcpt, + struct ptlrpc_thread *thread) +{ + /* Don't exit while there are replies to be handled */ + struct l_wait_info lwi = LWI_TIMEOUT(svcpt->scp_rqbd_timeout, + ptlrpc_retry_rqbds, svcpt); + + lc_watchdog_disable(thread->t_watchdog); + + cfs_cond_resched(); + + l_wait_event_exclusive_head(svcpt->scp_waitq, + ptlrpc_thread_stopping(thread) || + ptlrpc_server_request_incoming(svcpt) || + ptlrpc_server_request_pending(svcpt, 0) || + ptlrpc_rqbd_pending(svcpt) || + ptlrpc_at_check(svcpt), &lwi); + + if (ptlrpc_thread_stopping(thread)) + return -EINTR; + + lc_watchdog_touch(thread->t_watchdog, + ptlrpc_server_get_timeout(svcpt)); + return 0; +} + +/** + * Main thread body for service threads. + * Waits in a loop waiting for new requests to process to appear. + * Every time an incoming requests is added to its queue, a waitq + * is woken up and one of the threads will handle it. + */ static int ptlrpc_main(void *arg) { - struct ptlrpc_svc_data *data = (struct ptlrpc_svc_data *)arg; - struct ptlrpc_service *svc = data->svc; - struct ptlrpc_thread *thread = data->thread; - struct obd_device *dev = data->dev; - struct ptlrpc_reply_state *rs; + struct ptlrpc_thread *thread = (struct ptlrpc_thread *)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 cfs_group_info_t *ginfo = NULL; #endif - struct lu_env env; + struct lu_env *env; int counter = 0, rc = 0; ENTRY; thread->t_pid = cfs_curproc_pid(); - cfs_daemonize_ctxt(data->name); + cfs_daemonize_ctxt(thread->t_name); #if defined(HAVE_NODE_TO_CPUMASK) && defined(CONFIG_NUMA) /* we need to do this before any per-thread allocation is done so that @@ -1886,7 +2188,7 @@ static int ptlrpc_main(void *arg) for (cpu = 0, num_cpu = 0; cpu < cfs_num_possible_cpus(); cpu++) { - if (!cfs_cpu_online(cpu)) + if (!cpu_online(cpu)) continue; if (num_cpu == thread->t_id % cfs_num_online_cpus()) break; @@ -1908,116 +2210,102 @@ static int ptlrpc_main(void *arg) cfs_put_group_info(ginfo); #endif - if (svc->srv_init != NULL) { - rc = svc->srv_init(thread); + if (svc->srv_ops.so_thr_init != NULL) { + rc = svc->srv_ops.so_thr_init(thread); if (rc) goto out; } - rc = lu_context_init(&env.le_ctx, + OBD_ALLOC_PTR(env); + if (env == NULL) { + rc = -ENOMEM; + goto out_srv_fini; + } + + rc = lu_context_init(&env->le_ctx, svc->srv_ctx_tags|LCT_REMEMBER|LCT_NOREF); if (rc) goto out_srv_fini; - thread->t_env = &env; - env.le_ctx.lc_thread = thread; - env.le_ctx.lc_cookie = 0x6; + thread->t_env = env; + env->le_ctx.lc_thread = thread; + env->le_ctx.lc_cookie = 0x6; /* Alloc reply state structure for this one */ - OBD_ALLOC_GFP(rs, svc->srv_max_reply_size, CFS_ALLOC_STD); + OBD_ALLOC_LARGE(rs, svc->srv_max_reply_size); if (!rs) { rc = -ENOMEM; goto out_srv_fini; } - cfs_spin_lock(&svc->srv_lock); - /* SVC_STOPPING may already be set here if someone else is trying - * to stop the service while this new thread has been dynamically - * forked. We still set SVC_RUNNING to let our creator know that - * we are now running, however we will exit as soon as possible */ - thread->t_flags |= SVC_RUNNING; - cfs_spin_unlock(&svc->srv_lock); - - /* - * wake up our creator. Note: @data is invalid after this point, - * because it's allocated on ptlrpc_start_thread() stack. - */ - cfs_waitq_signal(&thread->t_ctl_waitq); - - thread->t_watchdog = lc_watchdog_add(CFS_GET_TIMEOUT(svc), NULL, NULL); + cfs_spin_lock(&svcpt->scp_lock); - cfs_spin_lock(&svc->srv_lock); - svc->srv_threads_running++; - cfs_list_add(&rs->rs_list, &svc->srv_free_rs_list); - cfs_spin_unlock(&svc->srv_lock); - cfs_waitq_signal(&svc->srv_free_rs_waitq); + LASSERT(thread_is_starting(thread)); + thread_clear_flags(thread, SVC_STARTING); - CDEBUG(D_NET, "service thread %d (#%d) started\n", thread->t_id, - svc->srv_threads_running); + LASSERT(svcpt->scp_nthrs_starting == 1); + svcpt->scp_nthrs_starting--; - /* XXX maintain a list of all managed devices: insert here */ + /* SVC_STOPPING may already be set here if someone else is trying + * to stop the service while this new thread has been dynamically + * forked. We still set SVC_RUNNING to let our creator know that + * we are now running, however we will exit as soon as possible */ + thread_add_flags(thread, SVC_RUNNING); + svcpt->scp_nthrs_running++; + cfs_spin_unlock(&svcpt->scp_lock); - while (!(thread->t_flags & SVC_STOPPING) && !svc->srv_is_stopping) { - /* Don't exit while there are replies to be handled */ - struct l_wait_info lwi = LWI_TIMEOUT(svc->srv_rqbd_timeout, - ptlrpc_retry_rqbds, svc); + /* wake up our creator in case he's still waiting. */ + cfs_waitq_signal(&thread->t_ctl_waitq); - lc_watchdog_disable(thread->t_watchdog); + thread->t_watchdog = lc_watchdog_add(ptlrpc_server_get_timeout(svcpt), + NULL, NULL); - cfs_cond_resched(); + cfs_spin_lock(&svcpt->scp_rep_lock); + cfs_list_add(&rs->rs_list, &svcpt->scp_rep_idle); + cfs_waitq_signal(&svcpt->scp_rep_waitq); + cfs_spin_unlock(&svcpt->scp_rep_lock); - l_wait_event_exclusive (svc->srv_waitq, - thread->t_flags & SVC_STOPPING || - svc->srv_is_stopping || - (!cfs_list_empty(&svc->srv_idle_rqbds) && - svc->srv_rqbd_timeout == 0) || - !cfs_list_empty(&svc->srv_req_in_queue) || - (ptlrpc_server_request_pending(svc, 0) && - (svc->srv_n_active_reqs < - (svc->srv_threads_running - 1))) || - svc->srv_at_check, - &lwi); + CDEBUG(D_NET, "service thread %d (#%d) started\n", thread->t_id, + svcpt->scp_nthrs_running); - if (thread->t_flags & SVC_STOPPING || svc->srv_is_stopping) - break; - - lc_watchdog_touch(thread->t_watchdog, CFS_GET_TIMEOUT(svc)); - - ptlrpc_check_rqbd_pool(svc); + /* XXX maintain a list of all managed devices: insert here */ + while (!ptlrpc_thread_stopping(thread)) { + if (ptlrpc_wait_event(svcpt, thread)) + break; - if (svc->srv_threads_started < svc->srv_threads_max && - svc->srv_n_active_reqs >= (svc->srv_threads_started - 1)) - /* Ignore return code - we tried... */ - ptlrpc_start_thread(dev, svc); + ptlrpc_check_rqbd_pool(svcpt); - if (!cfs_list_empty(&svc->srv_req_in_queue)) { - /* Process all incoming reqs before handling any */ - ptlrpc_server_handle_req_in(svc); - /* but limit ourselves in case of flood */ - if (counter++ < 1000) - continue; - counter = 0; + if (ptlrpc_threads_need_create(svcpt)) { + /* Ignore return code - we tried... */ + ptlrpc_start_thread(svcpt, 0); } - if (svc->srv_at_check) - ptlrpc_at_check_timed(svc); - - /* don't handle requests in the last thread */ - if (ptlrpc_server_request_pending(svc, 0) && - (svc->srv_n_active_reqs < (svc->srv_threads_running - 1))) { - lu_context_enter(&env.le_ctx); - ptlrpc_server_handle_request(svc, thread); - lu_context_exit(&env.le_ctx); + /* Process all incoming reqs before handling any */ + if (ptlrpc_server_request_incoming(svcpt)) { + ptlrpc_server_handle_req_in(svcpt); + /* but limit ourselves in case of flood */ + if (counter++ < 100) + continue; + counter = 0; + } + + if (ptlrpc_at_check(svcpt)) + ptlrpc_at_check_timed(svcpt); + + if (ptlrpc_server_request_pending(svcpt, 0)) { + lu_context_enter(&env->le_ctx); + ptlrpc_server_handle_request(svcpt, thread); + lu_context_exit(&env->le_ctx); } - if (!cfs_list_empty(&svc->srv_idle_rqbds) && - ptlrpc_server_post_idle_rqbds(svc) < 0) { - /* I just failed to repost request buffers. Wait - * for a timeout (unless something else happens) - * before I try again */ - svc->srv_rqbd_timeout = cfs_time_seconds(1)/10; - CDEBUG(D_RPCTRACE,"Posted buffers: %d\n", - svc->srv_nrqbd_receiving); + if (ptlrpc_rqbd_pending(svcpt) && + ptlrpc_server_post_idle_rqbds(svcpt) < 0) { + /* I just failed to repost request buffers. + * Wait for a timeout (unless something else + * happens) before I try again */ + svcpt->scp_rqbd_timeout = cfs_time_seconds(1) / 10; + CDEBUG(D_RPCTRACE, "Posted buffers: %d\n", + svcpt->scp_nrqbds_posted); } } @@ -2028,23 +2316,33 @@ out_srv_fini: /* * deconstruct service specific state created by ptlrpc_start_thread() */ - if (svc->srv_done != NULL) - svc->srv_done(thread); + if (svc->srv_ops.so_thr_done != NULL) + svc->srv_ops.so_thr_done(thread); - lu_context_fini(&env.le_ctx); + if (env != NULL) { + lu_context_fini(&env->le_ctx); + OBD_FREE_PTR(env); + } out: CDEBUG(D_RPCTRACE, "service thread [ %p : %u ] %d exiting: rc %d\n", thread, thread->t_pid, thread->t_id, rc); - cfs_spin_lock(&svc->srv_lock); - svc->srv_threads_running--; /* must know immediately */ - thread->t_id = rc; - thread->t_flags = SVC_STOPPED; + cfs_spin_lock(&svcpt->scp_lock); + if (thread_test_and_clear_flags(thread, SVC_STARTING)) + svcpt->scp_nthrs_starting--; - cfs_waitq_signal(&thread->t_ctl_waitq); - cfs_spin_unlock(&svc->srv_lock); + if (thread_test_and_clear_flags(thread, SVC_RUNNING)) { + /* must know immediately */ + svcpt->scp_nthrs_running--; + } - return rc; + thread->t_id = rc; + thread_add_flags(thread, SVC_STOPPED); + + cfs_waitq_signal(&thread->t_ctl_waitq); + cfs_spin_unlock(&svcpt->scp_lock); + + return rc; } struct ptlrpc_hr_args { @@ -2066,6 +2364,10 @@ static int hrt_dont_sleep(struct ptlrpc_hr_thread *t, return result; } +/** + * Main body of "handle reply" function. + * It processes acked reply states + */ static int ptlrpc_hr_main(void *arg) { struct ptlrpc_hr_args * hr_args = arg; @@ -2078,7 +2380,7 @@ static int ptlrpc_hr_main(void *arg) "ptlrpc_hr_%d", hr_args->thread_index); cfs_daemonize_ctxt(threadname); -#if defined(CONFIG_SMP) && defined(HAVE_NODE_TO_CPUMASK) +#if defined(CONFIG_NUMA) && defined(HAVE_NODE_TO_CPUMASK) cfs_set_cpus_allowed(cfs_current(), node_to_cpumask(cpu_to_node(hr_args->cpu_index))); #endif @@ -2087,7 +2389,7 @@ static int ptlrpc_hr_main(void *arg) while (!cfs_test_bit(HRT_STOPPING, &t->hrt_flags)) { - l_cfs_wait_event(t->hrt_wait, hrt_dont_sleep(t, &replies)); + l_wait_condition(t->hrt_wait, hrt_dont_sleep(t, &replies)); while (!cfs_list_empty(&replies)) { struct ptlrpc_reply_state *rs; @@ -2116,13 +2418,12 @@ static int ptlrpc_start_hr_thread(struct ptlrpc_hr_service *hr, int n, int cpu) args.cpu_index = cpu; args.hrs = hr; - rc = cfs_kernel_thread(ptlrpc_hr_main, (void*)&args, - CLONE_VM|CLONE_FILES); + rc = cfs_create_thread(ptlrpc_hr_main, (void*)&args, CFS_DAEMON_FLAGS); if (rc < 0) { cfs_complete(&t->hrt_completion); GOTO(out, rc); } - l_cfs_wait_event(t->hrt_wait, cfs_test_bit(HRT_RUNNING, &t->hrt_flags)); + l_wait_condition(t->hrt_wait, cfs_test_bit(HRT_RUNNING, &t->hrt_flags)); RETURN(0); out: return rc; @@ -2161,7 +2462,7 @@ static int ptlrpc_start_hr_threads(struct ptlrpc_hr_service *hr) for (n = 0, cpu = 0; n < hr->hr_n_threads; n++) { #if defined(CONFIG_SMP) && defined(HAVE_NODE_TO_CPUMASK) - while(!cfs_cpu_online(cpu)) { + while (!cpu_online(cpu)) { cpu++; if (cpu >= cfs_num_possible_cpus()) cpu = 0; @@ -2185,52 +2486,69 @@ static int ptlrpc_start_hr_threads(struct ptlrpc_hr_service *hr) RETURN(0); } -static void ptlrpc_stop_thread(struct ptlrpc_service *svc, - struct ptlrpc_thread *thread) +static void ptlrpc_svcpt_stop_threads(struct ptlrpc_service_part *svcpt) { - struct l_wait_info lwi = { 0 }; - ENTRY; - - CDEBUG(D_RPCTRACE, "Stopping thread [ %p : %u ]\n", - thread, thread->t_pid); - - cfs_spin_lock(&svc->srv_lock); - /* let the thread know that we would like it to stop asap */ - thread->t_flags |= SVC_STOPPING; - cfs_spin_unlock(&svc->srv_lock); - - cfs_waitq_broadcast(&svc->srv_waitq); - l_wait_event(thread->t_ctl_waitq, - (thread->t_flags & SVC_STOPPED), &lwi); - - cfs_spin_lock(&svc->srv_lock); - cfs_list_del(&thread->t_link); - cfs_spin_unlock(&svc->srv_lock); - - OBD_FREE_PTR(thread); - EXIT; + struct l_wait_info lwi = { 0 }; + struct ptlrpc_thread *thread; + CFS_LIST_HEAD (zombie); + + ENTRY; + + CDEBUG(D_INFO, "Stopping threads for service %s\n", + svcpt->scp_service->srv_name); + + cfs_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) { + CDEBUG(D_INFO, "Stopping thread %s #%u\n", + svcpt->scp_service->srv_thread_name, thread->t_id); + thread_add_flags(thread, SVC_STOPPING); + } + + cfs_waitq_broadcast(&svcpt->scp_waitq); + + while (!cfs_list_empty(&svcpt->scp_threads)) { + thread = cfs_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); + continue; + } + cfs_spin_unlock(&svcpt->scp_lock); + + CDEBUG(D_INFO, "waiting for stopping-thread %s #%u\n", + svcpt->scp_service->srv_thread_name, thread->t_id); + l_wait_event(thread->t_ctl_waitq, + thread_is_stopped(thread), &lwi); + + cfs_spin_lock(&svcpt->scp_lock); + } + + cfs_spin_unlock(&svcpt->scp_lock); + + while (!cfs_list_empty(&zombie)) { + thread = cfs_list_entry(zombie.next, + struct ptlrpc_thread, t_link); + cfs_list_del(&thread->t_link); + OBD_FREE_PTR(thread); + } + EXIT; } +/** + * Stops all threads of a particular service \a svc + */ void ptlrpc_stop_all_threads(struct ptlrpc_service *svc) { - struct ptlrpc_thread *thread; - ENTRY; - - cfs_spin_lock(&svc->srv_lock); - while (!cfs_list_empty(&svc->srv_threads)) { - thread = cfs_list_entry(svc->srv_threads.next, - struct ptlrpc_thread, t_link); - - cfs_spin_unlock(&svc->srv_lock); - ptlrpc_stop_thread(svc, thread); - cfs_spin_lock(&svc->srv_lock); - } + ENTRY; - cfs_spin_unlock(&svc->srv_lock); - EXIT; + if (svc != NULL && svc->srv_part != NULL) + ptlrpc_svcpt_stop_threads(svc->srv_part); + EXIT; } -int ptlrpc_start_threads(struct obd_device *dev, struct ptlrpc_service *svc) +int ptlrpc_start_threads(struct ptlrpc_service *svc) { int i, rc = 0; ENTRY; @@ -2239,10 +2557,12 @@ int ptlrpc_start_threads(struct obd_device *dev, struct ptlrpc_service *svc) ptlrpc_server_handle_request */ LASSERT(svc->srv_threads_min >= 2); for (i = 0; i < svc->srv_threads_min; i++) { - rc = ptlrpc_start_thread(dev, svc); + rc = ptlrpc_start_thread(svc->srv_part, 1); /* We have enough threads, don't start more. b=15759 */ - if (rc == -EMFILE) + if (rc == -EMFILE) { + rc = 0; break; + } if (rc) { CERROR("cannot start %s thread #%d: rc %d\n", svc->srv_thread_name, i, rc); @@ -2253,75 +2573,99 @@ int ptlrpc_start_threads(struct obd_device *dev, struct ptlrpc_service *svc) RETURN(rc); } -int ptlrpc_start_thread(struct obd_device *dev, struct ptlrpc_service *svc) +int ptlrpc_start_thread(struct ptlrpc_service_part *svcpt, int wait) { - struct l_wait_info lwi = { 0 }; - struct ptlrpc_svc_data d; - struct ptlrpc_thread *thread; - char name[32]; - int id, rc; - ENTRY; - - CDEBUG(D_RPCTRACE, "%s started %d min %d max %d running %d\n", - svc->srv_name, svc->srv_threads_started, svc->srv_threads_min, - svc->srv_threads_max, svc->srv_threads_running); - - if (unlikely(svc->srv_is_stopping)) - RETURN(-ESRCH); - - if (unlikely(svc->srv_threads_started >= svc->srv_threads_max) || - (OBD_FAIL_CHECK(OBD_FAIL_TGT_TOOMANY_THREADS) && - svc->srv_threads_started == svc->srv_threads_min - 1)) - RETURN(-EMFILE); - - OBD_ALLOC_PTR(thread); - if (thread == NULL) - RETURN(-ENOMEM); - cfs_waitq_init(&thread->t_ctl_waitq); - - cfs_spin_lock(&svc->srv_lock); - if (svc->srv_threads_started >= svc->srv_threads_max) { - cfs_spin_unlock(&svc->srv_lock); - OBD_FREE_PTR(thread); - RETURN(-EMFILE); - } - cfs_list_add(&thread->t_link, &svc->srv_threads); - id = svc->srv_threads_started++; - cfs_spin_unlock(&svc->srv_lock); - - thread->t_svc = svc; - thread->t_id = id; - sprintf(name, "%s_%02d", svc->srv_thread_name, id); - d.dev = dev; - d.svc = svc; - d.name = name; - d.thread = thread; - - CDEBUG(D_RPCTRACE, "starting thread '%s'\n", name); - - /* CLONE_VM and CLONE_FILES just avoid a needless copy, because we - * just drop the VM and FILES in cfs_daemonize_ctxt() right away. - */ - rc = cfs_kernel_thread(ptlrpc_main, &d, CLONE_VM | CLONE_FILES); - if (rc < 0) { - CERROR("cannot start thread '%s': rc %d\n", name, rc); - - cfs_spin_lock(&svc->srv_lock); - cfs_list_del(&thread->t_link); - --svc->srv_threads_started; - cfs_spin_unlock(&svc->srv_lock); + struct l_wait_info lwi = { 0 }; + struct ptlrpc_thread *thread; + struct ptlrpc_service *svc = svcpt->scp_service; + int rc; + ENTRY; + + LASSERT(svcpt != NULL); + + CDEBUG(D_RPCTRACE, "%s started %d min %d max %d\n", + svc->srv_name, svcpt->scp_nthrs_running, + svc->srv_threads_min, svc->srv_threads_max); + + again: + if (unlikely(svc->srv_is_stopping)) + RETURN(-ESRCH); + + if (!ptlrpc_threads_increasable(svcpt) || + (OBD_FAIL_CHECK(OBD_FAIL_TGT_TOOMANY_THREADS) && + svcpt->scp_nthrs_running == svc->srv_threads_min - 1)) + RETURN(-EMFILE); + + OBD_ALLOC_PTR(thread); + if (thread == NULL) + RETURN(-ENOMEM); + cfs_waitq_init(&thread->t_ctl_waitq); + + cfs_spin_lock(&svcpt->scp_lock); + if (!ptlrpc_threads_increasable(svcpt)) { + cfs_spin_unlock(&svcpt->scp_lock); + OBD_FREE_PTR(thread); + RETURN(-EMFILE); + } + + if (svcpt->scp_nthrs_starting != 0) { + /* serialize starting because some modules (obdfilter) + * might require unique and contiguous t_id */ + LASSERT(svcpt->scp_nthrs_starting == 1); + cfs_spin_unlock(&svcpt->scp_lock); + OBD_FREE_PTR(thread); + if (wait) { + CDEBUG(D_INFO, "Waiting for creating thread %s #%d\n", + svc->srv_thread_name, svcpt->scp_thr_nextid); + cfs_schedule(); + goto again; + } + + CDEBUG(D_INFO, "Creating thread %s #%d race, retry later\n", + svc->srv_thread_name, svcpt->scp_thr_nextid); + RETURN(-EAGAIN); + } + + svcpt->scp_nthrs_starting++; + thread->t_id = svcpt->scp_thr_nextid++; + thread_add_flags(thread, SVC_STARTING); + thread->t_svcpt = svcpt; + + cfs_list_add(&thread->t_link, &svcpt->scp_threads); + cfs_spin_unlock(&svcpt->scp_lock); + + snprintf(thread->t_name, PTLRPC_THR_NAME_LEN, + "%s_%02d", svc->srv_thread_name, thread->t_id); + + CDEBUG(D_RPCTRACE, "starting thread '%s'\n", thread->t_name); + /* + * CLONE_VM and CLONE_FILES just avoid a needless copy, because we + * just drop the VM and FILES in cfs_daemonize_ctxt() right away. + */ + rc = cfs_create_thread(ptlrpc_main, thread, CFS_DAEMON_FLAGS); + if (rc < 0) { + CERROR("cannot start thread '%s': rc %d\n", + thread->t_name, rc); + cfs_spin_lock(&svcpt->scp_lock); + cfs_list_del(&thread->t_link); + --svcpt->scp_nthrs_starting; + cfs_spin_unlock(&svcpt->scp_lock); OBD_FREE(thread, sizeof(*thread)); RETURN(rc); } + + if (!wait) + RETURN(0); + l_wait_event(thread->t_ctl_waitq, - thread->t_flags & (SVC_RUNNING | SVC_STOPPED), &lwi); + thread_is_running(thread) || thread_is_stopped(thread), + &lwi); - rc = (thread->t_flags & SVC_STOPPED) ? thread->t_id : 0; + rc = thread_is_stopped(thread) ? thread->t_id : 0; RETURN(rc); } - int ptlrpc_hr_init(void) { int i; @@ -2371,201 +2715,273 @@ void ptlrpc_hr_fini(void) /** * Wait until all already scheduled replies are processed. */ -static void ptlrpc_wait_replies(struct ptlrpc_service *svc) -{ - while (1) { - int rc; - struct l_wait_info lwi = LWI_TIMEOUT(cfs_time_seconds(10), - NULL, NULL); - rc = l_wait_event(svc->srv_waitq, cfs_atomic_read(&svc-> \ - srv_n_difficult_replies) == 0, - &lwi); - if (rc == 0) - break; - CWARN("Unexpectedly long timeout %p\n", svc); - } +static void ptlrpc_wait_replies(struct ptlrpc_service_part *svcpt) +{ + while (1) { + int rc; + struct l_wait_info lwi = LWI_TIMEOUT(cfs_time_seconds(10), + NULL, NULL); + + rc = l_wait_event(svcpt->scp_waitq, + cfs_atomic_read(&svcpt->scp_nreps_difficult) == 0, &lwi); + if (rc == 0) + break; + CWARN("Unexpectedly long timeout %s %p\n", + svcpt->scp_service->srv_name, svcpt->scp_service); + } } -int ptlrpc_unregister_service(struct ptlrpc_service *service) +static void +ptlrpc_service_del_atimer(struct ptlrpc_service *svc) { - int rc; - struct l_wait_info lwi; - cfs_list_t *tmp; - struct ptlrpc_reply_state *rs, *t; - struct ptlrpc_at_array *array = &service->srv_at_array; - ENTRY; - - service->srv_is_stopping = 1; - cfs_timer_disarm(&service->srv_at_timer); + struct ptlrpc_service_part *svcpt; - ptlrpc_stop_all_threads(service); - LASSERT(cfs_list_empty(&service->srv_threads)); + /* early disarm AT timer... */ + do { /* iterrate over multiple partitions in the future */ + svcpt = svc->srv_part; + if (svcpt == NULL || svcpt->scp_service == NULL) + break; - cfs_spin_lock (&ptlrpc_all_services_lock); - cfs_list_del_init (&service->srv_list); - cfs_spin_unlock (&ptlrpc_all_services_lock); + cfs_timer_disarm(&svcpt->scp_at_timer); + } while (0); +} - ptlrpc_lprocfs_unregister_service(service); +static void +ptlrpc_service_unlink_rqbd(struct ptlrpc_service *svc) +{ + struct ptlrpc_service_part *svcpt; + struct ptlrpc_request_buffer_desc *rqbd; + struct l_wait_info lwi; + int rc; /* All history will be culled when the next request buffer is - * freed */ - service->srv_max_history_rqbds = 0; - - CDEBUG(D_NET, "%s: tearing down\n", service->srv_name); - - rc = LNetClearLazyPortal(service->srv_req_portal); - LASSERT (rc == 0); - - /* Unlink all the request buffers. This forces a 'final' event with - * its 'unlink' flag set for each posted rqbd */ - cfs_list_for_each(tmp, &service->srv_active_rqbds) { - struct ptlrpc_request_buffer_desc *rqbd = - cfs_list_entry(tmp, struct ptlrpc_request_buffer_desc, - rqbd_list); - - rc = LNetMDUnlink(rqbd->rqbd_md_h); - LASSERT (rc == 0 || rc == -ENOENT); - } - - /* Wait for the network to release any buffers it's currently - * filling */ - for (;;) { - cfs_spin_lock(&service->srv_lock); - rc = service->srv_nrqbd_receiving; - cfs_spin_unlock(&service->srv_lock); - - if (rc == 0) - break; - - /* Network access will complete in finite time but the HUGE - * timeout lets us CWARN for visibility of sluggish NALs */ - lwi = LWI_TIMEOUT_INTERVAL(cfs_time_seconds(LONG_UNLINK), - cfs_time_seconds(1), NULL, NULL); - rc = l_wait_event(service->srv_waitq, - service->srv_nrqbd_receiving == 0, - &lwi); - if (rc == -ETIMEDOUT) - CWARN("Service %s waiting for request buffers\n", - service->srv_name); - } - - /* schedule all outstanding replies to terminate them */ - cfs_spin_lock(&service->srv_lock); - while (!cfs_list_empty(&service->srv_active_replies)) { - struct ptlrpc_reply_state *rs = - cfs_list_entry(service->srv_active_replies.next, - struct ptlrpc_reply_state, rs_list); - cfs_spin_lock(&rs->rs_lock); - ptlrpc_schedule_difficult_reply(rs); - cfs_spin_unlock(&rs->rs_lock); - } - cfs_spin_unlock(&service->srv_lock); - - /* 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(&service->srv_req_in_queue)) { - struct ptlrpc_request *req = - cfs_list_entry(service->srv_req_in_queue.next, - struct ptlrpc_request, - rq_list); + * freed in ptlrpc_service_purge_all() */ + svc->srv_max_history_rqbds = 0; + + rc = LNetClearLazyPortal(svc->srv_req_portal); + LASSERT(rc == 0); + + do { /* iterrate over multiple partitions in the future */ + svcpt = svc->srv_part; + if (svcpt == NULL || svcpt->scp_service == NULL) + break; + + /* 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, + rqbd_list) { + rc = LNetMDUnlink(rqbd->rqbd_md_h); + LASSERT(rc == 0 || rc == -ENOENT); + } + } while (0); + + do { /* iterrate over multiple partitions in the future */ + svcpt = svc->srv_part; + if (svcpt == NULL || svcpt->scp_service == NULL) + break; + + /* Wait for the network to release any buffers + * it's currently filling */ + cfs_spin_lock(&svcpt->scp_lock); + while (svcpt->scp_nrqbds_posted != 0) { + cfs_spin_unlock(&svcpt->scp_lock); + /* Network access will complete in finite time but + * the HUGE timeout lets us CWARN for visibility + * of sluggish NALs */ + lwi = LWI_TIMEOUT_INTERVAL( + cfs_time_seconds(LONG_UNLINK), + cfs_time_seconds(1), NULL, NULL); + rc = l_wait_event(svcpt->scp_waitq, + svcpt->scp_nrqbds_posted == 0, &lwi); + if (rc == -ETIMEDOUT) { + CWARN("Service %s waiting for " + "request buffers\n", + svcpt->scp_service->srv_name); + } + cfs_spin_lock(&svcpt->scp_lock); + } + cfs_spin_unlock(&svcpt->scp_lock); + } while (0); +} - cfs_list_del(&req->rq_list); - service->srv_n_queued_reqs--; - service->srv_n_active_reqs++; - ptlrpc_server_finish_request(req); - } - while (ptlrpc_server_request_pending(service, 1)) { - struct ptlrpc_request *req; +static void +ptlrpc_service_purge_all(struct ptlrpc_service *svc) +{ + struct ptlrpc_service_part *svcpt; + struct ptlrpc_request_buffer_desc *rqbd; + struct ptlrpc_request *req; + struct ptlrpc_reply_state *rs; + + do { /* iterrate over multiple partitions in the future */ + /* schedule all outstanding replies to terminate them */ + svcpt = svc->srv_part; + if (svcpt == NULL || svcpt->scp_service == NULL) + break; + + cfs_spin_lock(&svcpt->scp_rep_lock); + while (!cfs_list_empty(&svcpt->scp_rep_active)) { + rs = cfs_list_entry(svcpt->scp_rep_active.next, + struct ptlrpc_reply_state, rs_list); + cfs_spin_lock(&rs->rs_lock); + ptlrpc_schedule_difficult_reply(rs); + cfs_spin_unlock(&rs->rs_lock); + } + cfs_spin_unlock(&svcpt->scp_rep_lock); + + /* 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, + struct ptlrpc_request, rq_list); + + cfs_list_del(&req->rq_list); + svcpt->scp_nreqs_incoming--; + svcpt->scp_nreqs_active++; + ptlrpc_server_finish_request(svcpt, req); + } + + while (ptlrpc_server_request_pending(svcpt, 1)) { + req = ptlrpc_server_request_get(svcpt, 1); + cfs_list_del(&req->rq_list); + svcpt->scp_nreqs_active++; + ptlrpc_hpreq_fini(req); + ptlrpc_server_finish_request(svcpt, req); + } + + LASSERT(cfs_list_empty(&svcpt->scp_rqbd_posted)); + LASSERT(svcpt->scp_nreqs_incoming == 0); + LASSERT(svcpt->scp_nreqs_active == 0); + /* history should have been culled by + * ptlrpc_server_finish_request */ + LASSERT(svcpt->scp_hist_nrqbds == 0); + + /* 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, + 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, + struct ptlrpc_reply_state, + rs_list); + cfs_list_del(&rs->rs_list); + OBD_FREE_LARGE(rs, svc->srv_max_reply_size); + } + } while (0); +} - req = ptlrpc_server_request_get(service, 1); - cfs_list_del(&req->rq_list); - service->srv_n_queued_reqs--; - service->srv_n_active_reqs++; - ptlrpc_hpreq_fini(req); - ptlrpc_server_finish_request(req); - } - LASSERT(service->srv_n_queued_reqs == 0); - LASSERT(service->srv_n_active_reqs == 0); - LASSERT(service->srv_n_history_rqbds == 0); - LASSERT(cfs_list_empty(&service->srv_active_rqbds)); +static void +ptlrpc_service_free(struct ptlrpc_service *svc) +{ + struct ptlrpc_service_part *svcpt; + struct ptlrpc_at_array *array; + + do { /* iterrate over multiple partitions in the future */ + svcpt = svc->srv_part; + if (svcpt == NULL || svcpt->scp_service == NULL) + break; + + /* In case somebody rearmed this in the meantime */ + cfs_timer_disarm(&svcpt->scp_at_timer); + array = &svcpt->scp_at_array; + + if (array->paa_reqs_array != NULL) { + OBD_FREE(array->paa_reqs_array, + sizeof(cfs_list_t) * array->paa_size); + array->paa_reqs_array = NULL; + } + + if (array->paa_reqs_count != NULL) { + OBD_FREE(array->paa_reqs_count, + sizeof(__u32) * array->paa_size); + array->paa_reqs_count = NULL; + } + svcpt->scp_service = NULL; + } while (0); + + do { /* iterrate over multiple partitions in the future */ + svcpt = svc->srv_part; + if (svcpt != NULL) + OBD_FREE_PTR(svcpt); + } while (0); + + OBD_FREE_PTR(svc); +} - /* Now free all the request buffers since nothing references them - * any more... */ - while (!cfs_list_empty(&service->srv_idle_rqbds)) { - struct ptlrpc_request_buffer_desc *rqbd = - cfs_list_entry(service->srv_idle_rqbds.next, - struct ptlrpc_request_buffer_desc, - rqbd_list); +int ptlrpc_unregister_service(struct ptlrpc_service *service) +{ + ENTRY; - ptlrpc_free_rqbd(rqbd); - } + CDEBUG(D_NET, "%s: tearing down\n", service->srv_name); - ptlrpc_wait_replies(service); + service->srv_is_stopping = 1; - cfs_list_for_each_entry_safe(rs, t, &service->srv_free_rs_list, - rs_list) { - cfs_list_del(&rs->rs_list); - OBD_FREE(rs, service->srv_max_reply_size); - } + cfs_spin_lock(&ptlrpc_all_services_lock); + cfs_list_del_init(&service->srv_list); + cfs_spin_unlock(&ptlrpc_all_services_lock); - /* In case somebody rearmed this in the meantime */ - cfs_timer_disarm(&service->srv_at_timer); + ptlrpc_lprocfs_unregister_service(service); - if (array->paa_reqs_array != NULL) { - OBD_FREE(array->paa_reqs_array, - sizeof(cfs_list_t) * array->paa_size); - array->paa_reqs_array = NULL; - } + ptlrpc_service_del_atimer(service); + ptlrpc_stop_all_threads(service); - if (array->paa_reqs_count != NULL) { - OBD_FREE(array->paa_reqs_count, - sizeof(__u32) * array->paa_size); - array->paa_reqs_count= NULL; - } + ptlrpc_service_unlink_rqbd(service); + ptlrpc_service_purge_all(service); + ptlrpc_service_free(service); - OBD_FREE_PTR(service); - RETURN(0); + RETURN(0); } -/* Returns 0 if the service is healthy. +/** + * Returns 0 if the service is healthy. * * 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_service_health_check(struct ptlrpc_service *svc) { - struct ptlrpc_request *request; - struct timeval right_now; - long timediff; - - if (svc == NULL) - return 0; - - cfs_gettimeofday(&right_now); - - cfs_spin_lock(&svc->srv_lock); - if (!ptlrpc_server_request_pending(svc, 1)) { - cfs_spin_unlock(&svc->srv_lock); - return 0; - } - - /* How long has the next entry been waiting? */ - if (cfs_list_empty(&svc->srv_request_queue)) - request = cfs_list_entry(svc->srv_request_hpq.next, - struct ptlrpc_request, rq_list); - else - request = cfs_list_entry(svc->srv_request_queue.next, - struct ptlrpc_request, rq_list); - timediff = cfs_timeval_sub(&right_now, &request->rq_arrival_time, NULL); - cfs_spin_unlock(&svc->srv_lock); - - if ((timediff / ONE_MILLION) > (AT_OFF ? obd_timeout * 3/2 : - at_max)) { - CERROR("%s: unhealthy - request has been waiting %lds\n", - svc->srv_name, timediff / ONE_MILLION); - return (-1); - } - - return 0; + struct ptlrpc_service_part *svcpt; + struct ptlrpc_request *request; + struct timeval right_now; + long timediff; + + if (svc == NULL || svc->srv_part == NULL) + return 0; + + cfs_gettimeofday(&right_now); + + svcpt = svc->srv_part; + cfs_spin_lock(&svcpt->scp_req_lock); + if (!ptlrpc_server_request_pending(svcpt, 1)) { + cfs_spin_unlock(&svcpt->scp_req_lock); + return 0; + } + + /* How long has the next entry been waiting? */ + if (cfs_list_empty(&svcpt->scp_req_pending)) { + request = cfs_list_entry(svcpt->scp_hreq_pending.next, + struct ptlrpc_request, rq_list); + } else { + request = cfs_list_entry(svcpt->scp_req_pending.next, + struct ptlrpc_request, rq_list); + } + + timediff = cfs_timeval_sub(&right_now, &request->rq_arrival_time, NULL); + cfs_spin_unlock(&svcpt->scp_req_lock); + + if ((timediff / ONE_MILLION) > + (AT_OFF ? obd_timeout * 3 / 2 : at_max)) { + CERROR("%s: unhealthy - request has been waiting %lds\n", + svcpt->scp_service->srv_name, timediff / ONE_MILLION); + return -1; + } + + return 0; }