X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fmdt%2Fmdt_lproc.c;h=24932d92e7268cb51723676013a1fac32c3e6439;hp=de0a7bfbf4617129a741acbdc3b18f2b0bfac484;hb=9eb3d1db42d2937daef25950f6527ccb46221f8e;hpb=02d8c2fa5c63271d01818d24c86a80d7d63a6e00

diff --git a/lustre/mdt/mdt_lproc.c b/lustre/mdt/mdt_lproc.c
index de0a7bf..24932d9 100644
--- a/lustre/mdt/mdt_lproc.c
+++ b/lustre/mdt/mdt_lproc.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  */
 /*
@@ -68,37 +68,72 @@
 #include "mdt_internal.h"
 #include <lnet/lib-lnet.h>
 
+enum {
+        LPROC_MDT_NR
+};
 static const char *mdt_proc_names[LPROC_MDT_NR] = {
 };
 
 int mdt_procfs_init(struct mdt_device *mdt, const char *name)
 {
         struct lu_device *ld = &mdt->mdt_md_dev.md_lu_dev;
-        int result;
+        struct obd_device *obd = ld->ld_obd;
+        struct lprocfs_static_vars lvars;
+        int rc;
         ENTRY;
 
         LASSERT(name != NULL);
-        mdt->mdt_proc_entry = ld->ld_obd->obd_proc_entry;
+
+        lprocfs_mdt_init_vars(&lvars);
+        rc = lprocfs_obd_setup(obd, lvars.obd_vars);
+        if (rc) {
+                CERROR("Can't init lprocfs, rc %d\n", rc);
+                return rc;
+        }
+        ptlrpc_lprocfs_register_obd(obd);
+
+        mdt->mdt_proc_entry = obd->obd_proc_entry;
         LASSERT(mdt->mdt_proc_entry != NULL);
 
-        result = lu_time_init(&mdt->mdt_stats, mdt->mdt_proc_entry,
-                              mdt_proc_names, ARRAY_SIZE(mdt_proc_names));
-        if (result == 0)
-                result = lu_time_named_init(&ld->ld_site->ls_time_stats,
-                                            "site_time", mdt->mdt_proc_entry,
-                                            lu_time_names,
-                                            ARRAY_SIZE(lu_time_names));
-        RETURN(result);
+        rc = lu_time_init(&mdt->mdt_stats, mdt->mdt_proc_entry,
+                          mdt_proc_names, ARRAY_SIZE(mdt_proc_names));
+        if (rc == 0)
+                rc = lu_time_named_init(&ld->ld_site->ls_time_stats,
+                                        "site_time", mdt->mdt_proc_entry,
+                                         lu_time_names,
+                                         ARRAY_SIZE(lu_time_names));
+        if (rc)
+                return rc;
+
+        obd->obd_proc_exports_entry = proc_mkdir("exports",
+                                                 obd->obd_proc_entry);
+        if (obd->obd_proc_exports_entry)
+                lprocfs_add_simple(obd->obd_proc_exports_entry,
+                                   "clear", lprocfs_nid_stats_clear_read,
+                                   lprocfs_nid_stats_clear_write, obd, NULL);
+        rc = lprocfs_alloc_md_stats(obd, LPROC_MDT_LAST);
+
+        RETURN(rc);
 }
 
 int mdt_procfs_fini(struct mdt_device *mdt)
 {
         struct lu_device *ld = &mdt->mdt_md_dev.md_lu_dev;
+        struct obd_device *obd = ld->ld_obd;
+
         if (mdt->mdt_proc_entry) {
                 lu_time_fini(&ld->ld_site->ls_time_stats);
                 lu_time_fini(&mdt->mdt_stats);
                 mdt->mdt_proc_entry = NULL;
         }
+        if (obd->obd_proc_exports_entry) {
+                lprocfs_remove_proc_entry("clear", obd->obd_proc_exports_entry);
+                obd->obd_proc_exports_entry = NULL;
+        }
+        ptlrpc_lprocfs_unregister_obd(obd);
+        lprocfs_free_md_stats(obd);
+        lprocfs_obd_cleanup(obd);
+
         RETURN(0);
 }
 
@@ -120,7 +155,7 @@ static int lprocfs_rd_identity_expire(char *page, char **start, off_t off,
 
         *eof = 1;
         return snprintf(page, count, "%lu\n",
-                        mdt->mdt_identity_cache->uc_entry_expire / HZ);
+                        mdt->mdt_identity_cache->uc_entry_expire / CFS_HZ);
 }
 
 static int lprocfs_wr_identity_expire(struct file *file, const char *buffer,
@@ -134,7 +169,7 @@ static int lprocfs_wr_identity_expire(struct file *file, const char *buffer,
         if (rc)
                 return rc;
 
-        mdt->mdt_identity_cache->uc_entry_expire = val * HZ;
+        mdt->mdt_identity_cache->uc_entry_expire = val * CFS_HZ;
         return count;
 }
 
@@ -147,7 +182,7 @@ static int lprocfs_rd_identity_acquire_expire(char *page, char **start,
 
         *eof = 1;
         return snprintf(page, count, "%lu\n",
-                        mdt->mdt_identity_cache->uc_acquire_expire / HZ);
+                        mdt->mdt_identity_cache->uc_acquire_expire / CFS_HZ);
 }
 
 static int lprocfs_wr_identity_acquire_expire(struct file *file,
@@ -163,7 +198,7 @@ static int lprocfs_wr_identity_acquire_expire(struct file *file,
         if (rc)
                 return rc;
 
-        mdt->mdt_identity_cache->uc_acquire_expire = val * HZ;
+        mdt->mdt_identity_cache->uc_acquire_expire = val * CFS_HZ;
         return count;
 }
 
@@ -176,9 +211,9 @@ static int lprocfs_rd_identity_upcall(char *page, char **start, off_t off,
         int len;
 
         *eof = 1;
-        read_lock(&hash->uc_upcall_rwlock);
+        cfs_read_lock(&hash->uc_upcall_rwlock);
         len = snprintf(page, count, "%s\n", hash->uc_upcall);
-        read_unlock(&hash->uc_upcall_rwlock);
+        cfs_read_unlock(&hash->uc_upcall_rwlock);
         return len;
 }
 
@@ -195,14 +230,15 @@ static int lprocfs_wr_identity_upcall(struct file *file, const char *buffer,
                 return -EINVAL;
         }
 
-        if (copy_from_user(kernbuf, buffer, min_t(unsigned long, count,
-                                                  UC_CACHE_UPCALL_MAXPATH - 1)))
+        if (cfs_copy_from_user(kernbuf, buffer,
+                               min_t(unsigned long, count,
+                                     UC_CACHE_UPCALL_MAXPATH - 1)))
                 return -EFAULT;
 
         /* Remove any extraneous bits from the upcall (e.g. linefeeds) */
-        write_lock(&hash->uc_upcall_rwlock);
+        cfs_write_lock(&hash->uc_upcall_rwlock);
         sscanf(kernbuf, "%s", hash->uc_upcall);
-        write_unlock(&hash->uc_upcall_rwlock);
+        cfs_write_unlock(&hash->uc_upcall_rwlock);
 
         if (strcmp(hash->uc_name, obd->obd_name) != 0)
                 CWARN("%s: write to upcall name %s\n",
@@ -244,7 +280,7 @@ static int lprocfs_wr_identity_info(struct file *file, const char *buffer,
                 return count;
         }
 
-        if (copy_from_user(&sparam, buffer, sizeof(sparam))) {
+        if (cfs_copy_from_user(&sparam, buffer, sizeof(sparam))) {
                 CERROR("%s: bad identity data\n", obd->obd_name);
                 GOTO(out, rc = -EFAULT);
         }
@@ -276,7 +312,7 @@ static int lprocfs_wr_identity_info(struct file *file, const char *buffer,
                                sparam.idd_uid, sparam.idd_ngroups);
                         param = &sparam;
                         param->idd_ngroups = 0;
-                } else if (copy_from_user(param, buffer, size)) {
+                } else if (cfs_copy_from_user(param, buffer, size)) {
                         CERROR("%s: uid %u bad supplementary group data\n",
                                obd->obd_name, sparam.idd_uid);
                         OBD_FREE(param, size);
@@ -515,25 +551,20 @@ static int lprocfs_wr_root_squash(struct file *file, const char *buffer,
 {
         struct obd_device *obd = data;
         struct mdt_device *mdt = mdt_dev(obd->obd_lu_dev);
-        char kernbuf[50], *tmp, *end;
+        int rc;
+        char kernbuf[50], *tmp, *end, *errmsg;
         unsigned long uid, gid;
         int nouid, nogid;
         ENTRY;
 
-        if (count > (sizeof(kernbuf) - 1) ||
-            copy_from_user(kernbuf, buffer, count)) {
-                CWARN("%s: can't copy string to kernel space, "
-                      "uid:gid is expected, "
-                      "continue with %u:%u, "
-                      "there will be 0:0 on MDS restart\n",
-                      obd->obd_name, mdt->mdt_squash_uid,
-                      mdt->mdt_squash_gid);
-                RETURN(count);
+        if (count >= sizeof(kernbuf)) {
+                errmsg = "string too long";
+                GOTO(failed, rc = -EINVAL);
+        }
+        if (cfs_copy_from_user(kernbuf, buffer, count)) {
+                errmsg = "bad address";
+                GOTO(failed, rc = -EFAULT);
         }
-
-        if (copy_from_user(kernbuf, buffer, count))
-                RETURN(-EFAULT);
-
         kernbuf[count] = '\0';
 
         nouid = nogid = 0;
@@ -557,19 +588,20 @@ static int lprocfs_wr_root_squash(struct file *file, const char *buffer,
         mdt->mdt_squash_uid = uid;
         mdt->mdt_squash_gid = gid;
 
-        if (nouid || nogid)
-                CWARN("%s: can't parse \"\%s\", uid:gid is expected, "
-                      "continue with %u:%u, "
-                      "there will be %u:%u on MDS restart\n",
+        if (nouid && nogid) {
+                errmsg = "needs uid:gid format";
+                GOTO(failed, rc = -EINVAL);
+        }
+
+        LCONSOLE_INFO("%s: root_squash is set to %u:%u\n",
                       obd->obd_name,
-                      buffer, mdt->mdt_squash_uid, mdt->mdt_squash_gid,
-                      nouid ? 0 : mdt->mdt_squash_uid,
-                      nogid ? 0 : mdt->mdt_squash_gid);
-        else
-                LCONSOLE_INFO("%s: root_squash is set to %u:%u\n",
-                              obd->obd_name,
-                              mdt->mdt_squash_uid,  mdt->mdt_squash_gid);
+                      mdt->mdt_squash_uid,  mdt->mdt_squash_gid);
         RETURN(count);
+
+ failed:
+        CWARN("%s: failed to set root_squash to \"%s\", %s: rc %d\n",
+              obd->obd_name, buffer, errmsg, rc);
+        RETURN(rc);
 }
 
 static int lprocfs_rd_nosquash_nids(char *page, char **start, off_t off,
@@ -589,64 +621,148 @@ static int lprocfs_wr_nosquash_nids(struct file *file, const char *buffer,
         struct obd_device *obd = data;
         struct mdt_device *mdt = mdt_dev(obd->obd_lu_dev);
         int rc;
-        char *new;
-        struct list_head tmp;
+        char *kernbuf, *errmsg;
+        cfs_list_t tmp;
         ENTRY;
 
-        /* copy to kernel space */
-        OBD_ALLOC(new, count + 1);
-        if (new == 0)
+        OBD_ALLOC(kernbuf, count + 1);
+        if (kernbuf == NULL) {
+                errmsg = "no memory";
                 GOTO(failed, rc = -ENOMEM);
-
-        if (copy_from_user(new, buffer, count))
+        }
+        if (cfs_copy_from_user(kernbuf, buffer, count)) {
+                errmsg = "bad address";
                 GOTO(failed, rc = -EFAULT);
+        }
+        kernbuf[count] = '\0';
 
-        new[count] = 0;
-        if (strlen(new) != count)
-                GOTO(failed, rc = -EINVAL);
-
-        if (!strcmp(new, "NONE") || !strcmp(new, "clear")) {
+        if (!strcmp(kernbuf, "NONE") || !strcmp(kernbuf, "clear")) {
                 /* empty string is special case */
-                down_write(&mdt->mdt_squash_sem);
-                if (!list_empty(&mdt->mdt_nosquash_nids)) {
+                cfs_down_write(&mdt->mdt_squash_sem);
+                if (!cfs_list_empty(&mdt->mdt_nosquash_nids)) {
                         cfs_free_nidlist(&mdt->mdt_nosquash_nids);
                         OBD_FREE(mdt->mdt_nosquash_str,
                                  mdt->mdt_nosquash_strlen);
                         mdt->mdt_nosquash_str = NULL;
                         mdt->mdt_nosquash_strlen = 0;
                 }
-                up_write(&mdt->mdt_squash_sem);
+                cfs_up_write(&mdt->mdt_squash_sem);
                 LCONSOLE_INFO("%s: nosquash_nids is cleared\n",
                               obd->obd_name);
-                OBD_FREE(new, count + 1);
-                RETURN(0);
+                OBD_FREE(kernbuf, count + 1);
+                RETURN(count);
         }
 
         CFS_INIT_LIST_HEAD(&tmp);
-        if (cfs_parse_nidlist(new, count, &tmp) <= 0)
+        if (cfs_parse_nidlist(kernbuf, count, &tmp) <= 0) {
+                errmsg = "can't parse";
                 GOTO(failed, rc = -EINVAL);
+        }
 
-        down_write(&mdt->mdt_squash_sem);
-        if (!list_empty(&mdt->mdt_nosquash_nids)) {
+        cfs_down_write(&mdt->mdt_squash_sem);
+        if (!cfs_list_empty(&mdt->mdt_nosquash_nids)) {
                 cfs_free_nidlist(&mdt->mdt_nosquash_nids);
                 OBD_FREE(mdt->mdt_nosquash_str, mdt->mdt_nosquash_strlen);
         }
-        mdt->mdt_nosquash_str = new;
+        mdt->mdt_nosquash_str = kernbuf;
         mdt->mdt_nosquash_strlen = count + 1;
-        list_splice(&tmp, &mdt->mdt_nosquash_nids);
+        cfs_list_splice(&tmp, &mdt->mdt_nosquash_nids);
 
-        LCONSOLE_INFO("%s: nosquash_nids is set to %s\n", obd->obd_name, new);
-        up_write(&mdt->mdt_squash_sem);
+        LCONSOLE_INFO("%s: nosquash_nids is set to %s\n",
+                      obd->obd_name, kernbuf);
+        cfs_up_write(&mdt->mdt_squash_sem);
         RETURN(count);
 
  failed:
-        CWARN("%s: failed to set nosquash_nids (rc %d), "
-              "on MDS restart we will try to set it again, "
-              "continue with current nosquash_nids\n",
-              obd->obd_name, rc);
-        if (new)
-                OBD_FREE(new, count + 1);
-        RETURN(count);
+        CWARN("%s: failed to set nosquash_nids to \"%s\", %s: rc %d\n",
+              obd->obd_name, kernbuf, errmsg, rc);
+        if (kernbuf)
+                OBD_FREE(kernbuf, count + 1);
+        RETURN(rc);
+}
+
+static int lprocfs_rd_mdt_som(char *page, char **start, off_t off,
+                              int count, int *eof, void *data)
+{
+        struct obd_device *obd = data;
+        struct mdt_device *mdt = mdt_dev(obd->obd_lu_dev);
+
+        return snprintf(page, count, "%sabled\n",
+                        mdt->mdt_som_conf ? "en" : "dis");
+}
+
+static int lprocfs_wr_mdt_som(struct file *file, const char *buffer,
+                              unsigned long count, void *data)
+{
+        struct obd_export *exp;
+        struct obd_device *obd = data;
+        struct mdt_device *mdt = mdt_dev(obd->obd_lu_dev);
+        char kernbuf[16];
+        unsigned long val = 0;
+
+        if (count > (sizeof(kernbuf) - 1))
+                return -EINVAL;
+
+        if (cfs_copy_from_user(kernbuf, buffer, count))
+                return -EFAULT;
+
+        kernbuf[count] = '\0';
+
+        if (!strcmp(kernbuf, "enabled"))
+                val = 1;
+        else if (strcmp(kernbuf, "disabled"))
+                return -EINVAL;
+
+        if (mdt->mdt_som_conf == val)
+                return count;
+
+        if (!obd->obd_process_conf) {
+                CERROR("Temporary SOM change is not supported, use lctl "
+                       "conf_param for permanent setting\n");
+                return count;
+        }
+
+        /* 1 stands for self export. */
+        cfs_list_for_each_entry(exp, &obd->obd_exports, exp_obd_chain) {
+                if (exp == obd->obd_self_export)
+                        continue;
+                if (exp->exp_connect_flags & OBD_CONNECT_MDS_MDS)
+                        continue;
+                /* Some clients are already connected, skip the change */
+                LCONSOLE_INFO("%s is already connected, SOM will be %s on "
+                              "the next mount\n", exp->exp_client_uuid.uuid,
+                              val ? "enabled" : "disabled");
+                return count;
+        }
+
+        mdt->mdt_som_conf = val;
+        LCONSOLE_INFO("Enabling SOM\n");
+
+        return count;
+}
+
+/* Temporary; for testing purposes only */
+static int lprocfs_mdt_wr_mdc(struct file *file, const char *buffer,
+                              unsigned long count, void *data)
+{
+        struct obd_device *obd = data;
+        struct obd_export *exp = NULL;
+        struct obd_uuid uuid;
+        char tmpbuf[sizeof(struct obd_uuid)];
+
+        sscanf(buffer, "%40s", tmpbuf);
+
+        obd_str2uuid(&uuid, tmpbuf);
+        exp = cfs_hash_lookup(obd->obd_uuid_hash, &uuid);
+        if (exp == NULL) {
+                CERROR("%s: no export %s found\n",
+                       obd->obd_name, obd_uuid2str(&uuid));
+        } else {
+                mdt_hsm_copytool_send(exp);
+                class_export_put(exp);
+        }
+
+        return count;
 }
 
 static struct lprocfs_vars lprocfs_mdt_obd_vars[] = {
@@ -677,7 +793,10 @@ static struct lprocfs_vars lprocfs_mdt_obd_vars[] = {
         { "root_squash",                lprocfs_rd_root_squash,
                                         lprocfs_wr_root_squash,             0 },
         { "nosquash_nids",              lprocfs_rd_nosquash_nids,
-                                        lprocfs_wr_nosquash_nids,          0 },
+                                        lprocfs_wr_nosquash_nids,           0 },
+        { "som",                        lprocfs_rd_mdt_som,
+                                        lprocfs_wr_mdt_som, 0 },
+        { "mdccomm",                    0, lprocfs_mdt_wr_mdc,              0 },
         { 0 }
 };
 
@@ -691,3 +810,26 @@ void lprocfs_mdt_init_vars(struct lprocfs_static_vars *lvars)
     lvars->module_vars  = lprocfs_mdt_module_vars;
     lvars->obd_vars     = lprocfs_mdt_obd_vars;
 }
+
+void mdt_counter_incr(struct obd_export *exp, int opcode)
+{
+        if (exp->exp_obd && exp->exp_obd->obd_stats)
+                lprocfs_counter_incr(exp->exp_obd->obd_stats, opcode);
+        if (exp->exp_nid_stats && exp->exp_nid_stats->nid_stats != NULL)
+                lprocfs_counter_incr(exp->exp_nid_stats->nid_stats, opcode);
+
+}
+
+void mdt_stats_counter_init(struct lprocfs_stats *stats)
+{
+        lprocfs_counter_init(stats, LPROC_MDT_OPEN, 0, "open", "reqs");
+        lprocfs_counter_init(stats, LPROC_MDT_CLOSE, 0, "close", "reqs");
+        lprocfs_counter_init(stats, LPROC_MDT_MKNOD, 0, "mknod", "reqs");
+        lprocfs_counter_init(stats, LPROC_MDT_LINK, 0, "link", "reqs");
+        lprocfs_counter_init(stats, LPROC_MDT_UNLINK, 0, "unlink", "reqs");
+        lprocfs_counter_init(stats, LPROC_MDT_MKDIR, 0, "mkdir", "reqs");
+        lprocfs_counter_init(stats, LPROC_MDT_RMDIR, 0, "rmdir", "reqs");
+        lprocfs_counter_init(stats, LPROC_MDT_RENAME, 0, "rename", "reqs");
+        lprocfs_counter_init(stats, LPROC_MDT_GETXATTR, 0, "getxattr", "reqs");
+        lprocfs_counter_init(stats, LPROC_MDT_SETXATTR, 0, "setxattr", "reqs");
+}