From: Anup Patel <anup@brainfault.org>
To: Paolo Bonzini <pbonzini@redhat.com>
Cc: Damien Le Moal <Damien.LeMoal@wdc.com>,
Palmer Dabbelt <palmer@sifive.com>,
Daniel Lezcano <daniel.lezcano@linaro.org>,
"kvm@vger.kernel.org" <kvm@vger.kernel.org>,
Radim K <rkrcmar@redhat.com>, Anup Patel <Anup.Patel@wdc.com>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
Christoph Hellwig <hch@infradead.org>,
Atish Patra <Atish.Patra@wdc.com>,
Alistair Francis <Alistair.Francis@wdc.com>,
Paul Walmsley <paul.walmsley@sifive.com>,
Thomas Gleixner <tglx@linutronix.de>,
"linux-riscv@lists.infradead.org"
<linux-riscv@lists.infradead.org>
Subject: Re: [RFC PATCH v2 04/19] RISC-V: Add initial skeletal KVM support
Date: Mon, 5 Aug 2019 11:18:34 +0530 [thread overview]
Message-ID: <CAAhSdy16w+98VB7+DtVJOngABu2uUDmYmqURMsRBqzvKCQfGUQ@mail.gmail.com> (raw)
In-Reply-To: <9f30d2b6-fa2c-22ff-e597-b9fbd1c700ff@redhat.com>
On Fri, Aug 2, 2019 at 2:31 PM Paolo Bonzini <pbonzini@redhat.com> wrote:
>
> On 02/08/19 09:47, Anup Patel wrote:
> > +static void kvm_riscv_check_vcpu_requests(struct kvm_vcpu *vcpu)
> > +{
> > + if (kvm_request_pending(vcpu)) {
> > + /* TODO: */
> > +
> > + /*
> > + * Clear IRQ_PENDING requests that were made to guarantee
> > + * that a VCPU sees new virtual interrupts.
> > + */
> > + kvm_check_request(KVM_REQ_IRQ_PENDING, vcpu);
> > + }
> > +}
>
> This kvm_check_request can go away (as it does in patch 6).
Argh, I should have removed it in v2 itself.
Thanks for catching. I will update.
>
> > +int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run)
> > +{
> > + int ret;
> > + unsigned long scause, stval;
>
> You need to wrap this with srcu_read_lock/srcu_read_unlock, otherwise
> stage2_page_fault can access freed memslot arrays. (ARM doesn't have
> this issue because it does not have to decode instructions on MMIO faults).
Looking at KVM ARM/ARM64, I was not sure about use of kvm->srcu. Thanks
for clarifying. I will use kvm->srcu like you suggested.
>
> That is,
>
> vcpu->srcu_idx = srcu_read_lock(&vcpu->kvm->srcu);
>
> > + /* Process MMIO value returned from user-space */
> > + if (run->exit_reason == KVM_EXIT_MMIO) {
> > + ret = kvm_riscv_vcpu_mmio_return(vcpu, vcpu->run);
> > + if (ret)
> > + return ret;
> > + }
> > +
> > + if (run->immediate_exit)
> > + return -EINTR;
> > +
> > + vcpu_load(vcpu);
> > +
> > + kvm_sigset_activate(vcpu);
> > +
> > + ret = 1;
> > + run->exit_reason = KVM_EXIT_UNKNOWN;
> > + while (ret > 0) {
> > + /* Check conditions before entering the guest */
> > + cond_resched();
> > +
> > + kvm_riscv_check_vcpu_requests(vcpu);
> > +
> > + preempt_disable();
> > +
> > + local_irq_disable();
> > +
> > + /*
> > + * Exit if we have a signal pending so that we can deliver
> > + * the signal to user space.
> > + */
> > + if (signal_pending(current)) {
> > + ret = -EINTR;
> > + run->exit_reason = KVM_EXIT_INTR;
> > + }
>
> Add an srcu_read_unlock here (and then the smp_store_mb can become
> smp_mb__after_srcu_read_unlock + WRITE_ONCE).
Sure, I will update.
>
>
> > + /*
> > + * Ensure we set mode to IN_GUEST_MODE after we disable
> > + * interrupts and before the final VCPU requests check.
> > + * See the comment in kvm_vcpu_exiting_guest_mode() and
> > + * Documentation/virtual/kvm/vcpu-requests.rst
> > + */
> > + smp_store_mb(vcpu->mode, IN_GUEST_MODE);
> > +
> > + if (ret <= 0 ||
> > + kvm_request_pending(vcpu)) {
> > + vcpu->mode = OUTSIDE_GUEST_MODE;
> > + local_irq_enable();
> > + preempt_enable();
> > + continue;
> > + }
> > +
> > + guest_enter_irqoff();
> > +
> > + __kvm_riscv_switch_to(&vcpu->arch);
> > +
> > + vcpu->mode = OUTSIDE_GUEST_MODE;
> > + vcpu->stat.exits++;
> > +
> > + /* Save SCAUSE and STVAL because we might get an interrupt
> > + * between __kvm_riscv_switch_to() and local_irq_enable()
> > + * which can potentially overwrite SCAUSE and STVAL.
> > + */
> > + scause = csr_read(CSR_SCAUSE);
> > + stval = csr_read(CSR_STVAL);
> > +
> > + /*
> > + * We may have taken a host interrupt in VS/VU-mode (i.e.
> > + * while executing the guest). This interrupt is still
> > + * pending, as we haven't serviced it yet!
> > + *
> > + * We're now back in HS-mode with interrupts disabled
> > + * so enabling the interrupts now will have the effect
> > + * of taking the interrupt again, in HS-mode this time.
> > + */
> > + local_irq_enable();
> > +
> > + /*
> > + * We do local_irq_enable() before calling guest_exit() so
> > + * that if a timer interrupt hits while running the guest
> > + * we account that tick as being spent in the guest. We
> > + * enable preemption after calling guest_exit() so that if
> > + * we get preempted we make sure ticks after that is not
> > + * counted as guest time.
> > + */
> > + guest_exit();
> > +
> > + preempt_enable();
>
> And another srcu_read_lock here. Using vcpu->srcu_idx instead of a
> local variable also allows system_opcode_insn to wrap kvm_vcpu_block
> with a srcu_read_unlock/srcu_read_lock pair.
Okay.
>
> > + ret = kvm_riscv_vcpu_exit(vcpu, run, scause, stval);
> > + }
> > +
> > + kvm_sigset_deactivate(vcpu);
>
> And finally srcu_read_unlock here.
Okay.
Regards,
Anup
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
next prev parent reply other threads:[~2019-08-05 5:48 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-02 7:46 [RFC PATCH v2 00/19] KVM RISC-V Support Anup Patel
2019-08-02 7:47 ` [RFC PATCH v2 01/19] KVM: RISC-V: Add KVM_REG_RISCV for ONE_REG interface Anup Patel
2019-08-02 7:47 ` [RFC PATCH v2 02/19] RISC-V: Export few kernel symbols Anup Patel
2019-08-02 7:47 ` [RFC PATCH v2 03/19] RISC-V: Add hypervisor extension related CSR defines Anup Patel
2019-08-02 7:47 ` [RFC PATCH v2 04/19] RISC-V: Add initial skeletal KVM support Anup Patel
2019-08-02 9:01 ` Paolo Bonzini
2019-08-05 5:48 ` Anup Patel [this message]
2019-08-02 7:47 ` [RFC PATCH v2 05/19] RISC-V: KVM: Implement VCPU create, init and destroy functions Anup Patel
2019-08-02 7:47 ` [RFC PATCH v2 06/19] RISC-V: KVM: Implement VCPU interrupts and requests handling Anup Patel
2019-08-02 8:17 ` Paolo Bonzini
2019-08-05 12:27 ` Anup Patel
2019-08-02 7:47 ` [RFC PATCH v2 07/19] RISC-V: KVM: Implement KVM_GET_ONE_REG/KVM_SET_ONE_REG ioctls Anup Patel
2019-08-02 9:03 ` Paolo Bonzini
2019-08-05 6:55 ` Anup Patel
2019-08-05 7:10 ` Paolo Bonzini
2019-08-05 11:00 ` Anup Patel
2019-08-05 11:07 ` Paolo Bonzini
2019-08-05 11:37 ` Christian Borntraeger
2019-08-05 11:56 ` Anup Patel
2019-08-05 12:01 ` Paolo Bonzini
2019-08-05 12:13 ` Anup Patel
2019-08-05 11:56 ` Paolo Bonzini
2019-08-02 7:47 ` [RFC PATCH v2 08/19] RISC-V: KVM: Implement VCPU world-switch Anup Patel
2019-08-02 8:30 ` Paolo Bonzini
2019-08-02 8:43 ` Anup Patel
2019-08-02 8:59 ` Paolo Bonzini
2019-08-02 7:47 ` [RFC PATCH v2 09/19] RISC-V: KVM: Handle MMIO exits for VCPU Anup Patel
2019-08-02 7:47 ` [RFC PATCH v2 10/19] RISC-V: KVM: Handle WFI " Anup Patel
2019-08-02 9:03 ` Paolo Bonzini
2019-08-05 7:12 ` Anup Patel
2019-08-05 7:14 ` Paolo Bonzini
2019-08-05 7:18 ` Anup Patel
2019-08-02 7:48 ` [RFC PATCH v2 11/19] RISC-V: KVM: Implement VMID allocator Anup Patel
2019-08-02 9:19 ` Paolo Bonzini
2019-08-05 10:07 ` Anup Patel
2019-08-02 7:48 ` [RFC PATCH v2 12/19] RISC-V: KVM: Implement stage2 page table programming Anup Patel
2019-08-02 9:14 ` Paolo Bonzini
2019-08-05 10:08 ` Anup Patel
2019-08-02 7:48 ` [RFC PATCH v2 13/19] RISC-V: KVM: Implement MMU notifiers Anup Patel
2019-08-02 7:48 ` [RFC PATCH v2 14/19] RISC-V: KVM: Add timer functionality Anup Patel
2019-08-02 7:48 ` [RFC PATCH v2 15/19] RISC-V: KVM: FP lazy save/restore Anup Patel
2019-08-02 7:48 ` [RFC PATCH v2 16/19] RISC-V: KVM: Implement ONE REG interface for FP registers Anup Patel
2019-08-02 7:48 ` [RFC PATCH v2 17/19] RISC-V: KVM: Add SBI v0.1 support Anup Patel
2019-08-02 7:48 ` [RFC PATCH v2 18/19] RISC-V: Enable VIRTIO drivers in RV64 and RV32 defconfig Anup Patel
2019-08-02 7:48 ` [RFC PATCH v2 19/19] RISC-V: KVM: Add MAINTAINERS entry Anup Patel
2019-08-02 9:22 ` [RFC PATCH v2 00/19] KVM RISC-V Support Paolo Bonzini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAAhSdy16w+98VB7+DtVJOngABu2uUDmYmqURMsRBqzvKCQfGUQ@mail.gmail.com \
--to=anup@brainfault.org \
--cc=Alistair.Francis@wdc.com \
--cc=Anup.Patel@wdc.com \
--cc=Atish.Patra@wdc.com \
--cc=Damien.LeMoal@wdc.com \
--cc=daniel.lezcano@linaro.org \
--cc=hch@infradead.org \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=palmer@sifive.com \
--cc=paul.walmsley@sifive.com \
--cc=pbonzini@redhat.com \
--cc=rkrcmar@redhat.com \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).