| Message ID | 1519842483-8887-3-git-send-email-maran.wilson@oracle.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Feb 28, 2018 at 10:27:58AM -0800, Maran Wilson wrote: > Once hypervisors other than Xen start using the PVH entry point for > starting VMs, we would like the option of being able to compile PVH entry > capable kernels without enabling CONFIG_XEN and all the code that comes > along with that. To allow that, we are moving the PVH code out of Xen and > into files sitting at a higher level in the tree. > > This patch is not introducing any code or functional changes, just moving > files from one location to another. > > Signed-off-by: Maran Wilson <maran.wilson@oracle.com> Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> Thank you! > --- > MAINTAINERS | 1 + > arch/x86/Kbuild | 3 +++ > arch/x86/{xen/xen-pvh.S => pvh-head.S} | 0 > arch/x86/{xen/enlighten_pvh.c => pvh.c} | 0 > arch/x86/xen/Makefile | 2 -- > 5 files changed, 4 insertions(+), 2 deletions(-) > rename arch/x86/{xen/xen-pvh.S => pvh-head.S} (100%) > rename arch/x86/{xen/enlighten_pvh.c => pvh.c} (100%) > > diff --git a/MAINTAINERS b/MAINTAINERS > index 93a12af4f180..dc89f3a279bd 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -15210,6 +15210,7 @@ L: xen-devel@lists.xenproject.org (moderated for non-subscribers) > T: git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git > S: Supported > F: arch/x86/xen/ > +F: arch/x86/*pvh* > F: drivers/*/xen-*front.c > F: drivers/xen/ > F: arch/x86/include/asm/xen/ > diff --git a/arch/x86/Kbuild b/arch/x86/Kbuild > index 0038a2d10a7a..a4e5e3d348dc 100644 > --- a/arch/x86/Kbuild > +++ b/arch/x86/Kbuild > @@ -7,6 +7,9 @@ obj-$(CONFIG_KVM) += kvm/ > # Xen paravirtualization support > obj-$(CONFIG_XEN) += xen/ > > +obj-$(CONFIG_XEN_PVH) += pvh.o > +obj-$(CONFIG_XEN_PVH) += pvh-head.o > + > # Hyper-V paravirtualization support > obj-$(subst m,y,$(CONFIG_HYPERV)) += hyperv/ > > diff --git a/arch/x86/xen/xen-pvh.S b/arch/x86/pvh-head.S > similarity index 100% > rename from arch/x86/xen/xen-pvh.S > rename to arch/x86/pvh-head.S > diff --git a/arch/x86/xen/enlighten_pvh.c b/arch/x86/pvh.c > similarity index 100% > rename from arch/x86/xen/enlighten_pvh.c > rename to arch/x86/pvh.c > diff --git a/arch/x86/xen/Makefile b/arch/x86/xen/Makefile > index d83cb5478f54..7e8145b33997 100644 > --- a/arch/x86/xen/Makefile > +++ b/arch/x86/xen/Makefile > @@ -21,7 +21,6 @@ obj-y := enlighten.o multicalls.o mmu.o irq.o \ > obj-$(CONFIG_XEN_PVHVM) += enlighten_hvm.o mmu_hvm.o suspend_hvm.o > obj-$(CONFIG_XEN_PV) += setup.o apic.o pmu.o suspend_pv.o \ > p2m.o enlighten_pv.o mmu_pv.o > -obj-$(CONFIG_XEN_PVH) += enlighten_pvh.o > > obj-$(CONFIG_EVENT_TRACING) += trace.o > > @@ -33,4 +32,3 @@ obj-$(CONFIG_XEN_DEBUG_FS) += debugfs.o > obj-$(CONFIG_XEN_DOM0) += vga.o > obj-$(CONFIG_SWIOTLB_XEN) += pci-swiotlb-xen.o > obj-$(CONFIG_XEN_EFI) += efi.o > -obj-$(CONFIG_XEN_PVH) += xen-pvh.o > -- > 2.16.1 > > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xenproject.org > https://lists.xenproject.org/mailman/listinfo/xen-devel
On 28/02/2018 22:08, Konrad Rzeszutek Wilk wrote: > +obj-$(CONFIG_XEN_PVH) += pvh.o > +obj-$(CONFIG_XEN_PVH) += pvh-head.o > + Probably a better place for these would be arch/x86/platform/pvh/{enlighten.c,head.S}. (Just because there are no .c or .S files in arch/x86). Maybe Xen ought to be moved under arch/x86/platform too. Paolo
On 28/02/18 22:35, Paolo Bonzini wrote: > On 28/02/2018 22:08, Konrad Rzeszutek Wilk wrote: >> +obj-$(CONFIG_XEN_PVH) += pvh.o >> +obj-$(CONFIG_XEN_PVH) += pvh-head.o >> + > > Probably a better place for these would be > arch/x86/platform/pvh/{enlighten.c,head.S}. (Just because there are no > .c or .S files in arch/x86). Right. > Maybe Xen ought to be moved under > arch/x86/platform too. And hyperv and kvm, too? No, I think arch/x86/xen/ is fine. Juergen
On 01/03/2018 07:11, Juergen Gross wrote: >> Probably a better place for these would be >> arch/x86/platform/pvh/{enlighten.c,head.S}. (Just because there are no >> .c or .S files in arch/x86). > Right. > >> Maybe Xen ought to be moved under >> arch/x86/platform too. > And hyperv and kvm, too? Actually yes, though for kvm I'd move the files in arch/x86/kernel (arch/x86/kvm is the hypervisor itself, not the "platform"). > No, I think arch/x86/xen/ is fine. np, it was just a (somewhat crazy) suggestion. :) Paolo
On 03/01/2018 03:46 AM, Paolo Bonzini wrote: > On 01/03/2018 07:11, Juergen Gross wrote: >>> Probably a better place for these would be >>> arch/x86/platform/pvh/{enlighten.c,head.S}. (Just because there are no >>> .c or .S files in arch/x86). >> Right. >> >>> Maybe Xen ought to be moved under >>> arch/x86/platform too. >> And hyperv and kvm, too? I was actually thinking about having arch/x86/virt where xen, kvm, hyperv etc should go. Not as part of this series, obviously. -boris > Actually yes, though for kvm I'd move the files in arch/x86/kernel > (arch/x86/kvm is the hypervisor itself, not the "platform"). > >> No, I think arch/x86/xen/ is fine. > np, it was just a (somewhat crazy) suggestion. :) > > Paolo
On 2/28/2018 1:35 PM, Paolo Bonzini wrote: > On 28/02/2018 22:08, Konrad Rzeszutek Wilk wrote: >> +obj-$(CONFIG_XEN_PVH) += pvh.o >> +obj-$(CONFIG_XEN_PVH) += pvh-head.o >> + > Probably a better place for these would be > arch/x86/platform/pvh/{enlighten.c,head.S}. (Just because there are no > .c or .S files in arch/x86). Sounds good. Will make that change. Thanks, -Maran > Maybe Xen ought to be moved under > arch/x86/platform too. > > Paolo
diff --git a/MAINTAINERS b/MAINTAINERS index 93a12af4f180..dc89f3a279bd 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -15210,6 +15210,7 @@ L: xen-devel@lists.xenproject.org (moderated for non-subscribers) T: git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git S: Supported F: arch/x86/xen/ +F: arch/x86/*pvh* F: drivers/*/xen-*front.c F: drivers/xen/ F: arch/x86/include/asm/xen/ diff --git a/arch/x86/Kbuild b/arch/x86/Kbuild index 0038a2d10a7a..a4e5e3d348dc 100644 --- a/arch/x86/Kbuild +++ b/arch/x86/Kbuild @@ -7,6 +7,9 @@ obj-$(CONFIG_KVM) += kvm/ # Xen paravirtualization support obj-$(CONFIG_XEN) += xen/ +obj-$(CONFIG_XEN_PVH) += pvh.o +obj-$(CONFIG_XEN_PVH) += pvh-head.o + # Hyper-V paravirtualization support obj-$(subst m,y,$(CONFIG_HYPERV)) += hyperv/ diff --git a/arch/x86/xen/xen-pvh.S b/arch/x86/pvh-head.S similarity index 100% rename from arch/x86/xen/xen-pvh.S rename to arch/x86/pvh-head.S diff --git a/arch/x86/xen/enlighten_pvh.c b/arch/x86/pvh.c similarity index 100% rename from arch/x86/xen/enlighten_pvh.c rename to arch/x86/pvh.c diff --git a/arch/x86/xen/Makefile b/arch/x86/xen/Makefile index d83cb5478f54..7e8145b33997 100644 --- a/arch/x86/xen/Makefile +++ b/arch/x86/xen/Makefile @@ -21,7 +21,6 @@ obj-y := enlighten.o multicalls.o mmu.o irq.o \ obj-$(CONFIG_XEN_PVHVM) += enlighten_hvm.o mmu_hvm.o suspend_hvm.o obj-$(CONFIG_XEN_PV) += setup.o apic.o pmu.o suspend_pv.o \ p2m.o enlighten_pv.o mmu_pv.o -obj-$(CONFIG_XEN_PVH) += enlighten_pvh.o obj-$(CONFIG_EVENT_TRACING) += trace.o @@ -33,4 +32,3 @@ obj-$(CONFIG_XEN_DEBUG_FS) += debugfs.o obj-$(CONFIG_XEN_DOM0) += vga.o obj-$(CONFIG_SWIOTLB_XEN) += pci-swiotlb-xen.o obj-$(CONFIG_XEN_EFI) += efi.o -obj-$(CONFIG_XEN_PVH) += xen-pvh.o
Once hypervisors other than Xen start using the PVH entry point for starting VMs, we would like the option of being able to compile PVH entry capable kernels without enabling CONFIG_XEN and all the code that comes along with that. To allow that, we are moving the PVH code out of Xen and into files sitting at a higher level in the tree. This patch is not introducing any code or functional changes, just moving files from one location to another. Signed-off-by: Maran Wilson <maran.wilson@oracle.com> --- MAINTAINERS | 1 + arch/x86/Kbuild | 3 +++ arch/x86/{xen/xen-pvh.S => pvh-head.S} | 0 arch/x86/{xen/enlighten_pvh.c => pvh.c} | 0 arch/x86/xen/Makefile | 2 -- 5 files changed, 4 insertions(+), 2 deletions(-) rename arch/x86/{xen/xen-pvh.S => pvh-head.S} (100%) rename arch/x86/{xen/enlighten_pvh.c => pvh.c} (100%)