X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lnet%2Fklnds%2Fo2iblnd%2Fo2iblnd_modparams.c;h=27a6112e91ae2714bee16da8e54d4f72078bfcaa;hp=35bb265c7d7c68b9ee54434c7f2e1e1d8680e96a;hb=2a3233ea1234082ebce188026eb8a4d2f1811f0c;hpb=681cd2f094b0da8aa630be667a1553268dfe0bf0 diff --git a/lnet/klnds/o2iblnd/o2iblnd_modparams.c b/lnet/klnds/o2iblnd/o2iblnd_modparams.c index 35bb265..27a6112 100644 --- a/lnet/klnds/o2iblnd/o2iblnd_modparams.c +++ b/lnet/klnds/o2iblnd/o2iblnd_modparams.c @@ -1,24 +1,41 @@ /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- * vim:expandtab:shiftwidth=8:tabstop=8: * - * Copyright (C) 2006 Cluster File Systems, Inc. - * Author: Eric Barton + * GPL HEADER START * - * This file is part of Lustre, http://www.lustre.org. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * 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 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 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. + * 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). * - * 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. + * 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 * + * 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 2008 Sun Microsystems, Inc. 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. + * + * lnet/klnds/o2iblnd/o2iblnd_modparams.c + * + * Author: Eric Barton */ #include "o2iblnd.h" @@ -47,6 +64,18 @@ static int peer_credits = 8; CFS_MODULE_PARM(peer_credits, "i", int, 0444, "# concurrent sends to 1 peer"); +static int peer_credits_hiw = 0; +CFS_MODULE_PARM(peer_credits_hiw, "i", int, 0444, + "when eagerly to return credits"); + +static int peer_buffer_credits = 0; +CFS_MODULE_PARM(peer_buffer_credits, "i", int, 0444, + "# per-peer router buffer credits"); + +static int peer_timeout = 180; +CFS_MODULE_PARM(peer_timeout, "i", int, 0444, + "Seconds without aliveness news to declare peer dead (<=0 to disable)"); + static char *ipif_name = "ib0"; CFS_MODULE_PARM(ipif_name, "s", charp, 0444, "IPoIB interface name"); @@ -67,18 +96,17 @@ static int ib_mtu = 0; CFS_MODULE_PARM(ib_mtu, "i", int, 0444, "IB MTU 256/512/1024/2048/4096"); -#if IBLND_MAP_ON_DEMAND -static int concurrent_sends = IBLND_RX_MSGS; -#else -static int concurrent_sends = IBLND_MSG_QUEUE_SIZE; -#endif +static int concurrent_sends = 0; CFS_MODULE_PARM(concurrent_sends, "i", int, 0444, "send work-queue sizing"); -#if IBLND_MAP_ON_DEMAND +static int map_on_demand = 0; +CFS_MODULE_PARM(map_on_demand, "i", int, 0444, + "map on demand"); + static int fmr_pool_size = 512; CFS_MODULE_PARM(fmr_pool_size, "i", int, 0444, - "size of the fmr pool (>= ntx)"); + "size of the fmr pool (>= ntx / 4)"); static int fmr_flush_trigger = 384; CFS_MODULE_PARM(fmr_flush_trigger, "i", int, 0444, @@ -87,7 +115,10 @@ CFS_MODULE_PARM(fmr_flush_trigger, "i", int, 0444, static int fmr_cache = 1; CFS_MODULE_PARM(fmr_cache, "i", int, 0444, "non-zero to enable FMR caching"); -#endif + +static int pmr_pool_size = 512; +CFS_MODULE_PARM(pmr_pool_size, "i", int, 0444, + "size of the MR cache pmr pool"); kib_tunables_t kiblnd_tunables = { .kib_service = &service, @@ -96,26 +127,78 @@ kib_tunables_t kiblnd_tunables = { .kib_keepalive = &keepalive, .kib_ntx = &ntx, .kib_credits = &credits, - .kib_peercredits = &peer_credits, + .kib_peertxcredits = &peer_credits, + .kib_peercredits_hiw = &peer_credits_hiw, + .kib_peerrtrcredits = &peer_buffer_credits, + .kib_peertimeout = &peer_timeout, .kib_default_ipif = &ipif_name, .kib_retry_count = &retry_count, .kib_rnr_retry_count = &rnr_retry_count, .kib_concurrent_sends = &concurrent_sends, .kib_ib_mtu = &ib_mtu, -#if IBLND_MAP_ON_DEMAND + .kib_map_on_demand = &map_on_demand, .kib_fmr_pool_size = &fmr_pool_size, .kib_fmr_flush_trigger = &fmr_flush_trigger, .kib_fmr_cache = &fmr_cache, -#endif + .kib_pmr_pool_size = &pmr_pool_size, }; -#if CONFIG_SYSCTL && !CFS_SYSFS_MODULE_PARM +#if defined(CONFIG_SYSCTL) && !CFS_SYSFS_MODULE_PARM static char ipif_basename_space[32]; +#ifndef HAVE_SYSCTL_UNNUMBERED + +enum { + O2IBLND_SERVICE = 1, + O2IBLND_CKSUM, + O2IBLND_TIMEOUT, + O2IBLND_NTX, + O2IBLND_CREDITS, + O2IBLND_PEER_TXCREDITS, + O2IBLND_PEER_CREDITS_HIW, + O2IBLND_PEER_RTRCREDITS, + O2IBLND_PEER_TIMEOUT, + O2IBLND_IPIF_BASENAME, + O2IBLND_RETRY_COUNT, + O2IBLND_RNR_RETRY_COUNT, + O2IBLND_KEEPALIVE, + O2IBLND_CONCURRENT_SENDS, + O2IBLND_IB_MTU, + O2IBLND_MAP_ON_DEMAND, + O2IBLND_FMR_POOL_SIZE, + O2IBLND_FMR_FLUSH_TRIGGER, + O2IBLND_FMR_CACHE, + O2IBLND_PMR_POOL_SIZE +}; +#else + +#define O2IBLND_SERVICE CTL_UNNUMBERED +#define O2IBLND_CKSUM CTL_UNNUMBERED +#define O2IBLND_TIMEOUT CTL_UNNUMBERED +#define O2IBLND_NTX CTL_UNNUMBERED +#define O2IBLND_CREDITS CTL_UNNUMBERED +#define O2IBLND_PEER_TXCREDITS CTL_UNNUMBERED +#define O2IBLND_PEER_CREDITS_HIW CTL_UNNUMBERED +#define O2IBLND_PEER_RTRCREDITS CTL_UNNUMBERED +#define O2IBLND_PEER_TIMEOUT CTL_UNNUMBERED +#define O2IBLND_IPIF_BASENAME CTL_UNNUMBERED +#define O2IBLND_RETRY_COUNT CTL_UNNUMBERED +#define O2IBLND_RNR_RETRY_COUNT CTL_UNNUMBERED +#define O2IBLND_KEEPALIVE CTL_UNNUMBERED +#define O2IBLND_CONCURRENT_SENDS CTL_UNNUMBERED +#define O2IBLND_IB_MTU CTL_UNNUMBERED +#define O2IBLND_MAP_ON_DEMAND CTL_UNNUMBERED +#define O2IBLND_FMR_POOL_SIZE CTL_UNNUMBERED +#define O2IBLND_FMR_FLUSH_TRIGGER CTL_UNNUMBERED +#define O2IBLND_FMR_CACHE CTL_UNNUMBERED +#define O2IBLND_PMR_POOL_SIZE CTL_UNNUMBERED + +#endif + static cfs_sysctl_table_t kiblnd_ctl_table[] = { { - .ctl_name = 1, + .ctl_name = O2IBLND_SERVICE, .procname = "service", .data = &service, .maxlen = sizeof(int), @@ -123,7 +206,7 @@ static cfs_sysctl_table_t kiblnd_ctl_table[] = { .proc_handler = &proc_dointvec }, { - .ctl_name = 2, + .ctl_name = O2IBLND_CKSUM, .procname = "cksum", .data = &cksum, .maxlen = sizeof(int), @@ -131,7 +214,7 @@ static cfs_sysctl_table_t kiblnd_ctl_table[] = { .proc_handler = &proc_dointvec }, { - .ctl_name = 3, + .ctl_name = O2IBLND_TIMEOUT, .procname = "timeout", .data = &timeout, .maxlen = sizeof(int), @@ -139,7 +222,7 @@ static cfs_sysctl_table_t kiblnd_ctl_table[] = { .proc_handler = &proc_dointvec }, { - .ctl_name = 4, + .ctl_name = O2IBLND_NTX, .procname = "ntx", .data = &ntx, .maxlen = sizeof(int), @@ -147,7 +230,7 @@ static cfs_sysctl_table_t kiblnd_ctl_table[] = { .proc_handler = &proc_dointvec }, { - .ctl_name = 5, + .ctl_name = O2IBLND_CREDITS, .procname = "credits", .data = &credits, .maxlen = sizeof(int), @@ -155,7 +238,7 @@ static cfs_sysctl_table_t kiblnd_ctl_table[] = { .proc_handler = &proc_dointvec }, { - .ctl_name = 6, + .ctl_name = O2IBLND_PEER_TXCREDITS, .procname = "peer_credits", .data = &peer_credits, .maxlen = sizeof(int), @@ -163,7 +246,31 @@ static cfs_sysctl_table_t kiblnd_ctl_table[] = { .proc_handler = &proc_dointvec }, { - .ctl_name = 7, + .ctl_name = O2IBLND_PEER_CREDITS_HIW, + .procname = "peer_credits_hiw", + .data = &peer_credits_hiw, + .maxlen = sizeof(int), + .mode = 0444, + .proc_handler = &proc_dointvec + }, + { + .ctl_name = O2IBLND_PEER_RTRCREDITS, + .procname = "peer_buffer_credits", + .data = &peer_buffer_credits, + .maxlen = sizeof(int), + .mode = 0444, + .proc_handler = &proc_dointvec + }, + { + .ctl_name = O2IBLND_PEER_TIMEOUT, + .procname = "peer_timeout", + .data = &peer_timeout, + .maxlen = sizeof(int), + .mode = 0444, + .proc_handler = &proc_dointvec + }, + { + .ctl_name = O2IBLND_IPIF_BASENAME, .procname = "ipif_name", .data = ipif_basename_space, .maxlen = sizeof(ipif_basename_space), @@ -171,7 +278,7 @@ static cfs_sysctl_table_t kiblnd_ctl_table[] = { .proc_handler = &proc_dostring }, { - .ctl_name = 8, + .ctl_name = O2IBLND_RETRY_COUNT, .procname = "retry_count", .data = &retry_count, .maxlen = sizeof(int), @@ -179,7 +286,7 @@ static cfs_sysctl_table_t kiblnd_ctl_table[] = { .proc_handler = &proc_dointvec }, { - .ctl_name = 9, + .ctl_name = O2IBLND_RNR_RETRY_COUNT, .procname = "rnr_retry_count", .data = &rnr_retry_count, .maxlen = sizeof(int), @@ -187,7 +294,7 @@ static cfs_sysctl_table_t kiblnd_ctl_table[] = { .proc_handler = &proc_dointvec }, { - .ctl_name = 10, + .ctl_name = O2IBLND_KEEPALIVE, .procname = "keepalive", .data = &keepalive, .maxlen = sizeof(int), @@ -195,24 +302,32 @@ static cfs_sysctl_table_t kiblnd_ctl_table[] = { .proc_handler = &proc_dointvec }, { - .ctl_name = 11, + .ctl_name = O2IBLND_CONCURRENT_SENDS, .procname = "concurrent_sends", .data = &concurrent_sends, .maxlen = sizeof(int), - .mode = 0644, + .mode = 0444, .proc_handler = &proc_dointvec }, { - .ctl_name = 12, + .ctl_name = O2IBLND_IB_MTU, .procname = "ib_mtu", .data = &ib_mtu, .maxlen = sizeof(int), .mode = 0444, .proc_handler = &proc_dointvec }, -#if IBLND_MAP_ON_DEMAND { - .ctl_name = 13, + .ctl_name = O2IBLND_MAP_ON_DEMAND, + .procname = "map_on_demand", + .data = &map_on_demand, + .maxlen = sizeof(int), + .mode = 0444, + .proc_handler = &proc_dointvec + }, + + { + .ctl_name = O2IBLND_FMR_POOL_SIZE, .procname = "fmr_pool_size", .data = &fmr_pool_size, .maxlen = sizeof(int), @@ -220,7 +335,7 @@ static cfs_sysctl_table_t kiblnd_ctl_table[] = { .proc_handler = &proc_dointvec }, { - .ctl_name = 14, + .ctl_name = O2IBLND_FMR_FLUSH_TRIGGER, .procname = "fmr_flush_trigger", .data = &fmr_flush_trigger, .maxlen = sizeof(int), @@ -228,20 +343,27 @@ static cfs_sysctl_table_t kiblnd_ctl_table[] = { .proc_handler = &proc_dointvec }, { - .ctl_name = 15, + .ctl_name = O2IBLND_FMR_CACHE, .procname = "fmr_cache", .data = &fmr_cache, .maxlen = sizeof(int), .mode = 0444, .proc_handler = &proc_dointvec }, -#endif + { + .ctl_name = O2IBLND_PMR_POOL_SIZE, + .procname = "pmr_pool_size", + .data = &pmr_pool_size, + .maxlen = sizeof(int), + .mode = 0444, + .proc_handler = &proc_dointvec + }, {0} }; static cfs_sysctl_table_t kiblnd_top_ctl_table[] = { { - .ctl_name = 203, + .ctl_name = CTL_O2IBLND, .procname = "o2iblnd", .data = NULL, .maxlen = 0, @@ -295,13 +417,55 @@ kiblnd_sysctl_fini (void) int kiblnd_tunables_init (void) { - kiblnd_sysctl_init(); + if (kiblnd_translate_mtu(*kiblnd_tunables.kib_ib_mtu) < 0) { + CERROR("Invalid ib_mtu %d, expected 256/512/1024/2048/4096\n", + *kiblnd_tunables.kib_ib_mtu); + return -EINVAL; + } + + if (*kiblnd_tunables.kib_peertxcredits < IBLND_CREDITS_DEFAULT) + *kiblnd_tunables.kib_peertxcredits = IBLND_CREDITS_DEFAULT; + + if (*kiblnd_tunables.kib_peertxcredits > IBLND_CREDITS_MAX) + *kiblnd_tunables.kib_peertxcredits = IBLND_CREDITS_MAX; + + if (*kiblnd_tunables.kib_peertxcredits > *kiblnd_tunables.kib_credits) + *kiblnd_tunables.kib_peertxcredits = *kiblnd_tunables.kib_credits; + + if (*kiblnd_tunables.kib_peercredits_hiw < *kiblnd_tunables.kib_peertxcredits / 2) + *kiblnd_tunables.kib_peercredits_hiw = *kiblnd_tunables.kib_peertxcredits / 2; + + if (*kiblnd_tunables.kib_peercredits_hiw >= *kiblnd_tunables.kib_peertxcredits) + *kiblnd_tunables.kib_peercredits_hiw = *kiblnd_tunables.kib_peertxcredits - 1; + + if (*kiblnd_tunables.kib_map_on_demand < 0 || + *kiblnd_tunables.kib_map_on_demand > IBLND_MAX_RDMA_FRAGS) + *kiblnd_tunables.kib_map_on_demand = 0; /* disable map-on-demand */ - if (*kiblnd_tunables.kib_concurrent_sends > IBLND_RX_MSGS) - *kiblnd_tunables.kib_concurrent_sends = IBLND_RX_MSGS; - if (*kiblnd_tunables.kib_concurrent_sends < IBLND_MSG_QUEUE_SIZE) - *kiblnd_tunables.kib_concurrent_sends = IBLND_MSG_QUEUE_SIZE; + if (*kiblnd_tunables.kib_map_on_demand == 1) + *kiblnd_tunables.kib_map_on_demand = 2; /* don't make sense to create map if only one fragment */ + if (*kiblnd_tunables.kib_concurrent_sends == 0) { + if (*kiblnd_tunables.kib_map_on_demand > 0 && + *kiblnd_tunables.kib_map_on_demand <= IBLND_MAX_RDMA_FRAGS / 8) + *kiblnd_tunables.kib_concurrent_sends = (*kiblnd_tunables.kib_peertxcredits) * 2; + else + *kiblnd_tunables.kib_concurrent_sends = (*kiblnd_tunables.kib_peertxcredits); + } + + if (*kiblnd_tunables.kib_concurrent_sends > *kiblnd_tunables.kib_peertxcredits * 2) + *kiblnd_tunables.kib_concurrent_sends = *kiblnd_tunables.kib_peertxcredits * 2; + + if (*kiblnd_tunables.kib_concurrent_sends < *kiblnd_tunables.kib_peertxcredits / 2) + *kiblnd_tunables.kib_concurrent_sends = *kiblnd_tunables.kib_peertxcredits / 2; + + if (*kiblnd_tunables.kib_concurrent_sends < *kiblnd_tunables.kib_peertxcredits) { + CWARN("Concurrent sends %d is lower than message queue size: %d, " + "performance may drop slightly.\n", + *kiblnd_tunables.kib_concurrent_sends, *kiblnd_tunables.kib_peertxcredits); + } + + kiblnd_sysctl_init(); return 0; } @@ -310,6 +474,3 @@ kiblnd_tunables_fini (void) { kiblnd_sysctl_fini(); } - - -