From: Dietmar Hahn <dietmar.hahn@ts.fujitsu.com>
To: "xen-devel@lists.xensource.com" <xen-devel@lists.xensource.com>,
Jan Beulich <JBeulich@suse.com>
Subject: [PATCH v2] msr: Use defines for bits of MSR_IA32_DEBUGCTLMSR instead of numbers
Date: Tue, 31 Jan 2012 14:54:14 +0100 [thread overview]
Message-ID: <2409234.cBcKmkEUVD@amur> (raw)
Changes to v1:
As Jan suggested:
- changed definitions of the bit fields
- did the change more consistently across the source.
Dietmar.
# HG changeset patch
# Parent e2722b24dc0962de37215320b05d1bb7c4c42864
Use defines for bits of MSR_IA32_DEBUGCTLMSR instead of numbers.
Signed-off-by: Dietmar Hahn <dietmar.hahn@ts.fujitsu.com>
diff -r e2722b24dc09 xen/arch/x86/hvm/vmx/vmx.c
--- a/xen/arch/x86/hvm/vmx/vmx.c Thu Jan 26 17:43:31 2012 +0000
+++ b/xen/arch/x86/hvm/vmx/vmx.c Tue Jan 31 14:30:32 2012 +0100
@@ -1944,11 +1944,12 @@ static int vmx_msr_write_intercept(unsig
break;
case MSR_IA32_DEBUGCTLMSR: {
int i, rc = 0;
-
- if ( !msr_content || (msr_content & ~3) )
+ uint64_t supported = IA32_DEBUGCTLMSR_LBR | IA32_DEBUGCTLMSR_BTF;
+
+ if ( !msr_content || (msr_content & ~supported) )
break;
- if ( msr_content & 1 )
+ if ( msr_content & IA32_DEBUGCTLMSR_LBR )
{
const struct lbr_info *lbr = last_branch_msr_get();
if ( lbr == NULL )
diff -r e2722b24dc09 xen/arch/x86/traps.c
--- a/xen/arch/x86/traps.c Thu Jan 26 17:43:31 2012 +0000
+++ b/xen/arch/x86/traps.c Tue Jan 31 14:30:32 2012 +0100
@@ -3376,12 +3376,12 @@ void write_efer(u64 val)
static void ler_enable(void)
{
u64 debugctl;
-
+
if ( !this_cpu(ler_msr) )
return;
rdmsrl(MSR_IA32_DEBUGCTLMSR, debugctl);
- wrmsrl(MSR_IA32_DEBUGCTLMSR, debugctl | 1);
+ wrmsrl(MSR_IA32_DEBUGCTLMSR, debugctl | IA32_DEBUGCTLMSR_LBR);
}
void do_debug(struct cpu_user_regs *regs)
diff -r e2722b24dc09 xen/include/asm-x86/msr-index.h
--- a/xen/include/asm-x86/msr-index.h Thu Jan 26 17:43:31 2012 +0000
+++ b/xen/include/asm-x86/msr-index.h Tue Jan 31 14:30:32 2012 +0100
@@ -65,11 +65,14 @@
#define MSR_MTRRdefType 0x000002ff
#define MSR_IA32_DEBUGCTLMSR 0x000001d9
+#define IA32_DEBUGCTLMSR_LBR (1<<0) /* Last Branch Record */
+#define IA32_DEBUGCTLMSR_BTF (1<<1) /* Single Step on Branches */
+
#define MSR_IA32_LASTBRANCHFROMIP 0x000001db
#define MSR_IA32_LASTBRANCHTOIP 0x000001dc
#define MSR_IA32_LASTINTFROMIP 0x000001dd
#define MSR_IA32_LASTINTTOIP 0x000001de
-
+
#define MSR_IA32_MTRR_PHYSBASE0 0x00000200
#define MSR_IA32_MTRR_PHYSMASK0 0x00000201
#define MSR_IA32_MTRR_PHYSBASE1 0x00000202
--
Company details: http://ts.fujitsu.com/imprint.html
reply other threads:[~2012-01-31 13:54 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=2409234.cBcKmkEUVD@amur \
--to=dietmar.hahn@ts.fujitsu.com \
--cc=JBeulich@suse.com \
--cc=xen-devel@lists.xensource.com \
/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.