Commit 1588def9 authored by David Howells's avatar David Howells

afs: Mark afs_net::ws_cell as __rcu and set using rcu functions

The afs_net::ws_cell member is sometimes used under RCU conditions from
within an seq-readlock.  It isn't, however, marked __rcu and it isn't set
using the proper RCU barrier-imposing functions.

Fix this by annotating it with __rcu and using appropriate barriers to
make sure accesses are correctly ordered.

Without this, the code can produce the following warning:

>> fs/afs/proc.c:151:24: sparse: incompatible types in comparison expression (different address spaces)

Fixes: f044c884 ("afs: Lay the groundwork for supporting network namespaces")
Reported-by: default avatarkbuild test robot <lkp@intel.com>
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
parent c875c76a
...@@ -341,8 +341,8 @@ int afs_cell_init(struct afs_net *net, const char *rootcell) ...@@ -341,8 +341,8 @@ int afs_cell_init(struct afs_net *net, const char *rootcell)
/* install the new cell */ /* install the new cell */
write_seqlock(&net->cells_lock); write_seqlock(&net->cells_lock);
old_root = net->ws_cell; old_root = rcu_access_pointer(net->ws_cell);
net->ws_cell = new_root; rcu_assign_pointer(net->ws_cell, new_root);
write_sequnlock(&net->cells_lock); write_sequnlock(&net->cells_lock);
afs_put_cell(net, old_root); afs_put_cell(net, old_root);
...@@ -755,8 +755,8 @@ void afs_cell_purge(struct afs_net *net) ...@@ -755,8 +755,8 @@ void afs_cell_purge(struct afs_net *net)
_enter(""); _enter("");
write_seqlock(&net->cells_lock); write_seqlock(&net->cells_lock);
ws = net->ws_cell; ws = rcu_access_pointer(net->ws_cell);
net->ws_cell = NULL; RCU_INIT_POINTER(net->ws_cell, NULL);
write_sequnlock(&net->cells_lock); write_sequnlock(&net->cells_lock);
afs_put_cell(net, ws); afs_put_cell(net, ws);
......
...@@ -231,7 +231,7 @@ struct afs_net { ...@@ -231,7 +231,7 @@ struct afs_net {
/* Cell database */ /* Cell database */
struct rb_root cells; struct rb_root cells;
struct afs_cell *ws_cell; struct afs_cell __rcu *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;
......
...@@ -173,7 +173,7 @@ static ssize_t afs_proc_rootcell_read(struct file *file, char __user *buf, ...@@ -173,7 +173,7 @@ static ssize_t afs_proc_rootcell_read(struct file *file, char __user *buf,
if (*_pos > 0) if (*_pos > 0)
return 0; return 0;
if (!net->ws_cell) if (!rcu_access_pointer(net->ws_cell))
return 0; return 0;
rcu_read_lock(); rcu_read_lock();
......
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