X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fobdclass%2Flprocfs_status.c;h=cef248dca7272feeeb21876ec615e25e753bc5e3;hb=9b3a6b6f5bd13e79c6a5509f6032211549df004f;hp=a8b4a184c98861771d5a3cb8b6f51a2dfa1b3abb;hpb=33512ec9ce595b7bbe4006b2fc2371e3b4d66006;p=fs%2Flustre-release.git diff --git a/lustre/obdclass/lprocfs_status.c b/lustre/obdclass/lprocfs_status.c index a8b4a18..cef248d 100644 --- a/lustre/obdclass/lprocfs_status.c +++ b/lustre/obdclass/lprocfs_status.c @@ -1,26 +1,41 @@ /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- * vim:expandtab:shiftwidth=8:tabstop=8: * - * Copyright (C) 2002, 2003 Cluster File Systems, Inc. - * Author: Hariharan Thantry + * GPL HEADER START * - * This file is part of the Lustre file system, http://www.lustre.org - * Lustre is a trademark of Cluster File Systems, Inc. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * 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 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. * - * 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. + * 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). * - * 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. + * 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. + * + * lustre/obdclass/lprocfs_status.c + * + * Author: Hariharan Thantry */ #ifndef EXPORT_SYMTAB @@ -58,14 +73,18 @@ struct proc_dir_entry *lprocfs_srch(struct proc_dir_entry *head, if (head == NULL) return NULL; + LPROCFS_ENTRY(); temp = head->subdir; while (temp != NULL) { - if (strcmp(temp->name, name) == 0) + if (strcmp(temp->name, name) == 0) { + LPROCFS_EXIT(); return temp; + } temp = temp->next; } + LPROCFS_EXIT(); return NULL; } @@ -98,7 +117,7 @@ int lprocfs_add_simple(struct proc_dir_entry *root, char *name, { struct proc_dir_entry *proc; mode_t mode = 0; - + if (root == NULL || name == NULL) return -EINVAL; if (read_proc) @@ -116,6 +135,21 @@ int lprocfs_add_simple(struct proc_dir_entry *root, char *name, return 0; } +struct proc_dir_entry *lprocfs_add_symlink(const char *name, + struct proc_dir_entry *parent, const char *dest) +{ + struct proc_dir_entry *entry; + + if (parent == NULL || dest == NULL) + return NULL; + + entry = proc_symlink(name, parent, dest); + if (entry == NULL) + CERROR("LprocFS: Could not create symbolic link from %s to %s", + name, dest); + return entry; +} + static ssize_t lprocfs_fops_read(struct file *f, char __user *buf, size_t size, loff_t *ppos) { @@ -133,7 +167,7 @@ static ssize_t lprocfs_fops_read(struct file *f, char __user *buf, LPROCFS_ENTRY(); OBD_FAIL_TIMEOUT(OBD_FAIL_LPROC_REMOVE, 10); if (!dp->deleted && dp->read_proc) - rc = dp->read_proc(page, &start, *ppos, CFS_PAGE_SIZE, + rc = dp->read_proc(page, &start, *ppos, CFS_PAGE_SIZE, &eof, dp->data); LPROCFS_EXIT(); if (rc <= 0) @@ -168,7 +202,7 @@ out: static ssize_t lprocfs_fops_write(struct file *f, const char __user *buf, size_t size, loff_t *ppos) { struct proc_dir_entry *dp = PDE(f->f_dentry->d_inode); - int rc = 0; + int rc = -EIO; LPROCFS_ENTRY(); if (!dp->deleted && dp->write_proc) @@ -213,6 +247,17 @@ struct file_operations lprocfs_evict_client_fops = { }; EXPORT_SYMBOL(lprocfs_evict_client_fops); +/** + * Add /proc entrys. + * + * \param root [in] The parent proc entry on which new entry will be added. + * \param list [in] Array of proc entries to be added. + * \param data [in] The argument to be passed when entries read/write routines + * are called through /proc file. + * + * \retval 0 on success + * < 0 on error + */ int lprocfs_add_vars(struct proc_dir_entry *root, struct lprocfs_vars *list, void *data) { @@ -252,10 +297,14 @@ int lprocfs_add_vars(struct proc_dir_entry *root, struct lprocfs_vars *list, proc_mkdir(cur, cur_root)); } else if (proc == NULL) { mode_t mode = 0; - if (list->read_fptr) - mode = 0444; - if (list->write_fptr) - mode |= 0200; + if (list->proc_mode != 0000) { + mode = list->proc_mode; + } else { + if (list->read_fptr) + mode = 0444; + if (list->write_fptr) + mode |= 0200; + } proc = create_proc_entry(cur, mode, cur_root); } } @@ -294,6 +343,7 @@ void lprocfs_remove(struct proc_dir_entry **rooth) parent = root->parent; LASSERT(parent != NULL); + LPROCFS_WRITE_ENTRY(); /* search vs remove race */ while (1) { while (temp->subdir != NULL) @@ -308,15 +358,20 @@ void lprocfs_remove(struct proc_dir_entry **rooth) "0x%p %s/%s len %d\n", rm_entry, temp->name, rm_entry->name, (int)strlen(rm_entry->name)); - /* Now, the rm_entry->deleted flags is protected + /* Now, the rm_entry->deleted flags is protected * by _lprocfs_lock. */ - down_write(&_lprocfs_lock); rm_entry->data = NULL; remove_proc_entry(rm_entry->name, temp); - up_write(&_lprocfs_lock); if (temp == parent) break; } + LPROCFS_WRITE_EXIT(); +} + +void lprocfs_remove_proc_entry(const char *name, struct proc_dir_entry *parent) +{ + LASSERT(parent != NULL); + remove_proc_entry(name, parent); } struct proc_dir_entry *lprocfs_register(const char *name, @@ -393,14 +448,14 @@ int lprocfs_wr_atomic(struct file *file, const char *buffer, atomic_t *atm = data; int val = 0; int rc; - + rc = lprocfs_write_helper(buffer, count, &val); if (rc < 0) return rc; if (val <= 0) return -ERANGE; - + atomic_set(atm, val); return count; } @@ -579,6 +634,70 @@ int lprocfs_rd_conn_uuid(char *page, char **start, off_t off, int count, return rc; } +int lprocfs_at_hist_helper(char *page, int count, int rc, + struct adaptive_timeout *at) +{ + int i; + for (i = 0; i < AT_BINS; i++) + rc += snprintf(page + rc, count - rc, "%3u ", at->at_hist[i]); + rc += snprintf(page + rc, count - rc, "\n"); + return rc; +} + +/* See also ptlrpc_lprocfs_rd_timeouts */ +int lprocfs_rd_timeouts(char *page, char **start, off_t off, int count, + int *eof, void *data) +{ + struct obd_device *obd = (struct obd_device *)data; + struct obd_import *imp; + unsigned int cur, worst; + time_t now, worstt; + struct dhms ts; + int i, rc = 0; + + LASSERT(obd != NULL); + LPROCFS_CLIMP_CHECK(obd); + imp = obd->u.cli.cl_import; + *eof = 1; + + now = cfs_time_current_sec(); + + /* Some network health info for kicks */ + s2dhms(&ts, now - imp->imp_last_reply_time); + rc += snprintf(page + rc, count - rc, + "%-10s : %ld, "DHMS_FMT" ago\n", + "last reply", imp->imp_last_reply_time, DHMS_VARS(&ts)); + + + cur = at_get(&imp->imp_at.iat_net_latency); + worst = imp->imp_at.iat_net_latency.at_worst_ever; + worstt = imp->imp_at.iat_net_latency.at_worst_time; + s2dhms(&ts, now - worstt); + rc += snprintf(page + rc, count - rc, + "%-10s : cur %3u worst %3u (at %ld, "DHMS_FMT" ago) ", + "network", cur, worst, worstt, DHMS_VARS(&ts)); + rc = lprocfs_at_hist_helper(page, count, rc, + &imp->imp_at.iat_net_latency); + + for(i = 0; i < IMP_AT_MAX_PORTALS; i++) { + if (imp->imp_at.iat_portal[i] == 0) + break; + cur = at_get(&imp->imp_at.iat_service_estimate[i]); + worst = imp->imp_at.iat_service_estimate[i].at_worst_ever; + worstt = imp->imp_at.iat_service_estimate[i].at_worst_time; + s2dhms(&ts, now - worstt); + rc += snprintf(page + rc, count - rc, + "portal %-2d : cur %3u worst %3u (at %ld, " + DHMS_FMT" ago) ", imp->imp_at.iat_portal[i], + cur, worst, worstt, DHMS_VARS(&ts)); + rc = lprocfs_at_hist_helper(page, count, rc, + &imp->imp_at.iat_service_estimate[i]); + } + + LPROCFS_CLIMP_EXIT(obd); + return rc; +} + static const char *obd_connect_names[] = { "read_only", "lov_index", @@ -679,7 +798,7 @@ int lprocfs_obd_setup(struct obd_device *obd, struct lprocfs_vars *list) int lprocfs_obd_cleanup(struct obd_device *obd) { - if (!obd) + if (!obd) return -EINVAL; if (obd->obd_proc_exports_entry) { /* Should be no exports left */ @@ -690,10 +809,8 @@ int lprocfs_obd_cleanup(struct obd_device *obd) return 0; } -void lprocfs_free_client_stats(void *obj, void *data) +static void lprocfs_free_client_stats(struct nid_stat *client_stat) { - struct nid_stat *client_stat = obj; - CDEBUG(D_CONFIG, "stat %p - data %p/%p/%p\n", client_stat, client_stat->nid_proc, client_stat->nid_stats, client_stat->nid_brw_stats); @@ -702,7 +819,6 @@ void lprocfs_free_client_stats(void *obj, void *data) client_stat->nid_exp_ref_count); hlist_del_init(&client_stat->nid_hash); - list_del(&client_stat->nid_list); if (client_stat->nid_proc) lprocfs_remove(&client_stat->nid_proc); @@ -724,10 +840,12 @@ void lprocfs_free_per_client_stats(struct obd_device *obd) ENTRY; /* we need extra list - because hash_exit called to early */ + /* not need locking because all clients is died */ while(!list_empty(&obd->obd_nid_stats)) { stat = list_entry(obd->obd_nid_stats.next, struct nid_stat, nid_list); - lprocfs_free_client_stats(stat, NULL); + list_del_init(&stat->nid_list); + lprocfs_free_client_stats(stat); } EXIT; @@ -737,9 +855,8 @@ struct lprocfs_stats *lprocfs_alloc_stats(unsigned int num, enum lprocfs_stats_flags flags) { struct lprocfs_stats *stats; - struct lprocfs_percpu *percpu; unsigned int percpusize; - unsigned int i; + unsigned int i, j; unsigned int num_cpu; if (num == 0) @@ -762,12 +879,20 @@ struct lprocfs_stats *lprocfs_alloc_stats(unsigned int num, stats->ls_flags = 0; } - percpusize = offsetof(typeof(*percpu), lp_cntr[num]); + percpusize = offsetof(struct lprocfs_percpu, lp_cntr[num]); if (num_cpu > 1) percpusize = L1_CACHE_ALIGN(percpusize); - stats->ls_percpu_size = num_cpu * percpusize; - OBD_ALLOC(stats->ls_percpu[0], stats->ls_percpu_size); + for (i = 0; i < num_cpu; i++) { + OBD_ALLOC(stats->ls_percpu[i], percpusize); + if (stats->ls_percpu[i] == NULL) { + for (j = 0; j < i; j++) { + OBD_FREE(stats->ls_percpu[j], percpusize); + stats->ls_percpu[j] = NULL; + } + break; + } + } if (stats->ls_percpu[0] == NULL) { OBD_FREE(stats, offsetof(typeof(*stats), ls_percpu[num_cpu])); @@ -775,10 +900,6 @@ struct lprocfs_stats *lprocfs_alloc_stats(unsigned int num, } stats->ls_num = num; - for (i = 1; i < num_cpu; i++) - stats->ls_percpu[i] = (void *)(stats->ls_percpu[i - 1]) + - percpusize; - return stats; } @@ -786,6 +907,8 @@ void lprocfs_free_stats(struct lprocfs_stats **statsh) { struct lprocfs_stats *stats = *statsh; unsigned int num_cpu; + unsigned int percpusize; + unsigned int i; if (stats == NULL || stats->ls_num == 0) return; @@ -796,7 +919,11 @@ void lprocfs_free_stats(struct lprocfs_stats **statsh) else num_cpu = num_possible_cpus(); - OBD_FREE(stats->ls_percpu[0], stats->ls_percpu_size); + percpusize = offsetof(struct lprocfs_percpu, lp_cntr[stats->ls_num]); + if (num_cpu > 1) + percpusize = L1_CACHE_ALIGN(percpusize); + for (i = 0; i < num_cpu; i++) + OBD_FREE(stats->ls_percpu[i], percpusize); OBD_FREE(stats, offsetof(typeof(*stats), ls_percpu[num_cpu])); } @@ -814,7 +941,7 @@ void lprocfs_clear_stats(struct lprocfs_stats *stats) atomic_inc(&percpu_cntr->lc_cntl.la_entry); percpu_cntr->lc_count = 0; percpu_cntr->lc_sum = 0; - percpu_cntr->lc_min = ~(__u64)0; + percpu_cntr->lc_min = LC_MIN_INIT; percpu_cntr->lc_max = 0; percpu_cntr->lc_sumsquare = 0; atomic_inc(&percpu_cntr->lc_cntl.la_exit); @@ -860,7 +987,7 @@ static int lprocfs_stats_seq_show(struct seq_file *p, void *v) { struct lprocfs_stats *stats = p->private; struct lprocfs_counter *cntr = v; - struct lprocfs_counter t, ret = { .lc_min = ~(__u64)0 }; + struct lprocfs_counter t, ret = { .lc_min = LC_MIN_INIT }; int i, idx, rc; unsigned int num_cpu; @@ -902,18 +1029,18 @@ static int lprocfs_stats_seq_show(struct seq_file *p, void *v) ret.lc_sumsquare += t.lc_sumsquare; } - rc = seq_printf(p, "%-25s "LPU64" samples [%s]", cntr->lc_name, + rc = seq_printf(p, "%-25s "LPD64" samples [%s]", cntr->lc_name, ret.lc_count, cntr->lc_units); if (rc < 0) goto out; if ((cntr->lc_config & LPROCFS_CNTR_AVGMINMAX) && (ret.lc_count > 0)) { - rc = seq_printf(p, " "LPU64" "LPU64" "LPU64, + rc = seq_printf(p, " "LPD64" "LPD64" "LPD64, ret.lc_min, ret.lc_max, ret.lc_sum); if (rc < 0) goto out; if (cntr->lc_config & LPROCFS_CNTR_STDDEV) - rc = seq_printf(p, " "LPU64, ret.lc_sumsquare); + rc = seq_printf(p, " "LPD64, ret.lc_sumsquare); if (rc < 0) goto out; } @@ -985,7 +1112,7 @@ void lprocfs_counter_init(struct lprocfs_stats *stats, int index, c->lc_config = conf; c->lc_count = 0; c->lc_sum = 0; - c->lc_min = ~(__u64)0; + c->lc_min = LC_MIN_INIT; c->lc_max = 0; c->lc_name = name; c->lc_units = units; @@ -1039,6 +1166,8 @@ void lprocfs_init_ops_stats(int num_private_stats, struct lprocfs_stats *stats) LPROCFS_OBD_OP_INIT(num_private_stats, stats, brw); LPROCFS_OBD_OP_INIT(num_private_stats, stats, brw_async); LPROCFS_OBD_OP_INIT(num_private_stats, stats, prep_async_page); + LPROCFS_OBD_OP_INIT(num_private_stats, stats, reget_short_lock); + LPROCFS_OBD_OP_INIT(num_private_stats, stats, release_short_lock); LPROCFS_OBD_OP_INIT(num_private_stats, stats, queue_async_io); LPROCFS_OBD_OP_INIT(num_private_stats, stats, queue_group_io); LPROCFS_OBD_OP_INIT(num_private_stats, stats, trigger_group_io); @@ -1070,9 +1199,14 @@ void lprocfs_init_ops_stats(int num_private_stats, struct lprocfs_stats *stats) LPROCFS_OBD_OP_INIT(num_private_stats, stats, import_event); LPROCFS_OBD_OP_INIT(num_private_stats, stats, notify); LPROCFS_OBD_OP_INIT(num_private_stats, stats, health_check); + LPROCFS_OBD_OP_INIT(num_private_stats, stats, get_uuid); LPROCFS_OBD_OP_INIT(num_private_stats, stats, quotacheck); LPROCFS_OBD_OP_INIT(num_private_stats, stats, quotactl); LPROCFS_OBD_OP_INIT(num_private_stats, stats, ping); + LPROCFS_OBD_OP_INIT(num_private_stats, stats, register_page_removal_cb); + LPROCFS_OBD_OP_INIT(num_private_stats,stats,unregister_page_removal_cb); + LPROCFS_OBD_OP_INIT(num_private_stats, stats, register_lock_cancel_cb); + LPROCFS_OBD_OP_INIT(num_private_stats, stats,unregister_lock_cancel_cb); } int lprocfs_alloc_obd_stats(struct obd_device *obd, unsigned num_private_stats) @@ -1115,7 +1249,7 @@ int lprocfs_alloc_obd_stats(struct obd_device *obd, unsigned num_private_stats) void lprocfs_free_obd_stats(struct obd_device *obd) { - if (obd->obd_stats) + if (obd->obd_stats) lprocfs_free_stats(&obd->obd_stats); } @@ -1171,6 +1305,8 @@ int lprocfs_alloc_md_stats(struct obd_device *obd, LPROCFS_MD_OP_INIT(num_private_stats, stats, cancel_unused); LPROCFS_MD_OP_INIT(num_private_stats, stats, renew_capa); LPROCFS_MD_OP_INIT(num_private_stats, stats, get_remote_perm); + LPROCFS_MD_OP_INIT(num_private_stats, stats, intent_getattr_async); + LPROCFS_MD_OP_INIT(num_private_stats, stats, revalidate_lock); for (i = num_private_stats; i < num_stats; i++) { if (stats->ls_percpu[0]->lp_cntr[i].lc_name == NULL) { @@ -1243,9 +1379,8 @@ int lprocfs_exp_rd_uuid(char *page, char **start, off_t off, int count, cb_data.count = count; cb_data.eof = eof; cb_data.len = &len; - lustre_hash_bucket_iterate(obd->obd_nid_hash_body, - &stats->nid, lprocfs_exp_print_uuid, - &cb_data); + lustre_hash_for_each_key(obd->obd_nid_hash, &stats->nid, + lprocfs_exp_print_uuid, &cb_data); return (*cb_data.len); } @@ -1261,23 +1396,29 @@ EXPORT_SYMBOL(lprocfs_nid_stats_clear_read); void lprocfs_nid_stats_clear_write_cb(void *obj, void *data) { - struct nid_stat *client_stat = obj; + struct nid_stat *stat = obj; int i; - if(client_stat->nid_exp_ref_count == 1) { - hlist_del_init(&client_stat->nid_hash); - lprocfs_free_client_stats(client_stat, data); - OBD_FREE(client_stat, sizeof(struct nid_stat)); + + /* object has only hash + iterate_all references. + * add/delete blocked by hash bucket lock */ + CDEBUG(D_INFO,"refcnt %d\n", stat->nid_exp_ref_count); + if(stat->nid_exp_ref_count == 2) { + hlist_del_init(&stat->nid_hash); + stat->nid_exp_ref_count--; + spin_lock(&stat->nid_obd->obd_nid_lock); + list_del_init(&stat->nid_list); + spin_unlock(&stat->nid_obd->obd_nid_lock); + list_add(&stat->nid_list, data); EXIT; return; } - /* we has reference to object - only clear data*/ - if (client_stat->nid_stats) { - lprocfs_clear_stats(client_stat->nid_stats); - } - if (client_stat->nid_brw_stats) { + if (stat->nid_stats) + lprocfs_clear_stats(stat->nid_stats); + + if (stat->nid_brw_stats) { for (i = 0; i < BRW_LAST; i++) - lprocfs_oh_clear(&client_stat->nid_brw_stats->hist[i]); + lprocfs_oh_clear(&stat->nid_brw_stats->hist[i]); } EXIT; return; @@ -1287,8 +1428,18 @@ int lprocfs_nid_stats_clear_write(struct file *file, const char *buffer, unsigned long count, void *data) { struct obd_device *obd = (struct obd_device *)data; - lustre_hash_iterate_all(obd->obd_nid_stats_hash_body, - lprocfs_free_client_stats, NULL); + struct nid_stat *client_stat; + CFS_LIST_HEAD(free_list); + + lustre_hash_for_each(obd->obd_nid_stats_hash, + lprocfs_nid_stats_clear_write_cb, &free_list); + + while (!list_empty(&free_list)) { + client_stat = list_entry(free_list.next, struct nid_stat, nid_list); + list_del_init(&client_stat->nid_list); + lprocfs_free_client_stats(client_stat); + } + return count; } EXPORT_SYMBOL(lprocfs_nid_stats_clear_write); @@ -1303,7 +1454,7 @@ int lprocfs_exp_setup(struct obd_export *exp, lnet_nid_t *nid, int *newnid) *newnid = 0; if (!exp || !exp->exp_obd || !exp->exp_obd->obd_proc_exports_entry || - !exp->exp_obd->obd_nid_stats_hash_body) + !exp->exp_obd->obd_nid_stats_hash) RETURN(-EINVAL); /* not test against zero because eric say: @@ -1314,7 +1465,7 @@ int lprocfs_exp_setup(struct obd_export *exp, lnet_nid_t *nid, int *newnid) obd = exp->exp_obd; - CDEBUG(D_CONFIG, "using hash %p\n", obd->obd_nid_stats_hash_body); + CDEBUG(D_CONFIG, "using hash %p\n", obd->obd_nid_stats_hash); OBD_ALLOC(tmp, sizeof(struct nid_stat)); if (tmp == NULL) @@ -1324,8 +1475,13 @@ int lprocfs_exp_setup(struct obd_export *exp, lnet_nid_t *nid, int *newnid) tmp->nid_obd = exp->exp_obd; tmp->nid_exp_ref_count = 1; /* need live in hash after destroy export */ - tmp1= lustre_hash_findadd_unique(obd->obd_nid_stats_hash_body, nid, - &tmp->nid_hash); + /* protect competitive add to list, not need locking on destroy */ + spin_lock(&obd->obd_nid_lock); + list_add(&tmp->nid_list, &obd->obd_nid_stats); + spin_unlock(&obd->obd_nid_lock); + + tmp1 = lustre_hash_findadd_unique(obd->obd_nid_stats_hash, + nid, &tmp->nid_hash); CDEBUG(D_INFO, "Found stats %p for nid %s - ref %d\n", tmp1, libcfs_nid2str(*nid), tmp->nid_exp_ref_count); @@ -1334,13 +1490,12 @@ int lprocfs_exp_setup(struct obd_export *exp, lnet_nid_t *nid, int *newnid) GOTO(destroy_new, rc = 0); } /* not found - create */ - tmp->nid_proc = proc_mkdir(libcfs_nid2str(*nid), - obd->obd_proc_exports_entry); + tmp->nid_proc = lprocfs_register(libcfs_nid2str(*nid), + obd->obd_proc_exports_entry, NULL, NULL); if (!tmp->nid_proc) { CERROR("Error making export directory for" " nid %s\n", libcfs_nid2str(*nid)); - lustre_hash_delitem(obd->obd_nid_stats_hash_body, nid, - &tmp->nid_hash); + lustre_hash_del(obd->obd_nid_stats_hash, nid, &tmp->nid_hash); GOTO(destroy_new, rc = -ENOMEM); } @@ -1349,15 +1504,14 @@ int lprocfs_exp_setup(struct obd_export *exp, lnet_nid_t *nid, int *newnid) if (rc) CWARN("Error adding the uuid file\n"); - spin_lock(&obd->obd_nid_lock); - list_add(&tmp->nid_list, &obd->obd_nid_stats); - spin_unlock(&obd->obd_nid_lock); - exp->exp_nid_stats = tmp; *newnid = 1; RETURN(rc); destroy_new: + spin_lock(&obd->obd_nid_lock); + list_del(&tmp->nid_list); + spin_unlock(&obd->obd_nid_lock); OBD_FREE(tmp, sizeof(struct nid_stat)); RETURN(rc); } @@ -1453,7 +1607,7 @@ int lprocfs_read_frac_helper(char *buffer, unsigned long count, long val, int mu 2. #echo x.0x > /proc/xxx output result : x.0x 3. #echo x.x0 > /proc/xxx output result : x.x 4. #echo x.xx > /proc/xxx output result : x.xx - Only reserved 2bits fraction. + Only reserved 2bits fraction. */ for (i = 0; i < (5 - prtn); i++) temp_mult *= 10; @@ -1532,7 +1686,7 @@ int lprocfs_write_frac_u64_helper(const char *buffer, unsigned long count, units <<= 10; } /* Specified units override the multiplier */ - if (units) + if (units) mult = mult < 0 ? -units : units; frac *= mult; @@ -1541,7 +1695,7 @@ int lprocfs_write_frac_u64_helper(const char *buffer, unsigned long count, return 0; } -int lprocfs_seq_create(cfs_proc_dir_entry_t *parent, +int lprocfs_seq_create(cfs_proc_dir_entry_t *parent, char *name, mode_t mode, struct file_operations *seq_fops, void *data) { @@ -1563,7 +1717,7 @@ __inline__ int lprocfs_obd_seq_create(struct obd_device *dev, char *name, struct file_operations *seq_fops, void *data) { - return (lprocfs_seq_create(dev->obd_proc_entry, name, + return (lprocfs_seq_create(dev->obd_proc_entry, name, mode, seq_fops, data)); } EXPORT_SYMBOL(lprocfs_obd_seq_create); @@ -1609,6 +1763,24 @@ void lprocfs_oh_clear(struct obd_histogram *oh) } EXPORT_SYMBOL(lprocfs_oh_clear); +int lprocfs_obd_rd_hash(char *page, char **start, off_t off, + int count, int *eof, void *data) +{ + struct obd_device *obd = data; + int c = 0; + + if (obd == NULL) + return 0; + + c += lustre_hash_debug_header(page, count); + c += lustre_hash_debug_str(obd->obd_uuid_hash, page + c, count - c); + c += lustre_hash_debug_str(obd->obd_nid_hash, page + c, count - c); + c += lustre_hash_debug_str(obd->obd_nid_stats_hash, page+c, count-c); + + return c; +} +EXPORT_SYMBOL(lprocfs_obd_rd_hash); + int lprocfs_obd_rd_recovery_status(char *page, char **start, off_t off, int count, int *eof, void *data) { @@ -1635,7 +1807,6 @@ int lprocfs_obd_rd_recovery_status(char *page, char **start, off_t off, if (lprocfs_obd_snprintf(&page, size, &len, "status: ") <= 0) goto out; - if (obd->obd_max_recoverable_clients == 0) { if (lprocfs_obd_snprintf(&page, size, &len, "INACTIVE\n") <= 0) goto out; @@ -1647,64 +1818,60 @@ int lprocfs_obd_rd_recovery_status(char *page, char **start, off_t off, if (obd->obd_recovering == 0) { if (lprocfs_obd_snprintf(&page, size, &len, "COMPLETE\n") <= 0) goto out; - - if (lprocfs_obd_snprintf(&page, size, &len, "recovery_start: %lu\n", - obd->obd_recovery_start) <= 0) + if (lprocfs_obd_snprintf(&page, size, &len, + "recovery_start: %lu\n", + obd->obd_recovery_start) <= 0) goto out; - - if (lprocfs_obd_snprintf(&page, size, &len, "recovery_end: %lu\n", - obd->obd_recovery_end) <= 0) + if (lprocfs_obd_snprintf(&page, size, &len, + "recovery_duration: %lu\n", + obd->obd_recovery_end - + obd->obd_recovery_start) <= 0) goto out; - - /* Number of clients have have completed recovery */ - if (lprocfs_obd_snprintf(&page, size, &len, "recovered_clients: %d\n", - obd->obd_max_recoverable_clients - obd->obd_recoverable_clients) <= 0) + /* Number of clients that have completed recovery */ + if (lprocfs_obd_snprintf(&page, size, &len, + "completed_clients: %d/%d\n", + obd->obd_max_recoverable_clients - + obd->obd_recoverable_clients, + obd->obd_max_recoverable_clients) <= 0) goto out; - - if (lprocfs_obd_snprintf(&page, size, &len, "unrecovered_clients: %d\n", - obd->obd_recoverable_clients) <= 0) + if (lprocfs_obd_snprintf(&page, size, &len, + "replayed_requests: %d\n", + obd->obd_replayed_requests) <= 0) goto out; - - if (lprocfs_obd_snprintf(&page, size, &len, "last_transno: "LPD64"\n", - obd->obd_next_recovery_transno - 1) <= 0) + if (lprocfs_obd_snprintf(&page, size, &len, + "last_transno: "LPD64"\n", + obd->obd_next_recovery_transno - 1)<=0) goto out; - - lprocfs_obd_snprintf(&page, size, &len, "replayed_requests: %d\n", obd->obd_replayed_requests); goto fclose; } if (lprocfs_obd_snprintf(&page, size, &len, "RECOVERING\n") <= 0) goto out; - if (lprocfs_obd_snprintf(&page, size, &len, "recovery_start: %lu\n", - obd->obd_recovery_start) <= 0) + obd->obd_recovery_start) <= 0) goto out; - - if (lprocfs_obd_snprintf(&page, size, &len, "time remaining: %lu\n", - CURRENT_SECONDS >= obd->obd_recovery_end ? 0 : - obd->obd_recovery_end - CURRENT_SECONDS) <= 0) + if (lprocfs_obd_snprintf(&page, size, &len, "time_remaining: %lu\n", + cfs_time_current_sec() >= obd->obd_recovery_end ? 0 : + obd->obd_recovery_end - cfs_time_current_sec()) <= 0) goto out; - - if(lprocfs_obd_snprintf(&page, size, &len, "connected_clients: %d/%d\n", - obd->obd_connected_clients, - obd->obd_max_recoverable_clients) <= 0) + if (lprocfs_obd_snprintf(&page, size, &len,"connected_clients: %d/%d\n", + obd->obd_connected_clients, + obd->obd_max_recoverable_clients) <= 0) goto out; - - /* Number of clients have have completed recovery */ - if (lprocfs_obd_snprintf(&page, size, &len, "completed_clients: %d/%d\n", - obd->obd_max_recoverable_clients - obd->obd_recoverable_clients, + /* Number of clients that have completed recovery */ + if (lprocfs_obd_snprintf(&page, size, &len,"completed_clients: %d/%d\n", + obd->obd_max_recoverable_clients - + obd->obd_recoverable_clients, obd->obd_max_recoverable_clients) <= 0) goto out; - - if (lprocfs_obd_snprintf(&page, size, &len, "replayed_requests: %d/??\n", + if (lprocfs_obd_snprintf(&page, size, &len,"replayed_requests: %d/??\n", obd->obd_replayed_requests) <= 0) goto out; - if (lprocfs_obd_snprintf(&page, size, &len, "queued_requests: %d\n", obd->obd_requests_queued_for_recovery) <= 0) goto out; - if (lprocfs_obd_snprintf(&page, size, &len, "next_transno: "LPD64"\n", + if (lprocfs_obd_snprintf(&page, size, &len, "next_transno: "LPD64"\n", obd->obd_next_recovery_transno) <= 0) goto out; @@ -1721,7 +1888,7 @@ int lprocfs_obd_rd_recovery_maxtime(char *page, char **start, off_t off, struct obd_device *obd = (struct obd_device *)data; LASSERT(obd != NULL); - return snprintf(page, count, "%lu\n", + return snprintf(page, count, "%lu\n", obd->obd_recovery_max_time); } EXPORT_SYMBOL(lprocfs_obd_rd_recovery_maxtime); @@ -1745,10 +1912,12 @@ EXPORT_SYMBOL(lprocfs_obd_wr_recovery_maxtime); EXPORT_SYMBOL(lprocfs_register); EXPORT_SYMBOL(lprocfs_srch); EXPORT_SYMBOL(lprocfs_remove); +EXPORT_SYMBOL(lprocfs_remove_proc_entry); EXPORT_SYMBOL(lprocfs_add_vars); EXPORT_SYMBOL(lprocfs_obd_setup); EXPORT_SYMBOL(lprocfs_obd_cleanup); EXPORT_SYMBOL(lprocfs_add_simple); +EXPORT_SYMBOL(lprocfs_add_symlink); EXPORT_SYMBOL(lprocfs_free_per_client_stats); EXPORT_SYMBOL(lprocfs_alloc_stats); EXPORT_SYMBOL(lprocfs_free_stats); @@ -1772,7 +1941,8 @@ EXPORT_SYMBOL(lprocfs_rd_server_uuid); EXPORT_SYMBOL(lprocfs_rd_conn_uuid); EXPORT_SYMBOL(lprocfs_rd_num_exports); EXPORT_SYMBOL(lprocfs_rd_numrefs); - +EXPORT_SYMBOL(lprocfs_at_hist_helper); +EXPORT_SYMBOL(lprocfs_rd_timeouts); EXPORT_SYMBOL(lprocfs_rd_blksize); EXPORT_SYMBOL(lprocfs_rd_kbytestotal); EXPORT_SYMBOL(lprocfs_rd_kbytesfree);