From: "Jan Beulich" <JBeulich@suse.com>
To: xen-devel <xen-devel@lists.xenproject.org>
Cc: Kevin Tian <kevin.tian@intel.com>, Jun Nakajima <jun.nakajima@intel.com>
Subject: [PATCH] VMX: ensure MSR index enum and array remain in sync
Date: Mon, 20 Jun 2016 05:32:13 -0600 [thread overview]
Message-ID: <5767F05D02000078000F6A36@prv-mh.provo.novell.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 1205 bytes --]
... by using dedicated initializers. Also add an ASSERT() to make sure
unintentional addition of holes to the array gets noticed. Ditch
MSR_INDEX_SIZE as redundant with VMX_MSR_COUNT.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
--- a/xen/arch/x86/hvm/vmx/vmx.c
+++ b/xen/arch/x86/hvm/vmx/vmx.c
@@ -321,20 +321,23 @@ static void vmx_vcpu_destroy(struct vcpu
static DEFINE_PER_CPU(struct vmx_msr_state, host_msr_state);
-static const u32 msr_index[] =
+static const u32 msr_index[VMX_MSR_COUNT] =
{
- MSR_LSTAR, MSR_STAR, MSR_SYSCALL_MASK
+ [VMX_INDEX_MSR_LSTAR] = MSR_LSTAR,
+ [VMX_INDEX_MSR_STAR] = MSR_STAR,
+ [VMX_INDEX_MSR_SYSCALL_MASK] = MSR_SYSCALL_MASK
};
-#define MSR_INDEX_SIZE (ARRAY_SIZE(msr_index))
-
void vmx_save_host_msrs(void)
{
struct vmx_msr_state *host_msr_state = &this_cpu(host_msr_state);
- int i;
+ unsigned int i;
- for ( i = 0; i < MSR_INDEX_SIZE; i++ )
+ for ( i = 0; i < VMX_MSR_COUNT; i++ )
+ {
+ ASSERT(msr_index[i]);
rdmsrl(msr_index[i], host_msr_state->msrs[i]);
+ }
}
#define WRITE_MSR(address) do { \
[-- Attachment #2: VMX-msr_index-initializers.patch --]
[-- Type: text/plain, Size: 1254 bytes --]
VMX: ensure MSR index enum and array remain in sync
... by using dedicated initializers. Also add an ASSERT() to make sure
unintentional addition of holes to the array gets noticed. Ditch
MSR_INDEX_SIZE as redundant with VMX_MSR_COUNT.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
--- a/xen/arch/x86/hvm/vmx/vmx.c
+++ b/xen/arch/x86/hvm/vmx/vmx.c
@@ -321,20 +321,23 @@ static void vmx_vcpu_destroy(struct vcpu
static DEFINE_PER_CPU(struct vmx_msr_state, host_msr_state);
-static const u32 msr_index[] =
+static const u32 msr_index[VMX_MSR_COUNT] =
{
- MSR_LSTAR, MSR_STAR, MSR_SYSCALL_MASK
+ [VMX_INDEX_MSR_LSTAR] = MSR_LSTAR,
+ [VMX_INDEX_MSR_STAR] = MSR_STAR,
+ [VMX_INDEX_MSR_SYSCALL_MASK] = MSR_SYSCALL_MASK
};
-#define MSR_INDEX_SIZE (ARRAY_SIZE(msr_index))
-
void vmx_save_host_msrs(void)
{
struct vmx_msr_state *host_msr_state = &this_cpu(host_msr_state);
- int i;
+ unsigned int i;
- for ( i = 0; i < MSR_INDEX_SIZE; i++ )
+ for ( i = 0; i < VMX_MSR_COUNT; i++ )
+ {
+ ASSERT(msr_index[i]);
rdmsrl(msr_index[i], host_msr_state->msrs[i]);
+ }
}
#define WRITE_MSR(address) do { \
[-- Attachment #3: Type: text/plain, Size: 126 bytes --]
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
next reply other threads:[~2016-06-20 11:32 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-20 11:32 Jan Beulich [this message]
2016-06-20 12:31 ` [PATCH] VMX: ensure MSR index enum and array remain in sync Andrew Cooper
2016-06-23 8:06 ` 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=5767F05D02000078000F6A36@prv-mh.provo.novell.com \
--to=jbeulich@suse.com \
--cc=jun.nakajima@intel.com \
--cc=kevin.tian@intel.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 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).