lkml.org 
[lkml]   [2022]   [Jul]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[RFC 3/9] RISC-V: KVM: Define a probe function for SBI extension data structures
    Date
    c,urrently the probe function just check if an SBI extension is
    registered or not. However, the extension may not want to advertise
    itself depending on some other condition.
    An additional extension specific probe function will allow
    extensions to decide if they want to be advertised to the caller or
    not. Any extension that do not require additional dependency check
    does not required to implement this function.

    Signed-off-by: Atish Patra <atishp@rivosinc.com>
    ---
    arch/riscv/include/asm/kvm_vcpu_sbi.h | 3 +++
    arch/riscv/kvm/vcpu_sbi_base.c | 13 +++++++++++--
    2 files changed, 14 insertions(+), 2 deletions(-)

    diff --git a/arch/riscv/include/asm/kvm_vcpu_sbi.h b/arch/riscv/include/asm/kvm_vcpu_sbi.h
    index 83d6d4d2b1df..5853a1ef71ea 100644
    --- a/arch/riscv/include/asm/kvm_vcpu_sbi.h
    +++ b/arch/riscv/include/asm/kvm_vcpu_sbi.h
    @@ -25,6 +25,9 @@ struct kvm_vcpu_sbi_extension {
    int (*handler)(struct kvm_vcpu *vcpu, struct kvm_run *run,
    unsigned long *out_val, struct kvm_cpu_trap *utrap,
    bool *exit);
    +
    + /* Extension specific probe function */
    + unsigned long (*probe)(unsigned long extid);
    };

    void kvm_riscv_vcpu_sbi_forward(struct kvm_vcpu *vcpu, struct kvm_run *run);
    diff --git a/arch/riscv/kvm/vcpu_sbi_base.c b/arch/riscv/kvm/vcpu_sbi_base.c
    index 48f431091cdb..14be1a819588 100644
    --- a/arch/riscv/kvm/vcpu_sbi_base.c
    +++ b/arch/riscv/kvm/vcpu_sbi_base.c
    @@ -22,6 +22,7 @@ static int kvm_sbi_ext_base_handler(struct kvm_vcpu *vcpu, struct kvm_run *run,
    int ret = 0;
    struct kvm_cpu_context *cp = &vcpu->arch.guest_context;
    struct sbiret ecall_ret;
    + const struct kvm_vcpu_sbi_extension *sbi_ext;

    switch (cp->a6) {
    case SBI_EXT_BASE_GET_SPEC_VERSION:
    @@ -46,8 +47,16 @@ static int kvm_sbi_ext_base_handler(struct kvm_vcpu *vcpu, struct kvm_run *run,
    */
    kvm_riscv_vcpu_sbi_forward(vcpu, run);
    *exit = true;
    - } else
    - *out_val = kvm_vcpu_sbi_find_ext(cp->a0) ? 1 : 0;
    + } else {
    + sbi_ext = kvm_vcpu_sbi_find_ext(cp->a0);
    + if (sbi_ext) {
    + if (sbi_ext->probe)
    + *out_val = sbi_ext->probe(cp->a0);
    + else
    + *out_val = 1;
    + } else
    + *out_val = 0;
    + }
    break;
    case SBI_EXT_BASE_GET_MVENDORID:
    case SBI_EXT_BASE_GET_MARCHID:
    --
    2.25.1
    \
     
     \ /
      Last update: 2022-07-18 19:06    [W:3.384 / U:0.192 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site