Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752028AbdFSROt (ORCPT ); Mon, 19 Jun 2017 13:14:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57498 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750913AbdFSROq (ORCPT ); Mon, 19 Jun 2017 13:14:46 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 39808C007ACA Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=alex.williamson@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 39808C007ACA Subject: [PATCH v2 2/9] kvm-vfio: Decouple only when we match a group From: Alex Williamson To: kvm@vger.kernel.org Cc: Alexey Kardashevskiy , linux-kernel@vger.kernel.org, stable@vger.kernel.org, eric.auger@redhat.com, alex.williamson@redhat.com, Paolo Bonzini Date: Mon, 19 Jun 2017 11:14:39 -0600 Message-ID: <20170619171439.14047.33875.stgit@gimli.home> In-Reply-To: <20170619170323.14047.26504.stgit@gimli.home> References: <20170619170323.14047.26504.stgit@gimli.home> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Mon, 19 Jun 2017 17:14:41 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1343 Lines: 44 Unset-KVM and decrement-assignment only when we find the group in our list. Otherwise we can get out of sync if the user triggers this for groups that aren't currently on our list. Signed-off-by: Alex Williamson Cc: Paolo Bonzini Cc: Eric Auger Cc: Alexey Kardashevskiy Cc: stable@vger.kernel.org --- virt/kvm/vfio.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/virt/kvm/vfio.c b/virt/kvm/vfio.c index 37d9118fd84b..f1b0b7bca9a9 100644 --- a/virt/kvm/vfio.c +++ b/virt/kvm/vfio.c @@ -246,21 +246,19 @@ static int kvm_vfio_set_group(struct kvm_device *dev, long attr, u64 arg) continue; list_del(&kvg->node); + kvm_arch_end_assignment(dev->kvm); +#ifdef CONFIG_SPAPR_TCE_IOMMU + kvm_spapr_tce_release_vfio_group(dev->kvm, vfio_group); +#endif + kvm_vfio_group_set_kvm(kvg->vfio_group, NULL); kvm_vfio_group_put_external_user(kvg->vfio_group); kfree(kvg); ret = 0; break; } - kvm_arch_end_assignment(dev->kvm); - mutex_unlock(&kv->lock); -#ifdef CONFIG_SPAPR_TCE_IOMMU - kvm_spapr_tce_release_vfio_group(dev->kvm, vfio_group); -#endif - kvm_vfio_group_set_kvm(vfio_group, NULL); - kvm_vfio_group_put_external_user(vfio_group); kvm_vfio_update_coherency(dev);