X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lnet%2Fselftest%2Fconrpc.c;h=a7729edb5e46edb413a6eb5a85d3b51508875de0;hp=bd9aa92b5bcba5c27f3cfb782f9ed6b684b499a5;hb=56efe55f3d125343e80f8bf6c7e6edb2a2ff87ef;hpb=a5b81807c5d6d2cb3b2ef1a0a7e150ee6002f7f7;ds=sidebyside diff --git a/lnet/selftest/conrpc.c b/lnet/selftest/conrpc.c index bd9aa92..a7729ed 100644 --- a/lnet/selftest/conrpc.c +++ b/lnet/selftest/conrpc.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. @@ -28,6 +26,8 @@ /* * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. + * + * Copyright (c) 2011, 2012, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -37,7 +37,7 @@ * * Console framework rpcs * - * Author: Liang Zhen + * Author: Liang Zhen */ #ifdef __KERNEL__ @@ -48,23 +48,23 @@ #include "conrpc.h" #include "console.h" -void lstcon_rpc_stat_reply(int, srpc_msg_t *, - lstcon_node_t *, lstcon_trans_stat_t *); +void lstcon_rpc_stat_reply(lstcon_rpc_trans_t *, srpc_msg_t *, + lstcon_node_t *, lstcon_trans_stat_t *); static void lstcon_rpc_done(srpc_client_rpc_t *rpc) { - lstcon_rpc_t *crpc = (lstcon_rpc_t *)rpc->crpc_priv; + lstcon_rpc_t *crpc = (lstcon_rpc_t *)rpc->crpc_priv; - LASSERT (crpc != NULL && rpc == crpc->crp_rpc); - LASSERT (crpc->crp_posted && !crpc->crp_finished); + LASSERT(crpc != NULL && rpc == crpc->crp_rpc); + LASSERT(crpc->crp_posted && !crpc->crp_finished); - cfs_spin_lock(&rpc->crpc_lock); + 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 */ - cfs_spin_unlock(&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); /* release it */ lstcon_rpc_put(crpc); @@ -86,17 +86,16 @@ lstcon_rpc_done(srpc_client_rpc_t *rpc) if (cfs_atomic_dec_and_test(&crpc->crp_trans->tas_remaining)) cfs_waitq_signal(&crpc->crp_trans->tas_waitq); - cfs_spin_unlock(&rpc->crpc_lock); + spin_unlock(&rpc->crpc_lock); } int -lstcon_rpc_init(lstcon_node_t *nd, int service, - int npg, int cached, lstcon_rpc_t *crpc) +lstcon_rpc_init(lstcon_node_t *nd, int service, unsigned feats, + int bulk_npg, int bulk_len, int embedded, lstcon_rpc_t *crpc) { - - crpc->crp_rpc = sfw_create_rpc(nd->nd_id, service, - npg, npg * CFS_PAGE_SIZE, - lstcon_rpc_done, (void *)crpc); + crpc->crp_rpc = sfw_create_rpc(nd->nd_id, service, + feats, bulk_npg, bulk_len, + lstcon_rpc_done, (void *)crpc); if (crpc->crp_rpc == NULL) return -ENOMEM; @@ -107,7 +106,7 @@ lstcon_rpc_init(lstcon_node_t *nd, int service, crpc->crp_unpacked = 0; crpc->crp_status = 0; crpc->crp_stamp = 0; - crpc->crp_static = !cached; + crpc->crp_embedded = embedded; CFS_INIT_LIST_HEAD(&crpc->crp_link); cfs_atomic_inc(&console_session.ses_rpc_counter); @@ -116,29 +115,29 @@ lstcon_rpc_init(lstcon_node_t *nd, int service, } int -lstcon_rpc_prep(lstcon_node_t *nd, int service, - int npg, lstcon_rpc_t **crpcpp) +lstcon_rpc_prep(lstcon_node_t *nd, int service, unsigned feats, + int bulk_npg, int bulk_len, lstcon_rpc_t **crpcpp) { - lstcon_rpc_t *crpc = NULL; - int rc; + lstcon_rpc_t *crpc = NULL; + int rc; - cfs_spin_lock(&console_session.ses_rpc_lock); + spin_lock(&console_session.ses_rpc_lock); - 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); - } + 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); + } - cfs_spin_unlock(&console_session.ses_rpc_lock); + spin_unlock(&console_session.ses_rpc_lock); - if (crpc == NULL) { - LIBCFS_ALLOC(crpc, sizeof(*crpc)); - if (crpc == NULL) - return -ENOMEM; - } + if (crpc == NULL) { + LIBCFS_ALLOC(crpc, sizeof(*crpc)); + if (crpc == NULL) + return -ENOMEM; + } - rc = lstcon_rpc_init(nd, service, npg, 1, crpc); + rc = lstcon_rpc_init(nd, service, feats, bulk_npg, bulk_len, 0, crpc); if (rc == 0) { *crpcpp = crpc; return 0; @@ -161,27 +160,27 @@ lstcon_rpc_put(lstcon_rpc_t *crpc) if (bulk->bk_iovs[i].kiov_page == NULL) continue; - cfs_free_page(bulk->bk_iovs[i].kiov_page); + __free_page(bulk->bk_iovs[i].kiov_page); } srpc_client_rpc_decref(crpc->crp_rpc); - if (crpc->crp_static) { - /* Static RPC, not allocated */ - memset(crpc, 0, sizeof(*crpc)); - crpc->crp_static = 1; + if (crpc->crp_embedded) { + /* embedded RPC, don't recycle it */ + memset(crpc, 0, sizeof(*crpc)); + crpc->crp_embedded = 1; - } else { - cfs_spin_lock(&console_session.ses_rpc_lock); + } else { + spin_lock(&console_session.ses_rpc_lock); - cfs_list_add(&crpc->crp_link, - &console_session.ses_rpc_freelist); + cfs_list_add(&crpc->crp_link, + &console_session.ses_rpc_freelist); - cfs_spin_unlock(&console_session.ses_rpc_lock); - } + spin_unlock(&console_session.ses_rpc_lock); + } - /* RPC is not alive now */ - cfs_atomic_dec(&console_session.ses_rpc_counter); + /* RPC is not alive now */ + cfs_atomic_dec(&console_session.ses_rpc_counter); } void @@ -256,10 +255,10 @@ lstcon_rpc_trans_prep(cfs_list_t *translist, LIBCFS_ALLOC(trans, sizeof(*trans)); if (trans == NULL) return -ENOMEM; - + trans->tas_opc = transop; - if (translist == NULL) + if (translist == NULL) CFS_INIT_LIST_HEAD(&trans->tas_olink); else cfs_list_add_tail(&trans->tas_olink, translist); @@ -270,9 +269,12 @@ lstcon_rpc_trans_prep(cfs_list_t *translist, cfs_atomic_set(&trans->tas_remaining, 0); cfs_waitq_init(&trans->tas_waitq); - *transpp = trans; + spin_lock(&console_session.ses_rpc_lock); + trans->tas_features = console_session.ses_features; + spin_unlock(&console_session.ses_rpc_lock); - return 0; + *transpp = trans; + return 0; } void @@ -285,43 +287,43 @@ lstcon_rpc_trans_addreq(lstcon_rpc_trans_t *trans, lstcon_rpc_t *crpc) void lstcon_rpc_trans_abort(lstcon_rpc_trans_t *trans, int error) { - srpc_client_rpc_t *rpc; - lstcon_rpc_t *crpc; - lstcon_node_t *nd; + srpc_client_rpc_t *rpc; + lstcon_rpc_t *crpc; + lstcon_node_t *nd; - cfs_list_for_each_entry_typed (crpc, &trans->tas_rpcs_list, - lstcon_rpc_t, crp_link) { - rpc = crpc->crp_rpc; + cfs_list_for_each_entry_typed(crpc, &trans->tas_rpcs_list, + lstcon_rpc_t, crp_link) { + rpc = crpc->crp_rpc; - cfs_spin_lock(&rpc->crpc_lock); + spin_lock(&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; - } + 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; + } + spin_unlock(&rpc->crpc_lock); + continue; + } - crpc->crp_stamp = cfs_time_current(); - crpc->crp_status = error; + crpc->crp_stamp = cfs_time_current(); + crpc->crp_status = error; - cfs_spin_unlock(&rpc->crpc_lock); + spin_unlock(&rpc->crpc_lock); - sfw_abort_rpc(rpc); + sfw_abort_rpc(rpc); - if (error != ETIMEDOUT) - continue; + if (error != -ETIMEDOUT) + continue; - nd = crpc->crp_node; - if (cfs_time_after(nd->nd_stamp, crpc->crp_stamp)) - continue; + nd = crpc->crp_node; + if (cfs_time_after(nd->nd_stamp, crpc->crp_stamp)) + continue; - nd->nd_stamp = crpc->crp_stamp; - nd->nd_state = LST_NODE_DOWN; - } + nd->nd_stamp = crpc->crp_stamp; + nd->nd_state = LST_NODE_DOWN; + } } static int @@ -357,7 +359,7 @@ lstcon_rpc_trans_postwait(lstcon_rpc_trans_t *trans, int timeout) lstcon_rpc_post(crpc); } - cfs_mutex_up(&console_session.ses_mutex); + mutex_unlock(&console_session.ses_mutex); cfs_waitq_wait_event_interruptible_timeout(trans->tas_waitq, lstcon_rpc_trans_check(trans), @@ -365,7 +367,7 @@ lstcon_rpc_trans_postwait(lstcon_rpc_trans_t *trans, int timeout) rc = (rc > 0)? 0: ((rc < 0)? -EINTR: -ETIMEDOUT); - cfs_mutex_down(&console_session.ses_mutex); + mutex_lock(&console_session.ses_mutex); if (console_session.ses_shutdown) rc = -ESHUTDOWN; @@ -406,7 +408,7 @@ lstcon_rpc_get_reply(lstcon_rpc_t *crpc, srpc_msg_t **msgpp) sfw_unpack_message(*msgpp); crpc->crp_unpacked = 1; } - + if (cfs_time_after(nd->nd_stamp, crpc->crp_stamp)) return 0; @@ -451,8 +453,12 @@ lstcon_rpc_trans_stat(lstcon_rpc_trans_t *trans, lstcon_trans_stat_t *stat) lstcon_rpc_stat_success(stat, 1); - lstcon_rpc_stat_reply(trans->tas_opc, rep, - crpc->crp_node, stat); + lstcon_rpc_stat_reply(trans, rep, crpc->crp_node, stat); + } + + if (trans->tas_opc == LST_TRANS_SESNEW && stat->trs_fwk_errno == 0) { + stat->trs_fwk_errno = + lstcon_session_feats_check(trans->tas_features); } CDEBUG(D_NET, "transaction %s : success %d, failure %d, total %d, " @@ -488,7 +494,7 @@ lstcon_rpc_trans_interpreter(lstcon_rpc_trans_t *trans, cfs_list_for_each_entry_typed(crpc, &trans->tas_rpcs_list, lstcon_rpc_t, crp_link) { - if (cfs_copy_from_user(&tmp, next, + if (copy_from_user(&tmp, next, sizeof(cfs_list_t))) return -EFAULT; @@ -509,35 +515,36 @@ lstcon_rpc_trans_interpreter(lstcon_rpc_trans_t *trans, (cfs_time_t)console_session.ses_id.ses_stamp); cfs_duration_usec(dur, &tv); - 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 (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))) + return -EFAULT; - if (error != 0) - continue; + if (error != 0) + continue; - /* RPC is done */ - rep = (srpc_generic_reply_t *)&msg->msg_body.reply; + /* RPC is done */ + rep = (srpc_generic_reply_t *)&msg->msg_body.reply; - 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 (copy_to_user(&ent->rpe_sid, + &rep->sid, sizeof(lst_sid_t)) || + copy_to_user(&ent->rpe_fwk_errno, + &rep->status, sizeof(rep->status))) + return -EFAULT; - if (readent == NULL) - continue; + if (readent == NULL) + continue; - if ((error = readent(trans->tas_opc, msg, ent)) != 0) - return error; - } + error = readent(trans->tas_opc, msg, ent); + if (error != 0) + return error; + } - return 0; + return 0; } void @@ -553,11 +560,11 @@ lstcon_rpc_trans_destroy(lstcon_rpc_trans_t *trans) lstcon_rpc_t, crp_link) { rpc = crpc->crp_rpc; - cfs_spin_lock(&rpc->crpc_lock); + spin_lock(&rpc->crpc_lock); - /* free it if not posted or finished already */ - if (!crpc->crp_posted || crpc->crp_finished) { - cfs_spin_unlock(&rpc->crpc_lock); + /* free it if not posted or finished already */ + if (!crpc->crp_posted || crpc->crp_finished) { + spin_unlock(&rpc->crpc_lock); cfs_list_del_init(&crpc->crp_link); lstcon_rpc_put(crpc); @@ -577,7 +584,7 @@ lstcon_rpc_trans_destroy(lstcon_rpc_trans_t *trans) cfs_list_del_init(&crpc->crp_link); count ++; - cfs_spin_unlock(&rpc->crpc_lock); + spin_unlock(&rpc->crpc_lock); cfs_atomic_dec(&trans->tas_remaining); } @@ -597,7 +604,8 @@ lstcon_rpc_trans_destroy(lstcon_rpc_trans_t *trans) } int -lstcon_sesrpc_prep(lstcon_node_t *nd, int transop, lstcon_rpc_t **crpc) +lstcon_sesrpc_prep(lstcon_node_t *nd, int transop, + unsigned feats, lstcon_rpc_t **crpc) { srpc_mksn_reqst_t *msrq; srpc_rmsn_reqst_t *rsrq; @@ -605,7 +613,8 @@ lstcon_sesrpc_prep(lstcon_node_t *nd, int transop, lstcon_rpc_t **crpc) switch (transop) { case LST_TRANS_SESNEW: - rc = lstcon_rpc_prep(nd, SRPC_SERVICE_MAKE_SESSION, 0, crpc); + rc = lstcon_rpc_prep(nd, SRPC_SERVICE_MAKE_SESSION, + feats, 0, 0, crpc); if (rc != 0) return rc; @@ -617,7 +626,8 @@ lstcon_sesrpc_prep(lstcon_node_t *nd, int transop, lstcon_rpc_t **crpc) break; case LST_TRANS_SESEND: - rc = lstcon_rpc_prep(nd, SRPC_SERVICE_REMOVE_SESSION, 0, crpc); + rc = lstcon_rpc_prep(nd, SRPC_SERVICE_REMOVE_SESSION, + feats, 0, 0, crpc); if (rc != 0) return rc; @@ -633,12 +643,12 @@ lstcon_sesrpc_prep(lstcon_node_t *nd, int transop, lstcon_rpc_t **crpc) } int -lstcon_dbgrpc_prep(lstcon_node_t *nd, lstcon_rpc_t **crpc) +lstcon_dbgrpc_prep(lstcon_node_t *nd, unsigned feats, lstcon_rpc_t **crpc) { - srpc_debug_reqst_t *drq; - int rc; + srpc_debug_reqst_t *drq; + int rc; - rc = lstcon_rpc_prep(nd, SRPC_SERVICE_DEBUG, 0, crpc); + rc = lstcon_rpc_prep(nd, SRPC_SERVICE_DEBUG, feats, 0, 0, crpc); if (rc != 0) return rc; @@ -646,19 +656,19 @@ lstcon_dbgrpc_prep(lstcon_node_t *nd, lstcon_rpc_t **crpc) drq->dbg_sid = console_session.ses_id; drq->dbg_flags = 0; - + return rc; } int -lstcon_batrpc_prep(lstcon_node_t *nd, int transop, - lstcon_tsb_hdr_t *tsb, lstcon_rpc_t **crpc) +lstcon_batrpc_prep(lstcon_node_t *nd, int transop, unsigned feats, + lstcon_tsb_hdr_t *tsb, lstcon_rpc_t **crpc) { - lstcon_batch_t *batch; - srpc_batch_reqst_t *brq; - int rc; + lstcon_batch_t *batch; + srpc_batch_reqst_t *brq; + int rc; - rc = lstcon_rpc_prep(nd, SRPC_SERVICE_BATCH, 0, crpc); + rc = lstcon_rpc_prep(nd, SRPC_SERVICE_BATCH, feats, 0, 0, crpc); if (rc != 0) return rc; @@ -679,17 +689,17 @@ lstcon_batrpc_prep(lstcon_node_t *nd, int transop, batch = (lstcon_batch_t *)tsb; brq->bar_arg = batch->bat_arg; - + return 0; } int -lstcon_statrpc_prep(lstcon_node_t *nd, lstcon_rpc_t **crpc) +lstcon_statrpc_prep(lstcon_node_t *nd, unsigned feats, lstcon_rpc_t **crpc) { - srpc_stat_reqst_t *srq; - int rc; + srpc_stat_reqst_t *srq; + int rc; - rc = lstcon_rpc_prep(nd, SRPC_SERVICE_QUERY_STAT, 0, crpc); + rc = lstcon_rpc_prep(nd, SRPC_SERVICE_QUERY_STAT, feats, 0, 0, crpc); if (rc != 0) return rc; @@ -711,7 +721,7 @@ lstcon_next_id(int idx, int nkiov, lnet_kiov_t *kiov) LASSERT (i < nkiov); - pid = (lnet_process_id_packed_t *)cfs_page_address(kiov[i].kiov_page); + pid = (lnet_process_id_packed_t *)page_address(kiov[i].kiov_page); return &pid[idx % SFW_ID_PER_PAGE]; } @@ -776,7 +786,7 @@ int lstcon_pingrpc_prep(lst_test_ping_param_t *param, srpc_test_reqst_t *req) { test_ping_req_t *prq = &req->tsr_u.ping; - + prq->png_size = param->png_size; prq->png_flags = param->png_flags; /* TODO dest */ @@ -784,19 +794,33 @@ lstcon_pingrpc_prep(lst_test_ping_param_t *param, srpc_test_reqst_t *req) } int -lstcon_bulkrpc_prep(lst_test_bulk_param_t *param, srpc_test_reqst_t *req) +lstcon_bulkrpc_v0_prep(lst_test_bulk_param_t *param, srpc_test_reqst_t *req) { - test_bulk_req_t *brq = &req->tsr_u.bulk; + test_bulk_req_t *brq = &req->tsr_u.bulk_v0; - brq->blk_opc = param->blk_opc; - brq->blk_npg = (param->blk_size + CFS_PAGE_SIZE - 1) / CFS_PAGE_SIZE; - brq->blk_flags = param->blk_flags; + brq->blk_opc = param->blk_opc; + brq->blk_npg = (param->blk_size + PAGE_CACHE_SIZE - 1) / + PAGE_CACHE_SIZE; + brq->blk_flags = param->blk_flags; - return 0; + return 0; +} + +int +lstcon_bulkrpc_v1_prep(lst_test_bulk_param_t *param, srpc_test_reqst_t *req) +{ + test_bulk_req_v1_t *brq = &req->tsr_u.bulk_v1; + + brq->blk_opc = param->blk_opc; + brq->blk_flags = param->blk_flags; + brq->blk_len = param->blk_size; + brq->blk_offset = 0; /* reserved */ + + return 0; } int -lstcon_testrpc_prep(lstcon_node_t *nd, int transop, +lstcon_testrpc_prep(lstcon_node_t *nd, int transop, unsigned feats, lstcon_test_t *test, lstcon_rpc_t **crpc) { lstcon_group_t *sgrp = test->tes_src_grp; @@ -804,14 +828,19 @@ lstcon_testrpc_prep(lstcon_node_t *nd, int transop, srpc_test_reqst_t *trq; srpc_bulk_t *bulk; int i; - int n = 0; - int rc = 0; - - if (transop == LST_TRANS_TSBCLIADD) - n = sfw_id_pages(test->tes_span); - - rc = lstcon_rpc_prep(nd, SRPC_SERVICE_TEST, n, crpc); - if (rc != 0) + int npg = 0; + int nob = 0; + int rc = 0; + + if (transop == LST_TRANS_TSBCLIADD) { + npg = sfw_id_pages(test->tes_span); + nob = (feats & LST_FEAT_BULK_LEN) == 0 ? + npg * PAGE_CACHE_SIZE : + sizeof(lnet_process_id_packed_t) * test->tes_span; + } + + rc = lstcon_rpc_prep(nd, SRPC_SERVICE_TEST, feats, npg, nob, crpc); + if (rc != 0) return rc; trq = &(*crpc)->crp_rpc->crpc_reqstmsg.msg_body.tes_reqst; @@ -827,16 +856,24 @@ lstcon_testrpc_prep(lstcon_node_t *nd, int transop, } else { bulk = &(*crpc)->crp_rpc->crpc_bulk; - for (i = 0; i < n; i++) { - bulk->bk_iovs[i].kiov_offset = 0; - bulk->bk_iovs[i].kiov_len = CFS_PAGE_SIZE; - bulk->bk_iovs[i].kiov_page = cfs_alloc_page(CFS_ALLOC_STD); + for (i = 0; i < npg; i++) { + int len; - if (bulk->bk_iovs[i].kiov_page != NULL) - continue; + LASSERT(nob > 0); - lstcon_rpc_put(*crpc); - return -ENOMEM; + len = (feats & LST_FEAT_BULK_LEN) == 0 ? + PAGE_CACHE_SIZE : min_t(int, nob, PAGE_CACHE_SIZE); + nob -= len; + + bulk->bk_iovs[i].kiov_offset = 0; + bulk->bk_iovs[i].kiov_len = len; + bulk->bk_iovs[i].kiov_page = + alloc_page(GFP_IOFS); + + if (bulk->bk_iovs[i].kiov_page == NULL) { + lstcon_rpc_put(*crpc); + return -ENOMEM; + } } bulk->bk_sink = 0; @@ -844,8 +881,10 @@ lstcon_testrpc_prep(lstcon_node_t *nd, int transop, LASSERT (transop == LST_TRANS_TSBCLIADD); rc = lstcon_dstnodes_prep(test->tes_dst_grp, - test->tes_cliidx++, test->tes_dist, - test->tes_span, n, &bulk->bk_iovs[0]); + test->tes_cliidx++, + test->tes_dist, + test->tes_span, + npg, &bulk->bk_iovs[0]); if (rc != 0) { lstcon_rpc_put(*crpc); return rc; @@ -864,11 +903,20 @@ lstcon_testrpc_prep(lstcon_node_t *nd, int transop, switch (test->tes_type) { case LST_TEST_PING: trq->tsr_service = SRPC_SERVICE_PING; - rc = lstcon_pingrpc_prep((lst_test_ping_param_t *)&test->tes_param[0], trq); - break; - case LST_TEST_BULK: - trq->tsr_service = SRPC_SERVICE_BRW; - rc = lstcon_bulkrpc_prep((lst_test_bulk_param_t *)&test->tes_param[0], trq); + rc = lstcon_pingrpc_prep((lst_test_ping_param_t *) + &test->tes_param[0], trq); + break; + + case LST_TEST_BULK: + trq->tsr_service = SRPC_SERVICE_BRW; + if ((feats & LST_FEAT_BULK_LEN) == 0) { + rc = lstcon_bulkrpc_v0_prep((lst_test_bulk_param_t *) + &test->tes_param[0], trq); + } else { + rc = lstcon_bulkrpc_v1_prep((lst_test_bulk_param_t *) + &test->tes_param[0], trq); + } + break; default: LBUG(); @@ -878,11 +926,57 @@ lstcon_testrpc_prep(lstcon_node_t *nd, int transop, return rc; } +int +lstcon_sesnew_stat_reply(lstcon_rpc_trans_t *trans, + lstcon_node_t *nd, srpc_msg_t *reply) +{ + srpc_mksn_reply_t *mksn_rep = &reply->msg_body.mksn_reply; + int status = mksn_rep->mksn_status; + + if (status == 0 && + (reply->msg_ses_feats & ~LST_FEATS_MASK) != 0) { + mksn_rep->mksn_status = EPROTO; + status = EPROTO; + } + + if (status == EPROTO) { + CNETERR("session protocol error from %s: %u\n", + libcfs_nid2str(nd->nd_id.nid), + reply->msg_ses_feats); + } + + if (status != 0) + return status; + + if (!trans->tas_feats_updated) { + spin_lock(&console_session.ses_rpc_lock); + if (!trans->tas_feats_updated) { /* recheck with lock */ + trans->tas_feats_updated = 1; + trans->tas_features = reply->msg_ses_feats; + } + spin_unlock(&console_session.ses_rpc_lock); + } + + if (reply->msg_ses_feats != trans->tas_features) { + CNETERR("Framework features %x from %s is different with " + "features on this transaction: %x\n", + reply->msg_ses_feats, libcfs_nid2str(nd->nd_id.nid), + trans->tas_features); + status = mksn_rep->mksn_status = EPROTO; + } + + if (status == 0) { + /* session timeout on remote node */ + nd->nd_timeout = mksn_rep->mksn_timeout; + } + + return status; +} + void -lstcon_rpc_stat_reply(int transop, srpc_msg_t *msg, +lstcon_rpc_stat_reply(lstcon_rpc_trans_t *trans, srpc_msg_t *msg, lstcon_node_t *nd, lstcon_trans_stat_t *stat) { - srpc_mksn_reply_t *mksn_rep; srpc_rmsn_reply_t *rmsn_rep; srpc_debug_reply_t *dbg_rep; srpc_batch_reply_t *bat_rep; @@ -890,22 +984,15 @@ lstcon_rpc_stat_reply(int transop, srpc_msg_t *msg, srpc_stat_reply_t *stat_rep; int rc = 0; - switch (transop) { - case LST_TRANS_SESNEW: - mksn_rep = &msg->msg_body.mksn_reply; - - if (mksn_rep->mksn_status == 0) { + switch (trans->tas_opc) { + case LST_TRANS_SESNEW: + rc = lstcon_sesnew_stat_reply(trans, nd, msg); + if (rc == 0) { lstcon_sesop_stat_success(stat, 1); - /* session timeout on remote node */ - nd->nd_timeout = mksn_rep->mksn_timeout; return; } - LASSERT (mksn_rep->mksn_status == EBUSY || - mksn_rep->mksn_status == EINVAL); - lstcon_sesop_stat_failure(stat, 1); - rc = mksn_rep->mksn_status; break; case LST_TRANS_SESEND: @@ -917,9 +1004,6 @@ lstcon_rpc_stat_reply(int transop, srpc_msg_t *msg, return; } - LASSERT (rmsn_rep->rmsn_status == EBUSY || - rmsn_rep->rmsn_status == EINVAL); - lstcon_sesop_stat_failure(stat, 1); rc = rmsn_rep->rmsn_status; break; @@ -931,9 +1015,7 @@ lstcon_rpc_stat_reply(int transop, srpc_msg_t *msg, if (dbg_rep->dbg_status == ESRCH) { lstcon_sesqry_stat_unknown(stat, 1); return; - } - - LASSERT (dbg_rep->dbg_status == 0); + } if (lstcon_session_match(dbg_rep->dbg_sid)) lstcon_sesqry_stat_active(stat, 1); @@ -951,7 +1033,7 @@ lstcon_rpc_stat_reply(int transop, srpc_msg_t *msg, } if (bat_rep->bar_status == EPERM && - transop == LST_TRANS_TSBSTOP) { + trans->tas_opc == LST_TRANS_TSBSTOP) { lstcon_tsbop_stat_success(stat, 1); return; } @@ -1021,6 +1103,7 @@ lstcon_rpc_trans_ndlist(cfs_list_t *ndlist, lstcon_ndlink_t *ndl; lstcon_node_t *nd; lstcon_rpc_t *rpc; + unsigned feats; int rc; /* Creating session RPG for list of nodes */ @@ -1031,6 +1114,7 @@ lstcon_rpc_trans_ndlist(cfs_list_t *ndlist, return rc; } + feats = trans->tas_features; cfs_list_for_each_entry_typed(ndl, ndlist, lstcon_ndlink_t, ndl_link) { rc = condition == NULL ? 1 : condition(transop, ndl->ndl_node, arg); @@ -1049,26 +1133,26 @@ lstcon_rpc_trans_ndlist(cfs_list_t *ndlist, switch (transop) { case LST_TRANS_SESNEW: case LST_TRANS_SESEND: - rc = lstcon_sesrpc_prep(nd, transop, &rpc); - break; - case LST_TRANS_SESQRY: - case LST_TRANS_SESPING: - rc = lstcon_dbgrpc_prep(nd, &rpc); - break; - case LST_TRANS_TSBCLIADD: - case LST_TRANS_TSBSRVADD: - rc = lstcon_testrpc_prep(nd, transop, - (lstcon_test_t *)arg, &rpc); - break; - case LST_TRANS_TSBRUN: - case LST_TRANS_TSBSTOP: - case LST_TRANS_TSBCLIQRY: - case LST_TRANS_TSBSRVQRY: - rc = lstcon_batrpc_prep(nd, transop, - (lstcon_tsb_hdr_t *)arg, &rpc); - break; - case LST_TRANS_STATQRY: - rc = lstcon_statrpc_prep(nd, &rpc); + rc = lstcon_sesrpc_prep(nd, transop, feats, &rpc); + break; + case LST_TRANS_SESQRY: + case LST_TRANS_SESPING: + rc = lstcon_dbgrpc_prep(nd, feats, &rpc); + break; + case LST_TRANS_TSBCLIADD: + case LST_TRANS_TSBSRVADD: + rc = lstcon_testrpc_prep(nd, transop, feats, + (lstcon_test_t *)arg, &rpc); + break; + case LST_TRANS_TSBRUN: + case LST_TRANS_TSBSTOP: + case LST_TRANS_TSBCLIQRY: + case LST_TRANS_TSBSRVQRY: + rc = lstcon_batrpc_prep(nd, transop, feats, + (lstcon_tsb_hdr_t *)arg, &rpc); + break; + case LST_TRANS_STATQRY: + rc = lstcon_statrpc_prep(nd, feats, &rpc); break; default: rc = -EINVAL; @@ -1080,7 +1164,7 @@ lstcon_rpc_trans_ndlist(cfs_list_t *ndlist, lstcon_rpc_trans_name(transop), rc); break; } - + lstcon_rpc_trans_addreq(trans, rpc); } @@ -1111,10 +1195,10 @@ lstcon_rpc_pinger(void *arg) /* RPC pinger is a special case of transaction, * it's called by timer at 8 seconds interval. */ - cfs_mutex_down(&console_session.ses_mutex); + mutex_lock(&console_session.ses_mutex); if (console_session.ses_shutdown || console_session.ses_expired) { - cfs_mutex_up(&console_session.ses_mutex); + mutex_unlock(&console_session.ses_mutex); return; } @@ -1136,7 +1220,8 @@ lstcon_rpc_pinger(void *arg) if (nd->nd_state != LST_NODE_ACTIVE) continue; - rc = lstcon_sesrpc_prep(nd, LST_TRANS_SESEND, &crpc); + rc = lstcon_sesrpc_prep(nd, LST_TRANS_SESEND, + trans->tas_features, &crpc); if (rc != 0) { CERROR("Out of memory\n"); break; @@ -1154,22 +1239,22 @@ lstcon_rpc_pinger(void *arg) LASSERT (crpc->crp_trans == trans); LASSERT (!cfs_list_empty(&crpc->crp_link)); - cfs_spin_lock(&crpc->crp_rpc->crpc_lock); + spin_lock(&crpc->crp_rpc->crpc_lock); - LASSERT (crpc->crp_posted); + LASSERT(crpc->crp_posted); - if (!crpc->crp_finished) { - /* in flight */ - cfs_spin_unlock(&crpc->crp_rpc->crpc_lock); - continue; - } + if (!crpc->crp_finished) { + /* in flight */ + spin_unlock(&crpc->crp_rpc->crpc_lock); + continue; + } - cfs_spin_unlock(&crpc->crp_rpc->crpc_lock); + spin_unlock(&crpc->crp_rpc->crpc_lock); lstcon_rpc_get_reply(crpc, &rep); cfs_list_del_init(&crpc->crp_link); - + lstcon_rpc_put(crpc); } @@ -1181,7 +1266,8 @@ lstcon_rpc_pinger(void *arg) if (intv < (time_t)nd->nd_timeout / 2) continue; - rc = lstcon_rpc_init(nd, SRPC_SERVICE_DEBUG, 0, 0, crpc); + rc = lstcon_rpc_init(nd, SRPC_SERVICE_DEBUG, + trans->tas_features, 0, 0, 1, crpc); if (rc != 0) { CERROR("Out of memory\n"); break; @@ -1199,7 +1285,7 @@ lstcon_rpc_pinger(void *arg) } if (console_session.ses_expired) { - cfs_mutex_up(&console_session.ses_mutex); + mutex_unlock(&console_session.ses_mutex); return; } @@ -1208,7 +1294,7 @@ lstcon_rpc_pinger(void *arg) ptimer->stt_expires = (cfs_time_t)(cfs_time_current_sec() + LST_PING_INTERVAL); stt_add_timer(ptimer); - cfs_mutex_up(&console_session.ses_mutex); + mutex_unlock(&console_session.ses_mutex); } int @@ -1274,16 +1360,16 @@ lstcon_rpc_cleanup_wait(void) cfs_waitq_signal(&trans->tas_waitq); } - cfs_mutex_up(&console_session.ses_mutex); + mutex_unlock(&console_session.ses_mutex); - CWARN("Session is shutting down, " - "waiting for termination of transactions\n"); - cfs_pause(cfs_time_seconds(1)); + CWARN("Session is shutting down, " + "waiting for termination of transactions\n"); + cfs_pause(cfs_time_seconds(1)); - cfs_mutex_down(&console_session.ses_mutex); + mutex_lock(&console_session.ses_mutex); } - cfs_spin_lock(&console_session.ses_rpc_lock); + spin_lock(&console_session.ses_rpc_lock); lst_wait_until((cfs_atomic_read(&console_session.ses_rpc_counter) == 0), console_session.ses_rpc_lock, @@ -1294,7 +1380,7 @@ lstcon_rpc_cleanup_wait(void) cfs_list_add(&zlist, &console_session.ses_rpc_freelist); cfs_list_del_init(&console_session.ses_rpc_freelist); - cfs_spin_unlock(&console_session.ses_rpc_lock); + spin_unlock(&console_session.ses_rpc_lock); while (!cfs_list_empty(&zlist)) { crpc = cfs_list_entry(zlist.next, lstcon_rpc_t, crp_link); @@ -1313,11 +1399,11 @@ lstcon_rpc_module_init(void) console_session.ses_ping = NULL; - 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); + 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; + return 0; } void