RISC-V: KVM: Change zicbom/zicboz block size to depend on the host isa

The zicbom/zicboz block size registers should depend on the host's isa,
the reason is that we otherwise create an ioctl order dependency on the VMM.

Signed-off-by: Quan Zhou <zhouquan@iscas.ac.cn>
Reviewed-by: Andrew Jones <ajones@ventanamicro.com>
Reviwed-by: Troy Mitchell <troy.mitchell@linux.spacemit.com>
Reviewed-by: Nutty Liu <nutty.liu@hotmail.com>
Link: https://lore.kernel.org/r/fef5907425455ecd41b224e0093f1b6bc4067138.1754646071.git.zhouquan@iscas.ac.cn
Signed-off-by: Anup Patel <anup@brainfault.org>

diff --git a/arch/riscv/kvm/vcpu_onereg.c b/arch/riscv/kvm/vcpu_onereg.c
index b77748a56a594779fdc8da76cab78796b6ab59be..87a2ee369ac2e957a5c8a728f72b98b68a15bb25 100644 (file)
--- a/arch/riscv/kvm/vcpu_onereg.c
+++ b/arch/riscv/kvm/vcpu_onereg.c
@@ -276,12 +276,12 @@ static int kvm_riscv_vcpu_get_reg_config(struct kvm_vcpu *vcpu,
                reg_val = vcpu->arch.isa[0] & KVM_RISCV_BASE_ISA_MASK;
                break;
        case KVM_REG_RISCV_CONFIG_REG(zicbom_block_size):
-               if (!riscv_isa_extension_available(vcpu->arch.isa, ZICBOM))
+               if (!riscv_isa_extension_available(NULL, ZICBOM))
                        return -ENOENT;
                reg_val = riscv_cbom_block_size;
                break;
        case KVM_REG_RISCV_CONFIG_REG(zicboz_block_size):
-               if (!riscv_isa_extension_available(vcpu->arch.isa, ZICBOZ))
+               if (!riscv_isa_extension_available(NULL, ZICBOZ))
                        return -ENOENT;
                reg_val = riscv_cboz_block_size;
                break;
@@ -365,13 +365,13 @@ static int kvm_riscv_vcpu_set_reg_config(struct kvm_vcpu *vcpu,
                }
                break;
        case KVM_REG_RISCV_CONFIG_REG(zicbom_block_size):
-               if (!riscv_isa_extension_available(vcpu->arch.isa, ZICBOM))
+               if (!riscv_isa_extension_available(NULL, ZICBOM))
                        return -ENOENT;
                if (reg_val != riscv_cbom_block_size)
                        return -EINVAL;
                break;
        case KVM_REG_RISCV_CONFIG_REG(zicboz_block_size):
-               if (!riscv_isa_extension_available(vcpu->arch.isa, ZICBOZ))
+               if (!riscv_isa_extension_available(NULL, ZICBOZ))
                        return -ENOENT;
                if (reg_val != riscv_cboz_block_size)
                        return -EINVAL;
@@ -816,10 +816,10 @@ static int copy_config_reg_indices(const struct kvm_vcpu *vcpu,
                 * was not available.
                 */
                if (i == KVM_REG_RISCV_CONFIG_REG(zicbom_block_size) &&
-                       !riscv_isa_extension_available(vcpu->arch.isa, ZICBOM))
+                       !riscv_isa_extension_available(NULL, ZICBOM))
                        continue;
                else if (i == KVM_REG_RISCV_CONFIG_REG(zicboz_block_size) &&
-                       !riscv_isa_extension_available(vcpu->arch.isa, ZICBOZ))
+                       !riscv_isa_extension_available(NULL, ZICBOZ))
                        continue;
 
                size = IS_ENABLED(CONFIG_32BIT) ? KVM_REG_SIZE_U32 : KVM_REG_SIZE_U64;