if (!desc)
return NULL;
- spin_lock_init(&desc->bd_lock);
+ cfs_spin_lock_init(&desc->bd_lock);
cfs_waitq_init(&desc->bd_waitq);
desc->bd_max_iov = npages;
desc->bd_iov_count = 0;
if (AT_OFF) {
/* non-AT settings */
req->rq_timeout = req->rq_import->imp_server_timeout ?
- obd_timeout / 2 : obd_timeout;
- lustre_msg_set_timeout(req->rq_reqmsg, req->rq_timeout);
- return;
+ obd_timeout / 2 : obd_timeout;
+ } else {
+ at = &req->rq_import->imp_at;
+ idx = import_at_get_index(req->rq_import,
+ req->rq_request_portal);
+ serv_est = at_get(&at->iat_service_estimate[idx]);
+ req->rq_timeout = at_est2timeout(serv_est);
}
-
- at = &req->rq_import->imp_at;
- idx = import_at_get_index(req->rq_import,
- req->rq_request_portal);
- serv_est = at_get(&at->iat_service_estimate[idx]);
- req->rq_timeout = at_est2timeout(serv_est);
/* We could get even fancier here, using history to predict increased
loading... */
unsigned int oldse;
struct imp_at *at;
- /* do estimate only if is not in recovery */
- if ((req->rq_send_state != LUSTRE_IMP_FULL) &&
- (req->rq_send_state != LUSTRE_IMP_CONNECTING))
- return;
-
LASSERT(req->rq_import);
at = &req->rq_import->imp_at;
idx = import_at_get_index(req->rq_import, req->rq_request_portal);
/* max service estimates are tracked on the server side,
so just keep minimal history here */
- oldse = at_add(&at->iat_service_estimate[idx], serv_est);
+ oldse = at_measured(&at->iat_service_estimate[idx], serv_est);
if (oldse != 0)
CDEBUG(D_ADAPTTO, "The RPC service estimate for %s ptl %d "
"has changed from %d to %d\n",
CFS_DURATION_T"\n", service_time,
cfs_time_sub(now, req->rq_sent));
- oldnl = at_add(&at->iat_net_latency, nl);
+ oldnl = at_measured(&at->iat_net_latency, nl);
if (oldnl != 0)
CDEBUG(D_ADAPTTO, "The network latency for %s (nid %s) "
"has changed from %d to %d\n",
ENTRY;
req->rq_early = 0;
- spin_unlock(&req->rq_lock);
+ cfs_spin_unlock(&req->rq_lock);
rc = sptlrpc_cli_unwrap_early_reply(req, &early_req);
if (rc) {
- spin_lock(&req->rq_lock);
+ cfs_spin_lock(&req->rq_lock);
RETURN(rc);
}
sptlrpc_cli_finish_early_reply(early_req);
- spin_lock(&req->rq_lock);
+ cfs_spin_lock(&req->rq_lock);
if (rc == 0) {
/* Adjust the local timeout for this req */
void ptlrpc_free_rq_pool(struct ptlrpc_request_pool *pool)
{
- struct list_head *l, *tmp;
+ cfs_list_t *l, *tmp;
struct ptlrpc_request *req;
LASSERT(pool != NULL);
- spin_lock(&pool->prp_lock);
- list_for_each_safe(l, tmp, &pool->prp_req_list) {
- req = list_entry(l, struct ptlrpc_request, rq_list);
- list_del(&req->rq_list);
+ cfs_spin_lock(&pool->prp_lock);
+ cfs_list_for_each_safe(l, tmp, &pool->prp_req_list) {
+ req = cfs_list_entry(l, struct ptlrpc_request, rq_list);
+ cfs_list_del(&req->rq_list);
LASSERT(req->rq_reqbuf);
LASSERT(req->rq_reqbuf_len == pool->prp_rq_size);
OBD_FREE(req->rq_reqbuf, pool->prp_rq_size);
OBD_FREE(req, sizeof(*req));
}
- spin_unlock(&pool->prp_lock);
+ cfs_spin_unlock(&pool->prp_lock);
OBD_FREE(pool, sizeof(*pool));
}
int i;
int size = 1;
- while (size < pool->prp_rq_size + SPTLRPC_MAX_PAYLOAD)
+ while (size < pool->prp_rq_size)
size <<= 1;
- LASSERTF(list_empty(&pool->prp_req_list) || size == pool->prp_rq_size,
+ LASSERTF(cfs_list_empty(&pool->prp_req_list) ||
+ size == pool->prp_rq_size,
"Trying to change pool size with nonempty pool "
"from %d to %d bytes\n", pool->prp_rq_size, size);
- spin_lock(&pool->prp_lock);
+ cfs_spin_lock(&pool->prp_lock);
pool->prp_rq_size = size;
for (i = 0; i < num_rq; i++) {
struct ptlrpc_request *req;
struct lustre_msg *msg;
- spin_unlock(&pool->prp_lock);
+ cfs_spin_unlock(&pool->prp_lock);
OBD_ALLOC(req, sizeof(struct ptlrpc_request));
if (!req)
return;
req->rq_reqbuf = msg;
req->rq_reqbuf_len = size;
req->rq_pool = pool;
- spin_lock(&pool->prp_lock);
- list_add_tail(&req->rq_list, &pool->prp_req_list);
+ cfs_spin_lock(&pool->prp_lock);
+ cfs_list_add_tail(&req->rq_list, &pool->prp_req_list);
}
- spin_unlock(&pool->prp_lock);
+ cfs_spin_unlock(&pool->prp_lock);
return;
}
/* Request next power of two for the allocation, because internally
kernel would do exactly this */
- spin_lock_init(&pool->prp_lock);
+ cfs_spin_lock_init(&pool->prp_lock);
CFS_INIT_LIST_HEAD(&pool->prp_req_list);
- pool->prp_rq_size = msgsize;
+ pool->prp_rq_size = msgsize + SPTLRPC_MAX_PAYLOAD;
pool->prp_populate = populate_pool;
populate_pool(pool, num_rq);
- if (list_empty(&pool->prp_req_list)) {
+ if (cfs_list_empty(&pool->prp_req_list)) {
/* have not allocated a single request for the pool */
OBD_FREE(pool, sizeof (struct ptlrpc_request_pool));
pool = NULL;
if (!pool)
return NULL;
- spin_lock(&pool->prp_lock);
+ cfs_spin_lock(&pool->prp_lock);
/* See if we have anything in a pool, and bail out if nothing,
* in writeout path, where this matters, this is safe to do, because
* nothing is lost in this case, and when some in-flight requests
* complete, this code will be called again. */
- if (unlikely(list_empty(&pool->prp_req_list))) {
- spin_unlock(&pool->prp_lock);
+ if (unlikely(cfs_list_empty(&pool->prp_req_list))) {
+ cfs_spin_unlock(&pool->prp_lock);
return NULL;
}
- request = list_entry(pool->prp_req_list.next, struct ptlrpc_request,
- rq_list);
- list_del_init(&request->rq_list);
- spin_unlock(&pool->prp_lock);
+ request = cfs_list_entry(pool->prp_req_list.next, struct ptlrpc_request,
+ rq_list);
+ cfs_list_del_init(&request->rq_list);
+ cfs_spin_unlock(&pool->prp_lock);
LASSERT(request->rq_reqbuf);
LASSERT(request->rq_pool);
{
struct ptlrpc_request_pool *pool = request->rq_pool;
- spin_lock(&pool->prp_lock);
- LASSERT(list_empty(&request->rq_list));
+ cfs_spin_lock(&pool->prp_lock);
+ LASSERT(cfs_list_empty(&request->rq_list));
LASSERT(!request->rq_receiving_reply);
- list_add_tail(&request->rq_list, &pool->prp_req_list);
- spin_unlock(&pool->prp_lock);
+ cfs_list_add_tail(&request->rq_list, &pool->prp_req_list);
+ cfs_spin_unlock(&pool->prp_lock);
}
static int __ptlrpc_request_bufs_pack(struct ptlrpc_request *request,
ptlrpc_at_set_req_timeout(request);
- spin_lock_init(&request->rq_lock);
+ cfs_spin_lock_init(&request->rq_lock);
CFS_INIT_LIST_HEAD(&request->rq_list);
CFS_INIT_LIST_HEAD(&request->rq_timed_list);
CFS_INIT_LIST_HEAD(&request->rq_replay_list);
CFS_INIT_LIST_HEAD(&request->rq_history_list);
CFS_INIT_LIST_HEAD(&request->rq_exp_list);
cfs_waitq_init(&request->rq_reply_waitq);
+ cfs_waitq_init(&request->rq_set_waitq);
request->rq_xid = ptlrpc_next_xid();
- atomic_set(&request->rq_refcount, 1);
+ cfs_atomic_set(&request->rq_refcount, 1);
lustre_msg_set_opc(request->rq_reqmsg, opcode);
request->rq_no_delay = request->rq_no_resend = 1;
request->rq_fake = 1;
- spin_lock_init(&request->rq_lock);
+ cfs_spin_lock_init(&request->rq_lock);
CFS_INIT_LIST_HEAD(&request->rq_list);
CFS_INIT_LIST_HEAD(&request->rq_replay_list);
CFS_INIT_LIST_HEAD(&request->rq_set_chain);
CFS_INIT_LIST_HEAD(&request->rq_history_list);
CFS_INIT_LIST_HEAD(&request->rq_exp_list);
cfs_waitq_init(&request->rq_reply_waitq);
+ cfs_waitq_init(&request->rq_set_waitq);
request->rq_xid = ptlrpc_next_xid();
- atomic_set(&request->rq_refcount, 1);
+ cfs_atomic_set(&request->rq_refcount, 1);
RETURN(request);
}
struct ptlrpc_request_set *set = req->rq_set;
if (set)
- set->set_remaining --;
+ cfs_atomic_dec(&set->set_remaining);
}
ptlrpc_rqphase_move(req, RQ_PHASE_COMPLETE);
- list_del_init(&req->rq_list);
+ cfs_list_del_init(&req->rq_list);
}
RETURN(NULL);
CFS_INIT_LIST_HEAD(&set->set_requests);
cfs_waitq_init(&set->set_waitq);
- set->set_remaining = 0;
- spin_lock_init(&set->set_new_req_lock);
+ cfs_atomic_set(&set->set_remaining, 0);
+ cfs_spin_lock_init(&set->set_new_req_lock);
CFS_INIT_LIST_HEAD(&set->set_new_requests);
CFS_INIT_LIST_HEAD(&set->set_cblist);
/* Finish with this set; opposite of prep_set. */
void ptlrpc_set_destroy(struct ptlrpc_request_set *set)
{
- struct list_head *tmp;
- struct list_head *next;
+ cfs_list_t *tmp;
+ cfs_list_t *next;
int expected_phase;
int n = 0;
ENTRY;
/* Requests on the set should either all be completed, or all be new */
- expected_phase = (set->set_remaining == 0) ?
+ expected_phase = (cfs_atomic_read(&set->set_remaining) == 0) ?
RQ_PHASE_COMPLETE : RQ_PHASE_NEW;
- list_for_each (tmp, &set->set_requests) {
+ cfs_list_for_each (tmp, &set->set_requests) {
struct ptlrpc_request *req =
- list_entry(tmp, struct ptlrpc_request, rq_set_chain);
+ cfs_list_entry(tmp, struct ptlrpc_request,
+ rq_set_chain);
LASSERT(req->rq_phase == expected_phase);
n++;
}
- LASSERTF(set->set_remaining == 0 || set->set_remaining == n, "%d / %d\n",
- set->set_remaining, n);
+ LASSERTF(cfs_atomic_read(&set->set_remaining) == 0 ||
+ cfs_atomic_read(&set->set_remaining) == n, "%d / %d\n",
+ cfs_atomic_read(&set->set_remaining), n);
- list_for_each_safe(tmp, next, &set->set_requests) {
+ cfs_list_for_each_safe(tmp, next, &set->set_requests) {
struct ptlrpc_request *req =
- list_entry(tmp, struct ptlrpc_request, rq_set_chain);
- list_del_init(&req->rq_set_chain);
+ cfs_list_entry(tmp, struct ptlrpc_request,
+ rq_set_chain);
+ cfs_list_del_init(&req->rq_set_chain);
LASSERT(req->rq_phase == expected_phase);
if (req->rq_phase == RQ_PHASE_NEW) {
ptlrpc_req_interpret(NULL, req, -EBADR);
- set->set_remaining--;
+ cfs_atomic_dec(&set->set_remaining);
}
req->rq_set = NULL;
ptlrpc_req_finished (req);
}
- LASSERT(set->set_remaining == 0);
+ LASSERT(cfs_atomic_read(&set->set_remaining) == 0);
OBD_FREE(set, sizeof(*set));
EXIT;
cbdata->psc_interpret = fn;
cbdata->psc_data = data;
- list_add_tail(&cbdata->psc_item, &set->set_cblist);
+ cfs_list_add_tail(&cbdata->psc_item, &set->set_cblist);
RETURN(0);
}
struct ptlrpc_request *req)
{
/* The set takes over the caller's request reference */
- list_add_tail(&req->rq_set_chain, &set->set_requests);
+ cfs_list_add_tail(&req->rq_set_chain, &set->set_requests);
req->rq_set = set;
- set->set_remaining++;
+ cfs_atomic_inc(&set->set_remaining);
+ req->rq_queued_time = cfs_time_current(); /* Where is the best place to set this? */
}
/**
* Let caller know that we stopped and will not handle this request.
* It needs to take care itself of request.
*/
- if (test_bit(LIOD_STOP, &pc->pc_flags))
+ if (cfs_test_bit(LIOD_STOP, &pc->pc_flags))
return -EALREADY;
- spin_lock(&set->set_new_req_lock);
+ cfs_spin_lock(&set->set_new_req_lock);
/*
* The set takes over the caller's request reference.
*/
- list_add_tail(&req->rq_set_chain, &set->set_new_requests);
+ cfs_list_add_tail(&req->rq_set_chain, &set->set_new_requests);
req->rq_set = set;
- spin_unlock(&set->set_new_req_lock);
+ cfs_spin_unlock(&set->set_new_req_lock);
- /*
- * Let thead know that we added something and better it to wake up
- * and process.
- */
cfs_waitq_signal(&set->set_waitq);
return 0;
}
} else if (imp->imp_state == LUSTRE_IMP_CLOSED) {
DEBUG_REQ(D_ERROR, req, "IMP_CLOSED ");
*status = -EIO;
+ } else if (imp->imp_obd->obd_no_recov) {
+ *status = -ESHUTDOWN;
+ } else if (ptlrpc_send_limit_expired(req)) {
+ /* probably doesn't need to be a D_ERROR after initial testing */
+ DEBUG_REQ(D_ERROR, req, "send limit expired ");
+ *status = -EIO;
} else if (req->rq_send_state == LUSTRE_IMP_CONNECTING &&
imp->imp_state == LUSTRE_IMP_CONNECTING) {
/* allow CONNECT even if import is invalid */ ;
- if (atomic_read(&imp->imp_inval_count) != 0) {
+ if (cfs_atomic_read(&imp->imp_inval_count) != 0) {
DEBUG_REQ(D_ERROR, req, "invalidate in flight");
*status = -EIO;
}
- } else if ((imp->imp_invalid && (!imp->imp_recon_bk)) ||
- imp->imp_obd->obd_no_recov) {
- /* If the import has been invalidated (such as by an OST
- * failure), and if the import(MGC) tried all of its connection
- * list (Bug 13464), the request must fail with -ESHUTDOWN.
- * This indicates the requests should be discarded; an -EIO
- * may result in a resend of the request. */
+ } else if (imp->imp_invalid) {
if (!imp->imp_deactive)
DEBUG_REQ(D_ERROR, req, "IMP_INVALID");
*status = -ESHUTDOWN; /* bz 12940 */
*status = -EIO;
} else if (req->rq_send_state != imp->imp_state) {
/* invalidate in progress - any requests should be drop */
- if (atomic_read(&imp->imp_inval_count) != 0) {
+ if (cfs_atomic_read(&imp->imp_inval_count) != 0) {
DEBUG_REQ(D_ERROR, req, "invalidate in flight");
*status = -EIO;
} else if (imp->imp_dlm_fake || req->rq_no_delay) {
RETURN(delay);
}
-static int ptlrpc_check_reply(struct ptlrpc_request *req)
-{
- int rc = 0;
- ENTRY;
-
- /* serialise with network callback */
- spin_lock(&req->rq_lock);
-
- if (ptlrpc_client_replied(req))
- GOTO(out, rc = 1);
-
- if (req->rq_net_err && !req->rq_timedout) {
- spin_unlock(&req->rq_lock);
- rc = ptlrpc_expire_one_request(req, 0);
- spin_lock(&req->rq_lock);
- GOTO(out, rc);
- }
-
- if (req->rq_err)
- GOTO(out, rc = 1);
-
- if (req->rq_resend)
- GOTO(out, rc = 1);
-
- if (req->rq_restart)
- GOTO(out, rc = 1);
-
- if (ptlrpc_client_early(req)) {
- ptlrpc_at_recv_early_reply(req);
- GOTO(out, rc = 0); /* keep waiting */
- }
-
- EXIT;
- out:
- spin_unlock(&req->rq_lock);
- DEBUG_REQ(D_NET, req, "rc = %d for", rc);
- return rc;
-}
-
/* Conditionally suppress specific console messages */
static int ptlrpc_console_allow(struct ptlrpc_request *req)
{
return 1;
}
-
static int ptlrpc_check_status(struct ptlrpc_request *req)
{
int err;
long timediff;
ENTRY;
- LASSERT(!req->rq_receiving_reply);
- LASSERT(obd);
- LASSERT(req->rq_nob_received <= req->rq_repbuf_len);
+ LASSERT(obd != NULL);
+ /* repbuf must be unlinked */
+ LASSERT(!req->rq_receiving_reply && !req->rq_must_unlink);
+
+ if (req->rq_reply_truncate) {
+ if (ptlrpc_no_resend(req)) {
+ DEBUG_REQ(D_ERROR, req, "reply buffer overflow,"
+ " expected: %d, actual size: %d",
+ req->rq_nob_received, req->rq_repbuf_len);
+ RETURN(-EOVERFLOW);
+ }
+
+ sptlrpc_cli_free_repbuf(req);
+ /* Pass the required reply buffer size (include
+ * space for early reply).
+ * NB: no need to roundup because alloc_repbuf
+ * will roundup it */
+ req->rq_replen = req->rq_nob_received;
+ req->rq_nob_received = 0;
+ req->rq_resend = 1;
+ RETURN(0);
+ }
/*
* NB Until this point, the whole of the incoming message,
* including buflens, status etc is in the sender's byte order.
*/
-
rc = sptlrpc_cli_unwrap_reply(req);
if (rc) {
DEBUG_REQ(D_ERROR, req, "unwrap reply failed (%d):", rc);
if (rc)
RETURN(rc);
- do_gettimeofday(&work_start);
+ cfs_gettimeofday(&work_start);
timediff = cfs_timeval_sub(&work_start, &req->rq_arrival_time, NULL);
if (obd->obd_svc_stats != NULL) {
lprocfs_counter_add(obd->obd_svc_stats, PTLRPC_REQWAIT_CNTR,
RETURN(-EPROTO);
}
- OBD_FAIL_TIMEOUT(OBD_FAIL_PTLRPC_PAUSE_REP, obd_fail_val);
+ if (lustre_msg_get_opc(req->rq_reqmsg) != OBD_PING)
+ OBD_FAIL_TIMEOUT(OBD_FAIL_PTLRPC_PAUSE_REP, obd_fail_val);
ptlrpc_at_adj_service(req, lustre_msg_get_timeout(req->rq_repmsg));
ptlrpc_at_adj_net_latency(req,
lustre_msg_get_service_time(req->rq_repmsg));
}
if (imp->imp_replayable) {
- spin_lock(&imp->imp_lock);
+ cfs_spin_lock(&imp->imp_lock);
/*
* No point in adding already-committed requests to the replay
* list, we will just remove them immediately. b=9829
ptlrpc_save_versions(req);
ptlrpc_retain_replayable_request(req, imp);
} else if (req->rq_commit_cb != NULL) {
- spin_unlock(&imp->imp_lock);
+ cfs_spin_unlock(&imp->imp_lock);
req->rq_commit_cb(req);
- spin_lock(&imp->imp_lock);
+ cfs_spin_lock(&imp->imp_lock);
}
/*
lustre_msg_get_last_committed(req->rq_repmsg);
}
ptlrpc_free_committed(imp);
- spin_unlock(&imp->imp_lock);
+ cfs_spin_unlock(&imp->imp_lock);
}
RETURN(rc);
ptlrpc_rqphase_move(req, RQ_PHASE_RPC);
imp = req->rq_import;
- spin_lock(&imp->imp_lock);
+ cfs_spin_lock(&imp->imp_lock);
req->rq_import_generation = imp->imp_generation;
if (ptlrpc_import_delay_req(imp, req, &rc)) {
- spin_lock(&req->rq_lock);
+ cfs_spin_lock(&req->rq_lock);
req->rq_waiting = 1;
- spin_unlock(&req->rq_lock);
+ cfs_spin_unlock(&req->rq_lock);
DEBUG_REQ(D_HA, req, "req from PID %d waiting for recovery: "
"(%s != %s)", lustre_msg_get_status(req->rq_reqmsg),
ptlrpc_import_state_name(req->rq_send_state),
ptlrpc_import_state_name(imp->imp_state));
- LASSERT(list_empty(&req->rq_list));
- list_add_tail(&req->rq_list, &imp->imp_delayed_list);
- atomic_inc(&req->rq_import->imp_inflight);
- spin_unlock(&imp->imp_lock);
+ LASSERT(cfs_list_empty(&req->rq_list));
+ cfs_list_add_tail(&req->rq_list, &imp->imp_delayed_list);
+ cfs_atomic_inc(&req->rq_import->imp_inflight);
+ cfs_spin_unlock(&imp->imp_lock);
RETURN(0);
}
if (rc != 0) {
- spin_unlock(&imp->imp_lock);
+ cfs_spin_unlock(&imp->imp_lock);
req->rq_status = rc;
ptlrpc_rqphase_move(req, RQ_PHASE_INTERPRET);
RETURN(rc);
}
- LASSERT(list_empty(&req->rq_list));
- list_add_tail(&req->rq_list, &imp->imp_sending_list);
- atomic_inc(&req->rq_import->imp_inflight);
- spin_unlock(&imp->imp_lock);
+ LASSERT(cfs_list_empty(&req->rq_list));
+ cfs_list_add_tail(&req->rq_list, &imp->imp_sending_list);
+ cfs_atomic_inc(&req->rq_import->imp_inflight);
+ cfs_spin_unlock(&imp->imp_lock);
lustre_msg_set_status(req->rq_reqmsg, cfs_curproc_pid());
/* this sends any unsent RPCs in @set and returns TRUE if all are sent */
int ptlrpc_check_set(const struct lu_env *env, struct ptlrpc_request_set *set)
{
- struct list_head *tmp;
+ cfs_list_t *tmp;
int force_timer_recalc = 0;
ENTRY;
- if (set->set_remaining == 0)
+ if (cfs_atomic_read(&set->set_remaining) == 0)
RETURN(1);
- list_for_each(tmp, &set->set_requests) {
+ cfs_list_for_each(tmp, &set->set_requests) {
struct ptlrpc_request *req =
- list_entry(tmp, struct ptlrpc_request, rq_set_chain);
+ cfs_list_entry(tmp, struct ptlrpc_request,
+ rq_set_chain);
struct obd_import *imp = req->rq_import;
+ int unregistered = 0;
int rc = 0;
if (req->rq_phase == RQ_PHASE_NEW &&
}
if (req->rq_err) {
+ cfs_spin_lock(&req->rq_lock);
req->rq_replied = 0;
+ cfs_spin_unlock(&req->rq_lock);
if (req->rq_status == 0)
req->rq_status = -EIO;
ptlrpc_rqphase_move(req, RQ_PHASE_INTERPRET);
GOTO(interpret, req->rq_status);
}
- /* ptlrpc_queue_wait->l_wait_event guarantees that rq_intr
- * will only be set after rq_timedout, but the synchronous IO
- * waiting path sets rq_intr irrespective of whether ptlrpcd
- * has seen a timeout. our policy is to only interpret
- * interrupted rpcs after they have timed out */
+ /* ptlrpc_set_wait->l_wait_event sets lwi_allow_intr
+ * so it sets rq_intr regardless of individual rpc
+ * timeouts. The synchronous IO waiting path sets
+ * rq_intr irrespective of whether ptlrpcd
+ * has seen a timeout. Our policy is to only interpret
+ * interrupted rpcs after they have timed out, so we
+ * need to enforce that here.
+ */
+
if (req->rq_intr && (req->rq_timedout || req->rq_waiting ||
req->rq_wait_ctx)) {
req->rq_status = -EINTR;
if (!ptlrpc_unregister_reply(req, 1))
continue;
- spin_lock(&imp->imp_lock);
+ cfs_spin_lock(&imp->imp_lock);
if (ptlrpc_import_delay_req(imp, req, &status)){
/* put on delay list - only if we wait
* recovery finished - before send */
- list_del_init(&req->rq_list);
- list_add_tail(&req->rq_list, &imp->imp_delayed_list);
- spin_unlock(&imp->imp_lock);
+ cfs_list_del_init(&req->rq_list);
+ cfs_list_add_tail(&req->rq_list,
+ &imp-> \
+ imp_delayed_list);
+ cfs_spin_unlock(&imp->imp_lock);
continue;
}
req->rq_status = status;
ptlrpc_rqphase_move(req,
RQ_PHASE_INTERPRET);
- spin_unlock(&imp->imp_lock);
+ cfs_spin_unlock(&imp->imp_lock);
GOTO(interpret, req->rq_status);
}
- if (req->rq_no_resend && !req->rq_wait_ctx) {
+ if (ptlrpc_no_resend(req) && !req->rq_wait_ctx) {
req->rq_status = -ENOTCONN;
ptlrpc_rqphase_move(req,
RQ_PHASE_INTERPRET);
- spin_unlock(&imp->imp_lock);
+ cfs_spin_unlock(&imp->imp_lock);
GOTO(interpret, req->rq_status);
}
- list_del_init(&req->rq_list);
- list_add_tail(&req->rq_list,
+ cfs_list_del_init(&req->rq_list);
+ cfs_list_add_tail(&req->rq_list,
&imp->imp_sending_list);
- spin_unlock(&imp->imp_lock);
+ cfs_spin_unlock(&imp->imp_lock);
+ cfs_spin_lock(&req->rq_lock);
req->rq_waiting = 0;
+ cfs_spin_unlock(&req->rq_lock);
- if (req->rq_timedout||req->rq_resend) {
+ if (req->rq_timedout || req->rq_resend) {
/* This is re-sending anyways,
* let's mark req as resend. */
+ cfs_spin_lock(&req->rq_lock);
req->rq_resend = 1;
+ cfs_spin_unlock(&req->rq_lock);
if (req->rq_bulk) {
__u64 old_xid;
if (status) {
if (req->rq_err) {
req->rq_status = status;
+ cfs_spin_lock(&req->rq_lock);
req->rq_wait_ctx = 0;
+ cfs_spin_unlock(&req->rq_lock);
force_timer_recalc = 1;
} else {
+ cfs_spin_lock(&req->rq_lock);
req->rq_wait_ctx = 1;
+ cfs_spin_unlock(&req->rq_lock);
}
continue;
} else {
+ cfs_spin_lock(&req->rq_lock);
req->rq_wait_ctx = 0;
+ cfs_spin_unlock(&req->rq_lock);
}
rc = ptl_send_rpc(req, 0);
DEBUG_REQ(D_HA, req, "send failed (%d)",
rc);
force_timer_recalc = 1;
+ cfs_spin_lock(&req->rq_lock);
req->rq_net_err = 1;
+ cfs_spin_unlock(&req->rq_lock);
}
/* need to reset the timeout */
force_timer_recalc = 1;
}
- spin_lock(&req->rq_lock);
+ cfs_spin_lock(&req->rq_lock);
if (ptlrpc_client_early(req)) {
ptlrpc_at_recv_early_reply(req);
- spin_unlock(&req->rq_lock);
+ cfs_spin_unlock(&req->rq_lock);
continue;
}
/* Still waiting for a reply? */
if (ptlrpc_client_recv(req)) {
- spin_unlock(&req->rq_lock);
+ cfs_spin_unlock(&req->rq_lock);
continue;
}
/* Did we actually receive a reply? */
if (!ptlrpc_client_replied(req)) {
- spin_unlock(&req->rq_lock);
+ cfs_spin_unlock(&req->rq_lock);
continue;
}
- spin_unlock(&req->rq_lock);
+ cfs_spin_unlock(&req->rq_lock);
+
+ /* unlink from net because we are going to
+ * swab in-place of reply buffer */
+ unregistered = ptlrpc_unregister_reply(req, 1);
+ if (!unregistered)
+ continue;
req->rq_status = after_reply(req);
if (req->rq_resend)
if (!req->rq_bulk->bd_success) {
/* The RPC reply arrived OK, but the bulk screwed
- * up! Dead wierd since the server told us the RPC
+ * up! Dead weird since the server told us the RPC
* was good after getting the REPLY for her GET or
* the ACK for her PUT. */
DEBUG_REQ(D_ERROR, req, "bulk transfer failed");
/* This moves to "unregistering" phase we need to wait for
* reply unlink. */
- if (!ptlrpc_unregister_reply(req, 1))
+ if (!unregistered && !ptlrpc_unregister_reply(req, 1))
continue;
if (!ptlrpc_unregister_bulk(req, 1))
libcfs_nid2str(imp->imp_connection->c_peer.nid),
req->rq_reqmsg ? lustre_msg_get_opc(req->rq_reqmsg) : -1);
- spin_lock(&imp->imp_lock);
+ cfs_spin_lock(&imp->imp_lock);
/* Request already may be not on sending or delaying list. This
- * may happen in the case of marking it errorneous for the case
+ * may happen in the case of marking it erroneous for the case
* ptlrpc_import_delay_req(req, status) find it impossible to
* allow sending this rpc and returns *status != 0. */
- if (!list_empty(&req->rq_list)) {
- list_del_init(&req->rq_list);
- atomic_dec(&imp->imp_inflight);
+ if (!cfs_list_empty(&req->rq_list)) {
+ cfs_list_del_init(&req->rq_list);
+ cfs_atomic_dec(&imp->imp_inflight);
}
- spin_unlock(&imp->imp_lock);
+ cfs_spin_unlock(&imp->imp_lock);
- set->set_remaining--;
+ cfs_atomic_dec(&set->set_remaining);
cfs_waitq_broadcast(&imp->imp_recovery_waitq);
}
/* If we hit an error, we want to recover promptly. */
- RETURN(set->set_remaining == 0 || force_timer_recalc);
+ RETURN(cfs_atomic_read(&set->set_remaining) == 0 || force_timer_recalc);
}
/* Return 1 if we should give up, else 0 */
int rc = 0;
ENTRY;
- spin_lock(&req->rq_lock);
+ cfs_spin_lock(&req->rq_lock);
req->rq_timedout = 1;
- spin_unlock(&req->rq_lock);
+ cfs_spin_unlock(&req->rq_lock);
- DEBUG_REQ(D_WARNING, req, "Request x"LPU64" sent from %s to NID %s "
- CFS_DURATION_T"s ago has %s (limit "CFS_DURATION_T"s).\n",
+ DEBUG_REQ(req->rq_fake ? D_INFO : D_WARNING, req,
+ "Request x"LPU64" sent from %s to NID %s "CFS_DURATION_T"s "
+ "ago has %s ("CFS_DURATION_T"s prior to deadline).\n",
req->rq_xid, imp ? imp->imp_obd->obd_name : "<?>",
imp ? libcfs_nid2str(imp->imp_connection->c_peer.nid) : "<?>",
cfs_time_sub(cfs_time_current_sec(), req->rq_sent),
if (req->rq_fake)
RETURN(1);
- atomic_inc(&imp->imp_timeouts);
+ cfs_atomic_inc(&imp->imp_timeouts);
/* The DLM server doesn't want recovery run on its imports. */
if (imp->imp_dlm_fake)
DEBUG_REQ(D_RPCTRACE, req, "err -110, sent_state=%s (now=%s)",
ptlrpc_import_state_name(req->rq_send_state),
ptlrpc_import_state_name(imp->imp_state));
- spin_lock(&req->rq_lock);
+ cfs_spin_lock(&req->rq_lock);
req->rq_status = -ETIMEDOUT;
req->rq_err = 1;
- spin_unlock(&req->rq_lock);
+ cfs_spin_unlock(&req->rq_lock);
RETURN(1);
}
/* if a request can't be resent we can't wait for an answer after
the timeout */
- if (req->rq_no_resend) {
+ if (ptlrpc_no_resend(req)) {
DEBUG_REQ(D_RPCTRACE, req, "TIMEOUT-NORESEND:");
rc = 1;
}
int ptlrpc_expired_set(void *data)
{
struct ptlrpc_request_set *set = data;
- struct list_head *tmp;
+ cfs_list_t *tmp;
time_t now = cfs_time_current_sec();
ENTRY;
/*
* A timeout expired. See which reqs it applies to...
*/
- list_for_each (tmp, &set->set_requests) {
+ cfs_list_for_each (tmp, &set->set_requests) {
struct ptlrpc_request *req =
- list_entry(tmp, struct ptlrpc_request, rq_set_chain);
+ cfs_list_entry(tmp, struct ptlrpc_request,
+ rq_set_chain);
/* don't expire request waiting for context */
if (req->rq_wait_ctx)
}
/*
- * When waiting for a whole set, we always to break out of the
+ * When waiting for a whole set, we always break out of the
* sleep so we can recalculate the timeout, or enable interrupts
* if everyone's timed out.
*/
void ptlrpc_mark_interrupted(struct ptlrpc_request *req)
{
- spin_lock(&req->rq_lock);
+ cfs_spin_lock(&req->rq_lock);
req->rq_intr = 1;
- spin_unlock(&req->rq_lock);
+ cfs_spin_unlock(&req->rq_lock);
}
void ptlrpc_interrupted_set(void *data)
{
struct ptlrpc_request_set *set = data;
- struct list_head *tmp;
+ cfs_list_t *tmp;
LASSERT(set != NULL);
CERROR("INTERRUPTED SET %p\n", set);
- list_for_each(tmp, &set->set_requests) {
+ cfs_list_for_each(tmp, &set->set_requests) {
struct ptlrpc_request *req =
- list_entry(tmp, struct ptlrpc_request, rq_set_chain);
+ cfs_list_entry(tmp, struct ptlrpc_request,
+ rq_set_chain);
if (req->rq_phase != RQ_PHASE_RPC &&
req->rq_phase != RQ_PHASE_UNREGISTERING)
*/
int ptlrpc_set_next_timeout(struct ptlrpc_request_set *set)
{
- struct list_head *tmp;
+ cfs_list_t *tmp;
time_t now = cfs_time_current_sec();
int timeout = 0;
struct ptlrpc_request *req;
SIGNAL_MASK_ASSERT(); /* XXX BUG 1511 */
- list_for_each(tmp, &set->set_requests) {
- req = list_entry(tmp, struct ptlrpc_request, rq_set_chain);
+ cfs_list_for_each(tmp, &set->set_requests) {
+ req = cfs_list_entry(tmp, struct ptlrpc_request, rq_set_chain);
/*
* Request in-flight?
int ptlrpc_set_wait(struct ptlrpc_request_set *set)
{
- struct list_head *tmp;
+ cfs_list_t *tmp;
struct ptlrpc_request *req;
struct l_wait_info lwi;
int rc, timeout;
ENTRY;
- if (list_empty(&set->set_requests))
+ if (cfs_list_empty(&set->set_requests))
RETURN(0);
- list_for_each(tmp, &set->set_requests) {
- req = list_entry(tmp, struct ptlrpc_request, rq_set_chain);
+ cfs_list_for_each(tmp, &set->set_requests) {
+ req = cfs_list_entry(tmp, struct ptlrpc_request, rq_set_chain);
if (req->rq_phase == RQ_PHASE_NEW)
(void)ptlrpc_send_new_req(req);
}
* req times out */
CDEBUG(D_RPCTRACE, "set %p going to sleep for %d seconds\n",
set, timeout);
- lwi = LWI_TIMEOUT_INTR(cfs_time_seconds(timeout ? timeout : 1),
- ptlrpc_expired_set,
- ptlrpc_interrupted_set, set);
- rc = l_wait_event(set->set_waitq,
- ptlrpc_check_set(NULL, set), &lwi);
+
+ if (timeout == 0 && !cfs_signal_pending())
+ /*
+ * No requests are in-flight (ether timed out
+ * or delayed), so we can allow interrupts.
+ * We still want to block for a limited time,
+ * so we allow interrupts during the timeout.
+ */
+ lwi = LWI_TIMEOUT_INTR_ALL(cfs_time_seconds(1),
+ ptlrpc_expired_set,
+ ptlrpc_interrupted_set, set);
+ else
+ /*
+ * At least one request is in flight, so no
+ * interrupts are allowed. Wait until all
+ * complete, or an in-flight req times out.
+ */
+ lwi = LWI_TIMEOUT(cfs_time_seconds(timeout? timeout : 1),
+ ptlrpc_expired_set, set);
+
+ rc = l_wait_event(set->set_waitq, ptlrpc_check_set(NULL, set), &lwi);
LASSERT(rc == 0 || rc == -EINTR || rc == -ETIMEDOUT);
/* -EINTR => all requests have been flagged rq_intr so next
* check completes.
- * -ETIMEOUTD => someone timed out. When all reqs have
+ * -ETIMEDOUT => someone timed out. When all reqs have
* timed out, signals are enabled allowing completion with
* EINTR.
* I don't really care if we go once more round the loop in
* the error cases -eeb. */
- } while (rc != 0 || set->set_remaining != 0);
+ if (rc == 0 && cfs_atomic_read(&set->set_remaining) == 0) {
+ cfs_list_for_each(tmp, &set->set_requests) {
+ req = cfs_list_entry(tmp, struct ptlrpc_request,
+ rq_set_chain);
+ cfs_spin_lock(&req->rq_lock);
+ req->rq_invalid_rqset = 1;
+ cfs_spin_unlock(&req->rq_lock);
+ }
+ }
+ } while (rc != 0 || cfs_atomic_read(&set->set_remaining) != 0);
- LASSERT(set->set_remaining == 0);
+ LASSERT(cfs_atomic_read(&set->set_remaining) == 0);
rc = 0;
- list_for_each(tmp, &set->set_requests) {
- req = list_entry(tmp, struct ptlrpc_request, rq_set_chain);
+ cfs_list_for_each(tmp, &set->set_requests) {
+ req = cfs_list_entry(tmp, struct ptlrpc_request, rq_set_chain);
LASSERT(req->rq_phase == RQ_PHASE_COMPLETE);
if (req->rq_status != 0)
struct ptlrpc_set_cbdata *cbdata, *n;
int err;
- list_for_each_entry_safe(cbdata, n,
+ cfs_list_for_each_entry_safe(cbdata, n,
&set->set_cblist, psc_item) {
- list_del_init(&cbdata->psc_item);
+ cfs_list_del_init(&cbdata->psc_item);
err = cbdata->psc_interpret(set, cbdata->psc_data, rc);
if (err && !rc)
rc = err;
LASSERTF(!request->rq_receiving_reply, "req %p\n", request);
LASSERTF(request->rq_rqbd == NULL, "req %p\n",request);/* client-side */
- LASSERTF(list_empty(&request->rq_list), "req %p\n", request);
- LASSERTF(list_empty(&request->rq_set_chain), "req %p\n", request);
- LASSERTF(list_empty(&request->rq_exp_list), "req %p\n", request);
+ LASSERTF(cfs_list_empty(&request->rq_list), "req %p\n", request);
+ LASSERTF(cfs_list_empty(&request->rq_set_chain), "req %p\n", request);
+ LASSERTF(cfs_list_empty(&request->rq_exp_list), "req %p\n", request);
LASSERTF(!request->rq_replay, "req %p\n", request);
LASSERT(request->rq_cli_ctx || request->rq_fake);
* request->rq_reqmsg to NULL while osc_close is dereferencing it. */
if (request->rq_import != NULL) {
if (!locked)
- spin_lock(&request->rq_import->imp_lock);
- list_del_init(&request->rq_replay_list);
+ cfs_spin_lock(&request->rq_import->imp_lock);
+ cfs_list_del_init(&request->rq_replay_list);
if (!locked)
- spin_unlock(&request->rq_import->imp_lock);
+ cfs_spin_unlock(&request->rq_import->imp_lock);
}
- LASSERTF(list_empty(&request->rq_replay_list), "req %p\n", request);
+ LASSERTF(cfs_list_empty(&request->rq_replay_list), "req %p\n", request);
- if (atomic_read(&request->rq_refcount) != 0) {
+ if (cfs_atomic_read(&request->rq_refcount) != 0) {
DEBUG_REQ(D_ERROR, request,
"freeing request with nonzero refcount");
LBUG();
}
DEBUG_REQ(D_INFO, request, "refcount now %u",
- atomic_read(&request->rq_refcount) - 1);
+ cfs_atomic_read(&request->rq_refcount) - 1);
- if (atomic_dec_and_test(&request->rq_refcount)) {
+ if (cfs_atomic_dec_and_test(&request->rq_refcount)) {
__ptlrpc_free_req(request, locked);
RETURN(1);
}
/*
* Might sleep.
*/
- LASSERT(!in_interrupt());
+ LASSERT(!cfs_in_interrupt());
/*
* Let's setup deadline for reply unlink.
/* caller must hold imp->imp_lock */
void ptlrpc_free_committed(struct obd_import *imp)
{
- struct list_head *tmp, *saved;
+ cfs_list_t *tmp, *saved;
struct ptlrpc_request *req;
struct ptlrpc_request *last_req = NULL; /* temporary fire escape */
ENTRY;
imp->imp_last_transno_checked = imp->imp_peer_committed_transno;
imp->imp_last_generation_checked = imp->imp_generation;
- list_for_each_safe(tmp, saved, &imp->imp_replay_list) {
- req = list_entry(tmp, struct ptlrpc_request, rq_replay_list);
+ cfs_list_for_each_safe(tmp, saved, &imp->imp_replay_list) {
+ req = cfs_list_entry(tmp, struct ptlrpc_request,
+ rq_replay_list);
/* XXX ok to remove when 1357 resolved - rread 05/29/03 */
LASSERT(req != last_req);
DEBUG_REQ(D_RPCTRACE, req, "commit (last_committed "LPU64")",
imp->imp_peer_committed_transno);
free_req:
- spin_lock(&req->rq_lock);
+ cfs_spin_lock(&req->rq_lock);
req->rq_replay = 0;
- spin_unlock(&req->rq_lock);
+ cfs_spin_unlock(&req->rq_lock);
if (req->rq_commit_cb != NULL)
req->rq_commit_cb(req);
- list_del_init(&req->rq_replay_list);
+ cfs_list_del_init(&req->rq_replay_list);
__ptlrpc_req_finished(req, 1);
}
lustre_msg_set_handle(req->rq_reqmsg, &(struct lustre_handle){ 0 });
req->rq_status = -EAGAIN;
- spin_lock(&req->rq_lock);
+ cfs_spin_lock(&req->rq_lock);
req->rq_resend = 1;
req->rq_net_err = 0;
req->rq_timedout = 0;
old_xid, req->rq_xid);
}
ptlrpc_client_wake_req(req);
- spin_unlock(&req->rq_lock);
+ cfs_spin_unlock(&req->rq_lock);
}
/* XXX: this function and rq_status are currently unused */
DEBUG_REQ(D_HA, req, "restarting (possibly-)completed request");
req->rq_status = -ERESTARTSYS;
- spin_lock(&req->rq_lock);
+ cfs_spin_lock(&req->rq_lock);
req->rq_restart = 1;
req->rq_timedout = 0;
ptlrpc_client_wake_req(req);
- spin_unlock(&req->rq_lock);
-}
-
-static int expired_request(void *data)
-{
- struct ptlrpc_request *req = data;
- ENTRY;
-
- /*
- * Some failure can suspend regular timeouts.
- */
- if (ptlrpc_check_suspend())
- RETURN(1);
-
- /*
- * Deadline may have changed with an early reply.
- */
- if (req->rq_deadline > cfs_time_current_sec())
- RETURN(1);
-
- RETURN(ptlrpc_expire_one_request(req, 0));
-}
-
-static void interrupted_request(void *data)
-{
- struct ptlrpc_request *req = data;
- DEBUG_REQ(D_HA, req, "request interrupted");
- spin_lock(&req->rq_lock);
- req->rq_intr = 1;
- spin_unlock(&req->rq_lock);
+ cfs_spin_unlock(&req->rq_lock);
}
struct ptlrpc_request *ptlrpc_request_addref(struct ptlrpc_request *req)
{
ENTRY;
- atomic_inc(&req->rq_refcount);
+ cfs_atomic_inc(&req->rq_refcount);
RETURN(req);
}
void ptlrpc_retain_replayable_request(struct ptlrpc_request *req,
struct obd_import *imp)
{
- struct list_head *tmp;
+ cfs_list_t *tmp;
LASSERT_SPIN_LOCKED(&imp->imp_lock);
lustre_msg_clear_flags(req->rq_reqmsg, MSG_RESENT);
/* don't re-add requests that have been replayed */
- if (!list_empty(&req->rq_replay_list))
+ if (!cfs_list_empty(&req->rq_replay_list))
return;
lustre_msg_add_flags(req->rq_reqmsg, MSG_REPLAY);
LASSERT(imp->imp_replayable);
/* Balanced in ptlrpc_free_committed, usually. */
ptlrpc_request_addref(req);
- list_for_each_prev(tmp, &imp->imp_replay_list) {
+ cfs_list_for_each_prev(tmp, &imp->imp_replay_list) {
struct ptlrpc_request *iter =
- list_entry(tmp, struct ptlrpc_request, rq_replay_list);
+ cfs_list_entry(tmp, struct ptlrpc_request,
+ rq_replay_list);
/* We may have duplicate transnos if we create and then
* open a file, or for closes retained if to match creating
continue;
}
- list_add(&req->rq_replay_list, &iter->rq_replay_list);
+ cfs_list_add(&req->rq_replay_list, &iter->rq_replay_list);
return;
}
- list_add_tail(&req->rq_replay_list, &imp->imp_replay_list);
+ cfs_list_add(&req->rq_replay_list, &imp->imp_replay_list);
}
int ptlrpc_queue_wait(struct ptlrpc_request *req)
{
- int rc = 0;
- int brc;
- struct l_wait_info lwi;
- struct obd_import *imp = req->rq_import;
- cfs_duration_t timeout = CFS_TICK;
- long timeoutl;
+ struct ptlrpc_request_set *set;
+ int rc;
ENTRY;
LASSERT(req->rq_set == NULL);
LASSERT(!req->rq_receiving_reply);
- /* for distributed debugging */
- lustre_msg_set_status(req->rq_reqmsg, cfs_curproc_pid());
- LASSERT(imp->imp_obd != NULL);
- CDEBUG(D_RPCTRACE, "Sending RPC pname:cluuid:pid:xid:nid:opc "
- "%s:%s:%d:"LPU64":%s:%d\n", cfs_curproc_comm(),
- imp->imp_obd->obd_uuid.uuid,
- lustre_msg_get_status(req->rq_reqmsg), req->rq_xid,
- libcfs_nid2str(imp->imp_connection->c_peer.nid),
- lustre_msg_get_opc(req->rq_reqmsg));
-
- /* Mark phase here for a little debug help */
- ptlrpc_rqphase_move(req, RQ_PHASE_RPC);
-
- spin_lock(&imp->imp_lock);
- req->rq_import_generation = imp->imp_generation;
-restart:
- if (ptlrpc_import_delay_req(imp, req, &rc)) {
- list_del_init(&req->rq_list);
- list_add_tail(&req->rq_list, &imp->imp_delayed_list);
- atomic_inc(&imp->imp_inflight);
- spin_unlock(&imp->imp_lock);
-
- DEBUG_REQ(D_HA, req, "\"%s\" waiting for recovery: (%s != %s)",
- cfs_curproc_comm(),
- ptlrpc_import_state_name(req->rq_send_state),
- ptlrpc_import_state_name(imp->imp_state));
- lwi = LWI_INTR(interrupted_request, req);
- rc = l_wait_event(req->rq_reply_waitq,
- (req->rq_send_state == imp->imp_state ||
- req->rq_err || req->rq_intr),
- &lwi);
- DEBUG_REQ(D_HA, req, "\"%s\" awake: (%s == %s or %d/%d == 1)",
- cfs_curproc_comm(),
- ptlrpc_import_state_name(imp->imp_state),
- ptlrpc_import_state_name(req->rq_send_state),
- req->rq_err, req->rq_intr);
-
- spin_lock(&imp->imp_lock);
- list_del_init(&req->rq_list);
- atomic_dec(&imp->imp_inflight);
-
- if (req->rq_err) {
- /* rq_status was set locally */
- rc = -EIO;
- }
- else if (req->rq_intr) {
- rc = -EINTR;
- }
- else if (req->rq_no_resend) {
- spin_unlock(&imp->imp_lock);
- GOTO(out, rc = -ETIMEDOUT);
- }
- else {
- GOTO(restart, rc);
- }
- }
-
- if (rc != 0) {
- spin_unlock(&imp->imp_lock);
- req->rq_status = rc; // XXX this ok?
- GOTO(out, rc);
- }
-
- if (req->rq_resend) {
- if (req->rq_bulk != NULL) {
- ptlrpc_unregister_bulk(req, 0);
-
- /* bulk requests are supposed to be
- * idempotent, so we are free to bump the xid
- * here, which we need to do before
- * registering the bulk again (bug 6371).
- * print the old xid first for sanity.
- */
- DEBUG_REQ(D_HA, req, "bumping xid for bulk: ");
- req->rq_xid = ptlrpc_next_xid();
- }
-
- DEBUG_REQ(D_HA, req, "resending: ");
- }
-
- /* XXX this is the same as ptlrpc_set_wait */
- LASSERT(list_empty(&req->rq_list));
- list_add_tail(&req->rq_list, &imp->imp_sending_list);
- atomic_inc(&imp->imp_inflight);
- spin_unlock(&imp->imp_lock);
-
- rc = sptlrpc_req_refresh_ctx(req, 0);
- if (rc) {
- if (req->rq_err) {
- /* we got fatal ctx refresh error, directly jump out
- * thus we can pass back the actual error code.
- */
- spin_lock(&imp->imp_lock);
- list_del_init(&req->rq_list);
- atomic_dec(&imp->imp_inflight);
- spin_unlock(&imp->imp_lock);
-
- CERROR("Failed to refresh ctx of req %p: %d\n",
- req, rc);
- GOTO(out, rc);
- }
- /* simulating we got error during send rpc */
- goto after_send;
- }
-
- rc = ptl_send_rpc(req, 0);
- if (rc)
- DEBUG_REQ(D_HA, req, "send failed (%d); recovering", rc);
-repeat:
- timeoutl = req->rq_deadline - cfs_time_current_sec();
- timeout = (timeoutl <= 0 || rc) ? CFS_TICK :
- cfs_time_seconds(timeoutl);
- DEBUG_REQ(D_NET, req,
- "-- sleeping for "CFS_DURATION_T" ticks", timeout);
- lwi = LWI_TIMEOUT_INTR(timeout, expired_request, interrupted_request,
- req);
- brc = l_wait_event(req->rq_reply_waitq, ptlrpc_check_reply(req), &lwi);
- if (brc == -ETIMEDOUT && ((req->rq_deadline > cfs_time_current_sec()) ||
- ptlrpc_check_and_wait_suspend(req)))
- goto repeat;
-
-after_send:
- CDEBUG(D_RPCTRACE, "Completed RPC pname:cluuid:pid:xid:nid:opc "
- "%s:%s:%d:"LPU64":%s:%d\n", cfs_curproc_comm(),
- imp->imp_obd->obd_uuid.uuid,
- lustre_msg_get_status(req->rq_reqmsg), req->rq_xid,
- libcfs_nid2str(imp->imp_connection->c_peer.nid),
- lustre_msg_get_opc(req->rq_reqmsg));
-
- /* If the reply was received normally, this just grabs the spinlock
- * (ensuring the reply callback has returned), sees that
- * req->rq_receiving_reply is clear and returns. */
- ptlrpc_unregister_reply(req, 0);
-
- spin_lock(&imp->imp_lock);
- list_del_init(&req->rq_list);
- atomic_dec(&imp->imp_inflight);
- spin_unlock(&imp->imp_lock);
-
- if (req->rq_err) {
- DEBUG_REQ(D_RPCTRACE, req, "err rc=%d status=%d",
- rc, req->rq_status);
- GOTO(out, rc = rc ? rc : -EIO);
- }
-
- if (req->rq_intr) {
- /* Should only be interrupted if we timed out. */
- if (!req->rq_timedout)
- DEBUG_REQ(D_ERROR, req,
- "rq_intr set but rq_timedout not");
- GOTO(out, rc = -EINTR);
- }
-
- /* Resend if we need to */
- if (req->rq_resend||req->rq_timedout) {
- /* ...unless we were specifically told otherwise. */
- if (req->rq_no_resend)
- GOTO(out, rc = -ETIMEDOUT);
- spin_lock(&imp->imp_lock);
- /* we can have rq_timeout on dlm fake import which not support
- * recovery - but me need resend request on this import instead
- * of return error */
- req->rq_resend = 1;
- goto restart;
- }
-
- if (!ptlrpc_client_replied(req)) {
- /* How can this be? -eeb */
- DEBUG_REQ(D_ERROR, req, "!rq_replied: ");
- LBUG();
- GOTO(out, rc = req->rq_status);
+ set = ptlrpc_prep_set();
+ if (set == NULL) {
+ CERROR("Unable to allocate ptlrpc set.");
+ RETURN(-ENOMEM);
}
- rc = after_reply(req);
- /* NB may return +ve success rc */
- if (req->rq_resend) {
- spin_lock(&imp->imp_lock);
- goto restart;
- }
+ /* for distributed debugging */
+ lustre_msg_set_status(req->rq_reqmsg, cfs_curproc_pid());
- out:
- if (req->rq_bulk != NULL) {
- if (rc >= 0) {
- /* success so far. Note that anything going wrong
- * with bulk now, is EXTREMELY strange, since the
- * server must have believed that the bulk
- * transferred OK before she replied with success to
- * me. */
- lwi = LWI_TIMEOUT(timeout, NULL, NULL);
- brc = l_wait_event(req->rq_reply_waitq,
- !ptlrpc_client_bulk_active(req),
- &lwi);
- LASSERT(brc == 0 || brc == -ETIMEDOUT);
- if (brc != 0) {
- LASSERT(brc == -ETIMEDOUT);
- DEBUG_REQ(D_ERROR, req, "bulk timed out");
- rc = brc;
- } else if (!req->rq_bulk->bd_success) {
- DEBUG_REQ(D_ERROR, req, "bulk transfer failed");
- rc = -EIO;
- }
- }
- if (rc < 0)
- ptlrpc_unregister_bulk(req, 0);
- }
+ /* add a ref for the set (see comment in ptlrpc_set_add_req) */
+ ptlrpc_request_addref(req);
+ ptlrpc_set_add_req(set, req);
+ rc = ptlrpc_set_wait(set);
+ ptlrpc_set_destroy(set);
- LASSERT(!req->rq_receiving_reply);
- ptlrpc_rqphase_move(req, RQ_PHASE_INTERPRET);
- cfs_waitq_broadcast(&imp->imp_recovery_waitq);
RETURN(rc);
}
struct obd_import *imp = req->rq_import;
ENTRY;
- atomic_dec(&imp->imp_replay_inflight);
+ cfs_atomic_dec(&imp->imp_replay_inflight);
if (!ptlrpc_client_replied(req)) {
CERROR("request replay timed out, restarting recovery\n");
if (lustre_msg_get_status(req->rq_repmsg) == -EOVERFLOW) {
/** replay was failed due to version mismatch */
DEBUG_REQ(D_WARNING, req, "Version mismatch during replay\n");
- spin_lock(&imp->imp_lock);
+ cfs_spin_lock(&imp->imp_lock);
imp->imp_vbr_failed = 1;
imp->imp_no_lock_replay = 1;
- spin_unlock(&imp->imp_lock);
+ cfs_spin_unlock(&imp->imp_lock);
} else {
/** The transno had better not change over replay. */
LASSERTF(lustre_msg_get_transno(req->rq_reqmsg) ==
lustre_msg_get_transno(req->rq_repmsg));
}
- spin_lock(&imp->imp_lock);
+ cfs_spin_lock(&imp->imp_lock);
/** if replays by version then gap was occur on server, no trust to locks */
if (lustre_msg_get_flags(req->rq_repmsg) & MSG_VERSION_REPLAY)
imp->imp_no_lock_replay = 1;
imp->imp_last_replay_transno = lustre_msg_get_transno(req->rq_reqmsg);
- spin_unlock(&imp->imp_lock);
+ cfs_spin_unlock(&imp->imp_lock);
LASSERT(imp->imp_last_replay_transno);
DEBUG_REQ(D_HA, req, "got rep");
* imp_last_replay_transno shouldn't be set to 0 anyway
*/
if (req->rq_transno > 0) {
- spin_lock(&imp->imp_lock);
+ cfs_spin_lock(&imp->imp_lock);
LASSERT(req->rq_transno <= imp->imp_last_replay_transno);
imp->imp_last_replay_transno = req->rq_transno;
- spin_unlock(&imp->imp_lock);
+ cfs_spin_unlock(&imp->imp_lock);
} else
CERROR("Transno is 0 during replay!\n");
/* continue with recovery */
DEBUG_REQ(D_HA, req, "REPLAY");
- atomic_inc(&req->rq_import->imp_replay_inflight);
+ cfs_atomic_inc(&req->rq_import->imp_replay_inflight);
ptlrpc_request_addref(req); /* ptlrpcd needs a ref */
ptlrpcd_add_req(req, PSCOPE_OTHER);
void ptlrpc_abort_inflight(struct obd_import *imp)
{
- struct list_head *tmp, *n;
+ cfs_list_t *tmp, *n;
ENTRY;
/* Make sure that no new requests get processed for this import.
* ptlrpc_{queue,set}_wait must (and does) hold imp_lock while testing
* this flag and then putting requests on sending_list or delayed_list.
*/
- spin_lock(&imp->imp_lock);
+ cfs_spin_lock(&imp->imp_lock);
/* XXX locking? Maybe we should remove each request with the list
* locked? Also, how do we know if the requests on the list are
* being freed at this time?
*/
- list_for_each_safe(tmp, n, &imp->imp_sending_list) {
+ cfs_list_for_each_safe(tmp, n, &imp->imp_sending_list) {
struct ptlrpc_request *req =
- list_entry(tmp, struct ptlrpc_request, rq_list);
+ cfs_list_entry(tmp, struct ptlrpc_request, rq_list);
DEBUG_REQ(D_RPCTRACE, req, "inflight");
- spin_lock (&req->rq_lock);
+ cfs_spin_lock (&req->rq_lock);
if (req->rq_import_generation < imp->imp_generation) {
req->rq_err = 1;
req->rq_status = -EINTR;
ptlrpc_client_wake_req(req);
}
- spin_unlock (&req->rq_lock);
+ cfs_spin_unlock (&req->rq_lock);
}
- list_for_each_safe(tmp, n, &imp->imp_delayed_list) {
+ cfs_list_for_each_safe(tmp, n, &imp->imp_delayed_list) {
struct ptlrpc_request *req =
- list_entry(tmp, struct ptlrpc_request, rq_list);
+ cfs_list_entry(tmp, struct ptlrpc_request, rq_list);
DEBUG_REQ(D_RPCTRACE, req, "aborting waiting req");
- spin_lock (&req->rq_lock);
+ cfs_spin_lock (&req->rq_lock);
if (req->rq_import_generation < imp->imp_generation) {
req->rq_err = 1;
req->rq_status = -EINTR;
ptlrpc_client_wake_req(req);
}
- spin_unlock (&req->rq_lock);
+ cfs_spin_unlock (&req->rq_lock);
}
/* Last chance to free reqs left on the replay list, but we
if (imp->imp_replayable)
ptlrpc_free_committed(imp);
- spin_unlock(&imp->imp_lock);
+ cfs_spin_unlock(&imp->imp_lock);
EXIT;
}
void ptlrpc_abort_set(struct ptlrpc_request_set *set)
{
- struct list_head *tmp, *pos;
+ cfs_list_t *tmp, *pos;
LASSERT(set != NULL);
- list_for_each_safe(pos, tmp, &set->set_requests) {
+ cfs_list_for_each_safe(pos, tmp, &set->set_requests) {
struct ptlrpc_request *req =
- list_entry(pos, struct ptlrpc_request, rq_set_chain);
+ cfs_list_entry(pos, struct ptlrpc_request,
+ rq_set_chain);
- spin_lock(&req->rq_lock);
+ cfs_spin_lock(&req->rq_lock);
if (req->rq_phase != RQ_PHASE_RPC) {
- spin_unlock(&req->rq_lock);
+ cfs_spin_unlock(&req->rq_lock);
continue;
}
req->rq_err = 1;
req->rq_status = -EINTR;
ptlrpc_client_wake_req(req);
- spin_unlock(&req->rq_lock);
+ cfs_spin_unlock(&req->rq_lock);
}
}
static __u64 ptlrpc_last_xid;
-static spinlock_t ptlrpc_last_xid_lock;
+static cfs_spinlock_t ptlrpc_last_xid_lock;
/* Initialize the XID for the node. This is common among all requests on
* this node, and only requires the property that it is monotonically
{
time_t now = cfs_time_current_sec();
- spin_lock_init(&ptlrpc_last_xid_lock);
+ cfs_spin_lock_init(&ptlrpc_last_xid_lock);
if (now < YEAR_2004) {
ll_get_random_bytes(&ptlrpc_last_xid, sizeof(ptlrpc_last_xid));
ptlrpc_last_xid >>= 2;
__u64 ptlrpc_next_xid(void)
{
__u64 tmp;
- spin_lock(&ptlrpc_last_xid_lock);
+ cfs_spin_lock(&ptlrpc_last_xid_lock);
tmp = ++ptlrpc_last_xid;
- spin_unlock(&ptlrpc_last_xid_lock);
+ cfs_spin_unlock(&ptlrpc_last_xid_lock);
return tmp;
}
#if BITS_PER_LONG == 32
/* need to avoid possible word tearing on 32-bit systems */
__u64 tmp;
- spin_lock(&ptlrpc_last_xid_lock);
+ cfs_spin_lock(&ptlrpc_last_xid_lock);
tmp = ptlrpc_last_xid + 1;
- spin_unlock(&ptlrpc_last_xid_lock);
+ cfs_spin_unlock(&ptlrpc_last_xid_lock);
return tmp;
#else
/* No need to lock, since returned value is racy anyways */
git://git.whamcloud.com / fs / lustre-release.git / blobdiff