Remove Xen PVH dependency on PCI
Subsystems (3)
cover Remove Xen PVH dependency on PCI
A Xen PVH domain doesn't have a PCI bus or devices, so it doesn't need PCI support built in. Currently, XEN_PVH depends on XEN_PVHVM which depends on PCI.
The first patch introduces XEN_PVHVM_GUEST as a toplevel item and changes XEN_PVHVM to a hidden variable. This allows XEN_PVH to depend on XEN_PVHVM without PCI while XEN_PVHVM_GUEST depends on PCI.
The second patch moves XEN_512GB to clean up the option nesting.
Jason Andryuk (2):
xen: Remove Xen PVH/PVHVM dependency on PCI
xen: Kconfig: nest Xen guest options
arch/x86/xen/Kconfig | 38 ++++++++++++++++++++++---------------- drivers/xen/Makefile | 2 +- 2 files changed, 23 insertions(+), 17 deletions(-)
Signature · 1 line
2.26.2
PATCH 1/2 xen: Remove Xen PVH/PVHVM dependency on PCI
A Xen PVH domain doesn't have a PCI bus or devices, so it doesn't need PCI support built in. Currently, XEN_PVH depends on XEN_PVHVM which depends on PCI.
Introduce XEN_PVHVM_GUEST as a toplevel item and change XEN_PVHVM to a hidden variable. This allows XEN_PVH to depend on XEN_PVHVM without PCI while XEN_PVHVM_GUEST depends on PCI.
In drivers/xen, compile platform-pci depending on XEN_PVHVM_GUEST since that pulls in the PCI dependency for linking.
---
--- arch/x86/xen/Kconfig | 18 ++++++++++++------ drivers/xen/Makefile | 2 +- 2 files changed, 13 insertions(+), 7 deletions(-)
arch/x86/xen/Kconfig +12 -6
@@ -39,16 +39,20 @@ config XEN_DOM0 Support running as a Xen PV Dom0 guest. config XEN_PVHVM - bool "Xen PVHVM guest support" - default y - depends on XEN && PCI && X86_LOCAL_APIC - help - Support running as a Xen PVHVM guest. + def_bool y + depends on XEN && X86_LOCAL_APIC config XEN_PVHVM_SMP def_bool y depends on XEN_PVHVM && SMP +config XEN_PVHVM_GUEST + bool "Xen PVHVM guest support" + default y + depends on XEN_PVHVM && PCI + help + Support running as a Xen PVHVM guest. + config XEN_512GB bool "Limit Xen pv-domain memory to 512GB" depends on XEN_PV
@@ -76,7 +80,9 @@ config XEN_DEBUG_FS Enabling this option may incur a significant performance overhead. config XEN_PVH - bool "Support for running as a Xen PVH guest" + bool "Xen PVH guest support" depends on XEN && XEN_PVHVM && ACPI select PVH def_bool n + help + Support for running as a Xen PVH guest.
drivers/xen/Makefile +1 -1
@@ -21,7 +21,7 @@ obj-$(CONFIG_XEN_GNTDEV) += xen-gntdev.o obj-$(CONFIG_XEN_GRANT_DEV_ALLOC) += xen-gntalloc.o obj-$(CONFIG_XENFS) += xenfs/ obj-$(CONFIG_XEN_SYS_HYPERVISOR) += sys-hypervisor.o -obj-$(CONFIG_XEN_PVHVM) += platform-pci.o +obj-$(CONFIG_XEN_PVHVM_GUEST) += platform-pci.o obj-$(CONFIG_SWIOTLB_XEN) += swiotlb-xen.o obj-$(CONFIG_XEN_MCE_LOG) += mcelog.o obj-$(CONFIG_XEN_PCIDEV_BACKEND) += xen-pciback/
Signature · 1 line
2.26.2
Re: [PATCH 1/2] xen: Remove Xen PVH/PVHVM dependency on PCI
arch/x86/xen/Kconfig config XEN_DEBUG_FS · line 83
Quoted 6 lines · Jason Andryuk
arch/x86/xen/Kconfig +1
-1@@ -76,7 +80,9 @@ config XEN_DEBUG_FS Enabling this option may incur a significant performance overhead. config XEN_PVH - bool "Support for running as a Xen PVH guest" + bool "Xen PVH guest support"
Tangential question: Is "guest" here still appropriate, i.e. isn't this option also controlling whether the kernel can be used in a PVH Dom0?
arch/x86/xen/Kconfig config XEN_DEBUG_FS · line 86
Quoted 1 line
arch/x86/xen/Kconfig +0
-0def_bool n
And is this default still appropriate?
Jan
Re: [PATCH 1/2] xen: Remove Xen PVH/PVHVM dependency on PCI
Quoted 5 lines · Jan Beulich
Quoted 3 lines · Jason Andryuk
arch/x86/xen/Kconfig +0
-0@@ -76,7 +80,9 @@ config XEN_DEBUG_FS Enabling this option may incur a significant performance overhead.
Quoted 7 lines
arch/x86/xen/Kconfig config XEN_DEBUG_FS · line 83
Quoted 3 lines
arch/x86/xen/Kconfig +1
-1config XEN_PVH - bool "Support for running as a Xen PVH guest" + bool "Xen PVH guest support"Tangential question: Is "guest" here still appropriate, i.e. isn't this option also controlling whether the kernel can be used in a PVH Dom0?
Would you like something more generic like "Xen PVH support" and "Support for running in Xen PVH mode"?
Quoted 3 lines
arch/x86/xen/Kconfig config XEN_DEBUG_FS · line 86
Quoted 1 line
arch/x86/xen/Kconfig +0
-0def_bool nAnd is this default still appropriate?
We probably want to flip it on, yes. PVH is the future, isn't it?
Regards,
Jason
Re: [PATCH 1/2] xen: Remove Xen PVH/PVHVM dependency on PCI
Quoted 14 lines · Jason Andryuk
Quoted 5 lines · Jan Beulich
Quoted 3 lines · Jason Andryuk
arch/x86/xen/Kconfig +0
-0@@ -76,7 +80,9 @@ config XEN_DEBUG_FS Enabling this option may incur a significant performance overhead.Quoted 7 lines
arch/x86/xen/Kconfig config XEN_DEBUG_FS · line 83
Quoted 3 lines
arch/x86/xen/Kconfig +1
-1config XEN_PVH - bool "Support for running as a Xen PVH guest" + bool "Xen PVH guest support"Tangential question: Is "guest" here still appropriate, i.e. isn't this option also controlling whether the kernel can be used in a PVH Dom0?
Quoted 2 lines
Would you like something more generic like "Xen PVH support" and "Support for running in Xen PVH mode"?
Yeah, just dropping "guest" would be fine with me. No idea how to reflect that PVH Dom0 isn't supported, yet.
Jan
Re: [PATCH 1/2] xen: Remove Xen PVH/PVHVM dependency on PCI
Quoted 15 lines · Jan Beulich
Quoted 14 lines · Jason Andryuk
Quoted 12 lines · Jan Beulich
arch/x86/xen/Kconfig config XEN_DEBUG_FS · line 83
Quoted 6 lines · Jason Andryuk
arch/x86/xen/Kconfig +1
-1@@ -76,7 +80,9 @@ config XEN_DEBUG_FS Enabling this option may incur a significant performance overhead. config XEN_PVH - bool "Support for running as a Xen PVH guest" + bool "Xen PVH guest support"Tangential question: Is "guest" here still appropriate, i.e. isn't this option also controlling whether the kernel can be used in a PVH Dom0?
Quoted 5 lines
Quoted 2 lines
Would you like something more generic like "Xen PVH support" and "Support for running in Xen PVH mode"?
Yeah, just dropping "guest" would be fine with me. No idea how to reflect that PVH Dom0 isn't supported, yet.
The fact that it isn't supported by Xen shouldn't be reflected on the Linux configuration, as it's independent. Ie: you could run this Linux kernel on a future version of Xen where PVH dom0 is supported.
There's already a warning printed by Xen when booting PVH dom0 about not being a supported mode.
Thanks, Roger.
PATCH 2/2 xen: Kconfig: nest Xen guest options
In reply to Jason AndryukMoving XEN_512GB allows it to nest under XEN_PV. That also allows XEN_PVH to nest under XEN as a sibling to XEN_PV and XEN_PVHVM giving:
[*] Xen guest support
[*] Xen PV guest support
[*] Limit Xen pv-domain memory to 512GB
[*] Xen PV Dom0 support
[*] Xen PVHVM guest support
[*] Xen PVH guest support
--- arch/x86/xen/Kconfig | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-)
arch/x86/xen/Kconfig +13 -13
@@ -26,6 +26,19 @@ config XEN_PV help Support running as a Xen PV guest. +config XEN_512GB + bool "Limit Xen pv-domain memory to 512GB" + depends on XEN_PV && X86_64 + default y + help + Limit paravirtualized user domains to 512GB of RAM. + + The Xen tools and crash dump analysis tools might not support + pv-domains with more than 512 GB of RAM. This option controls the + default setting of the kernel to use only up to 512 GB or more. + It is always possible to change the default via specifying the + boot parameter "xen_512gb_limit". + config XEN_PV_SMP def_bool y depends on XEN_PV && SMP
@@ -53,19 +66,6 @@ config XEN_PVHVM_GUEST help Support running as a Xen PVHVM guest. -config XEN_512GB - bool "Limit Xen pv-domain memory to 512GB" - depends on XEN_PV - default y - help - Limit paravirtualized user domains to 512GB of RAM. - - The Xen tools and crash dump analysis tools might not support - pv-domains with more than 512 GB of RAM. This option controls the - default setting of the kernel to use only up to 512 GB or more. - It is always possible to change the default via specifying the - boot parameter "xen_512gb_limit". - config XEN_SAVE_RESTORE bool depends on XEN
Signature · 1 line
2.26.2
Re: [PATCH 2/2] xen: Kconfig: nest Xen guest options
Quoted 7 lines · Jason Andryuk
Moving
XEN_512GBallows it to nest underXEN_PV. That also allowsXEN_PVHto nest under XEN as a sibling toXEN_PVandXEN_PVHVMgiving:[*] Xen guest support
[*] Xen PV guest support
[*] Limit Xen pv-domain memory to 512GB
[*] Xen PV Dom0 support
This has currently a wrong text/semantics:
It should be split to CONFIG_XEN_DOM0 and CONFIG_XEN_PV_DOM0.
Otherwise the backends won't be enabled per default for a PVH-only config meant to be Dom0-capable.
You don't have to do that in your patches if you don't want to, but I wanted to mention it with you touching this area of Kconfig.
Quoted 4 lines
[*] Xen PVHVM guest support
[*] Xen PVH guest supportSigned-off-by Jason Andryuk <[email protected]>
Juergen
Re: [PATCH 2/2] xen: Kconfig: nest Xen guest options
Quoted 12 lines · Jürgen Groß
Quoted 7 lines · Jason Andryuk
Moving
XEN_512GBallows it to nest underXEN_PV. That also allowsXEN_PVHto nest under XEN as a sibling toXEN_PVandXEN_PVHVMgiving:[*] Xen guest support
[*] Xen PV guest support
[*] Limit Xen pv-domain memory to 512GB
[*] Xen PV Dom0 supportThis has currently a wrong text/semantics:
Quoted 7 lines
It should be split to
CONFIG_XEN_DOM0andCONFIG_XEN_PV_DOM0.Otherwise the backends won't be enabled per default for a PVH-only config meant to be Dom0-capable.
You don't have to do that in your patches if you don't want to, but I wanted to mention it with you touching this area of
Kconfig.
Yes, good point. I had not considered that.
Quoted 6 lines
Quoted 4 lines
[*] Xen PVHVM guest support
[*] Xen PVH guest supportSigned-off-by Jason Andryuk <[email protected]>Reviewed-by Juergen Gross <[email protected]>
Thanks,
Jason
[email protected]
reviewerRe: [PATCH 2/2] xen: Kconfig: nest Xen guest options
In reply to Jason Andryukarch/x86/xen/Kconfig config XEN_PV · line 31
Quoted 3 lines · Jason Andryuk
arch/x86/xen/Kconfig +3
-0+config XEN_512GB + bool "Limit Xen pv-domain memory to 512GB" + depends on XEN_PV && X86_64
Why is X86_64 needed here?
-boris
Re: [PATCH 2/2] xen: Kconfig: nest Xen guest options
Quoted 8 lines · On 15/10/2020 13:37, [email protected] wrote:
arch/x86/xen/Kconfig config XEN_PV · line 31
Quoted 3 lines · Jason Andryuk
arch/x86/xen/Kconfig +3
-0+config XEN_512GB + bool "Limit Xen pv-domain memory to 512GB" + depends on XEN_PV && X86_64Why is
X86_64needed here?512G support was implemented using a direct-mapped P2M, and is rather
beyond the virtual address capabilities of 32bit.
~Andrew
[email protected]
reviewerRe: [PATCH 2/2] xen: Kconfig: nest Xen guest options
Quoted 9 lines · Andrew Cooper
Quoted 6 lines · On 15/10/2020 13:37, [email protected] wrote:
arch/x86/xen/Kconfig config XEN_PV · line 31
Quoted 3 lines · Jason Andryuk
arch/x86/xen/Kconfig +3
-0+config XEN_512GB + bool "Limit Xen pv-domain memory to 512GB" + depends on XEN_PV && X86_64Why is
X86_64needed here?
512G support was implemented using a direct-mapped P2M, and is ratherbeyond the virtual address capabilities of 32bit.
Yes, my point was that XEN_PV already depends on X86_64.
-boris
Re: [PATCH 2/2] xen: Kconfig: nest Xen guest options
Quoted 8 lines · On Thu, Oct 15, 2020 at 9:17 AM <[email protected]> wrote:
Quoted 5 lines · Andrew Cooper
Quoted 4 lines · On 15/10/2020 13:37, [email protected] wrote:
Quoted 3 lines · Jason Andryuk
arch/x86/xen/Kconfig +3
-0+config XEN_512GB + bool "Limit Xen pv-domain memory to 512GB" + depends on XEN_PV && X86_64
Quoted 6 lines
Quoted 4 lines
Quoted 2 lines
Why is
X86_64needed here?
512G support was implemented using a direct-mapped P2M, and is ratherbeyond the virtual address capabilities of 32bit.
Yes, my point was that
XEN_PValready depends onX86_64.
Oh, thanks for catching this. I re-introduced it by accident when rebasing the patches.
Regards,
Jason
Quoted 1 line · Jason Andryuk
A Xen PVH domain doesn't have a PCI bus or devices,
[*] Yet.
Quoted 1 line
so it doesn't need PCI support built in.
Untangling the dependences is a good thing, but eventually we plan to put an optional PCI bus back in, e.g. for SRIOV usecases.
~Andrew
Quoted 5 lines · Andrew Cooper
Quoted 1 line · Jason Andryuk
A Xen PVH domain doesn't have a PCI bus or devices,
[*] Yet.
:)
Quoted 4 lines
Quoted 1 line
so it doesn't need PCI support built in.
Untangling the dependences is a good thing, but eventually we plan to put an optional PCI bus back in, e.g. for SRIOV usecases.
Yes, and to be clear this change doesn't preclude including the PCI code. I was just looking to remove code from my VMs that aren't using PCI devices.
Regards,
Jason
Jürgen Groß
maintainerQuoted 10 lines · Jason Andryuk
A Xen PVH domain doesn't have a PCI bus or devices, so it doesn't need PCI support built in. Currently,
XEN_PVHdepends onXEN_PVHVMwhich depends on PCI.The first patch introduces
XEN_PVHVM_GUESTas a toplevel item and changesXEN_PVHVMto a hidden variable. This allowsXEN_PVHto depend onXEN_PVHVMwithout PCI whileXEN_PVHVM_GUESTdepends on PCI.The second patch moves
XEN_512GBto clean up the option nesting.
Quoted 8 lines
Jason Andryuk (2):
xen: Remove Xen PVH/PVHVM dependency on PCI
xen:Kconfig: nest Xen guest optionsarch/x86/xen/Kconfig | 38 ++++++++++++++++++++++---------------- drivers/xen/Makefile | 2 +- 2 files changed, 23 insertions(+), 17 deletions(-)
Series applied to: xen/tip.git for-linus-5.11
Juergen