-/* -*- 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.
* GPL HEADER END
*/
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
+ *
+ * Copyright (c) 2011, Whamcloud, Inc.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
LASSERT (crpc != NULL && rpc == crpc->crp_rpc);
LASSERT (crpc->crp_posted && !crpc->crp_finished);
- spin_lock(&rpc->crpc_lock);
+ cfs_spin_lock(&rpc->crpc_lock);
if (crpc->crp_trans == NULL) {
/* Orphan RPC is not in any transaction,
* I'm just a poor body and nobody loves me */
- spin_unlock(&rpc->crpc_lock);
+ cfs_spin_unlock(&rpc->crpc_lock);
/* release it */
lstcon_rpc_put(crpc);
}
/* wakeup (transaction)thread if I'm the last RPC in the transaction */
- if (atomic_dec_and_test(&crpc->crp_trans->tas_remaining))
+ if (cfs_atomic_dec_and_test(&crpc->crp_trans->tas_remaining))
cfs_waitq_signal(&crpc->crp_trans->tas_waitq);
- spin_unlock(&rpc->crpc_lock);
+ cfs_spin_unlock(&rpc->crpc_lock);
}
int
crpc->crp_static = !cached;
CFS_INIT_LIST_HEAD(&crpc->crp_link);
- atomic_inc(&console_session.ses_rpc_counter);
+ cfs_atomic_inc(&console_session.ses_rpc_counter);
return 0;
}
lstcon_rpc_t *crpc = NULL;
int rc;
- spin_lock(&console_session.ses_rpc_lock);
+ cfs_spin_lock(&console_session.ses_rpc_lock);
- if (!list_empty(&console_session.ses_rpc_freelist)) {
- crpc = list_entry(console_session.ses_rpc_freelist.next,
- lstcon_rpc_t, crp_link);
- list_del_init(&crpc->crp_link);
+ if (!cfs_list_empty(&console_session.ses_rpc_freelist)) {
+ crpc = cfs_list_entry(console_session.ses_rpc_freelist.next,
+ lstcon_rpc_t, crp_link);
+ cfs_list_del_init(&crpc->crp_link);
}
- spin_unlock(&console_session.ses_rpc_lock);
+ cfs_spin_unlock(&console_session.ses_rpc_lock);
if (crpc == NULL) {
LIBCFS_ALLOC(crpc, sizeof(*crpc));
srpc_bulk_t *bulk = &crpc->crp_rpc->crpc_bulk;
int i;
- LASSERT (list_empty(&crpc->crp_link));
+ LASSERT (cfs_list_empty(&crpc->crp_link));
for (i = 0; i < bulk->bk_niov; i++) {
if (bulk->bk_iovs[i].kiov_page == NULL)
crpc->crp_static = 1;
} else {
- spin_lock(&console_session.ses_rpc_lock);
+ cfs_spin_lock(&console_session.ses_rpc_lock);
- list_add(&crpc->crp_link, &console_session.ses_rpc_freelist);
+ cfs_list_add(&crpc->crp_link,
+ &console_session.ses_rpc_freelist);
- spin_unlock(&console_session.ses_rpc_lock);
+ cfs_spin_unlock(&console_session.ses_rpc_lock);
}
/* RPC is not alive now */
- atomic_dec(&console_session.ses_rpc_counter);
+ cfs_atomic_dec(&console_session.ses_rpc_counter);
}
void
LASSERT (trans != NULL);
- atomic_inc(&trans->tas_remaining);
+ cfs_atomic_inc(&trans->tas_remaining);
crpc->crp_posted = 1;
sfw_post_rpc(crpc->crp_rpc);
}
int
-lstcon_rpc_trans_prep(struct list_head *translist,
+lstcon_rpc_trans_prep(cfs_list_t *translist,
int transop, lstcon_rpc_trans_t **transpp)
{
lstcon_rpc_trans_t *trans;
if (translist == NULL)
CFS_INIT_LIST_HEAD(&trans->tas_olink);
else
- list_add_tail(&trans->tas_olink, translist);
+ cfs_list_add_tail(&trans->tas_olink, translist);
- list_add_tail(&trans->tas_link, &console_session.ses_trans_list);
+ cfs_list_add_tail(&trans->tas_link, &console_session.ses_trans_list);
CFS_INIT_LIST_HEAD(&trans->tas_rpcs_list);
- atomic_set(&trans->tas_remaining, 0);
+ cfs_atomic_set(&trans->tas_remaining, 0);
cfs_waitq_init(&trans->tas_waitq);
*transpp = trans;
void
lstcon_rpc_trans_addreq(lstcon_rpc_trans_t *trans, lstcon_rpc_t *crpc)
{
- list_add_tail(&crpc->crp_link, &trans->tas_rpcs_list);
+ cfs_list_add_tail(&crpc->crp_link, &trans->tas_rpcs_list);
crpc->crp_trans = trans;
}
lstcon_rpc_t, crp_link) {
rpc = crpc->crp_rpc;
- spin_lock(&rpc->crpc_lock);
+ cfs_spin_lock(&rpc->crpc_lock);
- if (!crpc->crp_posted || crpc->crp_stamp != 0) {
- /* rpc done or aborted already */
- spin_unlock(&rpc->crpc_lock);
+ if (!crpc->crp_posted || /* not posted */
+ crpc->crp_stamp != 0) { /* rpc done or aborted already */
+ if (crpc->crp_stamp == 0) {
+ crpc->crp_stamp = cfs_time_current();
+ crpc->crp_status = -EINTR;
+ }
+ cfs_spin_unlock(&rpc->crpc_lock);
continue;
}
crpc->crp_stamp = cfs_time_current();
crpc->crp_status = error;
- spin_unlock(&rpc->crpc_lock);
+ cfs_spin_unlock(&rpc->crpc_lock);
sfw_abort_rpc(rpc);
lstcon_rpc_trans_check(lstcon_rpc_trans_t *trans)
{
if (console_session.ses_shutdown &&
- !list_empty(&trans->tas_olink)) /* It's not an end session RPC */
+ !cfs_list_empty(&trans->tas_olink)) /* Not an end session RPC */
return 1;
- return (atomic_read(&trans->tas_remaining) == 0) ? 1: 0;
+ return (cfs_atomic_read(&trans->tas_remaining) == 0) ? 1: 0;
}
int
lstcon_rpc_t *crpc;
int rc;
- if (list_empty(&trans->tas_rpcs_list))
+ if (cfs_list_empty(&trans->tas_rpcs_list))
return 0;
if (timeout < LST_TRANS_MIN_TIMEOUT)
lstcon_rpc_post(crpc);
}
- mutex_up(&console_session.ses_mutex);
+ cfs_mutex_unlock(&console_session.ses_mutex);
cfs_waitq_wait_event_interruptible_timeout(trans->tas_waitq,
lstcon_rpc_trans_check(trans),
rc = (rc > 0)? 0: ((rc < 0)? -EINTR: -ETIMEDOUT);
- mutex_down(&console_session.ses_mutex);
+ cfs_mutex_lock(&console_session.ses_mutex);
if (console_session.ses_shutdown)
rc = -ESHUTDOWN;
- if (rc != 0) {
+ if (rc != 0 || atomic_read(&trans->tas_remaining) != 0) {
/* treat short timeout as canceled */
if (rc == -ETIMEDOUT && timeout < LST_TRANS_MIN_TIMEOUT * 2)
rc = -EINTR;
lstcon_rpc_trans_stat(lstcon_rpc_trans_t *trans, lstcon_trans_stat_t *stat)
{
lstcon_rpc_t *crpc;
- srpc_client_rpc_t *rpc;
srpc_msg_t *rep;
int error;
lstcon_rpc_t, crp_link) {
lstcon_rpc_stat_total(stat, 1);
- rpc = crpc->crp_rpc;
-
LASSERT (crpc->crp_stamp != 0);
error = lstcon_rpc_get_reply(crpc, &rep);
int
lstcon_rpc_trans_interpreter(lstcon_rpc_trans_t *trans,
- struct list_head *head_up,
+ cfs_list_t *head_up,
lstcon_rpc_readent_func_t readent)
{
- struct list_head tmp;
- struct list_head *next;
+ cfs_list_t tmp;
+ cfs_list_t *next;
lstcon_rpc_ent_t *ent;
srpc_generic_reply_t *rep;
- srpc_client_rpc_t *rpc;
lstcon_rpc_t *crpc;
srpc_msg_t *msg;
lstcon_node_t *nd;
cfs_list_for_each_entry_typed(crpc, &trans->tas_rpcs_list,
lstcon_rpc_t, crp_link) {
- if (copy_from_user(&tmp, next, sizeof(struct list_head)))
+ if (cfs_copy_from_user(&tmp, next,
+ sizeof(cfs_list_t)))
return -EFAULT;
if (tmp.next == head_up)
next = tmp.next;
- ent = list_entry(next, lstcon_rpc_ent_t, rpe_link);
-
- rpc = crpc->crp_rpc;
+ ent = cfs_list_entry(next, lstcon_rpc_ent_t, rpe_link);
LASSERT (crpc->crp_stamp != 0);
(cfs_time_t)console_session.ses_id.ses_stamp);
cfs_duration_usec(dur, &tv);
- if (copy_to_user(&ent->rpe_peer,
- &nd->nd_id, sizeof(lnet_process_id_t)) ||
- copy_to_user(&ent->rpe_stamp, &tv, sizeof(tv)) ||
- copy_to_user(&ent->rpe_state,
- &nd->nd_state, sizeof(nd->nd_state)) ||
- copy_to_user(&ent->rpe_rpc_errno, &error, sizeof(error)))
+ if (cfs_copy_to_user(&ent->rpe_peer,
+ &nd->nd_id, sizeof(lnet_process_id_t)) ||
+ cfs_copy_to_user(&ent->rpe_stamp, &tv, sizeof(tv)) ||
+ cfs_copy_to_user(&ent->rpe_state,
+ &nd->nd_state, sizeof(nd->nd_state)) ||
+ cfs_copy_to_user(&ent->rpe_rpc_errno, &error,
+ sizeof(error)))
return -EFAULT;
if (error != 0)
/* RPC is done */
rep = (srpc_generic_reply_t *)&msg->msg_body.reply;
- if (copy_to_user(&ent->rpe_sid,
- &rep->sid, sizeof(lst_sid_t)) ||
- copy_to_user(&ent->rpe_fwk_errno,
- &rep->status, sizeof(rep->status)))
+ if (cfs_copy_to_user(&ent->rpe_sid,
+ &rep->sid, sizeof(lst_sid_t)) ||
+ cfs_copy_to_user(&ent->rpe_fwk_errno,
+ &rep->status, sizeof(rep->status)))
return -EFAULT;
if (readent == NULL)
lstcon_rpc_t *crpc;
lstcon_rpc_t *tmp;
int count = 0;
-
+
cfs_list_for_each_entry_safe_typed(crpc, tmp,
&trans->tas_rpcs_list,
lstcon_rpc_t, crp_link) {
rpc = crpc->crp_rpc;
- spin_lock(&rpc->crpc_lock);
+ cfs_spin_lock(&rpc->crpc_lock);
/* free it if not posted or finished already */
if (!crpc->crp_posted || crpc->crp_finished) {
- spin_unlock(&rpc->crpc_lock);
+ cfs_spin_unlock(&rpc->crpc_lock);
- list_del_init(&crpc->crp_link);
+ cfs_list_del_init(&crpc->crp_link);
lstcon_rpc_put(crpc);
continue;
/* rpcs can be still not callbacked (even LNetMDUnlink is called)
* because huge timeout for inaccessible network, don't make
- * user wait for them, just abandon them, they will be recycled
+ * user wait for them, just abandon them, they will be recycled
* in callback */
LASSERT (crpc->crp_status != 0);
crpc->crp_node = NULL;
crpc->crp_trans = NULL;
- list_del_init(&crpc->crp_link);
+ cfs_list_del_init(&crpc->crp_link);
count ++;
- spin_unlock(&rpc->crpc_lock);
+ cfs_spin_unlock(&rpc->crpc_lock);
- atomic_dec(&trans->tas_remaining);
+ cfs_atomic_dec(&trans->tas_remaining);
}
- LASSERT (atomic_read(&trans->tas_remaining) == 0);
+ LASSERT (cfs_atomic_read(&trans->tas_remaining) == 0);
- list_del(&trans->tas_link);
- if (!list_empty(&trans->tas_olink))
- list_del(&trans->tas_olink);
+ cfs_list_del(&trans->tas_link);
+ if (!cfs_list_empty(&trans->tas_olink))
+ cfs_list_del(&trans->tas_olink);
CDEBUG(D_NET, "Transaction %s destroyed with %d pending RPCs\n",
lstcon_rpc_trans_name(trans->tas_opc), count);
return 0;
}
-lnet_process_id_t *
+lnet_process_id_packed_t *
lstcon_next_id(int idx, int nkiov, lnet_kiov_t *kiov)
{
- lnet_process_id_t *pid;
- int i;
+ lnet_process_id_packed_t *pid;
+ int i;
- i = idx / (CFS_PAGE_SIZE / sizeof(lnet_process_id_t));
+ i = idx / SFW_ID_PER_PAGE;
LASSERT (i < nkiov);
- pid = (lnet_process_id_t *)cfs_page_address(kiov[i].kiov_page);
+ pid = (lnet_process_id_packed_t *)cfs_page_address(kiov[i].kiov_page);
- return &pid[idx % (CFS_PAGE_SIZE / sizeof(lnet_process_id_t))];
+ return &pid[idx % SFW_ID_PER_PAGE];
}
int
lstcon_dstnodes_prep(lstcon_group_t *grp, int idx,
int dist, int span, int nkiov, lnet_kiov_t *kiov)
{
- lnet_process_id_t *pid;
- lstcon_ndlink_t *ndl;
- lstcon_node_t *nd;
- int start;
- int end;
- int i = 0;
+ lnet_process_id_packed_t *pid;
+ lstcon_ndlink_t *ndl;
+ lstcon_node_t *nd;
+ int start;
+ int end;
+ int i = 0;
LASSERT (dist >= 1);
LASSERT (span >= 1);
break;
pid = lstcon_next_id((i - start), nkiov, kiov);
- *pid = nd->nd_id;
+ pid->nid = nd->nd_id.nid;
+ pid->pid = nd->nd_id.pid;
i++;
}
nd = ndl->ndl_node;
pid = lstcon_next_id((i - start), nkiov, kiov);
- *pid = nd->nd_id;
+ pid->nid = nd->nd_id.nid;
+ pid->pid = nd->nd_id.pid;
i++;
}
}
int
-lstcon_rpc_trans_ndlist(struct list_head *ndlist,
- struct list_head *translist, int transop,
+lstcon_rpc_trans_ndlist(cfs_list_t *ndlist,
+ cfs_list_t *translist, int transop,
void *arg, lstcon_rpc_cond_func_t condition,
lstcon_rpc_trans_t **transpp)
{
/* RPC pinger is a special case of transaction,
* it's called by timer at 8 seconds interval.
*/
- mutex_down(&console_session.ses_mutex);
+ cfs_mutex_lock(&console_session.ses_mutex);
if (console_session.ses_shutdown || console_session.ses_expired) {
- mutex_up(&console_session.ses_mutex);
+ cfs_mutex_unlock(&console_session.ses_mutex);
return;
}
if (crpc->crp_rpc != NULL) {
LASSERT (crpc->crp_trans == trans);
- LASSERT (!list_empty(&crpc->crp_link));
+ LASSERT (!cfs_list_empty(&crpc->crp_link));
- spin_lock(&crpc->crp_rpc->crpc_lock);
+ cfs_spin_lock(&crpc->crp_rpc->crpc_lock);
LASSERT (crpc->crp_posted);
if (!crpc->crp_finished) {
/* in flight */
- spin_unlock(&crpc->crp_rpc->crpc_lock);
+ cfs_spin_unlock(&crpc->crp_rpc->crpc_lock);
continue;
}
- spin_unlock(&crpc->crp_rpc->crpc_lock);
+ cfs_spin_unlock(&crpc->crp_rpc->crpc_lock);
lstcon_rpc_get_reply(crpc, &rep);
- list_del_init(&crpc->crp_link);
+ cfs_list_del_init(&crpc->crp_link);
lstcon_rpc_put(crpc);
}
}
if (console_session.ses_expired) {
- mutex_up(&console_session.ses_mutex);
+ cfs_mutex_unlock(&console_session.ses_mutex);
return;
}
ptimer->stt_expires = (cfs_time_t)(cfs_time_current_sec() + LST_PING_INTERVAL);
stt_add_timer(ptimer);
- mutex_up(&console_session.ses_mutex);
+ cfs_mutex_unlock(&console_session.ses_mutex);
}
int
stt_timer_t *ptimer;
int rc;
- LASSERT (list_empty(&console_session.ses_rpc_freelist));
- LASSERT (atomic_read(&console_session.ses_rpc_counter) == 0);
+ LASSERT (cfs_list_empty(&console_session.ses_rpc_freelist));
+ LASSERT (cfs_atomic_read(&console_session.ses_rpc_counter) == 0);
rc = lstcon_rpc_trans_prep(NULL, LST_TRANS_SESPING,
&console_session.ses_ping);
{
lstcon_rpc_trans_t *trans;
lstcon_rpc_t *crpc;
- struct list_head *pacer;
- struct list_head zlist;
+ cfs_list_t *pacer;
+ cfs_list_t zlist;
/* Called with hold of global mutex */
LASSERT (console_session.ses_shutdown);
- while (!list_empty(&console_session.ses_trans_list)) {
- list_for_each(pacer, &console_session.ses_trans_list) {
- trans = list_entry(pacer, lstcon_rpc_trans_t, tas_link);
+ while (!cfs_list_empty(&console_session.ses_trans_list)) {
+ cfs_list_for_each(pacer, &console_session.ses_trans_list) {
+ trans = cfs_list_entry(pacer, lstcon_rpc_trans_t,
+ tas_link);
CDEBUG(D_NET, "Session closed, wakeup transaction %s\n",
lstcon_rpc_trans_name(trans->tas_opc));
cfs_waitq_signal(&trans->tas_waitq);
}
- mutex_up(&console_session.ses_mutex);
+ cfs_mutex_unlock(&console_session.ses_mutex);
CWARN("Session is shutting down, "
"waiting for termination of transactions\n");
cfs_pause(cfs_time_seconds(1));
- mutex_down(&console_session.ses_mutex);
+ cfs_mutex_lock(&console_session.ses_mutex);
}
- spin_lock(&console_session.ses_rpc_lock);
+ cfs_spin_lock(&console_session.ses_rpc_lock);
- lst_wait_until((atomic_read(&console_session.ses_rpc_counter) == 0),
+ lst_wait_until((cfs_atomic_read(&console_session.ses_rpc_counter) == 0),
console_session.ses_rpc_lock,
"Network is not accessable or target is down, "
"waiting for %d console RPCs to being recycled\n",
- atomic_read(&console_session.ses_rpc_counter));
+ cfs_atomic_read(&console_session.ses_rpc_counter));
- list_add(&zlist, &console_session.ses_rpc_freelist);
- list_del_init(&console_session.ses_rpc_freelist);
+ cfs_list_add(&zlist, &console_session.ses_rpc_freelist);
+ cfs_list_del_init(&console_session.ses_rpc_freelist);
- spin_unlock(&console_session.ses_rpc_lock);
+ cfs_spin_unlock(&console_session.ses_rpc_lock);
- while (!list_empty(&zlist)) {
- crpc = list_entry(zlist.next, lstcon_rpc_t, crp_link);
+ while (!cfs_list_empty(&zlist)) {
+ crpc = cfs_list_entry(zlist.next, lstcon_rpc_t, crp_link);
- list_del(&crpc->crp_link);
+ cfs_list_del(&crpc->crp_link);
LIBCFS_FREE(crpc, sizeof(lstcon_rpc_t));
}
}
console_session.ses_ping = NULL;
- spin_lock_init(&console_session.ses_rpc_lock);
- atomic_set(&console_session.ses_rpc_counter, 0);
+ cfs_spin_lock_init(&console_session.ses_rpc_lock);
+ cfs_atomic_set(&console_session.ses_rpc_counter, 0);
CFS_INIT_LIST_HEAD(&console_session.ses_rpc_freelist);
return 0;
void
lstcon_rpc_module_fini(void)
{
- LASSERT (list_empty(&console_session.ses_rpc_freelist));
- LASSERT (atomic_read(&console_session.ses_rpc_counter) == 0);
+ LASSERT (cfs_list_empty(&console_session.ses_rpc_freelist));
+ LASSERT (cfs_atomic_read(&console_session.ses_rpc_counter) == 0);
}
#endif
git://git.whamcloud.com / fs / lustre-release.git / blobdiff