Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1660331
| Path | csiph.com!news.mixmin.net!aioe.org!news.servidellagleba.it!bofh.it!news.nic.it!robomod |
|---|---|
| From | Willy Tarreau <w@1wt.eu> |
| Newsgroups | linux.kernel |
| Subject | [PATCH 3.10 241/250] KVM: x86: clear bus pointer when destroyed |
| Date | Thu, 08 Jun 2017 01:10:03 +0200 |
| Message-ID | <tPSfp-4Fa-53@gated-at.bofh.it> (permalink) |
| References | <tPSfn-4Fa-3@gated-at.bofh.it> |
| X-Mailer | git-send-email 2.8.0.rc2.1.gbe9624a |
| MIME-Version | 1.0 |
| Content-Type | text/plain; charset=latin1 |
| Content-Transfer-Encoding | 8bit |
| Sender | robomod@news.nic.it |
| List-ID | <linux-kernel.vger.kernel.org> |
| X-Mailing-List | linux-kernel@vger.kernel.org |
| Approved | robomod@news.nic.it |
| Lines | 48 |
| Organization | linux.* mail to news gateway |
| X-Original-Cc | Peter Xu <peterx@redhat.com>, Radim Krčmář <rkrcmar@redhat.com>, Willy Tarreau <w@1wt.eu> |
| X-Original-Date | Thu, 8 Jun 2017 01:00:27 +0200 |
| X-Original-Message-ID | <1496876436-32402-242-git-send-email-w@1wt.eu> |
| X-Original-References | <1496876436-32402-1-git-send-email-w@1wt.eu> |
| X-Original-Sender | linux-kernel-owner@vger.kernel.org |
| Xref | csiph.com linux.kernel:1660331 |
Show key headers only | View raw
From: Peter Xu <peterx@redhat.com>
commit df630b8c1e851b5e265dc2ca9c87222e342c093b upstream.
When releasing the bus, let's clear the bus pointers to mark it out. If
any further device unregister happens on this bus, we know that we're
done if we found the bus being released already.
Signed-off-by: Peter Xu <peterx@redhat.com>
Signed-off-by: Radim KrÄmář <rkrcmar@redhat.com>
Signed-off-by: Willy Tarreau <w@1wt.eu>
---
virt/kvm/kvm_main.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index f71c4ad..e9128725 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -607,8 +607,10 @@ static void kvm_destroy_vm(struct kvm *kvm)
list_del(&kvm->vm_list);
raw_spin_unlock(&kvm_lock);
kvm_free_irq_routing(kvm);
- for (i = 0; i < KVM_NR_BUSES; i++)
+ for (i = 0; i < KVM_NR_BUSES; i++) {
kvm_io_bus_destroy(kvm->buses[i]);
+ kvm->buses[i] = NULL;
+ }
kvm_coalesced_mmio_free(kvm);
#if defined(CONFIG_MMU_NOTIFIER) && defined(KVM_ARCH_WANT_MMU_NOTIFIER)
mmu_notifier_unregister(&kvm->mmu_notifier, kvm->mm);
@@ -2959,6 +2961,14 @@ int kvm_io_bus_unregister_dev(struct kvm *kvm, enum kvm_bus bus_idx,
struct kvm_io_bus *new_bus, *bus;
bus = kvm->buses[bus_idx];
+
+ /*
+ * It's possible the bus being released before hand. If so,
+ * we're done here.
+ */
+ if (!bus)
+ return 0;
+
r = -ENOENT;
for (i = 0; i < bus->dev_count; i++)
if (bus->range[i].dev == dev) {
--
2.8.0.rc2.1.gbe9624a
Back to linux.kernel | Previous | Next | Find similar | Unroll thread
[PATCH 3.10 241/250] KVM: x86: clear bus pointer when destroyed Willy Tarreau <w@1wt.eu> - 2017-06-08 01:10 +0200
csiph-web