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=-6.5 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 27C66C54FD0 for ; Wed, 25 Mar 2020 09:07:24 +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 F3F4D2076A for ; Wed, 25 Mar 2020 09:07:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=ffwll.ch header.i=@ffwll.ch header.b="GrBCZTaK" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F3F4D2076A Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch 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 07F426E5CE; Wed, 25 Mar 2020 09:07:22 +0000 (UTC) Received: from mail-ot1-x344.google.com (mail-ot1-x344.google.com [IPv6:2607:f8b0:4864:20::344]) by gabe.freedesktop.org (Postfix) with ESMTPS id 723F96E5CC for ; Wed, 25 Mar 2020 09:07:20 +0000 (UTC) Received: by mail-ot1-x344.google.com with SMTP id a49so1210298otc.11 for ; Wed, 25 Mar 2020 02:07:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=ZygPvDTvZiSXBqVQCOym0t6dkd8zDqMF9JiZ1aKJhYY=; b=GrBCZTaKCniq+cRmK7xHmLyBMCGeyjP4L+83rUbhsRzCpShyB75791UsV7DInqjucQ tD6Eyh/2EmBEL1Sm90LP/Wer0eVAC5dJSPjRYUpkrhsdMIUlv00h4E7mmVyiUEZm9qTl vT2MMiefhZCUzgYKzuSKMJrGl+6OWTfu1eavk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=ZygPvDTvZiSXBqVQCOym0t6dkd8zDqMF9JiZ1aKJhYY=; b=emzGoCNdcf6XMrSgpD6e8zlFaTCPFVBfPJIMjLPoVDFp5ur/uVPqxbusw016OC8A10 Rrk0yiaKQ5B2ldaa3sA0ydrWakmLM5BKshQKEUcJRhHuM63JBBJCUK33bSHvm8ro4xVr ZARMgAoCyBaunfiBSnMfikzrF2xb+0Vp2cFBw8qlxwWJcA9cP0BbKRJbOIBA7JKVUzYC 68Zrb81Re9XgTK2mCcGLY8tD33qytJ1Oolct6IrMmhoO241fxak0i+2Zn7XkfalmOL0S noDkN/ycfN3f+BwOmmJkLeUSNrEVi3oSXa72fglwUXISbogVd5ldPErisXOXwvcH55tG oy6g== X-Gm-Message-State: ANhLgQ0sBbvju/rF1mvVRmMRnNK7IBtYUcq/8h/AqPiATcfRGv2agWWF ZOEzbRNPTinQseGMI8rg/iSNhPBwJoHZyFolaO+Qew== X-Google-Smtp-Source: ADFU+vvta+0hCL0Z/uh6AIiUa2nhH9jIurzG8asm2a729Vy8qnLQhIxRQNSFuikKr8gWzG2OjFcteAe1t3cXeaVKhwQ= X-Received: by 2002:a4a:4190:: with SMTP id x138mr745297ooa.35.1585127239393; Wed, 25 Mar 2020 02:07:19 -0700 (PDT) MIME-Version: 1.0 References: <20200323144950.3018436-1-daniel.vetter@ffwll.ch> <20200323144950.3018436-23-daniel.vetter@ffwll.ch> <20200324213639.GB24902@ravnborg.org> In-Reply-To: <20200324213639.GB24902@ravnborg.org> From: Daniel Vetter Date: Wed, 25 Mar 2020 10:07:08 +0100 Message-ID: Subject: Re: [PATCH 22/51] drm: manage drm_minor cleanup with drmm_ To: Sam Ravnborg 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: Thomas Zimmermann , Intel Graphics Development , Laurent Pinchart , DRI Development , Daniel Vetter Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Tue, Mar 24, 2020 at 10:36 PM Sam Ravnborg wrote: > > On Mon, Mar 23, 2020 at 03:49:21PM +0100, Daniel Vetter wrote: > > 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. > > > > The kdev for the minor already handles NULL, so no problem there. > > > > Hence add drmm_remove_action() to the drm_managed library. > > > > v2: Make pointer math around void ** consistent with what Laurent > > suggested. > > > > 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. > > > > Cc: Thomas Zimmermann > > Cc: Laurent Pinchart > > Signed-off-by: Daniel Vetter > > --- > > 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(-) > > > > 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, > > } > > } > > > > +static void drm_minor_alloc_release(struct drm_device *dev, void *data) > > +{ > > + struct drm_minor *minor = 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; > > > > - minor = kzalloc(sizeof(*minor), GFP_KERNEL); > > + minor = drmm_kzalloc(dev, sizeof(*minor), GFP_KERNEL); > > if (!minor) > > return -ENOMEM; > > > > @@ -117,46 +129,19 @@ static int drm_minor_alloc(struct drm_device *dev, unsigned int type) > > idr_preload_end(); > > > > if (r < 0) > > - goto err_free; > > + return r; > > > > - minor->index = r; > > + r = drmm_add_action_or_reset(dev, drm_minor_alloc_release, minor); > > + if (r) > > + return r; > > > > + minor->index = r; > > This looks wrong. > > We do: > r = idr_alloc(&drm_minors_idr, > > And then we loose the value when we reuse r > in the call to drmm_add_action_or_reset(). > So the index we assign is the return value of > drmm_add_action_or_reset() and not the ID returned > by idr_alloc() > > With this fixed: > > Reviewed-by: Sam Ravnborg > > > minor->kdev = drm_sysfs_minor_alloc(minor); > > - if (IS_ERR(minor->kdev)) { > > - r = PTR_ERR(minor->kdev); > > - goto err_index; > > - } > > + if (IS_ERR(minor->kdev)) > > + return PTR_ERR(minor->kdev); > > > > *drm_minor_get_slot(dev, type) = 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 = drm_minor_get_slot(dev, type); > > - minor = *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 = NULL; > > } > > > > static int drm_minor_register(struct drm_device *dev, unsigned int type) > > @@ -678,16 +663,16 @@ int drm_dev_init(struct drm_device *dev, > > if (drm_core_check_feature(dev, DRIVER_RENDER)) { > > ret = drm_minor_alloc(dev, DRM_MINOR_RENDER); > > if (ret) > > - goto err_minors; > > + goto err; > > } > > > > ret = drm_minor_alloc(dev, DRM_MINOR_PRIMARY); > > if (ret) > > - goto err_minors; > > + goto err; > > > > ret = drm_legacy_create_map_hash(dev); > > if (ret) > > - goto err_minors; > > + goto err; > > > > drm_legacy_ctxbitmap_init(dev); > > > > @@ -695,7 +680,7 @@ int drm_dev_init(struct drm_device *dev, > > ret = drm_gem_init(dev); > > if (ret) { > > DRM_ERROR("Cannot initialize graphics execution manager (GEM)\n"); > > - goto err_ctxbitmap; > > + goto err; > > } > > } > > > > @@ -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); > > > > @@ -776,9 +757,6 @@ void drm_dev_fini(struct drm_device *dev) > > > > 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); > > > > diff --git a/drivers/gpu/drm/drm_managed.c b/drivers/gpu/drm/drm_managed.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); > > > > +int __drmm_add_action_or_reset(struct drm_device *dev, > > + drmres_release_t action, > > + void *data, const char *name) > > +{ > > + int ret; > > + > > + ret = __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); > > > > -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); > There is a s/parent/container/ sneaked in here??? Uh rebase fail, I'll try to move this to the right patch. s/parent/container/ was requested by Thomas to clarify the meaning, but looks like the fixup ended up in the wrong place :-/ -Daniel > > > > > void *drmm_kmalloc(struct drm_device *dev, size_t size, gfp_t gfp) __malloc; > > static inline void *drmm_kzalloc(struct drm_device *dev, size_t size, gfp_t gfp) > > -- > > 2.25.1 > > > > _______________________________________________ > > dri-devel mailing list > > dri-devel@lists.freedesktop.org > > https://lists.freedesktop.org/mailman/listinfo/dri-devel -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel 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=-6.5 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 22D4EC18E5B for ; Wed, 25 Mar 2020 09:07:22 +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 E8BBB2076A for ; Wed, 25 Mar 2020 09:07:21 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=ffwll.ch header.i=@ffwll.ch header.b="GrBCZTaK" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E8BBB2076A Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch 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 9D2286E5CC; Wed, 25 Mar 2020 09:07:21 +0000 (UTC) Received: from mail-ot1-x343.google.com (mail-ot1-x343.google.com [IPv6:2607:f8b0:4864:20::343]) by gabe.freedesktop.org (Postfix) with ESMTPS id 72DA06E5CD for ; Wed, 25 Mar 2020 09:07:20 +0000 (UTC) Received: by mail-ot1-x343.google.com with SMTP id x11so1236448otp.6 for ; Wed, 25 Mar 2020 02:07:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=ZygPvDTvZiSXBqVQCOym0t6dkd8zDqMF9JiZ1aKJhYY=; b=GrBCZTaKCniq+cRmK7xHmLyBMCGeyjP4L+83rUbhsRzCpShyB75791UsV7DInqjucQ tD6Eyh/2EmBEL1Sm90LP/Wer0eVAC5dJSPjRYUpkrhsdMIUlv00h4E7mmVyiUEZm9qTl vT2MMiefhZCUzgYKzuSKMJrGl+6OWTfu1eavk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=ZygPvDTvZiSXBqVQCOym0t6dkd8zDqMF9JiZ1aKJhYY=; b=qC7SW7XhxS1TnPXVv+TMkXUGqNfMQGkw43fVDEm7UBc3hfG3Kt9JIdh2l0b9n4vUWJ nyjmKojTOmdRemQvSAHPw4ZPgYZzrYY1km4sUrOgk/O84InOgPzIIvQqZuAGeNH54UcZ pm4VGN2RhiV3oxOoYK7f+ZOm0Ukv8/bSStEOfqnpp2ub1Uvr5n9W75GfA/m2zFlHIC71 Es7OdoMWDQbWAu+6OgeigWqhlI4isU8JVEGbinqm8lbBQyPauSSoo3poynVOjaYzT/fp Cy8E4l/e9y5SCa+lq+TdFVNiV3oQGcv2br/nhXLP9FmutWBaGbwERe3T3Jj3+nzTPB0n p3bg== X-Gm-Message-State: ANhLgQ0dH3pGYCDYLndkDxPG2/E+Y0ORngCJ7aqIiKOL5MXGTDW25HrP yL/bJzT5+7RlVVKsVFHlgdVJInbxZ1NIMX5BFHi5fQ== X-Google-Smtp-Source: ADFU+vvta+0hCL0Z/uh6AIiUa2nhH9jIurzG8asm2a729Vy8qnLQhIxRQNSFuikKr8gWzG2OjFcteAe1t3cXeaVKhwQ= X-Received: by 2002:a4a:4190:: with SMTP id x138mr745297ooa.35.1585127239393; Wed, 25 Mar 2020 02:07:19 -0700 (PDT) MIME-Version: 1.0 References: <20200323144950.3018436-1-daniel.vetter@ffwll.ch> <20200323144950.3018436-23-daniel.vetter@ffwll.ch> <20200324213639.GB24902@ravnborg.org> In-Reply-To: <20200324213639.GB24902@ravnborg.org> From: Daniel Vetter Date: Wed, 25 Mar 2020 10:07:08 +0100 Message-ID: To: Sam Ravnborg 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: Thomas Zimmermann , Intel Graphics Development , Laurent Pinchart , DRI Development , Daniel Vetter Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Tue, Mar 24, 2020 at 10:36 PM Sam Ravnborg wrote: > > On Mon, Mar 23, 2020 at 03:49:21PM +0100, Daniel Vetter wrote: > > 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. > > > > The kdev for the minor already handles NULL, so no problem there. > > > > Hence add drmm_remove_action() to the drm_managed library. > > > > v2: Make pointer math around void ** consistent with what Laurent > > suggested. > > > > 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. > > > > Cc: Thomas Zimmermann > > Cc: Laurent Pinchart > > Signed-off-by: Daniel Vetter > > --- > > 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(-) > > > > 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, > > } > > } > > > > +static void drm_minor_alloc_release(struct drm_device *dev, void *data) > > +{ > > + struct drm_minor *minor = 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; > > > > - minor = kzalloc(sizeof(*minor), GFP_KERNEL); > > + minor = drmm_kzalloc(dev, sizeof(*minor), GFP_KERNEL); > > if (!minor) > > return -ENOMEM; > > > > @@ -117,46 +129,19 @@ static int drm_minor_alloc(struct drm_device *dev, unsigned int type) > > idr_preload_end(); > > > > if (r < 0) > > - goto err_free; > > + return r; > > > > - minor->index = r; > > + r = drmm_add_action_or_reset(dev, drm_minor_alloc_release, minor); > > + if (r) > > + return r; > > > > + minor->index = r; > > This looks wrong. > > We do: > r = idr_alloc(&drm_minors_idr, > > And then we loose the value when we reuse r > in the call to drmm_add_action_or_reset(). > So the index we assign is the return value of > drmm_add_action_or_reset() and not the ID returned > by idr_alloc() > > With this fixed: > > Reviewed-by: Sam Ravnborg > > > minor->kdev = drm_sysfs_minor_alloc(minor); > > - if (IS_ERR(minor->kdev)) { > > - r = PTR_ERR(minor->kdev); > > - goto err_index; > > - } > > + if (IS_ERR(minor->kdev)) > > + return PTR_ERR(minor->kdev); > > > > *drm_minor_get_slot(dev, type) = 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 = drm_minor_get_slot(dev, type); > > - minor = *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 = NULL; > > } > > > > static int drm_minor_register(struct drm_device *dev, unsigned int type) > > @@ -678,16 +663,16 @@ int drm_dev_init(struct drm_device *dev, > > if (drm_core_check_feature(dev, DRIVER_RENDER)) { > > ret = drm_minor_alloc(dev, DRM_MINOR_RENDER); > > if (ret) > > - goto err_minors; > > + goto err; > > } > > > > ret = drm_minor_alloc(dev, DRM_MINOR_PRIMARY); > > if (ret) > > - goto err_minors; > > + goto err; > > > > ret = drm_legacy_create_map_hash(dev); > > if (ret) > > - goto err_minors; > > + goto err; > > > > drm_legacy_ctxbitmap_init(dev); > > > > @@ -695,7 +680,7 @@ int drm_dev_init(struct drm_device *dev, > > ret = drm_gem_init(dev); > > if (ret) { > > DRM_ERROR("Cannot initialize graphics execution manager (GEM)\n"); > > - goto err_ctxbitmap; > > + goto err; > > } > > } > > > > @@ -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); > > > > @@ -776,9 +757,6 @@ void drm_dev_fini(struct drm_device *dev) > > > > 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); > > > > diff --git a/drivers/gpu/drm/drm_managed.c b/drivers/gpu/drm/drm_managed.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); > > > > +int __drmm_add_action_or_reset(struct drm_device *dev, > > + drmres_release_t action, > > + void *data, const char *name) > > +{ > > + int ret; > > + > > + ret = __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); > > > > -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); > There is a s/parent/container/ sneaked in here??? Uh rebase fail, I'll try to move this to the right patch. s/parent/container/ was requested by Thomas to clarify the meaning, but looks like the fixup ended up in the wrong place :-/ -Daniel > > > > > void *drmm_kmalloc(struct drm_device *dev, size_t size, gfp_t gfp) __malloc; > > static inline void *drmm_kzalloc(struct drm_device *dev, size_t size, gfp_t gfp) > > -- > > 2.25.1 > > > > _______________________________________________ > > dri-devel mailing list > > dri-devel@lists.freedesktop.org > > https://lists.freedesktop.org/mailman/listinfo/dri-devel -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx