X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fobdclass%2Flprocfs_status_server.c;h=290e4e519a35dc61c0949f5b2d8fde0d2e1d8fbe;hp=3acf81195430dcd8821c10e99a1ff0d3310e5f20;hb=907a321c9b9e2cd5f5ccf488cc516ba05dee0ad8;hpb=bafa12c06d87c05bb263eed37ad8af1a2df99894 diff --git a/lustre/obdclass/lprocfs_status_server.c b/lustre/obdclass/lprocfs_status_server.c index 3acf811..290e4e5 100644 --- a/lustre/obdclass/lprocfs_status_server.c +++ b/lustre/obdclass/lprocfs_status_server.c @@ -23,7 +23,7 @@ * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * - * Copyright (c) 2011, 2013, Intel Corporation. + * Copyright (c) 2011, 2014, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -38,8 +38,9 @@ #include #include #include +#include -#if defined(LPROCFS) +#ifdef CONFIG_PROC_FS int lprocfs_evict_client_open(struct inode *inode, struct file *f) { @@ -153,26 +154,41 @@ void lprocfs_free_per_client_stats(struct obd_device *obd) } EXPORT_SYMBOL(lprocfs_free_per_client_stats); -int lprocfs_exp_nid_seq_show(struct seq_file *m, void *data) +static int lprocfs_exp_print_uuid_seq(cfs_hash_t *hs, cfs_hash_bd_t *bd, + struct hlist_node *hnode, void *cb_data) { - struct obd_export *exp = m->private; - LASSERT(exp != NULL); - return seq_printf(m, "%s\n", obd_export_nid2str(exp)); -} + struct seq_file *m = cb_data; + struct obd_export *exp = cfs_hash_object(hs, hnode); -int lprocfs_exp_print_uuid_seq(cfs_hash_t *hs, cfs_hash_bd_t *bd, - struct hlist_node *hnode, void *cb_data) + if (exp->exp_nid_stats != NULL) + seq_printf(m, "%s\n", obd_uuid2str(&exp->exp_client_uuid)); + return 0; +} +static int lprocfs_exp_print_nodemap_seq(cfs_hash_t *hs, cfs_hash_bd_t *bd, + struct hlist_node *hnode, void *cb_data) { - struct obd_export *exp = cfs_hash_object(hs, hnode); struct seq_file *m = cb_data; + struct obd_export *exp = cfs_hash_object(hs, hnode); + struct lu_nodemap *nodemap = exp->exp_target_data.ted_nodemap; - if (exp->exp_nid_stats) - seq_printf(m, "%s\n", obd_uuid2str(&exp->exp_client_uuid)); + if (nodemap != NULL) + seq_printf(m, "%s\n", nodemap->nm_name); + return 0; +} + +static int lprocfs_exp_nodemap_seq_show(struct seq_file *m, void *data) +{ + struct nid_stat *stats = m->private; + struct obd_device *obd = stats->nid_obd; + + cfs_hash_for_each_key(obd->obd_nid_hash, &stats->nid, + lprocfs_exp_print_nodemap_seq, m); return 0; } +LPROC_SEQ_FOPS_RO(lprocfs_exp_nodemap); -int lprocfs_exp_uuid_seq_show(struct seq_file *m, void *data) +static int lprocfs_exp_uuid_seq_show(struct seq_file *m, void *data) { struct nid_stat *stats = m->private; struct obd_device *obd = stats->nid_obd; @@ -183,21 +199,21 @@ int lprocfs_exp_uuid_seq_show(struct seq_file *m, void *data) } LPROC_SEQ_FOPS_RO(lprocfs_exp_uuid); -int lprocfs_exp_print_hash_seq(cfs_hash_t *hs, cfs_hash_bd_t *bd, - struct hlist_node *hnode, void *cb_data) +static int lprocfs_exp_print_hash_seq(cfs_hash_t *hs, cfs_hash_bd_t *bd, + struct hlist_node *hnode, void *cb_data) { struct seq_file *m = cb_data; struct obd_export *exp = cfs_hash_object(hs, hnode); if (exp->exp_lock_hash != NULL) { - cfs_hash_debug_header_seq(m); - cfs_hash_debug_str_seq(hs, m); + cfs_hash_debug_header(m); + cfs_hash_debug_str(hs, m); } return 0; } -int lprocfs_exp_hash_seq_show(struct seq_file *m, void *data) +static int lprocfs_exp_hash_seq_show(struct seq_file *m, void *data) { struct nid_stat *stats = m->private; struct obd_device *obd = stats->nid_obd; @@ -258,17 +274,15 @@ lprocfs_nid_stats_clear_seq_write(struct file *file, const char *buffer, } EXPORT_SYMBOL(lprocfs_nid_stats_clear_seq_write); -int lprocfs_exp_setup(struct obd_export *exp, lnet_nid_t *nid, int *newnid) +int lprocfs_exp_setup(struct obd_export *exp, lnet_nid_t *nid) { struct nid_stat *new_stat, *old_stat; struct obd_device *obd = NULL; struct proc_dir_entry *entry; - char *buffer = NULL; + char nidstr[LNET_NIDSTR_SIZE]; int rc = 0; ENTRY; - *newnid = 0; - if (!exp || !exp->exp_obd || !exp->exp_obd->obd_proc_exports_entry || !exp->exp_obd->obd_nid_stats_hash) RETURN(-EINVAL); @@ -276,8 +290,10 @@ int lprocfs_exp_setup(struct obd_export *exp, lnet_nid_t *nid, int *newnid) /* not test against zero because eric say: * You may only test nid against another nid, or LNET_NID_ANY. * Anything else is nonsense.*/ - if (!nid || *nid == LNET_NID_ANY) - RETURN(0); + if (nid == NULL || *nid == LNET_NID_ANY) + RETURN(-EALREADY); + + libcfs_nid2str_r(*nid, nidstr, sizeof(nidstr)); spin_lock(&exp->exp_lock); if (exp->exp_nid_stats != NULL) { @@ -294,16 +310,15 @@ int lprocfs_exp_setup(struct obd_export *exp, lnet_nid_t *nid, int *newnid) if (new_stat == NULL) RETURN(-ENOMEM); - new_stat->nid = *nid; - new_stat->nid_obd = exp->exp_obd; + new_stat->nid = *nid; + new_stat->nid_obd = exp->exp_obd; /* we need set default refcount to 1 to balance obd_disconnect */ 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); 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)); + old_stat, nidstr, atomic_read(&old_stat->nid_exp_ref_count)); /* Return -EALREADY here so that we know that the /proc * entry already has been created */ @@ -318,62 +333,52 @@ int lprocfs_exp_setup(struct obd_export *exp, lnet_nid_t *nid, int *newnid) GOTO(destroy_new, rc = -EALREADY); } /* not found - create */ - OBD_ALLOC(buffer, LNET_NIDSTR_SIZE); - if (buffer == NULL) - GOTO(destroy_new, rc = -ENOMEM); - - memcpy(buffer, libcfs_nid2str(*nid), LNET_NIDSTR_SIZE); -#ifndef HAVE_ONLY_PROCFS_SEQ - new_stat->nid_proc = lprocfs_register(buffer, + new_stat->nid_proc = lprocfs_register(nidstr, obd->obd_proc_exports_entry, NULL, NULL); -#else - new_stat->nid_proc = lprocfs_seq_register(buffer, - obd->obd_proc_exports_entry, - NULL, NULL); -#endif - OBD_FREE(buffer, LNET_NIDSTR_SIZE); if (IS_ERR(new_stat->nid_proc)) { rc = PTR_ERR(new_stat->nid_proc); new_stat->nid_proc = NULL; CERROR("%s: cannot create proc entry for export %s: rc = %d\n", - obd->obd_name, libcfs_nid2str(*nid), rc); + obd->obd_name, nidstr, rc); GOTO(destroy_new_ns, rc); } - entry = lprocfs_add_simple(new_stat->nid_proc, "uuid", -#ifndef HAVE_ONLY_PROCFS_SEQ - NULL, NULL, -#endif - new_stat, &lprocfs_exp_uuid_fops); + entry = lprocfs_add_simple(new_stat->nid_proc, "nodemap", new_stat, + &lprocfs_exp_nodemap_fops); if (IS_ERR(entry)) { - CWARN("Error adding the NID stats file\n"); rc = PTR_ERR(entry); + CWARN("Error adding the nodemap file: rc = %d\n", rc); GOTO(destroy_new_ns, rc); } - entry = lprocfs_add_simple(new_stat->nid_proc, "hash", -#ifndef HAVE_ONLY_PROCFS_SEQ - NULL, NULL, -#endif - new_stat, &lprocfs_exp_hash_fops); + entry = lprocfs_add_simple(new_stat->nid_proc, "uuid", new_stat, + &lprocfs_exp_uuid_fops); if (IS_ERR(entry)) { - CWARN("Error adding the hash file\n"); rc = PTR_ERR(entry); + CWARN("Error adding the NID stats file: rc = %d\n", rc); + GOTO(destroy_new_ns, rc); + } + + entry = lprocfs_add_simple(new_stat->nid_proc, "hash", new_stat, + &lprocfs_exp_hash_fops); + if (IS_ERR(entry)) { + rc = PTR_ERR(entry); + CWARN("Error adding the hash file: rc = %d\n", rc); GOTO(destroy_new_ns, rc); } spin_lock(&exp->exp_lock); exp->exp_nid_stats = new_stat; spin_unlock(&exp->exp_lock); - *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); - RETURN(rc); + RETURN(0); destroy_new_ns: if (new_stat->nid_proc != NULL) @@ -399,7 +404,6 @@ int lprocfs_exp_cleanup(struct obd_export *exp) return 0; } -EXPORT_SYMBOL(lprocfs_exp_cleanup); #define LPROCFS_OBD_OP_INIT(base, stats, op) \ do { \ @@ -438,12 +442,8 @@ void lprocfs_init_ops_stats(int num_private_stats, struct lprocfs_stats *stats) LPROCFS_OBD_OP_INIT(num_private_stats, stats, getattr_async); LPROCFS_OBD_OP_INIT(num_private_stats, stats, preprw); LPROCFS_OBD_OP_INIT(num_private_stats, stats, commitrw); - 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, init_export); LPROCFS_OBD_OP_INIT(num_private_stats, stats, destroy_export); - LPROCFS_OBD_OP_INIT(num_private_stats, stats, llog_init); - LPROCFS_OBD_OP_INIT(num_private_stats, stats, llog_finish); LPROCFS_OBD_OP_INIT(num_private_stats, stats, import_event); LPROCFS_OBD_OP_INIT(num_private_stats, stats, notify); LPROCFS_OBD_OP_INIT(num_private_stats, stats, health_check); @@ -515,10 +515,10 @@ int lprocfs_hash_seq_show(struct seq_file *m, void *data) if (obd == NULL) return 0; - c += cfs_hash_debug_header_seq(m); - c += cfs_hash_debug_str_seq(obd->obd_uuid_hash, m); - c += cfs_hash_debug_str_seq(obd->obd_nid_hash, m); - c += cfs_hash_debug_str_seq(obd->obd_nid_stats_hash, m); + c += cfs_hash_debug_header(m); + c += cfs_hash_debug_str(obd->obd_uuid_hash, m); + c += cfs_hash_debug_str(obd->obd_nid_hash, m); + c += cfs_hash_debug_str(obd->obd_nid_stats_hash, m); return c; } EXPORT_SYMBOL(lprocfs_hash_seq_show); @@ -683,4 +683,4 @@ int lprocfs_target_instance_seq_show(struct seq_file *m, void *data) } EXPORT_SYMBOL(lprocfs_target_instance_seq_show); -#endif /* LPROCFS*/ +#endif /* CONFIG_PROC_FS*/