-/* -*- 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.
/*
* Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
+ *
+ * Copyright (c) 2011, Whamcloud, Inc.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
* Author: Hariharan Thantry <thantry@users.sourceforge.net>
*/
-#ifndef EXPORT_SYMTAB
-# define EXPORT_SYMTAB
-#endif
#define DEBUG_SUBSYSTEM S_CLASS
#ifndef __KERNEL__
#include <lustre_fsfilt.h>
#include <lustre_log.h>
#include <lustre/lustre_idl.h>
+#include <dt_object.h>
#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 */
}
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;
+}
+
/* lprocfs API calls */
/* Function that emulates snprintf but also has the side effect of advancing
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;
proc->data = data;
if (fops)
proc->proc_fops = fops;
+ LPROCFS_WRITE_EXIT();
return proc;
}
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)
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];
if (strlen(list->name) > sizeof(pathbuf) - 1) {
OBD_ALLOC(pathcopy, pathsize);
if (pathcopy == NULL)
- return -ENOMEM;
+ GOTO(out, rc = -ENOMEM);
} else {
pathcopy = pathbuf;
}
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"));
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)
proc->data = (list->data ? list->data : data);
list++;
}
- return 0;
+out:
+ LPROCFS_WRITE_EXIT();
+ return rc;
}
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));
+#ifdef HAVE_PROCFS_USERS
+ /* if procfs uses user count to synchronize deletion of
+ * proc entry, there is no protection for rm_entry->data,
+ * then lprocfs_fops_read and lprocfs_fops_write maybe
+ * call proc_dir_entry->read_proc (or write_proc) with
+ * proc_dir_entry->data == NULL, then cause kernel Oops.
+ * see bug19706 for detailed information */
+
+ /* procfs won't free rm_entry->data if it isn't a LINK,
+ * and Lustre won't use rm_entry->data if it is a LINK */
+ if (S_ISLNK(rm_entry->mode))
+ rm_entry->data = NULL;
+#else
/* Now, the rm_entry->deleted flags is protected
* by _lprocfs_lock. */
rm_entry->data = NULL;
+#endif
remove_proc_entry(rm_entry->name, temp);
if (temp == parent)
break;
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,
+ 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) {
return rc;
}
+int lprocfs_osd_rd_blksize(char *page, char **start, off_t off,
+ int count, int *eof, void *data)
+{
+ struct dt_device *dt = data;
+ struct obd_statfs osfs;
+ int rc = dt_statfs(NULL, dt, &osfs);
+ if (!rc) {
+ *eof = 1;
+ rc = snprintf(page, count, "%d\n",
+ (unsigned) osfs.os_bsize);
+ }
+ return rc;
+}
+
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,
+ 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) {
return rc;
}
+int lprocfs_osd_rd_kbytestotal(char *page, char **start, off_t off,
+ int count, int *eof, void *data)
+{
+ struct dt_device *dt = data;
+ struct obd_statfs osfs;
+ int rc = dt_statfs(NULL, dt, &osfs);
+ if (!rc) {
+ __u32 blk_size = osfs.os_bsize >> 10;
+ __u64 result = osfs.os_blocks;
+
+ while (blk_size >>= 1)
+ result <<= 1;
+
+ *eof = 1;
+ rc = snprintf(page, count, LPU64"\n", result);
+ }
+ return rc;
+}
+
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,
+ 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) {
return rc;
}
+int lprocfs_osd_rd_kbytesfree(char *page, char **start, off_t off,
+ int count, int *eof, void *data)
+{
+ struct dt_device *dt = data;
+ struct obd_statfs osfs;
+ int rc = dt_statfs(NULL, dt, &osfs);
+ if (!rc) {
+ __u32 blk_size = osfs.os_bsize >> 10;
+ __u64 result = osfs.os_bfree;
+
+ while (blk_size >>= 1)
+ result <<= 1;
+
+ *eof = 1;
+ rc = snprintf(page, count, LPU64"\n", result);
+ }
+ return rc;
+}
+
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,
+ 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) {
return rc;
}
+int lprocfs_osd_rd_kbytesavail(char *page, char **start, off_t off,
+ int count, int *eof, void *data)
+{
+ struct dt_device *dt = data;
+ struct obd_statfs osfs;
+ int rc = dt_statfs(NULL, dt, &osfs);
+ if (!rc) {
+ __u32 blk_size = osfs.os_bsize >> 10;
+ __u64 result = osfs.os_bavail;
+
+ while (blk_size >>= 1)
+ result <<= 1;
+
+ *eof = 1;
+ rc = snprintf(page, count, LPU64"\n", result);
+ }
+ return rc;
+}
+
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,
+ 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) {
return rc;
}
+int lprocfs_osd_rd_filestotal(char *page, char **start, off_t off,
+ int count, int *eof, void *data)
+{
+ struct dt_device *dt = data;
+ struct obd_statfs osfs;
+ int rc = dt_statfs(NULL, dt, &osfs);
+ if (!rc) {
+ *eof = 1;
+ rc = snprintf(page, count, LPU64"\n", osfs.os_files);
+ }
+
+ return rc;
+}
+
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,
+ 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) {
return rc;
}
+int lprocfs_osd_rd_filesfree(char *page, char **start, off_t off,
+ int count, int *eof, void *data)
+{
+ struct dt_device *dt = data;
+ struct obd_statfs osfs;
+ int rc = dt_statfs(NULL, dt, &osfs);
+ if (!rc) {
+ *eof = 1;
+ rc = snprintf(page, count, LPU64"\n", osfs.os_ffree);
+ }
+ return rc;
+}
+
int lprocfs_rd_server_uuid(char *page, char **start, off_t off, int count,
int *eof, void *data)
{
void lprocfs_stats_collect(struct lprocfs_stats *stats, int idx,
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 t;
+ struct lprocfs_counter *percpu_cntr;
+ int centry;
+ int i;
+ unsigned long flags = 0;
memset(cnt, 0, sizeof(*cnt));
cnt->lc_min = LC_MIN_INIT;
- if (stats->ls_flags & LPROCFS_STATS_FLAG_NOPERCPU)
- num_cpu = 1;
- else
- num_cpu = cfs_num_possible_cpus();
+ num_entry = lprocfs_stats_lock(stats, LPROCFS_GET_NUM_CPU, &flags);
- for (i = 0; i < num_cpu; i++) {
- percpu_cntr = &(stats->ls_percpu[i])->lp_cntr[idx];
+ for (i = 0; i < num_entry; i++) {
+ if (stats->ls_percpu[i] == NULL)
+ continue;
+ percpu_cntr = &(stats->ls_percpu[i])->lp_cntr[idx];
do {
centry = cfs_atomic_read(&percpu_cntr-> \
cnt->lc_sumsquare += t.lc_sumsquare;
}
- cnt->lc_units = stats->ls_percpu[0]->lp_cntr[idx].lc_units;
+ cnt->lc_units = stats->ls_percpu[0]->lp_cntr[idx].lc_units;
+ lprocfs_stats_unlock(stats, LPROCFS_GET_NUM_CPU, &flags);
}
/**
"large_ea",
"full20",
"layout_lock",
+ "64bithash",
+ "object_max_bytes",
+ "imp_recov",
+ "jobstats",
+ "umask",
+ "einprogress",
+ "grant_param",
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;
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)
" name: %s\n"
" target: %s\n"
" state: %s\n"
+ " instance: %u\n"
" connect_flags: [",
obd->obd_name,
obd2cli_tgt(obd),
- 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,
", ");
libcfs_nid2str(conn->oic_conn->c_peer.nid));
j++;
}
- cfs_spin_unlock(&imp->imp_lock);
- i += snprintf(page + i, count - i,
- "]\n"
- " current_connection: %s\n"
- " connection_attempts: %u\n"
- " generation: %u\n"
- " in-progress_invalidations: %u\n",
- libcfs_nid2str(imp->imp_connection->c_peer.nid),
- imp->imp_conn_cnt,
- imp->imp_generation,
- cfs_atomic_read(&imp->imp_inval_count));
+ 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 ? "<none>" :
+ libcfs_nid2str(imp->imp_connection->c_peer.nid),
+ imp->imp_conn_cnt,
+ imp->imp_generation,
+ cfs_atomic_read(&imp->imp_inval_count));
+ cfs_spin_unlock(&imp->imp_lock);
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"
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",
j = opcode_offset(OST_READ + rw) + EXTRA_MAX_OPCODES;
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);
client_stat->nid_brw_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);
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;
}
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 percpusize;
+ unsigned int num_entry;
if (num == 0)
return NULL;
- if (flags & LPROCFS_STATS_FLAG_NOPERCPU)
- num_cpu = 1;
- else
- num_cpu = cfs_num_possible_cpus();
+ if (lprocfs_no_percpu_stats != 0)
+ flags |= LPROCFS_STATS_FLAG_NOPERCPU;
- OBD_ALLOC(stats, offsetof(typeof(*stats), ls_percpu[num_cpu]));
- if (stats == NULL)
- return NULL;
+ if (flags & LPROCFS_STATS_FLAG_NOPERCPU)
+ num_entry = 1;
+ else
+ num_entry = cfs_num_possible_cpus() + 1;
+ /* alloc percpu pointers for all possible cpu slots */
+ OBD_ALLOC(stats, offsetof(struct lprocfs_stats, ls_percpu[num_entry]));
+ if (stats == NULL)
+ return NULL;
+
+ stats->ls_num = num;
+ stats->ls_biggest_alloc_num = 1;
if (flags & LPROCFS_STATS_FLAG_NOPERCPU) {
stats->ls_flags = flags;
cfs_spin_lock_init(&stats->ls_lock);
stats->ls_flags = 0;
}
- percpusize = offsetof(struct lprocfs_percpu, lp_cntr[num]);
- if (num_cpu > 1)
- percpusize = CFS_L1_CACHE_ALIGN(percpusize);
+ percpusize = offsetof(struct lprocfs_percpu, lp_cntr[num]);
+ if (num_entry > 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;
+ /* for no percpu area, the 0th entry is for real use,
+ * for percpu area, the 0th entry is for intialized entry template */
+ OBD_ALLOC(stats->ls_percpu[0], percpusize);
+ if (stats->ls_percpu[0] == NULL) {
+ OBD_FREE(stats,
+ offsetof(struct lprocfs_stats, ls_percpu[num_entry]));
+ stats = NULL;
+ }
+ return 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() + 1;
- 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 = offsetof(struct lprocfs_percpu, lp_cntr[stats->ls_num]);
+ if (num_entry > 1)
+ percpusize = CFS_L1_CACHE_ALIGN(percpusize);
+ for (i = 0; i < num_entry; i++)
+ if (stats->ls_percpu[i] != NULL)
+ OBD_FREE(stats->ls_percpu[i], percpusize);
+ OBD_FREE(stats, offsetof(typeof(*stats), ls_percpu[num_entry]));
}
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;
+ int i;
+ int j;
+ unsigned int num_entry;
+ unsigned int percpusize;
+ unsigned long flags = 0;
+
+ num_entry = lprocfs_stats_lock(stats, LPROCFS_GET_NUM_CPU, &flags);
+
+ percpusize = offsetof(struct lprocfs_percpu, lp_cntr[stats->ls_num]);
+ if (num_entry > 1)
+ percpusize = CFS_L1_CACHE_ALIGN(percpusize);
+
+ for (i = 0; i < num_entry; i++) {
+ if (stats->ls_percpu[i] == NULL)
+ continue;
+ /* the 1st percpu entry was statically allocated in
+ * lprocfs_alloc_stats() */
+ if (i > 0) {
+ OBD_FREE(stats->ls_percpu[i], percpusize);
+ stats->ls_percpu[i] = NULL;
+ continue;
+ }
+ 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, LPROCFS_GET_NUM_CPU, &flags);
}
static ssize_t lprocfs_stats_seq_write(struct file *file, const char *buf,
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;
}
void lprocfs_counter_init(struct lprocfs_stats *stats, int index,
- unsigned conf, const char *name, const char *units)
+ unsigned conf, const char *name, const char *units)
{
- struct lprocfs_counter *c;
- int i;
- unsigned int num_cpu;
-
- LASSERT(stats != NULL);
+ struct lprocfs_counter *c = &(stats->ls_percpu[0]->lp_cntr[index]);
+ unsigned long flags = 0;
- num_cpu = lprocfs_stats_lock(stats, LPROCFS_GET_NUM_CPU);
+ LASSERT(stats != NULL);
+ LASSERT(stats->ls_percpu[0] != NULL);
- 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);
+ lprocfs_stats_lock(stats, LPROCFS_GET_NUM_CPU, &flags);
+ 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, LPROCFS_GET_NUM_CPU, &flags);
}
EXPORT_SYMBOL(lprocfs_counter_init);
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, find_cbdata);
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);
+}
+
+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) {
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,
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,
}
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) {
+ if (cfs_atomic_read(&stat->nid_exp_ref_count) == 1) {
+ /* object has only hash references. */
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);
}
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;
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);
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 */
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_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);
}
struct proc_dir_entry *entry;
ENTRY;
+ 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);
}
c += cfs_hash_debug_str(obd->obd_uuid_hash, page + c, count - c);
c += cfs_hash_debug_str(obd->obd_nid_hash, page + c, count - c);
c += cfs_hash_debug_str(obd->obd_nid_stats_hash, page+c, count-c);
+#ifdef HAVE_QUOTA_SUPPORT
+ if (obd->u.obt.obt_qctxt.lqc_lqs_hash)
+ c += cfs_hash_debug_str(obd->u.obt.obt_qctxt.lqc_lqs_hash,
+ page + c, count - c);
+#endif
return c;
}
if (lprocfs_obd_snprintf(&page, size, &len, "VBR: %s\n",
obd->obd_version_recov ? "ON" : "OFF")<=0)
goto out;
+ if (lprocfs_obd_snprintf(&page, size, &len, "IR: %s\n",
+ obd->obd_no_ir ? "OFF" : "ON") <= 0)
+ goto out;
goto fclose;
}
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 */
<=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;
}
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)
{
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);
}
EXPORT_SYMBOL(lprocfs_obd_rd_mntdev);
+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;
+
+ 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);
+
+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);
+
EXPORT_SYMBOL(lprocfs_register);
EXPORT_SYMBOL(lprocfs_srch);
EXPORT_SYMBOL(lprocfs_remove);
EXPORT_SYMBOL(lprocfs_clear_stats);
EXPORT_SYMBOL(lprocfs_register_stats);
EXPORT_SYMBOL(lprocfs_init_ops_stats);
+EXPORT_SYMBOL(lprocfs_init_mps_stats);
EXPORT_SYMBOL(lprocfs_init_ldlm_stats);
EXPORT_SYMBOL(lprocfs_alloc_obd_stats);
EXPORT_SYMBOL(lprocfs_alloc_md_stats);