From: Roger Pau Monne <roger.pau@citrix.com>
To: <xen-devel@lists.xenproject.org>
Cc: Roger Pau Monne <roger.pau@citrix.com>,
Jan Beulich <jbeulich@suse.com>,
Andrew Cooper <andrew.cooper3@citrix.com>, Wei Liu <wl@xen.org>
Subject: [PATCH v4 3/5] x86/pv: disallow access to unknown MSRs
Date: Mon, 7 Sep 2020 12:31:41 +0200 [thread overview]
Message-ID: <20200907103143.58845-4-roger.pau@citrix.com> (raw)
In-Reply-To: <20200907103143.58845-1-roger.pau@citrix.com>
Change the catch-all behavior for MSR not explicitly handled. Instead
of allow full read-access to the MSR space and silently dropping
writes return an exception when the MSR is not explicitly handled.
Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
Changes since v2:
- Added missing 0x prefix.
---
xen/arch/x86/pv/emul-priv-op.c | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/xen/arch/x86/pv/emul-priv-op.c b/xen/arch/x86/pv/emul-priv-op.c
index bcc1188f6a..2d9953f5b4 100644
--- a/xen/arch/x86/pv/emul-priv-op.c
+++ b/xen/arch/x86/pv/emul-priv-op.c
@@ -972,9 +972,10 @@ static int read_msr(unsigned int reg, uint64_t *val,
}
/* fall through */
default:
+ gdprintk(XENLOG_WARNING, "RDMSR 0x%08x unimplemented\n", reg);
+ break;
+
normal:
- /* Everyone can read the MSR space. */
- /* gdprintk(XENLOG_WARNING, "Domain attempted RDMSR %08x\n", reg); */
if ( rdmsr_safe(reg, *val) )
break;
return X86EMUL_OKAY;
@@ -1141,14 +1142,15 @@ static int write_msr(unsigned int reg, uint64_t val,
}
/* fall through */
default:
- if ( rdmsr_safe(reg, temp) )
- break;
+ gdprintk(XENLOG_WARNING,
+ "WRMSR 0x%08x val 0x%016"PRIx64" unimplemented\n",
+ reg, val);
+ break;
- if ( val != temp )
invalid:
- gdprintk(XENLOG_WARNING,
- "Domain attempted WRMSR %08x from 0x%016"PRIx64" to 0x%016"PRIx64"\n",
- reg, temp, val);
+ gdprintk(XENLOG_WARNING,
+ "Domain attempted WRMSR 0x%08x from 0x%016"PRIx64" to 0x%016"PRIx64"\n",
+ reg, temp, val);
return X86EMUL_OKAY;
}
--
2.28.0
next prev parent reply other threads:[~2020-09-07 10:32 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-07 10:31 [PATCH v4 0/5] x86: switch default MSR behavior Roger Pau Monne
2020-09-07 10:31 ` [PATCH v4 1/5] x86/svm: handle BU_CFG and BU_CFG2 with cases Roger Pau Monne
2020-09-08 15:51 ` Jan Beulich
2020-09-07 10:31 ` [PATCH v4 2/5] x86/pv: allow reading FEATURE_CONTROL MSR Roger Pau Monne
2020-09-08 15:52 ` Jan Beulich
2020-09-15 2:48 ` Tian, Kevin
2020-09-07 10:31 ` Roger Pau Monne [this message]
2020-09-07 10:31 ` [PATCH v4 4/5] x86/hvm: Disallow access to unknown MSRs Roger Pau Monne
2020-09-07 10:31 ` [PATCH v4 5/5] x86/msr: Drop compatibility #GP handling in guest_{rd, wr}msr() Roger Pau Monne
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=20200907103143.58845-4-roger.pau@citrix.com \
--to=roger.pau@citrix.com \
--cc=andrew.cooper3@citrix.com \
--cc=jbeulich@suse.com \
--cc=wl@xen.org \
--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.