X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fosc%2Flproc_osc.c;h=05f13dd6b0c9510a6dfab8e398754636b69ae4da;hb=317ebf88af58e9d9235c90f84b112e931ae69b43;hp=8712ef674df88a52e3f76461017dec4d6ffa441b;hpb=689ea74b583aff80c50210e90548379f8f22c201;p=fs%2Flustre-release.git diff --git a/lustre/osc/lproc_osc.c b/lustre/osc/lproc_osc.c index 8712ef6..05f13dd 100644 --- a/lustre/osc/lproc_osc.c +++ b/lustre/osc/lproc_osc.c @@ -1,26 +1,37 @@ -/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- - * vim:expandtab:shiftwidth=8:tabstop=8: +/* + * GPL HEADER START * - * Copyright (C) 2002, 2003 Cluster File Systems, Inc. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * This file is part of the Lustre file system, http://www.lustre.org - * Lustre is a trademark of Cluster File Systems, Inc. + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 only, + * as published by the Free Software Foundation. * - * You may have signed or agreed to another license before downloading - * this software. If so, you are bound by the terms and conditions - * of that agreement, and the following does not apply to you. See the - * LICENSE file included with this distribution for more information. + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License version 2 for more details (a copy is included + * in the LICENSE file that accompanied this code). * - * If you did not agree to a different license, then this copy of Lustre - * is open source software; you can redistribute it and/or modify it - * under the terms of version 2 of the GNU General Public License as - * published by the Free Software Foundation. + * 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 * - * In either case, Lustre is distributed in the hope that it will be - * useful, but WITHOUT ANY WARRANTY; without even the implied warranty - * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * license text for more details. + * 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. * + * GPL HEADER END + */ +/* + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. + * Use is subject to license terms. + * + * Copyright (c) 2011, Whamcloud, Inc. + */ +/* + * This file is part of Lustre, http://www.lustre.org/ + * Lustre is a trademark of Sun Microsystems, Inc. */ #define DEBUG_SUBSYSTEM S_CLASS @@ -50,7 +61,7 @@ static int osc_wr_active(struct file *file, const char *buffer, { struct obd_device *dev = data; int val, rc; - + rc = lprocfs_write_helper(buffer, count, &val); if (rc) return rc; @@ -59,49 +70,11 @@ static int osc_wr_active(struct file *file, const char *buffer, LPROCFS_CLIMP_CHECK(dev); /* opposite senses */ - if (dev->u.cli.cl_import->imp_deactive == val) + if (dev->u.cli.cl_import->imp_deactive == val) rc = ptlrpc_set_import_active(dev->u.cli.cl_import, val); else CDEBUG(D_CONFIG, "activate %d: ignoring repeat request\n", val); - - LPROCFS_CLIMP_EXIT(dev); - return count; -} - -static int osc_rd_max_pages_per_rpc(char *page, char **start, off_t off, - int count, int *eof, void *data) -{ - 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, "%d\n", cli->cl_max_pages_per_rpc); - client_obd_list_unlock(&cli->cl_loi_list_lock); - return rc; -} -static int osc_wr_max_pages_per_rpc(struct file *file, const char *buffer, - unsigned long count, void *data) -{ - struct obd_device *dev = data; - struct client_obd *cli = &dev->u.cli; - struct obd_connect_data *ocd = &cli->cl_import->imp_connect_data; - int val, rc; - - rc = lprocfs_write_helper(buffer, count, &val); - if (rc) - return rc; - - LPROCFS_CLIMP_CHECK(dev); - if (val < 1 || val > ocd->ocd_brw_size >> CFS_PAGE_SHIFT) { - LPROCFS_CLIMP_EXIT(dev); - return -ERANGE; - } - client_obd_list_lock(&cli->cl_loi_list_lock); - cli->cl_max_pages_per_rpc = val; - client_obd_list_unlock(&cli->cl_loi_list_lock); - LPROCFS_CLIMP_EXIT(dev); return count; } @@ -141,7 +114,7 @@ static int osc_wr_max_rpcs_in_flight(struct file *file, const char *buffer, 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); - + LPROCFS_CLIMP_EXIT(dev); return count; } @@ -176,7 +149,7 @@ static int osc_wr_max_dirty_mb(struct file *file, const char *buffer, if (pages_number < 0 || pages_number > OSC_MAX_DIRTY_MB_MAX << (20 - CFS_PAGE_SHIFT) || - pages_number > num_physpages / 4) /* 1/4 of RAM */ + pages_number > cfs_num_physpages / 4) /* 1/4 of RAM */ return -ERANGE; client_obd_list_lock(&cli->cl_loi_list_lock); @@ -187,6 +160,48 @@ static int osc_wr_max_dirty_mb(struct file *file, const char *buffer, return count; } +static int osc_rd_cached_mb(char *page, char **start, off_t off, int count, + int *eof, void *data) +{ + struct obd_device *dev = data; + struct client_obd *cli = &dev->u.cli; + int shift = 20 - CFS_PAGE_SHIFT; + int rc; + + rc = snprintf(page, count, + "used_mb: %d\n" + "busy_cnt: %d\n", + (cfs_atomic_read(&cli->cl_lru_in_list) + + cfs_atomic_read(&cli->cl_lru_busy)) >> shift, + cfs_atomic_read(&cli->cl_lru_busy)); + + return rc; +} + +/* shrink the number of caching pages to a specific number */ +static int osc_wr_cached_mb(struct file *file, const char *buffer, + unsigned long count, void *data) +{ + struct obd_device *dev = data; + struct client_obd *cli = &dev->u.cli; + int pages_number, mult, rc; + + mult = 1 << (20 - CFS_PAGE_SHIFT); + buffer = lprocfs_find_named_value(buffer, "used_mb:", &count); + rc = lprocfs_write_frac_helper(buffer, count, &pages_number, mult); + if (rc) + return rc; + + if (pages_number < 0) + return -ERANGE; + + rc = cfs_atomic_read(&cli->cl_lru_in_list) - pages_number; + if (rc > 0) + (void)osc_lru_shrink(cli, rc); + + return count; +} + static int osc_rd_cur_dirty_bytes(char *page, char **start, off_t off, int count, int *eof, void *data) { @@ -213,63 +228,81 @@ static int osc_rd_cur_grant_bytes(char *page, char **start, off_t off, return rc; } -static int osc_rd_create_count(char *page, char **start, off_t off, int count, - int *eof, void *data) +static int osc_wr_cur_grant_bytes(struct file *file, const char *buffer, + unsigned long count, void *data) { struct obd_device *obd = data; + struct client_obd *cli = &obd->u.cli; + int rc; + __u64 val; if (obd == NULL) return 0; - return snprintf(page, count, "%d\n", - obd->u.cli.cl_oscc.oscc_grow_count); -} - -static int osc_wr_create_count(struct file *file, const char *buffer, - unsigned long count, void *data) -{ - struct obd_device *obd = data; - int val, rc; + rc = lprocfs_write_u64_helper(buffer, count, &val); + if (rc) + return rc; - if (obd == NULL) + /* this is only for shrinking grant */ + client_obd_list_lock(&cli->cl_loi_list_lock); + if (val >= cli->cl_avail_grant) { + client_obd_list_unlock(&cli->cl_loi_list_lock); return 0; + } + client_obd_list_unlock(&cli->cl_loi_list_lock); - rc = lprocfs_write_helper(buffer, count, &val); + LPROCFS_CLIMP_CHECK(obd); + if (cli->cl_import->imp_state == LUSTRE_IMP_FULL) + rc = osc_shrink_grant_to_target(cli, val); + LPROCFS_CLIMP_EXIT(obd); if (rc) return rc; + return count; +} - if (val < 0) - return -ERANGE; - if (val > OST_MAX_PRECREATE) - return -ERANGE; - - obd->u.cli.cl_oscc.oscc_grow_count = val; +static int osc_rd_cur_lost_grant_bytes(char *page, char **start, off_t off, + int count, int *eof, void *data) +{ + struct obd_device *dev = data; + struct client_obd *cli = &dev->u.cli; + int rc; - return count; + client_obd_list_lock(&cli->cl_loi_list_lock); + rc = snprintf(page, count, "%lu\n", cli->cl_lost_grant); + client_obd_list_unlock(&cli->cl_loi_list_lock); + return rc; } -static int osc_rd_prealloc_next_id(char *page, char **start, off_t off, - int count, int *eof, void *data) +static int osc_rd_grant_shrink_interval(char *page, char **start, off_t off, + int count, int *eof, void *data) { struct obd_device *obd = data; if (obd == NULL) return 0; - - return snprintf(page, count, LPU64"\n", - obd->u.cli.cl_oscc.oscc_next_id); + return snprintf(page, count, "%d\n", + obd->u.cli.cl_grant_shrink_interval); } -static int osc_rd_prealloc_last_id(char *page, char **start, off_t off, - int count, int *eof, void *data) +static int osc_wr_grant_shrink_interval(struct file *file, const char *buffer, + unsigned long count, void *data) { struct obd_device *obd = data; + int val, rc; if (obd == NULL) return 0; - return snprintf(page, count, LPU64"\n", - obd->u.cli.cl_oscc.oscc_last_id); + rc = lprocfs_write_helper(buffer, count, &val); + if (rc) + return rc; + + if (val <= 0) + return -ERANGE; + + obd->u.cli.cl_grant_shrink_interval = val; + + return count; } static int osc_rd_checksum(char *page, char **start, off_t off, int count, @@ -340,7 +373,7 @@ static int osc_wd_checksum_type(struct file *file, const char *buffer, if (count > sizeof(kernbuf) - 1) return -EINVAL; - if (copy_from_user(kernbuf, buffer, count)) + if (cfs_copy_from_user(kernbuf, buffer, count)) return -EFAULT; if (count > 0 && kernbuf[count - 1] == '\n') kernbuf[count - 1] = '\0'; @@ -363,7 +396,8 @@ static int osc_rd_resend_count(char *page, char **start, off_t off, int count, { struct obd_device *obd = data; - return snprintf(page, count, "%u\n", atomic_read(&obd->u.cli.cl_resends)); + return snprintf(page, count, "%u\n", + cfs_atomic_read(&obd->u.cli.cl_resends)); } static int osc_wr_resend_count(struct file *file, const char *buffer, @@ -379,14 +413,89 @@ static int osc_wr_resend_count(struct file *file, const char *buffer, if (val < 0) return -EINVAL; - atomic_set(&obd->u.cli.cl_resends, val); + cfs_atomic_set(&obd->u.cli.cl_resends, val); return count; } +static int osc_rd_contention_seconds(char *page, char **start, off_t off, + int count, int *eof, void *data) +{ + struct obd_device *obd = data; + struct osc_device *od = obd2osc_dev(obd); + + return snprintf(page, count, "%u\n", od->od_contention_time); +} + +static int osc_wr_contention_seconds(struct file *file, const char *buffer, + unsigned long count, void *data) +{ + struct obd_device *obd = data; + struct osc_device *od = obd2osc_dev(obd); + + return lprocfs_write_helper(buffer, count, &od->od_contention_time) ?: + count; +} + +static int osc_rd_lockless_truncate(char *page, char **start, off_t off, + int count, int *eof, void *data) +{ + struct obd_device *obd = data; + struct osc_device *od = obd2osc_dev(obd); + + return snprintf(page, count, "%u\n", od->od_lockless_truncate); +} + +static int osc_wr_lockless_truncate(struct file *file, const char *buffer, + unsigned long count, void *data) +{ + struct obd_device *obd = data; + struct osc_device *od = obd2osc_dev(obd); + + return lprocfs_write_helper(buffer, count, &od->od_lockless_truncate) ?: + count; +} + +static int osc_rd_destroys_in_flight(char *page, char **start, off_t off, + int count, int *eof, void *data) +{ + struct obd_device *obd = data; + return snprintf(page, count, "%u\n", + cfs_atomic_read(&obd->u.cli.cl_destroy_in_flight)); +} + +static int lprocfs_osc_wr_max_pages_per_rpc(struct file *file, + const char *buffer, unsigned long count, void *data) +{ + struct obd_device *dev = data; + struct client_obd *cli = &dev->u.cli; + struct obd_connect_data *ocd = &cli->cl_import->imp_connect_data; + int chunk_mask, val, rc; + + rc = lprocfs_write_helper(buffer, count, &val); + if (rc) + return rc; + + LPROCFS_CLIMP_CHECK(dev); + + chunk_mask = ~((1 << (cli->cl_chunkbits - CFS_PAGE_SHIFT)) - 1); + /* max_pages_per_rpc must be chunk aligned */ + val = (val + ~chunk_mask) & chunk_mask; + if (val == 0 || val > ocd->ocd_brw_size >> CFS_PAGE_SHIFT) { + LPROCFS_CLIMP_EXIT(dev); + return -ERANGE; + } + client_obd_list_lock(&cli->cl_loi_list_lock); + cli->cl_max_pages_per_rpc = val; + client_obd_list_unlock(&cli->cl_loi_list_lock); + + LPROCFS_CLIMP_EXIT(dev); + return count; +} + static struct lprocfs_vars lprocfs_osc_obd_vars[] = { { "uuid", lprocfs_rd_uuid, 0, 0 }, - { "ping", 0, lprocfs_wr_ping, 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 }, @@ -397,21 +506,33 @@ static struct lprocfs_vars lprocfs_osc_obd_vars[] = { //{ "filegroups", lprocfs_rd_filegroups, 0, 0 }, { "ost_server_uuid", lprocfs_rd_server_uuid, 0, 0 }, { "ost_conn_uuid", lprocfs_rd_conn_uuid, 0, 0 }, - { "active", osc_rd_active, + { "active", osc_rd_active, osc_wr_active, 0 }, - { "max_pages_per_rpc", osc_rd_max_pages_per_rpc, - osc_wr_max_pages_per_rpc, 0 }, + { "max_pages_per_rpc", lprocfs_obd_rd_max_pages_per_rpc, + lprocfs_osc_wr_max_pages_per_rpc, 0 }, { "max_rpcs_in_flight", osc_rd_max_rpcs_in_flight, osc_wr_max_rpcs_in_flight, 0 }, + { "destroys_in_flight", osc_rd_destroys_in_flight, 0, 0 }, { "max_dirty_mb", osc_rd_max_dirty_mb, osc_wr_max_dirty_mb, 0 }, + { "osc_cached_mb", osc_rd_cached_mb, osc_wr_cached_mb, 0 }, { "cur_dirty_bytes", osc_rd_cur_dirty_bytes, 0, 0 }, - { "cur_grant_bytes", osc_rd_cur_grant_bytes, 0, 0 }, - { "create_count", osc_rd_create_count, osc_wr_create_count, 0 }, - { "prealloc_next_id", osc_rd_prealloc_next_id, 0, 0 }, - { "prealloc_last_id", osc_rd_prealloc_last_id, 0, 0 }, + { "cur_grant_bytes", osc_rd_cur_grant_bytes, + osc_wr_cur_grant_bytes, 0 }, + { "cur_lost_grant_bytes", osc_rd_cur_lost_grant_bytes, 0, 0}, + { "grant_shrink_interval", osc_rd_grant_shrink_interval, + osc_wr_grant_shrink_interval, 0 }, { "checksums", osc_rd_checksum, osc_wr_checksum, 0 }, { "checksum_type", osc_rd_checksum_type, osc_wd_checksum_type, 0 }, { "resend_count", osc_rd_resend_count, osc_wr_resend_count, 0}, + { "timeouts", lprocfs_rd_timeouts, 0, 0 }, + { "contention_seconds", osc_rd_contention_seconds, + osc_wr_contention_seconds, 0 }, + { "lockless_truncate", osc_rd_lockless_truncate, + osc_wr_lockless_truncate, 0 }, + { "import", lprocfs_rd_import, lprocfs_wr_import, 0 }, + { "state", lprocfs_rd_state, 0, 0 }, + { "pinger_recov", lprocfs_rd_pinger_recov, + lprocfs_wr_pinger_recov, 0, 0 }, { 0 } }; @@ -430,7 +551,7 @@ static int osc_rpc_stats_seq_show(struct seq_file *seq, void *v) unsigned long read_tot = 0, write_tot = 0, read_cum, write_cum; int i; - do_gettimeofday(&now); + cfs_gettimeofday(&now); client_obd_list_lock(&cli->cl_loi_list_lock); @@ -441,9 +562,9 @@ static int osc_rpc_stats_seq_show(struct seq_file *seq, void *v) seq_printf(seq, "write RPCs in flight: %d\n", cli->cl_w_in_flight); seq_printf(seq, "pending write pages: %d\n", - cli->cl_pending_w_pages); + cfs_atomic_read(&cli->cl_pending_w_pages)); seq_printf(seq, "pending read pages: %d\n", - cli->cl_pending_r_pages); + cfs_atomic_read(&cli->cl_pending_r_pages)); seq_printf(seq, "\n\t\t\tread\t\t\twrite\n"); seq_printf(seq, "pages per rpc rpcs %% cum %% |"); @@ -507,7 +628,7 @@ static int osc_rpc_stats_seq_show(struct seq_file *seq, void *v) write_cum += w; seq_printf(seq, "%d:\t\t%10lu %3lu %3lu | %10lu %3lu %3lu\n", (i == 0) ? 0 : 1 << (i - 1), - r, pct(r, read_tot), pct(read_cum, read_tot), + r, pct(r, read_tot), pct(read_cum, read_tot), w, pct(w, write_tot), pct(write_cum, write_tot)); if (read_cum == read_tot && write_cum == write_tot) break; @@ -538,10 +659,48 @@ static ssize_t osc_rpc_stats_seq_write(struct file *file, const char *buf, LPROC_SEQ_FOPS(osc_rpc_stats); +static int osc_stats_seq_show(struct seq_file *seq, void *v) +{ + struct timeval now; + struct obd_device *dev = seq->private; + struct osc_stats *stats = &obd2osc_dev(dev)->od_stats; + + cfs_gettimeofday(&now); + + seq_printf(seq, "snapshot_time: %lu.%lu (secs.usecs)\n", + now.tv_sec, now.tv_usec); + seq_printf(seq, "lockless_write_bytes\t\t"LPU64"\n", + stats->os_lockless_writes); + seq_printf(seq, "lockless_read_bytes\t\t"LPU64"\n", + stats->os_lockless_reads); + seq_printf(seq, "lockless_truncate\t\t"LPU64"\n", + stats->os_lockless_truncates); + return 0; +} + +static ssize_t osc_stats_seq_write(struct file *file, const char *buf, + size_t len, loff_t *off) +{ + struct seq_file *seq = file->private_data; + struct obd_device *dev = seq->private; + struct osc_stats *stats = &obd2osc_dev(dev)->od_stats; + + memset(stats, 0, sizeof(*stats)); + return len; +} + +LPROC_SEQ_FOPS(osc_stats); + int lproc_osc_attach_seqstat(struct obd_device *dev) { - return lprocfs_obd_seq_create(dev, "rpc_stats", 0444, - &osc_rpc_stats_fops, dev); + int rc; + + rc = lprocfs_seq_create(dev->obd_proc_entry, "osc_stats", 0444, + &osc_stats_fops, dev); + if (rc == 0) + rc = lprocfs_obd_seq_create(dev, "rpc_stats", 0444, + &osc_rpc_stats_fops, dev); + return rc; } void lprocfs_osc_init_vars(struct lprocfs_static_vars *lvars) @@ -550,4 +709,3 @@ void lprocfs_osc_init_vars(struct lprocfs_static_vars *lvars) lvars->obd_vars = lprocfs_osc_obd_vars; } #endif /* LPROCFS */ -