X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Flov%2Flproc_lov.c;h=d9d3d91efdfad6f36848023d4d04fc5710d5285a;hb=326341889117faa5e7cbb05de66d759200405525;hp=7b7a00c08b44aa316faf240f8bbfe1a7766a2ca2;hpb=a2a0746305449dbd925879b14dc2c0d6040bb8bf;p=fs%2Flustre-release.git diff --git a/lustre/lov/lproc_lov.c b/lustre/lov/lproc_lov.c index 7b7a00c..d9d3d91 100644 --- a/lustre/lov/lproc_lov.c +++ b/lustre/lov/lproc_lov.c @@ -1,39 +1,48 @@ /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- * vim:expandtab:shiftwidth=8:tabstop=8: * - * Copyright (C) 2002 Cluster File Systems, Inc. + * GPL HEADER START * - * This file is part of Lustre, http://www.lustre.org. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Lustre is free 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 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. * - * 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 - * GNU General Public License for more details. + * 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). * - * You should have received a copy of the GNU General Public License - * along with Lustre; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * 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 (c) 2002, 2010, Oracle and/or its affiliates. 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 #include -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)) #include -#endif -#include -#include +#include +#include #include +#include "lov_internal.h" -#ifndef LPROCFS -static struct lprocfs_vars lprocfs_module_vars[] = { {0} }; -static struct lprocfs_vars lprocfs_obd_vars[] = { {0} }; -#else - +#ifdef LPROCFS static int lov_rd_stripesize(char *page, char **start, off_t off, int count, int *eof, void *data) { @@ -46,6 +55,25 @@ static int lov_rd_stripesize(char *page, char **start, off_t off, int count, return snprintf(page, count, LPU64"\n", desc->ld_default_stripe_size); } +static int lov_wr_stripesize(struct file *file, const char *buffer, + unsigned long count, void *data) +{ + struct obd_device *dev = (struct obd_device *)data; + struct lov_desc *desc; + __u64 val; + int rc; + + LASSERT(dev != NULL); + desc = &dev->u.lov.desc; + rc = lprocfs_write_u64_helper(buffer, count, &val); + if (rc) + return rc; + + lov_fix_desc_stripe_size(&val); + desc->ld_default_stripe_size = val; + return count; +} + static int lov_rd_stripeoffset(char *page, char **start, off_t off, int count, int *eof, void *data) { @@ -58,6 +86,24 @@ static int lov_rd_stripeoffset(char *page, char **start, off_t off, int count, return snprintf(page, count, LPU64"\n", desc->ld_default_stripe_offset); } +static int lov_wr_stripeoffset(struct file *file, const char *buffer, + unsigned long count, void *data) +{ + struct obd_device *dev = (struct obd_device *)data; + struct lov_desc *desc; + __u64 val; + int rc; + + LASSERT(dev != NULL); + desc = &dev->u.lov.desc; + rc = lprocfs_write_u64_helper(buffer, count, &val); + if (rc) + return rc; + + desc->ld_default_stripe_offset = val; + return count; +} + static int lov_rd_stripetype(char *page, char **start, off_t off, int count, int *eof, void *data) { @@ -70,6 +116,24 @@ static int lov_rd_stripetype(char *page, char **start, off_t off, int count, return snprintf(page, count, "%u\n", desc->ld_pattern); } +static int lov_wr_stripetype(struct file *file, const char *buffer, + unsigned long count, void *data) +{ + struct obd_device *dev = (struct obd_device *)data; + struct lov_desc *desc; + int val, rc; + + LASSERT(dev != NULL); + desc = &dev->u.lov.desc; + rc = lprocfs_write_helper(buffer, count, &val); + if (rc) + return rc; + + lov_fix_desc_pattern(&val); + desc->ld_pattern = val; + return count; +} + static int lov_rd_stripecount(char *page, char **start, off_t off, int count, int *eof, void *data) { @@ -79,7 +143,26 @@ static int lov_rd_stripecount(char *page, char **start, off_t off, int count, LASSERT(dev != NULL); desc = &dev->u.lov.desc; *eof = 1; - return snprintf(page, count, "%u\n", desc->ld_default_stripe_count); + return snprintf(page, count, "%d\n", + (__s16)(desc->ld_default_stripe_count + 1) - 1); +} + +static int lov_wr_stripecount(struct file *file, const char *buffer, + unsigned long count, void *data) +{ + struct obd_device *dev = (struct obd_device *)data; + struct lov_desc *desc; + int val, rc; + + LASSERT(dev != NULL); + desc = &dev->u.lov.desc; + rc = lprocfs_write_helper(buffer, count, &val); + if (rc) + return rc; + + lov_fix_desc_stripe_count(&val); + desc->ld_default_stripe_count = val; + return count; } static int lov_rd_numobd(char *page, char **start, off_t off, int count, @@ -107,8 +190,8 @@ static int lov_rd_activeobd(char *page, char **start, off_t off, int count, return snprintf(page, count, "%u\n", desc->ld_active_tgt_count); } -static int lov_rd_mdc(char *page, char **start, off_t off, int count, int *eof, - void *data) +static int lov_rd_desc_uuid(char *page, char **start, off_t off, int count, + int *eof, void *data) { struct obd_device *dev = (struct obd_device*) data; struct lov_obd *lov; @@ -116,7 +199,107 @@ static int lov_rd_mdc(char *page, char **start, off_t off, int count, int *eof, LASSERT(dev != NULL); lov = &dev->u.lov; *eof = 1; - return snprintf(page, count, "%s\n", lov->mdcobd->obd_uuid.uuid); + return snprintf(page, count, "%s\n", lov->desc.ld_uuid.uuid); +} + +/* free priority (0-255): how badly user wants to choose empty osts */ +static int lov_rd_qos_priofree(char *page, char **start, off_t off, int count, + int *eof, void *data) +{ + struct obd_device *dev = (struct obd_device*) data; + struct lov_obd *lov; + + LASSERT(dev != NULL); + lov = &dev->u.lov; + *eof = 1; + return snprintf(page, count, "%d%%\n", + (lov->lov_qos.lq_prio_free * 100) >> 8); +} + +static int lov_wr_qos_priofree(struct file *file, const char *buffer, + unsigned long count, void *data) +{ + struct obd_device *dev = (struct obd_device *)data; + struct lov_obd *lov; + int val, rc; + LASSERT(dev != NULL); + + lov = &dev->u.lov; + rc = lprocfs_write_helper(buffer, count, &val); + if (rc) + return rc; + + if (val > 100) + return -EINVAL; + lov->lov_qos.lq_prio_free = (val << 8) / 100; + lov->lov_qos.lq_dirty = 1; + lov->lov_qos.lq_reset = 1; + return count; +} + +static int lov_rd_qos_thresholdrr(char *page, char **start, off_t off, + int count, int *eof, void *data) +{ + struct obd_device *dev = (struct obd_device*) data; + struct lov_obd *lov; + + LASSERT(dev != NULL); + lov = &dev->u.lov; + *eof = 1; + return snprintf(page, count, "%d%%\n", + (lov->lov_qos.lq_threshold_rr * 100) >> 8); +} + +static int lov_wr_qos_thresholdrr(struct file *file, const char *buffer, + unsigned long count, void *data) +{ + struct obd_device *dev = (struct obd_device *)data; + struct lov_obd *lov; + int val, rc; + LASSERT(dev != NULL); + + lov = &dev->u.lov; + rc = lprocfs_write_helper(buffer, count, &val); + if (rc) + return rc; + + if (val > 100 || val < 0) + return -EINVAL; + + lov->lov_qos.lq_threshold_rr = (val << 8) / 100; + lov->lov_qos.lq_dirty = 1; + return count; +} + +static int lov_rd_qos_maxage(char *page, char **start, off_t off, int count, + int *eof, void *data) +{ + struct obd_device *dev = (struct obd_device*) data; + struct lov_obd *lov; + + LASSERT(dev != NULL); + lov = &dev->u.lov; + *eof = 1; + return snprintf(page, count, "%u Sec\n", lov->desc.ld_qos_maxage); +} + +static int lov_wr_qos_maxage(struct file *file, const char *buffer, + unsigned long count, void *data) +{ + struct obd_device *dev = (struct obd_device *)data; + struct lov_obd *lov; + int val, rc; + LASSERT(dev != NULL); + + lov = &dev->u.lov; + rc = lprocfs_write_helper(buffer, count, &val); + if (rc) + return rc; + + if (val <= 0) + return -EINVAL; + lov->desc.ld_qos_maxage = val; + return count; } static void *lov_tgt_seq_start(struct seq_file *p, loff_t *pos) @@ -124,8 +307,12 @@ static void *lov_tgt_seq_start(struct seq_file *p, loff_t *pos) struct obd_device *dev = p->private; struct lov_obd *lov = &dev->u.lov; - return (*pos >= lov->desc.ld_tgt_count) ? NULL : &(lov->tgts[*pos]); - + while (*pos < lov->desc.ld_tgt_count) { + if (lov->lov_tgts[*pos]) + return lov->lov_tgts[*pos]; + ++*pos; + } + return NULL; } static void lov_tgt_seq_stop(struct seq_file *p, void *v) @@ -137,18 +324,19 @@ static void *lov_tgt_seq_next(struct seq_file *p, void *v, loff_t *pos) struct obd_device *dev = p->private; struct lov_obd *lov = &dev->u.lov; - ++*pos; - return (*pos >=lov->desc.ld_tgt_count) ? NULL : &(lov->tgts[*pos]); + while (++*pos < lov->desc.ld_tgt_count) { + if (lov->lov_tgts[*pos]) + return lov->lov_tgts[*pos]; + } + return NULL; } static int lov_tgt_seq_show(struct seq_file *p, void *v) { struct lov_tgt_desc *tgt = v; - struct obd_device *dev = p->private; - struct lov_obd *lov = &dev->u.lov; - int idx = tgt - &(lov->tgts[0]); - return seq_printf(p, "%d: %s %sACTIVE\n", idx+1, tgt->uuid.uuid, - tgt->active ? "" : "IN"); + return seq_printf(p, "%d: %s %sACTIVE\n", tgt->ltd_index, + obd_uuid2str(&tgt->ltd_uuid), + tgt->ltd_active ? "" : "IN"); } struct seq_operations lov_tgt_sops = { @@ -160,48 +348,60 @@ struct seq_operations lov_tgt_sops = { static int lov_target_seq_open(struct inode *inode, struct file *file) { - struct proc_dir_entry *dp = inode->u.generic_ip; + struct proc_dir_entry *dp = PDE(inode); struct seq_file *seq; - int rc = seq_open(file, &lov_tgt_sops); + int rc; - if (rc) + LPROCFS_ENTRY_AND_CHECK(dp); + rc = seq_open(file, &lov_tgt_sops); + if (rc) { + LPROCFS_EXIT(); return rc; + } seq = file->private_data; seq->private = dp->data; - return 0; } -struct lprocfs_vars lprocfs_obd_vars[] = { +struct lprocfs_vars lprocfs_lov_obd_vars[] = { { "uuid", lprocfs_rd_uuid, 0, 0 }, - { "stripesize", lov_rd_stripesize, 0, 0 }, - { "stripeoffset", lov_rd_stripeoffset, 0, 0 }, - { "stripecount", lov_rd_stripecount, 0, 0 }, - { "stripetype", lov_rd_stripetype, 0, 0 }, + { "stripesize", lov_rd_stripesize, lov_wr_stripesize, 0 }, + { "stripeoffset", lov_rd_stripeoffset, lov_wr_stripeoffset, 0 }, + { "stripecount", lov_rd_stripecount, lov_wr_stripecount, 0 }, + { "stripetype", lov_rd_stripetype, lov_wr_stripetype, 0 }, { "numobd", lov_rd_numobd, 0, 0 }, { "activeobd", lov_rd_activeobd, 0, 0 }, { "filestotal", lprocfs_rd_filestotal, 0, 0 }, { "filesfree", lprocfs_rd_filesfree, 0, 0 }, - //{ "filegroups", lprocfs_rd_filegroups, 0, 0 }, + /*{ "filegroups", lprocfs_rd_filegroups, 0, 0 },*/ { "blocksize", lprocfs_rd_blksize, 0, 0 }, { "kbytestotal", lprocfs_rd_kbytestotal, 0, 0 }, { "kbytesfree", lprocfs_rd_kbytesfree, 0, 0 }, - { "target_mdc", lov_rd_mdc, 0, 0 }, + { "kbytesavail", lprocfs_rd_kbytesavail, 0, 0 }, + { "desc_uuid", lov_rd_desc_uuid, 0, 0 }, + { "qos_prio_free",lov_rd_qos_priofree, lov_wr_qos_priofree, 0 }, + { "qos_threshold_rr", lov_rd_qos_thresholdrr, lov_wr_qos_thresholdrr, 0 }, + { "qos_maxage", lov_rd_qos_maxage, lov_wr_qos_maxage, 0 }, { 0 } }; -static struct lprocfs_vars lprocfs_module_vars[] = { +static struct lprocfs_vars lprocfs_lov_module_vars[] = { { "num_refs", lprocfs_rd_numrefs, 0, 0 }, { 0 } }; +void lprocfs_lov_init_vars(struct lprocfs_static_vars *lvars) +{ + lvars->module_vars = lprocfs_lov_module_vars; + lvars->obd_vars = lprocfs_lov_obd_vars; +} + struct file_operations lov_proc_target_fops = { - .open = lov_target_seq_open, - .read = seq_read, - .llseek = seq_lseek, - .release = seq_release, + .owner = THIS_MODULE, + .open = lov_target_seq_open, + .read = seq_read, + .llseek = seq_lseek, + .release = lprocfs_seq_release, }; - #endif /* LPROCFS */ -LPROCFS_INIT_VARS(lov, lprocfs_module_vars, lprocfs_obd_vars)