On Thu, Dec 3, 2020 at 2:12 AM Roman Bolshakov <r.bolsha...@yadro.com> wrote:
>
> On Tue, Dec 01, 2020 at 10:59:50AM -0800, Peter Collingbourne wrote:
> > On Tue, Dec 1, 2020 at 3:16 AM Alexander Graf <ag...@csgraf.de> wrote:
> > >
> > > Hi Peter,
> > >
> > > On 01.12.20 09:21, Peter Collingbourne wrote:
> > > > Sleep on WFx until the VTIMER is due but allow ourselves to be woken
> > > > up on IPI.
> > > >
> > > > Signed-off-by: Peter Collingbourne <p...@google.com>
> > >
> > >
> > > Thanks a bunch!
> > >
> > >
> > > > ---
> > > > Alexander Graf wrote:
> > > >> I would love to take a patch from you here :). I'll still be stuck for
> > > >> a
> > > >> while with the sysreg sync rework that Peter asked for before I can
> > > >> look
> > > >> at WFI again.
> > > > Okay, here's a patch :) It's a relatively straightforward adaptation
> > > > of what we have in our fork, which can now boot Android to GUI while
> > > > remaining at around 4% CPU when idle.
> > > >
> > > > I'm not set up to boot a full Linux distribution at the moment so I
> > > > tested it on upstream QEMU by running a recent mainline Linux kernel
> > > > with a rootfs containing an init program that just does sleep(5)
> > > > and verified that the qemu process remains at low CPU usage during
> > > > the sleep. This was on top of your v2 plus the last patch of your v1
> > > > since it doesn't look like you have a replacement for that logic yet.
> > > >
> > > > accel/hvf/hvf-cpus.c | 5 +--
> > > > include/sysemu/hvf_int.h | 3 +-
> > > > target/arm/hvf/hvf.c | 94 +++++++++++-----------------------------
> > > > 3 files changed, 28 insertions(+), 74 deletions(-)
> > > >
> > > > diff --git a/accel/hvf/hvf-cpus.c b/accel/hvf/hvf-cpus.c
> > > > index 4360f64671..b2c8fb57f6 100644
> > > > --- a/accel/hvf/hvf-cpus.c
> > > > +++ b/accel/hvf/hvf-cpus.c
> > > > @@ -344,9 +344,8 @@ static int hvf_init_vcpu(CPUState *cpu)
> > > > sigact.sa_handler = dummy_signal;
> > > > sigaction(SIG_IPI, &sigact, NULL);
> > > >
> > > > - pthread_sigmask(SIG_BLOCK, NULL, &set);
> > > > - sigdelset(&set, SIG_IPI);
> > > > - pthread_sigmask(SIG_SETMASK, &set, NULL);
> > > > + pthread_sigmask(SIG_BLOCK, NULL, &cpu->hvf->unblock_ipi_mask);
> > > > + sigdelset(&cpu->hvf->unblock_ipi_mask, SIG_IPI);
> > >
> > >
> > > What will this do to the x86 hvf implementation? We're now not
> > > unblocking SIG_IPI again for that, right?
> >
> > Yes and that was the case before your patch series.
> >
> > > >
> > > > #ifdef __aarch64__
> > > > r = hv_vcpu_create(&cpu->hvf->fd, (hv_vcpu_exit_t
> > > > **)&cpu->hvf->exit, NULL);
> > > > diff --git a/include/sysemu/hvf_int.h b/include/sysemu/hvf_int.h
> > > > index c56baa3ae8..13adf6ea77 100644
> > > > --- a/include/sysemu/hvf_int.h
> > > > +++ b/include/sysemu/hvf_int.h
> > > > @@ -62,8 +62,7 @@ extern HVFState *hvf_state;
> > > > struct hvf_vcpu_state {
> > > > uint64_t fd;
> > > > void *exit;
> > > > - struct timespec ts;
> > > > - bool sleeping;
> > > > + sigset_t unblock_ipi_mask;
> > > > };
> > > >
> > > > void assert_hvf_ok(hv_return_t ret);
> > > > diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c
> > > > index 8fe10966d2..60a361ff38 100644
> > > > --- a/target/arm/hvf/hvf.c
> > > > +++ b/target/arm/hvf/hvf.c
> > > > @@ -2,6 +2,7 @@
> > > > * QEMU Hypervisor.framework support for Apple Silicon
> > > >
> > > > * Copyright 2020 Alexander Graf <ag...@csgraf.de>
> > > > + * Copyright 2020 Google LLC
> > > > *
> > > > * This work is licensed under the terms of the GNU GPL, version 2 or
> > > > later.
> > > > * See the COPYING file in the top-level directory.
> > > > @@ -18,6 +19,7 @@
> > > > #include "sysemu/hw_accel.h"
> > > >
> > > > #include <Hypervisor/Hypervisor.h>
> > > > +#include <mach/mach_time.h>
> > > >
> > > > #include "exec/address-spaces.h"
> > > > #include "hw/irq.h"
> > > > @@ -320,18 +322,8 @@ int hvf_arch_init_vcpu(CPUState *cpu)
> > > >
> > > > void hvf_kick_vcpu_thread(CPUState *cpu)
> > > > {
> > > > - if (cpu->hvf->sleeping) {
> > > > - /*
> > > > - * When sleeping, make sure we always send signals. Also,
> > > > clear the
> > > > - * timespec, so that an IPI that arrives between setting
> > > > hvf->sleeping
> > > > - * and the nanosleep syscall still aborts the sleep.
> > > > - */
> > > > - cpu->thread_kicked = false;
> > > > - cpu->hvf->ts = (struct timespec){ };
> > > > - cpus_kick_thread(cpu);
> > > > - } else {
> > > > - hv_vcpus_exit(&cpu->hvf->fd, 1);
> > > > - }
> > > > + cpus_kick_thread(cpu);
> > > > + hv_vcpus_exit(&cpu->hvf->fd, 1);
> > >
> > >
> > > This means your first WFI will almost always return immediately due to a
> > > pending signal, because there probably was an IRQ pending before on the
> > > same CPU, no?
> >
> > That's right. Any approach involving the "sleeping" field would need
> > to be implemented carefully to avoid races that may result in missed
> > wakeups so for simplicity I just decided to send both kinds of
> > wakeups. In particular the approach in the updated patch you sent is
> > racy and I'll elaborate more in the reply to that patch.
> >
> > > > }
> > > >
> > > > static int hvf_inject_interrupts(CPUState *cpu)
> > > > @@ -385,18 +377,19 @@ int hvf_vcpu_exec(CPUState *cpu)
> > > > uint64_t syndrome = hvf_exit->exception.syndrome;
> > > > uint32_t ec = syn_get_ec(syndrome);
> > > >
> > > > + qemu_mutex_lock_iothread();
> > >
> > >
> > > Is there a particular reason you're moving the iothread lock out again
> > > from the individual bits? I would really like to keep a notion of fast
> > > path exits.
> >
> > We still need to lock at least once no matter the exit reason to check
> > the interrupts so I don't think it's worth it to try and avoid locking
> > like this. It also makes the implementation easier to reason about and
> > therefore more likely to be correct. In our implementation we just
> > stay locked the whole time unless we're in hv_vcpu_run() or pselect().
> >
>
> But does it leaves a small window for a kick loss between
> qemu_mutex_unlock_iothread() and hv_vcpu_run()/pselect()?
>
> For x86 it could lose a kick between them. That was a reason for the
> sophisticated approach to catch the kick [1] (and related discussions in
> v1/v2/v3). Unfortunately I can't read ARM assembly yet so I don't if
> hv_vcpus_exit() suffers from the same issue as x86 hv_vcpu_interrupt().
>
> 1.
> https://patchwork.kernel.org/project/qemu-devel/patch/20200729124832.79375-1-r.bolsha...@yadro.com/
I addressed pselect() in my other reply.
It isn't on the website but the hv_vcpu.h header says this about
hv_vcpus_exit():
* @discussion
* If a vcpu is not running, the next time hv_vcpu_run is
called for the corresponding
* vcpu, it will return immediately without entering the guest.
So at least as documented I think we are okay.
Peter
>
> Thanks,
> Roman
>
> > > > switch (exit_reason) {
> > > > case HV_EXIT_REASON_EXCEPTION:
> > > > /* This is the main one, handle below. */
> > > > break;
> > > > case HV_EXIT_REASON_VTIMER_ACTIVATED:
> > > > - qemu_mutex_lock_iothread();
> > > > current_cpu = cpu;
> > > > qemu_set_irq(arm_cpu->gt_timer_outputs[GTIMER_VIRT], 1);
> > > > qemu_mutex_unlock_iothread();
> > > > continue;
> > > > case HV_EXIT_REASON_CANCELED:
> > > > /* we got kicked, no exit to process */
> > > > + qemu_mutex_unlock_iothread();
> > > > continue;
> > > > default:
> > > > assert(0);
> > > > @@ -413,7 +406,6 @@ int hvf_vcpu_exec(CPUState *cpu)
> > > > uint32_t srt = (syndrome >> 16) & 0x1f;
> > > > uint64_t val = 0;
> > > >
> > > > - qemu_mutex_lock_iothread();
> > > > current_cpu = cpu;
> > > >
> > > > DPRINTF("data abort: [pc=0x%llx va=0x%016llx pa=0x%016llx
> > > > isv=%x "
> > > > @@ -446,8 +438,6 @@ int hvf_vcpu_exec(CPUState *cpu)
> > > > hvf_set_reg(cpu, srt, val);
> > > > }
> > > >
> > > > - qemu_mutex_unlock_iothread();
> > > > -
> > > > advance_pc = true;
> > > > break;
> > > > }
> > > > @@ -493,68 +483,36 @@ int hvf_vcpu_exec(CPUState *cpu)
> > > > case EC_WFX_TRAP:
> > > > if (!(syndrome & WFX_IS_WFE) && !(cpu->interrupt_request &
> > > > (CPU_INTERRUPT_HARD | CPU_INTERRUPT_FIQ))) {
> > > > - uint64_t cval, ctl, val, diff, now;
> > > > + uint64_t cval;
> > > >
> > > > - /* Set up a local timer for vtimer if necessary ... */
> > > > - r = hv_vcpu_get_sys_reg(cpu->hvf->fd,
> > > > HV_SYS_REG_CNTV_CTL_EL0, &ctl);
> > > > - assert_hvf_ok(r);
> > > > r = hv_vcpu_get_sys_reg(cpu->hvf->fd,
> > > > HV_SYS_REG_CNTV_CVAL_EL0, &cval);
> > > > assert_hvf_ok(r);
> > > >
> > > > - asm volatile("mrs %0, cntvct_el0" : "=r"(val));
> > > > - diff = cval - val;
> > > > -
> > > > - now = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) /
> > > > - gt_cntfrq_period_ns(arm_cpu);
> > > > -
> > > > - /* Timer disabled or masked, just wait for long */
> > > > - if (!(ctl & 1) || (ctl & 2)) {
> > > > - diff = (120 * NANOSECONDS_PER_SECOND) /
> > > > - gt_cntfrq_period_ns(arm_cpu);
> > > > + int64_t ticks_to_sleep = cval - mach_absolute_time();
> > > > + if (ticks_to_sleep < 0) {
> > > > + break;
> > >
> > >
> > > This will loop at 100% for Windows, which configures the vtimer as
> > > cval=0 ctl=7, so with IRQ mask bit set.
> >
> > Okay, but the 120s is kind of arbitrary so we should just sleep until
> > we get a signal. That can be done by passing null as the timespec
> > argument to pselect().
> >
> > >
> > >
> > > Alex
> > >
> > >
> > > > }
> > > >
> > > > - if (diff < INT64_MAX) {
> > > > - uint64_t ns = diff * gt_cntfrq_period_ns(arm_cpu);
> > > > - struct timespec *ts = &cpu->hvf->ts;
> > > > -
> > > > - *ts = (struct timespec){
> > > > - .tv_sec = ns / NANOSECONDS_PER_SECOND,
> > > > - .tv_nsec = ns % NANOSECONDS_PER_SECOND,
> > > > - };
> > > > -
> > > > - /*
> > > > - * Waking up easily takes 1ms, don't go to sleep
> > > > for smaller
> > > > - * time periods than 2ms.
> > > > - */
> > > > - if (!ts->tv_sec && (ts->tv_nsec < (SCALE_MS * 2)))
> > > > {
> > >
> > >
> > > I put this logic here on purpose. A pselect(1 ns) easily takes 1-2ms to
> > > return. Without logic like this, super short WFIs will hurt performance
> > > quite badly.
> >
> > I don't think that's accurate. According to this benchmark it's a few
> > hundred nanoseconds at most.
> >
> > pcc@pac-mini /tmp> cat pselect.c
> > #include <signal.h>
> > #include <sys/select.h>
> >
> > int main() {
> > sigset_t mask, orig_mask;
> > pthread_sigmask(SIG_SETMASK, 0, &mask);
> > sigaddset(&mask, SIGUSR1);
> > pthread_sigmask(SIG_SETMASK, &mask, &orig_mask);
> >
> > for (int i = 0; i != 1000000; ++i) {
> > struct timespec ts = { 0, 1 };
> > pselect(0, 0, 0, 0, &ts, &orig_mask);
> > }
> > }
> > pcc@pac-mini /tmp> time ./pselect
> >
> > ________________________________________________________
> > Executed in 179.87 millis fish external
> > usr time 77.68 millis 57.00 micros 77.62 millis
> > sys time 101.37 millis 852.00 micros 100.52 millis
> >
> > Besides, all that you're really saving here is the single pselect
> > call. There are no doubt more expensive syscalls involved in exiting
> > and entering the VCPU that would dominate here.
> >
> > Peter
> >
> > >
> > >
> > > Alex
> > >
> > > > - advance_pc = true;
> > > > - break;
> > > > - }
> > > > -
> > > > - /* Set cpu->hvf->sleeping so that we get a SIG_IPI
> > > > signal. */
> > > > - cpu->hvf->sleeping = true;
> > > > - smp_mb();
> > > > -
> > > > - /* Bail out if we received an IRQ meanwhile */
> > > > - if (cpu->thread_kicked || (cpu->interrupt_request &
> > > > - (CPU_INTERRUPT_HARD | CPU_INTERRUPT_FIQ))) {
> > > > - cpu->hvf->sleeping = false;
> > > > - break;
> > > > - }
> > > > -
> > > > - /* nanosleep returns on signal, so we wake up on
> > > > kick. */
> > > > - nanosleep(ts, NULL);
> > > > -
> > > > - /* Out of sleep - either naturally or because of a
> > > > kick */
> > > > - cpu->hvf->sleeping = false;
> > > > - }
> > > > + uint64_t seconds = ticks_to_sleep /
> > > > arm_cpu->gt_cntfrq_hz;
> > > > + uint64_t nanos =
> > > > + (ticks_to_sleep - arm_cpu->gt_cntfrq_hz * seconds)
> > > > *
> > > > + 1000000000 / arm_cpu->gt_cntfrq_hz;
> > > > + struct timespec ts = { seconds, nanos };
> > > > +
> > > > + /*
> > > > + * Use pselect to sleep so that other threads can IPI
> > > > us while
> > > > + * we're sleeping.
> > > > + */
> > > > + qatomic_mb_set(&cpu->thread_kicked, false);
> > > > + qemu_mutex_unlock_iothread();
> > > > + pselect(0, 0, 0, 0, &ts, &cpu->hvf->unblock_ipi_mask);
> > > > + qemu_mutex_lock_iothread();
> > > >
> > > > advance_pc = true;
> > > > }
> > > > break;
> > > > case EC_AA64_HVC:
> > > > cpu_synchronize_state(cpu);
> > > > - qemu_mutex_lock_iothread();
> > > > current_cpu = cpu;
> > > > if (arm_is_psci_call(arm_cpu, EXCP_HVC)) {
> > > > arm_handle_psci_call(arm_cpu);
> > > > @@ -562,11 +520,9 @@ int hvf_vcpu_exec(CPUState *cpu)
> > > > DPRINTF("unknown HVC! %016llx", env->xregs[0]);
> > > > env->xregs[0] = -1;
> > > > }
> > > > - qemu_mutex_unlock_iothread();
> > > > break;
> > > > case EC_AA64_SMC:
> > > > cpu_synchronize_state(cpu);
> > > > - qemu_mutex_lock_iothread();
> > > > current_cpu = cpu;
> > > > if (arm_is_psci_call(arm_cpu, EXCP_SMC)) {
> > > > arm_handle_psci_call(arm_cpu);
> > > > @@ -575,7 +531,6 @@ int hvf_vcpu_exec(CPUState *cpu)
> > > > env->xregs[0] = -1;
> > > > env->pc += 4;
> > > > }
> > > > - qemu_mutex_unlock_iothread();
> > > > break;
> > > > default:
> > > > cpu_synchronize_state(cpu);
> > > > @@ -594,6 +549,7 @@ int hvf_vcpu_exec(CPUState *cpu)
> > > > r = hv_vcpu_set_reg(cpu->hvf->fd, HV_REG_PC, pc);
> > > > assert_hvf_ok(r);
> > > > }
> > > > + qemu_mutex_unlock_iothread();
> > > > } while (ret == 0);
> > > >
> > > > qemu_mutex_lock_iothread();
