Whamcloud - gitweb
LU-13004 ptlrpc: Allow BULK_BUF_KIOV to accept a kvec
[fs/lustre-release.git] / lnet / selftest / brw_test.c
index 51e3254..55c9486 100644 (file)
@@ -23,7 +23,7 @@
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2012, 2016, Intel Corporation.
+ * Copyright (c) 2012, 2017, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -49,10 +49,10 @@ MODULE_PARM_DESC(brw_inject_errors, "# data errors to inject randomly, zero by d
 #define BRW_MSIZE      sizeof(__u64)
 
 static void
-brw_client_fini (sfw_test_instance_t *tsi)
+brw_client_fini(struct sfw_test_instance *tsi)
 {
-       srpc_bulk_t     *bulk;
-       sfw_test_unit_t *tsu;
+       struct srpc_bulk *bulk;
+       struct sfw_test_unit *tsu;
 
        LASSERT(tsi->tsi_is_client);
 
@@ -67,22 +67,22 @@ brw_client_fini (sfw_test_instance_t *tsi)
 }
 
 static int
-brw_client_init (sfw_test_instance_t *tsi)
+brw_client_init(struct sfw_test_instance *tsi)
 {
-       sfw_session_t    *sn = tsi->tsi_batch->bat_session;
+       struct sfw_session *sn = tsi->tsi_batch->bat_session;
        int               flags;
        int               off;
        int               npg;
        int               len;
        int               opc;
-       srpc_bulk_t      *bulk;
-       sfw_test_unit_t  *tsu;
+       struct srpc_bulk *bulk;
+       struct sfw_test_unit *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;
+               struct test_bulk_req *breq = &tsi->tsi_u.bulk_v0;
 
                opc   = breq->blk_opc;
                flags = breq->blk_flags;
@@ -93,7 +93,7 @@ brw_client_init (sfw_test_instance_t *tsi)
                off   = 0;
 
        } else {
-               test_bulk_req_v1_t  *breq = &tsi->tsi_u.bulk_v1;
+               struct test_bulk_req_v1 *breq = &tsi->tsi_u.bulk_v1;
 
                /* I should never get this step if it's unknown feature
                 * because make_session will reject unknown feature */
@@ -137,7 +137,7 @@ brw_client_init (sfw_test_instance_t *tsi)
 #define BRW_MAGIC       0xeeb0eeb1eeb2eeb3ULL
 #define BRW_MSIZE       sizeof(__u64)
 
-int brw_inject_one_error(void)
+static int brw_inject_one_error(void)
 {
        struct timespec64 ts;
 
@@ -228,7 +228,7 @@ bad_data:
 }
 
 static void
-brw_fill_bulk(srpc_bulk_t *bk, int pattern, __u64 magic)
+brw_fill_bulk(struct srpc_bulk *bk, int pattern, __u64 magic)
 {
        int          i;
        struct page *pg;
@@ -245,7 +245,7 @@ brw_fill_bulk(srpc_bulk_t *bk, int pattern, __u64 magic)
 }
 
 static int
-brw_check_bulk(srpc_bulk_t *bk, int pattern, __u64 magic)
+brw_check_bulk(struct srpc_bulk *bk, int pattern, __u64 magic)
 {
        int          i;
        struct page *pg;
@@ -268,25 +268,25 @@ brw_check_bulk(srpc_bulk_t *bk, int pattern, __u64 magic)
 }
 
 static int
-brw_client_prep_rpc(sfw_test_unit_t *tsu,
-                   lnet_process_id_t dest, srpc_client_rpc_t **rpcpp)
+brw_client_prep_rpc(struct sfw_test_unit *tsu, struct lnet_process_id dest,
+                   struct srpc_client_rpc **rpcpp)
 {
-       srpc_bulk_t         *bulk = tsu->tsu_private;
-       sfw_test_instance_t *tsi = tsu->tsu_instance;
-       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;
+       struct srpc_bulk *bulk = tsu->tsu_private;
+       struct sfw_test_instance *tsi = tsu->tsu_instance;
+       struct sfw_session *sn = tsi->tsi_batch->bat_session;
+       struct srpc_client_rpc *rpc;
+       struct srpc_brw_reqst *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;
+               struct test_bulk_req *breq = &tsi->tsi_u.bulk_v0;
 
                opc   = breq->blk_opc;
                flags = breq->blk_flags;
@@ -294,8 +294,8 @@ brw_client_prep_rpc(sfw_test_unit_t *tsu,
                len   = npg * PAGE_SIZE;
 
        } else {
-               test_bulk_req_v1_t  *breq = &tsi->tsi_u.bulk_v1;
-               int                  off;
+               struct test_bulk_req_v1 *breq = &tsi->tsi_u.bulk_v1;
+               int off;
 
                /* I should never get this step if it's unknown feature
                 * because make_session will reject unknown feature */
@@ -312,7 +312,7 @@ brw_client_prep_rpc(sfw_test_unit_t *tsu,
        if (rc != 0)
                return rc;
 
-       memcpy(&rpc->crpc_bulk, bulk, offsetof(srpc_bulk_t, bk_iovs[npg]));
+       memcpy(&rpc->crpc_bulk, bulk, offsetof(struct srpc_bulk, bk_iovs[npg]));
        if (opc == LST_BRW_WRITE)
                brw_fill_bulk(&rpc->crpc_bulk, flags, BRW_MAGIC);
        else
@@ -328,14 +328,14 @@ brw_client_prep_rpc(sfw_test_unit_t *tsu,
 }
 
 static void
-brw_client_done_rpc(sfw_test_unit_t *tsu, srpc_client_rpc_t *rpc)
+brw_client_done_rpc(struct sfw_test_unit *tsu, struct srpc_client_rpc *rpc)
 {
-       __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;
+       __u64 magic = BRW_MAGIC;
+       struct sfw_test_instance *tsi = tsu->tsu_instance;
+       struct sfw_session *sn = tsi->tsi_batch->bat_session;
+       struct srpc_msg *msg = &rpc->crpc_replymsg;
+       struct srpc_brw_reply *reply = &msg->msg_body.brw_reply;
+       struct srpc_brw_reqst *reqst = &rpc->crpc_reqstmsg.msg_body.brw_reqst;
 
        LASSERT(sn != NULL);
 
@@ -371,14 +371,12 @@ brw_client_done_rpc(sfw_test_unit_t *tsu, srpc_client_rpc_t *rpc)
                atomic_inc(&sn->sn_brw_errors);
                rpc->crpc_status = -EBADMSG;
        }
-
-       return;
 }
 
 static void
-brw_server_rpc_done(srpc_server_rpc_t *rpc)
+brw_server_rpc_done(struct srpc_server_rpc *rpc)
 {
-       srpc_bulk_t *blk = rpc->srpc_bulk;
+       struct srpc_bulk *blk = rpc->srpc_bulk;
 
        if (blk == NULL)
                return;
@@ -396,12 +394,12 @@ brw_server_rpc_done(srpc_server_rpc_t *rpc)
 }
 
 static int
-brw_bulk_ready(srpc_server_rpc_t *rpc, int status)
+brw_bulk_ready(struct srpc_server_rpc *rpc, int status)
 {
-        __u64             magic = BRW_MAGIC;
-        srpc_brw_reply_t *reply = &rpc->srpc_replymsg.msg_body.brw_reply;
-        srpc_brw_reqst_t *reqst;
-        srpc_msg_t       *reqstmsg;
+       __u64 magic = BRW_MAGIC;
+       struct srpc_brw_reply *reply = &rpc->srpc_replymsg.msg_body.brw_reply;
+       struct srpc_brw_reqst *reqst;
+       struct srpc_msg *reqstmsg;
 
         LASSERT (rpc->srpc_bulk != NULL);
         LASSERT (rpc->srpc_reqstbuf != NULL);
@@ -434,13 +432,13 @@ brw_bulk_ready(srpc_server_rpc_t *rpc, int status)
 static int
 brw_server_handle(struct srpc_server_rpc *rpc)
 {
-       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;
+       struct srpc_service *sv = rpc->srpc_scd->scd_svc;
+       struct srpc_msg *replymsg = &rpc->srpc_replymsg;
+       struct srpc_msg *reqstmsg = &rpc->srpc_reqstbuf->buf_msg;
+       struct srpc_brw_reply *reply = &replymsg->msg_body.brw_reply;
+       struct srpc_brw_reqst *reqst = &reqstmsg->msg_body.brw_reqst;
+       int npg;
+       int rc;
 
         LASSERT (sv->sv_id == SRPC_SERVICE_BRW);
 
@@ -505,7 +503,8 @@ brw_server_handle(struct srpc_server_rpc *rpc)
         return 0;
 }
 
-sfw_test_client_ops_t brw_test_client;
+struct sfw_test_client_ops brw_test_client;
+
 void brw_init_test_client(void)
 {
         brw_test_client.tso_init       = brw_client_init;
@@ -514,10 +513,10 @@ void brw_init_test_client(void)
         brw_test_client.tso_done_rpc   = brw_client_done_rpc;
 };
 
-srpc_service_t brw_test_service;
+struct srpc_service brw_test_service;
+
 void brw_init_test_service(void)
 {
-
         brw_test_service.sv_id         = SRPC_SERVICE_BRW;
         brw_test_service.sv_name       = "brw_test";
         brw_test_service.sv_handler    = brw_server_handle;