X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Flov%2Flproc_lov.c;h=234eeb331f5f4df43347aaa83f9ca03682ae3a3a;hp=0fa460bf433933394e4991710a1151d12893f9a7;hb=f07508d17b49574c7ea47a855c6e8af2b23c3add;hpb=9b444af6ad00c68d74ec70f01e1236d2d075eee1

diff --git a/lustre/lov/lproc_lov.c b/lustre/lov/lproc_lov.c
index 0fa460b..234eeb3 100644
--- a/lustre/lov/lproc_lov.c
+++ b/lustre/lov/lproc_lov.c
@@ -1,26 +1,33 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
+/*
+ * GPL HEADER START
  *
- *  Copyright (C) 2002 Cluster File Systems, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *   This file is part of the Lustre file system, http://www.lustre.org
- *   Lustre is a trademark of Cluster File Systems, Inc.
+ * 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.
  *
- *   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 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).
  *
- *   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.
+ * You should have received a copy of the GNU General Public License
+ * version 2 along with this program; If not, see
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
- *   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.
+ * GPL HEADER END
+ */
+/*
+ * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Use is subject to license terms.
  *
+ * Copyright (c) 2012, 2017, Intel Corporation.
+ */
+/*
+ * This file is part of Lustre, http://www.lustre.org/
+ * Lustre is a trademark of Sun Microsystems, Inc.
  */
 #define DEBUG_SUBSYSTEM S_CLASS
 
@@ -28,242 +35,193 @@
 #include <asm/statfs.h>
 #include <lprocfs_status.h>
 #include <obd_class.h>
-#include <linux/seq_file.h>
+#include <uapi/linux/lustre/lustre_param.h>
 #include "lov_internal.h"
 
-#ifdef LPROCFS
-static int lov_rd_stripesize(char *page, char **start, off_t off, int count,
-                             int *eof, void *data)
+static int lov_stripesize_seq_show(struct seq_file *m, void *v)
 {
-        struct obd_device *dev = (struct obd_device *)data;
-        struct lov_desc *desc;
+	struct obd_device *dev = (struct obd_device *)m->private;
+	struct lov_desc *desc;
 
-        LASSERT(dev != NULL);
-        desc = &dev->u.lov.desc;
-        *eof = 1;
-        return snprintf(page, count, LPU64"\n", desc->ld_default_stripe_size);
-}
+	LASSERT(dev != NULL);
+	desc = &dev->u.lov.desc;
 
-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;
-
-        desc->ld_default_stripe_size = val;
-        lov_fix_desc(desc);
-        return count;
+	seq_printf(m, "%llu\n", desc->ld_default_stripe_size);
+	return 0;
 }
 
-static int lov_rd_stripeoffset(char *page, char **start, off_t off, int count,
-                               int *eof, void *data)
+static ssize_t lov_stripesize_seq_write(struct file *file,
+					const char __user *buffer,
+					size_t count, loff_t *off)
 {
-        struct obd_device *dev = (struct obd_device *)data;
-        struct lov_desc *desc;
+	struct seq_file *m = file->private_data;
+	struct obd_device *dev = m->private;
+	struct lov_desc *desc;
+	char kernbuf[22] = "";
+	u64 val;
+	int rc;
 
-        LASSERT(dev != NULL);
-        desc = &dev->u.lov.desc;
-        *eof = 1;
-        return snprintf(page, count, LPU64"\n", desc->ld_default_stripe_offset);
-}
+	LASSERT(dev != NULL);
+	desc = &dev->u.lov.desc;
 
-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;
-        lov_fix_desc(desc);
-        return count;
-}
+	if (count >= sizeof(kernbuf))
+		return -EINVAL;
 
-static int lov_rd_stripetype(char *page, char **start, off_t off, int count,
-                             int *eof, void *data)
-{
-        struct obd_device* dev = (struct obd_device*)data;
-        struct lov_desc *desc;
+	if (copy_from_user(kernbuf, buffer, count))
+		return -EFAULT;
+	kernbuf[count] = 0;
+
+	rc = sysfs_memparse(kernbuf, count, &val, "B");
+	if (rc < 0)
+		return rc;
 
-        LASSERT(dev != NULL);
-        desc = &dev->u.lov.desc;
-        *eof = 1;
-        return snprintf(page, count, "%u\n", desc->ld_pattern);
+	lov_fix_desc_stripe_size(&val);
+	desc->ld_default_stripe_size = val;
+
+	return count;
 }
+LPROC_SEQ_FOPS(lov_stripesize);
 
-static int lov_wr_stripetype(struct file *file, const char *buffer,
-                             unsigned long count, void *data)
+static ssize_t stripeoffset_show(struct kobject *kobj, struct attribute *attr,
+				 char *buf)
 {
-        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;
-
-        desc->ld_pattern = val;
-        lov_fix_desc(desc);
-        return count;
+	struct obd_device *dev = container_of(kobj, struct obd_device,
+					      obd_kset.kobj);
+	struct lov_desc *desc = &dev->u.lov.desc;
+
+	return sprintf(buf, "%lld\n", desc->ld_default_stripe_offset);
 }
 
-static int lov_rd_stripecount(char *page, char **start, off_t off, int count,
-                              int *eof, void *data)
+static ssize_t stripeoffset_store(struct kobject *kobj, struct attribute *attr,
+				  const char *buf, size_t count)
 {
-        struct obd_device *dev = (struct obd_device *)data;
-        struct lov_desc *desc;
+	struct obd_device *dev = container_of(kobj, struct obd_device,
+					      obd_kset.kobj);
+	struct lov_desc *desc = &dev->u.lov.desc;
+	long val;
+	int rc;
+
+	rc = kstrtol(buf, 0, &val);
+	if (rc)
+		return rc;
+	if (val < -1 || val > LOV_MAX_STRIPE_COUNT)
+		return -ERANGE;
+
+	desc->ld_default_stripe_offset = val;
 
-        LASSERT(dev != NULL);
-        desc = &dev->u.lov.desc;
-        *eof = 1;
-        return snprintf(page, count, "%u\n", desc->ld_default_stripe_count);
+	return count;
 }
+LUSTRE_RW_ATTR(stripeoffset);
 
-static int lov_wr_stripecount(struct file *file, const char *buffer,
-                              unsigned long count, void *data)
+static ssize_t stripetype_show(struct kobject *kobj, struct attribute *attr,
+			       char *buf)
 {
-        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;
-
-        desc->ld_default_stripe_count = val;
-        lov_fix_desc(desc);
-        return count;
+	struct obd_device *dev = container_of(kobj, struct obd_device,
+					      obd_kset.kobj);
+	struct lov_desc *desc = &dev->u.lov.desc;
+
+	return sprintf(buf, "%u\n", desc->ld_pattern);
 }
 
-static int lov_rd_numobd(char *page, char **start, off_t off, int count,
-                         int *eof, void *data)
+static ssize_t stripetype_store(struct kobject *kobj, struct attribute *attr,
+				const char *buffer, size_t count)
 {
-        struct obd_device *dev = (struct obd_device*)data;
-        struct lov_desc *desc;
+	struct obd_device *dev = container_of(kobj, struct obd_device,
+					      obd_kset.kobj);
+	struct lov_desc *desc = &dev->u.lov.desc;
+	u32 pattern;
+	int rc;
+
+	rc = kstrtouint(buffer, 0, &pattern);
+	if (rc)
+		return rc;
 
-        LASSERT(dev != NULL);
-        desc = &dev->u.lov.desc;
-        *eof = 1;
-        return snprintf(page, count, "%u\n", desc->ld_tgt_count);
+	lov_fix_desc_pattern(&pattern);
+	desc->ld_pattern = pattern;
 
+	return count;
 }
+LUSTRE_RW_ATTR(stripetype);
 
-static int lov_rd_activeobd(char *page, char **start, off_t off, int count,
-                            int *eof, void *data)
+static ssize_t stripecount_show(struct kobject *kobj, struct attribute *attr,
+				char *buf)
 {
-        struct obd_device* dev = (struct obd_device*)data;
-        struct lov_desc *desc;
+	struct obd_device *dev = container_of(kobj, struct obd_device,
+					      obd_kset.kobj);
+	struct lov_desc *desc = &dev->u.lov.desc;
 
-        LASSERT(dev != NULL);
-        desc = &dev->u.lov.desc;
-        *eof = 1;
-        return snprintf(page, count, "%u\n", desc->ld_active_tgt_count);
+	return sprintf(buf, "%d\n",
+		       (__s16)(desc->ld_default_stripe_count + 1) - 1);
 }
 
-static int lov_rd_desc_uuid(char *page, char **start, off_t off, int count,
-                            int *eof, void *data)
+static ssize_t stripecount_store(struct kobject *kobj, struct attribute *attr,
+				 const char *buffer, size_t count)
 {
-        struct obd_device *dev = (struct obd_device*) data;
-        struct lov_obd *lov;
+	struct obd_device *dev = container_of(kobj, struct obd_device,
+					      obd_kset.kobj);
+	struct lov_desc *desc = &dev->u.lov.desc;
+	int stripe_count;
+	int rc;
 
-        LASSERT(dev != NULL);
-        lov = &dev->u.lov;
-        *eof = 1;
-        return snprintf(page, count, "%s\n", lov->desc.ld_uuid.uuid);
-}
+	rc = kstrtoint(buffer, 0, &stripe_count);
+	if (rc)
+		return rc;
 
-/* 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);
+	if (stripe_count < -1)
+		return -ERANGE;
+
+	lov_fix_desc_stripe_count(&stripe_count);
+	desc->ld_default_stripe_count = stripe_count;
+
+	return count;
 }
+LUSTRE_RW_ATTR(stripecount);
 
-static int lov_wr_qos_priofree(struct file *file, const char *buffer,
-                               unsigned long count, void *data)
+static ssize_t numobd_show(struct kobject *kobj, struct attribute *attr,
+			   char *buf)
 {
-        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;
+	struct obd_device *dev = container_of(kobj, struct obd_device,
+					      obd_kset.kobj);
+	struct lov_desc *desc = &dev->u.lov.desc;
+
+	return sprintf(buf, "%u\n", desc->ld_tgt_count);
 }
+LUSTRE_RO_ATTR(numobd);
 
-static int lov_rd_qos_maxage(char *page, char **start, off_t off, int count,
-                             int *eof, void *data)
+static ssize_t activeobd_show(struct kobject *kobj, struct attribute *attr,
+			      char *buf)
 {
-        struct obd_device *dev = (struct obd_device*) data;
-        struct lov_obd *lov;
+	struct obd_device *dev = container_of(kobj, struct obd_device,
+					      obd_kset.kobj);
+	struct lov_desc *desc = &dev->u.lov.desc;
 
-        LASSERT(dev != NULL);
-        lov = &dev->u.lov;
-        *eof = 1;
-        return snprintf(page, count, "%u Sec\n", lov->desc.ld_qos_maxage);
+	return sprintf(buf, "%u\n", desc->ld_active_tgt_count);
 }
+LUSTRE_RO_ATTR(activeobd);
 
-static int lov_wr_qos_maxage(struct file *file, const char *buffer,
-                             unsigned long count, void *data)
+static ssize_t desc_uuid_show(struct kobject *kobj, struct attribute *attr,
+			      char *buf)
 {
-        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;
+	struct obd_device *dev = container_of(kobj, struct obd_device,
+					      obd_kset.kobj);
+	struct lov_desc *desc = &dev->u.lov.desc;
+
+	return sprintf(buf, "%s\n", desc->ld_uuid.uuid);
 }
+LUSTRE_RO_ATTR(desc_uuid);
 
+#ifdef CONFIG_PROC_FS
 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->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)
@@ -285,12 +243,14 @@ static void *lov_tgt_seq_next(struct seq_file *p, void *v, loff_t *pos)
 static int lov_tgt_seq_show(struct seq_file *p, void *v)
 {
         struct lov_tgt_desc *tgt = v;
-        return seq_printf(p, "%d: %s %sACTIVE\n", tgt->ltd_index, 
-                          obd_uuid2str(&tgt->ltd_uuid), 
-                          tgt->ltd_active ? "" : "IN");
+
+	seq_printf(p, "%d: %s %sACTIVE\n", tgt->ltd_index,
+		   obd_uuid2str(&tgt->ltd_uuid),
+		   tgt->ltd_active ? "" : "IN");
+	return 0;
 }
 
-struct seq_operations lov_tgt_sops = {
+static const struct seq_operations lov_tgt_sops = {
         .start = lov_tgt_seq_start,
         .stop = lov_tgt_seq_stop,
         .next = lov_tgt_seq_next,
@@ -299,55 +259,71 @@ struct seq_operations lov_tgt_sops = {
 
 static int lov_target_seq_open(struct inode *inode, struct file *file)
 {
-        struct proc_dir_entry *dp = PDE(inode);
-        struct seq_file *seq;
-        int rc;
-        
-        LPROCFS_ENTRY_AND_CHECK(dp);
-        rc = seq_open(file, &lov_tgt_sops);
-        if (rc) {
-                LPROCFS_EXIT();
-                return rc;
-        }
+	struct seq_file *seq;
+	int rc;
 
-        seq = file->private_data;
-        seq->private = dp->data;
-        return 0;
-}
+	rc = seq_open(file, &lov_tgt_sops);
+	if (rc)
+		return rc;
 
-struct lprocfs_vars lprocfs_obd_vars[] = {
-        { "uuid",         lprocfs_rd_uuid,        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 },*/
-        { "blocksize",    lprocfs_rd_blksize,     0, 0 },
-        { "kbytestotal",  lprocfs_rd_kbytestotal, 0, 0 },
-        { "kbytesfree",   lprocfs_rd_kbytesfree,  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_maxage",   lov_rd_qos_maxage,      lov_wr_qos_maxage, 0 },
-        { 0 }
-};
+	seq = file->private_data;
+	seq->private = PDE_DATA(inode);
+	return 0;
+}
 
-static struct lprocfs_vars lprocfs_module_vars[] = {
-        { "num_refs",     lprocfs_rd_numrefs,     0, 0 },
-        { 0 }
+struct lprocfs_vars lprocfs_lov_obd_vars[] = {
+	{ .name =	"stripesize",
+	  .fops =	&lov_stripesize_fops	},
+	{ NULL }
 };
 
-struct file_operations lov_proc_target_fops = {
+const struct file_operations lov_proc_target_fops = {
         .owner   = THIS_MODULE,
         .open    = lov_target_seq_open,
         .read    = seq_read,
         .llseek  = seq_lseek,
         .release = lprocfs_seq_release,
 };
+#endif /* CONFIG_PROC_FS */
+
+static struct attribute *lov_attrs[] = {
+	&lustre_attr_activeobd.attr,
+	&lustre_attr_numobd.attr,
+	&lustre_attr_desc_uuid.attr,
+	&lustre_attr_stripeoffset.attr,
+	&lustre_attr_stripetype.attr,
+	&lustre_attr_stripecount.attr,
+	NULL,
+};
 
-LPROCFS_INIT_VARS(lov, lprocfs_module_vars, lprocfs_obd_vars)
-#endif /* LPROCFS */
+int lov_tunables_init(struct obd_device *obd)
+{
+	struct lov_obd *lov = &obd->u.lov;
+	int rc;
+
+	obd->obd_vars = lprocfs_lov_obd_vars;
+	obd->obd_ktype.default_attrs = lov_attrs;
+	rc = lprocfs_obd_setup(obd, false);
+	if (rc)
+		GOTO(out, rc);
+
+#ifdef CONFIG_PROC_FS
+	rc = lprocfs_seq_create(obd->obd_proc_entry, "target_obd", 0444,
+				&lov_proc_target_fops, obd);
+	if (rc)
+		CWARN("%s: Error adding the target_obd file : rc %d\n",
+		      obd->obd_name, rc);
+
+	lov->lov_pool_proc_entry = lprocfs_register("pools",
+						    obd->obd_proc_entry,
+						    NULL, NULL);
+	if (IS_ERR(lov->lov_pool_proc_entry)) {
+		rc = PTR_ERR(lov->lov_pool_proc_entry);
+		CERROR("%s: error setting up debugfs for pools : rc %d\n",
+		       obd->obd_name, rc);
+		lov->lov_pool_proc_entry = NULL;
+	}
+#endif /* CONFIG_FS_PROC */
+out:
+	return rc;
+}