diff options
author | Keir Fraser <keir.fraser@citrix.com> | 2008-10-02 11:39:36 +0100 |
---|---|---|
committer | Keir Fraser <keir.fraser@citrix.com> | 2008-10-02 11:39:36 +0100 |
commit | 4a93b11b6753ae0e0afb93f7307b32543447253b (patch) | |
tree | db7770d40f9f05b0b12b12e5cb81707e86976e70 /xen | |
parent | 668349f38be79d2bd197ff968d728090f6d14faa (diff) | |
download | xen-4a93b11b6753ae0e0afb93f7307b32543447253b.tar.gz xen-4a93b11b6753ae0e0afb93f7307b32543447253b.tar.bz2 xen-4a93b11b6753ae0e0afb93f7307b32543447253b.zip |
Eliminate code duplication with rcu_lock_domain_by_id().
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Diffstat (limited to 'xen')
-rw-r--r-- | xen/arch/x86/hvm/hvm.c | 69 | ||||
-rw-r--r-- | xen/arch/x86/mm.c | 53 | ||||
-rw-r--r-- | xen/common/domain.c | 19 | ||||
-rw-r--r-- | xen/common/event_channel.c | 51 | ||||
-rw-r--r-- | xen/common/memory.c | 35 | ||||
-rw-r--r-- | xen/include/xen/sched.h | 7 |
6 files changed, 64 insertions, 170 deletions
diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 5d9428ca39..6c6b0db13b 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -2339,21 +2339,9 @@ long do_hvm_op(unsigned long op, XEN_GUEST_HANDLE(void) arg) if ( a.index >= HVM_NR_PARAMS ) return -EINVAL; - if ( a.domid == DOMID_SELF ) - { - d = rcu_lock_current_domain(); - } - else - { - if ( (d = rcu_lock_domain_by_id(a.domid)) == NULL ) - return -ESRCH; - if ( !IS_PRIV_FOR(current->domain, d) ) - { - rc = -EPERM; - goto param_fail; - } - } - + rc = rcu_lock_target_domain_by_id(a.domid, &d); + if ( rc != 0 ) + return rc; rc = -EINVAL; if ( !is_hvm_domain(d) ) @@ -2521,20 +2509,9 @@ long do_hvm_op(unsigned long op, XEN_GUEST_HANDLE(void) arg) if ( copy_from_guest(&a, arg, 1) ) return -EFAULT; - if ( a.domid == DOMID_SELF ) - { - d = rcu_lock_current_domain(); - } - else - { - if ( (d = rcu_lock_domain_by_id(a.domid)) == NULL ) - return -ESRCH; - if ( !IS_PRIV_FOR(current->domain, d) ) - { - rc = -EPERM; - goto param_fail2; - } - } + rc = rcu_lock_target_domain_by_id(a.domid, &d); + if ( rc != 0 ) + return rc; rc = -EINVAL; if ( !is_hvm_domain(d) ) @@ -2570,20 +2547,9 @@ long do_hvm_op(unsigned long op, XEN_GUEST_HANDLE(void) arg) if ( copy_from_guest(&a, arg, 1) ) return -EFAULT; - if ( a.domid == DOMID_SELF ) - { - d = rcu_lock_current_domain(); - } - else - { - if ( (d = rcu_lock_domain_by_id(a.domid)) == NULL ) - return -ESRCH; - if ( !IS_PRIV_FOR(current->domain, d) ) - { - rc = -EPERM; - goto param_fail3; - } - } + rc = rcu_lock_target_domain_by_id(a.domid, &d); + if ( rc != 0 ) + return rc; rc = -EINVAL; if ( !is_hvm_domain(d) ) @@ -2637,20 +2603,9 @@ long do_hvm_op(unsigned long op, XEN_GUEST_HANDLE(void) arg) if ( copy_from_guest(&a, arg, 1) ) return -EFAULT; - if ( a.domid == DOMID_SELF ) - { - d = rcu_lock_current_domain(); - } - else - { - if ( (d = rcu_lock_domain_by_id(a.domid)) == NULL ) - return -ESRCH; - if ( !IS_PRIV_FOR(current->domain, d) ) - { - rc = -EPERM; - goto param_fail4; - } - } + rc = rcu_lock_target_domain_by_id(a.domid, &d); + if ( rc != 0 ) + return rc; rc = -EINVAL; if ( !is_hvm_domain(d) ) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index b198355f0f..51b3537ea4 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -3550,6 +3550,8 @@ DEFINE_XEN_GUEST_HANDLE(e820entry_t); long arch_memory_op(int op, XEN_GUEST_HANDLE(void) arg) { struct page_info *page = NULL; + int rc; + switch ( op ) { case XENMEM_add_to_physmap: @@ -3561,20 +3563,9 @@ long arch_memory_op(int op, XEN_GUEST_HANDLE(void) arg) if ( copy_from_guest(&xatp, arg, 1) ) return -EFAULT; - if ( xatp.domid == DOMID_SELF ) - { - d = rcu_lock_current_domain(); - } - else - { - if ( (d = rcu_lock_domain_by_id(xatp.domid)) == NULL ) - return -ESRCH; - if ( !IS_PRIV_FOR(current->domain, d) ) - { - rcu_unlock_domain(d); - return -EPERM; - } - } + rc = rcu_lock_target_domain_by_id(xatp.domid, &d); + if ( rc != 0 ) + return rc; if ( xsm_add_to_physmap(current->domain, d) ) { @@ -3661,20 +3652,9 @@ long arch_memory_op(int op, XEN_GUEST_HANDLE(void) arg) if ( copy_from_guest(&xrfp, arg, 1) ) return -EFAULT; - if ( xrfp.domid == DOMID_SELF ) - { - d = rcu_lock_current_domain(); - } - else - { - if ( (d = rcu_lock_domain_by_id(xrfp.domid)) == NULL ) - return -ESRCH; - if ( !IS_PRIV_FOR(current->domain, d) ) - { - rcu_unlock_domain(d); - return -EPERM; - } - } + rc = rcu_lock_target_domain_by_id(xrfp.domid, &d); + if ( rc != 0 ) + return rc; if ( xsm_remove_from_physmap(current->domain, d) ) { @@ -3708,20 +3688,9 @@ long arch_memory_op(int op, XEN_GUEST_HANDLE(void) arg) if ( fmap.map.nr_entries > ARRAY_SIZE(d->arch.e820) ) return -EINVAL; - if ( fmap.domid == DOMID_SELF ) - { - d = rcu_lock_current_domain(); - } - else - { - if ( (d = rcu_lock_domain_by_id(fmap.domid)) == NULL ) - return -ESRCH; - if ( !IS_PRIV_FOR(current->domain, d) ) - { - rcu_unlock_domain(d); - return -EPERM; - } - } + rc = rcu_lock_target_domain_by_id(fmap.domid, &d); + if ( rc != 0 ) + return rc; rc = xsm_domain_memory_map(d); if ( rc ) diff --git a/xen/common/domain.c b/xen/common/domain.c index 353242dc2c..7e1f0ebe28 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -332,6 +332,25 @@ struct domain *rcu_lock_domain_by_id(domid_t dom) return NULL; } +int rcu_lock_target_domain_by_id(domid_t dom, struct domain **d) +{ + if ( dom == DOMID_SELF ) + { + *d = rcu_lock_current_domain(); + return 0; + } + + if ( (*d = rcu_lock_domain_by_id(dom)) == NULL ) + return -ESRCH; + + if ( !IS_PRIV_FOR(current->domain, *d) ) + { + rcu_unlock_domain(*d); + return -EPERM; + } + + return 0; +} int domain_kill(struct domain *d) { diff --git a/xen/common/event_channel.c b/xen/common/event_channel.c index 006d5eca3a..53dad7acc9 100644 --- a/xen/common/event_channel.c +++ b/xen/common/event_channel.c @@ -129,20 +129,9 @@ static long evtchn_alloc_unbound(evtchn_alloc_unbound_t *alloc) domid_t dom = alloc->dom; long rc; - if ( dom == DOMID_SELF ) - { - d = rcu_lock_current_domain(); - } - else - { - if ( (d = rcu_lock_domain_by_id(dom)) == NULL ) - return -ESRCH; - if ( !IS_PRIV_FOR(current->domain, d) ) - { - rcu_unlock_domain(d); - return -EPERM; - } - } + rc = rcu_lock_target_domain_by_id(dom, &d); + if ( rc ) + return rc; spin_lock(&d->evtchn_lock); @@ -663,20 +652,9 @@ static long evtchn_status(evtchn_status_t *status) struct evtchn *chn; long rc = 0; - if ( dom == DOMID_SELF ) - { - d = rcu_lock_current_domain(); - } - else - { - if ( (d = rcu_lock_domain_by_id(dom)) == NULL ) - return -ESRCH; - if ( !IS_PRIV_FOR(current->domain, d) ) - { - rcu_unlock_domain(d); - return -EPERM; - } - } + rc = rcu_lock_target_domain_by_id(dom, &d); + if ( rc ) + return rc; spin_lock(&d->evtchn_lock); @@ -824,20 +802,9 @@ static long evtchn_reset(evtchn_reset_t *r) struct domain *d; int i, rc; - if ( dom == DOMID_SELF ) - { - d = rcu_lock_current_domain(); - } - else - { - if ( (d = rcu_lock_domain_by_id(dom)) == NULL ) - return -ESRCH; - if ( !IS_PRIV_FOR(current->domain, d) ) - { - rc = -EPERM; - goto out; - } - } + rc = rcu_lock_target_domain_by_id(dom, &d); + if ( rc ) + return rc; rc = xsm_evtchn_reset(current->domain, d); if ( rc ) diff --git a/xen/common/memory.c b/xen/common/memory.c index e4d1a59f87..d39c2f59c0 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -222,21 +222,9 @@ static long translate_gpfn_list( !guest_handle_subrange_okay(op.mfn_list, *progress, op.nr_gpfns-1) ) return -EFAULT; - if ( op.domid == DOMID_SELF ) - { - d = rcu_lock_current_domain(); - } - else - { - if ( (d = rcu_lock_domain_by_id(op.domid)) == NULL ) - return -ESRCH; - if ( !IS_PRIV_FOR(current->domain, d) ) - { - rcu_unlock_domain(d); - return -EPERM; - } - } - + rc = rcu_lock_target_domain_by_id(op.domid, &d); + if ( rc ) + return rc; if ( !paging_mode_translate(d) ) { @@ -595,20 +583,9 @@ long do_memory_op(unsigned long cmd, XEN_GUEST_HANDLE(void) arg) if ( copy_from_guest(&domid, arg, 1) ) return -EFAULT; - if ( likely(domid == DOMID_SELF) ) - { - d = rcu_lock_current_domain(); - } - else - { - if ( (d = rcu_lock_domain_by_id(domid)) == NULL ) - return -ESRCH; - if ( !IS_PRIV_FOR(current->domain, d) ) - { - rcu_unlock_domain(d); - return -EPERM; - } - } + rc = rcu_lock_target_domain_by_id(domid, &d); + if ( rc ) + return rc; rc = xsm_memory_stat_reservation(current->domain, d); if ( rc ) diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 273126a949..b8bdc1e9a1 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -364,6 +364,13 @@ int construct_dom0( */ struct domain *rcu_lock_domain_by_id(domid_t dom); +/* + * As above function, but accounts for current domain context: + * - Translates target DOMID_SELF into caller's domain id; and + * - Checks that caller has permission to act on the target domain. + */ +int rcu_lock_target_domain_by_id(domid_t dom, struct domain **d); + /* Finish a RCU critical region started by rcu_lock_domain_by_id(). */ static inline void rcu_unlock_domain(struct domain *d) { |