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=-17.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,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 7DC7AC07E9D for ; Mon, 19 Jul 2021 12:43:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 685126115B for ; Mon, 19 Jul 2021 12:43:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237004AbhGSMDJ (ORCPT ); Mon, 19 Jul 2021 08:03:09 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:37846 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236968AbhGSMDJ (ORCPT ); Mon, 19 Jul 2021 08:03:09 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1626698629; 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=EwsnYBqt4r6I9PuFH5+xOJwDIbWh1CR6co4vOm5if5v20VwBxdkk2MIbHxmOleSTomVMSZ Z9CUXt0T4wBuegkZFqx+gXtsRTEiHipCb5o6VxDWhnG6QkjAdEOwJ+KnbOalBmhnnsfDFB YOTUrMQAmNoAy9xE6hVBHA2G1TwQVGI= 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 Cc: David Airlie , Tony Krowiak , Alex Williamson , Christian Borntraeger , Jonathan Corbet , Daniel Vetter , Diana Craciun , dri-devel@lists.freedesktop.org, Eric Auger , Eric Farman , Harald Freudenberger , Vasily Gorbik , Heiko Carstens , intel-gfx@lists.freedesktop.org, intel-gvt-dev@lists.freedesktop.org, Jani Nikula , Jason Herne , Joonas Lahtinen , kvm@vger.kernel.org, Kirti Wankhede , linux-doc@vger.kernel.org, linux-s390@vger.kernel.org, Matthew Rosato , Peter Oberparleiter , Halil Pasic , Rodrigo Vivi , Vineeth Vijayan , Zhenyu Wang , Zhi Wang , "Raj, Ashok" , Christoph Hellwig , Leon Romanovsky , Max Gurtovoy , Yishai Hadas Subject: Re: [PATCH 02/13] vfio: Introduce a vfio_uninit_group_dev() API call 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 Content-Type: text/plain X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Precedence: bulk List-ID: X-Mailing-List: linux-doc@vger.kernel.org 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