X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lnet%2Fselftest%2Fbrw_test.c;h=856bf957e0147038c493fcf3ce7c8be37eb94392;hb=48a0697d79101ad3ff7651779808dcf002a68890;hp=5e4b036c233f4c08873a8b91b42d70ccab2023b1;hpb=317ebf88af58e9d9235c90f84b112e931ae69b43;p=fs%2Flustre-release.git diff --git a/lnet/selftest/brw_test.c b/lnet/selftest/brw_test.c index 5e4b036..856bf95 100644 --- a/lnet/selftest/brw_test.c +++ b/lnet/selftest/brw_test.c @@ -27,7 +27,7 @@ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * - * Copyright (c) 2011, 2012, Intel Corporation. + * Copyright (c) 2012, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -50,22 +50,22 @@ CFS_MODULE_PARM(brw_inject_errors, "i", int, 0644, static void brw_client_fini (sfw_test_instance_t *tsi) { - srpc_bulk_t *bulk; - sfw_test_unit_t *tsu; + srpc_bulk_t *bulk; + sfw_test_unit_t *tsu; - LASSERT (tsi->tsi_is_client); + 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; + list_for_each_entry(tsu, &tsi->tsi_units, tsu_list) { + bulk = tsu->tsu_private; + if (bulk == NULL) + continue; - srpc_free_bulk(bulk); - tsu->tsu_private = NULL; - } + srpc_free_bulk(bulk); + tsu->tsu_private = NULL; + } } -int +static int brw_client_init (sfw_test_instance_t *tsi) { sfw_session_t *sn = tsi->tsi_batch->bat_session; @@ -87,7 +87,7 @@ brw_client_init (sfw_test_instance_t *tsi) 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; + len = npg * PAGE_CACHE_SIZE; } else { test_bulk_req_v1_t *breq = &tsi->tsi_u.bulk_v1; @@ -99,7 +99,7 @@ brw_client_init (sfw_test_instance_t *tsi) opc = breq->blk_opc; flags = breq->blk_flags; len = breq->blk_len; - npg = (len + CFS_PAGE_SIZE - 1) >> CFS_PAGE_SHIFT; + npg = (len + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT; } if (npg > LNET_MAX_IOV || npg <= 0) @@ -112,17 +112,16 @@ brw_client_init (sfw_test_instance_t *tsi) 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) { + list_for_each_entry(tsu, &tsi->tsi_units, 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; - } + if (bulk == NULL) { + brw_client_fini(tsi); + return -ENOMEM; + } - tsu->tsu_private = bulk; - } + tsu->tsu_private = bulk; + } return 0; } @@ -131,28 +130,27 @@ 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 timeval tv; + struct timeval tv; - if (brw_inject_errors <= 0) return 0; + if (brw_inject_errors <= 0) return 0; #ifndef __KERNEL__ - gettimeofday(&tv, NULL); + gettimeofday(&tv, NULL); #else - cfs_gettimeofday(&tv); + do_gettimeofday(&tv); #endif - if ((tv.tv_usec & 1) == 0) return 0; + if ((tv.tv_usec & 1) == 0) return 0; - return brw_inject_errors--; + return brw_inject_errors--; } -void -brw_fill_page (cfs_page_t *pg, int pattern, __u64 magic) +static void +brw_fill_page(struct page *pg, int pattern, __u64 magic) { - char *addr = cfs_page_address(pg); + char *addr = page_address(pg); int i; LASSERT (addr != NULL); @@ -164,13 +162,13 @@ brw_fill_page (cfs_page_t *pg, int pattern, __u64 magic) if (pattern == LST_BRW_CHECK_SIMPLE) { memcpy(addr, &magic, BRW_MSIZE); - addr += CFS_PAGE_SIZE - BRW_MSIZE; + addr += PAGE_CACHE_SIZE - BRW_MSIZE; memcpy(addr, &magic, BRW_MSIZE); return; } if (pattern == LST_BRW_CHECK_FULL) { - for (i = 0; i < CFS_PAGE_SIZE / BRW_MSIZE; i++) + for (i = 0; i < PAGE_CACHE_SIZE / BRW_MSIZE; i++) memcpy(addr + i * BRW_MSIZE, &magic, BRW_MSIZE); return; } @@ -179,10 +177,10 @@ brw_fill_page (cfs_page_t *pg, int pattern, __u64 magic) return; } -int -brw_check_page (cfs_page_t *pg, int pattern, __u64 magic) +static int +brw_check_page(struct page *pg, int pattern, __u64 magic) { - char *addr = cfs_page_address(pg); + char *addr = page_address(pg); __u64 data = 0; /* make compiler happy */ int i; @@ -195,7 +193,7 @@ brw_check_page (cfs_page_t *pg, int pattern, __u64 magic) data = *((__u64 *) addr); if (data != magic) goto bad_data; - addr += CFS_PAGE_SIZE - BRW_MSIZE; + addr += PAGE_CACHE_SIZE - BRW_MSIZE; data = *((__u64 *) addr); if (data != magic) goto bad_data; @@ -203,7 +201,7 @@ brw_check_page (cfs_page_t *pg, int pattern, __u64 magic) } if (pattern == LST_BRW_CHECK_FULL) { - for (i = 0; i < CFS_PAGE_SIZE / BRW_MSIZE; i++) { + for (i = 0; i < PAGE_CACHE_SIZE / BRW_MSIZE; i++) { data = *(((__u64 *) addr) + i); if (data != magic) goto bad_data; } @@ -219,11 +217,11 @@ bad_data: return 1; } -void -brw_fill_bulk (srpc_bulk_t *bk, int pattern, __u64 magic) +static void +brw_fill_bulk(srpc_bulk_t *bk, int pattern, __u64 magic) { int i; - cfs_page_t *pg; + struct page *pg; for (i = 0; i < bk->bk_niov; i++) { #ifdef __KERNEL__ @@ -236,11 +234,11 @@ brw_fill_bulk (srpc_bulk_t *bk, int pattern, __u64 magic) } } -int -brw_check_bulk (srpc_bulk_t *bk, int pattern, __u64 magic) +static int +brw_check_bulk(srpc_bulk_t *bk, int pattern, __u64 magic) { int i; - cfs_page_t *pg; + struct page *pg; for (i = 0; i < bk->bk_niov; i++) { #ifdef __KERNEL__ @@ -283,7 +281,7 @@ brw_client_prep_rpc (sfw_test_unit_t *tsu, opc = breq->blk_opc; flags = breq->blk_flags; npg = breq->blk_npg; - len = npg * CFS_PAGE_SIZE; + len = npg * PAGE_CACHE_SIZE; } else { test_bulk_req_v1_t *breq = &tsi->tsi_u.bulk_v1; @@ -295,7 +293,7 @@ brw_client_prep_rpc (sfw_test_unit_t *tsu, opc = breq->blk_opc; flags = breq->blk_flags; len = breq->blk_len; - npg = (len + CFS_PAGE_SIZE - 1) >> CFS_PAGE_SHIFT; + npg = (len + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT; } rc = sfw_create_test_rpc(tsu, dest, sn->sn_features, npg, len, &rpc); @@ -333,7 +331,7 @@ brw_client_done_rpc (sfw_test_unit_t *tsu, srpc_client_rpc_t *rpc) 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); + atomic_inc(&sn->sn_brw_errors); goto out; } @@ -347,7 +345,7 @@ brw_client_done_rpc (sfw_test_unit_t *tsu, srpc_client_rpc_t *rpc) libcfs_id2str(rpc->crpc_dest), reply->brw_status); if (reply->brw_status != 0) { - cfs_atomic_inc(&sn->sn_brw_errors); + atomic_inc(&sn->sn_brw_errors); rpc->crpc_status = -(int)reply->brw_status; goto out; } @@ -357,7 +355,7 @@ 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)); - cfs_atomic_inc(&sn->sn_brw_errors); + atomic_inc(&sn->sn_brw_errors); rpc->crpc_status = -EBADMSG; } @@ -368,8 +366,8 @@ out: return; } -void -brw_server_rpc_done (srpc_server_rpc_t *rpc) +static void +brw_server_rpc_done(srpc_server_rpc_t *rpc) { srpc_bulk_t *blk = rpc->srpc_bulk; @@ -387,8 +385,8 @@ brw_server_rpc_done (srpc_server_rpc_t *rpc) sfw_free_pages(rpc); } -int -brw_bulk_ready (srpc_server_rpc_t *rpc, int status) +static int +brw_bulk_ready(srpc_server_rpc_t *rpc, int status) { __u64 magic = BRW_MAGIC; srpc_brw_reply_t *reply = &rpc->srpc_replymsg.msg_body.brw_reply; @@ -423,7 +421,7 @@ brw_bulk_ready (srpc_server_rpc_t *rpc, int status) return 0; } -int +static int brw_server_handle(struct srpc_server_rpc *rpc) { struct srpc_service *sv = rpc->srpc_scd->scd_svc; @@ -470,10 +468,10 @@ brw_server_handle(struct srpc_server_rpc *rpc) reply->brw_status = EINVAL; return 0; } - npg = reqst->brw_len >> CFS_PAGE_SHIFT; + npg = reqst->brw_len >> PAGE_CACHE_SHIFT; } else { - npg = (reqst->brw_len + CFS_PAGE_SIZE - 1) >> CFS_PAGE_SHIFT; + npg = (reqst->brw_len + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT; } replymsg->msg_ses_feats = reqstmsg->msg_ses_feats;