kernel: add new infrastructure for platform_has() support
Subsystems (10)
Juergen Gross
maintainerv3 cover kernel: add new infrastructure for platform_has() support
In another patch series [1] the need has come up to have support for a generic feature flag infrastructure.
This patch series is introducing that infrastructure and adds the first use case.
I have decided to use a similar interface as the already known x86 cpu_has() function. As the new infrastructure is meant to be usable for general and arch-specific feature flags, the flags are being spread between a general bitmap and an arch specific one.
The bitmaps start all being zero, single features can be set or reset at any time by using the related platform_[re]set_feature() functions.
The platform_has() function is using a simple test_bit() call for now, further optimization might be added when needed.
[1]: https://lore.kernel.org/lkml/[email protected]/T/#t
Juergen Gross (2):
kernel: add platform_has() infrastructure
virtio: replace arch_has_restricted_virtio_memory_access()
MAINTAINERS | 8 ++++++++ arch/s390/Kconfig | 1 - arch/s390/mm/init.c | 13 +++---------- arch/x86/Kconfig | 1 - arch/x86/mm/mem_encrypt.c | 7 ------- arch/x86/mm/mem_encrypt_amd.c | 4 ++++ drivers/virtio/Kconfig | 6 ------ drivers/virtio/virtio.c | 5 ++--- include/asm-generic/Kbuild | 1 + include/asm-generic/platform-feature.h | 8 ++++++++ include/linux/platform-feature.h | 19 ++++++++++++++++++ include/linux/virtio_config.h | 9 --------- kernel/Makefile | 2 +- kernel/platform-feature.c | 27 ++++++++++++++++++++++++++ 14 files changed, 73 insertions(+), 38 deletions(-) create mode 100644 include/asm-generic/platform-feature.h create mode 100644 include/linux/platform-feature.h create mode 100644 kernel/platform-feature.c
Signature · 1 line
2.35.3
Juergen Gross
maintainerPATCH v3 1/2 kernel: add platform_has() infrastructure
Add a simple infrastructure for setting, resetting and querying platform feature flags.
Flags can be either global or architecture specific.
---
V2:
- rename set/reset functions to platform_[set|clear]() (Boris Petkov, Heiko Carstens)
- move function implementations to c file (Boris Petkov)
--- MAINTAINERS | 8 ++++++++ include/asm-generic/Kbuild | 1 + include/asm-generic/platform-feature.h | 8 ++++++++ include/linux/platform-feature.h | 15 ++++++++++++++ kernel/Makefile | 2 +- kernel/platform-feature.c | 27 ++++++++++++++++++++++++++ 6 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 include/asm-generic/platform-feature.h create mode 100644 include/linux/platform-feature.h create mode 100644 kernel/platform-feature.c
MAINTAINERS +8 -0
@@ -15657,6 +15657,14 @@ S: Maintained F: Documentation/devicetree/bindings/iio/chemical/plantower,pms7003.yaml F: drivers/iio/chemical/pms7003.c +PLATFORM FEATURE INFRASTRUCTURE +M: Juergen Gross <[email protected]> +S: Maintained +F: arch/*/include/asm/platform-feature.h +F: include/asm-generic/platform-feature.h +F: include/linux/platform-feature.h +F: kernel/platform-feature.c + PLDMFW LIBRARY M: Jacob Keller <[email protected]> S: Maintained
include/asm-generic/Kbuild +1 -0
@@ -44,6 +44,7 @@ mandatory-y += msi.h mandatory-y += pci.h mandatory-y += percpu.h mandatory-y += pgalloc.h +mandatory-y += platform-feature.h mandatory-y += preempt.h mandatory-y += rwonce.h mandatory-y += sections.h
include/asm-generic/platform-feature.h new file +8 -0
@@ -0,0 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _ASM_GENERIC_PLATFORM_FEATURE_H +#define _ASM_GENERIC_PLATFORM_FEATURE_H + +/* Number of arch specific feature flags. */ +#define PLATFORM_ARCH_FEAT_N 0 + +#endif /* _ASM_GENERIC_PLATFORM_FEATURE_H */
include/linux/platform-feature.h new file +15 -0
@@ -0,0 +1,15 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _PLATFORM_FEATURE_H +#define _PLATFORM_FEATURE_H + +#include <linux/bitops.h> +#include <asm/platform-feature.h> + +/* The platform features are starting with the architecture specific ones. */ +#define PLATFORM_FEAT_N (0 + PLATFORM_ARCH_FEAT_N) + +void platform_set (unsigned int feature); +void platform_clear (unsigned int feature); +bool platform_has (unsigned int feature); + +#endif /* _PLATFORM_FEATURE_H */
kernel/Makefile +1 -1
@@ -7,7 +7,7 @@ obj-y = fork.o exec_domain.o panic.o \ cpu.o exit.o softirq.o resource.o \ sysctl.o capability.o ptrace.o user.o \ signal.o sys.o umh.o workqueue.o pid.o task_work.o \ - extable.o params.o \ + extable.o params.o platform-feature.o \ kthread.o sys_ni.o nsproxy.o \ notifier.o ksysfs.o cred.o reboot.o \ async.o range.o smpboot.o ucount.o regset.o
kernel/platform-feature.c new file +27 -0
@@ -0,0 +1,27 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include <linux/bitops.h> +#include <linux/cache.h> +#include <linux/export.h> +#include <linux/platform-feature.h> + +#define PLATFORM_FEAT_ARRAY_SZ BITS_TO_LONGS(PLATFORM_FEAT_N) +static unsigned long __read_mostly platform_features[PLATFORM_FEAT_ARRAY_SZ ]; + +void platform_set (unsigned int feature) +{ +set_bit (feature, platform_features); +} +EXPORT_SYMBOL_GPL (platform_set); + +void platform_clear (unsigned int feature) +{ +clear_bit (feature, platform_features); +} +EXPORT_SYMBOL_GPL (platform_clear); + +bool platform_has (unsigned int feature) +{ +return test_bit (feature, platform_features); +} +EXPORT_SYMBOL_GPL (platform_has);
Signature · 6 lines
2.35.3 _______________________________________________ Virtualization mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Re: [PATCH v3 1/2] kernel: add platform_has() infrastructure
Looks good:
_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Re: [PATCH v3 1/2] kernel: add platform_has() infrastructure
In reply to Juergen GrossQuoted 19 lines · Juergen Gross
Add a simple infrastructure for setting, resetting and querying platform feature flags.
Flags can be either global or architecture specific.
Signed-off-by Juergen Gross <[email protected]>---
V2:
- rename set/reset functions to platform_[set|clear]() (Boris Petkov, Heiko Carstens)
- move function implementations to c file (Boris Petkov)
---MAINTAINERS | 8 ++++++++ include/asm-generic/Kbuild | 1 + include/asm-generic/platform-feature.h | 8 ++++++++ include/linux/platform-feature.h | 15 ++++++++++++++ kernel/Makefile | 2 +- kernel/platform-feature.c | 27 ++++++++++++++++++++++++++ 6 files changed, 60 insertions(+), 1 deletion(-)
Quoted 3 lines
create mode 100644
include/asm-generic/platform-feature.hcreate mode 100644include/linux/platform-feature.hcreate mode 100644kernel/platform-feature.c
Nice and simple, I like.
Signature · 1 line
Sent from a device which is good for reading mail but awful for writing. Please excuse any shortcomings.
Juergen Gross
maintainerPATCH v3 2/2 virtio: replace arch_has_restricted_virtio_memory_access()
In reply to Juergen GrossInstead of using arch_has_restricted_virtio_memory_access() together with CONFIG_ARCH_HAS_RESTRICTED_VIRTIO_MEMORY_ACCESS, replace those with platform_has() and a new platform feature PLATFORM_VIRTIO_RESTRICTED_MEM_ACCESS.
---
V2:
- move setting of PLATFORM_VIRTIO_RESTRICTED_MEM_ACCESS in SEV case to sev_setup_arch().
V3:
- remove Hyper-V chunk (Michael Kelley)
- remove include virtio_config.h from mem_encrypt.c (Oleksandr Tyshchenko)
- add comment for PLATFORM_VIRTIO_RESTRICTED_MEM_ACCESS (Oleksandr Tyshchenko)
--- arch/s390/Kconfig | 1 - arch/s390/mm/init.c | 13 +++---------- arch/x86/Kconfig | 1 - arch/x86/mm/mem_encrypt.c | 7 ------- arch/x86/mm/mem_encrypt_amd.c | 4 ++++ drivers/virtio/Kconfig | 6 ------ drivers/virtio/virtio.c | 5 ++--- include/linux/platform-feature.h | 6 +++++- include/linux/virtio_config.h | 9 --------- 9 files changed, 14 insertions(+), 38 deletions(-)
arch/s390/Kconfig +0 -1
@@ -772,7 +772,6 @@ menu "Virtualization" config PROTECTED_VIRTUALIZATION_GUEST def_bool n prompt "Protected virtualization guest support" - select ARCH_HAS_RESTRICTED_VIRTIO_MEMORY_ACCESS help Select this option, if you want to be able to run this kernel as a protected virtualization KVM guest.
arch/s390/mm/init.c +3 -10
@@ -31,6 +31,7 @@#include <linux/cma.h> #include <linux/gfp.h> #include <linux/dma-direct.h> +#include <linux/platform-feature.h> #include <asm/processor.h> #include <linux/uaccess.h> #include <asm/pgalloc.h>
@@ -168,22 +169,14 @@ bool force_dma_unencrypted(struct device *dev)return is_prot_virt_guest (); } -#ifdef CONFIG_ARCH_HAS_RESTRICTED_VIRTIO_MEMORY_ACCESS - -int arch_has_restricted_virtio_memory_access (void ) -{ -return is_prot_virt_guest (); -} -EXPORT_SYMBOL (arch_has_restricted_virtio_memory_access); - -#endif -/* protected virtualization */ static void pv_init (void ) {if (!is_prot_virt_guest ())return ; +platform_set (PLATFORM_VIRTIO_RESTRICTED_MEM_ACCESS ); +/* make sure bounce buffers are shared */ swiotlb_force =SWIOTLB_FORCE ;swiotlb_init (1 );
arch/x86/Kconfig +0 -1
@@ -1515,7 +1515,6 @@ config X86_CPA_STATISTICS config X86_MEM_ENCRYPT select ARCH_HAS_FORCE_DMA_UNENCRYPTED select DYNAMIC_PHYSICAL_MASK - select ARCH_HAS_RESTRICTED_VIRTIO_MEMORY_ACCESS def_bool n config AMD_MEM_ENCRYPT
arch/x86/mm/mem_encrypt.c +0 -7
@@ -12,7 +12,6 @@#include <linux/swiotlb.h> #include <linux/cc_platform.h> #include <linux/mem_encrypt.h> -#include <linux/virtio_config.h> /* Override for DMA direct allocation check - ARCH_HAS_FORCE_DMA_UNENCRYPTED */ bool force_dma_unencrypted (struct device *dev)
@@ -76,9 +75,3 @@ void __init mem_encrypt_init(void)print_mem_encrypt_feature_info (); } - -int arch_has_restricted_virtio_memory_access (void ) -{ -return cc_platform_has (CC_ATTR_GUEST_MEM_ENCRYPT ); -} -EXPORT_SYMBOL_GPL (arch_has_restricted_virtio_memory_access);
arch/x86/mm/mem_encrypt_amd.c +4 -0
@@ -21,6 +21,7 @@#include <linux/dma-mapping.h> #include <linux/virtio_config.h> #include <linux/cc_platform.h> +#include <linux/platform-feature.h> #include <asm/tlbflush.h> #include <asm/fixmap.h>
@@ -206,6 +207,9 @@ void __init sev_setup_arch(void) size = total_mem *6 /100 ; size =clamp_val (size,IO_TLB_DEFAULT_SIZE ,SZ_1G );swiotlb_adjust_size (size); + +/* Set restricted memory access for virtio. */ +platform_set (PLATFORM_VIRTIO_RESTRICTED_MEM_ACCESS ); }static unsigned long pg_level_to_pfn (int level,pte_t *kpte,pgprot_t *ret_prot)
drivers/virtio/Kconfig +0 -6
@@ -6,12 +6,6 @@ config VIRTIO bus, such as CONFIG_VIRTIO_PCI, CONFIG_VIRTIO_MMIO, CONFIG_RPMSG or CONFIG_S390_GUEST. -config ARCH_HAS_RESTRICTED_VIRTIO_MEMORY_ACCESS - bool - help - This option is selected if the architecture may need to enforce - VIRTIO_F_ACCESS_PLATFORM - config VIRTIO_PCI_LIB tristate help
drivers/virtio/virtio.c +2 -3
@@ -5,6 +5,7 @@#include <linux/module.h> #include <linux/idr.h> #include <linux/of.h> +#include <linux/platform-feature.h> #include <uapi/linux/virtio_ids.h> /* Unique numbering for virtio devices. */
@@ -170,12 +171,10 @@ EXPORT_SYMBOL_GPL(virtio_add_status);static int virtio_features_ok (struct virtio_device *dev) {unsigned status; -int ret;might_sleep (); - ret =arch_has_restricted_virtio_memory_access (); -if (ret) { +if (platform_has (PLATFORM_VIRTIO_RESTRICTED_MEM_ACCESS )) {if (!virtio_has_feature (dev,VIRTIO_F_VERSION_1 )) {dev_warn (&dev->dev,"device must provide VIRTIO_F_VERSION_1\n" );
include/linux/platform-feature.h +5 -1
@@ -6,7 +6,11 @@#include <asm/platform-feature.h> /* The platform features are starting with the architecture specific ones. */ -#define PLATFORM_FEAT_N (0 + PLATFORM_ARCH_FEAT_N) + +/* Used to enable platform specific DMA handling for virtio devices. */ +#define PLATFORM_VIRTIO_RESTRICTED_MEM_ACCESS (0 + PLATFORM_ARCH_FEAT_N) + +#define PLATFORM_FEAT_N (1 + PLATFORM_ARCH_FEAT_N)void platform_set (unsigned int feature);void platform_clear (unsigned int feature);
include/linux/virtio_config.h +0 -9
@@ -559,13 +559,4 @@ static inline void virtio_cwrite64(struct virtio_device *vdev, _r; \ }) -#ifdef CONFIG_ARCH_HAS_RESTRICTED_VIRTIO_MEMORY_ACCESS -int arch_has_restricted_virtio_memory_access (void ); -#else -static inline int arch_has_restricted_virtio_memory_access (void ) -{ -return 0 ; -} -#endif /* CONFIG_ARCH_HAS_RESTRICTED_VIRTIO_MEMORY_ACCESS */ -#endif /* _LINUX_VIRTIO_CONFIG_H */
Signature · 6 lines
2.35.3 _______________________________________________ Virtualization mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Re: [PATCH v3 2/2] virtio: replace arch_has_restricted_virtio_memory_access()
Looks good:
_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Re: [PATCH v3 2/2] virtio: replace arch_has_restricted_virtio_memory_access()
In reply to Juergen GrossQuoted 15 lines · Juergen Gross
Instead of using
arch_has_restricted_virtio_memory_access()together withCONFIG_ARCH_HAS_RESTRICTED_VIRTIO_MEMORY_ACCESS, replace those withplatform_has()and a new platform featurePLATFORM_VIRTIO_RESTRICTED_MEM_ACCESS.Signed-off-by Juergen Gross <[email protected]>---
V2:
- move setting ofPLATFORM_VIRTIO_RESTRICTED_MEM_ACCESSin SEV case tosev_setup_arch().
V3:
- remove Hyper-V chunk (Michael Kelley)
- remove includevirtio_config.hfrommem_encrypt.c(Oleksandr Tyshchenko)
- add comment forPLATFORM_VIRTIO_RESTRICTED_MEM_ACCESS(Oleksandr Tyshchenko)
---
Quoted 10 lines
arch/s390/Kconfig | 1 - arch/s390/mm/init.c | 13 +++---------- arch/x86/Kconfig | 1 - arch/x86/mm/mem_encrypt.c | 7 ------- arch/x86/mm/mem_encrypt_amd.c | 4 ++++ drivers/virtio/Kconfig | 6 ------ drivers/virtio/virtio.c | 5 ++--- include/linux/platform-feature.h | 6 +++++- include/linux/virtio_config.h | 9 --------- 9 files changed, 14 insertions(+), 38 deletions(-)
Signature · 1 line
Sent from a device which is ok for reading mail but awful for writing. Please excuse any shortcomings.
Juergen Gross
maintainerRe: [PATCH v3 2/2] virtio: replace arch_has_restricted_virtio_memory_access()
In reply to Juergen GrossQuoted 6 lines · Juergen Gross
Instead of using
arch_has_restricted_virtio_memory_access()together withCONFIG_ARCH_HAS_RESTRICTED_VIRTIO_MEMORY_ACCESS, replace those withplatform_has()and a new platform featurePLATFORM_VIRTIO_RESTRICTED_MEM_ACCESS.Signed-off-by Juergen Gross <[email protected]>
Could I get some feedback from the s390 side, please?
Juergen
Quoted 193 lines
---
V2:
- move setting ofPLATFORM_VIRTIO_RESTRICTED_MEM_ACCESSin SEV case tosev_setup_arch().
V3:
- remove Hyper-V chunk (Michael Kelley)
- remove includevirtio_config.hfrommem_encrypt.c(Oleksandr Tyshchenko)
- add comment forPLATFORM_VIRTIO_RESTRICTED_MEM_ACCESS(Oleksandr Tyshchenko)--- arch/s390/Kconfig | 1 - arch/s390/mm/init.c | 13 +++---------- arch/x86/Kconfig | 1 - arch/x86/mm/mem_encrypt.c | 7 ------- arch/x86/mm/mem_encrypt_amd.c | 4 ++++ drivers/virtio/Kconfig | 6 ------ drivers/virtio/virtio.c | 5 ++--- include/linux/platform-feature.h | 6 +++++- include/linux/virtio_config.h | 9 --------- 9 files changed, 14 insertions(+), 38 deletions(-)arch/s390/Kconfig +0
-1@@ -772,7 +772,6 @@ menu "Virtualization" config PROTECTED_VIRTUALIZATION_GUEST def_bool n prompt "Protected virtualization guest support" - select ARCH_HAS_RESTRICTED_VIRTIO_MEMORY_ACCESS help Select this option, if you want to be able to run this kernel as a protected virtualization KVM guest.arch/s390/mm/init.c +3
-10@@ -31,6 +31,7 @@#include <linux/cma.h> #include <linux/gfp.h> #include <linux/dma-direct.h> +#include <linux/platform-feature.h> #include <asm/processor.h> #include <linux/uaccess.h> #include <asm/pgalloc.h> @@ -168,22 +169,14 @@ bool force_dma_unencrypted(struct device *dev)return is_prot_virt_guest (); } -#ifdef CONFIG_ARCH_HAS_RESTRICTED_VIRTIO_MEMORY_ACCESS - -int arch_has_restricted_virtio_memory_access (void ) -{ -return is_prot_virt_guest (); -} -EXPORT_SYMBOL (arch_has_restricted_virtio_memory_access); - -#endif -/* protected virtualization */ static void pv_init (void ) {if (!is_prot_virt_guest ())return ; +platform_set (PLATFORM_VIRTIO_RESTRICTED_MEM_ACCESS ); +/* make sure bounce buffers are shared */ swiotlb_force =SWIOTLB_FORCE ;swiotlb_init (1 );arch/x86/Kconfig +0
-1@@ -1515,7 +1515,6 @@ config X86_CPA_STATISTICS config X86_MEM_ENCRYPT select ARCH_HAS_FORCE_DMA_UNENCRYPTED select DYNAMIC_PHYSICAL_MASK - select ARCH_HAS_RESTRICTED_VIRTIO_MEMORY_ACCESS def_bool n config AMD_MEM_ENCRYPTarch/x86/mm/mem_encrypt.c +0
-7@@ -12,7 +12,6 @@#include <linux/swiotlb.h> #include <linux/cc_platform.h> #include <linux/mem_encrypt.h> -#include <linux/virtio_config.h> /* Override for DMA direct allocation check - ARCH_HAS_FORCE_DMA_UNENCRYPTED */ bool force_dma_unencrypted (struct device *dev)@@ -76,9 +75,3 @@ void __init mem_encrypt_init(void)print_mem_encrypt_feature_info (); } - -int arch_has_restricted_virtio_memory_access (void ) -{ -return cc_platform_has (CC_ATTR_GUEST_MEM_ENCRYPT ); -} -EXPORT_SYMBOL_GPL (arch_has_restricted_virtio_memory_access);arch/x86/mm/mem_encrypt_amd.c +4
-0@@ -21,6 +21,7 @@#include <linux/dma-mapping.h> #include <linux/virtio_config.h> #include <linux/cc_platform.h> +#include <linux/platform-feature.h> #include <asm/tlbflush.h> #include <asm/fixmap.h> @@ -206,6 +207,9 @@ void __init sev_setup_arch(void) size = total_mem *6 /100 ; size =clamp_val (size,IO_TLB_DEFAULT_SIZE ,SZ_1G );swiotlb_adjust_size (size); + +/* Set restricted memory access for virtio. */ +platform_set (PLATFORM_VIRTIO_RESTRICTED_MEM_ACCESS ); }static unsigned long pg_level_to_pfn (int level,pte_t *kpte,pgprot_t *ret_prot)drivers/virtio/Kconfig +0
-6@@ -6,12 +6,6 @@ config VIRTIO bus, such as CONFIG_VIRTIO_PCI, CONFIG_VIRTIO_MMIO, CONFIG_RPMSG or CONFIG_S390_GUEST. -config ARCH_HAS_RESTRICTED_VIRTIO_MEMORY_ACCESS - bool - help - This option is selected if the architecture may need to enforce - VIRTIO_F_ACCESS_PLATFORM - config VIRTIO_PCI_LIB tristate helpdrivers/virtio/virtio.c +2
-3@@ -5,6 +5,7 @@#include <linux/module.h> #include <linux/idr.h> #include <linux/of.h> +#include <linux/platform-feature.h> #include <uapi/linux/virtio_ids.h> /* Unique numbering for virtio devices. */ @@ -170,12 +171,10 @@ EXPORT_SYMBOL_GPL(virtio_add_status);static int virtio_features_ok (struct virtio_device *dev) {unsigned status; -int ret;might_sleep (); - ret =arch_has_restricted_virtio_memory_access (); -if (ret) { +if (platform_has (PLATFORM_VIRTIO_RESTRICTED_MEM_ACCESS )) {if (!virtio_has_feature (dev,VIRTIO_F_VERSION_1 )) {dev_warn (&dev->dev,"device must provide VIRTIO_F_VERSION_1\n" );include/linux/platform-feature.h +5
-1@@ -6,7 +6,11 @@#include <asm/platform-feature.h> /* The platform features are starting with the architecture specific ones. */ -#define PLATFORM_FEAT_N (0 + PLATFORM_ARCH_FEAT_N) + +/* Used to enable platform specific DMA handling for virtio devices. */ +#define PLATFORM_VIRTIO_RESTRICTED_MEM_ACCESS (0 + PLATFORM_ARCH_FEAT_N) + +#define PLATFORM_FEAT_N (1 + PLATFORM_ARCH_FEAT_N)void platform_set (unsigned int feature);void platform_clear (unsigned int feature);include/linux/virtio_config.h +0
-0@@ -559,13 +559,4 @@ static inline void virtio_cwrite64(struct virtio_device *vdev, _r; \ })
include/linux/virtio_config.h static inline void virtio_cwrite64(struct virtio_device *vdev, · line 562
Quoted 10 lines
include/linux/virtio_config.h +0
-9-#ifdef CONFIG_ARCH_HAS_RESTRICTED_VIRTIO_MEMORY_ACCESS -int arch_has_restricted_virtio_memory_access (void ); -#else -static inline int arch_has_restricted_virtio_memory_access (void ) -{ -return 0 ; -} -#endif /* CONFIG_ARCH_HAS_RESTRICTED_VIRTIO_MEMORY_ACCESS */ -#endif /* _LINUX_VIRTIO_CONFIG_H */
_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
On 04.05.22 18:57, Juergen Gross wrote:
Hello Juergen
Quoted 11 lines
In another patch series [1] the need has come up to have support for a generic feature flag infrastructure.
This patch series is introducing that infrastructure and adds the first use case.
I have decided to use a similar interface as the already known x86
cpu_has()function. As the new infrastructure is meant to be usable for general and arch-specific feature flags, the flags are being spread between a general bitmap and an arch specific one.
Quoted 7 lines
The bitmaps start all being zero, single features can be set or reset at any time by using the related platform_[re]set_feature() functions.
The
platform_has()function is using a simpletest_bit()call for now, further optimization might be added when needed.
For both patches:
Also I haven't faced any issues with testing current series (w/ and w/o xen-virtio series [1] applied) in Xen guest (Linux v5.18-rc4) on Arm64 based board.
So, you can also add:
[Arm64 only]
Thanks!
Note, I reworked patch #3 [1] to use new platform_xxx functionality:
arch/arm/xen/enlighten.c +0 -0
@@ -443,6 +443,8 @@ static int __init xen_guest_init(void)
if (!xen_domain())
return 0;
+ xen_set_restricted_virtio_memory_access(); +
if (!acpi_disabled) xen_acpi_guest_init(); else
arch/x86/xen/enlighten_hvm.c +0 -0
@@ -195,6 +195,8 @@ static void __init xen_hvm_guest_init(void)
if (xen_pv_domain())
return;
+ xen_set_restricted_virtio_memory_access(); +
init_hvm_pv_info();
reserve_shared_info();
arch/x86/xen/enlighten_pv.c +0 -0
@@ -109,6 +109,8 @@ static DEFINE_PER_CPU(struct tls_descs, shadow_tls_desc);
static void __init xen_pv_init_platform(void)
{
+ xen_set_restricted_virtio_memory_access();
+ populate_extra_pte(fix_to_virt(FIX_PARAVIRT_BOOTMAP));
set_fixmap(FIX_PARAVIRT_BOOTMAP, xen_start_info->shared_info);
drivers/xen/Kconfig +0 -0
@@ -339,4 +339,15 @@ config XEN_GRANT_DMA_OPS
bool
select DMA_OPS
+config XEN_VIRTIO
+ bool "Xen virtio support"
+ depends on VIRTIO
+ select XEN_GRANT_DMA_OPS
+ help
+ Enable virtio support for running as Xen guest. Depending on the + guest type this will require special support on the backend side + (qemu or kernel, depending on the virtio device types used). +
+ If in doubt, say n.
+
endmenu
include/xen/xen.h +0 -0
@@ -52,6 +52,14 @@ bool xen_biovec_phys_mergeable(const struct bio_vec *vec1,
extern u64 xen_saved_max_mem_size;
#endif
+#include <linux/platform-feature.h>
+
+static inline void xen_set_restricted_virtio_memory_access(void) +{
+ if (IS_ENABLED(CONFIG_XEN_VIRTIO) && xen_domain())
+ platform_set(PLATFORM_VIRTIO_RESTRICTED_MEM_ACCESS);
+}
+
#ifdef CONFIG_XEN_UNPOPULATED_ALLOC
int xen_alloc_unpopulated_pages(unsigned int nr_pages, struct page **pages); void xen_free_unpopulated_pages(unsigned int nr_pages, struct page **pages); (END)
Quoted 24 lines
Juergen Gross (2):
kernel: addplatform_has()infrastructure
virtio: replacearch_has_restricted_virtio_memory_access()MAINTAINERS | 8 ++++++++ arch/s390/Kconfig | 1 - arch/s390/mm/init.c | 13 +++---------- arch/x86/Kconfig | 1 - arch/x86/mm/mem_encrypt.c | 7 ------- arch/x86/mm/mem_encrypt_amd.c | 4 ++++ drivers/virtio/Kconfig | 6 ------ drivers/virtio/virtio.c | 5 ++--- include/asm-generic/Kbuild | 1 + include/asm-generic/platform-feature.h | 8 ++++++++ include/linux/platform-feature.h | 19 ++++++++++++++++++ include/linux/virtio_config.h | 9 --------- kernel/Makefile | 2 +- kernel/platform-feature.c | 27 ++++++++++++++++++++++++++ 14 files changed, 73 insertions(+), 38 deletions(-)create mode 100644
include/asm-generic/platform-feature.hcreate mode 100644include/linux/platform-feature.hcreate mode 100644kernel/platform-feature.c
Signature · 3 lines
Regards, Oleksandr Tyshchenko