From: "Paul E. McKenney" <paulmck@kernel.org>
To: cai@lca.pw, pbonzini@redhat.com, elver@google.com
Cc: linux-kernel@vger.kernel.org
Subject: fastpath_t? __no_kcsan? Both?
Date: Sun, 14 Jun 2020 21:20:02 -0700 [thread overview]
Message-ID: <20200615042002.GA14788@paulmck-ThinkPad-P72> (raw)
Hello!
I get the following conflict when rebasing 39a8c47635b0 ("kvm/svm:
Disable KCSAN for svm_vcpu_run()") onto v5.8-rc1:
<<<<<<< 6c410247efb2d3907b508a2448ab9ab1c86d938c
static fastpath_t svm_vcpu_run(struct kvm_vcpu *vcpu)
=======
static __no_kcsan void svm_vcpu_run(struct kvm_vcpu *vcpu)
>>>>>>> kvm/svm: Disable KCSAN for svm_vcpu_run()
The "natural" resolution would be this:
static fastpath_t __no_kcsan void svm_vcpu_run(struct kvm_vcpu *vcpu)
But does that make sense?
I have dropped this commit for the time being. Please either
let me know the proper resolution or submit a fresh patch,
your choice.
Thanx, Paul
------------------------------------------------------------------------
commit 39a8c47635b00ebf9a3c52d9ca357fff5a8b36e3
Author: Qian Cai <cai@lca.pw>
Date: Wed Apr 15 11:37:09 2020 -0400
kvm/svm: Disable KCSAN for svm_vcpu_run()
For some reasons, running a simple qemu-kvm command with KCSAN will
reset AMD hosts. It turns out svm_vcpu_run() could not be instrumented.
This commit therefore disables it for now.
# /usr/libexec/qemu-kvm -name ubuntu-18.04-server-cloudimg -cpu host
-smp 2 -m 2G -hda ubuntu-18.04-server-cloudimg.qcow2
=== console output ===
Kernel 5.6.0-next-20200408+ on an x86_64
hp-dl385g10-05 login:
<...host reset...>
HPE ProLiant System BIOS A40 v1.20 (03/09/2018)
(C) Copyright 1982-2018 Hewlett Packard Enterprise Development LP
Early system initialization, please wait...
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Qian Cai <cai@lca.pw>
Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c
index 38f6aee..c6f89e4 100644
--- a/arch/x86/kvm/svm/svm.c
+++ b/arch/x86/kvm/svm/svm.c
@@ -3280,7 +3280,7 @@ static void svm_cancel_injection(struct kvm_vcpu *vcpu)
void __svm_vcpu_run(unsigned long vmcb_pa, unsigned long *regs);
-static void svm_vcpu_run(struct kvm_vcpu *vcpu)
+static __no_kcsan void svm_vcpu_run(struct kvm_vcpu *vcpu)
{
struct vcpu_svm *svm = to_svm(vcpu);
next reply other threads:[~2020-06-15 4:20 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-15 4:20 Paul E. McKenney [this message]
2020-06-15 7:12 ` fastpath_t? __no_kcsan? Both? Paolo Bonzini
2020-06-15 14:03 ` Paul E. McKenney
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=20200615042002.GA14788@paulmck-ThinkPad-P72 \
--to=paulmck@kernel.org \
--cc=cai@lca.pw \
--cc=elver@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=pbonzini@redhat.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;
as well as URLs for NNTP newsgroup(s).