From: Corneliu ZUZU <czuzu@bitdefender.com>
To: xen-devel@lists.xen.org
Cc: Andrew Cooper <andrew.cooper3@citrix.com>,
Tamas K Lengyel <tamas@tklengyel.com>,
Jan Beulich <jbeulich@suse.com>,
Razvan Cojocaru <rcojocaru@bitdefender.com>
Subject: [PATCH 16/16] x86/monitor: fix: xc_monitor _write_ctrlreg w/o previous _enable must fail
Date: Sat, 9 Jul 2016 07:23:56 +0300 [thread overview]
Message-ID: <1468038236-7172-1-git-send-email-czuzu@bitdefender.com> (raw)
In-Reply-To: <1468037509-6428-1-git-send-email-czuzu@bitdefender.com>
Enforce presence of a monitor vm-event subscriber when the toolstack user calls
xc_monitor_write_ctrlreg() (XEN_DOMCTL_MONITOR_EVENT_WRITE_CTRLREG domctl).
Without this change, "ASSERT(monitor_domain_initialised(v->domain));" @
hvm_set_cr0() and such would fail if the toolstack user calls
xc_monitor_write_ctrlreg(...) w/ enable = true, without first calling
xc_monitor_enable().
Also adjust returned error code for similar check from -EINVAL to more
descriptive -ENODEV (XEN_DOMCTL_MONITOR_OP_EMULATE_EACH_REP).
Signed-off-by: Corneliu ZUZU <czuzu@bitdefender.com>
---
xen/arch/x86/monitor.c | 4 ++++
xen/include/asm-x86/monitor.h | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/xen/arch/x86/monitor.c b/xen/arch/x86/monitor.c
index 05a2f0d..4cf018a 100644
--- a/xen/arch/x86/monitor.c
+++ b/xen/arch/x86/monitor.c
@@ -324,6 +324,10 @@ int arch_monitor_domctl_event(struct domain *d,
unsigned int ctrlreg_bitmask;
bool_t old_status;
+ /* Meaningless without a monitor vm-events subscriber. */
+ if ( unlikely(!monitor_domain_initialised(d)) )
+ return -ENODEV;
+
/* sanity check: avoid left-shift undefined behavior */
if ( unlikely(mop->u.mov_to_cr.index > 31) )
return -EINVAL;
diff --git a/xen/include/asm-x86/monitor.h b/xen/include/asm-x86/monitor.h
index 11497ef..a6022db 100644
--- a/xen/include/asm-x86/monitor.h
+++ b/xen/include/asm-x86/monitor.h
@@ -47,7 +47,7 @@ int arch_monitor_domctl_op(struct domain *d, struct xen_domctl_monitor_op *mop)
if ( likely(monitor_domain_initialised(d)) )
d->arch.mem_access_emulate_each_rep = !!mop->event;
else
- rc = -EINVAL;
+ rc = -ENODEV;
domain_unpause(d);
break;
--
2.5.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
next prev parent reply other threads:[~2016-07-09 4:23 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-09 4:11 [PATCH 00/16] x86/vm-event: numerous adjustments & fixes Corneliu ZUZU
2016-07-09 4:12 ` [PATCH 01/16] x86/vmx_update_guest_cr: minor optimization Corneliu ZUZU
2016-07-11 6:24 ` Corneliu ZUZU
2016-07-09 4:12 ` [PATCH 02/16] x86: fix: make atomic_read() param const Corneliu ZUZU
2016-07-11 15:18 ` Andrew Cooper
2016-07-12 5:11 ` Corneliu ZUZU
2016-07-12 9:42 ` Andrew Cooper
2016-07-12 10:11 ` Corneliu ZUZU
2016-07-12 10:22 ` Andrew Cooper
2016-07-12 10:35 ` Corneliu ZUZU
2016-07-12 10:38 ` Corneliu ZUZU
2016-07-12 12:49 ` Andrew Cooper
2016-07-12 13:45 ` Corneliu ZUZU
2016-07-09 4:13 ` [PATCH 03/16] x86/monitor: mechanical renames Corneliu ZUZU
2016-07-09 18:10 ` Tamas K Lengyel
2016-07-09 18:46 ` Corneliu ZUZU
2016-07-11 16:43 ` Tamas K Lengyel
2016-07-12 6:10 ` Corneliu ZUZU
2016-07-15 7:18 ` Corneliu ZUZU
2016-07-18 18:07 ` Andrew Cooper
2016-07-19 9:36 ` Corneliu ZUZU
2016-07-09 4:14 ` [PATCH 04/16] x86/monitor: relocate vm_event_register_write_resume() function to monitor code Corneliu ZUZU
2016-07-09 18:14 ` Tamas K Lengyel
2016-07-09 18:47 ` Corneliu ZUZU
2016-07-09 4:15 ` [PATCH 05/16] x86/monitor: relocate code more appropriately Corneliu ZUZU
2016-07-11 6:19 ` Corneliu ZUZU
2016-07-12 7:45 ` Tian, Kevin
2016-07-12 8:07 ` Corneliu ZUZU
2016-07-15 11:41 ` Corneliu ZUZU
2016-07-09 4:15 ` [PATCH 06/16] x86/monitor: fix: set msr_bitmap to NULL after xfree Corneliu ZUZU
2016-07-09 4:16 ` [PATCH 07/16] x86/vm-event: fix: call cleanup when init fails, to free partial allocs Corneliu ZUZU
2016-07-09 4:17 ` [PATCH 08/16] x86/vm-event: call monitor init & cleanup funcs from respective vm_event funcs Corneliu ZUZU
2016-07-09 4:18 ` [PATCH 09/16] arm/monitor: move d->monitor cleanup to monitor_cleanup_domain() Corneliu ZUZU
2016-07-09 4:19 ` [PATCH 10/16] x86/vm-event: centralize vcpu-destroy cleanup in vm-events code Corneliu ZUZU
2016-07-09 4:20 ` [PATCH 11/16] x86/monitor: fix: treat -monitor- properly, as a subsys of the vm-event subsys Corneliu ZUZU
2016-07-09 17:34 ` Tamas K Lengyel
2016-07-09 17:46 ` Corneliu ZUZU
2016-07-11 16:38 ` Tamas K Lengyel
2016-07-11 20:20 ` Corneliu ZUZU
2016-07-11 21:27 ` Tamas K Lengyel
2016-07-11 21:47 ` Corneliu ZUZU
2016-07-09 4:20 ` [PATCH 12/16] x86/vm-event: fix: move cleanup of mem_access_emulate_each_rep to monitor stub Corneliu ZUZU
2016-07-09 4:21 ` [PATCH 13/16] x86/monitor: introduce writes_pending field in monitor_write_data Corneliu ZUZU
2016-07-09 4:22 ` [PATCH 14/16] x86/monitor: clarify separation between monitor subsys and vm-event as a whole Corneliu ZUZU
2016-07-09 18:26 ` Tamas K Lengyel
2016-07-09 18:57 ` Corneliu ZUZU
2016-07-13 4:26 ` Corneliu ZUZU
2016-07-13 18:56 ` Tamas K Lengyel
2016-07-09 4:23 ` [PATCH 15/16] x86/monitor: fix: don't compromise a monitor_write_data with pending CR writes Corneliu ZUZU
2016-07-09 4:23 ` Corneliu ZUZU [this message]
2016-07-09 4:34 ` [PATCH 16/16] x86/monitor: fix: xc_monitor _write_ctrlreg w/o previous _enable must fail Corneliu ZUZU
2016-07-11 2:54 ` [PATCH 00/16] x86/vm-event: numerous adjustments & fixes Tian, Kevin
2016-07-11 5:32 ` Corneliu ZUZU
2016-07-12 7:42 ` Tian, Kevin
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=1468038236-7172-1-git-send-email-czuzu@bitdefender.com \
--to=czuzu@bitdefender.com \
--cc=andrew.cooper3@citrix.com \
--cc=jbeulich@suse.com \
--cc=rcojocaru@bitdefender.com \
--cc=tamas@tklengyel.com \
--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).