X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ffid%2Flproc_fid.c;h=aa16d8123f0a82294aacedcd4f11783ec868241b;hb=1fc013f90175d1e50d7a22b404ad6abd31a43e38;hp=1b6e6a8c6177a6219778049e1be73cc13f969fdc;hpb=0bb171673e30fa3271b851f6274ca9cdb8f5e55f;p=fs%2Flustre-release.git diff --git a/lustre/fid/lproc_fid.c b/lustre/fid/lproc_fid.c index 1b6e6a8..aa16d81 100644 --- a/lustre/fid/lproc_fid.c +++ b/lustre/fid/lproc_fid.c @@ -27,7 +27,7 @@ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * - * Copyright (c) 2011, 2013, Intel Corporation. + * Copyright (c) 2011, 2014, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -50,9 +50,11 @@ #include #include #include "fid_internal.h" -#include -#ifdef LPROCFS +#ifdef CONFIG_PROC_FS + +/* Format: [0x64BIT_INT - 0x64BIT_INT] + 32 bytes just in case */ +#define MAX_FID_RANGE_STRLEN (32 + 2 * 2 * sizeof(__u64)) /** * Reduce the SEQ range allocated to a node to a strict subset of the range * currently-allocated SEQ range. If the specified range is "clear", then @@ -61,23 +63,32 @@ * Note: this function should only be used for testing, it is not necessarily * safe for production use. */ -static int seq_proc_write_common(struct file *file, const char *buffer, - unsigned long count, void *data, - struct lu_seq_range *range) +static int +lprocfs_fid_write_common(const char __user *buffer, size_t count, + struct lu_seq_range *range) { struct lu_seq_range tmp = { 0, }; int rc; + char kernbuf[MAX_FID_RANGE_STRLEN]; ENTRY; LASSERT(range != NULL); - if (count == 5 && strcmp(buffer, "clear") == 0) { + if (count >= sizeof(kernbuf)) + RETURN(-EINVAL); + + if (copy_from_user(kernbuf, buffer, count)) + RETURN(-EFAULT); + + kernbuf[count] = 0; + + if (count == 5 && strcmp(kernbuf, "clear") == 0) { memset(range, 0, sizeof(*range)); RETURN(0); } /* of the form "[0x0000000240000400 - 0x000000028000400]" */ - rc = sscanf(buffer, "[%llx - %llx]\n", + rc = sscanf(kernbuf, "[%llx - %llx]\n", (long long unsigned *)&tmp.lsr_start, (long long unsigned *)&tmp.lsr_end); if (!range_is_sane(&tmp) || range_is_zero(&tmp) || @@ -87,101 +98,82 @@ static int seq_proc_write_common(struct file *file, const char *buffer, RETURN(0); } -static int seq_proc_read_common(char *page, char **start, off_t off, - int count, int *eof, void *data, - struct lu_seq_range *range) -{ - int rc; - ENTRY; - - *eof = 1; - rc = snprintf(page, count, "["LPX64" - "LPX64"]:%x:%s\n", - PRANGE(range)); - RETURN(rc); -} - #ifdef HAVE_SERVER_SUPPORT /* * Server side procfs stuff. */ -static int -seq_server_proc_write_space(struct file *file, const char *buffer, - unsigned long count, void *data) +static ssize_t +lprocfs_server_fid_space_seq_write(struct file *file, const char __user *buffer, + size_t count, loff_t *off) { - struct lu_server_seq *seq = (struct lu_server_seq *)data; + struct lu_server_seq *seq = ((struct seq_file *)file->private_data)->private; int rc; ENTRY; - LASSERT(seq != NULL); + LASSERT(seq != NULL); mutex_lock(&seq->lss_mutex); - rc = seq_proc_write_common(file, buffer, count, - data, &seq->lss_space); + rc = lprocfs_fid_write_common(buffer, count, &seq->lss_space); if (rc == 0) { CDEBUG(D_INFO, "%s: Space: "DRANGE"\n", - seq->lss_name, PRANGE(&seq->lss_space)); + seq->lss_name, PRANGE(&seq->lss_space)); } - mutex_unlock(&seq->lss_mutex); - RETURN(count); + RETURN(count); } static int -seq_server_proc_read_space(char *page, char **start, off_t off, - int count, int *eof, void *data) +lprocfs_server_fid_space_seq_show(struct seq_file *m, void *unused) { - struct lu_server_seq *seq = (struct lu_server_seq *)data; + struct lu_server_seq *seq = (struct lu_server_seq *)m->private; int rc; ENTRY; - LASSERT(seq != NULL); + LASSERT(seq != NULL); mutex_lock(&seq->lss_mutex); - rc = seq_proc_read_common(page, start, off, count, eof, - data, &seq->lss_space); + rc = seq_printf(m, "["LPX64" - "LPX64"]:%x:%s\n", + PRANGE(&seq->lss_space)); mutex_unlock(&seq->lss_mutex); RETURN(rc); } static int -seq_server_proc_read_server(char *page, char **start, off_t off, - int count, int *eof, void *data) +lprocfs_server_fid_server_seq_show(struct seq_file *m, void *unused) { - struct lu_server_seq *seq = (struct lu_server_seq *)data; - struct client_obd *cli; + struct lu_server_seq *seq = (struct lu_server_seq *)m->private; + struct client_obd *cli; int rc; ENTRY; - LASSERT(seq != NULL); + LASSERT(seq != NULL); - *eof = 1; if (seq->lss_cli) { - if (seq->lss_cli->lcs_exp != NULL) { - cli = &seq->lss_cli->lcs_exp->exp_obd->u.cli; - rc = snprintf(page, count, "%s\n", - cli->cl_target_uuid.uuid); - } else { - rc = snprintf(page, count, "%s\n", - seq->lss_cli->lcs_srv->lss_name); + if (seq->lss_cli->lcs_exp != NULL) { + cli = &seq->lss_cli->lcs_exp->exp_obd->u.cli; + rc = seq_printf(m, "%s\n", cli->cl_target_uuid.uuid); + } else { + rc = seq_printf(m, "%s\n", + seq->lss_cli->lcs_srv->lss_name); } } else { - rc = snprintf(page, count, "\n"); + rc = seq_printf(m, "\n"); } RETURN(rc); } -static int -seq_server_proc_write_width(struct file *file, const char *buffer, - unsigned long count, void *data) +static ssize_t +lprocfs_server_fid_width_seq_write(struct file *file, const char __user *buffer, + size_t count, loff_t *off) { - struct lu_server_seq *seq = (struct lu_server_seq *)data; + struct lu_server_seq *seq = ((struct seq_file *)file->private_data)->private; int rc, val; ENTRY; - LASSERT(seq != NULL); + LASSERT(seq != NULL); mutex_lock(&seq->lss_mutex); @@ -198,33 +190,36 @@ seq_server_proc_write_width(struct file *file, const char *buffer, out_unlock: mutex_unlock(&seq->lss_mutex); - RETURN(count); + RETURN(count); } static int -seq_server_proc_read_width(char *page, char **start, off_t off, - int count, int *eof, void *data) +lprocfs_server_fid_width_seq_show(struct seq_file *m, void *unused) { - struct lu_server_seq *seq = (struct lu_server_seq *)data; + struct lu_server_seq *seq = (struct lu_server_seq *)m->private; int rc; ENTRY; - LASSERT(seq != NULL); + LASSERT(seq != NULL); mutex_lock(&seq->lss_mutex); - rc = snprintf(page, count, LPU64"\n", seq->lss_width); + rc = seq_printf(m, LPU64"\n", seq->lss_width); mutex_unlock(&seq->lss_mutex); RETURN(rc); } +LPROC_SEQ_FOPS(lprocfs_server_fid_space); +LPROC_SEQ_FOPS(lprocfs_server_fid_width); +LPROC_SEQ_FOPS_RO(lprocfs_server_fid_server); + struct lprocfs_vars seq_server_proc_list[] = { - { "space", - seq_server_proc_read_space, seq_server_proc_write_space, NULL }, - { "width", - seq_server_proc_read_width, seq_server_proc_write_width, NULL }, - { "server", - seq_server_proc_read_server, NULL, NULL }, + { .name = "space", + .fops = &lprocfs_server_fid_space_fops }, + { .name = "width", + .fops = &lprocfs_server_fid_width_fops }, + { .name = "server", + .fops = &lprocfs_server_fid_server_fops }, { NULL } }; @@ -247,6 +242,8 @@ static void *fldb_seq_start(struct seq_file *p, loff_t *pos) struct lu_server_fld *fld; struct dt_object *obj; const struct dt_it_ops *iops; + struct dt_key *key; + int rc; if (param == NULL || param->fsp_stop) return NULL; @@ -256,9 +253,16 @@ static void *fldb_seq_start(struct seq_file *p, loff_t *pos) LASSERT(obj != NULL); iops = &obj->do_index_ops->dio_it; - iops->load(¶m->fsp_env, param->fsp_it, *pos); + rc = iops->load(¶m->fsp_env, param->fsp_it, *pos); + if (rc <= 0) + return NULL; + + key = iops->key(¶m->fsp_env, param->fsp_it); + if (IS_ERR(key)) + return NULL; + + *pos = be64_to_cpu(*(__u64 *)key); - *pos = be64_to_cpu(*(__u64 *)iops->key(¶m->fsp_env, param->fsp_it)); return param; } @@ -345,9 +349,8 @@ struct seq_operations fldb_sops = { static int fldb_seq_open(struct inode *inode, struct file *file) { - struct proc_dir_entry *dp = PDE(inode); struct seq_file *seq; - struct lu_server_seq *ss = (struct lu_server_seq *)dp->data; + struct lu_server_seq *ss = (struct lu_server_seq *) PDE_DATA(inode); struct lu_server_fld *fld; struct dt_object *obj; const struct dt_it_ops *iops; @@ -358,7 +361,10 @@ static int fldb_seq_open(struct inode *inode, struct file *file) fld = ss->lss_site->ss_server_fld; LASSERT(fld != NULL); - LPROCFS_ENTRY_CHECK(dp); + rc = LPROCFS_ENTRY_CHECK(inode); + if (rc < 0) + return rc; + rc = seq_open(file, &fldb_sops); if (rc) return rc; @@ -380,7 +386,7 @@ static int fldb_seq_open(struct inode *inode, struct file *file) env_init = 1; iops = &obj->do_index_ops->dio_it; - param->fsp_it = iops->init(¶m->fsp_env, obj, 0, NULL); + param->fsp_it = iops->init(¶m->fsp_env, obj, 0); if (IS_ERR(param->fsp_it)) GOTO(out, rc = PTR_ERR(param->fsp_it)); @@ -429,26 +435,27 @@ static int fldb_seq_release(struct inode *inode, struct file *file) return 0; } -static ssize_t fldb_seq_write(struct file *file, const char *buf, +static ssize_t fldb_seq_write(struct file *file, const char __user *buf, size_t len, loff_t *off) { struct seq_file *seq = file->private_data; struct fld_seq_param *param; struct lu_seq_range range; int rc = 0; - char *buffer, *_buffer; + char _buffer[MAX_FID_RANGE_STRLEN]; + char *buffer = _buffer; ENTRY; param = seq->private; if (param == NULL) RETURN(-EINVAL); - OBD_ALLOC(buffer, len + 1); - if (buffer == NULL) - RETURN(-ENOMEM); - memcpy(buffer, buf, len); + if (len >= sizeof(_buffer)) + RETURN(-EINVAL); + + if (copy_from_user(buffer, buf, len)) + GOTO(out, rc = -EFAULT); buffer[len] = 0; - _buffer = buffer; /* * format - [0x0000000200000007-0x0000000200000008):0:mdt @@ -486,7 +493,6 @@ static ssize_t fldb_seq_write(struct file *file, const char *buf, &range, ¶m->fsp_env); out: - OBD_FREE(_buffer, len + 1); RETURN(rc < 0 ? rc : len); } @@ -501,20 +507,18 @@ const struct file_operations seq_fld_proc_seq_fops = { #endif /* HAVE_SERVER_SUPPORT */ /* Client side procfs stuff */ -static int -seq_client_proc_write_space(struct file *file, const char *buffer, - unsigned long count, void *data) +static ssize_t +lprocfs_client_fid_space_seq_write(struct file *file, const char __user *buffer, + size_t count, loff_t *off) { - struct lu_client_seq *seq = (struct lu_client_seq *)data; + struct lu_client_seq *seq = ((struct seq_file *)file->private_data)->private; int rc; ENTRY; - LASSERT(seq != NULL); + LASSERT(seq != NULL); mutex_lock(&seq->lcs_mutex); - rc = seq_proc_write_common(file, buffer, count, - data, &seq->lcs_space); - + rc = lprocfs_fid_write_common(buffer, count, &seq->lcs_space); if (rc == 0) { CDEBUG(D_INFO, "%s: Space: "DRANGE"\n", seq->lcs_name, PRANGE(&seq->lcs_space)); @@ -522,45 +526,44 @@ seq_client_proc_write_space(struct file *file, const char *buffer, mutex_unlock(&seq->lcs_mutex); - RETURN(count); + RETURN(count); } static int -seq_client_proc_read_space(char *page, char **start, off_t off, - int count, int *eof, void *data) +lprocfs_client_fid_space_seq_show(struct seq_file *m, void *unused) { - struct lu_client_seq *seq = (struct lu_client_seq *)data; + struct lu_client_seq *seq = (struct lu_client_seq *)m->private; int rc; ENTRY; - LASSERT(seq != NULL); + LASSERT(seq != NULL); mutex_lock(&seq->lcs_mutex); - rc = seq_proc_read_common(page, start, off, count, eof, - data, &seq->lcs_space); + rc = seq_printf(m, "["LPX64" - "LPX64"]:%x:%s\n", + PRANGE(&seq->lcs_space)); mutex_unlock(&seq->lcs_mutex); RETURN(rc); } -static int -seq_client_proc_write_width(struct file *file, const char *buffer, - unsigned long count, void *data) +static ssize_t +lprocfs_client_fid_width_seq_write(struct file *file, const char __user *buffer, + size_t count, loff_t *off) { - struct lu_client_seq *seq = (struct lu_client_seq *)data; + struct lu_client_seq *seq = ((struct seq_file *)file->private_data)->private; __u64 max; int rc, val; ENTRY; - LASSERT(seq != NULL); + LASSERT(seq != NULL); mutex_lock(&seq->lcs_mutex); - rc = lprocfs_write_helper(buffer, count, &val); - if (rc) { + rc = lprocfs_write_helper(buffer, count, &val); + if (rc) { mutex_unlock(&seq->lcs_mutex); - RETURN(rc); - } + RETURN(rc); + } if (seq->lcs_type == LUSTRE_SEQ_DATA) max = LUSTRE_DATA_SEQ_MAX_WIDTH; @@ -570,75 +573,80 @@ seq_client_proc_write_width(struct file *file, const char *buffer, if (val <= max && val > 0) { seq->lcs_width = val; - if (rc == 0) { - CDEBUG(D_INFO, "%s: Sequence size: "LPU64"\n", - seq->lcs_name, seq->lcs_width); - } + CDEBUG(D_INFO, "%s: Sequence size: "LPU64"\n", + seq->lcs_name, seq->lcs_width); } - mutex_unlock(&seq->lcs_mutex); - RETURN(count); + RETURN(count); } static int -seq_client_proc_read_width(char *page, char **start, off_t off, - int count, int *eof, void *data) +lprocfs_client_fid_width_seq_show(struct seq_file *m, void *unused) { - struct lu_client_seq *seq = (struct lu_client_seq *)data; + struct lu_client_seq *seq = (struct lu_client_seq *)m->private; int rc; ENTRY; - LASSERT(seq != NULL); + LASSERT(seq != NULL); mutex_lock(&seq->lcs_mutex); - rc = snprintf(page, count, LPU64"\n", seq->lcs_width); + rc = seq_printf(m, LPU64"\n", seq->lcs_width); mutex_unlock(&seq->lcs_mutex); RETURN(rc); } static int -seq_client_proc_read_fid(char *page, char **start, off_t off, - int count, int *eof, void *data) +lprocfs_client_fid_fid_seq_show(struct seq_file *m, void *unused) { - struct lu_client_seq *seq = (struct lu_client_seq *)data; + struct lu_client_seq *seq = (struct lu_client_seq *)m->private; int rc; ENTRY; - LASSERT(seq != NULL); + LASSERT(seq != NULL); mutex_lock(&seq->lcs_mutex); - rc = snprintf(page, count, DFID"\n", PFID(&seq->lcs_fid)); + rc = seq_printf(m, DFID"\n", PFID(&seq->lcs_fid)); mutex_unlock(&seq->lcs_mutex); RETURN(rc); } static int -seq_client_proc_read_server(char *page, char **start, off_t off, - int count, int *eof, void *data) +lprocfs_client_fid_server_seq_show(struct seq_file *m, void *unused) { - struct lu_client_seq *seq = (struct lu_client_seq *)data; - struct client_obd *cli; + struct lu_client_seq *seq = (struct lu_client_seq *)m->private; + struct client_obd *cli; int rc; ENTRY; - LASSERT(seq != NULL); + LASSERT(seq != NULL); - if (seq->lcs_exp != NULL) { - cli = &seq->lcs_exp->exp_obd->u.cli; - rc = snprintf(page, count, "%s\n", cli->cl_target_uuid.uuid); - } else { - rc = snprintf(page, count, "%s\n", seq->lcs_srv->lss_name); - } + if (seq->lcs_exp != NULL) { + cli = &seq->lcs_exp->exp_obd->u.cli; + rc = seq_printf(m, "%s\n", cli->cl_target_uuid.uuid); + } else { + rc = seq_printf(m, "%s\n", seq->lcs_srv->lss_name); + } RETURN(rc); } +LPROC_SEQ_FOPS(lprocfs_client_fid_space); +LPROC_SEQ_FOPS(lprocfs_client_fid_width); +LPROC_SEQ_FOPS_RO(lprocfs_client_fid_server); +LPROC_SEQ_FOPS_RO(lprocfs_client_fid_fid); + struct lprocfs_vars seq_client_proc_list[] = { - { "space", seq_client_proc_read_space, seq_client_proc_write_space, NULL }, - { "width", seq_client_proc_read_width, seq_client_proc_write_width, NULL }, - { "server", seq_client_proc_read_server, NULL, NULL }, - { "fid", seq_client_proc_read_fid, NULL, NULL }, - { NULL }}; -#endif + { .name = "space", + .fops = &lprocfs_client_fid_space_fops }, + { .name = "width", + .fops = &lprocfs_client_fid_width_fops }, + { .name = "server", + .fops = &lprocfs_client_fid_server_fops }, + { .name = "fid", + .fops = &lprocfs_client_fid_fid_fops }, + { NULL } +}; + +#endif /* CONFIG_PROC_FS */