X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Flmv%2Flproc_lmv.c;h=feded160ee133b29525822a28c42dbd333bd9e11;hp=a033d07b256e9f41e74115ac5578f61c3235939c;hb=d106dfc1458702865118e73bfcdfc2ec2676a7d6;hpb=e3a7c58aebafce40323db54bf6056029e5af4a70

diff --git a/lustre/lmv/lproc_lmv.c b/lustre/lmv/lproc_lmv.c
index a033d07..feded16 100644
--- a/lustre/lmv/lproc_lmv.c
+++ b/lustre/lmv/lproc_lmv.c
@@ -15,177 +15,219 @@
  *
  * 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.
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
 /*
  * Copyright (c) 2004, 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
 
-#include <linux/version.h>
 #include <linux/seq_file.h>
-#include <asm/statfs.h>
+#include <linux/statfs.h>
 #include <lprocfs_status.h>
 #include <obd_class.h>
 
-#ifndef LPROCFS
-static struct lprocfs_vars lprocfs_module_vars[] = { {0} };
-static struct lprocfs_vars lprocfs_obd_vars[] = { {0} };
-#else
-static int lmv_rd_numobd(char *page, char **start, off_t off, int count,
-                         int *eof, void *data)
-{
-        struct obd_device       *dev = (struct obd_device*)data;
-        struct lmv_desc         *desc;
+#include "lmv_internal.h"
 
-        LASSERT(dev != NULL);
-        desc = &dev->u.lmv.desc;
-        *eof = 1;
-        return snprintf(page, count, "%u\n", desc->ld_tgt_count);
+static ssize_t numobd_show(struct kobject *kobj, struct attribute *attr,
+			   char *buf)
+{
+	struct obd_device *obd = container_of(kobj, struct obd_device,
+					      obd_kset.kobj);
 
+	return scnprintf(buf, PAGE_SIZE, "%u\n", obd->u.lmv.lmv_mdt_count);
 }
+LUSTRE_RO_ATTR(numobd);
 
-static const char *placement_name[] = {
-        [PLACEMENT_CHAR_POLICY] = "CHAR",
-        [PLACEMENT_NID_POLICY]  = "NID"
-};
+static ssize_t activeobd_show(struct kobject *kobj, struct attribute *attr,
+			      char *buf)
+{
+	struct obd_device *obd = container_of(kobj, struct obd_device,
+					      obd_kset.kobj);
+
+	return scnprintf(buf, PAGE_SIZE, "%u\n",
+		obd->u.lmv.lmv_mdt_descs.ltd_lmv_desc.ld_active_tgt_count);
+}
+LUSTRE_RO_ATTR(activeobd);
 
-static placement_policy_t placement_name2policy(char *name, int len)
+static ssize_t desc_uuid_show(struct kobject *kobj, struct attribute *attr,
+			      char *buf)
 {
-        int                     i;
+	struct obd_device *obd = container_of(kobj, struct obd_device,
+					      obd_kset.kobj);
 
-        for (i = 0; i < PLACEMENT_MAX_POLICY; i++) {
-                if (!strncmp(placement_name[i], name, len))
-                        return i;
-        }
-        return PLACEMENT_INVAL_POLICY;
+	return scnprintf(buf, PAGE_SIZE, "%s\n",
+			obd->u.lmv.lmv_mdt_descs.ltd_lmv_desc.ld_uuid.uuid);
 }
+LUSTRE_RO_ATTR(desc_uuid);
 
-static const char *placement_policy2name(placement_policy_t placement)
+static ssize_t qos_maxage_show(struct kobject *kobj,
+			       struct attribute *attr,
+			       char *buf)
 {
-        LASSERT(placement < PLACEMENT_MAX_POLICY);
-        return placement_name[placement];
+	struct obd_device *obd = container_of(kobj, struct obd_device,
+					      obd_kset.kobj);
+
+	return scnprintf(buf, PAGE_SIZE, "%u\n",
+			obd->u.lmv.lmv_mdt_descs.ltd_lmv_desc.ld_qos_maxage);
 }
 
-static int lmv_rd_placement(char *page, char **start, off_t off, int count,
-                            int *eof, void *data)
+static ssize_t qos_maxage_store(struct kobject *kobj,
+				struct attribute *attr,
+				const char *buffer,
+				size_t count)
 {
-        struct obd_device       *dev = (struct obd_device*)data;
-        struct lmv_obd          *lmv;
+	struct obd_device *obd = container_of(kobj, struct obd_device,
+					      obd_kset.kobj);
+	unsigned int val;
+	int rc;
+
+	rc = kstrtouint(buffer, 0, &val);
+	if (rc)
+		return rc;
 
-        LASSERT(dev != NULL);
-        lmv = &dev->u.lmv;
-        *eof = 1;
-        return snprintf(page, count, "%s\n",
-                        placement_policy2name(lmv->lmv_placement));
+	obd->u.lmv.lmv_mdt_descs.ltd_lmv_desc.ld_qos_maxage = val;
 
+	return count;
 }
+LUSTRE_RW_ATTR(qos_maxage);
 
-#define MAX_POLICY_STRING_SIZE 64
+static ssize_t qos_prio_free_show(struct kobject *kobj,
+				  struct attribute *attr,
+				  char *buf)
+{
+	struct obd_device *obd = container_of(kobj, struct obd_device,
+					      obd_kset.kobj);
 
-static int lmv_wr_placement(struct file *file, const char *buffer,
-                            unsigned long count, void *data)
+	return scnprintf(buf, PAGE_SIZE, "%u%%\n",
+			(obd->u.lmv.lmv_qos.lq_prio_free * 100 + 255) >> 8);
+}
+
+static ssize_t qos_prio_free_store(struct kobject *kobj,
+				   struct attribute *attr,
+				   const char *buffer,
+				   size_t count)
 {
-        struct obd_device       *dev = (struct obd_device *)data;
-        char                     dummy[MAX_POLICY_STRING_SIZE + 1];
-        int                      len = count;
-        placement_policy_t       policy;
-        struct lmv_obd          *lmv;
-
-        if (cfs_copy_from_user(dummy, buffer, MAX_POLICY_STRING_SIZE))
-                return -EFAULT;
-
-        LASSERT(dev != NULL);
-        lmv = &dev->u.lmv;
-
-        if (len > MAX_POLICY_STRING_SIZE)
-                len = MAX_POLICY_STRING_SIZE;
-
-        if (dummy[len - 1] == '\n')
-                len--;
-        dummy[len] = '\0';
-
-        policy = placement_name2policy(dummy, len);
-        if (policy != PLACEMENT_INVAL_POLICY) {
-                cfs_spin_lock(&lmv->lmv_lock);
-                lmv->lmv_placement = policy;
-                cfs_spin_unlock(&lmv->lmv_lock);
-        } else {
-                CERROR("Invalid placement policy \"%s\"!\n", dummy);
-                return -EINVAL;
-        }
-        return count;
+	struct obd_device *obd = container_of(kobj, struct obd_device,
+					      obd_kset.kobj);
+	struct lmv_obd *lmv = &obd->u.lmv;
+	unsigned int val;
+	int rc;
+
+	rc = kstrtouint(buffer, 0, &val);
+	if (rc)
+		return rc;
+
+	if (val > 100)
+		return -EINVAL;
+
+	lmv->lmv_qos.lq_prio_free = (val << 8) / 100;
+	set_bit(LQ_DIRTY, &lmv->lmv_qos.lq_flags);
+	set_bit(LQ_RESET, &lmv->lmv_qos.lq_flags);
+
+	return count;
 }
+LUSTRE_RW_ATTR(qos_prio_free);
 
-static int lmv_rd_activeobd(char *page, char **start, off_t off, int count,
-                            int *eof, void *data)
+static ssize_t qos_threshold_rr_show(struct kobject *kobj,
+				     struct attribute *attr,
+				     char *buf)
 {
-        struct obd_device       *dev = (struct obd_device*)data;
-        struct lmv_desc         *desc;
+	struct obd_device *obd = container_of(kobj, struct obd_device,
+					      obd_kset.kobj);
 
-        LASSERT(dev != NULL);
-        desc = &dev->u.lmv.desc;
-        *eof = 1;
-        return snprintf(page, count, "%u\n", desc->ld_active_tgt_count);
+	return scnprintf(buf, PAGE_SIZE, "%u%%\n",
+			(obd->u.lmv.lmv_qos.lq_threshold_rr * 100 + 255) >> 8);
 }
 
-static int lmv_rd_desc_uuid(char *page, char **start, off_t off, int count,
-                            int *eof, void *data)
+static ssize_t qos_threshold_rr_store(struct kobject *kobj,
+				      struct attribute *attr,
+				      const char *buffer,
+				      size_t count)
 {
-        struct obd_device       *dev = (struct obd_device*) data;
-        struct lmv_obd          *lmv;
+	struct obd_device *obd = container_of(kobj, struct obd_device,
+					      obd_kset.kobj);
+	struct lmv_obd *lmv = &obd->u.lmv;
+	unsigned int val;
+	int rc;
+
+	rc = kstrtouint(buffer, 0, &val);
+	if (rc)
+		return rc;
+
+	if (val > 100)
+		return -EINVAL;
 
-        LASSERT(dev != NULL);
-        lmv = &dev->u.lmv;
-        *eof = 1;
-        return snprintf(page, count, "%s\n", lmv->desc.ld_uuid.uuid);
+	lmv->lmv_qos.lq_threshold_rr = (val << 8) / 100;
+	set_bit(LQ_DIRTY, &lmv->lmv_qos.lq_flags);
+
+	return count;
 }
+LUSTRE_RW_ATTR(qos_threshold_rr);
 
+#ifdef CONFIG_PROC_FS
 static void *lmv_tgt_seq_start(struct seq_file *p, loff_t *pos)
 {
-        struct obd_device       *dev = p->private;
-        struct lmv_obd          *lmv = &dev->u.lmv;
-        return (*pos >= lmv->desc.ld_tgt_count) ? NULL : &(lmv->tgts[*pos]);
+	struct obd_device *obd = p->private;
+	struct lmv_obd *lmv = &obd->u.lmv;
+	struct lu_tgt_desc *tgt;
+
+	while (*pos < lmv->lmv_mdt_descs.ltd_tgts_size) {
+		tgt = lmv_tgt(lmv, (__u32)*pos);
+		if (tgt)
+			return tgt;
 
+		++*pos;
+	}
+
+	return NULL;
 }
 
 static void lmv_tgt_seq_stop(struct seq_file *p, void *v)
 {
-        return;
 }
 
 static void *lmv_tgt_seq_next(struct seq_file *p, void *v, loff_t *pos)
 {
-        struct obd_device       *dev = p->private;
-        struct lmv_obd          *lmv = &dev->u.lmv;
-        ++*pos;
-        return (*pos >=lmv->desc.ld_tgt_count) ? NULL : &(lmv->tgts[*pos]);
+	struct obd_device *obd = p->private;
+	struct lmv_obd *lmv = &obd->u.lmv;
+	struct lu_tgt_desc *tgt;
+
+	++*pos;
+	while (*pos < lmv->lmv_mdt_descs.ltd_tgts_size) {
+		tgt = lmv_tgt(lmv, (__u32)*pos);
+		if (tgt)
+			return tgt;
+
+		++*pos;
+	}
+
+	return NULL;
 }
 
 static int lmv_tgt_seq_show(struct seq_file *p, void *v)
 {
-        struct lmv_tgt_desc     *tgt = v;
-        struct obd_device       *dev = p->private;
-        struct lmv_obd          *lmv = &dev->u.lmv;
-        int                      idx = tgt - &(lmv->tgts[0]);
+	struct lmv_tgt_desc     *tgt = v;
 
-        return seq_printf(p, "%d: %s %sACTIVE\n", idx, tgt->ltd_uuid.uuid,
-                          tgt->ltd_active ? "" : "IN");
+	if (!tgt)
+		return 0;
+
+	seq_printf(p, "%u: %s %sACTIVE\n",
+		   tgt->ltd_index, tgt->ltd_uuid.uuid,
+		   tgt->ltd_active ? "" : "IN");
+	return 0;
 }
 
-struct seq_operations lmv_tgt_sops = {
+static const struct seq_operations lmv_tgt_sops = {
         .start                 = lmv_tgt_seq_start,
         .stop                  = lmv_tgt_seq_stop,
         .next                  = lmv_tgt_seq_next,
@@ -194,7 +236,6 @@ struct seq_operations lmv_tgt_sops = {
 
 static int lmv_target_seq_open(struct inode *inode, struct file *file)
 {
-        struct proc_dir_entry   *dp = PDE(inode);
         struct seq_file         *seq;
         int                     rc;
 
@@ -202,37 +243,55 @@ static int lmv_target_seq_open(struct inode *inode, struct file *file)
         if (rc)
                 return rc;
 
-        seq = file->private_data;
-        seq->private = dp->data;
-
-        return 0;
+	seq = file->private_data;
+	seq->private = PDE_DATA(inode);
+	return 0;
 }
 
-struct lprocfs_vars lprocfs_lmv_obd_vars[] = {
-        { "numobd",             lmv_rd_numobd,          0, 0 },
-        { "placement",          lmv_rd_placement,       lmv_wr_placement, 0 },
-        { "activeobd",          lmv_rd_activeobd,       0, 0 },
-        { "uuid",               lprocfs_rd_uuid,        0, 0 },
-        { "desc_uuid",          lmv_rd_desc_uuid,       0, 0 },
-        { 0 }
+static const struct proc_ops lmv_proc_target_fops = {
+	PROC_OWNER(THIS_MODULE)
+	.proc_open	= lmv_target_seq_open,
+	.proc_read	= seq_read,
+	.proc_lseek	= seq_lseek,
+	.proc_release	= seq_release,
 };
-
-static struct lprocfs_vars lprocfs_lmv_module_vars[] = {
-        { "num_refs",           lprocfs_rd_numrefs,     0, 0 },
-        { 0 }
-};
-
-struct file_operations lmv_proc_target_fops = {
-        .owner                = THIS_MODULE,
-        .open                 = lmv_target_seq_open,
-        .read                 = seq_read,
-        .llseek               = seq_lseek,
-        .release              = seq_release,
+#endif /* CONFIG_PROC_FS */
+
+static struct attribute *lmv_attrs[] = {
+	&lustre_attr_activeobd.attr,
+	&lustre_attr_desc_uuid.attr,
+	&lustre_attr_numobd.attr,
+	&lustre_attr_qos_maxage.attr,
+	&lustre_attr_qos_prio_free.attr,
+	&lustre_attr_qos_threshold_rr.attr,
+	NULL,
 };
 
-#endif /* LPROCFS */
-void lprocfs_lmv_init_vars(struct lprocfs_static_vars *lvars)
+int lmv_tunables_init(struct obd_device *obd)
 {
-        lvars->module_vars    = lprocfs_lmv_module_vars;
-        lvars->obd_vars       = lprocfs_lmv_obd_vars;
+	int rc;
+
+	obd->obd_ktype.default_attrs = lmv_attrs;
+	rc = lprocfs_obd_setup(obd, true);
+	if (rc)
+		goto out_failed;
+#ifdef CONFIG_PROC_FS
+	rc = lprocfs_alloc_md_stats(obd, 0);
+	if (rc) {
+		lprocfs_obd_cleanup(obd);
+		goto out_failed;
+	}
+
+	rc = lprocfs_seq_create(obd->obd_proc_entry, "target_obd",
+				0444, &lmv_proc_target_fops, obd);
+	if (rc) {
+		lprocfs_free_md_stats(obd);
+		lprocfs_obd_cleanup(obd);
+		CWARN("%s: error adding LMV target_obd file: rc = %d\n",
+		      obd->obd_name, rc);
+		rc = 0;
+	}
+#endif /* CONFIG_PROC_FS */
+out_failed:
+	return rc;
 }