X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lnet%2Fselftest%2Fbrw_test.c;h=e002e83922a1bad9e0d865ff67ce98be5cdf415f;hb=2f5ad4e8cf26406a7aa732efa4d813dbcced55d9;hp=da9d15019cb7b21043fd48f26c1f35c0c4a3bd75;hpb=03fe49eee6d3ae66042950bfc34239ef2c2a89e0;p=fs%2Flustre-release.git diff --git a/lnet/selftest/brw_test.c b/lnet/selftest/brw_test.c index da9d150..e002e83 100644 --- a/lnet/selftest/brw_test.c +++ b/lnet/selftest/brw_test.c @@ -1,18 +1,49 @@ -/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- - * vim:expandtab:shiftwidth=8:tabstop=8: +/* + * GPL HEADER START * - * Copyright (C) 2001, 2002 Cluster File Systems, Inc. - * Author: Isaac Huang + * 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 (c) 2007, 2010, Oracle and/or its affiliates. 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/brw_test.c + * + * Author: Isaac Huang */ -#include #include "selftest.h" +static int brw_srv_workitems = SFW_TEST_WI_MAX; +CFS_MODULE_PARM(brw_srv_workitems, "i", int, 0644, "# BRW server workitems"); -static int brw_inject_errors = 0; +static int brw_inject_errors; CFS_MODULE_PARM(brw_inject_errors, "i", int, 0644, - "# data errors to inject randomly"); + "# data errors to inject randomly, zero by default"); static void brw_client_fini (sfw_test_instance_t *tsi) @@ -20,7 +51,10 @@ brw_client_fini (sfw_test_instance_t *tsi) srpc_bulk_t *bulk; sfw_test_unit_t *tsu; - list_for_each_entry (tsu, &tsi->tsi_units, tsu_list) { + LASSERT (tsi->tsi_is_client); + + cfs_list_for_each_entry_typed (tsu, &tsi->tsi_units, + sfw_test_unit_t, tsu_list) { bulk = tsu->tsu_private; if (bulk == NULL) continue; @@ -32,24 +66,54 @@ brw_client_fini (sfw_test_instance_t *tsi) int brw_client_init (sfw_test_instance_t *tsi) { - test_bulk_req_t *breq = &tsi->tsi_u.bulk; - int flags = breq->blk_flags; - int npg = breq->blk_npg; - srpc_bulk_t *bulk; - sfw_test_unit_t *tsu; - - if (npg > LNET_MAX_IOV || npg <= 0) - return -EINVAL; - - if (breq->blk_opc != LST_BRW_READ && breq->blk_opc != LST_BRW_WRITE) - return -EINVAL; - - if (flags != LST_BRW_CHECK_NONE && - flags != LST_BRW_CHECK_FULL && flags != LST_BRW_CHECK_SIMPLE) - return -EINVAL; - - list_for_each_entry (tsu, &tsi->tsi_units, tsu_list) { - bulk = srpc_alloc_bulk(npg, breq->blk_opc == LST_BRW_READ); + sfw_session_t *sn = tsi->tsi_batch->bat_session; + int flags; + int npg; + int len; + int opc; + srpc_bulk_t *bulk; + sfw_test_unit_t *tsu; + + LASSERT(sn != NULL); + LASSERT(tsi->tsi_is_client); + + if ((sn->sn_features & LST_FEAT_BULK_LEN) == 0) { + test_bulk_req_t *breq = &tsi->tsi_u.bulk_v0; + + opc = breq->blk_opc; + flags = breq->blk_flags; + npg = breq->blk_npg; + /* NB: this is not going to work for variable page size, + * but we have to keep it for compatibility */ + len = npg * CFS_PAGE_SIZE; + + } else { + test_bulk_req_v1_t *breq = &tsi->tsi_u.bulk_v1; + + /* I should never get this step if it's unknown feature + * because make_session will reject unknown feature */ + LASSERT((sn->sn_features & ~LST_FEATS_MASK) == 0); + + opc = breq->blk_opc; + flags = breq->blk_flags; + len = breq->blk_len; + npg = (len + CFS_PAGE_SIZE - 1) >> CFS_PAGE_SHIFT; + } + + if (npg > LNET_MAX_IOV || npg <= 0) + return -EINVAL; + + if (opc != LST_BRW_READ && opc != LST_BRW_WRITE) + return -EINVAL; + + if (flags != LST_BRW_CHECK_NONE && + flags != LST_BRW_CHECK_FULL && flags != LST_BRW_CHECK_SIMPLE) + return -EINVAL; + + cfs_list_for_each_entry_typed(tsu, &tsi->tsi_units, + sfw_test_unit_t, tsu_list) { + bulk = srpc_alloc_bulk(lnet_cpt_of_nid(tsu->tsu_dest.nid), + npg, len, opc == LST_BRW_READ); if (bulk == NULL) { brw_client_fini(tsi); return -ENOMEM; @@ -58,7 +122,7 @@ brw_client_init (sfw_test_instance_t *tsi) tsu->tsu_private = bulk; } - return 0; + return 0; } #define BRW_POISON 0xbeefbeefbeefbeefULL @@ -75,7 +139,7 @@ brw_inject_one_error (void) #ifndef __KERNEL__ gettimeofday(&tv, NULL); #else - do_gettimeofday(&tv); + cfs_gettimeofday(&tv); #endif if ((tv.tv_usec & 1) == 0) return 0; @@ -91,8 +155,7 @@ brw_fill_page (cfs_page_t *pg, int pattern, __u64 magic) LASSERT (addr != NULL); - if (pattern == LST_BRW_CHECK_NONE) - return; + if (pattern == LST_BRW_CHECK_NONE) return; if (magic == BRW_MAGIC) magic += brw_inject_one_error(); @@ -118,7 +181,7 @@ int brw_check_page (cfs_page_t *pg, int pattern, __u64 magic) { char *addr = cfs_page_address(pg); - __u64 data; + __u64 data = 0; /* make compiler happy */ int i; LASSERT (addr != NULL); @@ -149,7 +212,7 @@ brw_check_page (cfs_page_t *pg, int pattern, __u64 magic) LBUG (); bad_data: - CERROR ("Bad data in page %p: "LPU64", "LPU64" expected\n", + CERROR ("Bad data in page %p: "LPX64", "LPX64" expected\n", pg, data, magic); return 1; } @@ -200,48 +263,75 @@ brw_client_prep_rpc (sfw_test_unit_t *tsu, { srpc_bulk_t *bulk = tsu->tsu_private; sfw_test_instance_t *tsi = tsu->tsu_instance; - test_bulk_req_t *breq = &tsi->tsi_u.bulk; - int npg = breq->blk_npg; - int flags = breq->blk_flags; - srpc_client_rpc_t *rpc; - srpc_brw_reqst_t *req; - int rc; - - LASSERT (bulk != NULL); - LASSERT (bulk->bk_niov == npg); - - rc = sfw_create_test_rpc(tsu, dest, npg, npg * CFS_PAGE_SIZE, &rpc); - if (rc != 0) return rc; - - memcpy(&rpc->crpc_bulk, bulk, offsetof(srpc_bulk_t, bk_iovs[npg])); - if (breq->blk_opc == LST_BRW_WRITE) - brw_fill_bulk(&rpc->crpc_bulk, flags, BRW_MAGIC); - else - brw_fill_bulk(&rpc->crpc_bulk, flags, BRW_POISON); - - req = &rpc->crpc_reqstmsg.msg_body.brw_reqst; - req->brw_flags = flags; - req->brw_rw = breq->blk_opc; - req->brw_len = npg * CFS_PAGE_SIZE; - - *rpcpp = rpc; - return 0; + sfw_session_t *sn = tsi->tsi_batch->bat_session; + srpc_client_rpc_t *rpc; + srpc_brw_reqst_t *req; + int flags; + int npg; + int len; + int opc; + int rc; + + LASSERT(sn != NULL); + LASSERT(bulk != NULL); + + if ((sn->sn_features & LST_FEAT_BULK_LEN) == 0) { + test_bulk_req_t *breq = &tsi->tsi_u.bulk_v0; + + opc = breq->blk_opc; + flags = breq->blk_flags; + npg = breq->blk_npg; + len = npg * CFS_PAGE_SIZE; + + } else { + test_bulk_req_v1_t *breq = &tsi->tsi_u.bulk_v1; + + /* I should never get this step if it's unknown feature + * because make_session will reject unknown feature */ + LASSERT((sn->sn_features & ~LST_FEATS_MASK) == 0); + + opc = breq->blk_opc; + flags = breq->blk_flags; + len = breq->blk_len; + npg = (len + CFS_PAGE_SIZE - 1) >> CFS_PAGE_SHIFT; + } + + rc = sfw_create_test_rpc(tsu, dest, sn->sn_features, npg, len, &rpc); + if (rc != 0) + return rc; + + memcpy(&rpc->crpc_bulk, bulk, offsetof(srpc_bulk_t, bk_iovs[npg])); + if (opc == LST_BRW_WRITE) + brw_fill_bulk(&rpc->crpc_bulk, flags, BRW_MAGIC); + else + brw_fill_bulk(&rpc->crpc_bulk, flags, BRW_POISON); + + req = &rpc->crpc_reqstmsg.msg_body.brw_reqst; + req->brw_flags = flags; + req->brw_rw = opc; + req->brw_len = len; + + *rpcpp = rpc; + return 0; } static void brw_client_done_rpc (sfw_test_unit_t *tsu, srpc_client_rpc_t *rpc) { - __u64 magic = BRW_MAGIC; - srpc_msg_t *msg = &rpc->crpc_replymsg; - srpc_brw_reply_t *reply = &msg->msg_body.brw_reply; - srpc_brw_reqst_t *reqst = &rpc->crpc_reqstmsg.msg_body.brw_reqst; - sfw_session_t *sn = tsu->tsu_instance->tsi_batch->bat_session; + __u64 magic = BRW_MAGIC; + sfw_test_instance_t *tsi = tsu->tsu_instance; + sfw_session_t *sn = tsi->tsi_batch->bat_session; + srpc_msg_t *msg = &rpc->crpc_replymsg; + srpc_brw_reply_t *reply = &msg->msg_body.brw_reply; + srpc_brw_reqst_t *reqst = &rpc->crpc_reqstmsg.msg_body.brw_reqst; LASSERT (sn != NULL); if (rpc->crpc_status != 0) { CERROR ("BRW RPC to %s failed with %d\n", libcfs_id2str(rpc->crpc_dest), rpc->crpc_status); + if (!tsi->tsi_stopping) /* rpc could have been aborted */ + cfs_atomic_inc(&sn->sn_brw_errors); goto out; } @@ -250,15 +340,13 @@ brw_client_done_rpc (sfw_test_unit_t *tsu, srpc_client_rpc_t *rpc) __swab32s(&reply->brw_status); } - if (tsu->tsu_error == 0) - tsu->tsu_error = -reply->brw_status; - CDEBUG (reply->brw_status ? D_WARNING : D_NET, "BRW RPC to %s finished with brw_status: %d\n", libcfs_id2str(rpc->crpc_dest), reply->brw_status); if (reply->brw_status != 0) { - atomic_inc(&sn->sn_brw_errors); + cfs_atomic_inc(&sn->sn_brw_errors); + rpc->crpc_status = -(int)reply->brw_status; goto out; } @@ -267,8 +355,8 @@ brw_client_done_rpc (sfw_test_unit_t *tsu, srpc_client_rpc_t *rpc) if (brw_check_bulk(&rpc->crpc_bulk, reqst->brw_flags, magic) != 0) { CERROR ("Bulk data from %s is corrupted!\n", libcfs_id2str(rpc->crpc_dest)); - tsu->tsu_error = -EBADMSG; - atomic_inc(&sn->sn_brw_errors); + cfs_atomic_inc(&sn->sn_brw_errors); + rpc->crpc_status = -EBADMSG; } out: @@ -334,13 +422,14 @@ brw_bulk_ready (srpc_server_rpc_t *rpc, int status) } int -brw_server_handle (srpc_server_rpc_t *rpc) +brw_server_handle(struct srpc_server_rpc *rpc) { - srpc_service_t *sv = rpc->srpc_service; + struct srpc_service *sv = rpc->srpc_scd->scd_svc; srpc_msg_t *replymsg = &rpc->srpc_replymsg; srpc_msg_t *reqstmsg = &rpc->srpc_reqstbuf->buf_msg; srpc_brw_reply_t *reply = &replymsg->msg_body.brw_reply; srpc_brw_reqst_t *reqst = &reqstmsg->msg_body.brw_reqst; + int npg; int rc; LASSERT (sv->sv_id == SRPC_SERVICE_BRW); @@ -348,31 +437,55 @@ brw_server_handle (srpc_server_rpc_t *rpc) if (reqstmsg->msg_magic != SRPC_MSG_MAGIC) { LASSERT (reqstmsg->msg_magic == __swab32(SRPC_MSG_MAGIC)); - __swab32s(&reqstmsg->msg_type); __swab32s(&reqst->brw_rw); __swab32s(&reqst->brw_len); __swab32s(&reqst->brw_flags); __swab64s(&reqst->brw_rpyid); __swab64s(&reqst->brw_bulkid); } - LASSERT (reqstmsg->msg_type == srpc_service2request(sv->sv_id)); + LASSERT (reqstmsg->msg_type == (__u32)srpc_service2request(sv->sv_id)); + reply->brw_status = 0; rpc->srpc_done = brw_server_rpc_done; if ((reqst->brw_rw != LST_BRW_READ && reqst->brw_rw != LST_BRW_WRITE) || - reqst->brw_len == 0 || (reqst->brw_len & ~CFS_PAGE_MASK) != 0 || - reqst->brw_len / CFS_PAGE_SIZE > LNET_MAX_IOV || (reqst->brw_flags != LST_BRW_CHECK_NONE && reqst->brw_flags != LST_BRW_CHECK_FULL && reqst->brw_flags != LST_BRW_CHECK_SIMPLE)) { reply->brw_status = EINVAL; return 0; } - - reply->brw_status = 0; - rc = sfw_alloc_pages(rpc, reqst->brw_len / CFS_PAGE_SIZE, - reqst->brw_rw == LST_BRW_WRITE); - if (rc != 0) return rc; + + if ((reqstmsg->msg_ses_feats & ~LST_FEATS_MASK) != 0) { + replymsg->msg_ses_feats = LST_FEATS_MASK; + reply->brw_status = EPROTO; + return 0; + } + + if ((reqstmsg->msg_ses_feats & LST_FEAT_BULK_LEN) == 0) { + /* compat with old version */ + if ((reqst->brw_len & ~CFS_PAGE_MASK) != 0) { + reply->brw_status = EINVAL; + return 0; + } + npg = reqst->brw_len >> CFS_PAGE_SHIFT; + + } else { + npg = (reqst->brw_len + CFS_PAGE_SIZE - 1) >> CFS_PAGE_SHIFT; + } + + replymsg->msg_ses_feats = reqstmsg->msg_ses_feats; + + if (reqst->brw_len == 0 || npg > LNET_MAX_IOV) { + reply->brw_status = EINVAL; + return 0; + } + + rc = sfw_alloc_pages(rpc, rpc->srpc_scd->scd_cpt, npg, + reqst->brw_len, + reqst->brw_rw == LST_BRW_WRITE); + if (rc != 0) + return rc; if (reqst->brw_rw == LST_BRW_READ) brw_fill_bulk(rpc->srpc_bulk, reqst->brw_flags, BRW_MAGIC); @@ -382,18 +495,28 @@ brw_server_handle (srpc_server_rpc_t *rpc) return 0; } -sfw_test_client_ops_t brw_test_client = +sfw_test_client_ops_t brw_test_client; +void brw_init_test_client(void) { - .tso_init = brw_client_init, - .tso_fini = brw_client_fini, - .tso_prep_rpc = brw_client_prep_rpc, - .tso_done_rpc = brw_client_done_rpc, + brw_test_client.tso_init = brw_client_init; + brw_test_client.tso_fini = brw_client_fini; + brw_test_client.tso_prep_rpc = brw_client_prep_rpc; + brw_test_client.tso_done_rpc = brw_client_done_rpc; }; -srpc_service_t brw_test_service = +srpc_service_t brw_test_service; +void brw_init_test_service(void) { - .sv_name = "brw test", - .sv_handler = brw_server_handle, - .sv_bulk_ready = brw_bulk_ready, - .sv_id = SRPC_SERVICE_BRW, -}; +#ifndef __KERNEL__ + char *s; + + s = getenv("BRW_INJECT_ERRORS"); + brw_inject_errors = s != NULL ? atoi(s) : brw_inject_errors; +#endif + + brw_test_service.sv_id = SRPC_SERVICE_BRW; + brw_test_service.sv_name = "brw_test"; + brw_test_service.sv_handler = brw_server_handle; + brw_test_service.sv_bulk_ready = brw_bulk_ready; + brw_test_service.sv_wi_total = brw_srv_workitems; +}