Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751050AbdFTCfF (ORCPT ); Mon, 19 Jun 2017 22:35:05 -0400 Received: from mail-pg0-f68.google.com ([74.125.83.68]:34707 "EHLO mail-pg0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750878AbdFTCfD (ORCPT ); Mon, 19 Jun 2017 22:35:03 -0400 Subject: Re: [PATCH v2 2/9] kvm-vfio: Decouple only when we match a group To: Alex Williamson , kvm@vger.kernel.org Cc: linux-kernel@vger.kernel.org, stable@vger.kernel.org, eric.auger@redhat.com, Paolo Bonzini References: <20170619170323.14047.26504.stgit@gimli.home> <20170619171439.14047.33875.stgit@gimli.home> From: Alexey Kardashevskiy Message-ID: <58985395-4f77-a37f-e809-3bd1203bce91@ozlabs.ru> Date: Tue, 20 Jun 2017 12:34:57 +1000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.1.0 MIME-Version: 1.0 In-Reply-To: <20170619171439.14047.33875.stgit@gimli.home> Content-Type: text/plain; charset=koi8-r Content-Language: en-AU Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1680 Lines: 62 On 20/06/17 03:14, 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 > 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); Tiny nit: vfio_group becomes kvg->vfio_group in kvm_vfio_group_set_kvm() and does not in kvm_spapr_tce_release_vfio_group(). Anyway, Reviewed-by: Alexey Kardashevskiy > - > kvm_vfio_group_put_external_user(vfio_group); > > kvm_vfio_update_coherency(dev); > -- Alexey