From: Christian Borntraeger <borntraeger@linux.ibm.com>
To: dwmw2@infradead.org, pbonzini@redhat.com
Cc: butterflyhuangxx@gmail.com, kvm@vger.kernel.org,
linux-kernel@vger.kernel.org, seanjc@google.com,
Cornelia Huck <cohuck@redhat.com>,
Christian Borntraeger <borntraeger@linux.ibm.com>,
Janosch Frank <frankja@linux.ibm.com>,
David Hildenbrand <david@redhat.com>,
linux-s390 <linux-s390@vger.kernel.org>,
Thomas Huth <thuth@redhat.com>,
Claudio Imbrenda <imbrenda@linux.ibm.com>
Subject: [PATCH] KVM: avoid warning on s390 in mark_page_dirty
Date: Thu, 13 Jan 2022 13:29:24 +0100 [thread overview]
Message-ID: <20220113122924.740496-1-borntraeger@linux.ibm.com> (raw)
In-Reply-To: <e9e5521d-21e5-8f6f-902c-17b0516b9839@redhat.com>
Avoid warnings on s390 like
[ 1801.980931] CPU: 12 PID: 117600 Comm: kworker/12:0 Tainted: G E 5.17.0-20220113.rc0.git0.32ce2abb03cf.300.fc35.s390x+next #1
[ 1801.980938] Workqueue: events irqfd_inject [kvm]
[...]
[ 1801.981057] Call Trace:
[ 1801.981060] [<000003ff805f0f5c>] mark_page_dirty_in_slot+0xa4/0xb0 [kvm]
[ 1801.981083] [<000003ff8060e9fe>] adapter_indicators_set+0xde/0x268 [kvm]
[ 1801.981104] [<000003ff80613c24>] set_adapter_int+0x64/0xd8 [kvm]
[ 1801.981124] [<000003ff805fb9aa>] kvm_set_irq+0xc2/0x130 [kvm]
[ 1801.981144] [<000003ff805f8d86>] irqfd_inject+0x76/0xa0 [kvm]
[ 1801.981164] [<0000000175e56906>] process_one_work+0x1fe/0x470
[ 1801.981173] [<0000000175e570a4>] worker_thread+0x64/0x498
[ 1801.981176] [<0000000175e5ef2c>] kthread+0x10c/0x110
[ 1801.981180] [<0000000175de73c8>] __ret_from_fork+0x40/0x58
[ 1801.981185] [<000000017698440a>] ret_from_fork+0xa/0x40
when writing to a guest from an irqfd worker as long as we do not have
the dirty ring.
Signed-off-by: Christian Borntraeger <borntraeger@linux.ibm.com>
---
virt/kvm/kvm_main.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 504158f0e131..1a682d3e106d 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -3163,8 +3163,10 @@ void mark_page_dirty_in_slot(struct kvm *kvm,
{
struct kvm_vcpu *vcpu = kvm_get_running_vcpu();
+#ifdef CONFIG_HAVE_KVM_DIRTY_RING
if (WARN_ON_ONCE(!vcpu) || WARN_ON_ONCE(vcpu->kvm != kvm))
return;
+#endif
if (memslot && kvm_slot_dirty_track_enabled(memslot)) {
unsigned long rel_gfn = gfn - memslot->base_gfn;
--
2.33.1
next prev parent reply other threads:[~2022-01-13 12:29 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-18 17:14 There is a null-ptr-deref bug in kvm_dirty_ring_get in virt/kvm/dirty_ring.c butt3rflyh4ck
2021-10-21 20:08 ` Paolo Bonzini
2021-10-28 7:42 ` butt3rflyh4ck
2021-11-08 5:11 ` butt3rflyh4ck
2021-11-16 15:41 ` butt3rflyh4ck
2021-11-16 16:22 ` [EXTERNAL] " David Woodhouse
2021-11-16 17:07 ` David Woodhouse
2021-11-17 9:46 ` Woodhouse, David
2021-11-17 16:49 ` Paolo Bonzini
2021-11-17 18:10 ` Woodhouse, David
2021-11-20 10:16 ` KVM: Warn if mark_page_dirty() is called without an active vCPU David Woodhouse
2021-11-22 17:01 ` Sean Christopherson
2021-11-22 17:52 ` David Woodhouse
2021-11-22 18:49 ` Sean Christopherson
2022-01-13 12:06 ` Christian Borntraeger
2022-01-13 12:14 ` Paolo Bonzini
2022-01-13 12:29 ` Christian Borntraeger [this message]
2022-01-13 12:31 ` [PATCH] KVM: avoid warning on s390 in mark_page_dirty David Woodhouse
2022-01-18 8:37 ` Christian Borntraeger
2022-01-18 8:44 ` Paolo Bonzini
2022-01-18 8:53 ` Christian Borntraeger
2022-01-18 11:44 ` Paolo Bonzini
2022-01-13 12:30 ` KVM: Warn if mark_page_dirty() is called without an active vCPU David Woodhouse
2022-01-13 12:51 ` Christian Borntraeger
2022-01-13 13:22 ` David Woodhouse
2022-01-13 15:09 ` Christian Borntraeger
2022-01-13 14:36 ` 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=20220113122924.740496-1-borntraeger@linux.ibm.com \
--to=borntraeger@linux.ibm.com \
--cc=butterflyhuangxx@gmail.com \
--cc=cohuck@redhat.com \
--cc=david@redhat.com \
--cc=dwmw2@infradead.org \
--cc=frankja@linux.ibm.com \
--cc=imbrenda@linux.ibm.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=seanjc@google.com \
--cc=thuth@redhat.com \
--subject='Re: [PATCH] KVM: avoid warning on s390 in mark_page_dirty' \
/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
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).