X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=lustre%2Fptlrpc%2Fpers.c;h=7b27b77d254729a254765b71bbfdf9518eefa574;hb=6765d78583a7b144810e63ce8aa1c05d27cb8189;hp=1b5f1edb123e111aa194cb8fb28d4881d67ff2de;hpb=744f32ac9efb1e2f2837992703c5a5e35f261e60;p=fs%2Flustre-release.git

diff --git a/lustre/ptlrpc/pers.c b/lustre/ptlrpc/pers.c
index 1b5f1ed..7b27b77 100644
--- a/lustre/ptlrpc/pers.c
+++ b/lustre/ptlrpc/pers.c
@@ -1,6 +1,4 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -26,8 +24,10 @@
  * GPL HEADER END
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2014, 2015, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -35,11 +35,6 @@
  */
 
 #define DEBUG_SUBSYSTEM S_RPC
-#ifndef __KERNEL__
-#include <errno.h>
-#include <signal.h>
-#include <liblustre.h>
-#endif
 
 #include <obd_support.h>
 #include <obd_class.h>
@@ -49,97 +44,35 @@
 
 #include "ptlrpc_internal.h"
 
-#ifdef __KERNEL__
-
-void ptlrpc_fill_bulk_md (lnet_md_t *md, struct ptlrpc_bulk_desc *desc)
-{
-        LASSERT (desc->bd_iov_count <= PTLRPC_MAX_BRW_PAGES);
-        LASSERT (!(md->options & (LNET_MD_IOVEC | LNET_MD_KIOV | LNET_MD_PHYS)));
-
-        md->options |= LNET_MD_KIOV;
-        md->length = desc->bd_iov_count;
-        if (desc->bd_enc_iov)
-                md->start = desc->bd_enc_iov;
-        else
-                md->start = desc->bd_iov;
-}
-
-void ptlrpc_add_bulk_page(struct ptlrpc_bulk_desc *desc, cfs_page_t *page,
-                          int pageoffset, int len)
-{
-        lnet_kiov_t *kiov = &desc->bd_iov[desc->bd_iov_count];
-
-        kiov->kiov_page = page;
-        kiov->kiov_offset = pageoffset;
-        kiov->kiov_len = len;
 
-        desc->bd_iov_count++;
-}
-
-void ptl_rpc_wipe_bulk_pages(struct ptlrpc_bulk_desc *desc)
+void ptlrpc_fill_bulk_md(lnet_md_t *md, struct ptlrpc_bulk_desc *desc,
+			 int mdidx)
 {
-        int i;
-        
-        for (i = 0; i < desc->bd_iov_count ; i++) {
-                lnet_kiov_t *kiov = &desc->bd_iov[i];
-                memset(cfs_kmap(kiov->kiov_page)+kiov->kiov_offset, 0xab,
-                       kiov->kiov_len);
-                cfs_kunmap(kiov->kiov_page);
-        }
+	CLASSERT(PTLRPC_MAX_BRW_PAGES < LI_POISON);
+
+	LASSERT(mdidx < desc->bd_md_max_brw);
+	LASSERT(desc->bd_iov_count <= PTLRPC_MAX_BRW_PAGES);
+	LASSERT(!(md->options & (LNET_MD_IOVEC | LNET_MD_KIOV |
+				 LNET_MD_PHYS)));
+
+	md->length = max(0, desc->bd_iov_count - mdidx * LNET_MAX_IOV);
+	md->length = min_t(unsigned int, LNET_MAX_IOV, md->length);
+
+	if (ptlrpc_is_bulk_desc_kiov(desc->bd_type)) {
+		md->options |= LNET_MD_KIOV;
+		if (GET_ENC_KIOV(desc))
+			md->start = &BD_GET_ENC_KIOV(desc, mdidx *
+						     LNET_MAX_IOV);
+		else
+			md->start = &BD_GET_KIOV(desc, mdidx * LNET_MAX_IOV);
+	} else if (ptlrpc_is_bulk_desc_kvec(desc->bd_type)) {
+		md->options |= LNET_MD_IOVEC;
+		if (GET_ENC_KVEC(desc))
+			md->start = &BD_GET_ENC_KVEC(desc, mdidx *
+						      LNET_MAX_IOV);
+		else
+			md->start = &BD_GET_KVEC(desc, mdidx * LNET_MAX_IOV);
+	}
 }
 
-#else /* !__KERNEL__ */
 
-void ptlrpc_fill_bulk_md(lnet_md_t *md, struct ptlrpc_bulk_desc *desc)
-{
-        LASSERT (!(md->options & (LNET_MD_IOVEC | LNET_MD_KIOV | LNET_MD_PHYS)));
-        if (desc->bd_iov_count == 1) {
-                md->start = desc->bd_iov[0].iov_base;
-                md->length = desc->bd_iov[0].iov_len;
-                return;
-        }
-        
-        md->options |= LNET_MD_IOVEC;
-        md->start = &desc->bd_iov[0];
-        md->length = desc->bd_iov_count;
-}
-
-static int can_merge_iovs(lnet_md_iovec_t *existing, lnet_md_iovec_t *candidate)
-{
-        if (existing->iov_base + existing->iov_len == candidate->iov_base) 
-                return 1;
-#if 0
-        /* Enable this section to provide earlier evidence of fragmented bulk */
-        CERROR("Can't merge iovs %p for %x, %p for %x\n",
-               existing->iov_base, existing->iov_len,
-               candidate->iov_base, candidate->iov_len);
-#endif
-        return 0;
-}
-
-void ptlrpc_add_bulk_page(struct ptlrpc_bulk_desc *desc, cfs_page_t *page, 
-                          int pageoffset, int len)
-{
-        lnet_md_iovec_t *iov = &desc->bd_iov[desc->bd_iov_count];
-
-        iov->iov_base = page->addr + pageoffset;
-        iov->iov_len = len;
-
-        if (desc->bd_iov_count > 0 && can_merge_iovs(iov - 1, iov)) {
-                (iov - 1)->iov_len += len;
-        } else {
-                desc->bd_iov_count++;
-        }
-}
-
-void ptl_rpc_wipe_bulk_pages(struct ptlrpc_bulk_desc *desc)
-{
-        int i;
-
-        for(i = 0; i < desc->bd_iov_count; i++) {
-                lnet_md_iovec_t *iov = &desc->bd_iov[i];
-
-                memset(iov->iov_base, 0xab, iov->iov_len);
-        }
-}
-#endif /* !__KERNEL__ */