X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fmdc%2Flproc_mdc.c;h=c5cb9d85e7695837bf3015c06b11a66cccbe9f2a;hb=bcc52fdccc92c45f657d637eaf8403decc6d9877;hp=7d4fa12a218a1f7101b95b901f26b762bd8b4158;hpb=40137f1d07295ee4a0bb75d2ae553c42e66295f4;p=fs%2Flustre-release.git diff --git a/lustre/mdc/lproc_mdc.c b/lustre/mdc/lproc_mdc.c index 7d4fa12..c5cb9d8 100644 --- a/lustre/mdc/lproc_mdc.c +++ b/lustre/mdc/lproc_mdc.c @@ -27,7 +27,7 @@ * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * - * Copyright (c) 2011, 2012, Intel Corporation. + * Copyright (c) 2011, 2014, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -40,143 +40,148 @@ #include #include -#ifdef LPROCFS +#include "mdc_internal.h" -static int mdc_rd_max_rpcs_in_flight(char *page, char **start, off_t off, - int count, int *eof, void *data) +#ifdef CONFIG_PROC_FS + +static int mdc_max_rpcs_in_flight_seq_show(struct seq_file *m, void *v) { - struct obd_device *dev = data; - struct client_obd *cli = &dev->u.cli; - int rc; - - client_obd_list_lock(&cli->cl_loi_list_lock); - rc = snprintf(page, count, "%u\n", cli->cl_max_rpcs_in_flight); - client_obd_list_unlock(&cli->cl_loi_list_lock); - return rc; + struct obd_device *dev = m->private; + __u32 max; + int rc; + + max = obd_get_max_rpcs_in_flight(&dev->u.cli); + rc = seq_printf(m, "%u\n", max); + + return rc; } -static int mdc_wr_max_rpcs_in_flight(struct file *file, const char *buffer, - unsigned long count, void *data) +static ssize_t mdc_max_rpcs_in_flight_seq_write(struct file *file, + const char __user *buffer, + size_t count, + loff_t *off) { - struct obd_device *dev = data; - struct client_obd *cli = &dev->u.cli; - int val, rc; - - rc = lprocfs_write_helper(buffer, count, &val); - if (rc) - return rc; + struct obd_device *dev = ((struct seq_file *)file->private_data)->private; + int val; + int rc; - if (val < 1 || val > MDC_MAX_RIF_MAX) - return -ERANGE; + rc = lprocfs_write_helper(buffer, count, &val); + if (rc == 0) + rc = obd_set_max_rpcs_in_flight(&dev->u.cli, val); - client_obd_list_lock(&cli->cl_loi_list_lock); - cli->cl_max_rpcs_in_flight = val; - client_obd_list_unlock(&cli->cl_loi_list_lock); + if (rc != 0) + count = rc; - return count; + return count; } +LPROC_SEQ_FOPS(mdc_max_rpcs_in_flight); -/* temporary for testing */ -static int mdc_wr_kuc(struct file *file, const char *buffer, - unsigned long count, void *data) + +static int mdc_max_mod_rpcs_in_flight_seq_show(struct seq_file *m, void *v) { - struct obd_device *obd = data; - struct kuc_hdr *lh; - struct hsm_action_list *hal; - struct hsm_action_item *hai; - int len; - int fd, rc; - ENTRY; - - rc = lprocfs_write_helper(buffer, count, &fd); - if (rc) - RETURN(rc); - - if (fd < 0) - RETURN(-ERANGE); - CWARN("message to fd %d\n", fd); - - len = sizeof(*lh) + sizeof(*hal) + MTI_NAME_MAXLEN + - /* for mockup below */ 2 * cfs_size_round(sizeof(*hai)); - - OBD_ALLOC(lh, len); - - lh->kuc_magic = KUC_MAGIC; - lh->kuc_transport = KUC_TRANSPORT_HSM; - lh->kuc_msgtype = HMT_ACTION_LIST; - lh->kuc_msglen = len; - - hal = (struct hsm_action_list *)(lh + 1); - hal->hal_version = HAL_VERSION; - hal->hal_archive_id = 1; - hal->hal_flags = 0; - obd_uuid2fsname(hal->hal_fsname, obd->obd_name, MTI_NAME_MAXLEN); - - /* mock up an action list */ - hal->hal_count = 2; - hai = hai_zero(hal); - hai->hai_action = HSMA_ARCHIVE; - hai->hai_fid.f_oid = 5; - hai->hai_len = sizeof(*hai); - hai = hai_next(hai); - hai->hai_action = HSMA_RESTORE; - hai->hai_fid.f_oid = 10; - hai->hai_len = sizeof(*hai); - - /* This works for either broadcast or unicast to a single fd */ - if (fd == 0) { - rc = libcfs_kkuc_group_put(KUC_GRP_HSM, lh); - } else { - cfs_file_t *fp = cfs_get_fd(fd); - rc = libcfs_kkuc_msg_put(fp, lh); - cfs_put_file(fp); - } - OBD_FREE(lh, len); - if (rc < 0) - RETURN(rc); - RETURN(count); + struct obd_device *dev = m->private; + __u16 max; + int rc; + + max = obd_get_max_mod_rpcs_in_flight(&dev->u.cli); + rc = seq_printf(m, "%hu\n", max); + + return rc; } -static struct lprocfs_vars lprocfs_mdc_obd_vars[] = { - { "uuid", lprocfs_rd_uuid, 0, 0 }, - { "ping", 0, lprocfs_wr_ping, 0, 0, 0222 }, - { "connect_flags", lprocfs_rd_connect_flags, 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 }, - { "filestotal", lprocfs_rd_filestotal, 0, 0 }, - { "filesfree", lprocfs_rd_filesfree, 0, 0 }, - /*{ "filegroups", lprocfs_rd_filegroups, 0, 0 },*/ - { "mds_server_uuid", lprocfs_rd_server_uuid, 0, 0 }, - { "mds_conn_uuid", lprocfs_rd_conn_uuid, 0, 0 }, - /* - * FIXME: below proc entry is provided, but not in used, instead - * sbi->sb_md_brw_size is used, the per obd variable should be used - * when CMD is enabled, and dir pages are managed in MDC layer. - * Remember to enable proc write function. - */ - { "max_pages_per_rpc", lprocfs_obd_rd_max_pages_per_rpc, - /* lprocfs_obd_wr_max_pages_per_rpc */0, 0 }, - { "max_rpcs_in_flight", mdc_rd_max_rpcs_in_flight, - mdc_wr_max_rpcs_in_flight, 0 }, - { "timeouts", lprocfs_rd_timeouts, 0, 0 }, - { "import", lprocfs_rd_import, lprocfs_wr_import, 0 }, - { "state", lprocfs_rd_state, 0, 0 }, - { "hsm_nl", 0, mdc_wr_kuc, 0, 0, 0200 }, - { "pinger_recov", lprocfs_rd_pinger_recov, - lprocfs_wr_pinger_recov, 0, 0 }, - { 0 } -}; +static ssize_t mdc_max_mod_rpcs_in_flight_seq_write(struct file *file, + const char *buffer, + size_t count, + loff_t *off) +{ + struct obd_device *dev = + ((struct seq_file *)file->private_data)->private; + int val; + int rc; -static struct lprocfs_vars lprocfs_mdc_module_vars[] = { - { "num_refs", lprocfs_rd_numrefs, 0, 0 }, - { 0 } -}; + rc = lprocfs_write_helper(buffer, count, &val); + if (rc != 0) + return rc; + + if (val < 0 || val > USHRT_MAX) + return -ERANGE; -void lprocfs_mdc_init_vars(struct lprocfs_static_vars *lvars) + rc = obd_set_max_mod_rpcs_in_flight(&dev->u.cli, val); + if (rc != 0) + count = rc; + + return count; +} +LPROC_SEQ_FOPS(mdc_max_mod_rpcs_in_flight); + +LPROC_SEQ_FOPS_WO_TYPE(mdc, ping); + +LPROC_SEQ_FOPS_RO_TYPE(mdc, uuid); +LPROC_SEQ_FOPS_RO_TYPE(mdc, connect_flags); +LPROC_SEQ_FOPS_RO_TYPE(mdc, blksize); +LPROC_SEQ_FOPS_RO_TYPE(mdc, kbytestotal); +LPROC_SEQ_FOPS_RO_TYPE(mdc, kbytesfree); +LPROC_SEQ_FOPS_RO_TYPE(mdc, kbytesavail); +LPROC_SEQ_FOPS_RO_TYPE(mdc, filestotal); +LPROC_SEQ_FOPS_RO_TYPE(mdc, filesfree); +LPROC_SEQ_FOPS_RO_TYPE(mdc, server_uuid); +LPROC_SEQ_FOPS_RO_TYPE(mdc, conn_uuid); +LPROC_SEQ_FOPS_RO_TYPE(mdc, timeouts); +LPROC_SEQ_FOPS_RO_TYPE(mdc, state); + +static int mdc_obd_max_pages_per_rpc_seq_show(struct seq_file *m, void *v) { - lvars->module_vars = lprocfs_mdc_module_vars; - lvars->obd_vars = lprocfs_mdc_obd_vars; + return lprocfs_obd_max_pages_per_rpc_seq_show(m, m->private); } -#endif /* LPROCFS */ +LPROC_SEQ_FOPS_RO(mdc_obd_max_pages_per_rpc); + +LPROC_SEQ_FOPS_RW_TYPE(mdc, import); +LPROC_SEQ_FOPS_RW_TYPE(mdc, pinger_recov); + +struct lprocfs_vars lprocfs_mdc_obd_vars[] = { + { .name = "uuid", + .fops = &mdc_uuid_fops }, + { .name = "ping", + .fops = &mdc_ping_fops, + .proc_mode = 0222 }, + { .name = "connect_flags", + .fops = &mdc_connect_flags_fops }, + { .name = "blocksize", + .fops = &mdc_blksize_fops }, + { .name = "kbytestotal", + .fops = &mdc_kbytestotal_fops }, + { .name = "kbytesfree", + .fops = &mdc_kbytesfree_fops }, + { .name = "kbytesavail", + .fops = &mdc_kbytesavail_fops }, + { .name = "filestotal", + .fops = &mdc_filestotal_fops }, + { .name = "filesfree", + .fops = &mdc_filesfree_fops }, + { .name = "mds_server_uuid", + .fops = &mdc_server_uuid_fops }, + { .name = "mds_conn_uuid", + .fops = &mdc_conn_uuid_fops }, + /* + * FIXME: below proc entry is provided, but not in used, instead + * sbi->sb_md_brw_size is used, the per obd variable should be used + * when CMD is enabled, and dir pages are managed in MDC layer. + * Remember to enable proc write function. + */ + { .name = "max_pages_per_rpc", + .fops = &mdc_obd_max_pages_per_rpc_fops }, + { .name = "max_rpcs_in_flight", + .fops = &mdc_max_rpcs_in_flight_fops }, + { .name = "max_mod_rpcs_in_flight", + .fops = &mdc_max_mod_rpcs_in_flight_fops }, + { .name = "timeouts", + .fops = &mdc_timeouts_fops }, + { .name = "import", + .fops = &mdc_import_fops }, + { .name = "state", + .fops = &mdc_state_fops }, + { .name = "pinger_recov", + .fops = &mdc_pinger_recov_fops }, + { NULL } +}; +#endif /* CONFIG_PROC_FS */