X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fobdclass%2Flprocfs_status.c;h=97d4107bfae74a43726ac7d8aa4e43bf5be82fb5;hp=33fa27ea19e88684cae27e9475745af111b4a9b7;hb=6fe7c32906f67f43d815c884ed8a902bb2333992;hpb=470339f456d8e5d27fa7a10103432ae264bf88f4 diff --git a/lustre/obdclass/lprocfs_status.c b/lustre/obdclass/lprocfs_status.c index 33fa27e..97d4107 100644 --- a/lustre/obdclass/lprocfs_status.c +++ b/lustre/obdclass/lprocfs_status.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. @@ -26,8 +24,10 @@ * GPL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. + * + * Copyright (c) 2011, 2013, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -38,9 +38,6 @@ * Author: Hariharan Thantry */ -#ifndef EXPORT_SYMTAB -# define EXPORT_SYMTAB -#endif #define DEBUG_SUBSYSTEM S_CLASS #ifndef __KERNEL__ @@ -49,18 +46,27 @@ #include #include -#include -#include #include #if defined(LPROCFS) +static int lprocfs_no_percpu_stats = 0; +CFS_MODULE_PARM(lprocfs_no_percpu_stats, "i", int, 0644, + "Do not alloc percpu data for lprocfs stats"); + #define MAX_STRING_SIZE 128 /* for bug 10866, global variable */ -CFS_DECLARE_RWSEM(_lprocfs_lock); +DECLARE_RWSEM(_lprocfs_lock); EXPORT_SYMBOL(_lprocfs_lock); +int lprocfs_single_release(struct inode *inode, struct file *file) +{ + LPROCFS_EXIT(); + return single_release(inode, file); +} +EXPORT_SYMBOL(lprocfs_single_release); + int lprocfs_seq_release(struct inode *inode, struct file *file) { LPROCFS_EXIT(); @@ -68,28 +74,37 @@ int lprocfs_seq_release(struct inode *inode, struct file *file) } EXPORT_SYMBOL(lprocfs_seq_release); -struct proc_dir_entry *lprocfs_srch(struct proc_dir_entry *head, - const char *name) +static struct proc_dir_entry *__lprocfs_srch(struct proc_dir_entry *head, + const char *name) { struct proc_dir_entry *temp; if (head == NULL) return NULL; - LPROCFS_ENTRY(); temp = head->subdir; while (temp != NULL) { if (strcmp(temp->name, name) == 0) { - LPROCFS_EXIT(); return temp; } temp = temp->next; } - LPROCFS_EXIT(); return NULL; } +struct proc_dir_entry *lprocfs_srch(struct proc_dir_entry *head, + const char *name) +{ + struct proc_dir_entry *temp; + + LPROCFS_SRCH_ENTRY(); + temp = __lprocfs_srch(head, name); + LPROCFS_SRCH_EXIT(); + return temp; +} +EXPORT_SYMBOL(lprocfs_srch); + /* lprocfs API calls */ /* Function that emulates snprintf but also has the side effect of advancing @@ -131,9 +146,11 @@ cfs_proc_dir_entry_t *lprocfs_add_simple(struct proc_dir_entry *root, mode |= 0200; if (fops) mode = 0644; + LPROCFS_WRITE_ENTRY(); proc = create_proc_entry(name, mode, root); if (!proc) { CERROR("LprocFS: No memory to create /proc entry %s", name); + LPROCFS_WRITE_EXIT(); return ERR_PTR(-ENOMEM); } proc->read_proc = read_proc; @@ -141,8 +158,10 @@ cfs_proc_dir_entry_t *lprocfs_add_simple(struct proc_dir_entry *root, proc->data = data; if (fops) proc->proc_fops = fops; + LPROCFS_WRITE_EXIT(); return proc; } +EXPORT_SYMBOL(lprocfs_add_simple); struct proc_dir_entry *lprocfs_add_symlink(const char *name, struct proc_dir_entry *parent, const char *format, ...) @@ -170,6 +189,7 @@ struct proc_dir_entry *lprocfs_add_symlink(const char *name, OBD_FREE(dest, MAX_STRING_SIZE + 1); return entry; } +EXPORT_SYMBOL(lprocfs_add_symlink); static ssize_t lprocfs_fops_read(struct file *f, char __user *buf, size_t size, loff_t *ppos) @@ -185,8 +205,10 @@ static ssize_t lprocfs_fops_read(struct file *f, char __user *buf, if (page == NULL) return -ENOMEM; - if (LPROCFS_ENTRY_AND_CHECK(dp)) - return -ENOENT; + if (LPROCFS_ENTRY_AND_CHECK(dp)) { + rc = -ENOENT; + goto out; + } OBD_FAIL_TIMEOUT(OBD_FAIL_LPROC_REMOVE, 10); if (dp->read_proc) @@ -286,9 +308,12 @@ EXPORT_SYMBOL(lprocfs_evict_client_fops); int lprocfs_add_vars(struct proc_dir_entry *root, struct lprocfs_vars *list, void *data) { + int rc = 0; + if (root == NULL || list == NULL) return -EINVAL; + LPROCFS_WRITE_ENTRY(); while (list->name != NULL) { struct proc_dir_entry *cur_root, *proc; char *pathcopy, *cur, *next, pathbuf[64]; @@ -301,7 +326,7 @@ int lprocfs_add_vars(struct proc_dir_entry *root, struct lprocfs_vars *list, if (strlen(list->name) > sizeof(pathbuf) - 1) { OBD_ALLOC(pathcopy, pathsize); if (pathcopy == NULL) - return -ENOMEM; + GOTO(out, rc = -ENOMEM); } else { pathcopy = pathbuf; } @@ -313,7 +338,7 @@ int lprocfs_add_vars(struct proc_dir_entry *root, struct lprocfs_vars *list, if (*cur =='\0') /* skip double/trailing "/" */ continue; - proc = lprocfs_srch(cur_root, cur); + proc = __lprocfs_srch(cur_root, cur); CDEBUG(D_OTHER, "cur_root=%s, cur=%s, next=%s, (%s)\n", cur_root->name, cur, next, (proc ? "exists" : "new")); @@ -340,7 +365,7 @@ int lprocfs_add_vars(struct proc_dir_entry *root, struct lprocfs_vars *list, if (cur_root == NULL || proc == NULL) { CERROR("LprocFS: No memory to create /proc entry %s", list->name); - return -ENOMEM; + GOTO(out, rc = -ENOMEM); } if (list->fops) @@ -352,10 +377,13 @@ int lprocfs_add_vars(struct proc_dir_entry *root, struct lprocfs_vars *list, proc->data = (list->data ? list->data : data); list++; } - return 0; +out: + LPROCFS_WRITE_EXIT(); + return rc; } +EXPORT_SYMBOL(lprocfs_add_vars); -void lprocfs_remove(struct proc_dir_entry **rooth) +void lprocfs_remove_nolock(struct proc_dir_entry **rooth) { struct proc_dir_entry *root = *rooth; struct proc_dir_entry *temp = root; @@ -368,7 +396,6 @@ 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) @@ -383,21 +410,72 @@ 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 - * by _lprocfs_lock. */ - rm_entry->data = NULL; remove_proc_entry(rm_entry->name, temp); if (temp == parent) break; } - LPROCFS_WRITE_EXIT(); } +void lprocfs_remove(struct proc_dir_entry **rooth) +{ + LPROCFS_WRITE_ENTRY(); /* search vs remove race */ + lprocfs_remove_nolock(rooth); + LPROCFS_WRITE_EXIT(); +} +EXPORT_SYMBOL(lprocfs_remove); + void lprocfs_remove_proc_entry(const char *name, struct proc_dir_entry *parent) { LASSERT(parent != NULL); remove_proc_entry(name, parent); } +EXPORT_SYMBOL(lprocfs_remove_proc_entry); + +void lprocfs_try_remove_proc_entry(const char *name, + struct proc_dir_entry *parent) +{ + struct proc_dir_entry *t = NULL; + struct proc_dir_entry **p; + int len, busy = 0; + + LASSERT(parent != NULL); + len = strlen(name); + + LPROCFS_WRITE_ENTRY(); + + /* lookup target name */ + for (p = &parent->subdir; *p; p = &(*p)->next) { + if ((*p)->namelen != len) + continue; + if (memcmp(name, (*p)->name, len)) + continue; + t = *p; + break; + } + + if (t) { + /* verify it's empty: do not count "num_refs" */ + for (p = &t->subdir; *p; p = &(*p)->next) { + if ((*p)->namelen != strlen("num_refs")) { + busy = 1; + break; + } + if (memcmp("num_refs", (*p)->name, + strlen("num_refs"))) { + busy = 1; + break; + } + } + } + + if (busy == 0) + lprocfs_remove_nolock(&t); + + LPROCFS_WRITE_EXIT(); + + return; +} +EXPORT_SYMBOL(lprocfs_try_remove_proc_entry); struct proc_dir_entry *lprocfs_register(const char *name, struct proc_dir_entry *parent, @@ -422,6 +500,7 @@ struct proc_dir_entry *lprocfs_register(const char *name, } return newchild; } +EXPORT_SYMBOL(lprocfs_register); /* Generic callbacks */ int lprocfs_rd_uint(char *page, char **start, off_t off, @@ -430,6 +509,7 @@ int lprocfs_rd_uint(char *page, char **start, off_t off, unsigned int *temp = data; return snprintf(page, count, "%u\n", *temp); } +EXPORT_SYMBOL(lprocfs_rd_uint); int lprocfs_wr_uint(struct file *file, const char *buffer, unsigned long count, void *data) @@ -449,6 +529,7 @@ int lprocfs_wr_uint(struct file *file, const char *buffer, *p = (unsigned int)tmp; return count; } +EXPORT_SYMBOL(lprocfs_wr_uint); int lprocfs_rd_u64(char *page, char **start, off_t off, int count, int *eof, void *data) @@ -457,6 +538,7 @@ int lprocfs_rd_u64(char *page, char **start, off_t off, *eof = 1; return snprintf(page, count, LPU64"\n", *(__u64 *)data); } +EXPORT_SYMBOL(lprocfs_rd_u64); int lprocfs_rd_atomic(char *page, char **start, off_t off, int count, int *eof, void *data) @@ -466,6 +548,7 @@ int lprocfs_rd_atomic(char *page, char **start, off_t off, *eof = 1; return snprintf(page, count, "%d\n", cfs_atomic_read(atom)); } +EXPORT_SYMBOL(lprocfs_rd_atomic); int lprocfs_wr_atomic(struct file *file, const char *buffer, unsigned long count, void *data) @@ -484,6 +567,7 @@ int lprocfs_wr_atomic(struct file *file, const char *buffer, cfs_atomic_set(atm, val); return count; } +EXPORT_SYMBOL(lprocfs_wr_atomic); int lprocfs_rd_uuid(char *page, char **start, off_t off, int count, int *eof, void *data) @@ -494,6 +578,7 @@ int lprocfs_rd_uuid(char *page, char **start, off_t off, int count, *eof = 1; return snprintf(page, count, "%s\n", obd->obd_uuid.uuid); } +EXPORT_SYMBOL(lprocfs_rd_uuid); int lprocfs_rd_name(char *page, char **start, off_t off, int count, int *eof, void *data) @@ -501,27 +586,18 @@ int lprocfs_rd_name(char *page, char **start, off_t off, int count, struct obd_device *dev = data; LASSERT(dev != NULL); - LASSERT(dev->obd_name != NULL); *eof = 1; return snprintf(page, count, "%s\n", dev->obd_name); } - -int lprocfs_rd_fstype(char *page, char **start, off_t off, int count, int *eof, - void *data) -{ - struct obd_device *obd = data; - - LASSERT(obd != NULL); - LASSERT(obd->obd_fsops != NULL); - LASSERT(obd->obd_fsops->fs_type != NULL); - return snprintf(page, count, "%s\n", obd->obd_fsops->fs_type); -} +EXPORT_SYMBOL(lprocfs_rd_name); int lprocfs_rd_blksize(char *page, char **start, off_t off, int count, int *eof, void *data) { - struct obd_statfs osfs; - int rc = obd_statfs(data, &osfs, cfs_time_current_64() - CFS_HZ, + struct obd_device *obd = data; + struct obd_statfs osfs; + int rc = obd_statfs(NULL, obd->obd_self_export, &osfs, + cfs_time_shift_64(-OBD_STATFS_CACHE_SECONDS), OBD_STATFS_NODELAY); if (!rc) { *eof = 1; @@ -529,12 +605,15 @@ int lprocfs_rd_blksize(char *page, char **start, off_t off, int count, } return rc; } +EXPORT_SYMBOL(lprocfs_rd_blksize); int lprocfs_rd_kbytestotal(char *page, char **start, off_t off, int count, int *eof, void *data) { - struct obd_statfs osfs; - int rc = obd_statfs(data, &osfs, cfs_time_current_64() - CFS_HZ, + struct obd_device *obd = data; + struct obd_statfs osfs; + int rc = obd_statfs(NULL, obd->obd_self_export, &osfs, + cfs_time_shift_64(-OBD_STATFS_CACHE_SECONDS), OBD_STATFS_NODELAY); if (!rc) { __u32 blk_size = osfs.os_bsize >> 10; @@ -548,12 +627,15 @@ int lprocfs_rd_kbytestotal(char *page, char **start, off_t off, int count, } return rc; } +EXPORT_SYMBOL(lprocfs_rd_kbytestotal); int lprocfs_rd_kbytesfree(char *page, char **start, off_t off, int count, int *eof, void *data) { - struct obd_statfs osfs; - int rc = obd_statfs(data, &osfs, cfs_time_current_64() - CFS_HZ, + struct obd_device *obd = data; + struct obd_statfs osfs; + int rc = obd_statfs(NULL, obd->obd_self_export, &osfs, + cfs_time_shift_64(-OBD_STATFS_CACHE_SECONDS), OBD_STATFS_NODELAY); if (!rc) { __u32 blk_size = osfs.os_bsize >> 10; @@ -567,12 +649,15 @@ int lprocfs_rd_kbytesfree(char *page, char **start, off_t off, int count, } return rc; } +EXPORT_SYMBOL(lprocfs_rd_kbytesfree); int lprocfs_rd_kbytesavail(char *page, char **start, off_t off, int count, int *eof, void *data) { - struct obd_statfs osfs; - int rc = obd_statfs(data, &osfs, cfs_time_current_64() - CFS_HZ, + struct obd_device *obd = data; + struct obd_statfs osfs; + int rc = obd_statfs(NULL, obd->obd_self_export, &osfs, + cfs_time_shift_64(-OBD_STATFS_CACHE_SECONDS), OBD_STATFS_NODELAY); if (!rc) { __u32 blk_size = osfs.os_bsize >> 10; @@ -586,12 +671,15 @@ int lprocfs_rd_kbytesavail(char *page, char **start, off_t off, int count, } return rc; } +EXPORT_SYMBOL(lprocfs_rd_kbytesavail); int lprocfs_rd_filestotal(char *page, char **start, off_t off, int count, int *eof, void *data) { - struct obd_statfs osfs; - int rc = obd_statfs(data, &osfs, cfs_time_current_64() - CFS_HZ, + struct obd_device *obd = data; + struct obd_statfs osfs; + int rc = obd_statfs(NULL, obd->obd_self_export, &osfs, + cfs_time_shift_64(-OBD_STATFS_CACHE_SECONDS), OBD_STATFS_NODELAY); if (!rc) { *eof = 1; @@ -600,12 +688,15 @@ int lprocfs_rd_filestotal(char *page, char **start, off_t off, int count, return rc; } +EXPORT_SYMBOL(lprocfs_rd_filestotal); int lprocfs_rd_filesfree(char *page, char **start, off_t off, int count, int *eof, void *data) { - struct obd_statfs osfs; - int rc = obd_statfs(data, &osfs, cfs_time_current_64() - CFS_HZ, + struct obd_device *obd = data; + struct obd_statfs osfs; + int rc = obd_statfs(NULL, obd->obd_self_export, &osfs, + cfs_time_shift_64(-OBD_STATFS_CACHE_SECONDS), OBD_STATFS_NODELAY); if (!rc) { *eof = 1; @@ -613,6 +704,7 @@ int lprocfs_rd_filesfree(char *page, char **start, off_t off, int count, } return rc; } +EXPORT_SYMBOL(lprocfs_rd_filesfree); int lprocfs_rd_server_uuid(char *page, char **start, off_t off, int count, int *eof, void *data) @@ -634,6 +726,7 @@ int lprocfs_rd_server_uuid(char *page, char **start, off_t off, int count, LPROCFS_CLIMP_EXIT(obd); return rc; } +EXPORT_SYMBOL(lprocfs_rd_server_uuid); int lprocfs_rd_conn_uuid(char *page, char **start, off_t off, int count, int *eof, void *data) @@ -657,57 +750,48 @@ int lprocfs_rd_conn_uuid(char *page, char **start, off_t off, int count, LPROCFS_CLIMP_EXIT(obd); return rc; } +EXPORT_SYMBOL(lprocfs_rd_conn_uuid); /** add up per-cpu counters */ void lprocfs_stats_collect(struct lprocfs_stats *stats, int idx, - struct lprocfs_counter *cnt) + struct lprocfs_counter *cnt) { - unsigned int num_cpu; - struct lprocfs_counter t; - struct lprocfs_counter *percpu_cntr; - int centry, i; + unsigned int num_entry; + struct lprocfs_counter *percpu_cntr; + struct lprocfs_counter_header *cntr_header; + int i; + unsigned long flags = 0; - memset(cnt, 0, sizeof(*cnt)); + memset(cnt, 0, sizeof(*cnt)); - if (stats == NULL) { - /* set count to 1 to avoid divide-by-zero errs in callers */ - cnt->lc_count = 1; - return; - } + if (stats == NULL) { + /* set count to 1 to avoid divide-by-zero errs in callers */ + cnt->lc_count = 1; + return; + } - cnt->lc_min = LC_MIN_INIT; - - if (stats->ls_flags & LPROCFS_STATS_FLAG_NOPERCPU) - num_cpu = 1; - else - num_cpu = cfs_num_possible_cpus(); - - for (i = 0; i < num_cpu; i++) { - percpu_cntr = &(stats->ls_percpu[i])->lp_cntr[idx]; - - do { - centry = cfs_atomic_read(&percpu_cntr-> \ - lc_cntl.la_entry); - t.lc_count = percpu_cntr->lc_count; - t.lc_sum = percpu_cntr->lc_sum; - t.lc_min = percpu_cntr->lc_min; - t.lc_max = percpu_cntr->lc_max; - t.lc_sumsquare = percpu_cntr->lc_sumsquare; - } while (centry != cfs_atomic_read(&percpu_cntr->lc_cntl. \ - la_entry) && - centry != cfs_atomic_read(&percpu_cntr->lc_cntl. \ - la_exit)); - cnt->lc_count += t.lc_count; - cnt->lc_sum += t.lc_sum; - if (t.lc_min < cnt->lc_min) - cnt->lc_min = t.lc_min; - if (t.lc_max > cnt->lc_max) - cnt->lc_max = t.lc_max; - cnt->lc_sumsquare += t.lc_sumsquare; - } + cnt->lc_min = LC_MIN_INIT; - cnt->lc_units = stats->ls_percpu[0]->lp_cntr[idx].lc_units; + num_entry = lprocfs_stats_lock(stats, LPROCFS_GET_NUM_CPU, &flags); + + for (i = 0; i < num_entry; i++) { + if (stats->ls_percpu[i] == NULL) + continue; + cntr_header = &stats->ls_cnt_header[idx]; + percpu_cntr = lprocfs_stats_counter_get(stats, i, idx); + + cnt->lc_count += percpu_cntr->lc_count; + cnt->lc_sum += percpu_cntr->lc_sum; + if (percpu_cntr->lc_min < cnt->lc_min) + cnt->lc_min = percpu_cntr->lc_min; + if (percpu_cntr->lc_max > cnt->lc_max) + cnt->lc_max = percpu_cntr->lc_max; + cnt->lc_sumsquare += percpu_cntr->lc_sumsquare; + } + + lprocfs_stats_unlock(stats, LPROCFS_GET_NUM_CPU, &flags); } +EXPORT_SYMBOL(lprocfs_stats_collect); /** * Append a space separated list of current set flags to str. @@ -768,10 +852,25 @@ static const char *obd_connect_names[] = { "skip_orphan", "large_ea", "full20", + "layout_lock", + "64bithash", + "object_max_bytes", + "imp_recov", + "jobstats", + "umask", + "einprogress", + "grant_param", + "flock_owner", + "lvb_type", + "nanoseconds_times", + "lightweight_conn", + "short_io", + "pingless", + "unknown", NULL }; -static int obd_connect_flags2str(char *page, int count, __u64 flags, char *sep) +int obd_connect_flags2str(char *page, int count, __u64 flags, char *sep) { __u64 mask = 1; int i, ret = 0; @@ -787,14 +886,20 @@ static int obd_connect_flags2str(char *page, int count, __u64 flags, char *sep) ret ? sep : "", flags & ~(mask - 1)); return ret; } +EXPORT_SYMBOL(obd_connect_flags2str); int lprocfs_rd_import(char *page, char **start, off_t off, int count, int *eof, void *data) { - struct lprocfs_counter ret; - struct obd_device *obd = (struct obd_device *)data; - struct obd_import *imp; - int i, j, k, rw = 0; + struct lprocfs_counter ret; + struct lprocfs_counter_header *header; + struct obd_device *obd = (struct obd_device *)data; + struct obd_import *imp; + struct obd_import_conn *conn; + int i; + int j; + int k; + int rw = 0; LASSERT(obd != NULL); LPROCFS_CLIMP_CHECK(obd); @@ -805,13 +910,13 @@ int lprocfs_rd_import(char *page, char **start, off_t off, int count, "import:\n" " name: %s\n" " target: %s\n" - " current_connection: %s\n" " state: %s\n" + " instance: %u\n" " connect_flags: [", obd->obd_name, obd2cli_tgt(obd), - imp->imp_connection->c_remote_uuid.uuid, - ptlrpc_import_state_name(imp->imp_state)); + ptlrpc_import_state_name(imp->imp_state), + imp->imp_connect_data.ocd_instance); i += obd_connect_flags2str(page + i, count - i, imp->imp_connect_data.ocd_connect_flags, ", "); @@ -823,17 +928,38 @@ int lprocfs_rd_import(char *page, char **start, off_t off, int count, i += snprintf(page + i, count - i, "]\n" " connection:\n" - " connection_attempts: %u\n" - " generation: %u\n" - " in-progress_invalidations: %u\n", - imp->imp_conn_cnt, - imp->imp_generation, - cfs_atomic_read(&imp->imp_inval_count)); - + " failover_nids: ["); + spin_lock(&imp->imp_lock); + j = 0; + cfs_list_for_each_entry(conn, &imp->imp_conn_list, oic_item) { + i += snprintf(page + i, count - i, "%s%s", j ? ", " : "", + libcfs_nid2str(conn->oic_conn->c_peer.nid)); + j++; + } + i += snprintf(page + i, count - i, + "]\n" + " current_connection: %s\n" + " connection_attempts: %u\n" + " generation: %u\n" + " in-progress_invalidations: %u\n", + imp->imp_connection == NULL ? "" : + libcfs_nid2str(imp->imp_connection->c_peer.nid), + imp->imp_conn_cnt, + imp->imp_generation, + cfs_atomic_read(&imp->imp_inval_count)); + spin_unlock(&imp->imp_lock); + + if (obd->obd_svc_stats == NULL) + goto out_climp; + + header = &obd->obd_svc_stats->ls_cnt_header[PTLRPC_REQWAIT_CNTR]; lprocfs_stats_collect(obd->obd_svc_stats, PTLRPC_REQWAIT_CNTR, &ret); - if (ret.lc_count != 0) - do_div(ret.lc_sum, ret.lc_count); - else + if (ret.lc_count != 0) { + /* first argument to do_div MUST be __u64 */ + __u64 sum = ret.lc_sum; + do_div(sum, ret.lc_count); + ret.lc_sum = sum; + } else ret.lc_sum = 0; i += snprintf(page + i, count - i, " rpcs:\n" @@ -844,7 +970,7 @@ int lprocfs_rd_import(char *page, char **start, off_t off, int count, cfs_atomic_read(&imp->imp_inflight), cfs_atomic_read(&imp->imp_unregistering), cfs_atomic_read(&imp->imp_timeouts), - ret.lc_sum, ret.lc_units); + ret.lc_sum, header->lc_units); k = 0; for(j = 0; j < IMP_AT_MAX_PORTALS; j++) { @@ -875,7 +1001,10 @@ int lprocfs_rd_import(char *page, char **start, off_t off, int count, PTLRPC_LAST_CNTR + BRW_READ_BYTES + rw, &ret); if (ret.lc_sum > 0 && ret.lc_count > 0) { - do_div(ret.lc_sum, ret.lc_count); + /* first argument to do_div MUST be __u64 */ + __u64 sum = ret.lc_sum; + do_div(sum, ret.lc_count); + ret.lc_sum = sum; i += snprintf(page + i, count - i, " %s_data_averages:\n" " bytes_per_rpc: "LPU64"\n", @@ -884,12 +1013,16 @@ int lprocfs_rd_import(char *page, char **start, off_t off, int count, } k = (int)ret.lc_sum; j = opcode_offset(OST_READ + rw) + EXTRA_MAX_OPCODES; + header = &obd->obd_svc_stats->ls_cnt_header[j]; lprocfs_stats_collect(obd->obd_svc_stats, j, &ret); if (ret.lc_sum > 0 && ret.lc_count != 0) { - do_div(ret.lc_sum, ret.lc_count); + /* first argument to do_div MUST be __u64 */ + __u64 sum = ret.lc_sum; + do_div(sum, ret.lc_count); + ret.lc_sum = sum; i += snprintf(page + i, count - i, " %s_per_rpc: "LPU64"\n", - ret.lc_units, ret.lc_sum); + header->lc_units, ret.lc_sum); j = (int)ret.lc_sum; if (j > 0) i += snprintf(page + i, count - i, @@ -898,9 +1031,11 @@ int lprocfs_rd_import(char *page, char **start, off_t off, int count, } } +out_climp: LPROCFS_CLIMP_EXIT(obd); return i; } +EXPORT_SYMBOL(lprocfs_rd_import); int lprocfs_rd_state(char *page, char **start, off_t off, int count, int *eof, void *data) @@ -932,6 +1067,7 @@ int lprocfs_rd_state(char *page, char **start, off_t off, int count, LPROCFS_CLIMP_EXIT(obd); return i; } +EXPORT_SYMBOL(lprocfs_rd_state); int lprocfs_at_hist_helper(char *page, int count, int rc, struct adaptive_timeout *at) @@ -942,6 +1078,7 @@ int lprocfs_at_hist_helper(char *page, int count, int rc, rc += snprintf(page + rc, count - rc, "\n"); return rc; } +EXPORT_SYMBOL(lprocfs_at_hist_helper); /* See also ptlrpc_lprocfs_rd_timeouts */ int lprocfs_rd_timeouts(char *page, char **start, off_t off, int count, @@ -995,6 +1132,7 @@ int lprocfs_rd_timeouts(char *page, char **start, off_t off, int count, LPROCFS_CLIMP_EXIT(obd); return rc; } +EXPORT_SYMBOL(lprocfs_rd_timeouts); int lprocfs_rd_connect_flags(char *page, char **start, off_t off, int count, int *eof, void *data) @@ -1022,6 +1160,7 @@ int lprocfs_rd_num_exports(char *page, char **start, off_t off, int count, *eof = 1; return snprintf(page, count, "%u\n", obd->obd_num_exports); } +EXPORT_SYMBOL(lprocfs_rd_num_exports); int lprocfs_rd_numrefs(char *page, char **start, off_t off, int count, int *eof, void *data) @@ -1032,6 +1171,7 @@ int lprocfs_rd_numrefs(char *page, char **start, off_t off, int count, *eof = 1; return snprintf(page, count, "%d\n", class->typ_refcnt); } +EXPORT_SYMBOL(lprocfs_rd_numrefs); int lprocfs_obd_setup(struct obd_device *obd, struct lprocfs_vars *list) { @@ -1051,6 +1191,7 @@ int lprocfs_obd_setup(struct obd_device *obd, struct lprocfs_vars *list) } return rc; } +EXPORT_SYMBOL(lprocfs_obd_setup); int lprocfs_obd_cleanup(struct obd_device *obd) { @@ -1068,18 +1209,16 @@ int lprocfs_obd_cleanup(struct obd_device *obd) } return 0; } +EXPORT_SYMBOL(lprocfs_obd_cleanup); static void lprocfs_free_client_stats(struct nid_stat *client_stat) { - 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); + CDEBUG(D_CONFIG, "stat %p - data %p/%p\n", client_stat, + client_stat->nid_proc, client_stat->nid_stats); LASSERTF(cfs_atomic_read(&client_stat->nid_exp_ref_count) == 0, - "count %d\n", - cfs_atomic_read(&client_stat->nid_exp_ref_count)); - - cfs_hlist_del_init(&client_stat->nid_hash); + "nid %s:count %d\n", libcfs_nid2str(client_stat->nid), + atomic_read(&client_stat->nid_exp_ref_count)); if (client_stat->nid_proc) lprocfs_remove(&client_stat->nid_proc); @@ -1087,9 +1226,6 @@ static void lprocfs_free_client_stats(struct nid_stat *client_stat) if (client_stat->nid_stats) lprocfs_free_stats(&client_stat->nid_stats); - if (client_stat->nid_brw_stats) - OBD_FREE_PTR(client_stat->nid_brw_stats); - if (client_stat->nid_ldlm_stats) lprocfs_free_stats(&client_stat->nid_ldlm_stats); @@ -1100,120 +1236,136 @@ static void lprocfs_free_client_stats(struct nid_stat *client_stat) void lprocfs_free_per_client_stats(struct obd_device *obd) { + cfs_hash_t *hash = obd->obd_nid_stats_hash; struct nid_stat *stat; ENTRY; /* we need extra list - because hash_exit called to early */ /* not need locking because all clients is died */ - while(!cfs_list_empty(&obd->obd_nid_stats)) { + while (!cfs_list_empty(&obd->obd_nid_stats)) { stat = cfs_list_entry(obd->obd_nid_stats.next, struct nid_stat, nid_list); cfs_list_del_init(&stat->nid_list); + cfs_hash_del(hash, &stat->nid, &stat->nid_hash); lprocfs_free_client_stats(stat); } - EXIT; } +EXPORT_SYMBOL(lprocfs_free_per_client_stats); struct lprocfs_stats *lprocfs_alloc_stats(unsigned int num, enum lprocfs_stats_flags flags) { - struct lprocfs_stats *stats; - unsigned int percpusize; - unsigned int i, j; - unsigned int num_cpu; + struct lprocfs_stats *stats; + unsigned int num_entry; + unsigned int percpusize = 0; + int i; if (num == 0) return NULL; - if (flags & LPROCFS_STATS_FLAG_NOPERCPU) - num_cpu = 1; - else - num_cpu = cfs_num_possible_cpus(); - - OBD_ALLOC(stats, offsetof(typeof(*stats), ls_percpu[num_cpu])); - if (stats == NULL) - return NULL; - - if (flags & LPROCFS_STATS_FLAG_NOPERCPU) { - stats->ls_flags = flags; - cfs_spin_lock_init(&stats->ls_lock); - /* Use this lock only if there are no percpu areas */ - } else { - stats->ls_flags = 0; - } - - percpusize = offsetof(struct lprocfs_percpu, lp_cntr[num]); - if (num_cpu > 1) - percpusize = CFS_L1_CACHE_ALIGN(percpusize); - - 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])); - return NULL; - } - - stats->ls_num = num; - return stats; + if (lprocfs_no_percpu_stats != 0) + flags |= LPROCFS_STATS_FLAG_NOPERCPU; + + if (flags & LPROCFS_STATS_FLAG_NOPERCPU) + num_entry = 1; + else + num_entry = cfs_num_possible_cpus(); + + /* alloc percpu pointers for all possible cpu slots */ + LIBCFS_ALLOC(stats, offsetof(typeof(*stats), ls_percpu[num_entry])); + if (stats == NULL) + return NULL; + + stats->ls_num = num; + stats->ls_flags = flags; + spin_lock_init(&stats->ls_lock); + + /* alloc num of counter headers */ + LIBCFS_ALLOC(stats->ls_cnt_header, + stats->ls_num * sizeof(struct lprocfs_counter_header)); + if (stats->ls_cnt_header == NULL) + goto fail; + + if ((flags & LPROCFS_STATS_FLAG_NOPERCPU) != 0) { + /* contains only one set counters */ + percpusize = lprocfs_stats_counter_size(stats); + LIBCFS_ALLOC_ATOMIC(stats->ls_percpu[0], percpusize); + if (stats->ls_percpu[0] == NULL) + goto fail; + stats->ls_biggest_alloc_num = 1; + } else if ((flags & LPROCFS_STATS_FLAG_IRQ_SAFE) != 0) { + /* alloc all percpu data, currently only obd_memory use this */ + for (i = 0; i < num_entry; ++i) + if (lprocfs_stats_alloc_one(stats, i) < 0) + goto fail; + } + + return stats; + +fail: + lprocfs_free_stats(&stats); + return NULL; } +EXPORT_SYMBOL(lprocfs_alloc_stats); void lprocfs_free_stats(struct lprocfs_stats **statsh) { - struct lprocfs_stats *stats = *statsh; - unsigned int num_cpu; - unsigned int percpusize; - unsigned int i; + struct lprocfs_stats *stats = *statsh; + unsigned int num_entry; + unsigned int percpusize; + unsigned int i; if (stats == NULL || stats->ls_num == 0) return; *statsh = NULL; - if (stats->ls_flags & LPROCFS_STATS_FLAG_NOPERCPU) - num_cpu = 1; - else - num_cpu = cfs_num_possible_cpus(); + if (stats->ls_flags & LPROCFS_STATS_FLAG_NOPERCPU) + num_entry = 1; + else + num_entry = cfs_num_possible_cpus(); - percpusize = offsetof(struct lprocfs_percpu, lp_cntr[stats->ls_num]); - if (num_cpu > 1) - percpusize = CFS_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])); + percpusize = lprocfs_stats_counter_size(stats); + for (i = 0; i < num_entry; i++) + if (stats->ls_percpu[i] != NULL) + LIBCFS_FREE(stats->ls_percpu[i], percpusize); + if (stats->ls_cnt_header != NULL) + LIBCFS_FREE(stats->ls_cnt_header, stats->ls_num * + sizeof(struct lprocfs_counter_header)); + LIBCFS_FREE(stats, offsetof(typeof(*stats), ls_percpu[num_entry])); } +EXPORT_SYMBOL(lprocfs_free_stats); void lprocfs_clear_stats(struct lprocfs_stats *stats) { - struct lprocfs_counter *percpu_cntr; - int i,j; - unsigned int num_cpu; - - num_cpu = lprocfs_stats_lock(stats, LPROCFS_GET_NUM_CPU); - - for (i = 0; i < num_cpu; i++) { - for (j = 0; j < stats->ls_num; j++) { - percpu_cntr = &(stats->ls_percpu[i])->lp_cntr[j]; - cfs_atomic_inc(&percpu_cntr->lc_cntl.la_entry); - percpu_cntr->lc_count = 0; - percpu_cntr->lc_sum = 0; - percpu_cntr->lc_min = LC_MIN_INIT; - percpu_cntr->lc_max = 0; - percpu_cntr->lc_sumsquare = 0; - cfs_atomic_inc(&percpu_cntr->lc_cntl.la_exit); - } - } - - lprocfs_stats_unlock(stats); + struct lprocfs_counter *percpu_cntr; + struct lprocfs_counter_header *header; + int i; + int j; + unsigned int num_entry; + unsigned long flags = 0; + + num_entry = lprocfs_stats_lock(stats, LPROCFS_GET_NUM_CPU, &flags); + + for (i = 0; i < num_entry; i++) { + if (stats->ls_percpu[i] == NULL) + continue; + for (j = 0; j < stats->ls_num; j++) { + header = &stats->ls_cnt_header[j]; + percpu_cntr = lprocfs_stats_counter_get(stats, i, j); + percpu_cntr->lc_count = 0; + percpu_cntr->lc_min = LC_MIN_INIT; + percpu_cntr->lc_max = 0; + percpu_cntr->lc_sumsquare = 0; + percpu_cntr->lc_sum = 0; + if (stats->ls_flags & LPROCFS_STATS_FLAG_IRQ_SAFE) + percpu_cntr->lc_sum_irq = 0; + } + } + + lprocfs_stats_unlock(stats, LPROCFS_GET_NUM_CPU, &flags); } +EXPORT_SYMBOL(lprocfs_clear_stats); static ssize_t lprocfs_stats_seq_write(struct file *file, const char *buf, size_t len, loff_t *off) @@ -1228,10 +1380,9 @@ static ssize_t lprocfs_stats_seq_write(struct file *file, const char *buf, static void *lprocfs_stats_seq_start(struct seq_file *p, loff_t *pos) { - struct lprocfs_stats *stats = p->private; - /* return 1st cpu location */ - return (*pos >= stats->ls_num) ? NULL : - &(stats->ls_percpu[0]->lp_cntr[*pos]); + struct lprocfs_stats *stats = p->private; + + return (*pos < stats->ls_num) ? pos : NULL; } static void lprocfs_stats_seq_stop(struct seq_file *p, void *v) @@ -1240,61 +1391,61 @@ static void lprocfs_stats_seq_stop(struct seq_file *p, void *v) static void *lprocfs_stats_seq_next(struct seq_file *p, void *v, loff_t *pos) { - struct lprocfs_stats *stats = p->private; - ++*pos; - return (*pos >= stats->ls_num) ? NULL : - &(stats->ls_percpu[0]->lp_cntr[*pos]); + (*pos)++; + + return lprocfs_stats_seq_start(p, pos); } /* seq file export of one lprocfs counter */ 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 ret; - int idx, rc = 0; - - if (cntr == &(stats->ls_percpu[0])->lp_cntr[0]) { - struct timeval now; - cfs_gettimeofday(&now); - rc = seq_printf(p, "%-25s %lu.%lu secs.usecs\n", - "snapshot_time", now.tv_sec, now.tv_usec); - if (rc < 0) - return rc; - } - idx = cntr - &(stats->ls_percpu[0])->lp_cntr[0]; - - lprocfs_stats_collect(stats, idx, &ret); - - if (ret.lc_count == 0) - goto out; - - 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, " "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, " "LPD64, ret.lc_sumsquare); - if (rc < 0) - goto out; - } - rc = seq_printf(p, "\n"); - out: - return (rc < 0) ? rc : 0; + struct lprocfs_stats *stats = p->private; + struct lprocfs_counter_header *hdr; + struct lprocfs_counter ctr; + int idx = *(loff_t *)v; + int rc = 0; + + if (idx == 0) { + struct timeval now; + + cfs_gettimeofday(&now); + rc = seq_printf(p, "%-25s %lu.%lu secs.usecs\n", + "snapshot_time", now.tv_sec, now.tv_usec); + if (rc < 0) + return rc; + } + + hdr = &stats->ls_cnt_header[idx]; + lprocfs_stats_collect(stats, idx, &ctr); + + if (ctr.lc_count == 0) + goto out; + + rc = seq_printf(p, "%-25s "LPD64" samples [%s]", hdr->lc_name, + ctr.lc_count, hdr->lc_units); + if (rc < 0) + goto out; + + if ((hdr->lc_config & LPROCFS_CNTR_AVGMINMAX) && ctr.lc_count > 0) { + rc = seq_printf(p, " "LPD64" "LPD64" "LPD64, + ctr.lc_min, ctr.lc_max, ctr.lc_sum); + if (rc < 0) + goto out; + if (hdr->lc_config & LPROCFS_CNTR_STDDEV) + rc = seq_printf(p, " "LPD64, ctr.lc_sumsquare); + if (rc < 0) + goto out; + } + rc = seq_printf(p, "\n"); +out: + return (rc < 0) ? rc : 0; } struct seq_operations lprocfs_stats_seq_sops = { - start: lprocfs_stats_seq_start, - stop: lprocfs_stats_seq_stop, - next: lprocfs_stats_seq_next, - show: lprocfs_stats_seq_show, + .start = lprocfs_stats_seq_start, + .stop = lprocfs_stats_seq_stop, + .next = lprocfs_stats_seq_next, + .show = lprocfs_stats_seq_show, }; static int lprocfs_stats_seq_open(struct inode *inode, struct file *file) @@ -1331,37 +1482,55 @@ int lprocfs_register_stats(struct proc_dir_entry *root, const char *name, struct proc_dir_entry *entry; LASSERT(root != NULL); + LPROCFS_WRITE_ENTRY(); entry = create_proc_entry(name, 0644, root); + if (entry) { + entry->proc_fops = &lprocfs_stats_seq_fops; + entry->data = stats; + } + + LPROCFS_WRITE_EXIT(); + if (entry == NULL) return -ENOMEM; - entry->proc_fops = &lprocfs_stats_seq_fops; - entry->data = stats; + return 0; } +EXPORT_SYMBOL(lprocfs_register_stats); void lprocfs_counter_init(struct lprocfs_stats *stats, int index, - unsigned conf, const char *name, const char *units) -{ - struct lprocfs_counter *c; - int i; - unsigned int num_cpu; - - LASSERT(stats != NULL); - - num_cpu = lprocfs_stats_lock(stats, LPROCFS_GET_NUM_CPU); - - for (i = 0; i < num_cpu; i++) { - c = &(stats->ls_percpu[i]->lp_cntr[index]); - c->lc_config = conf; - c->lc_count = 0; - c->lc_sum = 0; - c->lc_min = LC_MIN_INIT; - c->lc_max = 0; - c->lc_name = name; - c->lc_units = units; - } - - lprocfs_stats_unlock(stats); + unsigned conf, const char *name, const char *units) +{ + struct lprocfs_counter_header *header; + struct lprocfs_counter *percpu_cntr; + unsigned long flags = 0; + unsigned int i; + unsigned int num_cpu; + + LASSERT(stats != NULL); + + header = &stats->ls_cnt_header[index]; + LASSERTF(header != NULL, "Failed to allocate stats header:[%d]%s/%s\n", + index, name, units); + + header->lc_config = conf; + header->lc_name = name; + header->lc_units = units; + + num_cpu = lprocfs_stats_lock(stats, LPROCFS_GET_NUM_CPU, &flags); + for (i = 0; i < num_cpu; ++i) { + if (stats->ls_percpu[i] == NULL) + continue; + percpu_cntr = lprocfs_stats_counter_get(stats, i, index); + percpu_cntr->lc_count = 0; + percpu_cntr->lc_min = LC_MIN_INIT; + percpu_cntr->lc_max = 0; + percpu_cntr->lc_sumsquare = 0; + percpu_cntr->lc_sum = 0; + if ((stats->ls_flags & LPROCFS_STATS_FLAG_IRQ_SAFE) != 0) + percpu_cntr->lc_sum_irq = 0; + } + lprocfs_stats_unlock(stats, LPROCFS_GET_NUM_CPU, &flags); } EXPORT_SYMBOL(lprocfs_counter_init); @@ -1392,7 +1561,6 @@ void lprocfs_init_ops_stats(int num_private_stats, struct lprocfs_stats *stats) LPROCFS_OBD_OP_INIT(num_private_stats, stats, fid_init); LPROCFS_OBD_OP_INIT(num_private_stats, stats, fid_fini); LPROCFS_OBD_OP_INIT(num_private_stats, stats, fid_alloc); - LPROCFS_OBD_OP_INIT(num_private_stats, stats, fid_delete); LPROCFS_OBD_OP_INIT(num_private_stats, stats, statfs); LPROCFS_OBD_OP_INIT(num_private_stats, stats, statfs_async); LPROCFS_OBD_OP_INIT(num_private_stats, stats, packmd); @@ -1435,7 +1603,6 @@ void lprocfs_init_ops_stats(int num_private_stats, struct lprocfs_stats *stats) 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, quota_adjust_qunit); LPROCFS_OBD_OP_INIT(num_private_stats, stats, ping); LPROCFS_OBD_OP_INIT(num_private_stats, stats, pool_new); LPROCFS_OBD_OP_INIT(num_private_stats, stats, pool_rem); @@ -1444,6 +1611,7 @@ void lprocfs_init_ops_stats(int num_private_stats, struct lprocfs_stats *stats) LPROCFS_OBD_OP_INIT(num_private_stats, stats, getref); LPROCFS_OBD_OP_INIT(num_private_stats, stats, putref); } +EXPORT_SYMBOL(lprocfs_init_ops_stats); int lprocfs_alloc_obd_stats(struct obd_device *obd, unsigned num_private_stats) { @@ -1469,7 +1637,7 @@ int lprocfs_alloc_obd_stats(struct obd_device *obd, unsigned num_private_stats) * , and that the corresponding line item * LPROCFS_OBD_OP_INIT(.., .., opname) * is missing from the list above. */ - LASSERTF(stats->ls_percpu[0]->lp_cntr[i].lc_name != NULL, + LASSERTF(stats->ls_cnt_header[i].lc_name != NULL, "Missing obd_stat initializer obd_op " "operation at offset %d.\n", i - num_private_stats); } @@ -1482,12 +1650,14 @@ int lprocfs_alloc_obd_stats(struct obd_device *obd, unsigned num_private_stats) } return rc; } +EXPORT_SYMBOL(lprocfs_alloc_obd_stats); void lprocfs_free_obd_stats(struct obd_device *obd) { if (obd->obd_stats) lprocfs_free_stats(&obd->obd_stats); } +EXPORT_SYMBOL(lprocfs_free_obd_stats); #define LPROCFS_MD_OP_INIT(base, stats, op) \ do { \ @@ -1496,25 +1666,10 @@ do { \ lprocfs_counter_init(stats, coffset, 0, #op, "reqs"); \ } while (0) -int lprocfs_alloc_md_stats(struct obd_device *obd, - unsigned num_private_stats) +void lprocfs_init_mps_stats(int num_private_stats, struct lprocfs_stats *stats) { - struct lprocfs_stats *stats; - unsigned int num_stats; - int rc, i; - - LASSERT(obd->md_stats == NULL); - LASSERT(obd->obd_proc_entry != NULL); - LASSERT(obd->md_cntr_base == 0); - - num_stats = 1 + MD_COUNTER_OFFSET(revalidate_lock) + - num_private_stats; - stats = lprocfs_alloc_stats(num_stats, 0); - if (stats == NULL) - return -ENOMEM; - LPROCFS_MD_OP_INIT(num_private_stats, stats, getstatus); - LPROCFS_MD_OP_INIT(num_private_stats, stats, change_cbdata); + LPROCFS_MD_OP_INIT(num_private_stats, stats, null_inode); LPROCFS_MD_OP_INIT(num_private_stats, stats, find_cbdata); LPROCFS_MD_OP_INIT(num_private_stats, stats, close); LPROCFS_MD_OP_INIT(num_private_stats, stats, create); @@ -1545,9 +1700,30 @@ int lprocfs_alloc_md_stats(struct obd_device *obd, 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); +} +EXPORT_SYMBOL(lprocfs_init_mps_stats); + +int lprocfs_alloc_md_stats(struct obd_device *obd, + unsigned num_private_stats) +{ + struct lprocfs_stats *stats; + unsigned int num_stats; + int rc, i; + + LASSERT(obd->md_stats == NULL); + LASSERT(obd->obd_proc_entry != NULL); + LASSERT(obd->md_cntr_base == 0); + + num_stats = 1 + MD_COUNTER_OFFSET(revalidate_lock) + + num_private_stats; + stats = lprocfs_alloc_stats(num_stats, 0); + if (stats == NULL) + return -ENOMEM; + + lprocfs_init_mps_stats(num_private_stats, stats); for (i = num_private_stats; i < num_stats; i++) { - if (stats->ls_percpu[0]->lp_cntr[i].lc_name == NULL) { + if (stats->ls_cnt_header[i].lc_name == NULL) { CERROR("Missing md_stat initializer md_op " "operation at offset %d. Aborting.\n", i - num_private_stats); @@ -1563,6 +1739,7 @@ int lprocfs_alloc_md_stats(struct obd_device *obd, } return rc; } +EXPORT_SYMBOL(lprocfs_alloc_md_stats); void lprocfs_free_md_stats(struct obd_device *obd) { @@ -1574,6 +1751,7 @@ void lprocfs_free_md_stats(struct obd_device *obd) lprocfs_free_stats(&stats); } } +EXPORT_SYMBOL(lprocfs_free_md_stats); void lprocfs_init_ldlm_stats(struct lprocfs_stats *ldlm_stats) { @@ -1596,6 +1774,7 @@ void lprocfs_init_ldlm_stats(struct lprocfs_stats *ldlm_stats) LDLM_GL_CALLBACK - LDLM_FIRST_OPC, 0, "ldlm_gl_callback", "reqs"); } +EXPORT_SYMBOL(lprocfs_init_ldlm_stats); int lprocfs_exp_rd_nid(char *page, char **start, off_t off, int count, int *eof, void *data) @@ -1623,15 +1802,18 @@ lprocfs_exp_rd_cb_data_init(struct exp_uuid_cb_data *cb_data, char *page, cb_data->len = len; } -void lprocfs_exp_print_uuid(void *obj, void *cb_data) +int lprocfs_exp_print_uuid(cfs_hash_t *hs, cfs_hash_bd_t *bd, + cfs_hlist_node_t *hnode, void *cb_data) + { - struct obd_export *exp = (struct obd_export *)obj; + struct obd_export *exp = cfs_hash_object(hs, hnode); struct exp_uuid_cb_data *data = (struct exp_uuid_cb_data *)cb_data; if (exp->exp_nid_stats) *data->len += snprintf((data->page + *data->len), data->count, "%s\n", obd_uuid2str(&exp->exp_client_uuid)); + return 0; } int lprocfs_exp_rd_uuid(char *page, char **start, off_t off, int count, @@ -1650,21 +1832,23 @@ int lprocfs_exp_rd_uuid(char *page, char **start, off_t off, int count, return (*cb_data.len); } -void lprocfs_exp_print_hash(void *obj, void *cb_data) +int lprocfs_exp_print_hash(cfs_hash_t *hs, cfs_hash_bd_t *bd, + cfs_hlist_node_t *hnode, void *cb_data) + { struct exp_uuid_cb_data *data = cb_data; - struct obd_export *exp = obj; - cfs_hash_t *hs; + struct obd_export *exp = cfs_hash_object(hs, hnode); - hs = exp->exp_lock_hash; - if (hs) { - if (!*data->len) + if (exp->exp_lock_hash != NULL) { + if (!*data->len) { *data->len += cfs_hash_debug_header(data->page, data->count); - + } *data->len += cfs_hash_debug_str(hs, data->page + *data->len, data->count); } + + return 0; } int lprocfs_exp_rd_hash(char *page, char **start, off_t off, int count, @@ -1694,33 +1878,28 @@ int lprocfs_nid_stats_clear_read(char *page, char **start, off_t off, } EXPORT_SYMBOL(lprocfs_nid_stats_clear_read); -int lprocfs_nid_stats_clear_write_cb(void *obj, void *data) +static int lprocfs_nid_stats_clear_write_cb(void *obj, void *data) { struct nid_stat *stat = obj; - int i; ENTRY; - /* object has only hash + iterate_all references. - * add/delete blocked by hash bucket lock */ + CDEBUG(D_INFO,"refcnt %d\n", cfs_atomic_read(&stat->nid_exp_ref_count)); - if (cfs_atomic_read(&stat->nid_exp_ref_count) == 2) { - cfs_spin_lock(&stat->nid_obd->obd_nid_lock); - cfs_list_move(&stat->nid_list, data); - cfs_spin_unlock(&stat->nid_obd->obd_nid_lock); + if (cfs_atomic_read(&stat->nid_exp_ref_count) == 1) { + /* object has only hash references. */ + spin_lock(&stat->nid_obd->obd_nid_lock); + cfs_list_move(&stat->nid_list, data); + spin_unlock(&stat->nid_obd->obd_nid_lock); RETURN(1); } /* we has reference to object - only clear data*/ 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(&stat->nid_brw_stats->hist[i]); - } RETURN(0); } int lprocfs_nid_stats_clear_write(struct file *file, const char *buffer, - unsigned long count, void *data) + unsigned long count, void *data) { struct obd_device *obd = (struct obd_device *)data; struct nid_stat *client_stat; @@ -1771,7 +1950,8 @@ int lprocfs_exp_setup(struct obd_export *exp, lnet_nid_t *nid, int *newnid) new_stat->nid = *nid; new_stat->nid_obd = exp->exp_obd; - cfs_atomic_set(&new_stat->nid_exp_ref_count, 0); + /* we need set default refcount to 1 to balance obd_disconnect */ + cfs_atomic_set(&new_stat->nid_exp_ref_count, 1); old_stat = cfs_hash_findadd_unique(obd->obd_nid_stats_hash, nid, &new_stat->nid_hash); @@ -1779,22 +1959,17 @@ int lprocfs_exp_setup(struct obd_export *exp, lnet_nid_t *nid, int *newnid) old_stat, libcfs_nid2str(*nid), cfs_atomic_read(&new_stat->nid_exp_ref_count)); + /* We need to release old stats because lprocfs_exp_cleanup() hasn't + * been and will never be called. */ + if (exp->exp_nid_stats) { + nidstat_putref(exp->exp_nid_stats); + exp->exp_nid_stats = NULL; + } + /* Return -EALREADY here so that we know that the /proc * entry already has been created */ if (old_stat != new_stat) { - cfs_spin_lock(&obd->obd_nid_lock); - if (exp->exp_nid_stats != old_stat) { - if (exp->exp_nid_stats) - nidstat_putref(exp->exp_nid_stats); - exp->exp_nid_stats = old_stat; - } else { - /* cfs_hash_findadd_unique() has added - * old_stat's refcount */ - nidstat_putref(old_stat); - } - - cfs_spin_unlock(&obd->obd_nid_lock); - + exp->exp_nid_stats = old_stat; GOTO(destroy_new, rc = -EALREADY); } /* not found - create */ @@ -1803,7 +1978,7 @@ int lprocfs_exp_setup(struct obd_export *exp, lnet_nid_t *nid, int *newnid) GOTO(destroy_new, rc = -ENOMEM); memcpy(buffer, libcfs_nid2str(*nid), LNET_NIDSTR_SIZE); - new_stat->nid_proc = lprocfs_register(buffer, + new_stat->nid_proc = lprocfs_register(buffer, obd->obd_proc_exports_entry, NULL, NULL); OBD_FREE(buffer, LNET_NIDSTR_SIZE); @@ -1830,15 +2005,12 @@ int lprocfs_exp_setup(struct obd_export *exp, lnet_nid_t *nid, int *newnid) GOTO(destroy_new_ns, rc); } - if (exp->exp_nid_stats) - nidstat_putref(exp->exp_nid_stats); - nidstat_getref(new_stat); exp->exp_nid_stats = new_stat; *newnid = 1; /* protect competitive add to list, not need locking on destroy */ - cfs_spin_lock(&obd->obd_nid_lock); - cfs_list_add(&new_stat->nid_list, &obd->obd_nid_stats); - cfs_spin_unlock(&obd->obd_nid_lock); + spin_lock(&obd->obd_nid_lock); + cfs_list_add(&new_stat->nid_list, &obd->obd_nid_stats); + spin_unlock(&obd->obd_nid_lock); RETURN(rc); @@ -1848,9 +2020,11 @@ destroy_new_ns: cfs_hash_del(obd->obd_nid_stats_hash, nid, &new_stat->nid_hash); destroy_new: + nidstat_putref(new_stat); OBD_FREE_PTR(new_stat); RETURN(rc); } +EXPORT_SYMBOL(lprocfs_exp_setup); int lprocfs_exp_cleanup(struct obd_export *exp) { @@ -1864,12 +2038,14 @@ int lprocfs_exp_cleanup(struct obd_export *exp) return 0; } +EXPORT_SYMBOL(lprocfs_exp_cleanup); int lprocfs_write_helper(const char *buffer, unsigned long count, int *val) { return lprocfs_write_frac_helper(buffer, count, val, 1); } +EXPORT_SYMBOL(lprocfs_write_helper); int lprocfs_write_frac_helper(const char *buffer, unsigned long count, int *val, int mult) @@ -1912,6 +2088,7 @@ int lprocfs_write_frac_helper(const char *buffer, unsigned long count, } return 0; } +EXPORT_SYMBOL(lprocfs_write_frac_helper); int lprocfs_read_frac_helper(char *buffer, unsigned long count, long val, int mult) @@ -1966,11 +2143,13 @@ int lprocfs_read_frac_helper(char *buffer, unsigned long count, long val, buffer[prtn++] ='\n'; return prtn; } +EXPORT_SYMBOL(lprocfs_read_frac_helper); int lprocfs_write_u64_helper(const char *buffer, unsigned long count,__u64 *val) { return lprocfs_write_frac_u64_helper(buffer, count, val, 1); } +EXPORT_SYMBOL(lprocfs_write_u64_helper); int lprocfs_write_frac_u64_helper(const char *buffer, unsigned long count, __u64 *val, int mult) @@ -2032,27 +2211,86 @@ int lprocfs_write_frac_u64_helper(const char *buffer, unsigned long count, *val = whole * mult + frac; return 0; } +EXPORT_SYMBOL(lprocfs_write_frac_u64_helper); + +static char *lprocfs_strnstr(const char *s1, const char *s2, size_t len) +{ + size_t l2; + + l2 = strlen(s2); + if (!l2) + return (char *)s1; + while (len >= l2) { + len--; + if (!memcmp(s1, s2, l2)) + return (char *)s1; + s1++; + } + return NULL; +} -int lprocfs_seq_create(cfs_proc_dir_entry_t *parent, char *name, mode_t mode, - struct file_operations *seq_fops, void *data) +/** + * Find the string \a name in the input \a buffer, and return a pointer to the + * value immediately following \a name, reducing \a count appropriately. + * If \a name is not found the original \a buffer is returned. + */ +char *lprocfs_find_named_value(const char *buffer, const char *name, + unsigned long *count) +{ + char *val; + size_t buflen = *count; + + /* there is no strnstr() in rhel5 and ubuntu kernels */ + val = lprocfs_strnstr(buffer, name, buflen); + if (val == NULL) + return (char *)buffer; + + val += strlen(name); /* skip prefix */ + while (val < buffer + buflen && isspace(*val)) /* skip separator */ + val++; + + *count = 0; + while (val < buffer + buflen && isalnum(*val)) { + ++*count; + ++val; + } + + return val - *count; +} +EXPORT_SYMBOL(lprocfs_find_named_value); + +int lprocfs_seq_create(cfs_proc_dir_entry_t *parent, + const char *name, + mode_t mode, + const struct file_operations *seq_fops, + void *data) { struct proc_dir_entry *entry; ENTRY; + /* Disallow secretly (un)writable entries. */ + LASSERT((seq_fops->write == NULL) == ((mode & 0222) == 0)); + + LPROCFS_WRITE_ENTRY(); entry = create_proc_entry(name, mode, parent); + if (entry) { + entry->proc_fops = seq_fops; + entry->data = data; + } + LPROCFS_WRITE_EXIT(); + if (entry == NULL) RETURN(-ENOMEM); - entry->proc_fops = seq_fops; - entry->data = data; RETURN(0); } EXPORT_SYMBOL(lprocfs_seq_create); -__inline__ int lprocfs_obd_seq_create(struct obd_device *dev, char *name, - mode_t mode, - struct file_operations *seq_fops, - void *data) +int lprocfs_obd_seq_create(struct obd_device *dev, + const char *name, + mode_t mode, + const struct file_operations *seq_fops, + void *data) { return (lprocfs_seq_create(dev->obd_proc_entry, name, mode, seq_fops, data)); @@ -2061,12 +2299,12 @@ EXPORT_SYMBOL(lprocfs_obd_seq_create); void lprocfs_oh_tally(struct obd_histogram *oh, unsigned int value) { - if (value >= OBD_HIST_MAX) - value = OBD_HIST_MAX - 1; + if (value >= OBD_HIST_MAX) + value = OBD_HIST_MAX - 1; - cfs_spin_lock(&oh->oh_lock); - oh->oh_buckets[value]++; - cfs_spin_unlock(&oh->oh_lock); + spin_lock(&oh->oh_lock); + oh->oh_buckets[value]++; + spin_unlock(&oh->oh_lock); } EXPORT_SYMBOL(lprocfs_oh_tally); @@ -2094,9 +2332,9 @@ EXPORT_SYMBOL(lprocfs_oh_sum); void lprocfs_oh_clear(struct obd_histogram *oh) { - cfs_spin_lock(&oh->oh_lock); - memset(oh->oh_buckets, 0, sizeof(oh->oh_buckets)); - cfs_spin_unlock(&oh->oh_lock); + spin_lock(&oh->oh_lock); + memset(oh->oh_buckets, 0, sizeof(oh->oh_buckets)); + spin_unlock(&oh->oh_lock); } EXPORT_SYMBOL(lprocfs_oh_clear); @@ -2179,8 +2417,13 @@ int lprocfs_obd_rd_recovery_status(char *page, char **start, off_t off, "last_transno: "LPD64"\n", obd->obd_next_recovery_transno - 1)<=0) goto out; - if (lprocfs_obd_snprintf(&page, size, &len, "VBR: %s\n", - obd->obd_version_recov ? "ON" : "OFF")<=0) + if (lprocfs_obd_snprintf(&page, size, &len, "VBR: %s\n", + obd->obd_version_recov ? + "ENABLED" : "DISABLED") <=0) + goto out; + if (lprocfs_obd_snprintf(&page, size, &len, "IR: %s\n", + obd->obd_no_ir ? + "DISABLED" : "ENABLED") <= 0) goto out; goto fclose; } @@ -2191,11 +2434,15 @@ int lprocfs_obd_rd_recovery_status(char *page, char **start, off_t off, obd->obd_recovery_start) <= 0) goto out; 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) + cfs_time_current_sec() >= + obd->obd_recovery_start + + obd->obd_recovery_timeout ? 0 : + obd->obd_recovery_start + + obd->obd_recovery_timeout - + cfs_time_current_sec()) <= 0) goto out; if (lprocfs_obd_snprintf(&page, size, &len,"connected_clients: %d/%d\n", - obd->obd_connected_clients, + cfs_atomic_read(&obd->obd_connected_clients), obd->obd_max_recoverable_clients) <= 0) goto out; /* Number of clients that have completed recovery */ @@ -2208,7 +2455,7 @@ int lprocfs_obd_rd_recovery_status(char *page, char **start, off_t off, <=0) goto out; if (lprocfs_obd_snprintf(&page, size, &len,"completed_clients: %d\n", - obd->obd_connected_clients - + cfs_atomic_read(&obd->obd_connected_clients) - cfs_atomic_read(&obd->obd_lock_replay_clients)) <=0) goto out; @@ -2233,6 +2480,36 @@ out: } EXPORT_SYMBOL(lprocfs_obd_rd_recovery_status); +int lprocfs_obd_rd_ir_factor(char *page, char **start, off_t off, + int count, int *eof, void *data) +{ + struct obd_device *obd = (struct obd_device *)data; + LASSERT(obd != NULL); + + return snprintf(page, count, "%d\n", + obd->obd_recovery_ir_factor); +} +EXPORT_SYMBOL(lprocfs_obd_rd_ir_factor); + +int lprocfs_obd_wr_ir_factor(struct file *file, const char *buffer, + unsigned long count, void *data) +{ + struct obd_device *obd = (struct obd_device *)data; + int val, rc; + LASSERT(obd != NULL); + + rc = lprocfs_write_helper(buffer, count, &val); + if (rc) + return rc; + + if (val < OBD_IR_FACTOR_MIN || val > OBD_IR_FACTOR_MAX) + return -EINVAL; + + obd->obd_recovery_ir_factor = val; + return count; +} +EXPORT_SYMBOL(lprocfs_obd_wr_ir_factor); + int lprocfs_obd_rd_recovery_time_soft(char *page, char **start, off_t off, int count, int *eof, void *data) { @@ -2266,7 +2543,7 @@ int lprocfs_obd_rd_recovery_time_hard(char *page, char **start, off_t off, struct obd_device *obd = data; LASSERT(obd != NULL); - return snprintf(page, count, "%lu\n", obd->obd_recovery_time_hard); + return snprintf(page, count, "%u\n", obd->obd_recovery_time_hard); } EXPORT_SYMBOL(lprocfs_obd_rd_recovery_time_hard); @@ -2286,56 +2563,30 @@ int lprocfs_obd_wr_recovery_time_hard(struct file *file, const char *buffer, } EXPORT_SYMBOL(lprocfs_obd_wr_recovery_time_hard); -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); -EXPORT_SYMBOL(lprocfs_clear_stats); -EXPORT_SYMBOL(lprocfs_register_stats); -EXPORT_SYMBOL(lprocfs_init_ops_stats); -EXPORT_SYMBOL(lprocfs_init_ldlm_stats); -EXPORT_SYMBOL(lprocfs_alloc_obd_stats); -EXPORT_SYMBOL(lprocfs_alloc_md_stats); -EXPORT_SYMBOL(lprocfs_free_obd_stats); -EXPORT_SYMBOL(lprocfs_free_md_stats); -EXPORT_SYMBOL(lprocfs_exp_setup); -EXPORT_SYMBOL(lprocfs_exp_cleanup); +int lprocfs_obd_rd_max_pages_per_rpc(char *page, char **start, off_t off, + int count, int *eof, void *data) +{ + struct obd_device *dev = data; + struct client_obd *cli = &dev->u.cli; + int rc; -EXPORT_SYMBOL(lprocfs_rd_u64); -EXPORT_SYMBOL(lprocfs_rd_atomic); -EXPORT_SYMBOL(lprocfs_wr_atomic); -EXPORT_SYMBOL(lprocfs_rd_uint); -EXPORT_SYMBOL(lprocfs_wr_uint); -EXPORT_SYMBOL(lprocfs_rd_uuid); -EXPORT_SYMBOL(lprocfs_rd_name); -EXPORT_SYMBOL(lprocfs_rd_fstype); -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_import); -EXPORT_SYMBOL(lprocfs_rd_state); -EXPORT_SYMBOL(lprocfs_rd_timeouts); -EXPORT_SYMBOL(lprocfs_rd_blksize); -EXPORT_SYMBOL(lprocfs_rd_kbytestotal); -EXPORT_SYMBOL(lprocfs_rd_kbytesfree); -EXPORT_SYMBOL(lprocfs_rd_kbytesavail); -EXPORT_SYMBOL(lprocfs_rd_filestotal); -EXPORT_SYMBOL(lprocfs_rd_filesfree); + client_obd_list_lock(&cli->cl_loi_list_lock); + rc = snprintf(page, count, "%d\n", cli->cl_max_pages_per_rpc); + client_obd_list_unlock(&cli->cl_loi_list_lock); + return rc; +} +EXPORT_SYMBOL(lprocfs_obd_rd_max_pages_per_rpc); -EXPORT_SYMBOL(lprocfs_write_helper); -EXPORT_SYMBOL(lprocfs_write_frac_helper); -EXPORT_SYMBOL(lprocfs_read_frac_helper); -EXPORT_SYMBOL(lprocfs_write_u64_helper); -EXPORT_SYMBOL(lprocfs_write_frac_u64_helper); -EXPORT_SYMBOL(lprocfs_stats_collect); +int lprocfs_target_rd_instance(char *page, char **start, off_t off, + int count, int *eof, void *data) +{ + struct obd_device *obd = (struct obd_device *)data; + struct obd_device_target *target = &obd->u.obt; + + LASSERT(obd != NULL); + LASSERT(target->obt_magic == OBT_MAGIC); + *eof = 1; + return snprintf(page, count, "%u\n", obd->u.obt.obt_instance); +} +EXPORT_SYMBOL(lprocfs_target_rd_instance); #endif /* LPROCFS*/