Add RISC-V ISA extensions based on Linux-6.11
Subsystems (3)
cover Add RISC-V ISA extensions based on Linux-6.11
This series adds support for new ISA extensions based on Linux-6.11
namely: Zawrs, Zca, Zcb, Zcd, Zcf, Zcmop, and Zimop.
These patches can also be found in the riscv_more_exts_round4_v1 branch
at: https://github.com/avpatel/kvmtool.git
Anup Patel (8):
Sync-up headers with Linux-6.11-rc4 kernel
riscv: Add Zawrs extension support
riscv: Add Zca extension support
riscv: Add Zcb extension support
riscv: Add Zcd extension support
riscv: Add Zcf extension support
riscv: Add Zcmop extension support
riscv: Add Zimop extension support
include/linux/kvm.h | 27 +++++++++++++++- powerpc/include/asm/kvm.h | 3 ++ riscv/fdt.c | 7 +++++ riscv/include/asm/kvm.h | 7 +++++ riscv/include/kvm/kvm-config-arch.h | 21 +++++++++++++ x86/include/asm/kvm.h | 49 +++++++++++++++++++++++++++++ 6 files changed, 113 insertions(+), 1 deletion(-)
Signature · 1 line
2.43.0
PATCH 1/8 Sync-up headers with Linux-6.11-rc4 kernel
We sync-up Linux headers to get latest KVM RISC-V headers having Zawrs support.
--- include/linux/kvm.h | 27 ++++++++++++++++++++- powerpc/include/asm/kvm.h | 3 +++ riscv/include/asm/kvm.h | 7 ++++++ x86/include/asm/kvm.h | 49 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 85 insertions(+), 1 deletion(-)
include/linux/kvm.h +26 -1
@@ -192,11 +192,24 @@ struct kvm_xen_exit {/* Flags that describe what fields in emulation_failure hold valid data. */ #define KVM_INTERNAL_ERROR_EMULATION_FLAG_INSTRUCTION_BYTES (1ULL << 0) +/* +* struct kvm_run can be modified by userspace@any time, so KVM must be +* careful to avoid TOCTOU bugs. In order to protect KVM, HINT_UNSAFE_IN_KVM() +* renames fields in struct kvm_run from <symbol> to <symbol>__unsafe when +* compiled into the kernel, ensuring that any use within KVM is obvious and +* gets extra scrutiny. +*/ +#ifdef __KERNEL__ +#define HINT_UNSAFE_IN_KVM (_symbol) _symbol##__unsafe +#else +#define HINT_UNSAFE_IN_KVM (_symbol) _symbol +#endif +/* for KVM_RUN, returned by mmap(vcpu_fd, offset=0) */ struct kvm_run {/* in */ __u8 request_interrupt_window; -__u8 immediate_exit; +__u8 HINT_UNSAFE_IN_KVM(immediate_exit );__u8 padding1[6 ];/* out */
@@ -917,6 +930,9 @@ struct kvm_enable_cap {#define KVM_CAP_MEMORY_ATTRIBUTES 233#define KVM_CAP_GUEST_MEMFD 234#define KVM_CAP_VM_TYPES 235 +#define KVM_CAP_PRE_FAULT_MEMORY 236 +#define KVM_CAP_X86_APIC_BUS_CYCLES_NS 237 +#define KVM_CAP_X86_GUEST_MODE 238struct kvm_irq_routing_irqchip {__u32 irqchip;
@@ -1548,4 +1564,13 @@ struct kvm_create_guest_memfd { __u64 reserved[6]; }; +#define KVM_PRE_FAULT_MEMORY _IOWR(KVMIO, 0xd5, struct kvm_pre_fault_memory) + +struct kvm_pre_fault_memory { +__u64 gpa; +__u64 size; +__u64 flags; +__u64 padding[5 ]; +}; +#endif /* __LINUX_KVM_H */
powerpc/include/asm/kvm.h +3 -0
@@ -645,6 +645,9 @@ struct kvm_ppc_cpu_char {#define KVM_REG_PPC_SIER3 (KVM_REG_PPC | KVM_REG_SIZE_U64 | 0xc3)#define KVM_REG_PPC_DAWR1 (KVM_REG_PPC | KVM_REG_SIZE_U64 | 0xc4)#define KVM_REG_PPC_DAWRX1 (KVM_REG_PPC | KVM_REG_SIZE_U64 | 0xc5) +#define KVM_REG_PPC_DEXCR (KVM_REG_PPC | KVM_REG_SIZE_U64 | 0xc6) +#define KVM_REG_PPC_HASHKEYR (KVM_REG_PPC | KVM_REG_SIZE_U64 | 0xc7) +#define KVM_REG_PPC_HASHPKEYR (KVM_REG_PPC | KVM_REG_SIZE_U64 | 0xc8)/* Transactional Memory checkpointed state: * This is all GPRs, all VSX regs and a subset of SPRs
riscv/include/asm/kvm.h +7 -0
@@ -168,6 +168,13 @@ enum KVM_RISCV_ISA_EXT_ID {KVM_RISCV_ISA_EXT_ZTSO ,KVM_RISCV_ISA_EXT_ZACAS ,KVM_RISCV_ISA_EXT_SSCOFPMF , +KVM_RISCV_ISA_EXT_ZIMOP , +KVM_RISCV_ISA_EXT_ZCA , +KVM_RISCV_ISA_EXT_ZCB , +KVM_RISCV_ISA_EXT_ZCD , +KVM_RISCV_ISA_EXT_ZCF , +KVM_RISCV_ISA_EXT_ZCMOP , +KVM_RISCV_ISA_EXT_ZAWRS , KVM_RISCV_ISA_EXT_MAX, };
x86/include/asm/kvm.h +49 -0
72 lines not on this page · raw message
Signature · 1 line
2.43.0
PATCH 2/8 riscv: Add Zawrs extension support
In reply to Anup PatelWhen the Zawrs extension is available expose it to the guest via device tree so that guest can use it.
--- riscv/fdt.c | 1 + riscv/include/kvm/kvm-config-arch.h | 3 +++ 2 files changed, 4 insertions(+)
riscv/fdt.c +1 -0
@@ -24,6 +24,7 @@ struct isa_ext_info isa_info_arr[] = { {"svnapot", KVM_RISCV_ISA_EXT_SVNAPOT}, {"svpbmt", KVM_RISCV_ISA_EXT_SVPBMT}, {"zacas", KVM_RISCV_ISA_EXT_ZACAS}, + {"zawrs", KVM_RISCV_ISA_EXT_ZAWRS}, {"zba", KVM_RISCV_ISA_EXT_ZBA}, {"zbb", KVM_RISCV_ISA_EXT_ZBB}, {"zbc", KVM_RISCV_ISA_EXT_ZBC},
riscv/include/kvm/kvm-config-arch.h +3 -0
@@ -49,6 +49,9 @@ struct kvm_config_arch {OPT_BOOLEAN ('\0' ,"disable-zacas" , \ &(cfg)->ext_disabled[KVM_RISCV_ISA_EXT_ZACAS ], \"Disable Zacas Extension" ), \ +OPT_BOOLEAN ('\0' ,"disable-zawrs" , \ + &(cfg)->ext_disabled[KVM_RISCV_ISA_EXT_ZAWRS ], \ +"Disable Zawrs Extension" ), \OPT_BOOLEAN ('\0' ,"disable-zba" , \ &(cfg)->ext_disabled[KVM_RISCV_ISA_EXT_ZBA ], \ "Disable Zba Extension"), \
Signature · 1 line
2.43.0
PATCH 3/8 riscv: Add Zca extension support
In reply to Anup PatelWhen the Zca extension is available expose it to the guest via device tree so that guest can use it.
--- riscv/fdt.c | 1 + riscv/include/kvm/kvm-config-arch.h | 3 +++ 2 files changed, 4 insertions(+)
riscv/fdt.c +1 -0
@@ -32,6 +32,7 @@ struct isa_ext_info isa_info_arr[] = { {"zbkc", KVM_RISCV_ISA_EXT_ZBKC}, {"zbkx", KVM_RISCV_ISA_EXT_ZBKX}, {"zbs", KVM_RISCV_ISA_EXT_ZBS}, + {"zca", KVM_RISCV_ISA_EXT_ZCA}, {"zfa", KVM_RISCV_ISA_EXT_ZFA}, {"zfh", KVM_RISCV_ISA_EXT_ZFH}, {"zfhmin", KVM_RISCV_ISA_EXT_ZFHMIN},
riscv/include/kvm/kvm-config-arch.h +3 -0
@@ -73,6 +73,9 @@ struct kvm_config_arch {OPT_BOOLEAN ('\0' ,"disable-zbs" , \ &(cfg)->ext_disabled[KVM_RISCV_ISA_EXT_ZBS ], \"Disable Zbs Extension" ), \ +OPT_BOOLEAN ('\0' ,"disable-zca" , \ + &(cfg)->ext_disabled[KVM_RISCV_ISA_EXT_ZCA ], \ +"Disable Zca Extension" ), \OPT_BOOLEAN ('\0' ,"disable-zfa" , \ &(cfg)->ext_disabled[KVM_RISCV_ISA_EXT_ZFA ], \ "Disable Zfa Extension"), \
Signature · 1 line
2.43.0
PATCH 4/8 riscv: Add Zcb extension support
In reply to Anup PatelWhen the Zcb extension is available expose it to the guest via device tree so that guest can use it.
--- riscv/fdt.c | 1 + riscv/include/kvm/kvm-config-arch.h | 3 +++ 2 files changed, 4 insertions(+)
riscv/fdt.c +1 -0
@@ -33,6 +33,7 @@ struct isa_ext_info isa_info_arr[] = { {"zbkx", KVM_RISCV_ISA_EXT_ZBKX}, {"zbs", KVM_RISCV_ISA_EXT_ZBS}, {"zca", KVM_RISCV_ISA_EXT_ZCA}, + {"zcb", KVM_RISCV_ISA_EXT_ZCB}, {"zfa", KVM_RISCV_ISA_EXT_ZFA}, {"zfh", KVM_RISCV_ISA_EXT_ZFH}, {"zfhmin", KVM_RISCV_ISA_EXT_ZFHMIN},
riscv/include/kvm/kvm-config-arch.h +3 -0
@@ -76,6 +76,9 @@ struct kvm_config_arch {OPT_BOOLEAN ('\0' ,"disable-zca" , \ &(cfg)->ext_disabled[KVM_RISCV_ISA_EXT_ZCA ], \"Disable Zca Extension" ), \ +OPT_BOOLEAN ('\0' ,"disable-zcb" , \ + &(cfg)->ext_disabled[KVM_RISCV_ISA_EXT_ZCB ], \ +"Disable Zcb Extension" ), \OPT_BOOLEAN ('\0' ,"disable-zfa" , \ &(cfg)->ext_disabled[KVM_RISCV_ISA_EXT_ZFA ], \ "Disable Zfa Extension"), \
Signature · 1 line
2.43.0
PATCH 5/8 riscv: Add Zcd extension support
In reply to Anup PatelWhen the Zcd extension is available expose it to the guest via device tree so that guest can use it.
--- riscv/fdt.c | 1 + riscv/include/kvm/kvm-config-arch.h | 3 +++ 2 files changed, 4 insertions(+)
riscv/fdt.c +1 -0
@@ -34,6 +34,7 @@ struct isa_ext_info isa_info_arr[] = { {"zbs", KVM_RISCV_ISA_EXT_ZBS}, {"zca", KVM_RISCV_ISA_EXT_ZCA}, {"zcb", KVM_RISCV_ISA_EXT_ZCB}, + {"zcd", KVM_RISCV_ISA_EXT_ZCD}, {"zfa", KVM_RISCV_ISA_EXT_ZFA}, {"zfh", KVM_RISCV_ISA_EXT_ZFH}, {"zfhmin", KVM_RISCV_ISA_EXT_ZFHMIN},
riscv/include/kvm/kvm-config-arch.h +3 -0
@@ -79,6 +79,9 @@ struct kvm_config_arch {OPT_BOOLEAN ('\0' ,"disable-zcb" , \ &(cfg)->ext_disabled[KVM_RISCV_ISA_EXT_ZCB ], \"Disable Zcb Extension" ), \ +OPT_BOOLEAN ('\0' ,"disable-zcd" , \ + &(cfg)->ext_disabled[KVM_RISCV_ISA_EXT_ZCD ], \ +"Disable Zcd Extension" ), \OPT_BOOLEAN ('\0' ,"disable-zfa" , \ &(cfg)->ext_disabled[KVM_RISCV_ISA_EXT_ZFA ], \ "Disable Zfa Extension"), \
Signature · 1 line
2.43.0
PATCH 6/8 riscv: Add Zcf extension support
In reply to Anup PatelWhen the Zcf extension is available expose it to the guest via device tree so that guest can use it.
--- riscv/fdt.c | 1 + riscv/include/kvm/kvm-config-arch.h | 3 +++ 2 files changed, 4 insertions(+)
riscv/fdt.c +1 -0
@@ -35,6 +35,7 @@ struct isa_ext_info isa_info_arr[] = { {"zca", KVM_RISCV_ISA_EXT_ZCA}, {"zcb", KVM_RISCV_ISA_EXT_ZCB}, {"zcd", KVM_RISCV_ISA_EXT_ZCD}, + {"zcf", KVM_RISCV_ISA_EXT_ZCF}, {"zfa", KVM_RISCV_ISA_EXT_ZFA}, {"zfh", KVM_RISCV_ISA_EXT_ZFH}, {"zfhmin", KVM_RISCV_ISA_EXT_ZFHMIN},
riscv/include/kvm/kvm-config-arch.h +3 -0
@@ -82,6 +82,9 @@ struct kvm_config_arch {OPT_BOOLEAN ('\0' ,"disable-zcd" , \ &(cfg)->ext_disabled[KVM_RISCV_ISA_EXT_ZCD ], \"Disable Zcd Extension" ), \ +OPT_BOOLEAN ('\0' ,"disable-zcf" , \ + &(cfg)->ext_disabled[KVM_RISCV_ISA_EXT_ZCF ], \ +"Disable Zcf Extension" ), \OPT_BOOLEAN ('\0' ,"disable-zfa" , \ &(cfg)->ext_disabled[KVM_RISCV_ISA_EXT_ZFA ], \ "Disable Zfa Extension"), \
Signature · 1 line
2.43.0
PATCH 7/8 riscv: Add Zcmop extension support
In reply to Anup PatelWhen the Zcmop extension is available expose it to the guest via device tree so that guest can use it.
--- riscv/fdt.c | 1 + riscv/include/kvm/kvm-config-arch.h | 3 +++ 2 files changed, 4 insertions(+)
riscv/fdt.c +1 -0
@@ -36,6 +36,7 @@ struct isa_ext_info isa_info_arr[] = { {"zcb", KVM_RISCV_ISA_EXT_ZCB}, {"zcd", KVM_RISCV_ISA_EXT_ZCD}, {"zcf", KVM_RISCV_ISA_EXT_ZCF}, + {"zcmop", KVM_RISCV_ISA_EXT_ZCMOP}, {"zfa", KVM_RISCV_ISA_EXT_ZFA}, {"zfh", KVM_RISCV_ISA_EXT_ZFH}, {"zfhmin", KVM_RISCV_ISA_EXT_ZFHMIN},
riscv/include/kvm/kvm-config-arch.h +3 -0
@@ -85,6 +85,9 @@ struct kvm_config_arch {OPT_BOOLEAN ('\0' ,"disable-zcf" , \ &(cfg)->ext_disabled[KVM_RISCV_ISA_EXT_ZCF ], \"Disable Zcf Extension" ), \ +OPT_BOOLEAN ('\0' ,"disable-zcmop" , \ + &(cfg)->ext_disabled[KVM_RISCV_ISA_EXT_ZCMOP ], \ +"Disable Zcmop Extension" ), \OPT_BOOLEAN ('\0' ,"disable-zfa" , \ &(cfg)->ext_disabled[KVM_RISCV_ISA_EXT_ZFA ], \ "Disable Zfa Extension"), \
Signature · 1 line
2.43.0
PATCH 8/8 riscv: Add Zimop extension support
In reply to Anup PatelWhen the Zimop extension is available expose it to the guest via device tree so that guest can use it.
--- riscv/fdt.c | 1 + riscv/include/kvm/kvm-config-arch.h | 3 +++ 2 files changed, 4 insertions(+)
riscv/fdt.c +1 -0
@@ -49,6 +49,7 @@ struct isa_ext_info isa_info_arr[] = { {"zihintntl", KVM_RISCV_ISA_EXT_ZIHINTNTL}, {"zihintpause", KVM_RISCV_ISA_EXT_ZIHINTPAUSE}, {"zihpm", KVM_RISCV_ISA_EXT_ZIHPM}, + {"zimop", KVM_RISCV_ISA_EXT_ZIMOP}, {"zknd", KVM_RISCV_ISA_EXT_ZKND}, {"zkne", KVM_RISCV_ISA_EXT_ZKNE}, {"zknh", KVM_RISCV_ISA_EXT_ZKNH},
riscv/include/kvm/kvm-config-arch.h +3 -0
@@ -124,6 +124,9 @@ struct kvm_config_arch {OPT_BOOLEAN ('\0' ,"disable-zihpm" , \ &(cfg)->ext_disabled[KVM_RISCV_ISA_EXT_ZIHPM ], \"Disable Zihpm Extension" ), \ +OPT_BOOLEAN ('\0' ,"disable-zimop" , \ + &(cfg)->ext_disabled[KVM_RISCV_ISA_EXT_ZIMOP ], \ +"Disable Zimop Extension" ), \OPT_BOOLEAN ('\0' ,"disable-zknd" , \ &(cfg)->ext_disabled[KVM_RISCV_ISA_EXT_ZKND ], \ "Disable Zknd Extension"), \
Signature · 1 line
2.43.0