* [PATCH] hvm/vpmu: Prevent core2_vpmu_dump() handler from incorrectly mutating state
@ 2013-09-11 16:58 Andrew Cooper
2013-09-12 7:45 ` [PATCH v2] hvm/vpmu: Prevent dump handlers " Jan Beulich
0 siblings, 1 reply; 4+ messages in thread
From: Andrew Cooper @ 2013-09-11 16:58 UTC (permalink / raw)
To: Xen-devel
Cc: Andrew Cooper, Eddie Dong, Keir Fraser, Jun Nakajima, Jan Beulich
Discovered by Coverity, CID 1055181
The keyhandler was incorrectly setting VPMU_CONTEXT_LOADED when it was
intending to check for it.
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
CC: Keir Fraser <keir@xen.org>
CC: Jan Beulich <jbeulich@suse.com>
CC: Jun Nakajima <jun.nakajima@intel.com>
CC: Eddie Dong <eddie.dong@intel.com>
---
xen/arch/x86/hvm/vmx/vpmu_core2.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/xen/arch/x86/hvm/vmx/vpmu_core2.c b/xen/arch/x86/hvm/vmx/vpmu_core2.c
index 8c556c7..c8095d7 100644
--- a/xen/arch/x86/hvm/vmx/vpmu_core2.c
+++ b/xen/arch/x86/hvm/vmx/vpmu_core2.c
@@ -690,7 +690,7 @@ static void core2_vpmu_dump(struct vcpu *v)
if ( !vpmu_is_set(vpmu, VPMU_RUNNING) )
{
- if ( vpmu_set(vpmu, VPMU_CONTEXT_LOADED) )
+ if ( vpmu_is_set(vpmu, VPMU_CONTEXT_LOADED) )
printk(" vPMU loaded\n");
else
printk(" vPMU allocated\n");
--
1.7.10.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH v2] hvm/vpmu: Prevent dump handlers from incorrectly mutating state
2013-09-11 16:58 [PATCH] hvm/vpmu: Prevent core2_vpmu_dump() handler from incorrectly mutating state Andrew Cooper
@ 2013-09-12 7:45 ` Jan Beulich
2013-09-12 9:38 ` Andrew Cooper
2013-09-12 23:28 ` Suravee Suthikulanit
0 siblings, 2 replies; 4+ messages in thread
From: Jan Beulich @ 2013-09-12 7:45 UTC (permalink / raw)
To: Andrew Cooper, xen-devel
Cc: Keir Fraser, suravee.suthikulpanit, Jacob Shin, Eddie Dong,
Jun Nakajima, Boris Ostrovsky
[-- Attachment #1: Type: text/plain, Size: 4210 bytes --]
Discovered by Coverity, CID 1055181
core2_vpmu_dump() was incorrectly setting VPMU_CONTEXT_LOADED when it
was intending to check for it.
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
This would have been avoided if the dump function declared all its
pointers "const" - doing this now (also in SVM).
Also fixing some indentation issues at once.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
--- a/xen/arch/x86/hvm/svm/vpmu.c
+++ b/xen/arch/x86/hvm/svm/vpmu.c
@@ -415,10 +415,10 @@ static void amd_vpmu_destroy(struct vcpu
}
/* VPMU part of the 'q' keyhandler */
-static void amd_vpmu_dump(struct vcpu *v)
+static void amd_vpmu_dump(const struct vcpu *v)
{
- struct vpmu_struct *vpmu = vcpu_vpmu(v);
- struct amd_vpmu_context *ctxt = vpmu->context;
+ const struct vpmu_struct *vpmu = vcpu_vpmu(v);
+ const struct amd_vpmu_context *ctxt = vpmu->context;
unsigned int i;
printk(" VPMU state: 0x%x ", vpmu->flags);
@@ -447,9 +447,9 @@ static void amd_vpmu_dump(struct vcpu *v
rdmsrl(ctrls[i], ctrl);
rdmsrl(counters[i], cntr);
- printk(" 0x%08x: 0x%lx (0x%lx in HW) 0x%08x: 0x%lx (0x%lx in HW)\n",
- ctrls[i], ctxt->ctrls[i], ctrl,
- counters[i], ctxt->counters[i], cntr);
+ printk(" %#x: %#lx (%#lx in HW) %#x: %#lx (%#lx in HW)\n",
+ ctrls[i], ctxt->ctrls[i], ctrl,
+ counters[i], ctxt->counters[i], cntr);
}
}
--- a/xen/arch/x86/hvm/vmx/vpmu_core2.c
+++ b/xen/arch/x86/hvm/vmx/vpmu_core2.c
@@ -678,11 +678,11 @@ static void core2_vpmu_do_cpuid(unsigned
}
/* Dump vpmu info on console, called in the context of keyhandler 'q'. */
-static void core2_vpmu_dump(struct vcpu *v)
+static void core2_vpmu_dump(const struct vcpu *v)
{
- struct vpmu_struct *vpmu = vcpu_vpmu(v);
+ const struct vpmu_struct *vpmu = vcpu_vpmu(v);
int i, num;
- struct core2_vpmu_context *core2_vpmu_cxt = NULL;
+ const struct core2_vpmu_context *core2_vpmu_cxt = NULL;
u64 val;
if ( !vpmu_is_set(vpmu, VPMU_CONTEXT_ALLOCATED) )
@@ -690,7 +690,7 @@ static void core2_vpmu_dump(struct vcpu
if ( !vpmu_is_set(vpmu, VPMU_RUNNING) )
{
- if ( vpmu_set(vpmu, VPMU_CONTEXT_LOADED) )
+ if ( vpmu_is_set(vpmu, VPMU_CONTEXT_LOADED) )
printk(" vPMU loaded\n");
else
printk(" vPMU allocated\n");
@@ -703,10 +703,11 @@ static void core2_vpmu_dump(struct vcpu
/* Print the contents of the counter and its configuration msr. */
for ( i = 0; i < num; i++ )
{
- struct arch_msr_pair* msr_pair = core2_vpmu_cxt->arch_msr_pair;
+ const struct arch_msr_pair *msr_pair = core2_vpmu_cxt->arch_msr_pair;
+
if ( core2_vpmu_cxt->pmu_enable->arch_pmc_enable[i] )
printk(" general_%d: 0x%016lx ctrl: 0x%016lx\n",
- i, msr_pair[i].counter, msr_pair[i].control);
+ i, msr_pair[i].counter, msr_pair[i].control);
}
/*
* The configuration of the fixed counter is 4 bits each in the
@@ -716,9 +717,9 @@ static void core2_vpmu_dump(struct vcpu
for ( i = 0; i < core2_fix_counters.num; i++ )
{
if ( core2_vpmu_cxt->pmu_enable->fixed_ctr_enable[i] )
- printk(" fixed_%d: 0x%016lx ctrl: 0x%lx\n",
- i, core2_vpmu_cxt->fix_counters[i],
- val & FIXED_CTR_CTRL_MASK);
+ printk(" fixed_%d: 0x%016lx ctrl: %#lx\n",
+ i, core2_vpmu_cxt->fix_counters[i],
+ val & FIXED_CTR_CTRL_MASK);
val >>= FIXED_CTR_CTRL_BITS;
}
}
--- a/xen/include/asm-x86/hvm/vpmu.h
+++ b/xen/include/asm-x86/hvm/vpmu.h
@@ -54,7 +54,7 @@ struct arch_vpmu_ops {
void (*arch_vpmu_destroy)(struct vcpu *v);
int (*arch_vpmu_save)(struct vcpu *v);
void (*arch_vpmu_load)(struct vcpu *v);
- void (*arch_vpmu_dump)(struct vcpu *v);
+ void (*arch_vpmu_dump)(const struct vcpu *);
};
int vmx_vpmu_initialise(struct vcpu *, unsigned int flags);
[-- Attachment #2: x86-vPMU-dump-ro.patch --]
[-- Type: text/plain, Size: 4273 bytes --]
hvm/vpmu: Prevent dump handlers from incorrectly mutating state
Discovered by Coverity, CID 1055181
core2_vpmu_dump() was incorrectly setting VPMU_CONTEXT_LOADED when it
was intending to check for it.
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
This would have been avoided if the dump function declared all its
pointers "const" - doing this now (also in SVM).
Also fixing some indentation issues at once.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
--- a/xen/arch/x86/hvm/svm/vpmu.c
+++ b/xen/arch/x86/hvm/svm/vpmu.c
@@ -415,10 +415,10 @@ static void amd_vpmu_destroy(struct vcpu
}
/* VPMU part of the 'q' keyhandler */
-static void amd_vpmu_dump(struct vcpu *v)
+static void amd_vpmu_dump(const struct vcpu *v)
{
- struct vpmu_struct *vpmu = vcpu_vpmu(v);
- struct amd_vpmu_context *ctxt = vpmu->context;
+ const struct vpmu_struct *vpmu = vcpu_vpmu(v);
+ const struct amd_vpmu_context *ctxt = vpmu->context;
unsigned int i;
printk(" VPMU state: 0x%x ", vpmu->flags);
@@ -447,9 +447,9 @@ static void amd_vpmu_dump(struct vcpu *v
rdmsrl(ctrls[i], ctrl);
rdmsrl(counters[i], cntr);
- printk(" 0x%08x: 0x%lx (0x%lx in HW) 0x%08x: 0x%lx (0x%lx in HW)\n",
- ctrls[i], ctxt->ctrls[i], ctrl,
- counters[i], ctxt->counters[i], cntr);
+ printk(" %#x: %#lx (%#lx in HW) %#x: %#lx (%#lx in HW)\n",
+ ctrls[i], ctxt->ctrls[i], ctrl,
+ counters[i], ctxt->counters[i], cntr);
}
}
--- a/xen/arch/x86/hvm/vmx/vpmu_core2.c
+++ b/xen/arch/x86/hvm/vmx/vpmu_core2.c
@@ -678,11 +678,11 @@ static void core2_vpmu_do_cpuid(unsigned
}
/* Dump vpmu info on console, called in the context of keyhandler 'q'. */
-static void core2_vpmu_dump(struct vcpu *v)
+static void core2_vpmu_dump(const struct vcpu *v)
{
- struct vpmu_struct *vpmu = vcpu_vpmu(v);
+ const struct vpmu_struct *vpmu = vcpu_vpmu(v);
int i, num;
- struct core2_vpmu_context *core2_vpmu_cxt = NULL;
+ const struct core2_vpmu_context *core2_vpmu_cxt = NULL;
u64 val;
if ( !vpmu_is_set(vpmu, VPMU_CONTEXT_ALLOCATED) )
@@ -690,7 +690,7 @@ static void core2_vpmu_dump(struct vcpu
if ( !vpmu_is_set(vpmu, VPMU_RUNNING) )
{
- if ( vpmu_set(vpmu, VPMU_CONTEXT_LOADED) )
+ if ( vpmu_is_set(vpmu, VPMU_CONTEXT_LOADED) )
printk(" vPMU loaded\n");
else
printk(" vPMU allocated\n");
@@ -703,10 +703,11 @@ static void core2_vpmu_dump(struct vcpu
/* Print the contents of the counter and its configuration msr. */
for ( i = 0; i < num; i++ )
{
- struct arch_msr_pair* msr_pair = core2_vpmu_cxt->arch_msr_pair;
+ const struct arch_msr_pair *msr_pair = core2_vpmu_cxt->arch_msr_pair;
+
if ( core2_vpmu_cxt->pmu_enable->arch_pmc_enable[i] )
printk(" general_%d: 0x%016lx ctrl: 0x%016lx\n",
- i, msr_pair[i].counter, msr_pair[i].control);
+ i, msr_pair[i].counter, msr_pair[i].control);
}
/*
* The configuration of the fixed counter is 4 bits each in the
@@ -716,9 +717,9 @@ static void core2_vpmu_dump(struct vcpu
for ( i = 0; i < core2_fix_counters.num; i++ )
{
if ( core2_vpmu_cxt->pmu_enable->fixed_ctr_enable[i] )
- printk(" fixed_%d: 0x%016lx ctrl: 0x%lx\n",
- i, core2_vpmu_cxt->fix_counters[i],
- val & FIXED_CTR_CTRL_MASK);
+ printk(" fixed_%d: 0x%016lx ctrl: %#lx\n",
+ i, core2_vpmu_cxt->fix_counters[i],
+ val & FIXED_CTR_CTRL_MASK);
val >>= FIXED_CTR_CTRL_BITS;
}
}
--- a/xen/include/asm-x86/hvm/vpmu.h
+++ b/xen/include/asm-x86/hvm/vpmu.h
@@ -54,7 +54,7 @@ struct arch_vpmu_ops {
void (*arch_vpmu_destroy)(struct vcpu *v);
int (*arch_vpmu_save)(struct vcpu *v);
void (*arch_vpmu_load)(struct vcpu *v);
- void (*arch_vpmu_dump)(struct vcpu *v);
+ void (*arch_vpmu_dump)(const struct vcpu *);
};
int vmx_vpmu_initialise(struct vcpu *, unsigned int flags);
[-- Attachment #3: Type: text/plain, Size: 126 bytes --]
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2] hvm/vpmu: Prevent dump handlers from incorrectly mutating state
2013-09-12 7:45 ` [PATCH v2] hvm/vpmu: Prevent dump handlers " Jan Beulich
@ 2013-09-12 9:38 ` Andrew Cooper
2013-09-12 23:28 ` Suravee Suthikulanit
1 sibling, 0 replies; 4+ messages in thread
From: Andrew Cooper @ 2013-09-12 9:38 UTC (permalink / raw)
To: Jan Beulich
Cc: Keir Fraser, suravee.suthikulpanit, Eddie Dong, Jacob Shin,
Jun Nakajima, xen-devel, Boris Ostrovsky
On 12/09/13 08:45, Jan Beulich wrote:
> Discovered by Coverity, CID 1055181
>
> core2_vpmu_dump() was incorrectly setting VPMU_CONTEXT_LOADED when it
> was intending to check for it.
>
> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
>
> This would have been avoided if the dump function declared all its
> pointers "const" - doing this now (also in SVM).
>
> Also fixing some indentation issues at once.
>
> Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
>
> --- a/xen/arch/x86/hvm/svm/vpmu.c
> +++ b/xen/arch/x86/hvm/svm/vpmu.c
> @@ -415,10 +415,10 @@ static void amd_vpmu_destroy(struct vcpu
> }
>
> /* VPMU part of the 'q' keyhandler */
> -static void amd_vpmu_dump(struct vcpu *v)
> +static void amd_vpmu_dump(const struct vcpu *v)
> {
> - struct vpmu_struct *vpmu = vcpu_vpmu(v);
> - struct amd_vpmu_context *ctxt = vpmu->context;
> + const struct vpmu_struct *vpmu = vcpu_vpmu(v);
> + const struct amd_vpmu_context *ctxt = vpmu->context;
> unsigned int i;
>
> printk(" VPMU state: 0x%x ", vpmu->flags);
> @@ -447,9 +447,9 @@ static void amd_vpmu_dump(struct vcpu *v
>
> rdmsrl(ctrls[i], ctrl);
> rdmsrl(counters[i], cntr);
> - printk(" 0x%08x: 0x%lx (0x%lx in HW) 0x%08x: 0x%lx (0x%lx in HW)\n",
> - ctrls[i], ctxt->ctrls[i], ctrl,
> - counters[i], ctxt->counters[i], cntr);
> + printk(" %#x: %#lx (%#lx in HW) %#x: %#lx (%#lx in HW)\n",
> + ctrls[i], ctxt->ctrls[i], ctrl,
> + counters[i], ctxt->counters[i], cntr);
> }
> }
>
> --- a/xen/arch/x86/hvm/vmx/vpmu_core2.c
> +++ b/xen/arch/x86/hvm/vmx/vpmu_core2.c
> @@ -678,11 +678,11 @@ static void core2_vpmu_do_cpuid(unsigned
> }
>
> /* Dump vpmu info on console, called in the context of keyhandler 'q'. */
> -static void core2_vpmu_dump(struct vcpu *v)
> +static void core2_vpmu_dump(const struct vcpu *v)
> {
> - struct vpmu_struct *vpmu = vcpu_vpmu(v);
> + const struct vpmu_struct *vpmu = vcpu_vpmu(v);
> int i, num;
> - struct core2_vpmu_context *core2_vpmu_cxt = NULL;
> + const struct core2_vpmu_context *core2_vpmu_cxt = NULL;
> u64 val;
>
> if ( !vpmu_is_set(vpmu, VPMU_CONTEXT_ALLOCATED) )
> @@ -690,7 +690,7 @@ static void core2_vpmu_dump(struct vcpu
>
> if ( !vpmu_is_set(vpmu, VPMU_RUNNING) )
> {
> - if ( vpmu_set(vpmu, VPMU_CONTEXT_LOADED) )
> + if ( vpmu_is_set(vpmu, VPMU_CONTEXT_LOADED) )
> printk(" vPMU loaded\n");
> else
> printk(" vPMU allocated\n");
> @@ -703,10 +703,11 @@ static void core2_vpmu_dump(struct vcpu
> /* Print the contents of the counter and its configuration msr. */
> for ( i = 0; i < num; i++ )
> {
> - struct arch_msr_pair* msr_pair = core2_vpmu_cxt->arch_msr_pair;
> + const struct arch_msr_pair *msr_pair = core2_vpmu_cxt->arch_msr_pair;
> +
> if ( core2_vpmu_cxt->pmu_enable->arch_pmc_enable[i] )
> printk(" general_%d: 0x%016lx ctrl: 0x%016lx\n",
> - i, msr_pair[i].counter, msr_pair[i].control);
> + i, msr_pair[i].counter, msr_pair[i].control);
> }
> /*
> * The configuration of the fixed counter is 4 bits each in the
> @@ -716,9 +717,9 @@ static void core2_vpmu_dump(struct vcpu
> for ( i = 0; i < core2_fix_counters.num; i++ )
> {
> if ( core2_vpmu_cxt->pmu_enable->fixed_ctr_enable[i] )
> - printk(" fixed_%d: 0x%016lx ctrl: 0x%lx\n",
> - i, core2_vpmu_cxt->fix_counters[i],
> - val & FIXED_CTR_CTRL_MASK);
> + printk(" fixed_%d: 0x%016lx ctrl: %#lx\n",
> + i, core2_vpmu_cxt->fix_counters[i],
> + val & FIXED_CTR_CTRL_MASK);
> val >>= FIXED_CTR_CTRL_BITS;
> }
> }
> --- a/xen/include/asm-x86/hvm/vpmu.h
> +++ b/xen/include/asm-x86/hvm/vpmu.h
> @@ -54,7 +54,7 @@ struct arch_vpmu_ops {
> void (*arch_vpmu_destroy)(struct vcpu *v);
> int (*arch_vpmu_save)(struct vcpu *v);
> void (*arch_vpmu_load)(struct vcpu *v);
> - void (*arch_vpmu_dump)(struct vcpu *v);
> + void (*arch_vpmu_dump)(const struct vcpu *);
> };
>
> int vmx_vpmu_initialise(struct vcpu *, unsigned int flags);
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2] hvm/vpmu: Prevent dump handlers from incorrectly mutating state
2013-09-12 7:45 ` [PATCH v2] hvm/vpmu: Prevent dump handlers " Jan Beulich
2013-09-12 9:38 ` Andrew Cooper
@ 2013-09-12 23:28 ` Suravee Suthikulanit
1 sibling, 0 replies; 4+ messages in thread
From: Suravee Suthikulanit @ 2013-09-12 23:28 UTC (permalink / raw)
To: Jan Beulich
Cc: Keir Fraser, Eddie Dong, Andrew Cooper, Jacob Shin, Jun Nakajima,
xen-devel, Boris Ostrovsky
On 9/12/2013 2:45 AM, Jan Beulich wrote:
> Discovered by Coverity, CID 1055181
>
> core2_vpmu_dump() was incorrectly setting VPMU_CONTEXT_LOADED when it
> was intending to check for it.
>
> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
>
> This would have been avoided if the dump function declared all its
> pointers "const" - doing this now (also in SVM).
>
> Also fixing some indentation issues at once.
>
> Signed-off-by: Jan Beulich <jbeulich@suse.com>
>
> --- a/xen/arch/x86/hvm/svm/vpmu.c
> +++ b/xen/arch/x86/hvm/svm/vpmu.c
> @@ -415,10 +415,10 @@ static void amd_vpmu_destroy(struct vcpu
> }
>
> /* VPMU part of the 'q' keyhandler */
> -static void amd_vpmu_dump(struct vcpu *v)
> +static void amd_vpmu_dump(const struct vcpu *v)
> {
> - struct vpmu_struct *vpmu = vcpu_vpmu(v);
> - struct amd_vpmu_context *ctxt = vpmu->context;
> + const struct vpmu_struct *vpmu = vcpu_vpmu(v);
> + const struct amd_vpmu_context *ctxt = vpmu->context;
> unsigned int i;
>
> printk(" VPMU state: 0x%x ", vpmu->flags);
> @@ -447,9 +447,9 @@ static void amd_vpmu_dump(struct vcpu *v
>
> rdmsrl(ctrls[i], ctrl);
> rdmsrl(counters[i], cntr);
> - printk(" 0x%08x: 0x%lx (0x%lx in HW) 0x%08x: 0x%lx (0x%lx in HW)\n",
> - ctrls[i], ctxt->ctrls[i], ctrl,
> - counters[i], ctxt->counters[i], cntr);
> + printk(" %#x: %#lx (%#lx in HW) %#x: %#lx (%#lx in HW)\n",
> + ctrls[i], ctxt->ctrls[i], ctrl,
> + counters[i], ctxt->counters[i], cntr);
> }
> }
>
> --- a/xen/arch/x86/hvm/vmx/vpmu_core2.c
> +++ b/xen/arch/x86/hvm/vmx/vpmu_core2.c
> @@ -678,11 +678,11 @@ static void core2_vpmu_do_cpuid(unsigned
> }
>
> /* Dump vpmu info on console, called in the context of keyhandler 'q'. */
> -static void core2_vpmu_dump(struct vcpu *v)
> +static void core2_vpmu_dump(const struct vcpu *v)
> {
> - struct vpmu_struct *vpmu = vcpu_vpmu(v);
> + const struct vpmu_struct *vpmu = vcpu_vpmu(v);
> int i, num;
> - struct core2_vpmu_context *core2_vpmu_cxt = NULL;
> + const struct core2_vpmu_context *core2_vpmu_cxt = NULL;
> u64 val;
>
> if ( !vpmu_is_set(vpmu, VPMU_CONTEXT_ALLOCATED) )
> @@ -690,7 +690,7 @@ static void core2_vpmu_dump(struct vcpu
>
> if ( !vpmu_is_set(vpmu, VPMU_RUNNING) )
> {
> - if ( vpmu_set(vpmu, VPMU_CONTEXT_LOADED) )
> + if ( vpmu_is_set(vpmu, VPMU_CONTEXT_LOADED) )
> printk(" vPMU loaded\n");
> else
> printk(" vPMU allocated\n");
> @@ -703,10 +703,11 @@ static void core2_vpmu_dump(struct vcpu
> /* Print the contents of the counter and its configuration msr. */
> for ( i = 0; i < num; i++ )
> {
> - struct arch_msr_pair* msr_pair = core2_vpmu_cxt->arch_msr_pair;
> + const struct arch_msr_pair *msr_pair = core2_vpmu_cxt->arch_msr_pair;
> +
> if ( core2_vpmu_cxt->pmu_enable->arch_pmc_enable[i] )
> printk(" general_%d: 0x%016lx ctrl: 0x%016lx\n",
> - i, msr_pair[i].counter, msr_pair[i].control);
> + i, msr_pair[i].counter, msr_pair[i].control);
> }
> /*
> * The configuration of the fixed counter is 4 bits each in the
> @@ -716,9 +717,9 @@ static void core2_vpmu_dump(struct vcpu
> for ( i = 0; i < core2_fix_counters.num; i++ )
> {
> if ( core2_vpmu_cxt->pmu_enable->fixed_ctr_enable[i] )
> - printk(" fixed_%d: 0x%016lx ctrl: 0x%lx\n",
> - i, core2_vpmu_cxt->fix_counters[i],
> - val & FIXED_CTR_CTRL_MASK);
> + printk(" fixed_%d: 0x%016lx ctrl: %#lx\n",
> + i, core2_vpmu_cxt->fix_counters[i],
> + val & FIXED_CTR_CTRL_MASK);
> val >>= FIXED_CTR_CTRL_BITS;
> }
> }
> --- a/xen/include/asm-x86/hvm/vpmu.h
> +++ b/xen/include/asm-x86/hvm/vpmu.h
> @@ -54,7 +54,7 @@ struct arch_vpmu_ops {
> void (*arch_vpmu_destroy)(struct vcpu *v);
> int (*arch_vpmu_save)(struct vcpu *v);
> void (*arch_vpmu_load)(struct vcpu *v);
> - void (*arch_vpmu_dump)(struct vcpu *v);
> + void (*arch_vpmu_dump)(const struct vcpu *);
> };
>
> int vmx_vpmu_initialise(struct vcpu *, unsigned int flags);
>
>
Acked-by: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-09-12 23:28 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-09-11 16:58 [PATCH] hvm/vpmu: Prevent core2_vpmu_dump() handler from incorrectly mutating state Andrew Cooper
2013-09-12 7:45 ` [PATCH v2] hvm/vpmu: Prevent dump handlers " Jan Beulich
2013-09-12 9:38 ` Andrew Cooper
2013-09-12 23:28 ` Suravee Suthikulanit
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).