From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
To: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Cc: kevin.tian@intel.com, keir@xen.org, jbeulich@suse.com,
jun.nakajima@intel.com, andrew.cooper3@citrix.com, tim@xen.org,
dietmar.hahn@ts.fujitsu.com, xen-devel@lists.xen.org,
Aravind.Gopalakrishnan@amd.com, suravee.suthikulpanit@amd.com
Subject: Re: [PATCH v11 for-xen-4.5 20/20] x86/VPMU: Move VPMU files up from hvm/ directory
Date: Tue, 23 Sep 2014 14:53:15 -0400 [thread overview]
Message-ID: <20140923185315.GV3007@laptop.dumpdata.com> (raw)
In-Reply-To: <1411430281-6132-21-git-send-email-boris.ostrovsky@oracle.com>
On Mon, Sep 22, 2014 at 07:58:01PM -0400, Boris Ostrovsky wrote:
> Since PMU is now not HVM specific we can move VPMU-related files up from
> arch/x86/hvm/ directory.
>
> Specifically:
> arch/x86/hvm/vpmu.c -> arch/x86/vpmu.c
> arch/x86/hvm/svm/vpmu.c -> arch/x86/vpmu_amd.c
> arch/x86/hvm/vmx/vpmu_core2.c -> arch/x86/vpmu_intel.c
> include/asm-x86/hvm/vpmu.h -> include/asm-x86/vpmu.h
>
> Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
> ---
> xen/arch/x86/Makefile | 1 +
> xen/arch/x86/hvm/Makefile | 1 -
> xen/arch/x86/hvm/svm/Makefile | 1 -
> xen/arch/x86/hvm/vlapic.c | 2 +-
> xen/arch/x86/hvm/vmx/Makefile | 1 -
> xen/arch/x86/oprofile/op_model_ppro.c | 2 +-
> xen/arch/x86/traps.c | 2 +-
> xen/arch/x86/{hvm => }/vpmu.c | 2 +-
> xen/arch/x86/{hvm/svm/vpmu.c => vpmu_amd.c} | 2 +-
> xen/arch/x86/{hvm/vmx/vpmu_core2.c => vpmu_intel.c} | 2 +-
> xen/include/asm-x86/hvm/vmx/vmcs.h | 2 +-
> xen/include/asm-x86/{hvm => }/vpmu.h | 0
> 12 files changed, 8 insertions(+), 10 deletions(-)
> rename xen/arch/x86/{hvm => }/vpmu.c (99%)
> rename xen/arch/x86/{hvm/svm/vpmu.c => vpmu_amd.c} (99%)
> rename xen/arch/x86/{hvm/vmx/vpmu_core2.c => vpmu_intel.c} (99%)
> rename xen/include/asm-x86/{hvm => }/vpmu.h (100%)
>
> diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile
> index c1e244d..e985cfc 100644
> --- a/xen/arch/x86/Makefile
> +++ b/xen/arch/x86/Makefile
> @@ -59,6 +59,7 @@ obj-y += crash.o
> obj-y += tboot.o
> obj-y += hpet.o
> obj-y += xstate.o
> +obj-y += vpmu.o vpmu_amd.o vpmu_intel.o
>
> obj-$(crash_debug) += gdbstub.o
>
> diff --git a/xen/arch/x86/hvm/Makefile b/xen/arch/x86/hvm/Makefile
> index eea5555..742b83b 100644
> --- a/xen/arch/x86/hvm/Makefile
> +++ b/xen/arch/x86/hvm/Makefile
> @@ -22,4 +22,3 @@ obj-y += vlapic.o
> obj-y += vmsi.o
> obj-y += vpic.o
> obj-y += vpt.o
> -obj-y += vpmu.o
> \ No newline at end of file
> diff --git a/xen/arch/x86/hvm/svm/Makefile b/xen/arch/x86/hvm/svm/Makefile
> index a10a55e..760d295 100644
> --- a/xen/arch/x86/hvm/svm/Makefile
> +++ b/xen/arch/x86/hvm/svm/Makefile
> @@ -6,4 +6,3 @@ obj-y += nestedsvm.o
> obj-y += svm.o
> obj-y += svmdebug.o
> obj-y += vmcb.o
> -obj-y += vpmu.o
> diff --git a/xen/arch/x86/hvm/vlapic.c b/xen/arch/x86/hvm/vlapic.c
> index d72b0bd..2ed1117 100644
> --- a/xen/arch/x86/hvm/vlapic.c
> +++ b/xen/arch/x86/hvm/vlapic.c
> @@ -38,7 +38,7 @@
> #include <asm/hvm/support.h>
> #include <asm/hvm/vmx/vmx.h>
> #include <asm/hvm/nestedhvm.h>
> -#include <asm/hvm/vpmu.h>
> +#include <asm/vpmu.h>
> #include <public/hvm/ioreq.h>
> #include <public/hvm/params.h>
>
> diff --git a/xen/arch/x86/hvm/vmx/Makefile b/xen/arch/x86/hvm/vmx/Makefile
> index 373b3d9..04a29ce 100644
> --- a/xen/arch/x86/hvm/vmx/Makefile
> +++ b/xen/arch/x86/hvm/vmx/Makefile
> @@ -3,5 +3,4 @@ obj-y += intr.o
> obj-y += realmode.o
> obj-y += vmcs.o
> obj-y += vmx.o
> -obj-y += vpmu_core2.o
> obj-y += vvmx.o
> diff --git a/xen/arch/x86/oprofile/op_model_ppro.c b/xen/arch/x86/oprofile/op_model_ppro.c
> index 9e3510a..8f14d3e 100644
> --- a/xen/arch/x86/oprofile/op_model_ppro.c
> +++ b/xen/arch/x86/oprofile/op_model_ppro.c
> @@ -19,7 +19,7 @@
> #include <asm/processor.h>
> #include <asm/regs.h>
> #include <asm/current.h>
> -#include <asm/hvm/vpmu.h>
> +#include <asm/vpmu.h>
>
> #include "op_x86_model.h"
> #include "op_counter.h"
> diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c
> index 4e02359..9745c56 100644
> --- a/xen/arch/x86/traps.c
> +++ b/xen/arch/x86/traps.c
> @@ -72,7 +72,7 @@
> #include <asm/apic.h>
> #include <asm/mc146818rtc.h>
> #include <asm/hpet.h>
> -#include <asm/hvm/vpmu.h>
> +#include <asm/vpmu.h>
> #include <public/arch-x86/cpuid.h>
> #include <xsm/xsm.h>
>
> diff --git a/xen/arch/x86/hvm/vpmu.c b/xen/arch/x86/vpmu.c
> similarity index 99%
> rename from xen/arch/x86/hvm/vpmu.c
> rename to xen/arch/x86/vpmu.c
> index 52f5ce8..7a99006 100644
> --- a/xen/arch/x86/hvm/vpmu.c
> +++ b/xen/arch/x86/vpmu.c
> @@ -27,10 +27,10 @@
> #include <asm/types.h>
> #include <asm/msr.h>
> #include <asm/p2m.h>
> +#include <asm/vpmu.h>
> #include <asm/hvm/support.h>
> #include <asm/hvm/vmx/vmx.h>
> #include <asm/hvm/vmx/vmcs.h>
> -#include <asm/hvm/vpmu.h>
> #include <asm/hvm/svm/svm.h>
> #include <asm/hvm/svm/vmcb.h>
> #include <asm/apic.h>
> diff --git a/xen/arch/x86/hvm/svm/vpmu.c b/xen/arch/x86/vpmu_amd.c
> similarity index 99%
> rename from xen/arch/x86/hvm/svm/vpmu.c
> rename to xen/arch/x86/vpmu_amd.c
> index 9db0559..81be95d 100644
> --- a/xen/arch/x86/hvm/svm/vpmu.c
> +++ b/xen/arch/x86/vpmu_amd.c
> @@ -28,8 +28,8 @@
> #include <xen/sched.h>
> #include <xen/irq.h>
> #include <asm/apic.h>
> +#include <asm/vpmu.h>
> #include <asm/hvm/vlapic.h>
> -#include <asm/hvm/vpmu.h>
> #include <public/pmu.h>
>
> #define MSR_F10H_EVNTSEL_GO_SHIFT 40
> diff --git a/xen/arch/x86/hvm/vmx/vpmu_core2.c b/xen/arch/x86/vpmu_intel.c
> similarity index 99%
> rename from xen/arch/x86/hvm/vmx/vpmu_core2.c
> rename to xen/arch/x86/vpmu_intel.c
> index 37266ca..cef7046 100644
> --- a/xen/arch/x86/hvm/vmx/vpmu_core2.c
> +++ b/xen/arch/x86/vpmu_intel.c
> @@ -30,6 +30,7 @@
> #include <asm/traps.h>
> #include <asm/msr.h>
> #include <asm/msr-index.h>
> +#include <asm/vpmu.h>
> #include <asm/hvm/support.h>
> #include <asm/hvm/vlapic.h>
> #include <asm/hvm/vmx/vmx.h>
> @@ -37,7 +38,6 @@
> #include <public/sched.h>
> #include <public/hvm/save.h>
> #include <public/pmu.h>
> -#include <asm/hvm/vpmu.h>
>
> /*
> * See Intel SDM Vol 2a Instruction Set Reference chapter 3 for CPUID
> diff --git a/xen/include/asm-x86/hvm/vmx/vmcs.h b/xen/include/asm-x86/hvm/vmx/vmcs.h
> index f6cf010..fedc0ad 100644
> --- a/xen/include/asm-x86/hvm/vmx/vmcs.h
> +++ b/xen/include/asm-x86/hvm/vmx/vmcs.h
> @@ -20,7 +20,7 @@
> #define __ASM_X86_HVM_VMX_VMCS_H__
>
> #include <asm/hvm/io.h>
> -#include <asm/hvm/vpmu.h>
> +#include <asm/vpmu.h>
> #include <irq_vectors.h>
>
> extern void vmcs_dump_vcpu(struct vcpu *v);
> diff --git a/xen/include/asm-x86/hvm/vpmu.h b/xen/include/asm-x86/vpmu.h
> similarity index 100%
> rename from xen/include/asm-x86/hvm/vpmu.h
> rename to xen/include/asm-x86/vpmu.h
> --
> 1.8.1.4
>
>
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xen.org
> http://lists.xen.org/xen-devel
prev parent reply other threads:[~2014-09-23 18:53 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-22 23:57 [PATCH v11 for-xen-4.5 00/20] x86/PMU: Xen PMU PV(H) support Boris Ostrovsky
2014-09-22 23:57 ` [PATCH v11 for-xen-4.5 01/20] common/symbols: Export hypervisor symbols to privileged guest Boris Ostrovsky
2014-09-23 14:28 ` Konrad Rzeszutek Wilk
2014-09-22 23:57 ` [PATCH v11 for-xen-4.5 02/20] x86/VPMU: Manage VPMU_CONTEXT_SAVE flag in vpmu_save_force() Boris Ostrovsky
2014-09-23 14:44 ` Konrad Rzeszutek Wilk
2014-09-23 15:06 ` Boris Ostrovsky
2014-09-23 15:26 ` Konrad Rzeszutek Wilk
2014-09-22 23:57 ` [PATCH v11 for-xen-4.5 03/20] x86/VPMU: Set MSR bitmaps only for HVM/PVH guests Boris Ostrovsky
2014-09-22 23:57 ` [PATCH v11 for-xen-4.5 04/20] x86/VPMU: Make vpmu macros a bit more efficient Boris Ostrovsky
2014-09-22 23:57 ` [PATCH v11 for-xen-4.5 05/20] intel/VPMU: Clean up Intel VPMU code Boris Ostrovsky
2014-09-22 23:57 ` [PATCH v11 for-xen-4.5 06/20] vmx: Merge MSR management routines Boris Ostrovsky
2014-09-23 14:48 ` Konrad Rzeszutek Wilk
2014-09-22 23:57 ` [PATCH v11 for-xen-4.5 07/20] x86/VPMU: Handle APIC_LVTPC accesses Boris Ostrovsky
2014-09-22 23:57 ` [PATCH v11 for-xen-4.5 08/20] intel/VPMU: MSR_CORE_PERF_GLOBAL_CTRL should be initialized to zero Boris Ostrovsky
2014-09-22 23:57 ` [PATCH v11 for-xen-4.5 09/20] x86/VPMU: Add public xenpmu.h Boris Ostrovsky
2014-09-22 23:57 ` [PATCH v11 for-xen-4.5 10/20] x86/VPMU: Make vpmu not HVM-specific Boris Ostrovsky
2014-09-22 23:57 ` [PATCH v11 for-xen-4.5 11/20] x86/VPMU: Interface for setting PMU mode and flags Boris Ostrovsky
2014-09-23 14:55 ` Konrad Rzeszutek Wilk
2014-09-23 18:58 ` Konrad Rzeszutek Wilk
2014-09-23 19:24 ` Boris Ostrovsky
2014-09-23 20:47 ` Daniel De Graaf
2014-09-23 21:06 ` Boris Ostrovsky
2014-09-24 8:31 ` Jan Beulich
2014-09-22 23:57 ` [PATCH v11 for-xen-4.5 12/20] x86/VPMU: Initialize PMU for PV(H) guests Boris Ostrovsky
2014-09-23 14:59 ` Konrad Rzeszutek Wilk
2014-09-22 23:57 ` [PATCH v11 for-xen-4.5 13/20] x86/VPMU: Save VPMU state for PV guests during context switch Boris Ostrovsky
2014-09-23 15:01 ` Konrad Rzeszutek Wilk
2014-09-23 15:10 ` Boris Ostrovsky
2014-09-23 15:18 ` Konrad Rzeszutek Wilk
2014-09-22 23:57 ` [PATCH v11 for-xen-4.5 14/20] x86/VPMU: When handling MSR accesses, leave fault injection to callers Boris Ostrovsky
2014-09-22 23:57 ` [PATCH v11 for-xen-4.5 15/20] x86/VPMU: Add support for PMU register handling on PV guests Boris Ostrovsky
2014-09-23 15:08 ` Konrad Rzeszutek Wilk
2014-09-23 15:49 ` Boris Ostrovsky
2014-09-22 23:57 ` [PATCH v11 for-xen-4.5 16/20] x86/VPMU: Handle PMU interrupts for " Boris Ostrovsky
2014-09-23 17:18 ` Konrad Rzeszutek Wilk
2014-09-23 17:36 ` Boris Ostrovsky
2014-09-23 18:31 ` Konrad Rzeszutek Wilk
2014-09-23 18:36 ` Konrad Rzeszutek Wilk
2014-09-23 18:57 ` Boris Ostrovsky
2014-09-23 19:07 ` Konrad Rzeszutek Wilk
2014-09-22 23:57 ` [PATCH v11 for-xen-4.5 17/20] x86/VPMU: Merge vpmu_rdmsr and vpmu_wrmsr Boris Ostrovsky
2014-09-23 18:38 ` Konrad Rzeszutek Wilk
2014-09-22 23:57 ` [PATCH v11 for-xen-4.5 18/20] x86/VPMU: Add privileged PMU mode Boris Ostrovsky
2014-09-23 18:40 ` Konrad Rzeszutek Wilk
2014-09-22 23:58 ` [PATCH v11 for-xen-4.5 19/20] x86/VPMU: NMI-based VPMU support Boris Ostrovsky
2014-09-23 18:52 ` Konrad Rzeszutek Wilk
2014-09-23 19:18 ` Boris Ostrovsky
2014-09-23 19:27 ` Konrad Rzeszutek Wilk
2014-09-22 23:58 ` [PATCH v11 for-xen-4.5 20/20] x86/VPMU: Move VPMU files up from hvm/ directory Boris Ostrovsky
2014-09-23 18:53 ` Konrad Rzeszutek Wilk [this message]
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=20140923185315.GV3007@laptop.dumpdata.com \
--to=konrad.wilk@oracle.com \
--cc=Aravind.Gopalakrishnan@amd.com \
--cc=andrew.cooper3@citrix.com \
--cc=boris.ostrovsky@oracle.com \
--cc=dietmar.hahn@ts.fujitsu.com \
--cc=jbeulich@suse.com \
--cc=jun.nakajima@intel.com \
--cc=keir@xen.org \
--cc=kevin.tian@intel.com \
--cc=suravee.suthikulpanit@amd.com \
--cc=tim@xen.org \
--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 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.