From patchwork Tue Jun 20 02:42:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Williamson X-Patchwork-Id: 9798415 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 46BA860328 for ; Tue, 20 Jun 2017 02:42:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4931826E97 for ; Tue, 20 Jun 2017 02:42:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3DE38271CB; Tue, 20 Jun 2017 02:42:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EB06626E97 for ; Tue, 20 Jun 2017 02:42:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751133AbdFTCme (ORCPT ); Mon, 19 Jun 2017 22:42:34 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37552 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751113AbdFTCmd (ORCPT ); Mon, 19 Jun 2017 22:42:33 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9C84C80F6B; Tue, 20 Jun 2017 02:42:32 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 9C84C80F6B Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=alex.williamson@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 9C84C80F6B Received: from w520.home (ovpn-116-91.phx2.redhat.com [10.3.116.91]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9BC8D19140; Tue, 20 Jun 2017 02:42:30 +0000 (UTC) Date: Mon, 19 Jun 2017 20:42:30 -0600 From: Alex Williamson To: Alexey Kardashevskiy Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org, eric.auger@redhat.com, Paolo Bonzini Subject: Re: [PATCH v2 2/9] kvm-vfio: Decouple only when we match a group Message-ID: <20170619204230.4b368f63@w520.home> In-Reply-To: <58985395-4f77-a37f-e809-3bd1203bce91@ozlabs.ru> References: <20170619170323.14047.26504.stgit@gimli.home> <20170619171439.14047.33875.stgit@gimli.home> <58985395-4f77-a37f-e809-3bd1203bce91@ozlabs.ru> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Tue, 20 Jun 2017 02:42:32 +0000 (UTC) Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Tue, 20 Jun 2017 12:34:57 +1000 Alexey Kardashevskiy wrote: > 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 Thanks, I made the following change for consistency: diff --git a/virt/kvm/vfio.c b/virt/kvm/vfio.c index f1b0b7bca9a9..6e002d0f3191 100644 --- a/virt/kvm/vfio.c +++ b/virt/kvm/vfio.c @@ -248,7 +248,8 @@ static int kvm_vfio_set_group(struct kvm_device *dev, long attr, u64 arg) 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); + 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);