X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fptlrpc%2Fpers.c;h=7b27b77d254729a254765b71bbfdf9518eefa574;hb=676c2fe47c8de0825db3001f1e964347be3dc479;hp=865dcf001ca0ba353e38f476fbdd282c5da1e234;hpb=113303973ec9f8484eb2355a1a6ef3c4c7fd6a56;p=fs%2Flustre-release.git diff --git a/lustre/ptlrpc/pers.c b/lustre/ptlrpc/pers.c index 865dcf0..7b27b77 100644 --- a/lustre/ptlrpc/pers.c +++ b/lustre/ptlrpc/pers.c @@ -1,33 +1,40 @@ -/* -*- 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 the Lustre file system, http://www.lustre.org - * Lustre is a trademark of Cluster File Systems, Inc. + * 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. * - * 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. + * 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). * - * 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 + * version 2 along with this program; If not, see + * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf * - * 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. + * 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. + * + * Copyright (c) 2014, 2015, Intel Corporation. + */ +/* + * This file is part of Lustre, http://www.lustre.org/ + * Lustre is a trademark of Sun Microsystems, Inc. */ #define DEBUG_SUBSYSTEM S_RPC -#ifndef __KERNEL__ -#include -#include -#include -#endif #include #include @@ -37,94 +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->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; - kiov->kiov_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); - } -} - -#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) +void ptlrpc_fill_bulk_md(lnet_md_t *md, struct ptlrpc_bulk_desc *desc, + int mdidx) { - 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++; - } + 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); + } } -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__ */