mirrors/scoutfs
1
0
Fork 0
mirror of https://github.com/versity/scoutfs.git synced 2025-12-23 05:25:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

(wip) add some quick lock server stats

Browse Source
This commit is contained in:
Zach Brown
2021-05-25 16:27:43 -07:00
parent f2c9f66385
commit 9cdfd2cdf8
2 changed files with 37 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
kmod/src/format.h
View File

@@ -909,6 +909,7 @@ enum scoutfs_lock_trace {
SLT_INVALIDATE, SLT_INVALIDATE,
SLT_REQUEST, SLT_REQUEST,
SLT_RESPONSE, SLT_RESPONSE,
SLT_NR,
}; };
/* /*

37
kmod/src/lock_server.c
View File

@@ -78,6 +78,8 @@ struct lock_server_info {
struct scoutfs_tseq_tree tseq_tree; struct scoutfs_tseq_tree tseq_tree;
struct dentry *tseq_dentry; struct dentry *tseq_dentry;
struct scoutfs_tseq_tree stats_tseq_tree;
struct dentry *stats_tseq_dentry;
struct scoutfs_alloc *alloc; struct scoutfs_alloc *alloc;
struct scoutfs_block_writer *wri; struct scoutfs_block_writer *wri;
@@ -109,6 +111,9 @@ struct server_lock_node {
struct list_head granted; struct list_head granted;
struct list_head requested; struct list_head requested;
struct list_head invalidated; struct list_head invalidated;
struct scoutfs_tseq_entry stats_tseq_entry;
u64 stats[SLT_NR];
}; };
/* /*
@@ -298,6 +303,8 @@ static struct server_lock_node *alloc_server_lock(struct lock_server_info *inf,
snode = get_server_lock(inf, key, ins, false); snode = get_server_lock(inf, key, ins, false);
if (snode != ins) if (snode != ins)
kfree(ins); kfree(ins);
else
scoutfs_tseq_add(&inf->stats_tseq_tree, &snode->stats_tseq_entry);
} }
} }
@@ -327,8 +334,10 @@ static void put_server_lock(struct lock_server_info *inf,
mutex_unlock(&snode->mutex); mutex_unlock(&snode->mutex);
if (should_free) if (should_free) {
scoutfs_tseq_del(&inf->stats_tseq_tree, &snode->stats_tseq_entry);
kfree(snode); kfree(snode);
}
} }
static struct client_lock_entry *find_entry(struct server_lock_node *snode, static struct client_lock_entry *find_entry(struct server_lock_node *snode,
@@ -390,6 +399,8 @@ int scoutfs_lock_server_request(struct super_block *sb, u64 rid,
goto out; goto out;
} }
snode->stats[SLT_REQUEST]++;
clent->snode = snode; clent->snode = snode;
add_client_entry(snode, &snode->requested, clent); add_client_entry(snode, &snode->requested, clent);
scoutfs_tseq_add(&inf->tseq_tree, &clent->tseq_entry); scoutfs_tseq_add(&inf->tseq_tree, &clent->tseq_entry);
@@ -430,6 +441,8 @@ int scoutfs_lock_server_response(struct super_block *sb, u64 rid,
goto out; goto out;
} }
snode->stats[SLT_RESPONSE]++;
clent = find_entry(snode, &snode->invalidated, rid); clent = find_entry(snode, &snode->invalidated, rid);
if (!clent) { if (!clent) {
put_server_lock(inf, snode); put_server_lock(inf, snode);
@@ -510,6 +523,7 @@ static int process_waiting_requests(struct super_block *sb,
trace_scoutfs_lock_message(sb, SLT_SERVER, trace_scoutfs_lock_message(sb, SLT_SERVER,
SLT_INVALIDATE, SLT_REQUEST, SLT_INVALIDATE, SLT_REQUEST,
gr->rid, 0, &nl); gr->rid, 0, &nl);
snode->stats[SLT_INVALIDATE]++;
add_client_entry(snode, &snode->invalidated, gr); add_client_entry(snode, &snode->invalidated, gr);
} }
@@ -544,6 +558,7 @@ static int process_waiting_requests(struct super_block *sb,
trace_scoutfs_lock_message(sb, SLT_SERVER, SLT_GRANT, trace_scoutfs_lock_message(sb, SLT_SERVER, SLT_GRANT,
SLT_RESPONSE, req->rid, SLT_RESPONSE, req->rid,
req->net_id, &nl); req->net_id, &nl);
snode->stats[SLT_GRANT]++;
/* don't track null client locks, track all else */ /* don't track null client locks, track all else */
if (req->mode == SCOUTFS_LOCK_NULL) if (req->mode == SCOUTFS_LOCK_NULL)
@@ -794,6 +809,16 @@ static void lock_server_tseq_show(struct seq_file *m,
clent->net_id); clent->net_id);
} }
static void stats_tseq_show(struct seq_file *m, struct scoutfs_tseq_entry *ent)
{
struct server_lock_node *snode = container_of(ent, struct server_lock_node,
stats_tseq_entry);
seq_printf(m, SK_FMT" req %llu inv %llu rsp %llu gr %llu\n",
SK_ARG(&snode->key), snode->stats[SLT_REQUEST], snode->stats[SLT_INVALIDATE],
snode->stats[SLT_RESPONSE], snode->stats[SLT_GRANT]);
}
/* /*
* Setup the lock server. This is called before networking can deliver * Setup the lock server. This is called before networking can deliver
* requests. * requests.
@@ -813,6 +838,7 @@ int scoutfs_lock_server_setup(struct super_block *sb,
spin_lock_init(&inf->lock); spin_lock_init(&inf->lock);
inf->locks_root = RB_ROOT; inf->locks_root = RB_ROOT;
scoutfs_tseq_tree_init(&inf->tseq_tree, lock_server_tseq_show); scoutfs_tseq_tree_init(&inf->tseq_tree, lock_server_tseq_show);
scoutfs_tseq_tree_init(&inf->stats_tseq_tree, stats_tseq_show);
inf->alloc = alloc; inf->alloc = alloc;
inf->wri = wri; inf->wri = wri;
atomic64_set(&inf->write_version, max_vers); /* inc_return gives +1 */ atomic64_set(&inf->write_version, max_vers); /* inc_return gives +1 */
@@ -824,6 +850,14 @@ int scoutfs_lock_server_setup(struct super_block *sb,
return -ENOMEM; return -ENOMEM;
} }
inf->stats_tseq_dentry = scoutfs_tseq_create("tmp_lock_stats", sbi->debug_root,
&inf->stats_tseq_tree);
if (!inf->stats_tseq_dentry) {
debugfs_remove(inf->tseq_dentry);
kfree(inf);
return -ENOMEM;
}
sbi->lock_server_info = inf; sbi->lock_server_info = inf;
return 0; return 0;
@@ -845,6 +879,7 @@ void scoutfs_lock_server_destroy(struct super_block *sb)
if (inf) { if (inf) {
debugfs_remove(inf->tseq_dentry); debugfs_remove(inf->tseq_dentry);
debugfs_remove(inf->stats_tseq_dentry);
rbtree_postorder_for_each_entry_safe(snode, stmp, rbtree_postorder_for_each_entry_safe(snode, stmp,
&inf->locks_root, node) { &inf->locks_root, node) {