LU-13004 gnilnd: remove support for GNILND_BUF_VIRT_*

[fs/lustre-release.git] / lnet / klnds / gnilnd / gnilnd_proc.c

diff --git a/lnet/klnds/gnilnd/gnilnd_proc.c b/lnet/klnds/gnilnd/gnilnd_proc.c
index 71c1305..a833026 100644 (file)
--- a/lnet/klnds/gnilnd/gnilnd_proc.c
+++ b/lnet/klnds/gnilnd/gnilnd_proc.c
@@ -40,7 +40,7 @@
 static int
 _kgnilnd_proc_run_cksum_test(int caseno, int nloops, int nob)
 {
-       lnet_kiov_t              *src, *dest;
+       struct bio_vec          *src, *dest;
        struct timespec          begin, end, diff;
        int                      niov;
        int                      rc = 0;
@@ -48,8 +48,8 @@ _kgnilnd_proc_run_cksum_test(int caseno, int nloops, int nob)
        __u16                    cksum, cksum2;
        __u64                    mbytes;
 
-       LIBCFS_ALLOC(src, LNET_MAX_IOV * sizeof(lnet_kiov_t));
-       LIBCFS_ALLOC(dest, LNET_MAX_IOV * sizeof(lnet_kiov_t));
+       CFS_ALLOC_PTR_ARRAY(src, LNET_MAX_IOV);
+       CFS_ALLOC_PTR_ARRAY(dest, LNET_MAX_IOV);
 
        if (src == NULL || dest == NULL) {
                CERROR("couldn't allocate iovs\n");
@@ -57,20 +57,20 @@ _kgnilnd_proc_run_cksum_test(int caseno, int nloops, int nob)
        }
 
        for (i = 0; i < LNET_MAX_IOV; i++) {
-               src[i].kiov_offset = 0;
-               src[i].kiov_len = PAGE_SIZE;
-               src[i].kiov_page = alloc_page(GFP_KERNEL | __GFP_ZERO);
+               src[i].bv_offset = 0;
+               src[i].bv_len = PAGE_SIZE;
+               src[i].bv_page = alloc_page(GFP_KERNEL | __GFP_ZERO);
 
-               if (src[i].kiov_page == NULL) {
+               if (src[i].bv_page == NULL) {
                        CERROR("couldn't allocate page %d\n", i);
                        GOTO(unwind, rc = -ENOMEM);
                }
 
-               dest[i].kiov_offset = 0;
-               dest[i].kiov_len = PAGE_SIZE;
-               dest[i].kiov_page = alloc_page(GFP_KERNEL | __GFP_ZERO);
+               dest[i].bv_offset = 0;
+               dest[i].bv_len = PAGE_SIZE;
+               dest[i].bv_page = alloc_page(GFP_KERNEL | __GFP_ZERO);
 
-               if (dest[i].kiov_page == NULL) {
+               if (dest[i].bv_page == NULL) {
                        CERROR("couldn't allocate page %d\n", i);
                        GOTO(unwind, rc = -ENOMEM);
                }
@@ -85,31 +85,31 @@ _kgnilnd_proc_run_cksum_test(int caseno, int nloops, int nob)
        }
 
        /* setup real data */
-       src[0].kiov_offset = 317;
-       dest[0].kiov_offset = 592;
+       src[0].bv_offset = 317;
+       dest[0].bv_offset = 592;
        switch (caseno) {
        default:
                /* odd -> even */
                break;
        case 1:
                /* odd -> odd */
-               dest[0].kiov_offset -= 1;
+               dest[0].bv_offset -= 1;
                break;
        case 2:
                /* even -> even */
-               src[0].kiov_offset += 1;
+               src[0].bv_offset += 1;
                break;
        case 3:
                /* even -> odd */
-               src[0].kiov_offset += 1;
-               dest[0].kiov_offset -= 1;
+               src[0].bv_offset += 1;
+               dest[0].bv_offset -= 1;
        }
-       src[0].kiov_len = PAGE_SIZE - src[0].kiov_offset;
-       dest[0].kiov_len = PAGE_SIZE - dest[0].kiov_offset;
+       src[0].bv_len = PAGE_SIZE - src[0].bv_offset;
+       dest[0].bv_len = PAGE_SIZE - dest[0].bv_offset;
 
        for (i = 0; i < niov; i++) {
-               memset(page_address(src[i].kiov_page) + src[i].kiov_offset,
-                      0xf0 + i, src[i].kiov_len);
+               memset(page_address(src[i].bv_page) + src[i].bv_offset,
+                      0xf0 + i, src[i].bv_len);
        }
 
        lnet_copy_kiov2kiov(niov, dest, 0, niov, src, 0, nob);
@@ -117,8 +117,10 @@ _kgnilnd_proc_run_cksum_test(int caseno, int nloops, int nob)
        getnstimeofday(&begin);
 
        for (n = 0; n < nloops; n++) {
-               CDEBUG(D_BUFFS, "case %d loop %d src %d dest %d nob %d niov %d\n",
-                      caseno, n, src[0].kiov_offset, dest[0].kiov_offset, nob, niov);
+               CDEBUG(D_BUFFS,
+                      "case %d loop %d src %d dest %d nob %d niov %d\n",
+                      caseno, n, src[0].bv_offset, dest[0].bv_offset, nob,
+                      niov);
                cksum = kgnilnd_cksum_kiov(niov, src, 0, nob - (n % nob), 1);
                cksum2 = kgnilnd_cksum_kiov(niov, dest, 0, nob - (n % nob), 1);
 
@@ -141,18 +143,17 @@ _kgnilnd_proc_run_cksum_test(int caseno, int nloops, int nob)
 unwind:
        CDEBUG(D_NET, "freeing %d pages\n", i);
        for (i -= 1; i >= 0; i--) {
-               if (src[i].kiov_page != NULL) {
-                       __free_page(src[i].kiov_page);
-               }
-               if (dest[i].kiov_page != NULL) {
-                       __free_page(dest[i].kiov_page);
-               }
+               if (src[i].bv_page)
+                       __free_page(src[i].bv_page);
+
+               if (dest[i].bv_page)
+                       __free_page(dest[i].bv_page);
        }
 
        if (src != NULL)
-               LIBCFS_FREE(src, LNET_MAX_IOV * sizeof(lnet_kiov_t));
+               CFS_FREE_PTR_ARRAY(src, LNET_MAX_IOV);
        if (dest != NULL)
-               LIBCFS_FREE(dest, LNET_MAX_IOV * sizeof(lnet_kiov_t));
+               CFS_FREE_PTR_ARRAY(dest, LNET_MAX_IOV);
        return rc;
 }
 
@@ -234,8 +235,6 @@ kgnilnd_stats_seq_show(struct seq_file *sf, void *v)
                   "TX queued maps: %d\n"
                   "TX phys nmaps: %d\n"
                   "TX phys bytes: %lu\n"
-                  "TX virt nmaps: %d\n"
-                  "TX virt bytes: %llu\n"
                   "RDMAQ bytes_auth: %ld\n"
                   "RDMAQ bytes_left: %ld\n"
                   "RDMAQ nstalls: %d\n"
@@ -271,7 +270,6 @@ kgnilnd_stats_seq_show(struct seq_file *sf, void *v)
                   atomic64_read(&dev->gnd_nbytes_map),
                   atomic_read(&dev->gnd_nq_map),
                   dev->gnd_map_nphys, dev->gnd_map_physnop * PAGE_SIZE,
-                  dev->gnd_map_nvirt, dev->gnd_map_virtnob,
                   atomic64_read(&dev->gnd_rdmaq_bytes_out),
                   atomic64_read(&dev->gnd_rdmaq_bytes_ok),
                   atomic_read(&dev->gnd_rdmaq_nstalls),
@@ -1267,7 +1265,7 @@ kgnilnd_peer_seq_show(struct seq_file *s, void *iter)
 
        read_unlock(&kgnilnd_data.kgn_peer_conn_lock);
 
-       seq_printf(s, "%p->%s [%d] %s NIC 0x%x q %d conn %c purg %d last %d@%dms dgram %d@%dms reconn %dms to %lus \n",
+       seq_printf(s, "%p->%s [%d] %s NIC 0x%x q %d conn %c purg %d last %d@%lldms dgram %d@%dms reconn %dms to %lus \n",
                peer, libcfs_nid2str(peer->gnp_nid),
                atomic_read(&peer->gnp_refcount),
                (peer->gnp_state == GNILND_PEER_DOWN) ? "down" :
@@ -1277,7 +1275,7 @@ kgnilnd_peer_seq_show(struct seq_file *s, void *iter)
                conn_str,
                purg_count,
                peer->gnp_last_errno,
-               jiffies_to_msecs(jiffies - peer->gnp_last_alive),
+               (ktime_get_seconds() - peer->gnp_last_alive) * MSEC_PER_SEC,
                peer->gnp_last_dgram_errno,
                jiffies_to_msecs(jiffies - peer->gnp_last_dgram_time),
                peer->gnp_reconnect_interval != 0