X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=lustre%2Fobdclass%2Flprocfs_status.c;h=a253894c124b0d8dd34247bfcf6794ab0e9fd164;hb=54095fc66a54ef1675c248485054ad91c1044eb1;hp=71da72a8814e3545b2a1aa9c7bbc31417da58749;hpb=e7f3c2955a426bbe3e39b32208056b9ab8667190;p=fs%2Flustre-release.git diff --git a/lustre/obdclass/lprocfs_status.c b/lustre/obdclass/lprocfs_status.c index 71da72a..a253894 100644 --- a/lustre/obdclass/lprocfs_status.c +++ b/lustre/obdclass/lprocfs_status.c @@ -26,7 +26,7 @@ * 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. */ /* @@ -58,7 +58,7 @@ #define MAX_STRING_SIZE 128 /* for bug 10866, global variable */ -DECLARE_RWSEM(_lprocfs_lock); +CFS_DECLARE_RWSEM(_lprocfs_lock); EXPORT_SYMBOL(_lprocfs_lock); int lprocfs_seq_release(struct inode *inode, struct file *file) @@ -145,17 +145,29 @@ cfs_proc_dir_entry_t *lprocfs_add_simple(struct proc_dir_entry *root, } struct proc_dir_entry *lprocfs_add_symlink(const char *name, - struct proc_dir_entry *parent, const char *dest) + struct proc_dir_entry *parent, const char *format, ...) { struct proc_dir_entry *entry; + char *dest; + va_list ap; - if (parent == NULL || dest == NULL) + if (parent == NULL || format == NULL) return NULL; + OBD_ALLOC_WAIT(dest, MAX_STRING_SIZE + 1); + if (dest == NULL) + return NULL; + + va_start(ap, format); + vsnprintf(dest, MAX_STRING_SIZE, format, ap); + va_end(ap); + entry = proc_symlink(name, parent, dest); if (entry == NULL) CERROR("LprocFS: Could not create symbolic link from %s to %s", name, dest); + + OBD_FREE(dest, MAX_STRING_SIZE + 1); return entry; } @@ -173,9 +185,13 @@ static ssize_t lprocfs_fops_read(struct file *f, char __user *buf, if (page == NULL) return -ENOMEM; - LPROCFS_ENTRY(); + if (LPROCFS_ENTRY_AND_CHECK(dp)) { + rc = -ENOENT; + goto out; + } + OBD_FAIL_TIMEOUT(OBD_FAIL_LPROC_REMOVE, 10); - if (!dp->deleted && dp->read_proc) + if (dp->read_proc) rc = dp->read_proc(page, &start, *ppos, CFS_PAGE_SIZE, &eof, dp->data); LPROCFS_EXIT(); @@ -197,7 +213,7 @@ static ssize_t lprocfs_fops_read(struct file *f, char __user *buf, } count = (rc < size) ? rc : size; - if (copy_to_user(buf, start, count)) { + if (cfs_copy_to_user(buf, start, count)) { rc = -EFAULT; goto out; } @@ -214,8 +230,9 @@ static ssize_t lprocfs_fops_write(struct file *f, const char __user *buf, struct proc_dir_entry *dp = PDE(f->f_dentry->d_inode); int rc = -EIO; - LPROCFS_ENTRY(); - if (!dp->deleted && dp->write_proc) + if (LPROCFS_ENTRY_AND_CHECK(dp)) + return -ENOENT; + if (dp->write_proc) rc = dp->write_proc(f, buf, size, dp->data); LPROCFS_EXIT(); return rc; @@ -232,7 +249,7 @@ int lprocfs_evict_client_open(struct inode *inode, struct file *f) struct proc_dir_entry *dp = PDE(f->f_dentry->d_inode); struct obd_device *obd = dp->data; - atomic_inc(&obd->obd_evict_inprogress); + cfs_atomic_inc(&obd->obd_evict_inprogress); return 0; } @@ -242,8 +259,8 @@ int lprocfs_evict_client_release(struct inode *inode, struct file *f) struct proc_dir_entry *dp = PDE(f->f_dentry->d_inode); struct obd_device *obd = dp->data; - atomic_dec(&obd->obd_evict_inprogress); - wake_up(&obd->obd_evict_inprogress_waitq); + cfs_atomic_dec(&obd->obd_evict_inprogress); + cfs_waitq_signal(&obd->obd_evict_inprogress_waitq); return 0; } @@ -424,7 +441,7 @@ int lprocfs_wr_uint(struct file *file, const char *buffer, unsigned long tmp; dummy[MAX_STRING_SIZE] = '\0'; - if (copy_from_user(dummy, buffer, MAX_STRING_SIZE)) + if (cfs_copy_from_user(dummy, buffer, MAX_STRING_SIZE)) return -EFAULT; tmp = simple_strtoul(dummy, &end, 0); @@ -446,16 +463,16 @@ int lprocfs_rd_u64(char *page, char **start, off_t off, int lprocfs_rd_atomic(char *page, char **start, off_t off, int count, int *eof, void *data) { - atomic_t *atom = data; + cfs_atomic_t *atom = data; LASSERT(atom != NULL); *eof = 1; - return snprintf(page, count, "%d\n", atomic_read(atom)); + return snprintf(page, count, "%d\n", cfs_atomic_read(atom)); } int lprocfs_wr_atomic(struct file *file, const char *buffer, unsigned long count, void *data) { - atomic_t *atm = data; + cfs_atomic_t *atm = data; int val = 0; int rc; @@ -466,7 +483,7 @@ int lprocfs_wr_atomic(struct file *file, const char *buffer, if (val <= 0) return -ERANGE; - atomic_set(atm, val); + cfs_atomic_set(atm, val); return count; } @@ -506,7 +523,8 @@ 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() - HZ, + int rc = obd_statfs(data, &osfs, + cfs_time_shift_64(-OBD_STATFS_CACHE_SECONDS), OBD_STATFS_NODELAY); if (!rc) { *eof = 1; @@ -519,7 +537,8 @@ 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() - HZ, + int rc = obd_statfs(data, &osfs, + cfs_time_shift_64(-OBD_STATFS_CACHE_SECONDS), OBD_STATFS_NODELAY); if (!rc) { __u32 blk_size = osfs.os_bsize >> 10; @@ -538,7 +557,8 @@ 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() - HZ, + int rc = obd_statfs(data, &osfs, + cfs_time_shift_64(-OBD_STATFS_CACHE_SECONDS), OBD_STATFS_NODELAY); if (!rc) { __u32 blk_size = osfs.os_bsize >> 10; @@ -557,7 +577,8 @@ 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() - HZ, + int rc = obd_statfs(data, &osfs, + cfs_time_shift_64(-OBD_STATFS_CACHE_SECONDS), OBD_STATFS_NODELAY); if (!rc) { __u32 blk_size = osfs.os_bsize >> 10; @@ -576,7 +597,8 @@ 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() - HZ, + int rc = obd_statfs(data, &osfs, + cfs_time_shift_64(-OBD_STATFS_CACHE_SECONDS), OBD_STATFS_NODELAY); if (!rc) { *eof = 1; @@ -590,7 +612,8 @@ 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() - HZ, + int rc = obd_statfs(data, &osfs, + cfs_time_shift_64(-OBD_STATFS_CACHE_SECONDS), OBD_STATFS_NODELAY); if (!rc) { *eof = 1; @@ -631,9 +654,8 @@ int lprocfs_rd_conn_uuid(char *page, char **start, off_t off, int count, LPROCFS_CLIMP_CHECK(obd); conn = obd->u.cli.cl_import->imp_connection; - LASSERT(conn != NULL); *eof = 1; - if (obd->u.cli.cl_import) { + if (conn && obd->u.cli.cl_import) { rc = snprintf(page, count, "%s\n", conn->c_remote_uuid.uuid); } else { @@ -666,20 +688,23 @@ void lprocfs_stats_collect(struct lprocfs_stats *stats, int idx, if (stats->ls_flags & LPROCFS_STATS_FLAG_NOPERCPU) num_cpu = 1; else - num_cpu = num_possible_cpus(); + num_cpu = cfs_num_possible_cpus(); for (i = 0; i < num_cpu; i++) { percpu_cntr = &(stats->ls_percpu[i])->lp_cntr[idx]; do { - centry = atomic_read(&percpu_cntr->lc_cntl.la_entry); + 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 != atomic_read(&percpu_cntr->lc_cntl.la_entry) && - centry != atomic_read(&percpu_cntr->lc_cntl.la_exit)); + } 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) @@ -709,8 +734,6 @@ static int obd_import_flags2str(struct obd_import *imp, char *str, int max) flag2str(deactive); flag2str(replayable); flag2str(pingable); - flag2str(recon_bk); - flag2str(last_recon); return len; } #undef flags2str @@ -729,11 +752,11 @@ static const char *obd_connect_names[] = { "truncate_lock", "initial_transno", "inode_bit_locks", - "join_file", + "join_file(obsolete)", "getattr_by_fid", "no_oh_for_devices", - "local_client", "remote_client", + "remote_client_by_force", "max_byte_per_rpc", "64bit_qdata", "mds_capability", @@ -751,6 +774,9 @@ static const char *obd_connect_names[] = { "pools", "grant_shrink", "skip_orphan", + "large_ea", + "full20", + "layout_lock", NULL }; @@ -777,6 +803,7 @@ int lprocfs_rd_import(char *page, char **start, off_t off, int count, struct lprocfs_counter ret; struct obd_device *obd = (struct obd_device *)data; struct obd_import *imp; + struct obd_import_conn *conn; int i, j, k, rw = 0; LASSERT(obd != NULL); @@ -788,12 +815,10 @@ 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" " connect_flags: [", obd->obd_name, obd2cli_tgt(obd), - imp->imp_connection->c_remote_uuid.uuid, ptlrpc_import_state_name(imp->imp_state)); i += obd_connect_flags2str(page + i, count - i, imp->imp_connect_data.ocd_connect_flags, @@ -806,24 +831,40 @@ int lprocfs_rd_import(char *page, char **start, off_t off, int count, i += snprintf(page + i, count - i, "]\n" " connection:\n" + " failover_nids: ["); + cfs_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++; + } + 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, - atomic_read(&imp->imp_inval_count)); + cfs_atomic_read(&imp->imp_inval_count)); lprocfs_stats_collect(obd->obd_svc_stats, PTLRPC_REQWAIT_CNTR, &ret); - do_div(ret.lc_sum, ret.lc_count); + if (ret.lc_count != 0) + do_div(ret.lc_sum, ret.lc_count); + else + ret.lc_sum = 0; i += snprintf(page + i, count - i, " rpcs:\n" " inflight: %u\n" " unregistering: %u\n" " timeouts: %u\n" " avg_waittime: "LPU64" %s\n", - atomic_read(&imp->imp_inflight), - atomic_read(&imp->imp_unregistering), - atomic_read(&imp->imp_timeouts), + cfs_atomic_read(&imp->imp_inflight), + cfs_atomic_read(&imp->imp_unregistering), + cfs_atomic_read(&imp->imp_timeouts), ret.lc_sum, ret.lc_units); k = 0; @@ -854,7 +895,7 @@ int lprocfs_rd_import(char *page, char **start, off_t off, int count, lprocfs_stats_collect(obd->obd_svc_stats, PTLRPC_LAST_CNTR + BRW_READ_BYTES + rw, &ret); - if (ret.lc_sum > 0) { + if (ret.lc_sum > 0 && ret.lc_count > 0) { do_div(ret.lc_sum, ret.lc_count); i += snprintf(page + i, count - i, " %s_data_averages:\n" @@ -865,7 +906,7 @@ 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; lprocfs_stats_collect(obd->obd_svc_stats, j, &ret); - if (ret.lc_sum > 0) { + if (ret.lc_sum > 0 && ret.lc_count != 0) { do_div(ret.lc_sum, ret.lc_count); i += snprintf(page + i, count - i, " %s_per_rpc: "LPU64"\n", @@ -923,33 +964,6 @@ int lprocfs_at_hist_helper(char *page, int count, int rc, return rc; } -int lprocfs_rd_quota_resend_count(char *page, char **start, off_t off, - int count, int *eof, void *data) -{ - struct obd_device *obd = data; - - return snprintf(page, count, "%u\n", - atomic_read(&obd->u.cli.cl_quota_resends)); -} - -int lprocfs_wr_quota_resend_count(struct file *file, const char *buffer, - unsigned long count, void *data) -{ - struct obd_device *obd = data; - int val, rc; - - rc = lprocfs_write_helper(buffer, count, &val); - if (rc) - return rc; - - if (val < 0) - return -EINVAL; - - atomic_set(&obd->u.cli.cl_quota_resends, val); - - return count; -} - /* See also ptlrpc_lprocfs_rd_timeouts */ int lprocfs_rd_timeouts(char *page, char **start, off_t off, int count, int *eof, void *data) @@ -1082,10 +1096,11 @@ static void lprocfs_free_client_stats(struct nid_stat *client_stat) client_stat->nid_proc, client_stat->nid_stats, client_stat->nid_brw_stats); - LASSERTF(atomic_read(&client_stat->nid_exp_ref_count) == 0, - "count %d\n", atomic_read(&client_stat->nid_exp_ref_count)); + LASSERTF(cfs_atomic_read(&client_stat->nid_exp_ref_count) == 0, + "count %d\n", + cfs_atomic_read(&client_stat->nid_exp_ref_count)); - hlist_del_init(&client_stat->nid_hash); + cfs_hlist_del_init(&client_stat->nid_hash); if (client_stat->nid_proc) lprocfs_remove(&client_stat->nid_proc); @@ -1111,10 +1126,10 @@ void lprocfs_free_per_client_stats(struct obd_device *obd) /* 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); - list_del_init(&stat->nid_list); + 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); lprocfs_free_client_stats(stat); } @@ -1135,7 +1150,7 @@ struct lprocfs_stats *lprocfs_alloc_stats(unsigned int num, if (flags & LPROCFS_STATS_FLAG_NOPERCPU) num_cpu = 1; else - num_cpu = num_possible_cpus(); + num_cpu = cfs_num_possible_cpus(); OBD_ALLOC(stats, offsetof(typeof(*stats), ls_percpu[num_cpu])); if (stats == NULL) @@ -1143,7 +1158,7 @@ struct lprocfs_stats *lprocfs_alloc_stats(unsigned int num, if (flags & LPROCFS_STATS_FLAG_NOPERCPU) { stats->ls_flags = flags; - spin_lock_init(&stats->ls_lock); + cfs_spin_lock_init(&stats->ls_lock); /* Use this lock only if there are no percpu areas */ } else { stats->ls_flags = 0; @@ -1151,7 +1166,7 @@ struct lprocfs_stats *lprocfs_alloc_stats(unsigned int num, percpusize = offsetof(struct lprocfs_percpu, lp_cntr[num]); if (num_cpu > 1) - percpusize = L1_CACHE_ALIGN(percpusize); + percpusize = CFS_L1_CACHE_ALIGN(percpusize); for (i = 0; i < num_cpu; i++) { OBD_ALLOC(stats->ls_percpu[i], percpusize); @@ -1187,11 +1202,11 @@ void lprocfs_free_stats(struct lprocfs_stats **statsh) if (stats->ls_flags & LPROCFS_STATS_FLAG_NOPERCPU) num_cpu = 1; else - num_cpu = num_possible_cpus(); + num_cpu = cfs_num_possible_cpus(); percpusize = offsetof(struct lprocfs_percpu, lp_cntr[stats->ls_num]); if (num_cpu > 1) - percpusize = L1_CACHE_ALIGN(percpusize); + 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])); @@ -1208,13 +1223,13 @@ void lprocfs_clear_stats(struct lprocfs_stats *stats) for (i = 0; i < num_cpu; i++) { for (j = 0; j < stats->ls_num; j++) { percpu_cntr = &(stats->ls_percpu[i])->lp_cntr[j]; - atomic_inc(&percpu_cntr->lc_cntl.la_entry); + 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; - atomic_inc(&percpu_cntr->lc_cntl.la_exit); + cfs_atomic_inc(&percpu_cntr->lc_cntl.la_exit); } } @@ -1262,7 +1277,7 @@ static int lprocfs_stats_seq_show(struct seq_file *p, void *v) if (cntr == &(stats->ls_percpu[0])->lp_cntr[0]) { struct timeval now; - do_gettimeofday(&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) @@ -1309,7 +1324,9 @@ static int lprocfs_stats_seq_open(struct inode *inode, struct file *file) struct seq_file *seq; int rc; - LPROCFS_ENTRY_AND_CHECK(dp); + if (LPROCFS_ENTRY_AND_CHECK(dp)) + return -ENOENT; + rc = seq_open(file, &lprocfs_stats_seq_sops); if (rc) { LPROCFS_EXIT(); @@ -1401,7 +1418,6 @@ void lprocfs_init_ops_stats(int num_private_stats, struct lprocfs_stats *stats) LPROCFS_OBD_OP_INIT(num_private_stats, stats, statfs_async); LPROCFS_OBD_OP_INIT(num_private_stats, stats, packmd); LPROCFS_OBD_OP_INIT(num_private_stats, stats, unpackmd); - LPROCFS_OBD_OP_INIT(num_private_stats, stats, checkmd); LPROCFS_OBD_OP_INIT(num_private_stats, stats, preallocate); LPROCFS_OBD_OP_INIT(num_private_stats, stats, precreate); LPROCFS_OBD_OP_INIT(num_private_stats, stats, create); @@ -1423,6 +1439,7 @@ void lprocfs_init_ops_stats(int num_private_stats, struct lprocfs_stats *stats) LPROCFS_OBD_OP_INIT(num_private_stats, stats, commitrw); LPROCFS_OBD_OP_INIT(num_private_stats, stats, enqueue); LPROCFS_OBD_OP_INIT(num_private_stats, stats, change_cbdata); + LPROCFS_OBD_OP_INIT(num_private_stats, stats, find_cbdata); LPROCFS_OBD_OP_INIT(num_private_stats, stats, cancel); LPROCFS_OBD_OP_INIT(num_private_stats, stats, cancel_unused); LPROCFS_OBD_OP_INIT(num_private_stats, stats, init_export); @@ -1519,6 +1536,7 @@ int lprocfs_alloc_md_stats(struct obd_device *obd, 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, close); LPROCFS_MD_OP_INIT(num_private_stats, stats, create); LPROCFS_MD_OP_INIT(num_private_stats, stats, done_writing); @@ -1648,8 +1666,8 @@ int lprocfs_exp_rd_uuid(char *page, char **start, off_t off, int count, *eof = 1; page[0] = '\0'; lprocfs_exp_rd_cb_data_init(&cb_data, page, count, eof, &len); - lustre_hash_for_each_key(obd->obd_nid_hash, &stats->nid, - lprocfs_exp_print_uuid, &cb_data); + cfs_hash_for_each_key(obd->obd_nid_hash, &stats->nid, + lprocfs_exp_print_uuid, &cb_data); return (*cb_data.len); } @@ -1657,16 +1675,16 @@ void lprocfs_exp_print_hash(void *obj, void *cb_data) { struct exp_uuid_cb_data *data = cb_data; struct obd_export *exp = obj; - lustre_hash_t *lh; + cfs_hash_t *hs; - lh = exp->exp_lock_hash; - if (lh) { + hs = exp->exp_lock_hash; + if (hs) { if (!*data->len) - *data->len += lustre_hash_debug_header(data->page, - data->count); + *data->len += cfs_hash_debug_header(data->page, + data->count); - *data->len += lustre_hash_debug_str(lh, data->page + *data->len, - data->count); + *data->len += cfs_hash_debug_str(hs, data->page + *data->len, + data->count); } } @@ -1682,8 +1700,8 @@ int lprocfs_exp_rd_hash(char *page, char **start, off_t off, int count, page[0] = '\0'; lprocfs_exp_rd_cb_data_init(&cb_data, page, count, eof, &len); - lustre_hash_for_each_key(obd->obd_nid_hash, &stats->nid, - lprocfs_exp_print_hash, &cb_data); + cfs_hash_for_each_key(obd->obd_nid_hash, &stats->nid, + lprocfs_exp_print_hash, &cb_data); return (*cb_data.len); } @@ -1697,22 +1715,19 @@ int lprocfs_nid_stats_clear_read(char *page, char **start, off_t off, } EXPORT_SYMBOL(lprocfs_nid_stats_clear_read); -void lprocfs_nid_stats_clear_write_cb(void *obj, void *data) +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", atomic_read(&stat->nid_exp_ref_count)); - if (atomic_read(&stat->nid_exp_ref_count) == 2) { - hlist_del_init(&stat->nid_hash); - nidstat_putref(stat); - spin_lock(&stat->nid_obd->obd_nid_lock); - list_move(&stat->nid_list, data); - spin_unlock(&stat->nid_obd->obd_nid_lock); - EXIT; - return; + 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); + RETURN(1); } /* we has reference to object - only clear data*/ if (stat->nid_stats) @@ -1722,8 +1737,7 @@ void lprocfs_nid_stats_clear_write_cb(void *obj, void *data) for (i = 0; i < BRW_LAST; i++) lprocfs_oh_clear(&stat->nid_brw_stats->hist[i]); } - EXIT; - return; + RETURN(0); } int lprocfs_nid_stats_clear_write(struct file *file, const char *buffer, @@ -1733,13 +1747,13 @@ int lprocfs_nid_stats_clear_write(struct file *file, const char *buffer, 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); + cfs_hash_cond_del(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); + while (!cfs_list_empty(&free_list)) { + client_stat = cfs_list_entry(free_list.next, struct nid_stat, + nid_list); + cfs_list_del_init(&client_stat->nid_list); lprocfs_free_client_stats(client_stat); } @@ -1752,6 +1766,7 @@ int lprocfs_exp_setup(struct obd_export *exp, lnet_nid_t *nid, int *newnid) struct nid_stat *new_stat, *old_stat; struct obd_device *obd = NULL; cfs_proc_dir_entry_t *entry; + char *buffer = NULL; int rc = 0; ENTRY; @@ -1777,36 +1792,43 @@ 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; - atomic_set(&new_stat->nid_exp_ref_count, 0); + cfs_atomic_set(&new_stat->nid_exp_ref_count, 0); - old_stat = lustre_hash_findadd_unique(obd->obd_nid_stats_hash, - nid, &new_stat->nid_hash); + old_stat = cfs_hash_findadd_unique(obd->obd_nid_stats_hash, + nid, &new_stat->nid_hash); CDEBUG(D_INFO, "Found stats %p for nid %s - ref %d\n", old_stat, libcfs_nid2str(*nid), - atomic_read(&new_stat->nid_exp_ref_count)); + cfs_atomic_read(&new_stat->nid_exp_ref_count)); /* Return -EALREADY here so that we know that the /proc * entry already has been created */ if (old_stat != new_stat) { - spin_lock(&obd->obd_nid_lock); + 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 { - /* lustre_hash_findadd_unique() has added + /* cfs_hash_findadd_unique() has added * old_stat's refcount */ nidstat_putref(old_stat); } - spin_unlock(&obd->obd_nid_lock); + cfs_spin_unlock(&obd->obd_nid_lock); GOTO(destroy_new, rc = -EALREADY); } /* not found - create */ - new_stat->nid_proc = lprocfs_register(libcfs_nid2str(*nid), + OBD_ALLOC(buffer, LNET_NIDSTR_SIZE); + if (buffer == NULL) + GOTO(destroy_new, rc = -ENOMEM); + + memcpy(buffer, libcfs_nid2str(*nid), LNET_NIDSTR_SIZE); + new_stat->nid_proc = lprocfs_register(buffer, obd->obd_proc_exports_entry, NULL, NULL); + OBD_FREE(buffer, LNET_NIDSTR_SIZE); + if (new_stat->nid_proc == NULL) { CERROR("Error making export directory for nid %s\n", libcfs_nid2str(*nid)); @@ -1835,16 +1857,16 @@ int lprocfs_exp_setup(struct obd_export *exp, lnet_nid_t *nid, int *newnid) exp->exp_nid_stats = new_stat; *newnid = 1; /* protect competitive add to list, not need locking on destroy */ - spin_lock(&obd->obd_nid_lock); - list_add(&new_stat->nid_list, &obd->obd_nid_stats); - spin_unlock(&obd->obd_nid_lock); + 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); RETURN(rc); destroy_new_ns: if (new_stat->nid_proc != NULL) lprocfs_remove(&new_stat->nid_proc); - lustre_hash_del(obd->obd_nid_stats_hash, nid, &new_stat->nid_hash); + cfs_hash_del(obd->obd_nid_stats_hash, nid, &new_stat->nid_hash); destroy_new: OBD_FREE_PTR(new_stat); @@ -1860,7 +1882,6 @@ int lprocfs_exp_cleanup(struct obd_export *exp) nidstat_putref(exp->exp_nid_stats); exp->exp_nid_stats = NULL; - lprocfs_free_md_stats(exp->exp_obd); return 0; } @@ -1879,7 +1900,7 @@ int lprocfs_write_frac_helper(const char *buffer, unsigned long count, if (count > (sizeof(kernbuf) - 1)) return -EINVAL; - if (copy_from_user(kernbuf, buffer, count)) + if (cfs_copy_from_user(kernbuf, buffer, count)) return -EFAULT; kernbuf[count] = '\0'; @@ -1982,7 +2003,7 @@ int lprocfs_write_frac_u64_helper(const char *buffer, unsigned long count, if (count > (sizeof(kernbuf) - 1)) return -EINVAL; - if (copy_from_user(kernbuf, buffer, count)) + if (cfs_copy_from_user(kernbuf, buffer, count)) return -EFAULT; kernbuf[count] = '\0'; @@ -2064,9 +2085,9 @@ void lprocfs_oh_tally(struct obd_histogram *oh, unsigned int value) if (value >= OBD_HIST_MAX) value = OBD_HIST_MAX - 1; - spin_lock(&oh->oh_lock); + cfs_spin_lock(&oh->oh_lock); oh->oh_buckets[value]++; - spin_unlock(&oh->oh_lock); + cfs_spin_unlock(&oh->oh_lock); } EXPORT_SYMBOL(lprocfs_oh_tally); @@ -2094,9 +2115,9 @@ EXPORT_SYMBOL(lprocfs_oh_sum); void lprocfs_oh_clear(struct obd_histogram *oh) { - spin_lock(&oh->oh_lock); + cfs_spin_lock(&oh->oh_lock); memset(oh->oh_buckets, 0, sizeof(oh->oh_buckets)); - spin_unlock(&oh->oh_lock); + cfs_spin_unlock(&oh->oh_lock); } EXPORT_SYMBOL(lprocfs_oh_clear); @@ -2109,10 +2130,10 @@ int lprocfs_obd_rd_hash(char *page, char **start, off_t off, 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); + c += cfs_hash_debug_header(page, count); + 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); return c; } @@ -2200,14 +2221,17 @@ int lprocfs_obd_rd_recovery_status(char *page, char **start, off_t off, goto out; /* Number of clients that have completed recovery */ if (lprocfs_obd_snprintf(&page, size, &len,"req_replay_clients: %d\n", - atomic_read(&obd->obd_req_replay_clients))<= 0) + cfs_atomic_read(&obd->obd_req_replay_clients)) + <= 0) goto out; if (lprocfs_obd_snprintf(&page, size, &len,"lock_repay_clients: %d\n", - atomic_read(&obd->obd_lock_replay_clients))<=0) + cfs_atomic_read(&obd->obd_lock_replay_clients)) + <=0) goto out; if (lprocfs_obd_snprintf(&page, size, &len,"completed_clients: %d\n", obd->obd_connected_clients - - atomic_read(&obd->obd_lock_replay_clients))<=0) + cfs_atomic_read(&obd->obd_lock_replay_clients)) + <=0) goto out; if (lprocfs_obd_snprintf(&page, size, &len,"evicted_clients: %d\n", obd->obd_stale_clients) <= 0) @@ -2230,20 +2254,21 @@ out: } EXPORT_SYMBOL(lprocfs_obd_rd_recovery_status); -int lprocfs_obd_rd_recovery_maxtime(char *page, char **start, off_t off, - int count, int *eof, void *data) +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; + struct obd_device *obd = (struct obd_device *)data; LASSERT(obd != NULL); - return snprintf(page, count, "%lu\n", obd->obd_recovery_max_time); + return snprintf(page, count, "%d\n", + obd->obd_recovery_timeout); } -EXPORT_SYMBOL(lprocfs_obd_rd_recovery_maxtime); +EXPORT_SYMBOL(lprocfs_obd_rd_recovery_time_soft); -int lprocfs_obd_wr_recovery_maxtime(struct file *file, const char *buffer, - unsigned long count, void *data) +int lprocfs_obd_wr_recovery_time_soft(struct file *file, const char *buffer, + unsigned long count, void *data) { - struct obd_device *obd = data; + struct obd_device *obd = (struct obd_device *)data; int val, rc; LASSERT(obd != NULL); @@ -2251,270 +2276,49 @@ int lprocfs_obd_wr_recovery_maxtime(struct file *file, const char *buffer, if (rc) return rc; - obd->obd_recovery_max_time = val; + obd->obd_recovery_timeout = val; return count; } -EXPORT_SYMBOL(lprocfs_obd_wr_recovery_maxtime); - - -/**** Changelogs *****/ -#define D_CHANGELOG 0 - -/* How many records per seq_show. Too small, we spawn llog_process threads - too often; too large, we run out of buffer space */ -#define CHANGELOG_CHUNK_SIZE 100 +EXPORT_SYMBOL(lprocfs_obd_wr_recovery_time_soft); -static int changelog_show_cb(struct llog_handle *llh, struct llog_rec_hdr *hdr, - void *data) +int lprocfs_obd_rd_recovery_time_hard(char *page, char **start, off_t off, + int count, int *eof, void *data) { - struct seq_file *seq = (struct seq_file *)data; - struct changelog_seq_iter *csi = seq->private; - struct llog_changelog_rec *rec = (struct llog_changelog_rec *)hdr; - char *ptr; - int cnt, rc; - ENTRY; - - if ((rec->cr_hdr.lrh_type != CHANGELOG_REC) || - (rec->cr.cr_type >= CL_LAST)) { - CERROR("Not a changelog rec %d/%d\n", rec->cr_hdr.lrh_type, - rec->cr.cr_type); - RETURN(-EINVAL); - } - - CDEBUG(D_CHANGELOG, "rec="LPU64" start="LPU64" cat=%d:%d start=%d:%d\n", - rec->cr.cr_index, csi->csi_startrec, - llh->lgh_hdr->llh_cat_idx, llh->lgh_cur_idx, - csi->csi_startcat, csi->csi_startidx); - - if (rec->cr.cr_index < csi->csi_startrec) - /* Skip entries earlier than what we are interested in */ - RETURN(0); - if (rec->cr.cr_index == csi->csi_startrec) { - /* Remember where we started, since seq_read will re-read - * the data when it reallocs space. Sigh, if only there was - * a way to tell seq_file how big the buf should be in the - * first place... - */ - csi->csi_startcat = llh->lgh_hdr->llh_cat_idx; - csi->csi_startidx = rec->cr_hdr.lrh_index - 1; - } - if (csi->csi_wrote > CHANGELOG_CHUNK_SIZE) { - /* Stop at some point with a reasonable seq_file buffer size. - * Start from here the next time. - */ - csi->csi_endrec = rec->cr.cr_index - 1; - csi->csi_startcat = llh->lgh_hdr->llh_cat_idx; - csi->csi_startidx = rec->cr_hdr.lrh_index - 1; - csi->csi_wrote = 0; - RETURN(LLOG_PROC_BREAK); - } - - CDEBUG(D_CHANGELOG, LPU64" %02d%-5s "LPU64" 0x%x t="DFID" p="DFID - " %.*s\n", rec->cr.cr_index, rec->cr.cr_type, - changelog_type2str(rec->cr.cr_type), rec->cr.cr_time, - rec->cr.cr_flags & CLF_FLAGMASK, - PFID(&rec->cr.cr_tfid), PFID(&rec->cr.cr_pfid), - rec->cr.cr_namelen, rec->cr.cr_name); - - cnt = sizeof(rec->cr) + rec->cr.cr_namelen; - ptr = (char *)(&rec->cr); - CDEBUG(D_CHANGELOG, "packed rec %d starting at %p\n", cnt, ptr); - rc = 0; - while ((cnt-- > 0) && (rc == 0)) { - rc = seq_putc(seq, *ptr); - ptr++; - } - - if (rc < 0) { - /* Ran out of room in the seq buffer. seq_read will dump - * the whole buffer and re-seq_start with a larger one; - * no point in continuing the llog_process */ - CDEBUG(D_CHANGELOG, "rec="LPU64" overflow "LPU64"<-"LPU64"\n", - rec->cr.cr_index, csi->csi_startrec, csi->csi_endrec); - csi->csi_endrec = csi->csi_startrec - 1; - csi->csi_wrote = 0; - RETURN(LLOG_PROC_BREAK); - } - - csi->csi_wrote++; - csi->csi_endrec = rec->cr.cr_index; - - RETURN(0); -} - -static int changelog_seq_show(struct seq_file *seq, void *v) -{ - struct changelog_seq_iter *csi = seq->private; - int rc; - ENTRY; - - if (csi->csi_fill) { - /* seq_read wants more data to fill his buffer. But we already - filled the buf as much as we cared to; force seq_read to - accept that by padding with 0's */ - while (seq_putc(seq, 0) == 0); - RETURN(0); - } - - /* Since we have to restart the llog_cat_process for each chunk of the - seq_ functions, start from where we left off. */ - rc = llog_cat_process(csi->csi_llh, changelog_show_cb, seq, - csi->csi_startcat, csi->csi_startidx); - - CDEBUG(D_CHANGELOG,"seq_show "LPU64"-"LPU64" cat=%d:%d wrote=%d rc=%d\n", - csi->csi_startrec, csi->csi_endrec, csi->csi_startcat, - csi->csi_startidx, csi->csi_wrote, rc); - - if (rc == 0) - csi->csi_done = 1; - if (rc == LLOG_PROC_BREAK) - /* more records left, but seq_show must return 0 */ - rc = 0; - RETURN(rc); -} - -static void *changelog_seq_start(struct seq_file *seq, loff_t *pos) -{ - struct changelog_seq_iter *csi = seq->private; - LASSERT(csi); - - CDEBUG(D_CHANGELOG, "start "LPU64"-"LPU64" pos="LPU64"\n", - csi->csi_startrec, csi->csi_endrec, *pos); - - csi->csi_fill = 0; - - if (csi->csi_done) - /* no more records, seq_read should return 0 if buffer - is empty */ - return NULL; - - if (*pos > csi->csi_pos) { - /* The seq_read implementation sucks. It may call start - multiple times, using pos to indicate advances, if any, - by arbitrarily increasing it by 1. So ignore the actual - value of pos, and just register any increase as - "seq_read wants the next values". */ - csi->csi_startrec = csi->csi_endrec + 1; - csi->csi_pos = *pos; - } - /* else use old startrec/startidx */ - - return csi; -} - -static void changelog_seq_stop(struct seq_file *seq, void *v) -{ - struct changelog_seq_iter *csi = seq->private; + struct obd_device *obd = data; + LASSERT(obd != NULL); - CDEBUG(D_CHANGELOG, "stop "LPU64"-"LPU64"\n", - csi->csi_startrec, csi->csi_endrec); + return snprintf(page, count, "%lu\n", obd->obd_recovery_time_hard); } +EXPORT_SYMBOL(lprocfs_obd_rd_recovery_time_hard); -static void *changelog_seq_next(struct seq_file *seq, void *v, loff_t *pos) +int lprocfs_obd_wr_recovery_time_hard(struct file *file, const char *buffer, + unsigned long count, void *data) { - struct changelog_seq_iter *csi = seq->private; - - CDEBUG(D_CHANGELOG, "next "LPU64"-"LPU64" pos="LPU64"\n", - csi->csi_startrec, csi->csi_endrec, *pos); - - csi->csi_fill = 1; - - return csi; -} - -static struct seq_operations changelog_sops = { - .start = changelog_seq_start, - .stop = changelog_seq_stop, - .next = changelog_seq_next, - .show = changelog_seq_show, -}; - -int changelog_seq_open(struct inode *inode, struct file *file, - struct changelog_seq_iter **csih) -{ - struct changelog_seq_iter *csi; - struct proc_dir_entry *dp = PDE(inode); - struct seq_file *seq; - int rc; - - LPROCFS_ENTRY_AND_CHECK(dp); + struct obd_device *obd = data; + int val, rc; + LASSERT(obd != NULL); - rc = seq_open(file, &changelog_sops); - if (rc) { - LPROCFS_EXIT(); + rc = lprocfs_write_helper(buffer, count, &val); + if (rc) return rc; - } - - OBD_ALLOC_PTR(csi); - if (csi == NULL) { - lprocfs_seq_release(inode, file); - return -ENOMEM; - } - - csi->csi_dev = dp->data; - seq = file->private_data; - seq->private = csi; - *csih = csi; - - return rc; -} -EXPORT_SYMBOL(changelog_seq_open); - -int changelog_seq_release(struct inode *inode, struct file *file) -{ - struct seq_file *seq = file->private_data; - struct changelog_seq_iter *csi = seq->private; - - if (csi) - OBD_FREE_PTR(csi); - return lprocfs_seq_release(inode, file); + obd->obd_recovery_time_hard = val; + return count; } -EXPORT_SYMBOL(changelog_seq_release); - -#ifndef SEEK_CUR /* SLES10 needs this */ -#define SEEK_CUR 1 -#define SEEK_END 2 -#endif +EXPORT_SYMBOL(lprocfs_obd_wr_recovery_time_hard); -loff_t changelog_seq_lseek(struct file *file, loff_t offset, int origin) +int lprocfs_obd_rd_mntdev(char *page, char **start, off_t off, + int count, int *eof, void *data) { - struct seq_file *seq = (struct seq_file *)file->private_data; - struct changelog_seq_iter *csi = seq->private; - - CDEBUG(D_CHANGELOG,"seek "LPU64"-"LPU64" off="LPU64":%d fpos="LPU64"\n", - csi->csi_startrec, csi->csi_endrec, offset, origin, file->f_pos); - - LL_SEQ_LOCK(seq); - - switch (origin) { - case SEEK_CUR: - offset += csi->csi_endrec; - break; - case SEEK_END: - /* we don't know the last rec */ - offset = -1; - } - - /* SEEK_SET */ - - if (offset < 0) { - LL_SEQ_UNLOCK(seq); - return -EINVAL; - } - - csi->csi_startrec = offset; - csi->csi_endrec = offset ? offset - 1 : 0; + struct obd_device *obd = (struct obd_device *)data; - /* drop whatever is left in sucky seq_read's buffer */ - seq->count = 0; - seq->from = 0; - seq->index++; - LL_SEQ_UNLOCK(seq); - file->f_pos = csi->csi_startrec; - return csi->csi_startrec; + LASSERT(obd != NULL); + LASSERT(obd->u.obt.obt_vfsmnt->mnt_devname); + *eof = 1; + return snprintf(page, count, "%s\n", + obd->u.obt.obt_vfsmnt->mnt_devname); } -EXPORT_SYMBOL(changelog_seq_lseek); +EXPORT_SYMBOL(lprocfs_obd_rd_mntdev); EXPORT_SYMBOL(lprocfs_register); EXPORT_SYMBOL(lprocfs_srch); @@ -2535,6 +2339,7 @@ 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); @@ -2560,8 +2365,6 @@ EXPORT_SYMBOL(lprocfs_rd_kbytesfree); EXPORT_SYMBOL(lprocfs_rd_kbytesavail); EXPORT_SYMBOL(lprocfs_rd_filestotal); EXPORT_SYMBOL(lprocfs_rd_filesfree); -EXPORT_SYMBOL(lprocfs_rd_quota_resend_count); -EXPORT_SYMBOL(lprocfs_wr_quota_resend_count); EXPORT_SYMBOL(lprocfs_write_helper); EXPORT_SYMBOL(lprocfs_write_frac_helper);