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=-8.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=ham 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 620AFC10DCE for ; Tue, 24 Mar 2020 08:55:01 +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 40A0A205ED for ; Tue, 24 Mar 2020 08:55:01 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 40A0A205ED Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 620966E451; Tue, 24 Mar 2020 08:55:00 +0000 (UTC) Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) by gabe.freedesktop.org (Postfix) with ESMTPS id 174F86E286; Tue, 24 Mar 2020 08:54:59 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 81795AC19; Tue, 24 Mar 2020 08:54:57 +0000 (UTC) Subject: Re: [PATCH 22/51] drm: manage drm_minor cleanup with drmm_ To: Daniel Vetter , DRI Development References: <20200323144950.3018436-1-daniel.vetter@ffwll.ch> <20200323144950.3018436-23-daniel.vetter@ffwll.ch> From: Thomas Zimmermann Autocrypt: addr=tzimmermann@suse.de; keydata= mQENBFs50uABCADEHPidWt974CaxBVbrIBwqcq/WURinJ3+2WlIrKWspiP83vfZKaXhFYsdg XH47fDVbPPj+d6tQrw5lPQCyqjwrCPYnq3WlIBnGPJ4/jreTL6V+qfKRDlGLWFjZcsrPJGE0 BeB5BbqP5erN1qylK9i3gPoQjXGhpBpQYwRrEyQyjuvk+Ev0K1Jc5tVDeJAuau3TGNgah4Yc hdHm3bkPjz9EErV85RwvImQ1dptvx6s7xzwXTgGAsaYZsL8WCwDaTuqFa1d1jjlaxg6+tZsB 9GluwvIhSezPgnEmimZDkGnZRRSFiGP8yjqTjjWuf0bSj5rUnTGiyLyRZRNGcXmu6hjlABEB AAG0J1Rob21hcyBaaW1tZXJtYW5uIDx0emltbWVybWFubkBzdXNlLmRlPokBVAQTAQgAPhYh BHIX+6yM6c9jRKFo5WgNwR1TC3ojBQJbOdLgAhsDBQkDwmcABQsJCAcCBhUKCQgLAgQWAgMB Ah4BAheAAAoJEGgNwR1TC3ojR80H/jH+vYavwQ+TvO8ksXL9JQWc3IFSiGpuSVXLCdg62AmR irxW+qCwNncNQyb9rd30gzdectSkPWL3KSqEResBe24IbA5/jSkPweJasgXtfhuyoeCJ6PXo clQQGKIoFIAEv1s8l0ggPZswvCinegl1diyJXUXmdEJRTWYAtxn/atut1o6Giv6D2qmYbXN7 mneMC5MzlLaJKUtoH7U/IjVw1sx2qtxAZGKVm4RZxPnMCp9E1MAr5t4dP5gJCIiqsdrVqI6i KupZstMxstPU//azmz7ZWWxT0JzgJqZSvPYx/SATeexTYBP47YFyri4jnsty2ErS91E6H8os Bv6pnSn7eAq5AQ0EWznS4AEIAMYmP4M/V+T5RY5at/g7rUdNsLhWv1APYrh9RQefODYHrNRH UE9eosYbT6XMryR9hT8XlGOYRwKWwiQBoWSDiTMo/Xi29jUnn4BXfI2px2DTXwc22LKtLAgT RjP+qbU63Y0xnQN29UGDbYgyyK51DW3H0If2a3JNsheAAK+Xc9baj0LGIc8T9uiEWHBnCH+R dhgATnWWGKdDegUR5BkDfDg5O/FISymJBHx2Dyoklv5g4BzkgqTqwmaYzsl8UxZKvbaxq0zb ehDda8lvhFXodNFMAgTLJlLuDYOGLK2AwbrS3Sp0AEbkpdJBb44qVlGm5bApZouHeJ/+n+7r 12+lqdsAEQEAAYkBPAQYAQgAJhYhBHIX+6yM6c9jRKFo5WgNwR1TC3ojBQJbOdLgAhsMBQkD wmcAAAoJEGgNwR1TC3ojpfcIAInwP5OlcEKokTnHCiDTz4Ony4GnHRP2fXATQZCKxmu4AJY2 h9ifw9Nf2TjCZ6AMvC3thAN0rFDj55N9l4s1CpaDo4J+0fkrHuyNacnT206CeJV1E7NYntxU n+LSiRrOdywn6erjxRi9EYTVLCHcDhBEjKmFZfg4AM4GZMWX1lg0+eHbd5oL1as28WvvI/uI aMyV8RbyXot1r/8QLlWldU3NrTF5p7TMU2y3ZH2mf5suSKHAMtbE4jKJ8ZHFOo3GhLgjVrBW HE9JXO08xKkgD+w6v83+nomsEuf6C6LYrqY/tsZvyEX6zN8CtirPdPWu/VXNRYAl/lat7lSI 3H26qrE= Message-ID: <22b51a94-f71d-bc90-77f0-9fbf013ca996@suse.de> Date: Tue, 24 Mar 2020 09:54:53 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.5.0 MIME-Version: 1.0 In-Reply-To: <20200323144950.3018436-23-daniel.vetter@ffwll.ch> X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Vetter , Intel Graphics Development , Laurent Pinchart Content-Type: multipart/mixed; boundary="===============1166523962==" Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --===============1166523962== Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="xcUsXUNbLyLQ4KYN5YA3Ne1CIBswgX7U3" This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --xcUsXUNbLyLQ4KYN5YA3Ne1CIBswgX7U3 Content-Type: multipart/mixed; boundary="Dw7iHNQQW0wjO2FwQP70zxEDkE8ab5UMb"; protected-headers="v1" From: Thomas Zimmermann To: Daniel Vetter , DRI Development Cc: Intel Graphics Development , Laurent Pinchart , Daniel Vetter Message-ID: <22b51a94-f71d-bc90-77f0-9fbf013ca996@suse.de> Subject: Re: [PATCH 22/51] drm: manage drm_minor cleanup with drmm_ References: <20200323144950.3018436-1-daniel.vetter@ffwll.ch> <20200323144950.3018436-23-daniel.vetter@ffwll.ch> In-Reply-To: <20200323144950.3018436-23-daniel.vetter@ffwll.ch> --Dw7iHNQQW0wjO2FwQP70zxEDkE8ab5UMb Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable Hi Am 23.03.20 um 15:49 schrieb Daniel Vetter: > The cleanup here is somewhat tricky, since we can't tell apart the > allocated minor index from 0. So register a cleanup action first, and > if the index allocation fails, unregister that cleanup action again to > avoid bad mistakes. >=20 > The kdev for the minor already handles NULL, so no problem there. >=20 > Hence add drmm_remove_action() to the drm_managed library. >=20 > v2: Make pointer math around void ** consistent with what Laurent > suggested. >=20 > v3: Use drmm_add_action_or_reset and remove drmm_remove_action. Noticed= > because of some questions from Thomas. This also means we need to move > the drmm_add_action_or_reset helper earlier in the series. >=20 > Cc: Thomas Zimmermann > Cc: Laurent Pinchart > Signed-off-by: Daniel Vetter This code looks easier to understand than the previous patch. Acked-by: Thomas Zimmermann > --- > drivers/gpu/drm/drm_drv.c | 70 ++++++++++++-----------------------= > drivers/gpu/drm/drm_managed.c | 14 +++++++ > include/drm/drm_managed.h | 9 ++++- > 3 files changed, 46 insertions(+), 47 deletions(-) >=20 > diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c > index a710c53d13a8..25fc2107057c 100644 > --- a/drivers/gpu/drm/drm_drv.c > +++ b/drivers/gpu/drm/drm_drv.c > @@ -93,13 +93,25 @@ static struct drm_minor **drm_minor_get_slot(struct= drm_device *dev, > } > } > =20 > +static void drm_minor_alloc_release(struct drm_device *dev, void *data= ) > +{ > + struct drm_minor *minor =3D data; > + unsigned long flags; > + > + put_device(minor->kdev); > + > + spin_lock_irqsave(&drm_minor_lock, flags); > + idr_remove(&drm_minors_idr, minor->index); > + spin_unlock_irqrestore(&drm_minor_lock, flags); > +} > + > static int drm_minor_alloc(struct drm_device *dev, unsigned int type) > { > struct drm_minor *minor; > unsigned long flags; > int r; > =20 > - minor =3D kzalloc(sizeof(*minor), GFP_KERNEL); > + minor =3D drmm_kzalloc(dev, sizeof(*minor), GFP_KERNEL); > if (!minor) > return -ENOMEM; > =20 > @@ -117,46 +129,19 @@ static int drm_minor_alloc(struct drm_device *dev= , unsigned int type) > idr_preload_end(); > =20 > if (r < 0) > - goto err_free; > + return r; > =20 > - minor->index =3D r; > + r =3D drmm_add_action_or_reset(dev, drm_minor_alloc_release, minor); > + if (r) > + return r; > =20 > + minor->index =3D r; > minor->kdev =3D drm_sysfs_minor_alloc(minor); > - if (IS_ERR(minor->kdev)) { > - r =3D PTR_ERR(minor->kdev); > - goto err_index; > - } > + if (IS_ERR(minor->kdev)) > + return PTR_ERR(minor->kdev); > =20 > *drm_minor_get_slot(dev, type) =3D minor; > return 0; > - > -err_index: > - spin_lock_irqsave(&drm_minor_lock, flags); > - idr_remove(&drm_minors_idr, minor->index); > - spin_unlock_irqrestore(&drm_minor_lock, flags); > -err_free: > - kfree(minor); > - return r; > -} > - > -static void drm_minor_free(struct drm_device *dev, unsigned int type) > -{ > - struct drm_minor **slot, *minor; > - unsigned long flags; > - > - slot =3D drm_minor_get_slot(dev, type); > - minor =3D *slot; > - if (!minor) > - return; > - > - put_device(minor->kdev); > - > - spin_lock_irqsave(&drm_minor_lock, flags); > - idr_remove(&drm_minors_idr, minor->index); > - spin_unlock_irqrestore(&drm_minor_lock, flags); > - > - kfree(minor); > - *slot =3D NULL; > } > =20 > static int drm_minor_register(struct drm_device *dev, unsigned int typ= e) > @@ -678,16 +663,16 @@ int drm_dev_init(struct drm_device *dev, > if (drm_core_check_feature(dev, DRIVER_RENDER)) { > ret =3D drm_minor_alloc(dev, DRM_MINOR_RENDER); > if (ret) > - goto err_minors; > + goto err; > } > =20 > ret =3D drm_minor_alloc(dev, DRM_MINOR_PRIMARY); > if (ret) > - goto err_minors; > + goto err; > =20 > ret =3D drm_legacy_create_map_hash(dev); > if (ret) > - goto err_minors; > + goto err; > =20 > drm_legacy_ctxbitmap_init(dev); > =20 > @@ -695,7 +680,7 @@ int drm_dev_init(struct drm_device *dev, > ret =3D drm_gem_init(dev); > if (ret) { > DRM_ERROR("Cannot initialize graphics execution manager (GEM)\n"); > - goto err_ctxbitmap; > + goto err; > } > } > =20 > @@ -708,10 +693,6 @@ int drm_dev_init(struct drm_device *dev, > err_setunique: > if (drm_core_check_feature(dev, DRIVER_GEM)) > drm_gem_destroy(dev); > -err_ctxbitmap: > -err_minors: > - drm_minor_free(dev, DRM_MINOR_PRIMARY); > - drm_minor_free(dev, DRM_MINOR_RENDER); > err: > drm_managed_release(dev); > =20 > @@ -776,9 +757,6 @@ void drm_dev_fini(struct drm_device *dev) > =20 > if (drm_core_check_feature(dev, DRIVER_GEM)) > drm_gem_destroy(dev); > - > - drm_minor_free(dev, DRM_MINOR_PRIMARY); > - drm_minor_free(dev, DRM_MINOR_RENDER); > } > EXPORT_SYMBOL(drm_dev_fini); > =20 > diff --git a/drivers/gpu/drm/drm_managed.c b/drivers/gpu/drm/drm_manage= d.c > index c633c2ef5269..8abf3a53aeb5 100644 > --- a/drivers/gpu/drm/drm_managed.c > +++ b/drivers/gpu/drm/drm_managed.c > @@ -149,6 +149,20 @@ int __drmm_add_action(struct drm_device *dev, > } > EXPORT_SYMBOL(__drmm_add_action); > =20 > +int __drmm_add_action_or_reset(struct drm_device *dev, > + drmres_release_t action, > + void *data, const char *name) > +{ > + int ret; > + > + ret =3D __drmm_add_action(dev, action, data, name); > + if (ret) > + action(dev, data); > + > + return ret; > +} > +EXPORT_SYMBOL(__drmm_add_action_or_reset); > + > void *drmm_kmalloc(struct drm_device *dev, size_t size, gfp_t gfp) > { > struct drmres *dr; > diff --git a/include/drm/drm_managed.h b/include/drm/drm_managed.h > index 89e6fce9f689..2d1e29a2200c 100644 > --- a/include/drm/drm_managed.h > +++ b/include/drm/drm_managed.h > @@ -17,7 +17,14 @@ int __must_check __drmm_add_action(struct drm_device= *dev, > drmres_release_t action, > void *data, const char *name); > =20 > -void drmm_add_final_kfree(struct drm_device *dev, void *parent); > +#define drmm_add_action_or_reset(dev, action, data) \ > + __drmm_add_action_or_reset(dev, action, data, #action) > + > +int __must_check __drmm_add_action_or_reset(struct drm_device *dev, > + drmres_release_t action, > + void *data, const char *name); > + > +void drmm_add_final_kfree(struct drm_device *dev, void *container); > =20 > void *drmm_kmalloc(struct drm_device *dev, size_t size, gfp_t gfp) __m= alloc; > static inline void *drmm_kzalloc(struct drm_device *dev, size_t size, = gfp_t gfp) >=20 --=20 Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Maxfeldstr. 5, 90409 N=C3=BCrnberg, Germany (HRB 36809, AG N=C3=BCrnberg) Gesch=C3=A4ftsf=C3=BChrer: Felix Imend=C3=B6rffer --Dw7iHNQQW0wjO2FwQP70zxEDkE8ab5UMb-- --xcUsXUNbLyLQ4KYN5YA3Ne1CIBswgX7U3 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEchf7rIzpz2NEoWjlaA3BHVMLeiMFAl55yt0ACgkQaA3BHVML eiNFdgf9HMNSPfDWxXYWeYL+K5Fs6qE8BvO7F0xsPd4TGu3dDb/00GotzwR+/wlT j8+S5cqXywncwpCkDzqxQNmc0FIsN+MFmDrSxpj9i/YKMxgTVBOXDdzvEzTJSzVC +UasfCNkWMsTYxIWUFURm5UIRJFdqQRBov4REzYOY06cLbnkU4C252rD2YCxp9AC WXqr1o0c+Y1Ml+Mc10Snt6ECgUdA0jmAXYy2JU/D+fiQz0IHkS2fAWPlzX4huifL 8KPXDKQjpCYVa2fL/hkBqNbpuNbSLyy8bwdZVuU4E2triw6MDBBJHSzBSGpVBAY1 Nk+ZmXjeK0k4XeLFIDB+u1UuTRmacg== =otcU -----END PGP SIGNATURE----- --xcUsXUNbLyLQ4KYN5YA3Ne1CIBswgX7U3-- --===============1166523962== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel --===============1166523962==-- 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=-8.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=ham 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 79647C4332B for ; Tue, 24 Mar 2020 08:55:00 +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 59748208C3 for ; Tue, 24 Mar 2020 08:55:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 59748208C3 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.de 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 D03CE6E286; Tue, 24 Mar 2020 08:54:59 +0000 (UTC) Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) by gabe.freedesktop.org (Postfix) with ESMTPS id 174F86E286; Tue, 24 Mar 2020 08:54:59 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 81795AC19; Tue, 24 Mar 2020 08:54:57 +0000 (UTC) To: Daniel Vetter , DRI Development References: <20200323144950.3018436-1-daniel.vetter@ffwll.ch> <20200323144950.3018436-23-daniel.vetter@ffwll.ch> From: Thomas Zimmermann Autocrypt: addr=tzimmermann@suse.de; keydata= mQENBFs50uABCADEHPidWt974CaxBVbrIBwqcq/WURinJ3+2WlIrKWspiP83vfZKaXhFYsdg XH47fDVbPPj+d6tQrw5lPQCyqjwrCPYnq3WlIBnGPJ4/jreTL6V+qfKRDlGLWFjZcsrPJGE0 BeB5BbqP5erN1qylK9i3gPoQjXGhpBpQYwRrEyQyjuvk+Ev0K1Jc5tVDeJAuau3TGNgah4Yc hdHm3bkPjz9EErV85RwvImQ1dptvx6s7xzwXTgGAsaYZsL8WCwDaTuqFa1d1jjlaxg6+tZsB 9GluwvIhSezPgnEmimZDkGnZRRSFiGP8yjqTjjWuf0bSj5rUnTGiyLyRZRNGcXmu6hjlABEB AAG0J1Rob21hcyBaaW1tZXJtYW5uIDx0emltbWVybWFubkBzdXNlLmRlPokBVAQTAQgAPhYh BHIX+6yM6c9jRKFo5WgNwR1TC3ojBQJbOdLgAhsDBQkDwmcABQsJCAcCBhUKCQgLAgQWAgMB Ah4BAheAAAoJEGgNwR1TC3ojR80H/jH+vYavwQ+TvO8ksXL9JQWc3IFSiGpuSVXLCdg62AmR irxW+qCwNncNQyb9rd30gzdectSkPWL3KSqEResBe24IbA5/jSkPweJasgXtfhuyoeCJ6PXo clQQGKIoFIAEv1s8l0ggPZswvCinegl1diyJXUXmdEJRTWYAtxn/atut1o6Giv6D2qmYbXN7 mneMC5MzlLaJKUtoH7U/IjVw1sx2qtxAZGKVm4RZxPnMCp9E1MAr5t4dP5gJCIiqsdrVqI6i KupZstMxstPU//azmz7ZWWxT0JzgJqZSvPYx/SATeexTYBP47YFyri4jnsty2ErS91E6H8os Bv6pnSn7eAq5AQ0EWznS4AEIAMYmP4M/V+T5RY5at/g7rUdNsLhWv1APYrh9RQefODYHrNRH UE9eosYbT6XMryR9hT8XlGOYRwKWwiQBoWSDiTMo/Xi29jUnn4BXfI2px2DTXwc22LKtLAgT RjP+qbU63Y0xnQN29UGDbYgyyK51DW3H0If2a3JNsheAAK+Xc9baj0LGIc8T9uiEWHBnCH+R dhgATnWWGKdDegUR5BkDfDg5O/FISymJBHx2Dyoklv5g4BzkgqTqwmaYzsl8UxZKvbaxq0zb ehDda8lvhFXodNFMAgTLJlLuDYOGLK2AwbrS3Sp0AEbkpdJBb44qVlGm5bApZouHeJ/+n+7r 12+lqdsAEQEAAYkBPAQYAQgAJhYhBHIX+6yM6c9jRKFo5WgNwR1TC3ojBQJbOdLgAhsMBQkD wmcAAAoJEGgNwR1TC3ojpfcIAInwP5OlcEKokTnHCiDTz4Ony4GnHRP2fXATQZCKxmu4AJY2 h9ifw9Nf2TjCZ6AMvC3thAN0rFDj55N9l4s1CpaDo4J+0fkrHuyNacnT206CeJV1E7NYntxU n+LSiRrOdywn6erjxRi9EYTVLCHcDhBEjKmFZfg4AM4GZMWX1lg0+eHbd5oL1as28WvvI/uI aMyV8RbyXot1r/8QLlWldU3NrTF5p7TMU2y3ZH2mf5suSKHAMtbE4jKJ8ZHFOo3GhLgjVrBW HE9JXO08xKkgD+w6v83+nomsEuf6C6LYrqY/tsZvyEX6zN8CtirPdPWu/VXNRYAl/lat7lSI 3H26qrE= Message-ID: <22b51a94-f71d-bc90-77f0-9fbf013ca996@suse.de> Date: Tue, 24 Mar 2020 09:54:53 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.5.0 MIME-Version: 1.0 In-Reply-To: <20200323144950.3018436-23-daniel.vetter@ffwll.ch> Subject: Re: [Intel-gfx] [PATCH 22/51] drm: manage drm_minor cleanup with drmm_ 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: Daniel Vetter , Intel Graphics Development , Laurent Pinchart Content-Type: multipart/mixed; boundary="===============1064418334==" Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --===============1064418334== Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="xcUsXUNbLyLQ4KYN5YA3Ne1CIBswgX7U3" This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --xcUsXUNbLyLQ4KYN5YA3Ne1CIBswgX7U3 Content-Type: multipart/mixed; boundary="Dw7iHNQQW0wjO2FwQP70zxEDkE8ab5UMb"; protected-headers="v1" From: Thomas Zimmermann To: Daniel Vetter , DRI Development Cc: Intel Graphics Development , Laurent Pinchart , Daniel Vetter Message-ID: <22b51a94-f71d-bc90-77f0-9fbf013ca996@suse.de> Subject: Re: [PATCH 22/51] drm: manage drm_minor cleanup with drmm_ References: <20200323144950.3018436-1-daniel.vetter@ffwll.ch> <20200323144950.3018436-23-daniel.vetter@ffwll.ch> In-Reply-To: <20200323144950.3018436-23-daniel.vetter@ffwll.ch> --Dw7iHNQQW0wjO2FwQP70zxEDkE8ab5UMb Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable Hi Am 23.03.20 um 15:49 schrieb Daniel Vetter: > The cleanup here is somewhat tricky, since we can't tell apart the > allocated minor index from 0. So register a cleanup action first, and > if the index allocation fails, unregister that cleanup action again to > avoid bad mistakes. >=20 > The kdev for the minor already handles NULL, so no problem there. >=20 > Hence add drmm_remove_action() to the drm_managed library. >=20 > v2: Make pointer math around void ** consistent with what Laurent > suggested. >=20 > v3: Use drmm_add_action_or_reset and remove drmm_remove_action. Noticed= > because of some questions from Thomas. This also means we need to move > the drmm_add_action_or_reset helper earlier in the series. >=20 > Cc: Thomas Zimmermann > Cc: Laurent Pinchart > Signed-off-by: Daniel Vetter This code looks easier to understand than the previous patch. Acked-by: Thomas Zimmermann > --- > drivers/gpu/drm/drm_drv.c | 70 ++++++++++++-----------------------= > drivers/gpu/drm/drm_managed.c | 14 +++++++ > include/drm/drm_managed.h | 9 ++++- > 3 files changed, 46 insertions(+), 47 deletions(-) >=20 > diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c > index a710c53d13a8..25fc2107057c 100644 > --- a/drivers/gpu/drm/drm_drv.c > +++ b/drivers/gpu/drm/drm_drv.c > @@ -93,13 +93,25 @@ static struct drm_minor **drm_minor_get_slot(struct= drm_device *dev, > } > } > =20 > +static void drm_minor_alloc_release(struct drm_device *dev, void *data= ) > +{ > + struct drm_minor *minor =3D data; > + unsigned long flags; > + > + put_device(minor->kdev); > + > + spin_lock_irqsave(&drm_minor_lock, flags); > + idr_remove(&drm_minors_idr, minor->index); > + spin_unlock_irqrestore(&drm_minor_lock, flags); > +} > + > static int drm_minor_alloc(struct drm_device *dev, unsigned int type) > { > struct drm_minor *minor; > unsigned long flags; > int r; > =20 > - minor =3D kzalloc(sizeof(*minor), GFP_KERNEL); > + minor =3D drmm_kzalloc(dev, sizeof(*minor), GFP_KERNEL); > if (!minor) > return -ENOMEM; > =20 > @@ -117,46 +129,19 @@ static int drm_minor_alloc(struct drm_device *dev= , unsigned int type) > idr_preload_end(); > =20 > if (r < 0) > - goto err_free; > + return r; > =20 > - minor->index =3D r; > + r =3D drmm_add_action_or_reset(dev, drm_minor_alloc_release, minor); > + if (r) > + return r; > =20 > + minor->index =3D r; > minor->kdev =3D drm_sysfs_minor_alloc(minor); > - if (IS_ERR(minor->kdev)) { > - r =3D PTR_ERR(minor->kdev); > - goto err_index; > - } > + if (IS_ERR(minor->kdev)) > + return PTR_ERR(minor->kdev); > =20 > *drm_minor_get_slot(dev, type) =3D minor; > return 0; > - > -err_index: > - spin_lock_irqsave(&drm_minor_lock, flags); > - idr_remove(&drm_minors_idr, minor->index); > - spin_unlock_irqrestore(&drm_minor_lock, flags); > -err_free: > - kfree(minor); > - return r; > -} > - > -static void drm_minor_free(struct drm_device *dev, unsigned int type) > -{ > - struct drm_minor **slot, *minor; > - unsigned long flags; > - > - slot =3D drm_minor_get_slot(dev, type); > - minor =3D *slot; > - if (!minor) > - return; > - > - put_device(minor->kdev); > - > - spin_lock_irqsave(&drm_minor_lock, flags); > - idr_remove(&drm_minors_idr, minor->index); > - spin_unlock_irqrestore(&drm_minor_lock, flags); > - > - kfree(minor); > - *slot =3D NULL; > } > =20 > static int drm_minor_register(struct drm_device *dev, unsigned int typ= e) > @@ -678,16 +663,16 @@ int drm_dev_init(struct drm_device *dev, > if (drm_core_check_feature(dev, DRIVER_RENDER)) { > ret =3D drm_minor_alloc(dev, DRM_MINOR_RENDER); > if (ret) > - goto err_minors; > + goto err; > } > =20 > ret =3D drm_minor_alloc(dev, DRM_MINOR_PRIMARY); > if (ret) > - goto err_minors; > + goto err; > =20 > ret =3D drm_legacy_create_map_hash(dev); > if (ret) > - goto err_minors; > + goto err; > =20 > drm_legacy_ctxbitmap_init(dev); > =20 > @@ -695,7 +680,7 @@ int drm_dev_init(struct drm_device *dev, > ret =3D drm_gem_init(dev); > if (ret) { > DRM_ERROR("Cannot initialize graphics execution manager (GEM)\n"); > - goto err_ctxbitmap; > + goto err; > } > } > =20 > @@ -708,10 +693,6 @@ int drm_dev_init(struct drm_device *dev, > err_setunique: > if (drm_core_check_feature(dev, DRIVER_GEM)) > drm_gem_destroy(dev); > -err_ctxbitmap: > -err_minors: > - drm_minor_free(dev, DRM_MINOR_PRIMARY); > - drm_minor_free(dev, DRM_MINOR_RENDER); > err: > drm_managed_release(dev); > =20 > @@ -776,9 +757,6 @@ void drm_dev_fini(struct drm_device *dev) > =20 > if (drm_core_check_feature(dev, DRIVER_GEM)) > drm_gem_destroy(dev); > - > - drm_minor_free(dev, DRM_MINOR_PRIMARY); > - drm_minor_free(dev, DRM_MINOR_RENDER); > } > EXPORT_SYMBOL(drm_dev_fini); > =20 > diff --git a/drivers/gpu/drm/drm_managed.c b/drivers/gpu/drm/drm_manage= d.c > index c633c2ef5269..8abf3a53aeb5 100644 > --- a/drivers/gpu/drm/drm_managed.c > +++ b/drivers/gpu/drm/drm_managed.c > @@ -149,6 +149,20 @@ int __drmm_add_action(struct drm_device *dev, > } > EXPORT_SYMBOL(__drmm_add_action); > =20 > +int __drmm_add_action_or_reset(struct drm_device *dev, > + drmres_release_t action, > + void *data, const char *name) > +{ > + int ret; > + > + ret =3D __drmm_add_action(dev, action, data, name); > + if (ret) > + action(dev, data); > + > + return ret; > +} > +EXPORT_SYMBOL(__drmm_add_action_or_reset); > + > void *drmm_kmalloc(struct drm_device *dev, size_t size, gfp_t gfp) > { > struct drmres *dr; > diff --git a/include/drm/drm_managed.h b/include/drm/drm_managed.h > index 89e6fce9f689..2d1e29a2200c 100644 > --- a/include/drm/drm_managed.h > +++ b/include/drm/drm_managed.h > @@ -17,7 +17,14 @@ int __must_check __drmm_add_action(struct drm_device= *dev, > drmres_release_t action, > void *data, const char *name); > =20 > -void drmm_add_final_kfree(struct drm_device *dev, void *parent); > +#define drmm_add_action_or_reset(dev, action, data) \ > + __drmm_add_action_or_reset(dev, action, data, #action) > + > +int __must_check __drmm_add_action_or_reset(struct drm_device *dev, > + drmres_release_t action, > + void *data, const char *name); > + > +void drmm_add_final_kfree(struct drm_device *dev, void *container); > =20 > void *drmm_kmalloc(struct drm_device *dev, size_t size, gfp_t gfp) __m= alloc; > static inline void *drmm_kzalloc(struct drm_device *dev, size_t size, = gfp_t gfp) >=20 --=20 Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Maxfeldstr. 5, 90409 N=C3=BCrnberg, Germany (HRB 36809, AG N=C3=BCrnberg) Gesch=C3=A4ftsf=C3=BChrer: Felix Imend=C3=B6rffer --Dw7iHNQQW0wjO2FwQP70zxEDkE8ab5UMb-- --xcUsXUNbLyLQ4KYN5YA3Ne1CIBswgX7U3 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEchf7rIzpz2NEoWjlaA3BHVMLeiMFAl55yt0ACgkQaA3BHVML eiNFdgf9HMNSPfDWxXYWeYL+K5Fs6qE8BvO7F0xsPd4TGu3dDb/00GotzwR+/wlT j8+S5cqXywncwpCkDzqxQNmc0FIsN+MFmDrSxpj9i/YKMxgTVBOXDdzvEzTJSzVC +UasfCNkWMsTYxIWUFURm5UIRJFdqQRBov4REzYOY06cLbnkU4C252rD2YCxp9AC WXqr1o0c+Y1Ml+Mc10Snt6ECgUdA0jmAXYy2JU/D+fiQz0IHkS2fAWPlzX4huifL 8KPXDKQjpCYVa2fL/hkBqNbpuNbSLyy8bwdZVuU4E2triw6MDBBJHSzBSGpVBAY1 Nk+ZmXjeK0k4XeLFIDB+u1UuTRmacg== =otcU -----END PGP SIGNATURE----- --xcUsXUNbLyLQ4KYN5YA3Ne1CIBswgX7U3-- --===============1064418334== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx --===============1064418334==--