Message ID | 1b52b557beb6606007f7ec5672eab0adf1606a34.camel@infradead.org |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp3111262vqi; Mon, 18 Sep 2023 20:45:50 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGjd+CzqXGYRpdalBO9/Nw134Y/y0rQWnG+QI/v3NHKKg5AxYNDvsX34I3Ya3hGZCNevfP2 X-Received: by 2002:a05:6830:1008:b0:6b9:90db:f6ed with SMTP id a8-20020a056830100800b006b990dbf6edmr10961807otp.11.1695095150191; Mon, 18 Sep 2023 20:45:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695095150; cv=none; d=google.com; s=arc-20160816; b=MPcL0j+tP3bEpljRtuaHvLzybkxY3hDlF8lBAX8JJsD8CjqVeIhHyfL6RRt7/enEeo USrs928rneqsR9E+jPB6oIClE+qFppQetYbTuCnSmDujCGTVtmpJHrIkgKu5+Fg0L/xS 982uRMZ73PPcSK2oUVFPcGkMl02DvW79YPetLl5+ByMQz+7yw3tWDefEWQ1T+A0frUS3 DxpBVs5+cLjcc6oq9QmyBVhoxXfcaiTWwBlBrTEJlvYdbldba2XFJFpt6ied+7DKkmDl L8BuuKkf+BhCV4nP0A3y4IoWpYGjciQBRbeGgnqysAbR+eyKuqom+niZ8npshoCKRzFQ Dqhw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:user-agent:date:cc:to:from:subject :message-id:dkim-signature; bh=jhKFzfaIrj2yifqprfN7tR//Lqbk6JFSdT37dJb4VL0=; fh=/6SZ2rT11jv/Hu8DywGKPIpNUtdbdgM1/qBJEcwBoag=; b=A8IFF8Pfa1wR8Xx/0gXUDewd3Ot45YK/d/m7Y9zSd+rXQAsNeBJpvTtmgNXurUKMmb 5YIm7XXZQo4SafkOvuLJY2LF/sbEfW72rRTUg1nRJ1DPKNdlnn3XE/roi6uJ4r/WQc60 yMIJJYRtZBEJXUcqmS63PrJ9DAsJi0o8x/m1JtkCDOc3bib1lmH/XT+g59eqBb896+Ev Py+JgHcxLh3ChdIS05qwxa1pUE7TYxnoTInEhxbMeV7RvOshyikg3NYhqWBBIgmmZ6uw xKPM68vr89Ww5BtKrZrjTs6ILfZpyzRhF8omOVbosbmv+eb7jvwqY/aOCNqIfIi6tRdJ wSNA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=casper.20170209 header.b=QKabkEXG; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from morse.vger.email (morse.vger.email. [23.128.96.31]) by mx.google.com with ESMTPS id p26-20020a63741a000000b005653e3f6d58si8847684pgc.748.2023.09.18.20.45.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Sep 2023 20:45:49 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) client-ip=23.128.96.31; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=casper.20170209 header.b=QKabkEXG; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by morse.vger.email (Postfix) with ESMTP id 4E57B8024DE5; Mon, 18 Sep 2023 02:07:51 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240873AbjIRJGz (ORCPT <rfc822;kernel.ruili@gmail.com> + 27 others); Mon, 18 Sep 2023 05:06:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45104 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240965AbjIRJGj (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Mon, 18 Sep 2023 05:06:39 -0400 Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:8b0:10b:1236::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7B6DDC5; Mon, 18 Sep 2023 02:06:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=MIME-Version:Content-Type:Date:Cc:To: From:Subject:Message-ID:Sender:Reply-To:Content-Transfer-Encoding:Content-ID: Content-Description:In-Reply-To:References; bh=jhKFzfaIrj2yifqprfN7tR//Lqbk6JFSdT37dJb4VL0=; b=QKabkEXGZDcccenpwlyT7dPry+ X9cTG2wiEFPIZzCpCjycweSVM2LSkPZQHFGryCsStYAzO6U+MAoqfBZ49NbBc8+RO1tCQ6Y6EFn4A Y8Q62k6yEhLArtKztOidimg+lJH/bto01H+Kmhl6tATYnFIyrPblOYwamNpOeLkJfksYnpyd+gg/f vtDWjisOGCkCJHGhTlhrljyL3QWpoxHIE621C7ngh3m68Ao5jNDR1Q8qTF+1WA7QQUx4Zfd9yzWTx jL+iKq+0WZFF4aY8etkWuJU58wLB6t73fVu9ANO+eh6qnkdbVHo8t/3RCQaoXPOy9hFZsLS9xfwPr XoA2eJmg==; Received: from [2001:8b0:10b:5:3cdb:35b0:ea67:aadb] (helo=u3832b3a9db3152.ant.amazon.com) by casper.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1qiAD3-009yJZ-0J; Mon, 18 Sep 2023 09:06:25 +0000 Message-ID: <1b52b557beb6606007f7ec5672eab0adf1606a34.camel@infradead.org> Subject: [RFC] KVM: x86: Allow userspace exit on HLT and MWAIT, else yield on MWAIT From: David Woodhouse <dwmw2@infradead.org> To: kvm@vger.kernel.org, Peter Zijlstra <peterz@infradead.org> Cc: Sean Christopherson <seanjc@google.com>, Paolo Bonzini <pbonzini@redhat.com>, Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>, Dave Hansen <dave.hansen@linux.intel.com>, x86@kernel.org, "H. Peter Anvin" <hpa@zytor.com>, linux-kernel@vger.kernel.org, graf@amazon.de, Nicolas Saenz Julienne <nsaenz@amazon.es>, "Griffoul, Fred" <fgriffo@amazon.com> Date: Mon, 18 Sep 2023 11:06:24 +0200 Content-Type: multipart/signed; micalg="sha-256"; protocol="application/pkcs7-signature"; boundary="=-5IlqtGoL4WjBAvGoYipU" User-Agent: Evolution 3.44.4-0ubuntu2 MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from <dwmw2@infradead.org> by casper.infradead.org. See http://www.infradead.org/rpr.html X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Mon, 18 Sep 2023 02:07:51 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777368433430729420 X-GMAIL-MSGID: 1777436092304688183 |
Series |
[RFC] KVM: x86: Allow userspace exit on HLT and MWAIT, else yield on MWAIT
|
|
Commit Message
David Woodhouse
Sept. 18, 2023, 9:06 a.m. UTC
From: David Woodhouse <dwmw@amazon.co.uk> The VMM may have work to do on behalf of the guest, and it's often desirable to use the cycles when the vCPUS are idle. When the vCPU uses HLT this works out OK because the VMM can run its tasks in a separate thread which gets scheduled when the in-kernel emulation of HLT schedules away. It isn't perfect, because it doesn't easily allow for handling both low-priority maintenance tasks when the VMM wants to wait until the vCPU is idle, and also for higher priority tasks where the VMM does want to preempt the vCPU. It can also lead to noisy neighbour effects, when a host has isn't necessarily sized to expect any given VMM to suddenly be contending for many *more* pCPUs than it has vCPUs. In addition, there are times when we need to expose MWAIT to a guest for compatibility with a previous environment. And MWAIT is much harder because it's very hard to emulate properly. There were attempts at doing so based on marking the target page read- only in MONITOR and triggering the wake when it takes a minor fault, but so far they haven't led to a working solution: https://www.contrib.andrew.cmu.edu/~somlo/OSXKVM/mwait.html So when a guest executes MWAIT, either we've disabled exit-on-mwait and the guest actually sits in non-root mode hogging the pCPU, or if we do enable exit-on-mwait the kernel just treats it as a NOP and bounces right back into the guest to busy-wait round its idle loop. For a start, we can stick a yield() into that busy-loop. The yield() has fairly poorly defined semantics, but it's better than *nothing* and does allow a VMM's thread-based I/O and maintenance tasks to run a *little* better. Better still, we can bounce all the way out to *userspace* on an MWAIT exit, and let the VMM perform some of its pending work right there and then in the vCPU thread before re-entering the vCPU. That's much nicer than yield(). The vCPU is still runnable, since we still don't have a *real* emulation of MWAIT, so the vCPU thread can do a *little* bit of work and then go back into the vCPU for another turn around the loop. And if we're going to do that kind of task processing for MWAIT-idle guests directly from the vCPU thread, it's neater to do it for HLT-idle guests that way too. For HLT, the vCPU *isn't* runnable; it'll be in KVM_MP_STATE_HALTED. The VMM can poll the mp_state and know when the vCPU should be run again. But not poll(), although we might want to hook up something like that (or just a signal or eventfd) for other reasons for VSM anyway. The VMM can also just do some work and then re-enter the vCPU without the corresponding bit set in the kvm_run struct. So, er, what does this patch do? Add a capability, define two bits for exiting to userspace on HLT or MWAIT — in the kvm_run struct rather than needing a separate ioctl to turn them on or off, so that the VMM can make the decision each time it enters the vCPU. Hook it up to (ab?)use the existing KVM_EXIT_HLT which was previously only used when the local APIC was emulated in userspace, and add a new KVM_EXIT_MWAIT. Fairly much untested. If this approach seems reasonable, of course I'll add test cases and proper documentation before posting it for real. This is the proof of concept before we even put it through testing to see what performance we get out of it especially for those obnoxious MWAIT-enabled guests. Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Comments
On Mon, Sep 18, 2023 at 01:59:50PM +0200, Alexander Graf wrote:
> The problem with MWAIT is that you don't really know when it's done.
This isn't really a problem. MWAIT is allowed (expected even) to return
early.
REP;NOP is a valid implementation of MWAIT.
MWAIT must not delay waking (much) after either:
- write to monitored address
- interrupt pending
But it doesn't say anything about not waking up sooner.
Now, obviously on real hardware you prefer if MWAIT were to also do the
whole C-state thing and safe your some actual power, but this is virt,
real hardware is not a concern and wakeup-timeliness also not much.
IIRC the ARM64 WFE thing has a 10khz timer or something it wakes from if
nothing else. So I suppose what I'm saying is that: nanosleep(100000)
might be a suitable MWAIT implementation.
It's virt, it sucks anyway :-)
On Mon, Sep 18, 2023 at 11:30 AM David Woodhouse <dwmw2@infradead.org> wrote: > > From: David Woodhouse <dwmw@amazon.co.uk> > > The VMM may have work to do on behalf of the guest, and it's often > desirable to use the cycles when the vCPUS are idle. > > When the vCPU uses HLT this works out OK because the VMM can run its > tasks in a separate thread which gets scheduled when the in-kernel > emulation of HLT schedules away. It isn't perfect, because it doesn't > easily allow for handling both low-priority maintenance tasks when the > VMM wants to wait until the vCPU is idle, and also for higher priority > tasks where the VMM does want to preempt the vCPU. It can also lead to > noisy neighbour effects, when a host has isn't necessarily sized to > expect any given VMM to suddenly be contending for many *more* pCPUs > than it has vCPUs. > > In addition, there are times when we need to expose MWAIT to a guest > for compatibility with a previous environment. And MWAIT is much harder > because it's very hard to emulate properly. I don't dislike giving userspace more flexibility in deciding when to exit on HLT and MWAIT (or even PAUSE), and kvm_run is a good place to do this. It's an extension of request_interrupt_window and immediate_exit. I'm not sure how it would interact with KVM_CAP_X86_DISABLE_EXITS. Perhaps KVM_ENABLE_CAP(KVM_X86_DISABLE_EXITS) could be changed to do nothing except writing to a new kvm_run field? All the kvm->arch.*_in_guest field would change into a kvm->arch.saved_request_userspace_exit, and every vmentry would do something like if (kvm->arch.saved_request_userspace_exit != kvm_run->request_userspace_exit) { /* tweak intercepts */ } To avoid races you need two flags though; there needs to be also a kernel->userspace communication of whether the vCPU is currently in HLT or MWAIT, using the "flags" field for example. If it was HLT only, moving the mp_state in kvm_run would seem like a good idea; but not if MWAIT or PAUSE are also included. To set a kvm_run flag during MWAIT, you could reenter MWAIT with the MWAIT-exiting bit cleared and the monitor trap flag bit (or just EFLAGS.TF) set. On the subsequent singlestep exit, clear the flag in kvm_run and set again the MWAIT-exiting bit. The MWAIT handler would also check kvm_run->request_userspace_exit before reentering. Paolo
On Fri, 2023-09-22 at 14:00 +0200, Paolo Bonzini wrote: > On Mon, Sep 18, 2023 at 11:30 AM David Woodhouse <dwmw2@infradead.org> wrote: > > > > From: David Woodhouse <dwmw@amazon.co.uk> > > > > The VMM may have work to do on behalf of the guest, and it's often > > desirable to use the cycles when the vCPUS are idle. > > > > When the vCPU uses HLT this works out OK because the VMM can run its > > tasks in a separate thread which gets scheduled when the in-kernel > > emulation of HLT schedules away. It isn't perfect, because it doesn't > > easily allow for handling both low-priority maintenance tasks when the > > VMM wants to wait until the vCPU is idle, and also for higher priority > > tasks where the VMM does want to preempt the vCPU. It can also lead to > > noisy neighbour effects, when a host has isn't necessarily sized to > > expect any given VMM to suddenly be contending for many *more* pCPUs > > than it has vCPUs. > > > > In addition, there are times when we need to expose MWAIT to a guest > > for compatibility with a previous environment. And MWAIT is much harder > > because it's very hard to emulate properly. > > I don't dislike giving userspace more flexibility in deciding when to > exit on HLT and MWAIT (or even PAUSE), and kvm_run is a good place to > do this. It's an extension of request_interrupt_window and > immediate_exit. I'm not sure how it would interact with > KVM_CAP_X86_DISABLE_EXITS. Yeah, right now it doesn't interact at all. The use case is that you *always* allow vmexits to KVM for the offending instructions, and then it's just a question of what KVM does when that happens. > Perhaps KVM_ENABLE_CAP(KVM_X86_DISABLE_EXITS) could be changed to do > nothing except writing to a new kvm_run field? All the kvm- > >arch.*_in_guest field would change into a kvm- > >arch.saved_request_userspace_exit, and every vmentry would do > something like > > if (kvm->arch.saved_request_userspace_exit != kvm_run->request_userspace_exit) { > /* tweak intercepts */ > } > > To avoid races you need two flags though; there needs to be also a > kernel->userspace communication of whether the vCPU is currently in > HLT or MWAIT, using the "flags" field for example. If it was HLT only, > moving the mp_state in kvm_run would seem like a good idea; but not if > MWAIT or PAUSE are also included. Right. When work is added to an empty workqueue, the VMM will want to hunt for a vCPU which is currently idle and then signal it to exit. As you say, for HLT it's simple enough to look at the mp_state, and we can move that into kvm_run so it doesn't need an ioctl... although it would also be nice to get an *event* on an eventfd when the vCPU becomes runnable (as noted, we want that for VSM anyway). Or perhaps even to be able to poll() on the vCPU fd. But MWAIT (as currently not-really-emulated) and PAUSE are both just transient states with nothing you can really *wait* for, which is why they're such fun to deal with. > To set a kvm_run flag during MWAIT, you could reenter MWAIT with the > MWAIT-exiting bit cleared and the monitor trap flag bit (or just > EFLAGS.TF) set. On the subsequent singlestep exit, clear the flag in > kvm_run and set again the MWAIT-exiting bit. The MWAIT handler would > also check kvm_run->request_userspace_exit before reentering. Yeah, we've pondered that one. Perhaps coupled with setting the scheduling priority as low as possible while it's actually on the MWAIT, and putting it back again afterwards. Something along the lines of 'do not schedule me unless you literally have *nothing* else to do on this pCPU, for the next N µs'. Not pretty, but *nothing* you do with MWAIT is going to be pretty. Unless we can tolerate 4KiB granularity and actually get the read-only and minor fault trick working. Anyway, I knocked this up just for Fred to play with and see what actually performs reasonably and what doesn't, because I never want to post even random proof-of-concept kernel patches in private. So we'll play with it and see what we get out of it.
On 9/23/23 09:22, David Woodhouse wrote: > On Fri, 2023-09-22 at 14:00 +0200, Paolo Bonzini wrote: >> To avoid races you need two flags though; there needs to be also a >> kernel->userspace communication of whether the vCPU is currently in >> HLT or MWAIT, using the "flags" field for example. If it was HLT only, >> moving the mp_state in kvm_run would seem like a good idea; but not if >> MWAIT or PAUSE are also included. > > Right. When work is added to an empty workqueue, the VMM will want to > hunt for a vCPU which is currently idle and then signal it to exit. > > As you say, for HLT it's simple enough to look at the mp_state, and we > can move that into kvm_run so it doesn't need an ioctl... Looking at it again: not so easy because the mpstate is changed in the vCPU thread by vcpu_block() itself. > although it > would also be nice to get an *event* on an eventfd when the vCPU > becomes runnable (as noted, we want that for VSM anyway). Or perhaps > even to be able to poll() on the vCPU fd. Why do you need it? You can just use KVM_RUN to go to sleep, and if you get another job you kick out the vCPU with pthread_kill. (I also didn't get the VSM reference). An interesting quirk is that kvm_run->immediate_exit is processed before kvm_vcpu_block(), but TIF_SIGPENDING is processed afterwards. This means that you can force an mpstate update with pthread_kill + KVM_RUN. It's not going to be a speed demon, but it's worth writing a selftest for it. > But MWAIT (as currently not-really-emulated) and PAUSE are both just > transient states with nothing you can really *wait* for, which is why > they're such fun to deal with. PAUSE is easier because it is just momentary and you stick it inside what's already a busy wait. MWAIT is less fun because you don't really want to busy wait. Paolo
On 23.09.23 11:24, Paolo Bonzini wrote: > > On 9/23/23 09:22, David Woodhouse wrote: >> On Fri, 2023-09-22 at 14:00 +0200, Paolo Bonzini wrote: >>> To avoid races you need two flags though; there needs to be also a >>> kernel->userspace communication of whether the vCPU is currently in >>> HLT or MWAIT, using the "flags" field for example. If it was HLT only, >>> moving the mp_state in kvm_run would seem like a good idea; but not if >>> MWAIT or PAUSE are also included. >> >> Right. When work is added to an empty workqueue, the VMM will want to >> hunt for a vCPU which is currently idle and then signal it to exit. >> >> As you say, for HLT it's simple enough to look at the mp_state, and we >> can move that into kvm_run so it doesn't need an ioctl... > > Looking at it again: not so easy because the mpstate is changed in the > vCPU thread by vcpu_block() itself. > >> although it >> would also be nice to get an *event* on an eventfd when the vCPU >> becomes runnable (as noted, we want that for VSM anyway). Or perhaps >> even to be able to poll() on the vCPU fd. > > Why do you need it? You can just use KVM_RUN to go to sleep, and if you > get another job you kick out the vCPU with pthread_kill. (I also didn't > get the VSM reference). With the original VSM patches, we used to make a vCPU aware of the fact that it can morph into one of many VTLs. That approach turned out to be insanely intrusive and fragile and so we're currently reimplementing everything as VTLs as vCPUs. That allows us to move the majority of VSM functionality to user space. Everything we've seen so far looks as if there is no real performance loss with that approach. One small problem with that is that now user space is responsible for switching between VTLs: It determines which VTL is currently running and leaves all others (read: all other vCPUs) as stopped. That means if you are running happily in KVM_RUN in VTL0 and VTL1 gets an interrupt, user space needs to stop VTL0 and unpause VTL1 until it triggers VTL_RETURN at which point VTL1 stops execution and VTL0 runs again. Nicolas built a patch that exposes "interrupt on vCPU is pending" as an ioeventfd user space can request. That way, user space can know whenever a currently paused vCPU has a pending interrupt and can act accordingly. You could use the same mechanism if you wanted to implement HLT in user space, but still use an in-kernel LAPIC. Alex Amazon Development Center Germany GmbH Krausenstr. 38 10117 Berlin Geschaeftsfuehrung: Christian Schlaeger, Jonathan Weiss Eingetragen am Amtsgericht Charlottenburg unter HRB 149173 B Sitz: Berlin Ust-ID: DE 289 237 879
On Sat, Sep 23, 2023 at 6:44 PM Alexander Graf <graf@amazon.de> wrote: > On 23.09.23 11:24, Paolo Bonzini wrote: > > Why do you need it? You can just use KVM_RUN to go to sleep, and if you > > get another job you kick out the vCPU with pthread_kill. (I also didn't > > get the VSM reference). > > With the original VSM patches, we used to make a vCPU aware of the fact > that it can morph into one of many VTLs. That approach turned out to be > insanely intrusive and fragile and so we're currently reimplementing > everything as VTLs as vCPUs. That allows us to move the majority of VSM > functionality to user space. Everything we've seen so far looks as if > there is no real performance loss with that approach. Yes, that was also what I remember, sharing the FPU somehow while having separate vCPU file descriptors. > One small problem with that is that now user space is responsible for > switching between VTLs: It determines which VTL is currently running and > leaves all others (read: all other vCPUs) as stopped. That means if you > are running happily in KVM_RUN in VTL0 and VTL1 gets an interrupt, user > space needs to stop VTL0 and unpause VTL1 until it triggers VTL_RETURN > at which point VTL1 stops execution and VTL0 runs again. That's with IPIs in VTL1, right? I understand now. My idea was, since we need a link from VTL1 to VTL0 for the FPU, to use the same link to trigger a vmexit to userspace if source VTL > destination VTL. I am not sure how you would handle the case where the destination vCPU is not running; probably by detecting the IPI when VTL0 restarts on the destination vCPU? In any case, making vCPUs poll()-able is sensible. Paolo > Nicolas built a patch that exposes "interrupt on vCPU is pending" as an > ioeventfd user space can request. That way, user space can know whenever > a currently paused vCPU has a pending interrupt and can act accordingly. > You could use the same mechanism if you wanted to implement HLT in user > space, but still use an in-kernel LAPIC.
On 26 September 2023 19:20:24 CEST, Paolo Bonzini <pbonzini@redhat.com> wrote: >On Sat, Sep 23, 2023 at 6:44 PM Alexander Graf <graf@amazon.de> wrote: >> On 23.09.23 11:24, Paolo Bonzini wrote: >> > Why do you need it? You can just use KVM_RUN to go to sleep, and if you >> > get another job you kick out the vCPU with pthread_kill. (I also didn't >> > get the VSM reference). >> >> With the original VSM patches, we used to make a vCPU aware of the fact >> that it can morph into one of many VTLs. That approach turned out to be >> insanely intrusive and fragile and so we're currently reimplementing >> everything as VTLs as vCPUs. That allows us to move the majority of VSM >> functionality to user space. Everything we've seen so far looks as if >> there is no real performance loss with that approach. > >Yes, that was also what I remember, sharing the FPU somehow while >having separate vCPU file descriptors. > >> One small problem with that is that now user space is responsible for >> switching between VTLs: It determines which VTL is currently running and >> leaves all others (read: all other vCPUs) as stopped. That means if you >> are running happily in KVM_RUN in VTL0 and VTL1 gets an interrupt, user >> space needs to stop VTL0 and unpause VTL1 until it triggers VTL_RETURN >> at which point VTL1 stops execution and VTL0 runs again. > >That's with IPIs in VTL1, right? I understand now. My idea was, since >we need a link from VTL1 to VTL0 for the FPU, to use the same link to >trigger a vmexit to userspace if source VTL > destination VTL. I am >not sure how you would handle the case where the destination vCPU is >not running; probably by detecting the IPI when VTL0 restarts on the >destination vCPU? > >In any case, making vCPUs poll()-able is sensible. Thinking about this a bit more, even for HLT it probably isn't just as simple as checking for mp_state changes. If there's a REQ_EVENT outstanding for something like a timer delivery, that won't get handled and the IRQ actually delivered to the local APIC until the vCPU is actually *run*, will it?
On Tue, Sep 26, 2023, David Woodhouse wrote: > > > On 26 September 2023 19:20:24 CEST, Paolo Bonzini <pbonzini@redhat.com> wrote: > >On Sat, Sep 23, 2023 at 6:44 PM Alexander Graf <graf@amazon.de> wrote: > >> On 23.09.23 11:24, Paolo Bonzini wrote: > >> > Why do you need it? You can just use KVM_RUN to go to sleep, and if you > >> > get another job you kick out the vCPU with pthread_kill. (I also didn't > >> > get the VSM reference). > >> > >> With the original VSM patches, we used to make a vCPU aware of the fact > >> that it can morph into one of many VTLs. That approach turned out to be > >> insanely intrusive and fragile and so we're currently reimplementing > >> everything as VTLs as vCPUs. That allows us to move the majority of VSM > >> functionality to user space. Everything we've seen so far looks as if > >> there is no real performance loss with that approach. > > > >Yes, that was also what I remember, sharing the FPU somehow while > >having separate vCPU file descriptors. > > > >> One small problem with that is that now user space is responsible for > >> switching between VTLs: It determines which VTL is currently running and > >> leaves all others (read: all other vCPUs) as stopped. That means if you > >> are running happily in KVM_RUN in VTL0 and VTL1 gets an interrupt, user > >> space needs to stop VTL0 and unpause VTL1 until it triggers VTL_RETURN > >> at which point VTL1 stops execution and VTL0 runs again. > > > >That's with IPIs in VTL1, right? I understand now. My idea was, since > >we need a link from VTL1 to VTL0 for the FPU, to use the same link to > >trigger a vmexit to userspace if source VTL > destination VTL. I am > >not sure how you would handle the case where the destination vCPU is > >not running; probably by detecting the IPI when VTL0 restarts on the > >destination vCPU? > > > >In any case, making vCPUs poll()-able is sensible. > > Thinking about this a bit more, even for HLT it probably isn't just as simple > as checking for mp_state changes. If there's a REQ_EVENT outstanding for > something like a timer delivery, that won't get handled and the IRQ actually > delivered to the local APIC until the vCPU is actually *run*, will it? I haven't been following this conversation, just reacting to seeing "HLT" and "mp_state", which is a bit of a mess: https://lore.kernel.org/all/ZMgIQ5m1jMSAogT4@google.com
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index a6582c1fd8b9..8f931539114a 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -2128,9 +2128,23 @@ static int kvm_emulate_monitor_mwait(struct kvm_vcpu *vcpu, const char *insn) pr_warn_once("%s instruction emulated as NOP!\n", insn); return kvm_emulate_as_nop(vcpu); } + int kvm_emulate_mwait(struct kvm_vcpu *vcpu) { - return kvm_emulate_monitor_mwait(vcpu, "MWAIT"); + int ret = kvm_emulate_monitor_mwait(vcpu, "MWAIT"); + + if (ret && kvm_userspace_exit(vcpu, KVM_EXIT_MWAIT)) { + vcpu->run->exit_reason = KVM_EXIT_MWAIT; + ret = 0; + } else { + /* + * Calling yield() has poorly defined semantics, but the + * guest is in a busy loop and it's the best we can do + * without a full emulation of MONITOR/MWAIT. + */ + yield(); + } + return ret; } EXPORT_SYMBOL_GPL(kvm_emulate_mwait); @@ -4554,6 +4568,9 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext) r |= KVM_X86_DISABLE_EXITS_MWAIT; } break; + case KVM_CAP_X86_USERSPACE_EXITS: + r = KVM_X86_USERSPACE_VALID_EXITS; + break; case KVM_CAP_X86_SMM: if (!IS_ENABLED(CONFIG_KVM_SMM)) break; @@ -9643,11 +9660,11 @@ static int __kvm_emulate_halt(struct kvm_vcpu *vcpu, int state, int reason) ++vcpu->stat.halt_exits; if (lapic_in_kernel(vcpu)) { vcpu->arch.mp_state = state; - return 1; - } else { - vcpu->run->exit_reason = reason; - return 0; + if (!kvm_userspace_exit(vcpu, reason)) + return 1; } + vcpu->run->exit_reason = reason; + return 0; } int kvm_emulate_halt_noskip(struct kvm_vcpu *vcpu) diff --git a/arch/x86/kvm/x86.h b/arch/x86/kvm/x86.h index 1e7be1f6ab29..ce10a809151c 100644 --- a/arch/x86/kvm/x86.h +++ b/arch/x86/kvm/x86.h @@ -430,6 +430,19 @@ static inline bool kvm_notify_vmexit_enabled(struct kvm *kvm) return kvm->arch.notify_vmexit_flags & KVM_X86_NOTIFY_VMEXIT_ENABLED; } +static inline bool kvm_userspace_exit(struct kvm_vcpu *vcpu, int reason) +{ + if (reason == KVM_EXIT_HLT && + (vcpu->run->userspace_exits & KVM_X86_USERSPACE_EXIT_HLT)) + return true; + + if (reason == KVM_EXIT_MWAIT && + (vcpu->run->userspace_exits & KVM_X86_USERSPACE_EXIT_MWAIT)) + return true; + + return false; +} + enum kvm_intr_type { /* Values are arbitrary, but must be non-zero. */ KVM_HANDLING_IRQ = 1, diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h index 13065dd96132..43d94d49fc24 100644 --- a/include/uapi/linux/kvm.h +++ b/include/uapi/linux/kvm.h @@ -264,6 +264,7 @@ struct kvm_xen_exit { #define KVM_EXIT_RISCV_SBI 35 #define KVM_EXIT_RISCV_CSR 36 #define KVM_EXIT_NOTIFY 37 +#define KVM_EXIT_MWAIT 38 /* For KVM_EXIT_INTERNAL_ERROR */ /* Emulate instruction failed. */ @@ -283,7 +284,8 @@ struct kvm_run { /* in */ __u8 request_interrupt_window; __u8 immediate_exit; - __u8 padding1[6]; + __u8 userspace_exits; + __u8 padding1[5]; /* out */ __u32 exit_reason; @@ -841,6 +843,11 @@ struct kvm_ioeventfd { KVM_X86_DISABLE_EXITS_PAUSE | \ KVM_X86_DISABLE_EXITS_CSTATE) +#define KVM_X86_USERSPACE_EXIT_MWAIT (1 << 0) +#define KVM_X86_USERSPACE_EXIT_HLT (1 << 1) +#define KVM_X86_USERSPACE_VALID_EXITS (KVM_X86_USERSPACE_EXIT_MWAIT | \ + KVM_X86_USERSPACE_EXIT_HLT) + /* for KVM_ENABLE_CAP */ struct kvm_enable_cap { /* in */ @@ -1192,6 +1199,7 @@ struct kvm_ppc_resize_hpt { #define KVM_CAP_COUNTER_OFFSET 227 #define KVM_CAP_ARM_EAGER_SPLIT_CHUNK_SIZE 228 #define KVM_CAP_ARM_SUPPORTED_BLOCK_SIZES 229 +#define KVM_CAP_X86_USERSPACE_EXITS 230 #ifdef KVM_CAP_IRQ_ROUTING