X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lnet%2Fselftest%2Fping_test.c;h=ed16e13c26b8b16f65a78a9084fd5546438285f2;hb=b19b318b5e74e76b3fc5b15c796666d04df62466;hp=93fc9cf89ab0d7dfe522fc7ce0b6253e8d01b2f5;hpb=776615e6825e2c90c2635c8b55e7bb02da33726c;p=fs%2Flustre-release.git diff --git a/lnet/selftest/ping_test.c b/lnet/selftest/ping_test.c index 93fc9cf..ed16e13 100644 --- a/lnet/selftest/ping_test.c +++ b/lnet/selftest/ping_test.c @@ -1,51 +1,100 @@ -/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- - * vim:expandtab:shiftwidth=8:tabstop=8: +/* + * GPL HEADER START * - * Author: Liang Zhen + * 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). * - * This file is part of Lustre, http://www.lustre.org + * You should have received a copy of the GNU General Public License + * version 2 along with this program; If not, see + * http://www.gnu.org/licenses/gpl-2.0.html + * + * GPL HEADER END + */ +/* + * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. + * Use is subject to license terms. + * + * Copyright (c) 2012, Intel Corporation. + */ +/* + * This file is part of Lustre, http://www.lustre.org/ + * Lustre is a trademark of Sun Microsystems, Inc. + * + * lnet/selftest/conctl.c * * Test client & Server + * + * Author: Liang Zhen */ -#include + #include "selftest.h" #define LST_PING_TEST_MAGIC 0xbabeface -typedef struct { - spinlock_t pnd_lock; /* serialize */ - int pnd_counter; /* sequence counter */ - int pnd_err_count; /* error count */ -} lst_ping_data_t; +static int ping_srv_workitems = SFW_TEST_WI_MAX; +module_param(ping_srv_workitems, int, 0644); +MODULE_PARM_DESC(ping_srv_workitems, "# PING server workitems"); -static lst_ping_data_t lst_ping_data; +struct lst_ping_data { + spinlock_t pnd_lock; /* serialize */ + int pnd_counter; /* sequence counter */ +}; + +static struct lst_ping_data lst_ping_data; static int -ping_client_init(sfw_test_instance_t *tsi) +ping_client_init(struct sfw_test_instance *tsi) { - spin_lock_init(&lst_ping_data.pnd_lock); - lst_ping_data.pnd_counter = 0; - lst_ping_data.pnd_err_count = 0; + struct sfw_session *sn = tsi->tsi_batch->bat_session; + + LASSERT(tsi->tsi_is_client); + LASSERT(sn != NULL && (sn->sn_features & ~LST_FEATS_MASK) == 0); - return 0; + spin_lock_init(&lst_ping_data.pnd_lock); + lst_ping_data.pnd_counter = 0; + + return 0; } static void -ping_client_fini(sfw_test_instance_t *tsi) +ping_client_fini(struct sfw_test_instance *tsi) { - CWARN("Total ping %d, failed ping: %d\n", - lst_ping_data.pnd_counter, lst_ping_data.pnd_err_count); + struct sfw_session *sn = tsi->tsi_batch->bat_session; + int errors; + + LASSERT (sn != NULL); + LASSERT (tsi->tsi_is_client); + + errors = atomic_read(&sn->sn_ping_errors); + if (errors) + CWARN ("%d pings have failed.\n", errors); + else + CDEBUG (D_NET, "Ping test finished OK.\n"); } static int -ping_client_prep_rpc(sfw_test_unit_t *tsu, - lnet_process_id_t dest, srpc_client_rpc_t **rpc) +ping_client_prep_rpc(struct sfw_test_unit *tsu, struct lnet_process_id dest, + struct srpc_client_rpc **rpc) { - srpc_ping_reqst_t *req; - struct timeval tv; - int rc; + struct srpc_ping_reqst *req; + struct sfw_test_instance *tsi = tsu->tsu_instance; + struct sfw_session *sn = tsi->tsi_batch->bat_session; + struct timespec64 ts; + int rc; + + LASSERT(sn != NULL); + LASSERT((sn->sn_features & ~LST_FEATS_MASK) == 0); - rc = sfw_create_test_rpc(tsu, dest, 0, 0, rpc); + rc = sfw_create_test_rpc(tsu, dest, sn->sn_features, 0, 0, rpc); if (rc != 0) return rc; @@ -53,82 +102,85 @@ ping_client_prep_rpc(sfw_test_unit_t *tsu, req->pnr_magic = LST_PING_TEST_MAGIC; - spin_lock(&lst_ping_data.pnd_lock); - req->pnr_seq = lst_ping_data.pnd_counter ++; - spin_unlock(&lst_ping_data.pnd_lock); + spin_lock(&lst_ping_data.pnd_lock); + req->pnr_seq = lst_ping_data.pnd_counter++; + spin_unlock(&lst_ping_data.pnd_lock); - cfs_fs_timeval(&tv); - req->pnr_time_sec = tv.tv_sec; - req->pnr_time_usec = tv.tv_usec; + ktime_get_real_ts64(&ts); + req->pnr_time_sec = ts.tv_sec; + req->pnr_time_nsec = ts.tv_nsec; - return rc; + return rc; } static void -ping_client_done_rpc(sfw_test_unit_t *tsu, srpc_client_rpc_t *rpc) +ping_client_done_rpc(struct sfw_test_unit *tsu, struct srpc_client_rpc *rpc) { - srpc_ping_reqst_t *req; - srpc_ping_reply_t *rep; - struct timeval tv; - - req = &rpc->crpc_reqstmsg.msg_body.ping_reqst; - rep = &rpc->crpc_replymsg.msg_body.ping_reply; - - if (rpc->crpc_status == 0 && - rpc->crpc_replymsg.msg_magic != SRPC_MSG_MAGIC) { - __swab32s(&rep->pnr_seq); - __swab32s(&rep->pnr_magic); - __swab32s(&rep->pnr_status); - } + struct sfw_test_instance *tsi = tsu->tsu_instance; + struct sfw_session *sn = tsi->tsi_batch->bat_session; + struct srpc_ping_reqst *reqst = &rpc->crpc_reqstmsg.msg_body.ping_reqst; + struct srpc_ping_reply *reply = &rpc->crpc_replymsg.msg_body.ping_reply; + struct timespec64 ts; + + LASSERT(sn != NULL); if (rpc->crpc_status != 0) { + if (!tsi->tsi_stopping) /* rpc could have been aborted */ + atomic_inc(&sn->sn_ping_errors); CERROR ("Unable to ping %s (%d): %d\n", libcfs_id2str(rpc->crpc_dest), - req->pnr_seq, rpc->crpc_status); - } else if (rep->pnr_magic != LST_PING_TEST_MAGIC) { - tsu->tsu_error = -EBADMSG; + reqst->pnr_seq, rpc->crpc_status); + return; + } + + if (rpc->crpc_replymsg.msg_magic != SRPC_MSG_MAGIC) { + __swab32s(&reply->pnr_seq); + __swab32s(&reply->pnr_magic); + __swab32s(&reply->pnr_status); + } + + if (reply->pnr_magic != LST_PING_TEST_MAGIC) { + rpc->crpc_status = -EBADMSG; + atomic_inc(&sn->sn_ping_errors); CERROR ("Bad magic %u from %s, %u expected.\n", - rep->pnr_magic, libcfs_id2str(rpc->crpc_dest), + reply->pnr_magic, libcfs_id2str(rpc->crpc_dest), LST_PING_TEST_MAGIC); - } else if (rep->pnr_seq != req->pnr_seq) { - tsu->tsu_error = -EBADMSG; - CERROR ("Bad seq %u from %s, %u expected.\n", - rep->pnr_seq, libcfs_id2str(rpc->crpc_dest), - req->pnr_seq); - } + return; + } - if (tsu->tsu_error != 0) { - spin_lock(&lst_ping_data.pnd_lock); - lst_ping_data.pnd_err_count++; - spin_unlock(&lst_ping_data.pnd_lock); + if (reply->pnr_seq != reqst->pnr_seq) { + rpc->crpc_status = -EBADMSG; + atomic_inc(&sn->sn_ping_errors); + CERROR ("Bad seq %u from %s, %u expected.\n", + reply->pnr_seq, libcfs_id2str(rpc->crpc_dest), + reqst->pnr_seq); return; } - cfs_fs_timeval(&tv); - CDEBUG (D_NET, "%d reply in %u usec\n", rep->pnr_seq, - (unsigned)((tv.tv_sec - (unsigned)req->pnr_time_sec) * 1000000 + - (tv.tv_usec - req->pnr_time_usec))); - return; + ktime_get_real_ts64(&ts); + CDEBUG(D_NET, "%d reply in %llu nsec\n", reply->pnr_seq, + (u64)((ts.tv_sec - reqst->pnr_time_sec) * NSEC_PER_SEC + + (ts.tv_nsec - reqst->pnr_time_nsec))); } static int -ping_server_handle (srpc_server_rpc_t *rpc) +ping_server_handle(struct srpc_server_rpc *rpc) { - srpc_service_t *sv = rpc->srpc_service; - srpc_msg_t *reqstmsg = &rpc->srpc_reqstbuf->buf_msg; - srpc_ping_reqst_t *req = &reqstmsg->msg_body.ping_reqst; - srpc_ping_reply_t *rep = &rpc->srpc_replymsg.msg_body.ping_reply; + struct srpc_service *sv = rpc->srpc_scd->scd_svc; + struct srpc_msg *reqstmsg = &rpc->srpc_reqstbuf->buf_msg; + struct srpc_msg *replymsg = &rpc->srpc_replymsg; + struct srpc_ping_reqst *req = &reqstmsg->msg_body.ping_reqst; + struct srpc_ping_reply *rep = &rpc->srpc_replymsg.msg_body.ping_reply; LASSERT (sv->sv_id == SRPC_SERVICE_PING); if (reqstmsg->msg_magic != SRPC_MSG_MAGIC) { LASSERT (reqstmsg->msg_magic == __swab32(SRPC_MSG_MAGIC)); - __swab32s(&reqstmsg->msg_type); __swab32s(&req->pnr_seq); __swab32s(&req->pnr_magic); __swab64s(&req->pnr_time_sec); - __swab64s(&req->pnr_time_usec); + __swab64s(&req->pnr_time_nsec); } LASSERT (reqstmsg->msg_type == srpc_service2request(sv->sv_id)); @@ -141,22 +193,35 @@ ping_server_handle (srpc_server_rpc_t *rpc) rep->pnr_seq = req->pnr_seq; rep->pnr_magic = LST_PING_TEST_MAGIC; - CDEBUG (D_NET, "Get ping %d from %s\n", - req->pnr_seq, libcfs_id2str(rpc->srpc_peer)); - return 0; + if ((reqstmsg->msg_ses_feats & ~LST_FEATS_MASK) != 0) { + replymsg->msg_ses_feats = LST_FEATS_MASK; + rep->pnr_status = EPROTO; + return 0; + } + + replymsg->msg_ses_feats = reqstmsg->msg_ses_feats; + + CDEBUG(D_NET, "Get ping %d from %s\n", + req->pnr_seq, libcfs_id2str(rpc->srpc_peer)); + return 0; } -sfw_test_client_ops_t ping_test_client = +struct sfw_test_client_ops ping_test_client; + +void ping_init_test_client(void) { - .tso_init = ping_client_init, - .tso_fini = ping_client_fini, - .tso_prep_rpc = ping_client_prep_rpc, - .tso_done_rpc = ping_client_done_rpc, -}; + ping_test_client.tso_init = ping_client_init; + ping_test_client.tso_fini = ping_client_fini; + ping_test_client.tso_prep_rpc = ping_client_prep_rpc; + ping_test_client.tso_done_rpc = ping_client_done_rpc; +} + +struct srpc_service ping_test_service; -srpc_service_t ping_test_service = +void ping_init_test_service(void) { - .sv_name = "ping test", - .sv_handler = ping_server_handle, - .sv_id = SRPC_SERVICE_PING, -}; + ping_test_service.sv_id = SRPC_SERVICE_PING; + ping_test_service.sv_name = "ping_test"; + ping_test_service.sv_handler = ping_server_handle; + ping_test_service.sv_wi_total = ping_srv_workitems; +}