X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Flov%2Flov_pool.c;h=a8d3f18615d74e507a771b06deb0983390b21981;hb=7107e54983b0a701c5c02a1e3c521302e8f79810;hp=bf125216b5fb32fd9e35ba75f7522c32b64746d3;hpb=4a2abc926bf7408bbdd13fc0d99dc8abd54d8e37;p=fs%2Flustre-release.git diff --git a/lustre/lov/lov_pool.c b/lustre/lov/lov_pool.c index bf12521..a8d3f18 100644 --- a/lustre/lov/lov_pool.c +++ b/lustre/lov/lov_pool.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. @@ -16,18 +14,16 @@ * in the LICENSE file that accompanied this code). * * You should have received a copy of the GNU General Public License - * version 2 along with this program; If not, see [sun.com URL with a - * copy of GPLv2]. - * - * 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. + * version 2 along with this program; If not, see + * http://www.gnu.org/licenses/gpl-2.0.html * * GPL HEADER END */ /* * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. + * + * Copyright (c) 2012, 2014, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -44,41 +40,39 @@ #define DEBUG_SUBSYSTEM S_LOV -#ifdef __KERNEL__ #include -#else -#include -#endif #include #include "lov_internal.h" +#define pool_tgt(_p, _i) \ + _p->pool_lobd->u.lov.lov_tgts[_p->pool_obds.op_array[_i]] + static void lov_pool_getref(struct pool_desc *pool) { - CDEBUG(D_INFO, "pool %p\n", pool); - cfs_atomic_inc(&pool->pool_refcount); + CDEBUG(D_INFO, "pool %p\n", pool); + atomic_inc(&pool->pool_refcount); } -void lov_pool_putref(struct pool_desc *pool) +static void lov_pool_putref(struct pool_desc *pool) { - CDEBUG(D_INFO, "pool %p\n", pool); - if (cfs_atomic_dec_and_test(&pool->pool_refcount)) { - LASSERT(cfs_hlist_unhashed(&pool->pool_hash)); - LASSERT(cfs_list_empty(&pool->pool_list)); - LASSERT(pool->pool_proc_entry == NULL); - lov_ost_pool_free(&(pool->pool_rr.lqr_pool)); - lov_ost_pool_free(&(pool->pool_obds)); - OBD_FREE_PTR(pool); - EXIT; - } + CDEBUG(D_INFO, "pool %p\n", pool); + if (atomic_dec_and_test(&pool->pool_refcount)) { + LASSERT(hlist_unhashed(&pool->pool_hash)); + LASSERT(list_empty(&pool->pool_list)); + LASSERT(pool->pool_proc_entry == NULL); + lov_ost_pool_free(&(pool->pool_obds)); + OBD_FREE_PTR(pool); + EXIT; + } } -void lov_pool_putref_locked(struct pool_desc *pool) +static void lov_pool_putref_locked(struct pool_desc *pool) { - CDEBUG(D_INFO, "pool %p\n", pool); - LASSERT(cfs_atomic_read(&pool->pool_refcount) > 1); + CDEBUG(D_INFO, "pool %p\n", pool); + LASSERT(atomic_read(&pool->pool_refcount) > 1); - cfs_atomic_dec(&pool->pool_refcount); + atomic_dec(&pool->pool_refcount); } /* @@ -88,7 +82,8 @@ void lov_pool_putref_locked(struct pool_desc *pool) * Chapter 6.4. * Addison Wesley, 1973 */ -static __u32 pool_hashfn(cfs_hash_t *hash_body, void *key, unsigned mask) +static __u32 pool_hashfn(struct cfs_hash *hash_body, const void *key, + unsigned mask) { int i; __u32 result; @@ -104,47 +99,48 @@ static __u32 pool_hashfn(cfs_hash_t *hash_body, void *key, unsigned mask) return (result % mask); } -static void *pool_key(cfs_hlist_node_t *hnode) +static void *pool_key(struct hlist_node *hnode) { struct pool_desc *pool; - pool = cfs_hlist_entry(hnode, struct pool_desc, pool_hash); + pool = hlist_entry(hnode, struct pool_desc, pool_hash); return (pool->pool_name); } -static int pool_hashkey_keycmp(void *key, cfs_hlist_node_t *compared_hnode) +static int +pool_hashkey_keycmp(const void *key, struct hlist_node *compared_hnode) { char *pool_name; struct pool_desc *pool; pool_name = (char *)key; - pool = cfs_hlist_entry(compared_hnode, struct pool_desc, pool_hash); + pool = hlist_entry(compared_hnode, struct pool_desc, pool_hash); return !strncmp(pool_name, pool->pool_name, LOV_MAXPOOLNAME); } -static void *pool_hashobject(cfs_hlist_node_t *hnode) +static void *pool_hashobject(struct hlist_node *hnode) { - return cfs_hlist_entry(hnode, struct pool_desc, pool_hash); + return hlist_entry(hnode, struct pool_desc, pool_hash); } -static void pool_hashrefcount_get(cfs_hash_t *hs, cfs_hlist_node_t *hnode) +static void pool_hashrefcount_get(struct cfs_hash *hs, struct hlist_node *hnode) { struct pool_desc *pool; - pool = cfs_hlist_entry(hnode, struct pool_desc, pool_hash); + pool = hlist_entry(hnode, struct pool_desc, pool_hash); lov_pool_getref(pool); } -static void pool_hashrefcount_put_locked(cfs_hash_t *hs, - cfs_hlist_node_t *hnode) +static void pool_hashrefcount_put_locked(struct cfs_hash *hs, + struct hlist_node *hnode) { struct pool_desc *pool; - pool = cfs_hlist_entry(hnode, struct pool_desc, pool_hash); + pool = hlist_entry(hnode, struct pool_desc, pool_hash); lov_pool_putref_locked(pool); } -cfs_hash_ops_t pool_hash_operations = { +struct cfs_hash_ops pool_hash_operations = { .hs_hash = pool_hashfn, .hs_key = pool_key, .hs_keycmp = pool_hashkey_keycmp, @@ -154,7 +150,7 @@ cfs_hash_ops_t pool_hash_operations = { }; -#ifdef LPROCFS +#ifdef CONFIG_PROC_FS /* ifdef needed for liblustre support */ /* * pool /proc seq_file methods @@ -177,7 +173,7 @@ static void *pool_proc_next(struct seq_file *s, void *v, loff_t *pos) struct pool_iterator *iter = (struct pool_iterator *)s->private; int prev_idx; - LASSERTF(iter->magic == POOL_IT_MAGIC, "%08X", iter->magic); + LASSERTF(iter->magic == POOL_IT_MAGIC, "%08X\n", iter->magic); /* test if end of file */ if (*pos >= pool_tgt_count(iter->pool)) @@ -185,14 +181,14 @@ static void *pool_proc_next(struct seq_file *s, void *v, loff_t *pos) /* iterate to find a non empty entry */ prev_idx = iter->idx; - cfs_down_read(&pool_tgt_rw_sem(iter->pool)); + down_read(&pool_tgt_rw_sem(iter->pool)); iter->idx++; if (iter->idx == pool_tgt_count(iter->pool)) { iter->idx = prev_idx; /* we stay on the last entry */ - cfs_up_read(&pool_tgt_rw_sem(iter->pool)); + up_read(&pool_tgt_rw_sem(iter->pool)); return NULL; } - cfs_up_read(&pool_tgt_rw_sem(iter->pool)); + up_read(&pool_tgt_rw_sem(iter->pool)); (*pos)++; /* return != NULL to continue */ return iter; @@ -258,13 +254,13 @@ static int pool_proc_show(struct seq_file *s, void *v) struct pool_iterator *iter = (struct pool_iterator *)v; struct lov_tgt_desc *tgt; - LASSERTF(iter->magic == POOL_IT_MAGIC, "%08X", iter->magic); - LASSERT(iter->pool != NULL); - LASSERT(iter->idx <= pool_tgt_count(iter->pool)); + LASSERTF(iter->magic == POOL_IT_MAGIC, "%08X\n", iter->magic); + LASSERT(iter->pool != NULL); + LASSERT(iter->idx <= pool_tgt_count(iter->pool)); - cfs_down_read(&pool_tgt_rw_sem(iter->pool)); + down_read(&pool_tgt_rw_sem(iter->pool)); tgt = pool_tgt(iter->pool, iter->idx); - cfs_up_read(&pool_tgt_rw_sem(iter->pool)); + up_read(&pool_tgt_rw_sem(iter->pool)); if (tgt) seq_printf(s, "%s\n", obd_uuid2str(&(tgt->ltd_uuid))); @@ -285,7 +281,7 @@ static int pool_proc_open(struct inode *inode, struct file *file) rc = seq_open(file, &pool_proc_ops); if (!rc) { struct seq_file *s = file->private_data; - s->private = PROC_I(inode)->pde->data; + s->private = PDE_DATA(inode); } return rc; } @@ -296,7 +292,7 @@ static struct file_operations pool_proc_operations = { .llseek = seq_lseek, .release = seq_release, }; -#endif /* LPROCFS */ +#endif /* CONFIG_PROC_FS */ void lov_dump_pool(int level, struct pool_desc *pool) { @@ -306,7 +302,7 @@ void lov_dump_pool(int level, struct pool_desc *pool) CDEBUG(level, "pool "LOV_POOLNAMEF" has %d members\n", pool->pool_name, pool->pool_obds.op_count); - cfs_down_read(&pool_tgt_rw_sem(pool)); + down_read(&pool_tgt_rw_sem(pool)); for (i = 0; i < pool_tgt_count(pool) ; i++) { if (!pool_tgt(pool, i) || !(pool_tgt(pool, i))->ltd_exp) @@ -316,7 +312,7 @@ void lov_dump_pool(int level, struct pool_desc *pool) obd_uuid2str(&((pool_tgt(pool, i))->ltd_uuid))); } - cfs_up_read(&pool_tgt_rw_sem(pool)); + up_read(&pool_tgt_rw_sem(pool)); lov_pool_putref(pool); } @@ -329,7 +325,7 @@ int lov_ost_pool_init(struct ost_pool *op, unsigned int count) count = LOV_POOL_INIT_COUNT; op->op_array = NULL; op->op_count = 0; - cfs_init_rwsem(&op->op_rw_sem); + init_rwsem(&op->op_rw_sem); op->op_size = count; OBD_ALLOC(op->op_array, op->op_size * sizeof(op->op_array[0])); if (op->op_array == NULL) { @@ -369,7 +365,7 @@ int lov_ost_pool_add(struct ost_pool *op, __u32 idx, unsigned int min_count) int rc = 0, i; ENTRY; - cfs_down_write(&op->op_rw_sem); + down_write(&op->op_rw_sem); rc = lov_ost_pool_extend(op, min_count); if (rc) @@ -385,7 +381,7 @@ int lov_ost_pool_add(struct ost_pool *op, __u32 idx, unsigned int min_count) op->op_count++; EXIT; out: - cfs_up_write(&op->op_rw_sem); + up_write(&op->op_rw_sem); return rc; } @@ -394,20 +390,20 @@ int lov_ost_pool_remove(struct ost_pool *op, __u32 idx) int i; ENTRY; - cfs_down_write(&op->op_rw_sem); + down_write(&op->op_rw_sem); for (i = 0; i < op->op_count; i++) { if (op->op_array[i] == idx) { memmove(&op->op_array[i], &op->op_array[i + 1], (op->op_count - i - 1) * sizeof(op->op_array[0])); op->op_count--; - cfs_up_write(&op->op_rw_sem); + up_write(&op->op_rw_sem); EXIT; return 0; } } - cfs_up_write(&op->op_rw_sem); + up_write(&op->op_rw_sem); RETURN(-EINVAL); } @@ -418,14 +414,14 @@ int lov_ost_pool_free(struct ost_pool *op) if (op->op_size == 0) RETURN(0); - cfs_down_write(&op->op_rw_sem); + down_write(&op->op_rw_sem); OBD_FREE(op->op_array, op->op_size * sizeof(op->op_array[0])); op->op_array = NULL; op->op_count = 0; op->op_size = 0; - cfs_up_write(&op->op_rw_sem); + up_write(&op->op_rw_sem); RETURN(0); } @@ -446,44 +442,37 @@ int lov_pool_new(struct obd_device *obd, char *poolname) if (new_pool == NULL) RETURN(-ENOMEM); - strncpy(new_pool->pool_name, poolname, LOV_MAXPOOLNAME); - new_pool->pool_name[LOV_MAXPOOLNAME] = '\0'; - new_pool->pool_lov = lov; - /* ref count init to 1 because when created a pool is always used - * up to deletion - */ - cfs_atomic_set(&new_pool->pool_refcount, 1); - rc = lov_ost_pool_init(&new_pool->pool_obds, 0); - if (rc) - GOTO(out_err, rc); - - memset(&(new_pool->pool_rr), 0, sizeof(struct lov_qos_rr)); - rc = lov_ost_pool_init(&new_pool->pool_rr.lqr_pool, 0); - if (rc) - GOTO(out_free_pool_obds, rc); + strlcpy(new_pool->pool_name, poolname, sizeof(new_pool->pool_name)); + new_pool->pool_lobd = obd; + /* ref count init to 1 because when created a pool is always used + * up to deletion + */ + atomic_set(&new_pool->pool_refcount, 1); + rc = lov_ost_pool_init(&new_pool->pool_obds, 0); + if (rc) + GOTO(out_err, rc); - CFS_INIT_HLIST_NODE(&new_pool->pool_hash); + INIT_HLIST_NODE(&new_pool->pool_hash); -#ifdef LPROCFS - /* we need this assert seq_file is not implementated for liblustre */ - /* get ref for /proc file */ +#ifdef CONFIG_PROC_FS + /* get ref for /proc file */ lov_pool_getref(new_pool); - new_pool->pool_proc_entry = lprocfs_add_simple(lov->lov_pool_proc_entry, - poolname, NULL, NULL, - new_pool, - &pool_proc_operations); - if (IS_ERR(new_pool->pool_proc_entry)) { - CWARN("Cannot add proc pool entry "LOV_POOLNAMEF"\n", poolname); - new_pool->pool_proc_entry = NULL; - lov_pool_putref(new_pool); - } - CDEBUG(D_INFO, "pool %p - proc %p\n", new_pool, new_pool->pool_proc_entry); + new_pool->pool_proc_entry = lprocfs_add_simple(lov->lov_pool_proc_entry, + poolname, new_pool, + &pool_proc_operations); + if (IS_ERR(new_pool->pool_proc_entry)) { + CWARN("Cannot add proc pool entry "LOV_POOLNAMEF"\n", poolname); + new_pool->pool_proc_entry = NULL; + lov_pool_putref(new_pool); + } + CDEBUG(D_INFO, "pool %p - proc %p\n", + new_pool, new_pool->pool_proc_entry); #endif - cfs_spin_lock(&obd->obd_dev_lock); - cfs_list_add_tail(&new_pool->pool_list, &lov->lov_pool_list); - lov->lov_pool_count++; - cfs_spin_unlock(&obd->obd_dev_lock); + spin_lock(&obd->obd_dev_lock); + list_add_tail(&new_pool->pool_list, &lov->lov_pool_list); + lov->lov_pool_count++; + spin_unlock(&obd->obd_dev_lock); /* add to find only when it fully ready */ rc = cfs_hash_add_unique(lov->lov_pools_hash_body, poolname, @@ -497,18 +486,15 @@ int lov_pool_new(struct obd_device *obd, char *poolname) RETURN(0); out_err: - cfs_spin_lock(&obd->obd_dev_lock); - cfs_list_del_init(&new_pool->pool_list); - lov->lov_pool_count--; - cfs_spin_unlock(&obd->obd_dev_lock); - + spin_lock(&obd->obd_dev_lock); + list_del_init(&new_pool->pool_list); + lov->lov_pool_count--; + spin_unlock(&obd->obd_dev_lock); lprocfs_remove(&new_pool->pool_proc_entry); + lov_ost_pool_free(&new_pool->pool_obds); + OBD_FREE_PTR(new_pool); - lov_ost_pool_free(&new_pool->pool_rr.lqr_pool); -out_free_pool_obds: - lov_ost_pool_free(&new_pool->pool_obds); - OBD_FREE_PTR(new_pool); - return rc; + return rc; } int lov_pool_del(struct obd_device *obd, char *poolname) @@ -530,15 +516,15 @@ int lov_pool_del(struct obd_device *obd, char *poolname) lov_pool_putref(pool); } - cfs_spin_lock(&obd->obd_dev_lock); - cfs_list_del_init(&pool->pool_list); - lov->lov_pool_count--; - cfs_spin_unlock(&obd->obd_dev_lock); + spin_lock(&obd->obd_dev_lock); + list_del_init(&pool->pool_list); + lov->lov_pool_count--; + spin_unlock(&obd->obd_dev_lock); - /* release last reference */ - lov_pool_putref(pool); + /* release last reference */ + lov_pool_putref(pool); - RETURN(0); + RETURN(0); } @@ -577,8 +563,6 @@ int lov_pool_add(struct obd_device *obd, char *poolname, char *ostname) if (rc) GOTO(out, rc); - pool->pool_rr.lqr_dirty = 1; - CDEBUG(D_CONFIG, "Added %s to "LOV_POOLNAMEF" as member %d\n", ostname, poolname, pool_tgt_count(pool)); @@ -623,8 +607,6 @@ int lov_pool_remove(struct obd_device *obd, char *poolname, char *ostname) lov_ost_pool_remove(&pool->pool_obds, lov_idx); - pool->pool_rr.lqr_dirty = 1; - CDEBUG(D_CONFIG, "%s removed from "LOV_POOLNAMEF"\n", ostname, poolname); @@ -634,51 +616,3 @@ out: lov_pool_putref(pool); return rc; } - -int lov_check_index_in_pool(__u32 idx, struct pool_desc *pool) -{ - int i, rc; - ENTRY; - - /* caller may no have a ref on pool if it got the pool - * without calling lov_find_pool() (e.g. go through the lov pool - * list) - */ - lov_pool_getref(pool); - - cfs_down_read(&pool_tgt_rw_sem(pool)); - - for (i = 0; i < pool_tgt_count(pool); i++) { - if (pool_tgt_array(pool)[i] == idx) - GOTO(out, rc = 0); - } - rc = -ENOENT; - EXIT; -out: - cfs_up_read(&pool_tgt_rw_sem(pool)); - - lov_pool_putref(pool); - return rc; -} - -struct pool_desc *lov_find_pool(struct lov_obd *lov, char *poolname) -{ - struct pool_desc *pool; - - pool = NULL; - if (poolname[0] != '\0') { - pool = cfs_hash_lookup(lov->lov_pools_hash_body, poolname); - if (pool == NULL) - CWARN("Request for an unknown pool ("LOV_POOLNAMEF")\n", - poolname); - if ((pool != NULL) && (pool_tgt_count(pool) == 0)) { - CWARN("Request for an empty pool ("LOV_POOLNAMEF")\n", - poolname); - /* pool is ignored, so we remove ref on it */ - lov_pool_putref(pool); - pool = NULL; - } - } - return pool; -} -