mirror of
https://github.com/xen-project/xen.git
synced 2026-10-29 18:50:05 +01:00
rcu: fix rcu_lock_domain()
rcu_lock_domain() misuses the domain structure as rcu lock, which is working only as long as rcu_read_lock() isn't evaluating the lock. Fix that by adding a rcu lock to struct domain and use that for rcu_lock_domain(). Signed-off-by: Juergen Gross <jgross@suse.com> Reviewed-by: Jan Beulich <jbeulich@suse.com>
This commit is contained in:
1 parent
53ddfc80a8
commit
a9b6dacf88
3 files changed
+6
-2
No files matched your search
@@ -398,6 +398,7 @@ struct domain *domain_create(domid_t domid,
|
||||
goto fail;
|
||||
|
||||
atomic_set(&d->refcnt, 1);
|
||||
RCU_READ_LOCK_INIT(&d->rcu_lock);
|
||||
spin_lock_init_prof(d, domain_lock);
|
||||
spin_lock_init_prof(d, page_alloc_lock);
|
||||
spin_lock_init(&d->hypercall_deadlock_mutex);
|
||||
|
||||
@@ -65,6 +65,7 @@ int rcu_needs_cpu(int cpu);
|
||||
struct _rcu_read_lock {};
|
||||
typedef struct _rcu_read_lock rcu_read_lock_t;
|
||||
#define DEFINE_RCU_READ_LOCK(x) rcu_read_lock_t x
|
||||
#define RCU_READ_LOCK_INIT(x)
|
||||
|
||||
/**
|
||||
* rcu_read_lock - mark the beginning of an RCU read-side critical section.
|
||||
|
||||
@@ -323,6 +323,8 @@ struct domain
|
||||
|
||||
shared_info_t *shared_info; /* shared data area */
|
||||
|
||||
rcu_read_lock_t rcu_lock;
|
||||
|
||||
spinlock_t domain_lock;
|
||||
|
||||
spinlock_t page_alloc_lock; /* protects all the following fields */
|
||||
@@ -609,13 +611,13 @@ int rcu_lock_live_remote_domain_by_id(domid_t dom, struct domain **d);
|
||||
static inline void rcu_unlock_domain(struct domain *d)
|
||||
{
|
||||
if ( d != current->domain )
|
||||
rcu_read_unlock(d);
|
||||
rcu_read_unlock(&d->rcu_lock);
|
||||
}
|
||||
|
||||
static inline struct domain *rcu_lock_domain(struct domain *d)
|
||||
{
|
||||
if ( d != current->domain )
|
||||
rcu_read_lock(d);
|
||||
rcu_read_lock(&d->rcu_lock);
|
||||
return d;
|
||||
}
|
||||
|
||||
|
||||