/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
* vim:expandtab:shiftwidth=8:tabstop=8:
*
- * Copyright (C) 2001, 2002 Cluster File Systems, Inc.
- * Authors: Isaac Huang <isaac@clusterfs.com>
- * Liang Zhen <liangzhen@clusterfs.com>
+ * GPL HEADER START
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 only,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License version 2 for more details (a copy is included
+ * in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License
+ * version 2 along with this program; If not, see
+ * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ * GPL HEADER END
+ */
+/*
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved
+ * Use is subject to license terms.
+ */
+/*
+ * This file is part of Lustre, http://www.lustre.org/
+ * Lustre is a trademark of Sun Microsystems, Inc.
+ *
+ * lnet/selftest/framework.c
+ *
+ * Author: Isaac Huang <isaac@clusterfs.com>
+ * Author: Liang Zhen <liangzhen@clusterfs.com>
*/
#define DEBUG_SUBSYSTEM S_LNET
-#include <libcfs/kp30.h>
-#include <libcfs/libcfs.h>
-#include <lnet/lib-lnet.h>
-
#include "selftest.h"
+lst_sid_t LST_INVALID_SID = {LNET_NID_ANY, -1};
+
+int brw_inject_errors = 0;
+CFS_MODULE_PARM(brw_inject_errors, "i", int, 0644,
+ "# data errors to inject randomly, zero by default");
static int session_timeout = 100;
CFS_MODULE_PARM(session_timeout, "i", int, 0444,
"test session timeout in seconds (100 by default, 0 == never)");
-#define SFW_TEST_CONCURRENCY 128
-#define SFW_TEST_RPC_TIMEOUT 64
-#define SFW_CLIENT_RPC_TIMEOUT 64 /* in seconds */
+static int rpc_timeout = 64;
+CFS_MODULE_PARM(rpc_timeout, "i", int, 0644,
+ "rpc timeout in seconds (64 by default, 0 == never)");
+
+#define SFW_TEST_CONCURRENCY 1792
#define SFW_EXTRA_TEST_BUFFERS 8 /* tolerate buggy peers with extra buffers */
#define sfw_test_buffers(tsi) ((tsi)->tsi_loop + SFW_EXTRA_TEST_BUFFERS)
#define sfw_unpack_fw_counters(fc) \
do { \
__swab32s(&(fc).brw_errors); \
+ __swab32s(&(fc).ping_errors); \
__swab32s(&(fc).active_tests); \
__swab32s(&(fc).active_batches); \
__swab32s(&(fc).zombie_sessions); \
__swab64s(&(lc).route_length); \
} while (0)
-#define sfw_test_active(t) (atomic_read(&(t)->tsi_nactive) != 0)
-#define sfw_batch_active(b) (atomic_read(&(b)->bat_nactive) != 0)
+#define sfw_test_active(t) (cfs_atomic_read(&(t)->tsi_nactive) != 0)
+#define sfw_batch_active(b) (cfs_atomic_read(&(b)->bat_nactive) != 0)
struct smoketest_framework {
- struct list_head fw_zombie_rpcs; /* RPCs to be recycled */
- struct list_head fw_zombie_sessions; /* stopping sessions */
- struct list_head fw_tests; /* registered test cases */
- atomic_t fw_nzombies; /* # zombie sessions */
- spinlock_t fw_lock; /* serialise */
+ cfs_list_t fw_zombie_rpcs; /* RPCs to be recycled */
+ cfs_list_t fw_zombie_sessions; /* stopping sessions */
+ cfs_list_t fw_tests; /* registered test cases */
+ cfs_atomic_t fw_nzombies; /* # zombie sessions */
+ cfs_spinlock_t fw_lock; /* serialise */
sfw_session_t *fw_session; /* _the_ session */
int fw_shuttingdown; /* shutdown in progress */
srpc_server_rpc_t *fw_active_srpc; /* running RPC */
LASSERT (id <= SRPC_SERVICE_MAX_ID);
LASSERT (id > SRPC_FRAMEWORK_SERVICE_MAX_ID);
- list_for_each_entry (tsc, &sfw_data.fw_tests, tsc_list) {
+ cfs_list_for_each_entry_typed (tsc, &sfw_data.fw_tests,
+ sfw_test_case_t, tsc_list) {
if (tsc->tsc_srv_service->sv_id == id)
return tsc;
}
tsc->tsc_cli_ops = cliops;
tsc->tsc_srv_service = service;
- list_add_tail(&tsc->tsc_list, &sfw_data.fw_tests);
+ cfs_list_add_tail(&tsc->tsc_list, &sfw_data.fw_tests);
return 0;
}
sfw_session_t *sn = sfw_data.fw_session;
int nactive = 0;
sfw_batch_t *tsb;
+ sfw_test_case_t *tsc;
- if (sn == NULL)
- return;
+ if (sn == NULL) return;
LASSERT (!sn->sn_timer_active);
sfw_data.fw_session = NULL;
- atomic_inc(&sfw_data.fw_nzombies);
- list_add(&sn->sn_list, &sfw_data.fw_zombie_sessions);
+ cfs_atomic_inc(&sfw_data.fw_nzombies);
+ cfs_list_add(&sn->sn_list, &sfw_data.fw_zombie_sessions);
+
+ cfs_spin_unlock(&sfw_data.fw_lock);
- list_for_each_entry (tsb, &sn->sn_batches, bat_list) {
+ cfs_list_for_each_entry_typed (tsc, &sfw_data.fw_tests,
+ sfw_test_case_t, tsc_list) {
+ srpc_abort_service(tsc->tsc_srv_service);
+ }
+
+ cfs_spin_lock(&sfw_data.fw_lock);
+
+ cfs_list_for_each_entry_typed (tsb, &sn->sn_batches,
+ sfw_batch_t, bat_list) {
if (sfw_batch_active(tsb)) {
nactive++;
sfw_stop_batch(tsb, 1);
if (nactive != 0)
return; /* wait for active batches to stop */
- list_del_init(&sn->sn_list);
- spin_unlock(&sfw_data.fw_lock);
+ cfs_list_del_init(&sn->sn_list);
+ cfs_spin_unlock(&sfw_data.fw_lock);
sfw_destroy_session(sn);
- spin_lock(&sfw_data.fw_lock);
+ cfs_spin_lock(&sfw_data.fw_lock);
return;
}
return (sfw_data.fw_session == NULL) ? 1 : 0;
}
-void
-sfw_set_session_timeout (int timeout)
-{
- session_timeout = timeout;
-}
-
#endif
void
{
sfw_session_t *sn = data;
- spin_lock(&sfw_data.fw_lock);
+ cfs_spin_lock(&sfw_data.fw_lock);
LASSERT (sn->sn_timer_active);
LASSERT (sn == sfw_data.fw_session);
sn->sn_timer_active = 0;
sfw_deactivate_session();
- spin_unlock(&sfw_data.fw_lock);
+ cfs_spin_unlock(&sfw_data.fw_lock);
return;
}
memset(sn, 0, sizeof(sfw_session_t));
CFS_INIT_LIST_HEAD(&sn->sn_list);
CFS_INIT_LIST_HEAD(&sn->sn_batches);
- atomic_set(&sn->sn_brw_errors, 0);
+ cfs_atomic_set(&sn->sn_refcount, 1); /* +1 for caller */
+ cfs_atomic_set(&sn->sn_brw_errors, 0);
+ cfs_atomic_set(&sn->sn_ping_errors, 0);
strncpy(&sn->sn_name[0], name, LST_NAME_SIZE);
sn->sn_timer_active = 0;
sfw_client_rpc_fini (srpc_client_rpc_t *rpc)
{
LASSERT (rpc->crpc_bulk.bk_niov == 0);
- LASSERT (list_empty(&rpc->crpc_list));
- LASSERT (atomic_read(&rpc->crpc_refcount) == 0);
+ LASSERT (cfs_list_empty(&rpc->crpc_list));
+ LASSERT (cfs_atomic_read(&rpc->crpc_refcount) == 0);
#ifndef __KERNEL__
LASSERT (rpc->crpc_bulk.bk_pages == NULL);
#endif
swi_state2str(rpc->crpc_wi.wi_state),
rpc->crpc_aborted, rpc->crpc_status);
- spin_lock(&sfw_data.fw_lock);
+ cfs_spin_lock(&sfw_data.fw_lock);
/* my callers must finish all RPCs before shutting me down */
LASSERT (!sfw_data.fw_shuttingdown);
- list_add(&rpc->crpc_list, &sfw_data.fw_zombie_rpcs);
+ cfs_list_add(&rpc->crpc_list, &sfw_data.fw_zombie_rpcs);
- spin_unlock(&sfw_data.fw_lock);
+ cfs_spin_unlock(&sfw_data.fw_lock);
return;
}
LASSERT (sn != NULL);
- list_for_each_entry (bat, &sn->sn_batches, bat_list) {
+ cfs_list_for_each_entry_typed (bat, &sn->sn_batches,
+ sfw_batch_t, bat_list) {
if (bat->bat_id.bat_id == bid.bat_id)
return bat;
}
bat->bat_error = 0;
bat->bat_session = sn;
bat->bat_id = bid;
- atomic_set(&bat->bat_nactive, 0);
+ cfs_atomic_set(&bat->bat_nactive, 0);
CFS_INIT_LIST_HEAD(&bat->bat_tests);
- list_add_tail(&bat->bat_list, &sn->sn_batches);
+ cfs_list_add_tail(&bat->bat_list, &sn->sn_batches);
return bat;
}
srpc_get_counters(&reply->str_rpc);
- cnt->brw_errors = atomic_read(&sn->sn_brw_errors);
- cnt->zombie_sessions = atomic_read(&sfw_data.fw_nzombies);
+ cnt->brw_errors = cfs_atomic_read(&sn->sn_brw_errors);
+ cnt->ping_errors = cfs_atomic_read(&sn->sn_ping_errors);
+ cnt->zombie_sessions = cfs_atomic_read(&sfw_data.fw_nzombies);
cnt->active_tests = cnt->active_batches = 0;
- list_for_each_entry (bat, &sn->sn_batches, bat_list) {
- int n = atomic_read(&bat->bat_nactive);
+ cfs_list_for_each_entry_typed (bat, &sn->sn_batches,
+ sfw_batch_t, bat_list) {
+ int n = cfs_atomic_read(&bat->bat_nactive);
if (n > 0) {
cnt->active_batches++;
return 0;
}
- if (sn != NULL && !request->mksn_force) {
- reply->mksn_sid = sn->sn_id;
- reply->mksn_status = EBUSY;
- strncpy(&reply->mksn_name[0], &sn->sn_name[0], LST_NAME_SIZE);
- return 0;
+ if (sn != NULL) {
+ reply->mksn_status = 0;
+ reply->mksn_sid = sn->sn_id;
+ reply->mksn_timeout = sn->sn_timeout;
+
+ if (sfw_sid_equal(request->mksn_sid, sn->sn_id)) {
+ cfs_atomic_inc(&sn->sn_refcount);
+ return 0;
+ }
+
+ if (!request->mksn_force) {
+ reply->mksn_status = EBUSY;
+ strncpy(&reply->mksn_name[0], &sn->sn_name[0], LST_NAME_SIZE);
+ return 0;
+ }
}
-
+
+ /* brand new or create by force */
LIBCFS_ALLOC(sn, sizeof(sfw_session_t));
if (sn == NULL) {
CERROR ("Dropping RPC (mksn) under memory pressure.\n");
sfw_init_session(sn, request->mksn_sid, &request->mksn_name[0]);
- spin_lock(&sfw_data.fw_lock);
+ cfs_spin_lock(&sfw_data.fw_lock);
sfw_deactivate_session();
LASSERT (sfw_data.fw_session == NULL);
sfw_data.fw_session = sn;
- spin_unlock(&sfw_data.fw_lock);
+ cfs_spin_unlock(&sfw_data.fw_lock);
reply->mksn_status = 0;
reply->mksn_sid = sn->sn_id;
return 0;
}
- spin_lock(&sfw_data.fw_lock);
+ if (!cfs_atomic_dec_and_test(&sn->sn_refcount)) {
+ reply->rmsn_status = 0;
+ return 0;
+ }
+
+ cfs_spin_lock(&sfw_data.fw_lock);
sfw_deactivate_session();
- spin_unlock(&sfw_data.fw_lock);
+ cfs_spin_unlock(&sfw_data.fw_lock);
reply->rmsn_status = 0;
reply->rmsn_sid = LST_INVALID_SID;
sfw_test_instance_t *tsi = tsu->tsu_instance;
/* Called with hold of tsi->tsi_lock */
- LASSERT (list_empty(&rpc->crpc_list));
- list_add(&rpc->crpc_list, &tsi->tsi_free_rpcs);
+ LASSERT (cfs_list_empty(&rpc->crpc_list));
+ cfs_list_add(&rpc->crpc_list, &tsi->tsi_free_rpcs);
}
int
srpc_client_rpc_t *rpc;
sfw_test_unit_t *tsu;
- if (!tsi->tsi_is_client)
- goto clean;
+ if (!tsi->tsi_is_client) goto clean;
tsi->tsi_ops->tso_fini(tsi);
LASSERT (!tsi->tsi_stopping);
- LASSERT (list_empty(&tsi->tsi_active_rpcs));
+ LASSERT (cfs_list_empty(&tsi->tsi_active_rpcs));
LASSERT (!sfw_test_active(tsi));
- while (!list_empty(&tsi->tsi_units)) {
- tsu = list_entry(tsi->tsi_units.next,
- sfw_test_unit_t, tsu_list);
- list_del(&tsu->tsu_list);
+ while (!cfs_list_empty(&tsi->tsi_units)) {
+ tsu = cfs_list_entry(tsi->tsi_units.next,
+ sfw_test_unit_t, tsu_list);
+ cfs_list_del(&tsu->tsu_list);
LIBCFS_FREE(tsu, sizeof(*tsu));
}
- while (!list_empty(&tsi->tsi_free_rpcs)) {
- rpc = list_entry(tsi->tsi_free_rpcs.next,
- srpc_client_rpc_t, crpc_list);
- list_del(&rpc->crpc_list);
+ while (!cfs_list_empty(&tsi->tsi_free_rpcs)) {
+ rpc = cfs_list_entry(tsi->tsi_free_rpcs.next,
+ srpc_client_rpc_t, crpc_list);
+ cfs_list_del(&rpc->crpc_list);
LIBCFS_FREE(rpc, srpc_client_rpc_size(rpc));
}
sfw_test_instance_t *tsi;
LASSERT (!sfw_batch_active(tsb));
- LASSERT (list_empty(&tsb->bat_list));
+ LASSERT (cfs_list_empty(&tsb->bat_list));
- while (!list_empty(&tsb->bat_tests)) {
- tsi = list_entry(tsb->bat_tests.next,
- sfw_test_instance_t, tsi_list);
- list_del_init(&tsi->tsi_list);
+ while (!cfs_list_empty(&tsb->bat_tests)) {
+ tsi = cfs_list_entry(tsb->bat_tests.next,
+ sfw_test_instance_t, tsi_list);
+ cfs_list_del_init(&tsi->tsi_list);
sfw_destroy_test_instance(tsi);
}
{
sfw_batch_t *batch;
- LASSERT (list_empty(&sn->sn_list));
+ LASSERT (cfs_list_empty(&sn->sn_list));
LASSERT (sn != sfw_data.fw_session);
- while (!list_empty(&sn->sn_batches)) {
- batch = list_entry(sn->sn_batches.next,
- sfw_batch_t, bat_list);
- list_del_init(&batch->bat_list);
+ while (!cfs_list_empty(&sn->sn_batches)) {
+ batch = cfs_list_entry(sn->sn_batches.next,
+ sfw_batch_t, bat_list);
+ cfs_list_del_init(&batch->bat_list);
sfw_destroy_batch(batch);
}
LIBCFS_FREE(sn, sizeof(*sn));
- atomic_dec(&sfw_data.fw_nzombies);
+ cfs_atomic_dec(&sfw_data.fw_nzombies);
return;
}
}
memset(tsi, 0, sizeof(*tsi));
- spin_lock_init(&tsi->tsi_lock);
- atomic_set(&tsi->tsi_nactive, 0);
+ cfs_spin_lock_init(&tsi->tsi_lock);
+ cfs_atomic_set(&tsi->tsi_nactive, 0);
CFS_INIT_LIST_HEAD(&tsi->tsi_units);
CFS_INIT_LIST_HEAD(&tsi->tsi_free_rpcs);
CFS_INIT_LIST_HEAD(&tsi->tsi_active_rpcs);
- tsi->tsi_stopping = 0;
- tsi->tsi_batch = tsb;
- tsi->tsi_loop = req->tsr_loop;
- tsi->tsi_concur = req->tsr_concur;
- tsi->tsi_service = req->tsr_service;
- tsi->tsi_is_client = !!(req->tsr_is_client);
- tsi->tsi_stop_onerr = !!(req->tsr_stop_onerr);
+ tsi->tsi_stopping = 0;
+ tsi->tsi_batch = tsb;
+ tsi->tsi_loop = req->tsr_loop;
+ tsi->tsi_concur = req->tsr_concur;
+ tsi->tsi_service = req->tsr_service;
+ tsi->tsi_is_client = !!(req->tsr_is_client);
+ tsi->tsi_stoptsu_onerr = !!(req->tsr_stop_onerr);
rc = sfw_load_test(tsi);
if (rc != 0) {
if (!tsi->tsi_is_client) {
/* it's test server, just add it to tsb */
- list_add_tail(&tsi->tsi_list, &tsb->bat_tests);
+ cfs_list_add_tail(&tsi->tsi_list, &tsb->bat_tests);
return 0;
}
#ifndef __KERNEL__
LASSERT (bk->bk_pages != NULL);
#endif
- LASSERT (bk->bk_niov * SFW_ID_PER_PAGE >= ndest);
- LASSERT (bk->bk_len >= sizeof(lnet_process_id_t) * ndest);
+ LASSERT (bk->bk_niov * SFW_ID_PER_PAGE >= (unsigned int)ndest);
+ LASSERT ((unsigned int)bk->bk_len >= sizeof(lnet_process_id_t) * ndest);
sfw_unpack_test_req(msg);
memcpy(&tsi->tsi_u, &req->tsr_u, sizeof(tsi->tsi_u));
for (i = 0; i < ndest; i++) {
- lnet_process_id_t *dests;
- lnet_process_id_t id;
- int j;
+ lnet_process_id_packed_t *dests;
+ lnet_process_id_packed_t id;
+ int j;
#ifdef __KERNEL__
dests = cfs_page_address(bk->bk_iovs[i / SFW_ID_PER_PAGE].kiov_page);
goto error;
}
- tsu->tsu_dest = id;
+ tsu->tsu_dest.nid = id.nid;
+ tsu->tsu_dest.pid = id.pid;
tsu->tsu_instance = tsi;
tsu->tsu_private = NULL;
- list_add_tail(&tsu->tsu_list, &tsi->tsi_units);
+ cfs_list_add_tail(&tsu->tsu_list, &tsi->tsi_units);
}
}
rc = tsi->tsi_ops->tso_init(tsi);
if (rc == 0) {
- list_add_tail(&tsi->tsi_list, &tsb->bat_tests);
+ cfs_list_add_tail(&tsi->tsi_list, &tsb->bat_tests);
return 0;
}
LASSERT (sfw_test_active(tsi));
- if (!atomic_dec_and_test(&tsi->tsi_nactive))
+ if (!cfs_atomic_dec_and_test(&tsi->tsi_nactive))
return;
-
+
/* the test instance is done */
- spin_lock(&tsi->tsi_lock);
+ cfs_spin_lock(&tsi->tsi_lock);
tsi->tsi_stopping = 0;
- spin_unlock(&tsi->tsi_lock);
+ cfs_spin_unlock(&tsi->tsi_lock);
- spin_lock(&sfw_data.fw_lock);
+ cfs_spin_lock(&sfw_data.fw_lock);
- if (!atomic_dec_and_test(&tsb->bat_nactive) || /* tsb still active */
+ if (!cfs_atomic_dec_and_test(&tsb->bat_nactive) ||/* tsb still active */
sn == sfw_data.fw_session) { /* sn also active */
- spin_unlock(&sfw_data.fw_lock);
+ cfs_spin_unlock(&sfw_data.fw_lock);
return;
}
-
- LASSERT (!list_empty(&sn->sn_list)); /* I'm a zombie! */
- list_for_each_entry (tsb, &sn->sn_batches, bat_list) {
+ LASSERT (!cfs_list_empty(&sn->sn_list)); /* I'm a zombie! */
+
+ cfs_list_for_each_entry_typed (tsb, &sn->sn_batches,
+ sfw_batch_t, bat_list) {
if (sfw_batch_active(tsb)) {
- spin_unlock(&sfw_data.fw_lock);
+ cfs_spin_unlock(&sfw_data.fw_lock);
return;
}
}
- list_del_init(&sn->sn_list);
- spin_unlock(&sfw_data.fw_lock);
+ cfs_list_del_init(&sn->sn_list);
+ cfs_spin_unlock(&sfw_data.fw_lock);
sfw_destroy_session(sn);
return;
sfw_test_instance_t *tsi = tsu->tsu_instance;
int done = 0;
- if (rpc->crpc_status != 0 && tsu->tsu_error == 0 &&
- (rpc->crpc_status != -EINTR || !tsi->tsi_stopping))
- tsu->tsu_error = rpc->crpc_status;
-
tsi->tsi_ops->tso_done_rpc(tsu, rpc);
- spin_lock(&tsi->tsi_lock);
+ cfs_spin_lock(&tsi->tsi_lock);
LASSERT (sfw_test_active(tsi));
- LASSERT (!list_empty(&rpc->crpc_list));
+ LASSERT (!cfs_list_empty(&rpc->crpc_list));
- list_del_init(&rpc->crpc_list);
+ cfs_list_del_init(&rpc->crpc_list);
/* batch is stopping or loop is done or get error */
if (tsi->tsi_stopping ||
tsu->tsu_loop == 0 ||
- (tsu->tsu_error != 0 && tsi->tsi_stop_onerr))
+ (rpc->crpc_status != 0 && tsi->tsi_stoptsu_onerr))
done = 1;
/* dec ref for poster */
srpc_client_rpc_decref(rpc);
- spin_unlock(&tsi->tsi_lock);
+ cfs_spin_unlock(&tsi->tsi_lock);
if (!done) {
swi_schedule_workitem(&tsu->tsu_worker);
{
srpc_client_rpc_t *rpc = NULL;
sfw_test_instance_t *tsi = tsu->tsu_instance;
-
- spin_lock(&tsi->tsi_lock);
+
+ cfs_spin_lock(&tsi->tsi_lock);
LASSERT (sfw_test_active(tsi));
- if (!list_empty(&tsi->tsi_free_rpcs)) {
+ if (!cfs_list_empty(&tsi->tsi_free_rpcs)) {
/* pick request from buffer */
- rpc = list_entry(tsi->tsi_free_rpcs.next,
- srpc_client_rpc_t, crpc_list);
+ rpc = cfs_list_entry(tsi->tsi_free_rpcs.next,
+ srpc_client_rpc_t, crpc_list);
LASSERT (nblk == rpc->crpc_bulk.bk_niov);
- list_del_init(&rpc->crpc_list);
+ cfs_list_del_init(&rpc->crpc_list);
srpc_init_client_rpc(rpc, peer, tsi->tsi_service, nblk,
blklen, sfw_test_rpc_done,
sfw_test_rpc_fini, tsu);
}
- spin_unlock(&tsi->tsi_lock);
+ cfs_spin_unlock(&tsi->tsi_lock);
if (rpc == NULL)
rpc = srpc_create_client_rpc(peer, tsi->tsi_service, nblk,
LASSERT (wi == &tsu->tsu_worker);
- tsu->tsu_error = tsi->tsi_ops->tso_prep_rpc(tsu, tsu->tsu_dest, &rpc);
- if (tsu->tsu_error != 0) {
+ if (tsi->tsi_ops->tso_prep_rpc(tsu, tsu->tsu_dest, &rpc) != 0) {
LASSERT (rpc == NULL);
goto test_done;
}
LASSERT (rpc != NULL);
- spin_lock(&tsi->tsi_lock);
+ cfs_spin_lock(&tsi->tsi_lock);
if (tsi->tsi_stopping) {
- list_add(&rpc->crpc_list, &tsi->tsi_free_rpcs);
- spin_unlock(&tsi->tsi_lock);
+ cfs_list_add(&rpc->crpc_list, &tsi->tsi_free_rpcs);
+ cfs_spin_unlock(&tsi->tsi_lock);
goto test_done;
}
if (tsu->tsu_loop > 0)
tsu->tsu_loop--;
- list_add_tail(&rpc->crpc_list, &tsi->tsi_active_rpcs);
- spin_unlock(&tsi->tsi_lock);
+ cfs_list_add_tail(&rpc->crpc_list, &tsi->tsi_active_rpcs);
+ cfs_spin_unlock(&tsi->tsi_lock);
- rpc->crpc_timeout = SFW_TEST_RPC_TIMEOUT;
+ rpc->crpc_timeout = rpc_timeout;
- spin_lock(&rpc->crpc_lock);
+ cfs_spin_lock(&rpc->crpc_lock);
srpc_post_rpc(rpc);
- spin_unlock(&rpc->crpc_lock);
+ cfs_spin_unlock(&rpc->crpc_lock);
return 0;
test_done:
sfw_test_instance_t *tsi;
if (sfw_batch_active(tsb)) {
- CDEBUG (D_NET, "Can't start active batch: "LPU64" (%d)\n",
- tsb->bat_id.bat_id, atomic_read(&tsb->bat_nactive));
- return -EPERM;
+ CDEBUG(D_NET, "Batch already active: "LPU64" (%d)\n",
+ tsb->bat_id.bat_id, cfs_atomic_read(&tsb->bat_nactive));
+ return 0;
}
- list_for_each_entry (tsi, &tsb->bat_tests, tsi_list) {
+ cfs_list_for_each_entry_typed (tsi, &tsb->bat_tests,
+ sfw_test_instance_t, tsi_list) {
if (!tsi->tsi_is_client) /* skip server instances */
continue;
LASSERT (!tsi->tsi_stopping);
LASSERT (!sfw_test_active(tsi));
- atomic_inc(&tsb->bat_nactive);
-
- list_for_each_entry (tsu, &tsi->tsi_units, tsu_list) {
- atomic_inc(&tsi->tsi_nactive);
-
- tsu->tsu_error = 0;
- tsu->tsu_loop = tsi->tsi_loop;
+ cfs_atomic_inc(&tsb->bat_nactive);
+ cfs_list_for_each_entry_typed (tsu, &tsi->tsi_units,
+ sfw_test_unit_t, tsu_list) {
+ cfs_atomic_inc(&tsi->tsi_nactive);
+ tsu->tsu_loop = tsi->tsi_loop;
wi = &tsu->tsu_worker;
swi_init_workitem(wi, tsu, sfw_run_test);
swi_schedule_workitem(wi);
sfw_test_instance_t *tsi;
srpc_client_rpc_t *rpc;
- if (!sfw_batch_active(tsb))
- return -EPERM;
+ if (!sfw_batch_active(tsb)) {
+ CDEBUG(D_NET, "Batch "LPU64" inactive\n", tsb->bat_id.bat_id);
+ return 0;
+ }
- list_for_each_entry (tsi, &tsb->bat_tests, tsi_list) {
- spin_lock(&tsi->tsi_lock);
+ cfs_list_for_each_entry_typed (tsi, &tsb->bat_tests,
+ sfw_test_instance_t, tsi_list) {
+ cfs_spin_lock(&tsi->tsi_lock);
if (!tsi->tsi_is_client ||
!sfw_test_active(tsi) || tsi->tsi_stopping) {
- spin_unlock(&tsi->tsi_lock);
+ cfs_spin_unlock(&tsi->tsi_lock);
continue;
}
tsi->tsi_stopping = 1;
if (!force) {
- spin_unlock(&tsi->tsi_lock);
+ cfs_spin_unlock(&tsi->tsi_lock);
continue;
}
/* abort launched rpcs in the test */
- list_for_each_entry (rpc, &tsi->tsi_active_rpcs, crpc_list) {
- spin_lock(&rpc->crpc_lock);
+ cfs_list_for_each_entry_typed (rpc, &tsi->tsi_active_rpcs,
+ srpc_client_rpc_t, crpc_list) {
+ cfs_spin_lock(&rpc->crpc_lock);
srpc_abort_rpc(rpc, -EINTR);
- spin_unlock(&rpc->crpc_lock);
+ cfs_spin_unlock(&rpc->crpc_lock);
}
- spin_unlock(&tsi->tsi_lock);
+ cfs_spin_unlock(&tsi->tsi_lock);
}
return 0;
return -EINVAL;
if (testidx == 0) {
- reply->bar_active = atomic_read(&tsb->bat_nactive);
+ reply->bar_active = cfs_atomic_read(&tsb->bat_nactive);
return 0;
}
- list_for_each_entry (tsi, &tsb->bat_tests, tsi_list) {
+ cfs_list_for_each_entry_typed (tsi, &tsb->bat_tests,
+ sfw_test_instance_t, tsi_list) {
if (testidx-- > 1)
continue;
- reply->bar_active = atomic_read(&tsi->tsi_nactive);
+ reply->bar_active = cfs_atomic_read(&tsi->tsi_nactive);
return 0;
}
LASSERT (sfw_data.fw_active_srpc == NULL);
LASSERT (sv->sv_id <= SRPC_FRAMEWORK_SERVICE_MAX_ID);
- spin_lock(&sfw_data.fw_lock);
+ cfs_spin_lock(&sfw_data.fw_lock);
if (sfw_data.fw_shuttingdown) {
- spin_unlock(&sfw_data.fw_lock);
+ cfs_spin_unlock(&sfw_data.fw_lock);
return -ESHUTDOWN;
}
if (sfw_del_session_timer() != 0) {
CERROR ("Dropping RPC (%s) from %s: racing with expiry timer.",
sv->sv_name, libcfs_id2str(rpc->srpc_peer));
- spin_unlock(&sfw_data.fw_lock);
+ cfs_spin_unlock(&sfw_data.fw_lock);
return -EAGAIN;
}
sfw_data.fw_active_srpc = rpc;
- spin_unlock(&sfw_data.fw_lock);
+ cfs_spin_unlock(&sfw_data.fw_lock);
sfw_unpack_message(request);
LASSERT (request->msg_type == srpc_service2request(sv->sv_id));
}
rpc->srpc_done = sfw_server_rpc_done;
- spin_lock(&sfw_data.fw_lock);
+ cfs_spin_lock(&sfw_data.fw_lock);
#ifdef __KERNEL__
if (!sfw_data.fw_shuttingdown)
#endif
sfw_data.fw_active_srpc = NULL;
- spin_unlock(&sfw_data.fw_lock);
+ cfs_spin_unlock(&sfw_data.fw_lock);
return rc;
}
LASSERT (sfw_data.fw_active_srpc == NULL);
LASSERT (rpc->srpc_reqstbuf->buf_msg.msg_body.tes_reqst.tsr_is_client);
- spin_lock(&sfw_data.fw_lock);
+ cfs_spin_lock(&sfw_data.fw_lock);
if (status != 0) {
CERROR ("Bulk transfer failed for RPC: "
"service %s, peer %s, status %d\n",
sv->sv_name, libcfs_id2str(rpc->srpc_peer), status);
- spin_unlock(&sfw_data.fw_lock);
+ cfs_spin_unlock(&sfw_data.fw_lock);
return -EIO;
}
if (sfw_data.fw_shuttingdown) {
- spin_unlock(&sfw_data.fw_lock);
+ cfs_spin_unlock(&sfw_data.fw_lock);
return -ESHUTDOWN;
}
if (sfw_del_session_timer() != 0) {
CERROR ("Dropping RPC (%s) from %s: racing with expiry timer",
sv->sv_name, libcfs_id2str(rpc->srpc_peer));
- spin_unlock(&sfw_data.fw_lock);
+ cfs_spin_unlock(&sfw_data.fw_lock);
return -EAGAIN;
}
sfw_data.fw_active_srpc = rpc;
- spin_unlock(&sfw_data.fw_lock);
+ cfs_spin_unlock(&sfw_data.fw_lock);
rc = sfw_add_test(rpc);
- spin_lock(&sfw_data.fw_lock);
+ cfs_spin_lock(&sfw_data.fw_lock);
#ifdef __KERNEL__
if (!sfw_data.fw_shuttingdown)
#endif
sfw_data.fw_active_srpc = NULL;
- spin_unlock(&sfw_data.fw_lock);
+ cfs_spin_unlock(&sfw_data.fw_lock);
return rc;
}
{
srpc_client_rpc_t *rpc;
- spin_lock(&sfw_data.fw_lock);
+ cfs_spin_lock(&sfw_data.fw_lock);
LASSERT (!sfw_data.fw_shuttingdown);
LASSERT (service <= SRPC_FRAMEWORK_SERVICE_MAX_ID);
- if (nbulkiov == 0 && !list_empty(&sfw_data.fw_zombie_rpcs)) {
- rpc = list_entry(sfw_data.fw_zombie_rpcs.next,
- srpc_client_rpc_t, crpc_list);
- list_del(&rpc->crpc_list);
- spin_unlock(&sfw_data.fw_lock);
+ if (nbulkiov == 0 && !cfs_list_empty(&sfw_data.fw_zombie_rpcs)) {
+ rpc = cfs_list_entry(sfw_data.fw_zombie_rpcs.next,
+ srpc_client_rpc_t, crpc_list);
+ cfs_list_del(&rpc->crpc_list);
+ cfs_spin_unlock(&sfw_data.fw_lock);
srpc_init_client_rpc(rpc, peer, service, 0, 0,
done, sfw_client_rpc_fini, priv);
return rpc;
}
- spin_unlock(&sfw_data.fw_lock);
+ cfs_spin_unlock(&sfw_data.fw_lock);
rpc = srpc_create_client_rpc(peer, service, nbulkiov, bulklen, done,
nbulkiov != 0 ? NULL : sfw_client_rpc_fini,
void
sfw_abort_rpc (srpc_client_rpc_t *rpc)
{
- LASSERT (atomic_read(&rpc->crpc_refcount) > 0);
+ LASSERT (cfs_atomic_read(&rpc->crpc_refcount) > 0);
LASSERT (rpc->crpc_service <= SRPC_FRAMEWORK_SERVICE_MAX_ID);
- spin_lock(&rpc->crpc_lock);
+ cfs_spin_lock(&rpc->crpc_lock);
srpc_abort_rpc(rpc, -EINTR);
- spin_unlock(&rpc->crpc_lock);
+ cfs_spin_unlock(&rpc->crpc_lock);
return;
}
void
sfw_post_rpc (srpc_client_rpc_t *rpc)
{
- spin_lock(&rpc->crpc_lock);
+ cfs_spin_lock(&rpc->crpc_lock);
LASSERT (!rpc->crpc_closed);
LASSERT (!rpc->crpc_aborted);
- LASSERT (list_empty(&rpc->crpc_list));
+ LASSERT (cfs_list_empty(&rpc->crpc_list));
LASSERT (!sfw_data.fw_shuttingdown);
- rpc->crpc_timeout = SFW_CLIENT_RPC_TIMEOUT;
+ rpc->crpc_timeout = rpc_timeout;
srpc_post_rpc(rpc);
- spin_unlock(&rpc->crpc_lock);
+ cfs_spin_unlock(&rpc->crpc_lock);
return;
}
static srpc_service_t sfw_services[] =
{
{
- .sv_name = "debug",
- .sv_id = SRPC_SERVICE_DEBUG,
+ /* sv_id */ SRPC_SERVICE_DEBUG,
+ /* sv_name */ "debug",
+ 0
},
{
- .sv_name = "query stats",
- .sv_id = SRPC_SERVICE_QUERY_STAT,
+ /* sv_id */ SRPC_SERVICE_QUERY_STAT,
+ /* sv_name */ "query stats",
+ 0
},
{
- .sv_name = "make sessin",
- .sv_id = SRPC_SERVICE_MAKE_SESSION,
+ /* sv_id */ SRPC_SERVICE_MAKE_SESSION,
+ /* sv_name */ "make session",
+ 0
},
{
- .sv_name = "remove session",
- .sv_id = SRPC_SERVICE_REMOVE_SESSION,
+ /* sv_id */ SRPC_SERVICE_REMOVE_SESSION,
+ /* sv_name */ "remove session",
+ 0
},
{
- .sv_name = "batch service",
- .sv_id = SRPC_SERVICE_BATCH,
+ /* sv_id */ SRPC_SERVICE_BATCH,
+ /* sv_name */ "batch service",
+ 0
},
{
- .sv_name = "test service",
- .sv_id = SRPC_SERVICE_TEST,
+ /* sv_id */ SRPC_SERVICE_TEST,
+ /* sv_name */ "test service",
+ 0
},
- { .sv_name = NULL, }
+ {
+ /* sv_id */ 0,
+ /* sv_name */ NULL,
+ 0
+ }
};
extern sfw_test_client_ops_t ping_test_client;
extern srpc_service_t ping_test_service;
+extern void ping_init_test_client(void);
+extern void ping_init_test_service(void);
extern sfw_test_client_ops_t brw_test_client;
extern srpc_service_t brw_test_service;
+extern void brw_init_test_client(void);
+extern void brw_init_test_service(void);
+
int
sfw_startup (void)
srpc_service_t *sv;
sfw_test_case_t *tsc;
+#ifndef __KERNEL__
+ char *s;
+
+ s = getenv("SESSION_TIMEOUT");
+ session_timeout = s != NULL ? atoi(s) : session_timeout;
+
+ s = getenv("BRW_INJECT_ERRORS");
+ brw_inject_errors = s != NULL ? atoi(s) : brw_inject_errors;
+
+ s = getenv("RPC_TIMEOUT");
+ rpc_timeout = s != NULL ? atoi(s) : rpc_timeout;
+#endif
+
if (session_timeout < 0) {
CERROR ("Session timeout must be non-negative: %d\n",
session_timeout);
return -EINVAL;
}
+ if (rpc_timeout < 0) {
+ CERROR ("RPC timeout must be non-negative: %d\n",
+ rpc_timeout);
+ return -EINVAL;
+ }
+
if (session_timeout == 0)
CWARN ("Zero session_timeout specified "
- "- test sessions never timeout.\n");
+ "- test sessions never expire.\n");
+
+ if (rpc_timeout == 0)
+ CWARN ("Zero rpc_timeout specified "
+ "- test RPC never expire.\n");
memset(&sfw_data, 0, sizeof(struct smoketest_framework));
sfw_data.fw_session = NULL;
sfw_data.fw_active_srpc = NULL;
- spin_lock_init(&sfw_data.fw_lock);
- atomic_set(&sfw_data.fw_nzombies, 0);
+ cfs_spin_lock_init(&sfw_data.fw_lock);
+ cfs_atomic_set(&sfw_data.fw_nzombies, 0);
CFS_INIT_LIST_HEAD(&sfw_data.fw_tests);
CFS_INIT_LIST_HEAD(&sfw_data.fw_zombie_rpcs);
CFS_INIT_LIST_HEAD(&sfw_data.fw_zombie_sessions);
+ brw_init_test_client();
+ brw_init_test_service();
rc = sfw_register_test(&brw_test_service, &brw_test_client);
LASSERT (rc == 0);
+
+ ping_init_test_client();
+ ping_init_test_service();
rc = sfw_register_test(&ping_test_service, &ping_test_client);
LASSERT (rc == 0);
error = 0;
- list_for_each_entry (tsc, &sfw_data.fw_tests, tsc_list) {
+ cfs_list_for_each_entry_typed (tsc, &sfw_data.fw_tests,
+ sfw_test_case_t, tsc_list) {
sv = tsc->tsc_srv_service;
sv->sv_concur = SFW_TEST_CONCURRENCY;
}
/* about to sfw_shutdown, no need to add buffer */
- if (error) continue;
+ if (error) continue;
rc = srpc_service_add_buffers(sv, SFW_POST_BUFFERS);
if (rc != SFW_POST_BUFFERS) {
sfw_test_case_t *tsc;
int i;
- spin_lock(&sfw_data.fw_lock);
+ cfs_spin_lock(&sfw_data.fw_lock);
sfw_data.fw_shuttingdown = 1;
#ifdef __KERNEL__
"waiting for session timer to explode.\n");
sfw_deactivate_session();
- lst_wait_until(atomic_read(&sfw_data.fw_nzombies) == 0,
+ lst_wait_until(cfs_atomic_read(&sfw_data.fw_nzombies) == 0,
sfw_data.fw_lock,
"waiting for %d zombie sessions to die.\n",
- atomic_read(&sfw_data.fw_nzombies));
+ cfs_atomic_read(&sfw_data.fw_nzombies));
- spin_unlock(&sfw_data.fw_lock);
+ cfs_spin_unlock(&sfw_data.fw_lock);
for (i = 0; ; i++) {
sv = &sfw_services[i];
srpc_remove_service(sv);
}
- list_for_each_entry (tsc, &sfw_data.fw_tests, tsc_list) {
+ cfs_list_for_each_entry_typed (tsc, &sfw_data.fw_tests,
+ sfw_test_case_t, tsc_list) {
sv = tsc->tsc_srv_service;
srpc_shutdown_service(sv);
srpc_remove_service(sv);
}
- while (!list_empty(&sfw_data.fw_zombie_rpcs)) {
+ while (!cfs_list_empty(&sfw_data.fw_zombie_rpcs)) {
srpc_client_rpc_t *rpc;
- rpc = list_entry(sfw_data.fw_zombie_rpcs.next,
- srpc_client_rpc_t, crpc_list);
- list_del(&rpc->crpc_list);
+ rpc = cfs_list_entry(sfw_data.fw_zombie_rpcs.next,
+ srpc_client_rpc_t, crpc_list);
+ cfs_list_del(&rpc->crpc_list);
LIBCFS_FREE(rpc, srpc_client_rpc_size(rpc));
}
srpc_wait_service_shutdown(sv);
}
- while (!list_empty(&sfw_data.fw_tests)) {
- tsc = list_entry(sfw_data.fw_tests.next,
- sfw_test_case_t, tsc_list);
-
+ while (!cfs_list_empty(&sfw_data.fw_tests)) {
+ tsc = cfs_list_entry(sfw_data.fw_tests.next,
+ sfw_test_case_t, tsc_list);
+
srpc_wait_service_shutdown(tsc->tsc_srv_service);
- list_del(&tsc->tsc_list);
+ cfs_list_del(&tsc->tsc_list);
LIBCFS_FREE(tsc, sizeof(*tsc));
}
git://git.whamcloud.com / fs / lustre-release.git / blobdiff