From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751414AbdFZHcE (ORCPT ); Mon, 26 Jun 2017 03:32:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58768 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751544AbdFZHao (ORCPT ); Mon, 26 Jun 2017 03:30:44 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com A2E3480C0C Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=eric.auger@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com A2E3480C0C Subject: Re: [PATCH v3 2/9] kvm-vfio: Decouple only when we match a group To: Alex Williamson , kvm@vger.kernel.org References: <20170620154312.17487.66916.stgit@gimli.home> <20170620154750.17487.94673.stgit@gimli.home> Cc: Alexey Kardashevskiy , linux-kernel@vger.kernel.org, stable@vger.kernel.org, linux@armlinux.org.uk, Paolo Bonzini From: Auger Eric Message-ID: Date: Mon, 26 Jun 2017 09:30:36 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.4.0 MIME-Version: 1.0 In-Reply-To: <20170620154750.17487.94673.stgit@gimli.home> 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.26]); Mon, 26 Jun 2017 07:30:43 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, On 20/06/2017 17:47, Alex Williamson wrote: > 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 > Reviewed-by: Alexey Kardashevskiy > Cc: Paolo Bonzini > Cc: Eric Auger > Cc: stable@vger.kernel.org Reviewed-by: Eric Auger Thanks Eric > --- > virt/kvm/vfio.c | 13 ++++++------- > 1 file changed, 6 insertions(+), 7 deletions(-) > > diff --git a/virt/kvm/vfio.c b/virt/kvm/vfio.c > index 37d9118fd84b..6e002d0f3191 100644 > --- a/virt/kvm/vfio.c > +++ b/virt/kvm/vfio.c > @@ -246,21 +246,20 @@ 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, > + kvg->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); >