From: Jan Beulich <jbeulich@suse.com>
To: "xen-devel@lists.xenproject.org" <xen-devel@lists.xenproject.org>
Cc: George Dunlap <george.dunlap@citrix.com>,
Christopher Clark <christopher.w.clark@gmail.com>
Subject: [PATCH 3/5] argo: don't pointlessly use get_domain_by_id()
Date: Tue, 5 Jan 2021 14:26:18 +0100 [thread overview]
Message-ID: <1d565881-d3d7-2a25-326a-61c7bb640f3a@suse.com> (raw)
In-Reply-To: <3f069a0e-39a9-f5c8-154e-ac41e8b2a1c8@suse.com>
For short-lived references rcu_lock_domain_by_id() is the better
(slightly cheaper) alternative.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
---
Is it really intentional for fill_ring_data() to return success (0) in
case the domain can't be found or has argo disabled? Even if so, the
uninitialized ent.max_message_size will be leaked to the caller then
(and similarly when find_ring_info_by_match() returns NULL). Perhaps
the field should only be copied back when ent.flags is non-zero?
--- a/xen/common/argo.c
+++ b/xen/common/argo.c
@@ -445,13 +445,13 @@ signal_domain(struct domain *d)
static void
signal_domid(domid_t domain_id)
{
- struct domain *d = get_domain_by_id(domain_id);
+ struct domain *d = rcu_lock_domain_by_id(domain_id);
if ( !d )
return;
signal_domain(d);
- put_domain(d);
+ rcu_unlock_domain(d);
}
static void
@@ -983,7 +983,7 @@ ringbuf_insert(const struct domain *d, s
static void
wildcard_pending_list_remove(domid_t domain_id, struct pending_ent *ent)
{
- struct domain *d = get_domain_by_id(domain_id);
+ struct domain *d = rcu_lock_domain_by_id(domain_id);
if ( !d )
return;
@@ -996,13 +996,13 @@ wildcard_pending_list_remove(domid_t dom
list_del(&ent->wildcard_node);
spin_unlock(&d->argo->wildcard_L2_lock);
}
- put_domain(d);
+ rcu_unlock_domain(d);
}
static void
wildcard_pending_list_insert(domid_t domain_id, struct pending_ent *ent)
{
- struct domain *d = get_domain_by_id(domain_id);
+ struct domain *d = rcu_lock_domain_by_id(domain_id);
if ( !d )
return;
@@ -1015,7 +1015,7 @@ wildcard_pending_list_insert(domid_t dom
list_add(&ent->wildcard_node, &d->argo->wildcard_pend_list);
spin_unlock(&d->argo->wildcard_L2_lock);
}
- put_domain(d);
+ rcu_unlock_domain(d);
}
static void
@@ -1283,7 +1283,7 @@ partner_rings_remove(struct domain *src_
struct argo_send_info,
node)) )
{
- struct domain *dst_d = get_domain_by_id(send_info->id.domain_id);
+ struct domain *dst_d = rcu_lock_domain_by_id(send_info->id.domain_id);
if ( dst_d && dst_d->argo )
{
@@ -1302,7 +1302,7 @@ partner_rings_remove(struct domain *src_
ASSERT_UNREACHABLE();
if ( dst_d )
- put_domain(dst_d);
+ rcu_unlock_domain(dst_d);
list_del(&send_info->node);
xfree(send_info);
@@ -1330,7 +1330,7 @@ fill_ring_data(const struct domain *curr
ent.flags = 0;
- dst_d = get_domain_by_id(ent.ring.domain_id);
+ dst_d = rcu_lock_domain_by_id(ent.ring.domain_id);
if ( !dst_d || !dst_d->argo )
goto out;
@@ -1340,10 +1340,7 @@ fill_ring_data(const struct domain *curr
*/
ret = xsm_argo_send(currd, dst_d);
if ( ret )
- {
- put_domain(dst_d);
- return ret;
- }
+ goto out;
read_lock(&dst_d->argo->rings_L2_rwlock);
@@ -1405,7 +1402,7 @@ fill_ring_data(const struct domain *curr
out:
if ( dst_d )
- put_domain(dst_d);
+ rcu_unlock_domain(dst_d);
if ( !ret && (__copy_field_to_guest(data_ent_hnd, &ent, flags) ||
__copy_field_to_guest(data_ent_hnd, &ent, max_message_size)) )
@@ -1569,7 +1566,7 @@ unregister_ring(struct domain *currd,
if ( ring_id.partner_id == XEN_ARGO_DOMID_ANY )
goto out;
- dst_d = get_domain_by_id(ring_id.partner_id);
+ dst_d = rcu_lock_domain_by_id(ring_id.partner_id);
if ( !dst_d || !dst_d->argo )
{
ASSERT_UNREACHABLE();
@@ -1592,7 +1589,7 @@ unregister_ring(struct domain *currd,
read_unlock(&L1_global_argo_rwlock);
if ( dst_d )
- put_domain(dst_d);
+ rcu_unlock_domain(dst_d);
xfree(send_info);
@@ -1663,7 +1660,7 @@ register_ring(struct domain *currd,
}
else
{
- dst_d = get_domain_by_id(reg.partner_id);
+ dst_d = rcu_lock_domain_by_id(reg.partner_id);
if ( !dst_d )
{
argo_dprintk("!dst_d, ESRCH\n");
@@ -1845,7 +1842,7 @@ register_ring(struct domain *currd,
out:
if ( dst_d )
- put_domain(dst_d);
+ rcu_unlock_domain(dst_d);
if ( ret )
xfree(send_info);
@@ -1988,7 +1985,7 @@ sendv(struct domain *src_d, xen_argo_add
src_id.domain_id = src_d->domain_id;
src_id.partner_id = dst_addr->domain_id;
- dst_d = get_domain_by_id(dst_addr->domain_id);
+ dst_d = rcu_lock_domain_by_id(dst_addr->domain_id);
if ( !dst_d )
return -ESRCH;
@@ -1998,7 +1995,7 @@ sendv(struct domain *src_d, xen_argo_add
gprintk(XENLOG_ERR, "argo: XSM REJECTED %i -> %i\n",
src_d->domain_id, dst_d->domain_id);
- put_domain(dst_d);
+ rcu_unlock_domain(dst_d);
return ret;
}
@@ -2068,7 +2065,7 @@ sendv(struct domain *src_d, xen_argo_add
signal_domain(dst_d);
if ( dst_d )
- put_domain(dst_d);
+ rcu_unlock_domain(dst_d);
return ( ret < 0 ) ? ret : len;
}
next prev parent reply other threads:[~2021-01-05 13:26 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-05 13:23 [PATCH 0/5] domain referencing adjustments Jan Beulich
2021-01-05 13:24 ` [PATCH 1/5] common: don't (kind of) open-code rcu_lock_domain_by_any_id() Jan Beulich
2021-01-05 13:38 ` Andrew Cooper
2021-01-05 14:17 ` Jan Beulich
2021-01-13 22:42 ` Andrew Cooper
2021-01-05 13:24 ` [PATCH 2/5] evtchn: don't pointlessly use get_domain() Jan Beulich
2021-01-05 13:26 ` Jan Beulich [this message]
2021-01-13 22:24 ` [PATCH 3/5] argo: don't pointlessly use get_domain_by_id() Christopher Clark
2021-01-05 13:26 ` [PATCH 4/5] x86: " Jan Beulich
2021-01-05 13:28 ` [PATCH 5/5] x86/mem-sharing: " Jan Beulich
2021-01-05 13:37 ` Tamas K Lengyel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1d565881-d3d7-2a25-326a-61c7bb640f3a@suse.com \
--to=jbeulich@suse.com \
--cc=christopher.w.clark@gmail.com \
--cc=george.dunlap@citrix.com \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.