X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fptlrpc%2Fpers.c;h=5c78e1250a48c6d4a6b4f498a7438a3fcdd50d34;hp=bcbf0951d761db985c34d6ba62fc5655f7b18bfb;hb=c49ff6ff89725052a29aa91d780a881e7829dfa2;hpb=191061ee668400324f4505cf498f1ee2d57e4962 diff --git a/lustre/ptlrpc/pers.c b/lustre/ptlrpc/pers.c index bcbf095..5c78e12 100644 --- a/lustre/ptlrpc/pers.c +++ b/lustre/ptlrpc/pers.c @@ -1,22 +1,35 @@ -/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- - * vim:expandtab:shiftwidth=8:tabstop=8: +/* + * GPL HEADER START * - * Copyright (c) 2004 Cluster File Systems, Inc. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * This file is part of Lustre, http://www.lustre.org. + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 only, + * as published by the Free Software Foundation. * - * 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. + * This program 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 version 2 for more details (a copy is included + * in the LICENSE file that accompanied this code). * - * 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. + * You should have received a copy of the GNU General Public License + * version 2 along with this program; If not, see + * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf * - * 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. + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + * + * GPL HEADER END + */ +/* + * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. + * Use is subject to license terms. + */ +/* + * This file is part of Lustre, http://www.lustre.org/ + * Lustre is a trademark of Sun Microsystems, Inc. */ #define DEBUG_SUBSYSTEM S_RPC @@ -26,30 +39,33 @@ #include #endif -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "ptlrpc_internal.h" #ifdef __KERNEL__ -#ifndef CRAY_PORTALS -void ptlrpc_fill_bulk_md (ptl_md_t *md, struct ptlrpc_bulk_desc *desc) + +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 & (PTL_MD_IOVEC | PTL_MD_KIOV | PTL_MD_PHYS))); + LASSERT (!(md->options & (LNET_MD_IOVEC | LNET_MD_KIOV | LNET_MD_PHYS))); - md->options |= PTL_MD_KIOV; - md->start = &desc->bd_iov[0]; + 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, struct page *page, +void ptlrpc_add_bulk_page(struct ptlrpc_bulk_desc *desc, cfs_page_t *page, int pageoffset, int len) { - ptl_kiov_t *kiov = &desc->bd_iov[desc->bd_iov_count]; + lnet_kiov_t *kiov = &desc->bd_iov[desc->bd_iov_count]; kiov->kiov_page = page; kiov->kiov_offset = pageoffset; @@ -57,68 +73,40 @@ void ptlrpc_add_bulk_page(struct ptlrpc_bulk_desc *desc, struct page *page, desc->bd_iov_count++; } -#else -void ptlrpc_fill_bulk_md (ptl_md_t *md, struct ptlrpc_bulk_desc *desc) -{ - LASSERT (desc->bd_iov_count <= PTLRPC_MAX_BRW_PAGES); - LASSERT (!(md->options & (PTL_MD_IOVEC | PTL_MD_KIOV | PTL_MD_PHYS))); - - md->options |= (PTL_MD_IOVEC | PTL_MD_PHYS); - md->start = &desc->bd_iov[0]; - md->length = desc->bd_iov_count; -} - -void ptlrpc_add_bulk_page(struct ptlrpc_bulk_desc *desc, struct page *page, - int pageoffset, int len) -{ - ptl_md_iovec_t *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++; -} -#endif #else /* !__KERNEL__ */ -void ptlrpc_fill_bulk_md(ptl_md_t *md, struct ptlrpc_bulk_desc *desc) -{ - LASSERT (!(md->options & (PTL_MD_IOVEC | PTL_MD_KIOV | PTL_MD_PHYS))); +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; } - -#if CRAY_PORTALS - LBUG(); -#endif - md->options |= PTL_MD_IOVEC; + + md->options |= LNET_MD_IOVEC; md->start = &desc->bd_iov[0]; md->length = desc->bd_iov_count; } -static int can_merge_iovs(ptl_md_iovec_t *existing, ptl_md_iovec_t *candidate) +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) + if (existing->iov_base + existing->iov_len == candidate->iov_base) return 1; - /* XXX it's good to have an warning here, but user-level echo_client - * will hit this. reenable it when we fixed echo_client. - */ #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 +#endif return 0; } -void ptlrpc_add_bulk_page(struct ptlrpc_bulk_desc *desc, struct page *page, +void ptlrpc_add_bulk_page(struct ptlrpc_bulk_desc *desc, cfs_page_t *page, int pageoffset, int len) { - ptl_md_iovec_t *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; @@ -129,4 +117,5 @@ void ptlrpc_add_bulk_page(struct ptlrpc_bulk_desc *desc, struct page *page, desc->bd_iov_count++; } } -#endif + +#endif /* !__KERNEL__ */