-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
* GPL HEADER START
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2011 Whamcloud, Inc.
- *
+ * Copyright (c) 2011, 2012, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
* Author: Fan Yong <fanyong@clusterfs.com>
*/
-#ifndef EXPORT_SYMTAB
-# define EXPORT_SYMTAB
-#endif
#define DEBUG_SUBSYSTEM S_MDS
#include <linux/version.h>
#include <lustre_mds.h>
#include <lustre_mdt.h>
#include <lprocfs_status.h>
-#include <lu_time.h>
#include "mdt_internal.h"
#include <lnet/lib-lnet.h>
-enum {
- LPROC_MDT_NR
-};
-static const char *mdt_proc_names[LPROC_MDT_NR] = {
-};
-
/**
* The rename stats output would be YAML formats, like
* rename_stats:
static int lproc_mdt_attach_rename_seqstat(struct mdt_device *mdt)
{
- struct lu_device *ld = &mdt->mdt_md_dev.md_lu_dev;
- struct obd_device *obd = ld->ld_obd;
- int i;
+ struct lu_device *ld = &mdt->mdt_md_dev.md_lu_dev;
+ struct obd_device *obd = ld->ld_obd;
+ int i;
- for (i = 0; i < RENAME_LAST; i++)
- spin_lock_init(&mdt->mdt_rename_stats.hist[i].oh_lock);
+ for (i = 0; i < RENAME_LAST; i++)
+ spin_lock_init(&mdt->mdt_rename_stats.hist[i].oh_lock);
- return lprocfs_obd_seq_create(obd, "rename_stats", 0444,
- &mdt_rename_stats_fops, mdt);
+ return lprocfs_obd_seq_create(obd, "rename_stats", 0644,
+ &mdt_rename_stats_fops, mdt);
}
void mdt_rename_counter_tally(struct mdt_thread_info *info,
- struct mdt_device *mdt,
- struct obd_export *exp,
- struct mdt_object *src,
- struct mdt_object *tgt)
+ struct mdt_device *mdt,
+ struct ptlrpc_request *req,
+ struct mdt_object *src,
+ struct mdt_object *tgt)
{
struct md_attr *ma = &info->mti_attr;
struct rename_stats *rstats = &mdt->mdt_rename_stats;
rc = mo_attr_get(info->mti_env, mdt_object_child(src), ma);
if (rc) {
CERROR("%s: "DFID" attr_get, rc = %d\n",
- exp->exp_obd->obd_name, PFID(mdt_object_fid(src)), rc);
+ req->rq_export->exp_obd->obd_name,
+ PFID(mdt_object_fid(src)), rc);
return;
}
if (src == tgt) {
- mdt_counter_incr(exp, LPROC_MDT_SAMEDIR_RENAME);
+ mdt_counter_incr(req, LPROC_MDT_SAMEDIR_RENAME);
lprocfs_oh_tally_log2(&rstats->hist[RENAME_SAMEDIR_SIZE],
(unsigned int)ma->ma_attr.la_size);
return;
}
- mdt_counter_incr(exp, LPROC_MDT_CROSSDIR_RENAME);
+ mdt_counter_incr(req, LPROC_MDT_CROSSDIR_RENAME);
lprocfs_oh_tally_log2(&rstats->hist[RENAME_CROSSDIR_SRC_SIZE],
(unsigned int)ma->ma_attr.la_size);
rc = mo_attr_get(info->mti_env, mdt_object_child(tgt), ma);
if (rc) {
CERROR("%s: "DFID" attr_get, rc = %d\n",
- exp->exp_obd->obd_name, PFID(mdt_object_fid(tgt)), rc);
+ req->rq_export->exp_obd->obd_name,
+ PFID(mdt_object_fid(tgt)), rc);
return;
}
}
ptlrpc_lprocfs_register_obd(obd);
- mdt->mdt_proc_entry = obd->obd_proc_entry;
- LASSERT(mdt->mdt_proc_entry != NULL);
-
- 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)
"clear", lprocfs_nid_stats_clear_read,
lprocfs_nid_stats_clear_write, obd, NULL);
rc = lprocfs_alloc_md_stats(obd, LPROC_MDT_LAST);
- if (rc == 0)
- mdt_stats_counter_init(obd->md_stats);
+ if (rc)
+ return rc;
+ mdt_stats_counter_init(obd->md_stats);
+
+ rc = lprocfs_job_stats_init(obd, LPROC_MDT_LAST,
+ mdt_stats_counter_init);
rc = lproc_mdt_attach_rename_seqstat(mdt);
if (rc)
struct lu_device *ld = &mdt->mdt_md_dev.md_lu_dev;
struct obd_device *obd = ld->ld_obd;
+ lprocfs_job_stats_fini(obd);
+
if (obd->obd_proc_exports_entry) {
lprocfs_remove_proc_entry("clear", obd->obd_proc_exports_entry);
obd->obd_proc_exports_entry = NULL;
lprocfs_free_per_client_stats(obd);
lprocfs_obd_cleanup(obd);
ptlrpc_lprocfs_unregister_obd(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;
- }
lprocfs_free_md_stats(obd);
lprocfs_free_obd_stats(obd);
RETURN(0);
}
-void mdt_time_start(const struct mdt_thread_info *info)
-{
- lu_lprocfs_time_start(info->mti_env);
-}
-
-void mdt_time_end(const struct mdt_thread_info *info, int idx)
-{
- lu_lprocfs_time_end(info->mti_env, info->mti_mdt->mdt_stats, idx);
-}
-
static int lprocfs_rd_identity_expire(char *page, char **start, off_t off,
int count, int *eof, void *data)
{
struct upcall_cache *hash = mdt->mdt_identity_cache;
int len;
- *eof = 1;
- cfs_read_lock(&hash->uc_upcall_rwlock);
- len = snprintf(page, count, "%s\n", hash->uc_upcall);
- cfs_read_unlock(&hash->uc_upcall_rwlock);
- return len;
+ *eof = 1;
+ read_lock(&hash->uc_upcall_rwlock);
+ len = snprintf(page, count, "%s\n", hash->uc_upcall);
+ read_unlock(&hash->uc_upcall_rwlock);
+ return len;
}
static int lprocfs_wr_identity_upcall(struct file *file, const char *buffer,
GOTO(failed, rc = -EFAULT);
/* Remove any extraneous bits from the upcall (e.g. linefeeds) */
- cfs_write_lock(&hash->uc_upcall_rwlock);
- sscanf(kernbuf, "%s", hash->uc_upcall);
- cfs_write_unlock(&hash->uc_upcall_rwlock);
+ write_lock(&hash->uc_upcall_rwlock);
+ sscanf(kernbuf, "%s", hash->uc_upcall);
+ write_unlock(&hash->uc_upcall_rwlock);
if (strcmp(hash->uc_name, obd->obd_name) != 0)
CWARN("%s: write to upcall name %s\n",
return count;
}
+#define BUFLEN (UUID_MAX + 4)
+
static int lprocfs_mdt_wr_evict_client(struct file *file, const char *buffer,
unsigned long count, void *data)
{
- char tmpbuf[sizeof(struct obd_uuid)];
+ char *kbuf;
+ char *tmpbuf;
- sscanf(buffer, "%40s", tmpbuf);
+ OBD_ALLOC(kbuf, BUFLEN);
+ if (kbuf == NULL)
+ return -ENOMEM;
- if (strncmp(tmpbuf, "nid:", 4) != 0)
- return lprocfs_wr_evict_client(file, buffer, count, data);
+ /*
+ * OBD_ALLOC() will zero kbuf, but we only copy BUFLEN - 1
+ * bytes into kbuf, to ensure that the string is NUL-terminated.
+ * UUID_MAX should include a trailing NUL already.
+ */
+ if (cfs_copy_from_user(kbuf, buffer,
+ min_t(unsigned long, BUFLEN - 1, count))) {
+ count = -EFAULT;
+ goto out;
+ }
+ tmpbuf = cfs_firststr(kbuf, min_t(unsigned long, BUFLEN - 1, count));
+
+ if (strncmp(tmpbuf, "nid:", 4) != 0) {
+ count = lprocfs_wr_evict_client(file, buffer, count, data);
+ goto out;
+ }
CERROR("NOT implement evict client by nid %s\n", tmpbuf);
+out:
+ OBD_FREE(kbuf, BUFLEN);
return count;
}
+#undef BUFLEN
+
static int lprocfs_rd_sec_level(char *page, char **start, off_t off,
int count, int *eof, void *data)
{
if (!strcmp(kernbuf, "NONE") || !strcmp(kernbuf, "clear")) {
/* empty string is special case */
- cfs_down_write(&mdt->mdt_squash_sem);
+ 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_str = NULL;
mdt->mdt_nosquash_strlen = 0;
}
- cfs_up_write(&mdt->mdt_squash_sem);
+ up_write(&mdt->mdt_squash_sem);
LCONSOLE_INFO("%s: nosquash_nids is cleared\n",
obd->obd_name);
OBD_FREE(kernbuf, count + 1);
GOTO(failed, rc = -EINVAL);
}
- cfs_down_write(&mdt->mdt_squash_sem);
+ 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);
LCONSOLE_INFO("%s: nosquash_nids is set to %s\n",
obd->obd_name, kernbuf);
- cfs_up_write(&mdt->mdt_squash_sem);
+ up_write(&mdt->mdt_squash_sem);
RETURN(count);
failed:
{
struct obd_device *obd = data;
struct obd_export *exp = NULL;
- struct obd_uuid uuid;
- char tmpbuf[sizeof(struct obd_uuid)];
+ struct obd_uuid *uuid;
+ char *kbuf;
+ char *tmpbuf;
- sscanf(buffer, "%40s", tmpbuf);
+ OBD_ALLOC(kbuf, UUID_MAX);
+ if (kbuf == NULL)
+ return -ENOMEM;
- obd_str2uuid(&uuid, tmpbuf);
- exp = cfs_hash_lookup(obd->obd_uuid_hash, &uuid);
+ /*
+ * OBD_ALLOC() will zero kbuf, but we only copy UUID_MAX - 1
+ * bytes into kbuf, to ensure that the string is NUL-terminated.
+ * UUID_MAX should include a trailing NUL already.
+ */
+ if (cfs_copy_from_user(kbuf, buffer,
+ min_t(unsigned long, UUID_MAX - 1, count))) {
+ count = -EFAULT;
+ goto out;
+ }
+ tmpbuf = cfs_firststr(kbuf, min_t(unsigned long, UUID_MAX - 1, count));
+
+ OBD_ALLOC(uuid, UUID_MAX);
+ if (uuid == NULL) {
+ count = -ENOMEM;
+ goto out;
+ }
+
+ 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));
+ obd->obd_name, obd_uuid2str(uuid));
} else {
mdt_hsm_copytool_send(exp);
class_export_put(exp);
}
+ OBD_FREE(uuid, UUID_MAX);
+out:
+ OBD_FREE(kbuf, UUID_MAX);
return count;
}
{ "instance", lprocfs_target_rd_instance, 0 },
{ "ir_factor", lprocfs_obd_rd_ir_factor,
lprocfs_obd_wr_ir_factor, 0 },
+ { "job_cleanup_interval", lprocfs_rd_job_interval,
+ lprocfs_wr_job_interval, 0 },
{ 0 }
};
void lprocfs_mdt_init_vars(struct lprocfs_static_vars *lvars)
{
- lvars->module_vars = lprocfs_mdt_module_vars;
- lvars->obd_vars = lprocfs_mdt_obd_vars;
+ 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->md_stats)
- lprocfs_counter_incr(exp->exp_obd->md_stats, opcode);
- if (exp->exp_nid_stats && exp->exp_nid_stats->nid_stats != NULL)
- lprocfs_counter_incr(exp->exp_nid_stats->nid_stats, opcode);
+struct lprocfs_vars lprocfs_mds_obd_vars[] = {
+ { "uuid", lprocfs_rd_uuid, 0, 0 },
+ { 0 }
+};
+struct lprocfs_vars lprocfs_mds_module_vars[] = {
+ { "num_refs", lprocfs_rd_numrefs, 0, 0 },
+ { 0 }
+};
+
+void mdt_counter_incr(struct ptlrpc_request *req, int opcode)
+{
+ struct obd_export *exp = req->rq_export;
+
+ if (exp->exp_obd && exp->exp_obd->md_stats)
+ lprocfs_counter_incr(exp->exp_obd->md_stats, opcode);
+ if (exp->exp_nid_stats && exp->exp_nid_stats->nid_stats != NULL)
+ lprocfs_counter_incr(exp->exp_nid_stats->nid_stats, opcode);
+ if (exp->exp_obd && exp->exp_obd->u.obt.obt_jobstats.ojs_hash &&
+ (exp->exp_connect_flags & OBD_CONNECT_JOBSTATS))
+ lprocfs_job_stats_log(exp->exp_obd,
+ lustre_msg_get_jobid(req->rq_reqmsg),
+ opcode, 1);
}
void mdt_stats_counter_init(struct lprocfs_stats *stats)
git://git.whamcloud.com / fs / lustre-release.git / blobdiff