X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fobdfilter%2Flproc_obdfilter.c;h=d51f306b98821b2d404b8a0d3405355654e448a6;hb=2d5e7dc801fcaa66f5fd2a3acdd5f8c150dc84d7;hp=123c1ed304971ad6d0b9d603d66cb2d875cb9838;hpb=940dcd5282df4c8503053a5b3e932e8a7dc00486;p=fs%2Flustre-release.git diff --git a/lustre/obdfilter/lproc_obdfilter.c b/lustre/obdfilter/lproc_obdfilter.c index 123c1ed..d51f306 100644 --- a/lustre/obdfilter/lproc_obdfilter.c +++ b/lustre/obdfilter/lproc_obdfilter.c @@ -1,26 +1,37 @@ /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- * vim:expandtab:shiftwidth=8:tabstop=8: * - * Copyright (C) 2002, 2003 Cluster File Systems, Inc. + * GPL HEADER START * - * This file is part of the Lustre file system, http://www.lustre.org - * Lustre is a trademark of Cluster File Systems, Inc. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * You may have signed or agreed to another license before downloading - * this software. If so, you are bound by the terms and conditions - * of that agreement, and the following does not apply to you. See the - * LICENSE file included with this distribution for more information. + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 only, + * as published by the Free Software Foundation. * - * If you did not agree to a different license, then this copy of Lustre - * is open source software; you can redistribute it and/or modify it - * under the terms of version 2 of the GNU General Public License as - * published by the Free Software Foundation. + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License version 2 for more details (a copy is included + * in the LICENSE file that accompanied this code). * - * In either case, Lustre is distributed in the hope that it will be - * useful, but WITHOUT ANY WARRANTY; without even the implied warranty - * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * license text for more details. + * You should have received a copy of the GNU General Public License + * version 2 along with this program; If not, see + * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf * + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + * + * GPL HEADER END + */ +/* + * Copyright 2008 Sun Microsystems, Inc. All rights reserved + * Use is subject to license terms. + */ +/* + * This file is part of Lustre, http://www.lustre.org/ + * Lustre is a trademark of Sun Microsystems, Inc. */ #define DEBUG_SUBSYSTEM S_CLASS @@ -77,10 +88,10 @@ static int lprocfs_filter_rd_mntdev(char *page, char **start, off_t off, struct obd_device *obd = (struct obd_device *)data; LASSERT(obd != NULL); - LASSERT(obd->u.filter.fo_vfsmnt->mnt_devname); + LASSERT(obd->u.obt.obt_vfsmnt->mnt_devname); *eof = 1; return snprintf(page, count, "%s\n", - obd->u.filter.fo_vfsmnt->mnt_devname); + obd->u.obt.obt_vfsmnt->mnt_devname); } static int lprocfs_filter_rd_last_id(char *page, char **start, off_t off, @@ -90,10 +101,16 @@ static int lprocfs_filter_rd_last_id(char *page, char **start, off_t off, struct filter_obd *filter = &obd->u.filter; int retval = 0, rc, i; - if (obd == NULL) + if (obd == NULL || !obd->obd_set_up || obd->obd_stopping) return 0; + rc = snprintf(page, count, LPU64"\n",filter_last_id(filter, 0)); + if (rc < 0) + return rc; + page += rc; + count -= rc; + retval += rc; - for (i = FILTER_GROUP_MDS0; i < filter->fo_group_count; i++) { + for (i = FILTER_GROUP_MDS1_N_BASE; i < filter->fo_group_count; i++) { rc = snprintf(page, count, LPU64"\n",filter_last_id(filter, i)); if (rc < 0) { retval = rc; @@ -132,7 +149,6 @@ int lprocfs_filter_wr_readcache(struct file *file, const char *buffer, return count; } - int lprocfs_filter_rd_fmd_max_num(char *page, char **start, off_t off, int count, int *eof, void *data) { @@ -167,7 +183,8 @@ int lprocfs_filter_rd_fmd_max_age(char *page, char **start, off_t off, struct obd_device *obd = data; int rc; - rc = snprintf(page, count, "%u\n", obd->u.filter.fo_fmd_max_age / HZ); + rc = snprintf(page, count, "%u\n", + obd->u.filter.fo_fmd_max_age / CFS_HZ); return rc; } @@ -185,7 +202,7 @@ int lprocfs_filter_wr_fmd_max_age(struct file *file, const char *buffer, if (val > 65536 || val < 1) return -EINVAL; - obd->u.filter.fo_fmd_max_age = val * HZ; + obd->u.filter.fo_fmd_max_age = val * CFS_HZ; return count; } @@ -231,42 +248,125 @@ static int lprocfs_filter_rd_capa_count(char *page, char **start, off_t off, capa_count[CAPA_SITE_SERVER]); } -static -int lprocfs_filter_rd_blacklist(char *page, char **start, off_t off, int count, - int *eof, void *data) +static int lprocfs_rd_sec_level(char *page, char **start, off_t off, + int count, int *eof, void *data) { - int rc; + struct obd_device *obd = data; - rc = blacklist_display(page, count); - *eof = 1; - return rc; + return snprintf(page, count, "%d\n", obd->u.filter.fo_sec_level); } -static -int lprocfs_filter_wr_blacklist(struct file *file, const char *buffer, +static int lprocfs_wr_sec_level(struct file *file, const char *buffer, unsigned long count, void *data) { - int add; - uid_t uid = -1; - - if (count < 2) - return count; - if (buffer[0] == '+') - add = 1; - else if (buffer[0] == '-') - add = 0; - else - return count; - - sscanf(buffer + 1, "%u", &uid); - if (add) - blacklist_add(uid); - else - blacklist_del(uid); + struct obd_device *obd = data; + int val, rc; + + rc = lprocfs_write_helper(buffer, count, &val); + if (rc) + return rc; + + if (val > LUSTRE_SEC_ALL || val < LUSTRE_SEC_NONE) + return -EINVAL; + + if (val == LUSTRE_SEC_SPECIFY) { + CWARN("security level %d will be supported in future.\n", + LUSTRE_SEC_SPECIFY); + return -EINVAL; + } + + obd->u.filter.fo_sec_level = val; + return count; +} + +static int lprocfs_filter_rd_cache(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, "%u\n", obd->u.filter.fo_read_cache); +} + +static int lprocfs_filter_wr_cache(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; + + cfs_spin_lock_bh(&obd->obd_processing_task_lock); + obd->u.filter.fo_read_cache = val; + cfs_spin_unlock_bh(&obd->obd_processing_task_lock); return count; } -static struct lprocfs_vars lprocfs_obd_vars[] = { +static int lprocfs_filter_rd_wcache(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, "%u\n", obd->u.filter.fo_writethrough_cache); +} + +static int lprocfs_filter_wr_wcache(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; + + cfs_spin_lock_bh(&obd->obd_processing_task_lock); + obd->u.filter.fo_writethrough_cache = val; + cfs_spin_unlock_bh(&obd->obd_processing_task_lock); + return count; +} + +static int lprocfs_filter_rd_mds_sync(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, "%u\n", obd->u.filter.fo_mds_ost_sync); +} + +int lprocfs_filter_rd_degraded(char *page, char **start, off_t off, + int count, int *eof, void *data) +{ + struct obd_device *obd = data; + + return snprintf(page, count, "%u\n", obd->u.filter.fo_raid_degraded); +} + +int lprocfs_filter_wr_degraded(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; + + cfs_spin_lock(&obd->obd_osfs_lock); + obd->u.filter.fo_raid_degraded = !!val; + cfs_spin_unlock(&obd->obd_osfs_lock); + return count; +} + +static struct lprocfs_vars lprocfs_filter_obd_vars[] = { { "uuid", lprocfs_rd_uuid, 0, 0 }, { "blocksize", lprocfs_rd_blksize, 0, 0 }, { "kbytestotal", lprocfs_rd_kbytestotal, 0, 0 }, @@ -281,7 +381,12 @@ static struct lprocfs_vars lprocfs_obd_vars[] = { { "tot_dirty", lprocfs_filter_rd_tot_dirty, 0, 0 }, { "tot_pending", lprocfs_filter_rd_tot_pending, 0, 0 }, { "tot_granted", lprocfs_filter_rd_tot_granted, 0, 0 }, - { "recovery_status", lprocfs_obd_rd_recovery_status, 0, 0 }, + { "hash_stats", lprocfs_obd_rd_hash, 0, 0 }, + { "recovery_status", lprocfs_obd_rd_recovery_status, 0, 0 }, + { "recovery_time_soft", lprocfs_obd_rd_recovery_time_soft, + lprocfs_obd_wr_recovery_time_soft, 0}, + { "recovery_time_hard", lprocfs_obd_rd_recovery_time_hard, + lprocfs_obd_wr_recovery_time_hard, 0}, { "evict_client", 0, lprocfs_wr_evict_client, 0, &lprocfs_evict_client_fops}, { "num_exports", lprocfs_rd_num_exports, 0, 0 }, @@ -289,11 +394,8 @@ static struct lprocfs_vars lprocfs_obd_vars[] = { lprocfs_filter_rd_readcache, lprocfs_filter_wr_readcache, 0 }, #ifdef HAVE_QUOTA_SUPPORT - { "quota_bunit_sz", lprocfs_rd_bunit, lprocfs_wr_bunit, 0}, - { "quota_btune_sz", lprocfs_rd_btune, lprocfs_wr_btune, 0}, - { "quota_iunit_sz", lprocfs_rd_iunit, lprocfs_wr_iunit, 0}, - { "quota_itune_sz", lprocfs_rd_itune, lprocfs_wr_itune, 0}, - { "quota_type", lprocfs_rd_type, lprocfs_wr_type, 0}, + { "quota_type", lprocfs_quota_rd_type, + lprocfs_quota_wr_type, 0}, #endif { "client_cache_count", lprocfs_filter_rd_fmd_max_num, lprocfs_filter_wr_fmd_max_num, 0 }, @@ -302,12 +404,18 @@ static struct lprocfs_vars lprocfs_obd_vars[] = { { "capa", lprocfs_filter_rd_capa, lprocfs_filter_wr_capa, 0 }, { "capa_count", lprocfs_filter_rd_capa_count, 0, 0 }, - { "blacklist", lprocfs_filter_rd_blacklist, - lprocfs_filter_wr_blacklist, 0 }, + { "sec_level", lprocfs_rd_sec_level, + lprocfs_wr_sec_level, 0 }, + { "read_cache_enable", lprocfs_filter_rd_cache, lprocfs_filter_wr_cache, 0}, + { "writethrough_cache_enable", lprocfs_filter_rd_wcache, + lprocfs_filter_wr_wcache, 0}, + { "mds_sync", lprocfs_filter_rd_mds_sync, 0, 0}, + { "degraded", lprocfs_filter_rd_degraded, + lprocfs_filter_wr_degraded, 0 }, { 0 } }; -static struct lprocfs_vars lprocfs_module_vars[] = { +static struct lprocfs_vars lprocfs_filter_module_vars[] = { { "num_refs", lprocfs_rd_numrefs, 0, 0 }, { 0 } }; @@ -316,7 +424,6 @@ void filter_tally(struct obd_export *exp, struct page **pages, int nr_pages, unsigned long *blocks, int blocks_per_page, int wr) { struct filter_obd *filter = &exp->exp_obd->u.filter; - struct filter_export_data *fed = &exp->exp_filter_data; struct page *last_page = NULL; unsigned long *last_block = NULL; unsigned long discont_pages = 0; @@ -328,8 +435,9 @@ void filter_tally(struct obd_export *exp, struct page **pages, int nr_pages, lprocfs_oh_tally_log2(&filter->fo_filter_stats.hist[BRW_R_PAGES + wr], nr_pages); - lprocfs_oh_tally_log2(&fed->fed_brw_stats.hist[BRW_R_PAGES + wr], - nr_pages); + if (exp->exp_nid_stats && exp->exp_nid_stats->nid_brw_stats) + lprocfs_oh_tally_log2(&exp->exp_nid_stats->nid_brw_stats-> + hist[BRW_R_PAGES + wr], nr_pages); while (nr_pages-- > 0) { if (last_page && (*pages)->index != (last_page->index + 1)) @@ -345,12 +453,17 @@ void filter_tally(struct obd_export *exp, struct page **pages, int nr_pages, lprocfs_oh_tally(&filter->fo_filter_stats.hist[BRW_R_DISCONT_PAGES +wr], discont_pages); - lprocfs_oh_tally(&fed->fed_brw_stats.hist[BRW_R_DISCONT_PAGES + wr], - discont_pages); lprocfs_oh_tally(&filter->fo_filter_stats.hist[BRW_R_DISCONT_BLOCKS+wr], discont_blocks); - lprocfs_oh_tally(&fed->fed_brw_stats.hist[BRW_R_DISCONT_BLOCKS + wr], - discont_blocks); + + if (exp->exp_nid_stats && exp->exp_nid_stats->nid_brw_stats) { + lprocfs_oh_tally_log2(&exp->exp_nid_stats->nid_brw_stats-> + hist[BRW_R_DISCONT_PAGES + wr], + discont_pages); + lprocfs_oh_tally_log2(&exp->exp_nid_stats->nid_brw_stats-> + hist[BRW_R_DISCONT_BLOCKS + wr], + discont_blocks); + } } #define pct(a,b) (b ? a * 100 / b : 0) @@ -362,7 +475,7 @@ static void display_brw_stats(struct seq_file *seq, char *name, char *units, int i; seq_printf(seq, "\n%26s read | write\n", " "); - seq_printf(seq, "%-22s %-5s %% cum %% | %-5s %% cum %%\n", + seq_printf(seq, "%-22s %-5s %% cum %% | %-5s %% cum %%\n", name, units, units); read_tot = lprocfs_oh_sum(read); @@ -375,7 +488,7 @@ static void display_brw_stats(struct seq_file *seq, char *name, char *units, if (read_cum == 0 && write_cum == 0) continue; - if (!log2) + if (!log2) seq_printf(seq, "%u", i); else if (i < 10) seq_printf(seq, "%u", 1<hist[BRW_R_DIO_FRAGS], &brw_stats->hist[BRW_W_DIO_FRAGS], 0); -#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0)) display_brw_stats(seq, "disk I/Os in flight", "ios", &brw_stats->hist[BRW_R_RPC_HIST], &brw_stats->hist[BRW_W_RPC_HIST], 0); { char title[24]; - sprintf(title, "I/O time (1/%ds)", HZ); + sprintf(title, "I/O time (1/%ds)", CFS_HZ); display_brw_stats(seq, title, "ios", &brw_stats->hist[BRW_R_IO_TIME], &brw_stats->hist[BRW_W_IO_TIME], 1); @@ -434,9 +546,10 @@ static void brw_stats_show(struct seq_file *seq, struct brw_stats *brw_stats) display_brw_stats(seq, "disk I/O size", "ios", &brw_stats->hist[BRW_R_DISK_IOSIZE], &brw_stats->hist[BRW_W_DISK_IOSIZE], 1); -#endif } +#undef pct + static int filter_brw_stats_seq_show(struct seq_file *seq, void *v) { struct obd_device *dev = seq->private; @@ -469,29 +582,36 @@ int lproc_filter_attach_seqstat(struct obd_device *dev) &filter_brw_stats_fops, dev); } -static int filter_per_export_stats_seq_show(struct seq_file *seq, void *v) +void lprocfs_filter_init_vars(struct lprocfs_static_vars *lvars) { - struct filter_export_data *fed = seq->private; + lvars->module_vars = lprocfs_filter_module_vars; + lvars->obd_vars = lprocfs_filter_obd_vars; +} - brw_stats_show(seq, &fed->fed_brw_stats); +static int filter_per_nid_stats_seq_show(struct seq_file *seq, void *v) +{ + nid_stat_t * stat = seq->private; + + if (stat->nid_brw_stats) + brw_stats_show(seq, stat->nid_brw_stats); return 0; } -static ssize_t filter_per_export_stats_seq_write(struct file *file, - const char *buf, size_t len, loff_t *off) +static ssize_t filter_per_nid_stats_seq_write(struct file *file, + const char *buf, size_t len, + loff_t *off) { - struct seq_file *seq = file->private_data; - struct filter_export_data *fed = seq->private; + struct seq_file *seq = file->private_data; + nid_stat_t *stat = seq->private; int i; - for (i = 0; i < BRW_LAST; i++) - lprocfs_oh_clear(&fed->fed_brw_stats.hist[i]); + if (stat->nid_brw_stats) + for (i = 0; i < BRW_LAST; i++) + lprocfs_oh_clear(&stat->nid_brw_stats->hist[i]); return len; } -LPROC_SEQ_FOPS(filter_per_export_stats); - -LPROCFS_INIT_VARS(filter, lprocfs_module_vars, lprocfs_obd_vars) +LPROC_SEQ_FOPS(filter_per_nid_stats); #endif /* LPROCFS */