static struct lprocfs_vars lprocfs_module_vars[] = { {0} };
#else
-#define OSC_MAX_RIF_MAX 32
-#define OSC_MAX_DIRTY_MB_MAX 4096 /* totally arbitrary */
-
int osc_rd_max_pages_per_rpc(char *page, char **start, off_t off, int count,
int *eof, void *data)
{
if (rc)
return rc;
- if (val < 1 || val > PTL_MD_MAX_PAGES)
+ if (val < 1 || val > PTLRPC_MAX_BRW_PAGES)
return -ERANGE;
spin_lock(&cli->cl_loi_list_lock);
int rc;
spin_lock(&cli->cl_loi_list_lock);
- rc = snprintf(page, count, "%d\n", cli->cl_max_rpcs_in_flight);
+ rc = snprintf(page, count, "%u\n", cli->cl_max_rpcs_in_flight);
spin_unlock(&cli->cl_loi_list_lock);
return rc;
}
{
struct obd_device *dev = data;
struct client_obd *cli = &dev->u.cli;
- int val;
- int rc;
+ unsigned val;
spin_lock(&cli->cl_loi_list_lock);
val = cli->cl_dirty_max >> 20;
- rc = snprintf(page, count, "%d\n", val);
spin_unlock(&cli->cl_loi_list_lock);
- return rc;
+
+ return snprintf(page, count, "%u\n", val);
}
int osc_wr_max_dirty_mb(struct file *file, const char *buffer,
if (rc)
return rc;
- if (val < 0 || val > OSC_MAX_DIRTY_MB_MAX)
+ if (val < 0 || val > OSC_MAX_DIRTY_MB_MAX ||
+ val > num_physpages >> (20 - PAGE_SHIFT - 2)) /* 1/4 of RAM */
return -ERANGE;
spin_lock(&cli->cl_loi_list_lock);
cli->cl_dirty_max = (obd_count)val * 1024 * 1024;
- osc_adjust_cache(cli);
+ osc_wake_cache_waiters(cli);
spin_unlock(&cli->cl_loi_list_lock);
return count;
int rc;
spin_lock(&cli->cl_loi_list_lock);
- rc = snprintf(page, count, LPU64"\n", cli->cl_dirty);
+ rc = snprintf(page, count, "%lu\n", cli->cl_dirty);
+ spin_unlock(&cli->cl_loi_list_lock);
+ return rc;
+}
+
+int osc_rd_cur_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;
+
+ spin_lock(&cli->cl_loi_list_lock);
+ rc = snprintf(page, count, "%lu\n", cli->cl_avail_grant);
spin_unlock(&cli->cl_loi_list_lock);
return rc;
}
int *eof, void *data)
{
struct obd_device *obd = data;
- struct obd_export *exp;
- if (obd == NULL || list_empty(&obd->obd_exports))
+ if (obd == NULL)
return 0;
- spin_lock(&obd->obd_dev_lock);
- exp = list_entry(obd->obd_exports.next, struct obd_export,
- exp_obd_chain);
- spin_unlock(&obd->obd_dev_lock);
-
return snprintf(page, count, "%d\n",
- exp->exp_osc_data.oed_oscc.oscc_kick_barrier);
+ obd->u.cli.cl_oscc.oscc_kick_barrier);
}
int osc_wr_create_low_wm(struct file *file, const char *buffer,
unsigned long count, void *data)
{
struct obd_device *obd = data;
- struct obd_export *exp;
int val, rc;
- if (obd == NULL || list_empty(&obd->obd_exports))
+ if (obd == NULL)
return 0;
rc = lprocfs_write_helper(buffer, count, &val);
return -ERANGE;
spin_lock(&obd->obd_dev_lock);
- exp = list_entry(obd->obd_exports.next, struct obd_export,
- exp_obd_chain);
- exp->exp_osc_data.oed_oscc.oscc_kick_barrier = val;
+ obd->u.cli.cl_oscc.oscc_kick_barrier = val;
spin_unlock(&obd->obd_dev_lock);
return count;
int *eof, void *data)
{
struct obd_device *obd = data;
- struct obd_export *exp;
- if (obd == NULL || list_empty(&obd->obd_exports))
+ if (obd == NULL)
return 0;
- spin_lock(&obd->obd_dev_lock);
- exp = list_entry(obd->obd_exports.next, struct obd_export,
- exp_obd_chain);
- spin_unlock(&obd->obd_dev_lock);
-
return snprintf(page, count, "%d\n",
- exp->exp_osc_data.oed_oscc.oscc_grow_count);
+ obd->u.cli.cl_oscc.oscc_grow_count);
}
int osc_wr_create_count(struct file *file, const char *buffer,
unsigned long count, void *data)
{
struct obd_device *obd = data;
- struct obd_export *exp;
int val, rc;
- if (obd == NULL || list_empty(&obd->obd_exports))
+ if (obd == NULL)
return 0;
rc = lprocfs_write_helper(buffer, count, &val);
if (val < 0)
return -ERANGE;
- spin_lock(&obd->obd_dev_lock);
- exp = list_entry(obd->obd_exports.next, struct obd_export,
- exp_obd_chain);
- exp->exp_osc_data.oed_oscc.oscc_grow_count = val;
- spin_unlock(&obd->obd_dev_lock);
+ obd->u.cli.cl_oscc.oscc_grow_count = val;
return count;
}
int *eof, void *data)
{
struct obd_device *obd = data;
- struct obd_export *exp;
- if (obd == NULL || list_empty(&obd->obd_exports))
+ if (obd == NULL)
return 0;
- spin_lock(&obd->obd_dev_lock);
- exp = list_entry(obd->obd_exports.next, struct obd_export,
- exp_obd_chain);
- spin_unlock(&obd->obd_dev_lock);
-
return snprintf(page, count, LPU64"\n",
- exp->exp_osc_data.oed_oscc.oscc_next_id);
+ obd->u.cli.cl_oscc.oscc_next_id);
}
int osc_rd_prealloc_last_id(char *page, char **start, off_t off, int count,
int *eof, void *data)
{
struct obd_device *obd = data;
- struct obd_export *exp;
- if (obd == NULL || list_empty(&obd->obd_exports))
+ if (obd == NULL)
return 0;
- spin_lock(&obd->obd_dev_lock);
- exp = list_entry(obd->obd_exports.next, struct obd_export,
- exp_obd_chain);
- spin_unlock(&obd->obd_dev_lock);
-
return snprintf(page, count, LPU64"\n",
- exp->exp_osc_data.oed_oscc.oscc_last_id);
+ obd->u.cli.cl_oscc.oscc_last_id);
}
static struct lprocfs_vars lprocfs_obd_vars[] = {
{ "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 },
{ "ost_server_uuid", lprocfs_rd_server_uuid, 0, 0 },
{ "ost_conn_uuid", lprocfs_rd_conn_uuid, 0, 0 },
- { "max_pages_per_rpc", osc_rd_max_pages_per_rpc,
+ { "max_pages_per_rpc", osc_rd_max_pages_per_rpc,
osc_wr_max_pages_per_rpc, 0 },
- { "max_rpcs_in_flight", osc_rd_max_rpcs_in_flight,
+ { "max_rpcs_in_flight", osc_rd_max_rpcs_in_flight,
osc_wr_max_rpcs_in_flight, 0 },
{ "max_dirty_mb", osc_rd_max_dirty_mb, osc_wr_max_dirty_mb, 0 },
{ "cur_dirty_bytes", osc_rd_cur_dirty_bytes, 0, 0 },
+ { "cur_grant_bytes", osc_rd_cur_grant_bytes, 0, 0 },
{"create_low_watermark", osc_rd_create_low_wm, osc_wr_create_low_wm, 0},
{ "create_count", osc_rd_create_count, osc_wr_create_count, 0 },
{ "prealloc_next_id", osc_rd_prealloc_next_id, 0, 0 },
{ 0 }
};
-void lproc_osc_hist(struct osc_histogram *oh, unsigned int value)
-{
- unsigned long flags;
-
- if (value >= OSC_HIST_MAX)
- value = OSC_HIST_MAX - 1;
-
- spin_lock_irqsave(&oh->oh_lock, flags);
- oh->oh_buckets[value]++;
- spin_unlock_irqrestore(&oh->oh_lock, flags);
-}
-
-void lproc_osc_hist_pow2(struct osc_histogram *oh, unsigned int value)
-{
- unsigned int pow;
-
- for (pow = 0; ((1 << pow) < value) && (pow <= OSC_HIST_MAX); pow++)
- ;
-
- lproc_osc_hist(oh, pow);
-}
+#define pct(a,b) (b ? a * 100 / b : 0)
-static unsigned long lproc_oh_sum(struct osc_histogram *oh)
-{
- unsigned long ret = 0;
- int i;
+#define PRINTF_STIME(stime) (unsigned long)(stime)->st_num, \
+ lprocfs_stime_avg_ms(stime), lprocfs_stime_avg_us(stime)
- for (i = 0; i < OSC_HIST_MAX; i++)
- ret += oh->oh_buckets[i];
- return ret;
-}
-
-static void lproc_clear_oh(struct osc_histogram *oh)
-{
- unsigned long flags;
- spin_lock_irqsave(&oh->oh_lock, flags);
- memset(oh->oh_buckets, 0, sizeof(oh->oh_buckets));
- spin_unlock_irqrestore(&oh->oh_lock, flags);
-}
-
-#define pct(a,b) (b ? a * 100 / b : 0)
static int osc_rpc_stats_seq_show(struct seq_file *seq, void *v)
{
struct client_obd *cli = &dev->u.cli;
unsigned long flags;
unsigned long read_tot = 0, write_tot = 0, read_cum, write_cum;
- int i, rpcs, r, w;
+ int i;
do_gettimeofday(&now);
spin_lock_irqsave(&cli->cl_loi_list_lock, flags);
- rpcs = cli->cl_brw_in_flight;
- r = cli->cl_pending_r_pages;
- w = cli->cl_pending_w_pages;
-
seq_printf(seq, "snapshot_time: %lu:%lu (secs:usecs)\n",
now.tv_sec, now.tv_usec);
- seq_printf(seq, "RPCs in flight: %d\n", rpcs);
- seq_printf(seq, "pending write pages: %d\n", w);
- seq_printf(seq, "pending read pages: %d\n", r);
+
+ seq_printf(seq, "read RPCs in flight: %d\n",
+ cli->cl_r_in_flight);
+ 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);
+ seq_printf(seq, "pending read pages: %d\n",
+ cli->cl_pending_r_pages);
+
seq_printf(seq, "\n\t\t\tread\t\t\twrite\n");
seq_printf(seq, "pages per rpc rpcs %% cum %% |");
seq_printf(seq, " rpcs %% cum %%\n");
- read_tot = lproc_oh_sum(&cli->cl_read_page_hist);
- write_tot = lproc_oh_sum(&cli->cl_write_page_hist);
+ read_tot = lprocfs_oh_sum(&cli->cl_read_page_hist);
+ write_tot = lprocfs_oh_sum(&cli->cl_write_page_hist);
read_cum = 0;
write_cum = 0;
- for (i = 0; i < OSC_HIST_MAX; i++) {
+ for (i = 0; i < OBD_HIST_MAX; i++) {
unsigned long r = cli->cl_read_page_hist.oh_buckets[i];
unsigned long w = cli->cl_write_page_hist.oh_buckets[i];
read_cum += r;
write_cum += w;
- seq_printf(seq, "%d:\t\t%10lu %3lu %3lu | %10lu %3lu %3lu\n",
- 1 << i, r, pct(r, read_tot),
- pct(read_cum, read_tot), w,
+ seq_printf(seq, "%d:\t\t%10lu %3lu %3lu | %10lu %3lu %3lu\n",
+ 1 << i, 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)
seq_printf(seq, "rpcs in flight rpcs %% cum %% |");
seq_printf(seq, " rpcs %% cum %%\n");
- read_tot = lproc_oh_sum(&cli->cl_read_rpc_hist);
- write_tot = lproc_oh_sum(&cli->cl_write_rpc_hist);
+ read_tot = lprocfs_oh_sum(&cli->cl_read_rpc_hist);
+ write_tot = lprocfs_oh_sum(&cli->cl_write_rpc_hist);
read_cum = 0;
write_cum = 0;
- for (i = 0; i < OSC_HIST_MAX; i++) {
+ for (i = 0; i < OBD_HIST_MAX; i++) {
unsigned long r = cli->cl_read_rpc_hist.oh_buckets[i];
unsigned long w = cli->cl_write_rpc_hist.oh_buckets[i];
read_cum += r;
write_cum += w;
- seq_printf(seq, "%d:\t\t%10lu %3lu %3lu | %10lu %3lu %3lu\n",
- i, r, pct(r, read_tot),
- pct(read_cum, read_tot), w,
+ seq_printf(seq, "%d:\t\t%10lu %3lu %3lu | %10lu %3lu %3lu\n",
+ i, 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;
}
+ seq_printf(seq, "\nrpc service time: (rpcs, average ms)\n");
+ seq_printf(seq, "\tread\t%lu\t%lu.%04lu\n",
+ PRINTF_STIME(&cli->cl_read_stime));
+ seq_printf(seq, "\twrite\t%lu\t%lu.%04lu\n\n",
+ PRINTF_STIME(&cli->cl_write_stime));
+
+ seq_printf(seq, "app waiting: (num, average ms)\n");
+ seq_printf(seq, "\tenter cache\t%lu\t%lu.%04lu\n",
+ PRINTF_STIME(&cli->cl_enter_stime));
+
spin_unlock_irqrestore(&cli->cl_loi_list_lock, flags);
return 0;
static int osc_rpc_stats_seq_open(struct inode *inode, struct file *file)
{
- struct proc_dir_entry *dp = inode->u.generic_ip;
+ struct proc_dir_entry *dp = PDE(inode);
struct seq_file *seq;
int rc;
-
+
rc = seq_open(file, &osc_rpc_stats_seq_sops);
if (rc)
return rc;
struct obd_device *dev = seq->private;
struct client_obd *cli = &dev->u.cli;
- lproc_clear_oh(&cli->cl_read_rpc_hist);
- lproc_clear_oh(&cli->cl_write_rpc_hist);
- lproc_clear_oh(&cli->cl_read_page_hist);
- lproc_clear_oh(&cli->cl_write_page_hist);
+ lprocfs_oh_clear(&cli->cl_read_rpc_hist);
+ lprocfs_oh_clear(&cli->cl_write_rpc_hist);
+ lprocfs_oh_clear(&cli->cl_read_page_hist);
+ lprocfs_oh_clear(&cli->cl_write_page_hist);
+
+ memset(&cli->cl_read_stime, 0, sizeof(cli->cl_read_stime));
+ memset(&cli->cl_write_stime, 0, sizeof(cli->cl_write_stime));
+ memset(&cli->cl_enter_stime, 0, sizeof(cli->cl_enter_stime));
return len;
}
struct file_operations osc_rpc_stats_fops = {
+ .owner = THIS_MODULE,
.open = osc_rpc_stats_seq_open,
.read = seq_read,
.write = osc_rpc_stats_seq_write,
int lproc_osc_attach_seqstat(struct obd_device *dev)
{
- struct proc_dir_entry *entry;
- ENTRY;
-
- entry = create_proc_entry("rpc_stats", 0444, dev->obd_proc_entry);
- if (entry == NULL)
- RETURN(-ENOMEM);
- entry->proc_fops = &osc_rpc_stats_fops;
- entry->data = dev;
-
- RETURN(0);
+ return lprocfs_obd_seq_create(dev, "rpc_stats", 0444,
+ &osc_rpc_stats_fops, dev);
}
-
#endif /* LPROCFS */
-LPROCFS_INIT_VARS(osc,lprocfs_module_vars, lprocfs_obd_vars)
+LPROCFS_INIT_VARS(osc, lprocfs_module_vars, lprocfs_obd_vars)
git://git.whamcloud.com / fs / lustre-release.git / blobdiff