From: David Stevens <stevensd@chromium.org>
To: Sean Christopherson <seanjc@google.com>
Cc: Yu Zhang <yu.c.zhang@linux.intel.com>,
Isaku Yamahata <isaku.yamahata@gmail.com>,
Zhi Wang <zhi.wang.linux@gmail.com>,
Maxim Levitsky <mlevitsk@redhat.com>,
kvmarm@lists.linux.dev, linux-kernel@vger.kernel.org,
kvm@vger.kernel.org, David Stevens <stevensd@chromium.org>
Subject: [PATCH v10 2/8] KVM: Relax BUG_ON argument validation
Date: Wed, 21 Feb 2024 16:25:20 +0900 [thread overview]
Message-ID: <20240221072528.2702048-3-stevensd@google.com> (raw)
In-Reply-To: <20240221072528.2702048-1-stevensd@google.com>
From: David Stevens <stevensd@chromium.org>
hva_to_pfn() includes a check that KVM isn't trying to do an async page
fault in a situation where it can't sleep. Downgrade this check from a
BUG_ON() to a WARN_ON_ONCE(), since DoS'ing the guest (at worst) is
better than bringing down the host.
Suggested-by: Sean Christopherson <seanjc@google.com>
Signed-off-by: David Stevens <stevensd@chromium.org>
---
virt/kvm/kvm_main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index c5e4bf7c48f9..6f37d56fb2fc 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -2979,7 +2979,7 @@ kvm_pfn_t hva_to_pfn(unsigned long addr, bool atomic, bool interruptible,
int npages, r;
/* we can do it either atomically or asynchronously, not both */
- BUG_ON(atomic && async);
+ WARN_ON_ONCE(atomic && async);
if (hva_to_pfn_fast(addr, write_fault, writable, &pfn))
return pfn;
--
2.44.0.rc0.258.g7320e95886-goog
next prev parent reply other threads:[~2024-02-21 7:26 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-21 7:25 [PATCH v10 0/8] KVM: allow mapping non-refcounted pages David Stevens
2024-02-21 7:25 ` [PATCH v10 1/8] KVM: Assert that a page's refcount is elevated when marking accessed/dirty David Stevens
2024-02-21 7:25 ` David Stevens [this message]
2024-02-21 7:25 ` [PATCH v10 3/8] KVM: mmu: Introduce kvm_follow_pfn() David Stevens
2024-02-21 7:25 ` [PATCH v10 4/8] KVM: mmu: Improve handling of non-refcounted pfns David Stevens
2024-02-23 9:48 ` Paolo Bonzini
2024-02-23 18:00 ` Sean Christopherson
2024-02-21 7:25 ` [PATCH v10 5/8] KVM: Migrate kvm_vcpu_map to __kvm_follow_pfn David Stevens
2024-02-21 7:25 ` [PATCH v10 5/8] KVM: Migrate kvm_vcpu_map() to kvm_follow_pfn() David Stevens
2024-02-21 7:25 ` [PATCH v10 6/8] KVM: x86: Migrate to __kvm_follow_pfn David Stevens
2024-02-21 7:25 ` [PATCH v10 6/8] KVM: x86: Migrate to kvm_follow_pfn() David Stevens
2024-02-21 7:25 ` [PATCH v10 7/8] KVM: x86/mmu: Track if sptes refer to refcounted pages David Stevens
2024-02-23 10:00 ` Paolo Bonzini
2024-02-23 18:03 ` Sean Christopherson
2024-02-23 17:36 ` Sean Christopherson
2024-02-21 7:25 ` [PATCH v10 8/8] KVM: x86/mmu: Handle non-refcounted pages David Stevens
2024-02-23 9:44 ` [PATCH v10 0/8] KVM: allow mapping " 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=20240221072528.2702048-3-stevensd@google.com \
--to=stevensd@chromium.org \
--cc=isaku.yamahata@gmail.com \
--cc=kvm@vger.kernel.org \
--cc=kvmarm@lists.linux.dev \
--cc=linux-kernel@vger.kernel.org \
--cc=mlevitsk@redhat.com \
--cc=seanjc@google.com \
--cc=yu.c.zhang@linux.intel.com \
--cc=zhi.wang.linux@gmail.com \
/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