X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fobdclass%2Flustre_peer.c;h=5be97886c6410f491c2f51e736122c62bb404648;hb=a7a2133bfab42eba077f1b8d5c991c651c8028c3;hp=016354c7d9a5642d137097d6533cbcfd6a695630;hpb=040033cef24c5aca2967daf2da7a862abcd074cf;p=fs%2Flustre-release.git diff --git a/lustre/obdclass/lustre_peer.c b/lustre/obdclass/lustre_peer.c index 016354c..5be9788 100644 --- a/lustre/obdclass/lustre_peer.c +++ b/lustre/obdclass/lustre_peer.c @@ -1,48 +1,57 @@ /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- * vim:expandtab:shiftwidth=8:tabstop=8: * - * Copyright (c) 2002, 2003 Cluster File Systems, Inc. + * 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. */ #define DEBUG_SUBSYSTEM S_RPC -#ifdef __KERNEL__ -# include -# include -# include -#else +#ifndef __KERNEL__ # include #endif -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include struct uuid_nid_data { - struct list_head head; - ptl_nid_t nid; - char *uuid; - __u32 nal; - ptl_handle_ni_t ni; + struct list_head un_list; + lnet_nid_t un_nid; + char *un_uuid; + int un_count; /* nid/uuid pair refcount */ }; /* FIXME: This should probably become more elegant than a global linked list */ @@ -51,25 +60,17 @@ static spinlock_t g_uuid_lock; void class_init_uuidlist(void) { - INIT_LIST_HEAD(&g_uuid_list); + CFS_INIT_LIST_HEAD(&g_uuid_list); spin_lock_init(&g_uuid_lock); } void class_exit_uuidlist(void) { - struct list_head *tmp, *n; - - /* Module going => sole user => don't need to lock g_uuid_list */ - list_for_each_safe(tmp, n, &g_uuid_list) { - struct uuid_nid_data *data = - list_entry(tmp, struct uuid_nid_data, head); - - PORTAL_FREE(data->uuid, strlen(data->uuid) + 1); - PORTAL_FREE(data, sizeof(*data)); - } + /* delete all */ + class_del_uuid(NULL); } -int lustre_uuid_to_peer(char *uuid, struct lustre_peer *peer) +int lustre_uuid_to_peer(const char *uuid, lnet_nid_t *peer_nid, int index) { struct list_head *tmp; @@ -77,11 +78,11 @@ int lustre_uuid_to_peer(char *uuid, struct lustre_peer *peer) list_for_each(tmp, &g_uuid_list) { struct uuid_nid_data *data = - list_entry(tmp, struct uuid_nid_data, head); + list_entry(tmp, struct uuid_nid_data, un_list); - if (strcmp(data->uuid, uuid) == 0) { - peer->peer_nid = data->nid; - peer->peer_ni = data->ni; + if (!strcmp(data->un_uuid, uuid) && + index-- == 0) { + *peer_nid = data->un_nid; spin_unlock (&g_uuid_lock); return 0; @@ -89,91 +90,102 @@ int lustre_uuid_to_peer(char *uuid, struct lustre_peer *peer) } spin_unlock (&g_uuid_lock); - return -1; + return -ENOENT; } -int class_add_uuid(char *uuid, __u64 nid, __u32 nal) +/* Add a nid to a niduuid. Multiple nids can be added to a single uuid; + LNET will choose the best one. */ +int class_add_uuid(const char *uuid, __u64 nid) { - const ptl_handle_ni_t *nip; - struct uuid_nid_data *data; - int rc; - int nob = strnlen (uuid, PAGE_SIZE) + 1; + struct uuid_nid_data *data, *entry; + int nob = strnlen (uuid, CFS_PAGE_SIZE) + 1; + int found = 0; - if (nob > PAGE_SIZE) - return -EINVAL; + LASSERT(nid != 0); /* valid newconfig NID is never zero */ - nip = kportal_get_ni (nal); - if (nip == NULL) { - CERROR("get_ni failed: is the NAL module loaded?\n"); - return -EIO; - } + if (nob > CFS_PAGE_SIZE) + return -EINVAL; - rc = -ENOMEM; - PORTAL_ALLOC(data, sizeof(*data)); + OBD_ALLOC(data, sizeof(*data)); if (data == NULL) - goto fail_0; + return -ENOMEM; - PORTAL_ALLOC(data->uuid, nob); - if (data == NULL) - goto fail_1; + OBD_ALLOC(data->un_uuid, nob); + if (data == NULL) { + OBD_FREE(data, sizeof(*data)); + return -ENOMEM; + } - memcpy(data->uuid, uuid, nob); - data->nid = nid; - data->nal = nal; - data->ni = *nip; + memcpy(data->un_uuid, uuid, nob); + data->un_nid = nid; + data->un_count = 1; spin_lock (&g_uuid_lock); - list_add(&data->head, &g_uuid_list); - + list_for_each_entry(entry, &g_uuid_list, un_list) { + if (entry->un_nid == nid && + (strcmp(entry->un_uuid, uuid) == 0)) { + found++; + entry->un_count++; + break; + } + } + if (!found) + list_add(&data->un_list, &g_uuid_list); spin_unlock (&g_uuid_lock); + if (found) { + CDEBUG(D_INFO, "found uuid %s %s cnt=%d\n", uuid, + libcfs_nid2str(nid), entry->un_count); + OBD_FREE(data->un_uuid, nob); + OBD_FREE(data, sizeof(*data)); + } else { + CDEBUG(D_INFO, "add uuid %s %s\n", uuid, libcfs_nid2str(nid)); + } return 0; - - fail_1: - PORTAL_FREE (data, sizeof (*data)); - fail_0: - kportal_put_ni (nal); - return (rc); } -/* delete only one entry if uuid is specified, otherwise delete all */ -int class_del_uuid (char *uuid) +/* Delete the nids for one uuid if specified, otherwise delete all */ +int class_del_uuid(const char *uuid) { - struct list_head deathrow; - struct list_head *tmp; - struct list_head *n; + CFS_LIST_HEAD(deathrow); struct uuid_nid_data *data; - - INIT_LIST_HEAD (&deathrow); + int found = 0; spin_lock (&g_uuid_lock); - - list_for_each_safe(tmp, n, &g_uuid_list) { - data = list_entry(tmp, struct uuid_nid_data, head); - - if (uuid == NULL || strcmp(data->uuid, uuid) == 0) { - list_del (&data->head); - list_add (&data->head, &deathrow); - if (uuid) - break; + if (uuid == NULL) { + list_splice_init(&g_uuid_list, &deathrow); + found = 1; + } else { + list_for_each_entry(data, &g_uuid_list, un_list) { + if (strcmp(data->un_uuid, uuid)) + continue; + --data->un_count; + LASSERT(data->un_count >= 0); + if (data->un_count == 0) + list_move(&data->un_list, &deathrow); + found = 1; + break; } } - spin_unlock (&g_uuid_lock); - if (list_empty (&deathrow)) + if (!found) { + if (uuid) + CERROR("Try to delete a non-existent uuid %s\n", uuid); return -EINVAL; + } - do { - data = list_entry(deathrow.next, struct uuid_nid_data, head); + while (!list_empty(&deathrow)) { + data = list_entry(deathrow.next, struct uuid_nid_data, un_list); + list_del(&data->un_list); - list_del (&data->head); + CDEBUG(D_INFO, "del uuid %s %s\n", data->un_uuid, + libcfs_nid2str(data->un_nid)); - kportal_put_ni (data->nal); - PORTAL_FREE(data->uuid, strlen(data->uuid) + 1); - PORTAL_FREE(data, sizeof(*data)); - } while (!list_empty (&deathrow)); + OBD_FREE(data->un_uuid, strlen(data->un_uuid) + 1); + OBD_FREE(data, sizeof(*data)); + } return 0; }