From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 49AABC07E9D for ; Mon, 19 Jul 2021 12:43:56 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 12CA86113C for ; Mon, 19 Jul 2021 12:43:56 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 12CA86113C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3D7FA6E077; Mon, 19 Jul 2021 12:43:53 +0000 (UTC) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by gabe.freedesktop.org (Postfix) with ESMTPS id E11AA6E0CA for ; Mon, 19 Jul 2021 12:43:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1626698631; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=CsRWkrkLCBHdORvI+0r8/crMEZchxVDKUeRiFvqeFeU=; b=iSghQDQd8AKpFIjh/UHz+2uDfEGGLspRGoGsZ5Nq802LRbR15j3xWhh7SvOnMVpBvj4bW5 +/aY7VNEXCZ9fzaWkxXfk9zcPY62nyEFSlr9tA6Mdokyl1zZrXs+V5rYoqlkOoHiOhrBWu KZI/QJPv+31pcCvWBZbi1W1Sbza6c04= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-38-zB30tcNENIC3_rzETh12zw-1; Mon, 19 Jul 2021 08:43:47 -0400 X-MC-Unique: zB30tcNENIC3_rzETh12zw-1 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4DC77362FA; Mon, 19 Jul 2021 12:43:44 +0000 (UTC) Received: from localhost (ovpn-112-158.ams2.redhat.com [10.36.112.158]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EDDAB18F0A; Mon, 19 Jul 2021 12:43:35 +0000 (UTC) From: Cornelia Huck To: Jason Gunthorpe In-Reply-To: <20210719121730.GP543781@nvidia.com> Organization: Red Hat GmbH References: <2-v1-eaf3ccbba33c+1add0-vfio_reflck_jgg@nvidia.com> <8735sabj0l.fsf@redhat.com> <20210719121730.GP543781@nvidia.com> User-Agent: Notmuch/0.32.1 (https://notmuchmail.org) Date: Mon, 19 Jul 2021 14:43:34 +0200 Message-ID: <87y2a2a2yx.fsf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Subject: Re: [Intel-gfx] [PATCH 02/13] vfio: Introduce a vfio_uninit_group_dev() API call X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kvm@vger.kernel.org, linux-doc@vger.kernel.org, David Airlie , dri-devel@lists.freedesktop.org, Kirti Wankhede , Max Gurtovoy , Vineeth Vijayan , Diana Craciun , Leon Romanovsky , Christoph Hellwig , linux-s390@vger.kernel.org, Matthew Rosato , Jonathan Corbet , Halil Pasic , Christian Borntraeger , intel-gfx@lists.freedesktop.org, Jason Herne , Eric Farman , Vasily Gorbik , Heiko Carstens , Eric Auger , Harald Freudenberger , intel-gvt-dev@lists.freedesktop.org, "Raj, Ashok" , Tony Krowiak , Yishai Hadas , Peter Oberparleiter Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Mon, Jul 19 2021, Jason Gunthorpe wrote: > On Mon, Jul 19, 2021 at 02:11:38PM +0200, Cornelia Huck wrote: >> On Wed, Jul 14 2021, Jason Gunthorpe wrote: >> >> > From: Max Gurtovoy >> > >> > This pairs with vfio_init_group_dev() and allows undoing any state that is >> > stored in the vfio_device unrelated to registration. Add appropriately >> > placed calls to all the drivers. >> > >> > The following patch will use this to add pre-registration state for the >> > device set. >> > >> > Signed-off-by: Max Gurtovoy >> > Signed-off-by: Jason Gunthorpe >> > Documentation/driver-api/vfio.rst | 4 ++- >> > drivers/vfio/fsl-mc/vfio_fsl_mc.c | 6 +++-- >> > drivers/vfio/mdev/vfio_mdev.c | 13 +++++++--- >> > drivers/vfio/pci/vfio_pci.c | 6 +++-- >> > drivers/vfio/platform/vfio_platform_common.c | 7 +++-- >> > drivers/vfio/vfio.c | 5 ++++ >> > include/linux/vfio.h | 1 + >> > samples/vfio-mdev/mbochs.c | 2 ++ >> > samples/vfio-mdev/mdpy.c | 25 ++++++++++-------- >> > samples/vfio-mdev/mtty.c | 27 ++++++++++++-------- >> > 10 files changed, 64 insertions(+), 32 deletions(-) >> >> (...) >> >> > diff --git a/samples/vfio-mdev/mbochs.c b/samples/vfio-mdev/mbochs.c >> > index e81b875b4d87b4..cf264d0bf11053 100644 >> > +++ b/samples/vfio-mdev/mbochs.c >> > @@ -558,6 +558,7 @@ static int mbochs_probe(struct mdev_device *mdev) >> > return 0; >> > >> > err_mem: >> > + vfio_uninit_group_dev(&mdev_state->vdev); >> > kfree(mdev_state->vconfig); >> > kfree(mdev_state); >> > return ret; > > Doesn't this leak pages? Sigh. I think it also fails to decrease mbochs_used_mbytes; looks like there need to be two cleanup labels. > >> > @@ -571,6 +572,7 @@ static void mbochs_remove(struct mdev_device *mdev) >> > vfio_unregister_group_dev(&mdev_state->vdev); >> > kfree(mdev_state->pages); >> > kfree(mdev_state->vconfig); >> > + vfio_uninit_group_dev(&mdev_state->vdev); >> >> Does the location of the uninit vs the kfree matter? Even if not, it >> might be good to keep it consistent. > > It does not, but I will reorder it anyhow > > Jason _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx