From: Razvan Cojocaru <rcojocaru@bitdefender.com>
To: xen-devel@lists.xen.org
Cc: andrew.cooper3@citrix.com, keir@xen.org,
Razvan Cojocaru <rcojocaru@bitdefender.com>,
jbeulich@suse.com
Subject: [PATCH V3] x86/monitor: Disallow setting mem_access_emulate_each_rep when vm_event is NULL
Date: Sat, 9 Apr 2016 08:54:09 +0300 [thread overview]
Message-ID: <1460181249-13651-1-git-send-email-rcojocaru@bitdefender.com> (raw)
It is meaningless (and potentially dangerous - see hvmemul_virtual_to_linear())
to set mem_access_emulate_each_rep before xc_monitor_enable() (which allocates
vcpu->arch.vm_event) has been called, so return an error from the
XEN_DOMCTL_MONITOR_OP_EMULATE_EACH_REP hypercall when that is the case.
Signed-off-by: Razvan Cojocaru <rcojocaru@bitdefender.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citirx.com>
---
Changes since V2:
- Updated the if() condition as recommended by Andrew Cooper.
- Added Andrew Cooper's Reviewed-by.
---
xen/include/asm-x86/monitor.h | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/xen/include/asm-x86/monitor.h b/xen/include/asm-x86/monitor.h
index 0954b59..d367099 100644
--- a/xen/include/asm-x86/monitor.h
+++ b/xen/include/asm-x86/monitor.h
@@ -32,19 +32,29 @@
static inline
int arch_monitor_domctl_op(struct domain *d, struct xen_domctl_monitor_op *mop)
{
+ int rc = 0;
+
switch ( mop->op )
{
case XEN_DOMCTL_MONITOR_OP_EMULATE_EACH_REP:
domain_pause(d);
- d->arch.mem_access_emulate_each_rep = !!mop->event;
+ /*
+ * Enabling mem_access_emulate_each_rep without a vm_event subscriber
+ * is meaningless.
+ */
+ if ( d->max_vcpus && d->vcpu[0] && d->vcpu[0]->arch.vm_event )
+ d->arch.mem_access_emulate_each_rep = !!mop->event;
+ else
+ rc = -EINVAL;
+
domain_unpause(d);
break;
default:
- return -EOPNOTSUPP;
+ rc = -EOPNOTSUPP;
}
- return 0;
+ return rc;
}
int arch_monitor_domctl_event(struct domain *d,
--
1.9.1
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
next reply other threads:[~2016-04-09 5:54 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-09 5:54 Razvan Cojocaru [this message]
2016-04-29 16:12 ` [PATCH V3] x86/monitor: Disallow setting mem_access_emulate_each_rep when vm_event is NULL Razvan Cojocaru
2016-05-02 10:26 ` Wei Liu
2016-05-03 8:14 ` Jan Beulich
2016-05-03 8:18 ` Razvan Cojocaru
2016-05-03 18:28 ` 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=1460181249-13651-1-git-send-email-rcojocaru@bitdefender.com \
--to=rcojocaru@bitdefender.com \
--cc=andrew.cooper3@citrix.com \
--cc=jbeulich@suse.com \
--cc=keir@xen.org \
--cc=xen-devel@lists.xen.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).