*
* Copyright (c) 2004 Cluster File Systems, Inc.
*
- * This file is part of Lustre, http://www.lustre.org.
+ * This file is part of the Lustre file system, http://www.lustre.org
+ * Lustre is a trademark of Cluster File Systems, Inc.
*
- * Lustre is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * You may have signed or agreed to another license before downloading
+ * this software. If so, you are bound by the terms and conditions
+ * of that agreement, and the following does not apply to you. See the
+ * LICENSE file included with this distribution for more information.
*
- * Lustre 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 for more details.
+ * If you did not agree to a different license, then this copy of Lustre
+ * is open source software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
*
- * You should have received a copy of the GNU General Public License
- * along with Lustre; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * In either case, Lustre 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
+ * license text for more details.
*/
#define DEBUG_SUBSYSTEM S_RPC
#include <liblustre.h>
#endif
-#include <linux/obd_support.h>
-#include <linux/obd_class.h>
-#include <linux/lustre_lib.h>
-#include <linux/lustre_ha.h>
-#include <linux/lustre_import.h>
+#include <obd_support.h>
+#include <obd_class.h>
+#include <lustre_lib.h>
+#include <lustre_ha.h>
+#include <lustre_import.h>
#include "ptlrpc_internal.h"
#ifdef __KERNEL__
-#ifndef CRAY_PORTALS
-void pers_bulk_add_page(struct ptlrpc_bulk_desc *desc, struct page *page,
- int pageoffset, int len)
+
+void ptlrpc_fill_bulk_md (lnet_md_t *md, struct ptlrpc_bulk_desc *desc)
{
- ptl_kiov_t *kiov = &desc->bd_iov[desc->bd_iov_count];
+ 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->start = &desc->bd_iov[0];
+ md->length = desc->bd_iov_count;
+}
+
+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;
desc->bd_iov_count++;
}
-#else
-void pers_bulk_add_page(struct ptlrpc_bulk_desc *desc, struct page *page,
- int pageoffset, int len)
-{
- struct iovec *iov = &desc->bd_iov[desc->bd_iov_count];
- /* Should get a compiler warning if sizeof(physaddr) > sizeof(void *) */
- iov->iov_base = (void *)(page_to_phys(page) + pageoffset);
- iov->iov_len = len;
-
- 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_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);
+ }
}
-#endif
#else /* !__KERNEL__ */
-int can_merge_iovs(struct iovec *existing, struct iovec *candidate)
+void ptlrpc_fill_bulk_md(lnet_md_t *md, struct ptlrpc_bulk_desc *desc)
{
- if (existing->iov_base + existing->iov_len == candidate->iov_base)
+ 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 pers_bulk_add_page(struct ptlrpc_bulk_desc *desc, struct page *page,
- int pageoffset, int len)
+
+void ptlrpc_add_bulk_page(struct ptlrpc_bulk_desc *desc, cfs_page_t *page,
+ int pageoffset, int len)
{
- struct iovec *iov = &desc->bd_iov[desc->bd_iov_count];
+ lnet_md_iovec_t *iov = &desc->bd_iov[desc->bd_iov_count];
iov->iov_base = page->addr + pageoffset;
iov->iov_len = len;
desc->bd_iov_count++;
}
}
-#endif
+
+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__ */
git://git.whamcloud.com / fs / lustre-release.git / blobdiff