Commit fad70111 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'afs-fixes-20201016' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs

Pull afs updates from David Howells:
 "A collection of fixes to fix afs_cell struct refcounting, thereby
  fixing a slew of related syzbot bugs:

   - Fix the cell tree in the netns to use an rwsem rather than RCU.

     There seem to be some problems deriving from the use of RCU and a
     seqlock to walk the rbtree, but it's not entirely clear what since
     there are several different failures being seen.

     Changing things to use an rwsem instead makes it more robust. The
     extra performance derived from using RCU isn't necessary in this
     case since the only time we're looking up a cell is during mount or
     when cells are being manually added.

   - Fix the refcounting by splitting the usage counter into a memory
     refcount and an active users counter. The usage counter was doing
     double duty, keeping track of whether a cell is still in use and
     keeping track of when it needs to be destroyed - but this makes the
     clean up tricky. Separating these out simplifies the logic.

   - Fix purging a cell that has an alias. A cell alias pins the cell
     it's an alias of, but the alias is always later in the list. Trying
     to purge in a single pass causes rmmod to hang in such a case.

   - Fix cell removal. If a cell's manager is requeued whilst it's
     removing itself, the manager will run again and re-remove itself,
     causing problems in various places. Follow Hillf Danton's
     suggestion to insert a more terminal state that causes the manager
     to do nothing post-removal.

  In additional to the above, two other changes:

   - Add a tracepoint for the cell refcount and active users count. This
     helped with debugging the above and may be useful again in future.

   - Downgrade an assertion to a print when a still-active server is
     seen during purging. This was happening as a consequence of
     incomplete cell removal before the servers were cleaned up"

* tag 'afs-fixes-20201016' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs:
  afs: Don't assert on unpurgeable server records
  afs: Add tracing for cell refcount and active user count
  afs: Fix cell removal
  afs: Fix cell purging with aliases
  afs: Fix cell refcounting by splitting the usage counter
  afs: Fix rapid cell addition/removal by not using RCU on cells tree
parents 7a3daded 7530d3eb
This diff is collapsed.
...@@ -123,9 +123,9 @@ static int afs_probe_cell_name(struct dentry *dentry) ...@@ -123,9 +123,9 @@ static int afs_probe_cell_name(struct dentry *dentry)
len--; len--;
} }
cell = afs_lookup_cell_rcu(net, name, len); cell = afs_find_cell(net, name, len, afs_cell_trace_use_probe);
if (!IS_ERR(cell)) { if (!IS_ERR(cell)) {
afs_put_cell(net, cell); afs_unuse_cell(net, cell, afs_cell_trace_unuse_probe);
return 0; return 0;
} }
...@@ -179,7 +179,6 @@ static struct dentry *afs_lookup_atcell(struct dentry *dentry) ...@@ -179,7 +179,6 @@ static struct dentry *afs_lookup_atcell(struct dentry *dentry)
struct afs_cell *cell; struct afs_cell *cell;
struct afs_net *net = afs_d2net(dentry); struct afs_net *net = afs_d2net(dentry);
struct dentry *ret; struct dentry *ret;
unsigned int seq = 0;
char *name; char *name;
int len; int len;
...@@ -191,17 +190,13 @@ static struct dentry *afs_lookup_atcell(struct dentry *dentry) ...@@ -191,17 +190,13 @@ static struct dentry *afs_lookup_atcell(struct dentry *dentry)
if (!name) if (!name)
goto out_p; goto out_p;
rcu_read_lock(); down_read(&net->cells_lock);
do { cell = net->ws_cell;
read_seqbegin_or_lock(&net->cells_lock, &seq);
cell = rcu_dereference_raw(net->ws_cell);
if (cell) { if (cell) {
len = cell->name_len; len = cell->name_len;
memcpy(name, cell->name, len + 1); memcpy(name, cell->name, len + 1);
} }
} while (need_seqretry(&net->cells_lock, seq)); up_read(&net->cells_lock);
done_seqretry(&net->cells_lock, seq);
rcu_read_unlock();
ret = ERR_PTR(-ENOENT); ret = ERR_PTR(-ENOENT);
if (!cell) if (!cell)
......
...@@ -263,11 +263,11 @@ struct afs_net { ...@@ -263,11 +263,11 @@ struct afs_net {
/* Cell database */ /* Cell database */
struct rb_root cells; struct rb_root cells;
struct afs_cell __rcu *ws_cell; struct afs_cell *ws_cell;
struct work_struct cells_manager; struct work_struct cells_manager;
struct timer_list cells_timer; struct timer_list cells_timer;
atomic_t cells_outstanding; atomic_t cells_outstanding;
seqlock_t cells_lock; struct rw_semaphore cells_lock;
struct mutex cells_alias_lock; struct mutex cells_alias_lock;
struct mutex proc_cells_lock; struct mutex proc_cells_lock;
...@@ -326,6 +326,7 @@ enum afs_cell_state { ...@@ -326,6 +326,7 @@ enum afs_cell_state {
AFS_CELL_DEACTIVATING, AFS_CELL_DEACTIVATING,
AFS_CELL_INACTIVE, AFS_CELL_INACTIVE,
AFS_CELL_FAILED, AFS_CELL_FAILED,
AFS_CELL_REMOVED,
}; };
/* /*
...@@ -363,7 +364,8 @@ struct afs_cell { ...@@ -363,7 +364,8 @@ struct afs_cell {
#endif #endif
time64_t dns_expiry; /* Time AFSDB/SRV record expires */ time64_t dns_expiry; /* Time AFSDB/SRV record expires */
time64_t last_inactive; /* Time of last drop of usage count */ time64_t last_inactive; /* Time of last drop of usage count */
atomic_t usage; atomic_t ref; /* Struct refcount */
atomic_t active; /* Active usage counter */
unsigned long flags; unsigned long flags;
#define AFS_CELL_FL_NO_GC 0 /* The cell was added manually, don't auto-gc */ #define AFS_CELL_FL_NO_GC 0 /* The cell was added manually, don't auto-gc */
#define AFS_CELL_FL_DO_LOOKUP 1 /* DNS lookup requested */ #define AFS_CELL_FL_DO_LOOKUP 1 /* DNS lookup requested */
...@@ -373,6 +375,7 @@ struct afs_cell { ...@@ -373,6 +375,7 @@ struct afs_cell {
enum dns_record_source dns_source:8; /* Latest source of data from lookup */ enum dns_record_source dns_source:8; /* Latest source of data from lookup */
enum dns_lookup_status dns_status:8; /* Latest status of data from lookup */ enum dns_lookup_status dns_status:8; /* Latest status of data from lookup */
unsigned int dns_lookup_count; /* Counter of DNS lookups */ unsigned int dns_lookup_count; /* Counter of DNS lookups */
unsigned int debug_id;
/* The volumes belonging to this cell */ /* The volumes belonging to this cell */
struct rb_root volumes; /* Tree of volumes on this server */ struct rb_root volumes; /* Tree of volumes on this server */
...@@ -917,11 +920,16 @@ static inline bool afs_cb_is_broken(unsigned int cb_break, ...@@ -917,11 +920,16 @@ static inline bool afs_cb_is_broken(unsigned int cb_break,
* cell.c * cell.c
*/ */
extern int afs_cell_init(struct afs_net *, const char *); extern int afs_cell_init(struct afs_net *, const char *);
extern struct afs_cell *afs_lookup_cell_rcu(struct afs_net *, const char *, unsigned); extern struct afs_cell *afs_find_cell(struct afs_net *, const char *, unsigned,
enum afs_cell_trace);
extern struct afs_cell *afs_lookup_cell(struct afs_net *, const char *, unsigned, extern struct afs_cell *afs_lookup_cell(struct afs_net *, const char *, unsigned,
const char *, bool); const char *, bool);
extern struct afs_cell *afs_get_cell(struct afs_cell *); extern struct afs_cell *afs_use_cell(struct afs_cell *, enum afs_cell_trace);
extern void afs_put_cell(struct afs_net *, struct afs_cell *); extern void afs_unuse_cell(struct afs_net *, struct afs_cell *, enum afs_cell_trace);
extern struct afs_cell *afs_get_cell(struct afs_cell *, enum afs_cell_trace);
extern void afs_see_cell(struct afs_cell *, enum afs_cell_trace);
extern void afs_put_cell(struct afs_cell *, enum afs_cell_trace);
extern void afs_queue_cell(struct afs_cell *, enum afs_cell_trace);
extern void afs_manage_cells(struct work_struct *); extern void afs_manage_cells(struct work_struct *);
extern void afs_cells_timer(struct timer_list *); extern void afs_cells_timer(struct timer_list *);
extern void __net_exit afs_cell_purge(struct afs_net *); extern void __net_exit afs_cell_purge(struct afs_net *);
......
...@@ -78,7 +78,7 @@ static int __net_init afs_net_init(struct net *net_ns) ...@@ -78,7 +78,7 @@ static int __net_init afs_net_init(struct net *net_ns)
mutex_init(&net->socket_mutex); mutex_init(&net->socket_mutex);
net->cells = RB_ROOT; net->cells = RB_ROOT;
seqlock_init(&net->cells_lock); init_rwsem(&net->cells_lock);
INIT_WORK(&net->cells_manager, afs_manage_cells); INIT_WORK(&net->cells_manager, afs_manage_cells);
timer_setup(&net->cells_timer, afs_cells_timer, 0); timer_setup(&net->cells_timer, afs_cells_timer, 0);
......
...@@ -88,7 +88,7 @@ static int afs_mntpt_set_params(struct fs_context *fc, struct dentry *mntpt) ...@@ -88,7 +88,7 @@ static int afs_mntpt_set_params(struct fs_context *fc, struct dentry *mntpt)
ctx->force = true; ctx->force = true;
} }
if (ctx->cell) { if (ctx->cell) {
afs_put_cell(ctx->net, ctx->cell); afs_unuse_cell(ctx->net, ctx->cell, afs_cell_trace_unuse_mntpt);
ctx->cell = NULL; ctx->cell = NULL;
} }
if (test_bit(AFS_VNODE_PSEUDODIR, &vnode->flags)) { if (test_bit(AFS_VNODE_PSEUDODIR, &vnode->flags)) {
...@@ -124,7 +124,7 @@ static int afs_mntpt_set_params(struct fs_context *fc, struct dentry *mntpt) ...@@ -124,7 +124,7 @@ static int afs_mntpt_set_params(struct fs_context *fc, struct dentry *mntpt)
char *buf; char *buf;
if (src_as->cell) if (src_as->cell)
ctx->cell = afs_get_cell(src_as->cell); ctx->cell = afs_use_cell(src_as->cell, afs_cell_trace_use_mntpt);
if (size < 2 || size > PAGE_SIZE - 1) if (size < 2 || size > PAGE_SIZE - 1)
return -EINVAL; return -EINVAL;
......
...@@ -38,7 +38,7 @@ static int afs_proc_cells_show(struct seq_file *m, void *v) ...@@ -38,7 +38,7 @@ static int afs_proc_cells_show(struct seq_file *m, void *v)
if (v == SEQ_START_TOKEN) { if (v == SEQ_START_TOKEN) {
/* display header on line 1 */ /* display header on line 1 */
seq_puts(m, "USE TTL SV ST NAME\n"); seq_puts(m, "USE ACT TTL SV ST NAME\n");
return 0; return 0;
} }
...@@ -46,10 +46,11 @@ static int afs_proc_cells_show(struct seq_file *m, void *v) ...@@ -46,10 +46,11 @@ static int afs_proc_cells_show(struct seq_file *m, void *v)
vllist = rcu_dereference(cell->vl_servers); vllist = rcu_dereference(cell->vl_servers);
/* display one cell per line on subsequent lines */ /* display one cell per line on subsequent lines */
seq_printf(m, "%3u %6lld %2u %2u %s\n", seq_printf(m, "%3u %3u %6lld %2u %2u %s\n",
atomic_read(&cell->usage), atomic_read(&cell->ref),
atomic_read(&cell->active),
cell->dns_expiry - ktime_get_real_seconds(), cell->dns_expiry - ktime_get_real_seconds(),
vllist->nr_servers, vllist ? vllist->nr_servers : 0,
cell->state, cell->state,
cell->name); cell->name);
return 0; return 0;
...@@ -128,7 +129,7 @@ static int afs_proc_cells_write(struct file *file, char *buf, size_t size) ...@@ -128,7 +129,7 @@ static int afs_proc_cells_write(struct file *file, char *buf, size_t size)
} }
if (test_and_set_bit(AFS_CELL_FL_NO_GC, &cell->flags)) if (test_and_set_bit(AFS_CELL_FL_NO_GC, &cell->flags))
afs_put_cell(net, cell); afs_unuse_cell(net, cell, afs_cell_trace_unuse_no_pin);
} else { } else {
goto inval; goto inval;
} }
...@@ -154,13 +155,11 @@ static int afs_proc_rootcell_show(struct seq_file *m, void *v) ...@@ -154,13 +155,11 @@ static int afs_proc_rootcell_show(struct seq_file *m, void *v)
struct afs_net *net; struct afs_net *net;
net = afs_seq2net_single(m); net = afs_seq2net_single(m);
if (rcu_access_pointer(net->ws_cell)) { down_read(&net->cells_lock);
rcu_read_lock(); cell = net->ws_cell;
cell = rcu_dereference(net->ws_cell);
if (cell) if (cell)
seq_printf(m, "%s\n", cell->name); seq_printf(m, "%s\n", cell->name);
rcu_read_unlock(); up_read(&net->cells_lock);
}
return 0; return 0;
} }
......
...@@ -550,7 +550,12 @@ void afs_manage_servers(struct work_struct *work) ...@@ -550,7 +550,12 @@ void afs_manage_servers(struct work_struct *work)
_debug("manage %pU %u", &server->uuid, active); _debug("manage %pU %u", &server->uuid, active);
ASSERTIFCMP(purging, active, ==, 0); if (purging) {
trace_afs_server(server, atomic_read(&server->ref),
active, afs_server_trace_purging);
if (active != 0)
pr_notice("Can't purge s=%08x\n", server->debug_id);
}
if (active == 0) { if (active == 0) {
time64_t expire_at = server->unuse_time; time64_t expire_at = server->unuse_time;
......
...@@ -294,7 +294,8 @@ static int afs_parse_source(struct fs_context *fc, struct fs_parameter *param) ...@@ -294,7 +294,8 @@ static int afs_parse_source(struct fs_context *fc, struct fs_parameter *param)
cellnamesz, cellnamesz, cellname ?: ""); cellnamesz, cellnamesz, cellname ?: "");
return PTR_ERR(cell); return PTR_ERR(cell);
} }
afs_put_cell(ctx->net, ctx->cell); afs_unuse_cell(ctx->net, ctx->cell, afs_cell_trace_unuse_parse);
afs_see_cell(cell, afs_cell_trace_see_source);
ctx->cell = cell; ctx->cell = cell;
} }
...@@ -389,8 +390,9 @@ static int afs_validate_fc(struct fs_context *fc) ...@@ -389,8 +390,9 @@ static int afs_validate_fc(struct fs_context *fc)
_debug("switch to alias"); _debug("switch to alias");
key_put(ctx->key); key_put(ctx->key);
ctx->key = NULL; ctx->key = NULL;
cell = afs_get_cell(ctx->cell->alias_of); cell = afs_use_cell(ctx->cell->alias_of,
afs_put_cell(ctx->net, ctx->cell); afs_cell_trace_use_fc_alias);
afs_unuse_cell(ctx->net, ctx->cell, afs_cell_trace_unuse_fc);
ctx->cell = cell; ctx->cell = cell;
goto reget_key; goto reget_key;
} }
...@@ -507,7 +509,7 @@ static struct afs_super_info *afs_alloc_sbi(struct fs_context *fc) ...@@ -507,7 +509,7 @@ static struct afs_super_info *afs_alloc_sbi(struct fs_context *fc)
if (ctx->dyn_root) { if (ctx->dyn_root) {
as->dyn_root = true; as->dyn_root = true;
} else { } else {
as->cell = afs_get_cell(ctx->cell); as->cell = afs_use_cell(ctx->cell, afs_cell_trace_use_sbi);
as->volume = afs_get_volume(ctx->volume, as->volume = afs_get_volume(ctx->volume,
afs_volume_trace_get_alloc_sbi); afs_volume_trace_get_alloc_sbi);
} }
...@@ -520,7 +522,7 @@ static void afs_destroy_sbi(struct afs_super_info *as) ...@@ -520,7 +522,7 @@ static void afs_destroy_sbi(struct afs_super_info *as)
if (as) { if (as) {
struct afs_net *net = afs_net(as->net_ns); struct afs_net *net = afs_net(as->net_ns);
afs_put_volume(net, as->volume, afs_volume_trace_put_destroy_sbi); afs_put_volume(net, as->volume, afs_volume_trace_put_destroy_sbi);
afs_put_cell(net, as->cell); afs_unuse_cell(net, as->cell, afs_cell_trace_unuse_sbi);
put_net(as->net_ns); put_net(as->net_ns);
kfree(as); kfree(as);
} }
...@@ -606,7 +608,7 @@ static void afs_free_fc(struct fs_context *fc) ...@@ -606,7 +608,7 @@ static void afs_free_fc(struct fs_context *fc)
afs_destroy_sbi(fc->s_fs_info); afs_destroy_sbi(fc->s_fs_info);
afs_put_volume(ctx->net, ctx->volume, afs_volume_trace_put_free_fc); afs_put_volume(ctx->net, ctx->volume, afs_volume_trace_put_free_fc);
afs_put_cell(ctx->net, ctx->cell); afs_unuse_cell(ctx->net, ctx->cell, afs_cell_trace_unuse_fc);
key_put(ctx->key); key_put(ctx->key);
kfree(ctx); kfree(ctx);
} }
...@@ -633,9 +635,7 @@ static int afs_init_fs_context(struct fs_context *fc) ...@@ -633,9 +635,7 @@ static int afs_init_fs_context(struct fs_context *fc)
ctx->net = afs_net(fc->net_ns); ctx->net = afs_net(fc->net_ns);
/* Default to the workstation cell. */ /* Default to the workstation cell. */
rcu_read_lock(); cell = afs_find_cell(ctx->net, NULL, 0, afs_cell_trace_use_fc);
cell = afs_lookup_cell_rcu(ctx->net, NULL, 0);
rcu_read_unlock();
if (IS_ERR(cell)) if (IS_ERR(cell))
cell = NULL; cell = NULL;
ctx->cell = cell; ctx->cell = cell;
......
...@@ -177,7 +177,7 @@ static int afs_compare_cell_roots(struct afs_cell *cell) ...@@ -177,7 +177,7 @@ static int afs_compare_cell_roots(struct afs_cell *cell)
is_alias: is_alias:
rcu_read_unlock(); rcu_read_unlock();
cell->alias_of = afs_get_cell(p); cell->alias_of = afs_use_cell(p, afs_cell_trace_use_alias);
return 1; return 1;
} }
...@@ -247,18 +247,18 @@ static int afs_query_for_alias(struct afs_cell *cell, struct key *key) ...@@ -247,18 +247,18 @@ static int afs_query_for_alias(struct afs_cell *cell, struct key *key)
continue; continue;
if (p->root_volume) if (p->root_volume)
continue; /* Ignore cells that have a root.cell volume. */ continue; /* Ignore cells that have a root.cell volume. */
afs_get_cell(p); afs_use_cell(p, afs_cell_trace_use_check_alias);
mutex_unlock(&cell->net->proc_cells_lock); mutex_unlock(&cell->net->proc_cells_lock);
if (afs_query_for_alias_one(cell, key, p) != 0) if (afs_query_for_alias_one(cell, key, p) != 0)
goto is_alias; goto is_alias;
if (mutex_lock_interruptible(&cell->net->proc_cells_lock) < 0) { if (mutex_lock_interruptible(&cell->net->proc_cells_lock) < 0) {
afs_put_cell(cell->net, p); afs_unuse_cell(cell->net, p, afs_cell_trace_unuse_check_alias);
return -ERESTARTSYS; return -ERESTARTSYS;
} }
afs_put_cell(cell->net, p); afs_unuse_cell(cell->net, p, afs_cell_trace_unuse_check_alias);
} }
mutex_unlock(&cell->net->proc_cells_lock); mutex_unlock(&cell->net->proc_cells_lock);
......
...@@ -45,7 +45,7 @@ static bool afs_start_vl_iteration(struct afs_vl_cursor *vc) ...@@ -45,7 +45,7 @@ static bool afs_start_vl_iteration(struct afs_vl_cursor *vc)
cell->dns_expiry <= ktime_get_real_seconds()) { cell->dns_expiry <= ktime_get_real_seconds()) {
dns_lookup_count = smp_load_acquire(&cell->dns_lookup_count); dns_lookup_count = smp_load_acquire(&cell->dns_lookup_count);
set_bit(AFS_CELL_FL_DO_LOOKUP, &cell->flags); set_bit(AFS_CELL_FL_DO_LOOKUP, &cell->flags);
queue_work(afs_wq, &cell->manager); afs_queue_cell(cell, afs_cell_trace_get_queue_dns);
if (cell->dns_source == DNS_RECORD_UNAVAILABLE) { if (cell->dns_source == DNS_RECORD_UNAVAILABLE) {
if (wait_var_event_interruptible( if (wait_var_event_interruptible(
......
...@@ -83,7 +83,7 @@ static struct afs_volume *afs_alloc_volume(struct afs_fs_context *params, ...@@ -83,7 +83,7 @@ static struct afs_volume *afs_alloc_volume(struct afs_fs_context *params,
volume->vid = vldb->vid[params->type]; volume->vid = vldb->vid[params->type];
volume->update_at = ktime_get_real_seconds() + afs_volume_record_life; volume->update_at = ktime_get_real_seconds() + afs_volume_record_life;
volume->cell = afs_get_cell(params->cell); volume->cell = afs_get_cell(params->cell, afs_cell_trace_get_vol);
volume->type = params->type; volume->type = params->type;
volume->type_force = params->force; volume->type_force = params->force;
volume->name_len = vldb->name_len; volume->name_len = vldb->name_len;
...@@ -106,7 +106,7 @@ static struct afs_volume *afs_alloc_volume(struct afs_fs_context *params, ...@@ -106,7 +106,7 @@ static struct afs_volume *afs_alloc_volume(struct afs_fs_context *params,
return volume; return volume;
error_1: error_1:
afs_put_cell(params->net, volume->cell); afs_put_cell(volume->cell, afs_cell_trace_put_vol);
kfree(volume); kfree(volume);
error_0: error_0:
return ERR_PTR(ret); return ERR_PTR(ret);
...@@ -228,7 +228,7 @@ static void afs_destroy_volume(struct afs_net *net, struct afs_volume *volume) ...@@ -228,7 +228,7 @@ static void afs_destroy_volume(struct afs_net *net, struct afs_volume *volume)
afs_remove_volume_from_cell(volume); afs_remove_volume_from_cell(volume);
afs_put_serverlist(net, rcu_access_pointer(volume->servers)); afs_put_serverlist(net, rcu_access_pointer(volume->servers));
afs_put_cell(net, volume->cell); afs_put_cell(volume->cell, afs_cell_trace_put_vol);
trace_afs_volume(volume->vid, atomic_read(&volume->usage), trace_afs_volume(volume->vid, atomic_read(&volume->usage),
afs_volume_trace_free); afs_volume_trace_free);
kfree_rcu(volume, rcu); kfree_rcu(volume, rcu);
......
...@@ -40,6 +40,7 @@ enum afs_server_trace { ...@@ -40,6 +40,7 @@ enum afs_server_trace {
afs_server_trace_get_new_cbi, afs_server_trace_get_new_cbi,
afs_server_trace_get_probe, afs_server_trace_get_probe,
afs_server_trace_give_up_cb, afs_server_trace_give_up_cb,
afs_server_trace_purging,
afs_server_trace_put_call, afs_server_trace_put_call,
afs_server_trace_put_cbi, afs_server_trace_put_cbi,
afs_server_trace_put_find_rsq, afs_server_trace_put_find_rsq,
...@@ -50,6 +51,7 @@ enum afs_server_trace { ...@@ -50,6 +51,7 @@ enum afs_server_trace {
afs_server_trace_update, afs_server_trace_update,
}; };
enum afs_volume_trace { enum afs_volume_trace {
afs_volume_trace_alloc, afs_volume_trace_alloc,
afs_volume_trace_free, afs_volume_trace_free,
...@@ -67,6 +69,46 @@ enum afs_volume_trace { ...@@ -67,6 +69,46 @@ enum afs_volume_trace {
afs_volume_trace_remove, afs_volume_trace_remove,
}; };
enum afs_cell_trace {
afs_cell_trace_alloc,
afs_cell_trace_free,
afs_cell_trace_get_queue_dns,
afs_cell_trace_get_queue_manage,
afs_cell_trace_get_queue_new,
afs_cell_trace_get_vol,
afs_cell_trace_insert,
afs_cell_trace_manage,
afs_cell_trace_put_candidate,
afs_cell_trace_put_destroy,
afs_cell_trace_put_queue_fail,
afs_cell_trace_put_queue_work,
afs_cell_trace_put_vol,
afs_cell_trace_see_source,
afs_cell_trace_see_ws,
afs_cell_trace_unuse_alias,
afs_cell_trace_unuse_check_alias,
afs_cell_trace_unuse_delete,
afs_cell_trace_unuse_fc,
afs_cell_trace_unuse_lookup,
afs_cell_trace_unuse_mntpt,
afs_cell_trace_unuse_no_pin,
afs_cell_trace_unuse_parse,
afs_cell_trace_unuse_pin,
afs_cell_trace_unuse_probe,
afs_cell_trace_unuse_sbi,
afs_cell_trace_unuse_ws,
afs_cell_trace_use_alias,
afs_cell_trace_use_check_alias,
afs_cell_trace_use_fc,
afs_cell_trace_use_fc_alias,
afs_cell_trace_use_lookup,
afs_cell_trace_use_mntpt,
afs_cell_trace_use_pin,
afs_cell_trace_use_probe,
afs_cell_trace_use_sbi,
afs_cell_trace_wait,
};
enum afs_fs_operation { enum afs_fs_operation {
afs_FS_FetchData = 130, /* AFS Fetch file data */ afs_FS_FetchData = 130, /* AFS Fetch file data */
afs_FS_FetchACL = 131, /* AFS Fetch file ACL */ afs_FS_FetchACL = 131, /* AFS Fetch file ACL */
...@@ -270,6 +312,7 @@ enum afs_cb_break_reason { ...@@ -270,6 +312,7 @@ enum afs_cb_break_reason {
EM(afs_server_trace_get_new_cbi, "GET cbi ") \ EM(afs_server_trace_get_new_cbi, "GET cbi ") \
EM(afs_server_trace_get_probe, "GET probe") \ EM(afs_server_trace_get_probe, "GET probe") \
EM(afs_server_trace_give_up_cb, "giveup-cb") \ EM(afs_server_trace_give_up_cb, "giveup-cb") \
EM(afs_server_trace_purging, "PURGE ") \
EM(afs_server_trace_put_call, "PUT call ") \ EM(afs_server_trace_put_call, "PUT call ") \
EM(afs_server_trace_put_cbi, "PUT cbi ") \ EM(afs_server_trace_put_cbi, "PUT cbi ") \
EM(afs_server_trace_put_find_rsq, "PUT f-rsq") \ EM(afs_server_trace_put_find_rsq, "PUT f-rsq") \
...@@ -295,6 +338,44 @@ enum afs_cb_break_reason { ...@@ -295,6 +338,44 @@ enum afs_cb_break_reason {
EM(afs_volume_trace_put_validate_fc, "PUT fc-validat") \ EM(afs_volume_trace_put_validate_fc, "PUT fc-validat") \
E_(afs_volume_trace_remove, "REMOVE ") E_(afs_volume_trace_remove, "REMOVE ")
#define afs_cell_traces \
EM(afs_cell_trace_alloc, "ALLOC ") \
EM(afs_cell_trace_free, "FREE ") \
EM(afs_cell_trace_get_queue_dns, "GET q-dns ") \
EM(afs_cell_trace_get_queue_manage, "GET q-mng ") \
EM(afs_cell_trace_get_queue_new, "GET q-new ") \
EM(afs_cell_trace_get_vol, "GET vol ") \
EM(afs_cell_trace_insert, "INSERT ") \
EM(afs_cell_trace_manage, "MANAGE ") \
EM(afs_cell_trace_put_candidate, "PUT candid") \
EM(afs_cell_trace_put_destroy, "PUT destry") \
EM(afs_cell_trace_put_queue_work, "PUT q-work") \
EM(afs_cell_trace_put_queue_fail, "PUT q-fail") \
EM(afs_cell_trace_put_vol, "PUT vol ") \
EM(afs_cell_trace_see_source, "SEE source") \
EM(afs_cell_trace_see_ws, "SEE ws ") \
EM(afs_cell_trace_unuse_alias, "UNU alias ") \
EM(afs_cell_trace_unuse_check_alias, "UNU chk-al") \
EM(afs_cell_trace_unuse_delete, "UNU delete") \
EM(afs_cell_trace_unuse_fc, "UNU fc ") \
EM(afs_cell_trace_unuse_lookup, "UNU lookup") \
EM(afs_cell_trace_unuse_mntpt, "UNU mntpt ") \
EM(afs_cell_trace_unuse_parse, "UNU parse ") \
EM(afs_cell_trace_unuse_pin, "UNU pin ") \
EM(afs_cell_trace_unuse_probe, "UNU probe ") \
EM(afs_cell_trace_unuse_sbi, "UNU sbi ") \
EM(afs_cell_trace_unuse_ws, "UNU ws ") \
EM(afs_cell_trace_use_alias, "USE alias ") \
EM(afs_cell_trace_use_check_alias, "USE chk-al") \
EM(afs_cell_trace_use_fc, "USE fc ") \
EM(afs_cell_trace_use_fc_alias, "USE fc-al ") \
EM(afs_cell_trace_use_lookup, "USE lookup") \
EM(afs_cell_trace_use_mntpt, "USE mntpt ") \
EM(afs_cell_trace_use_pin, "USE pin ") \
EM(afs_cell_trace_use_probe, "USE probe ") \
EM(afs_cell_trace_use_sbi, "USE sbi ") \
E_(afs_cell_trace_wait, "WAIT ")
#define afs_fs_operations \ #define afs_fs_operations \
EM(afs_FS_FetchData, "FS.FetchData") \ EM(afs_FS_FetchData, "FS.FetchData") \
EM(afs_FS_FetchStatus, "FS.FetchStatus") \ EM(afs_FS_FetchStatus, "FS.FetchStatus") \
...@@ -483,6 +564,7 @@ enum afs_cb_break_reason { ...@@ -483,6 +564,7 @@ enum afs_cb_break_reason {
afs_call_traces; afs_call_traces;
afs_server_traces; afs_server_traces;
afs_cell_traces;
afs_fs_operations; afs_fs_operations;
afs_vl_operations; afs_vl_operations;
afs_edit_dir_ops; afs_edit_dir_ops;
...@@ -1358,6 +1440,33 @@ TRACE_EVENT(afs_volume, ...@@ -1358,6 +1440,33 @@ TRACE_EVENT(afs_volume,
__entry->ref) __entry->ref)
); );
TRACE_EVENT(afs_cell,
TP_PROTO(unsigned int cell_debug_id, int usage, int active,
enum afs_cell_trace reason),
TP_ARGS(cell_debug_id, usage, active, reason),
TP_STRUCT__entry(
__field(unsigned int, cell )
__field(int, usage )
__field(int, active )
__field(int, reason )
),
TP_fast_assign(
__entry->cell = cell_debug_id;
__entry->usage = usage;
__entry->active = active;
__entry->reason = reason;
),
TP_printk("L=%08x %s u=%d a=%d",
__entry->cell,
__print_symbolic(__entry->reason, afs_cell_traces),
__entry->usage,
__entry->active)
);
#endif /* _TRACE_AFS_H */ #endif /* _TRACE_AFS_H */
/* This part must be outside protection */ /* This part must be outside protection */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment