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.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_MUTT 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 63234C43387 for ; Sun, 23 Dec 2018 23:10:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 036EE217FA for ; Sun, 23 Dec 2018 23:10:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lekensteyn.nl header.i=@lekensteyn.nl header.b="lBUUg8BK" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726012AbeLWXKx (ORCPT ); Sun, 23 Dec 2018 18:10:53 -0500 Received: from lekensteyn.nl ([178.21.112.251]:35041 "EHLO lekensteyn.nl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725911AbeLWXKw (ORCPT ); Sun, 23 Dec 2018 18:10:52 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lekensteyn.nl; s=s2048-2015-q1; h=In-Reply-To:Content-Transfer-Encoding:Content-Type:MIME-Version:References:Message-ID:Subject:Cc:To:From:Date; bh=zzh48e8LmE8XrsMuk34ytHotWFQf48AnxhdPZOOTkao=; b=lBUUg8BK+5rIgy71lh8C7Q39LR+KVvYfAYiiXSNcln4VuXuG5RAHw6zxCrxEsP6WlomYK713Q57kFY/S4ZLzT2t2Ttn40REDpNvgUgkGDrzWGZgCMXTgbIY5RkfEur/gyGv/lpmuuWZeOw/t9AlRh38xHfA8G9TxDjFlcWVvmUSbHRimKDN1k+xS4goU2a56F3qWWpwLKldKkep6HOKoj19roNZ2YHkndlkA7aoyeWWbr+j0IC9EISm7PA2cDRNkvLNnTIvyzBrHZXm5khP5MnexvdB8zQHmoEe1U/heZlwDFDqtg1b1CUn/UclZviYPWwmD8suL+MUdLtA2LdvVSQ==; Received: by lekensteyn.nl with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1gbCtI-00057c-Pj; Mon, 24 Dec 2018 00:10:37 +0100 Date: Mon, 24 Dec 2018 00:10:33 +0100 From: Peter Wu To: Noralf =?iso-8859-1?Q?Tr=F8nnes?= Cc: dri-devel@lists.freedesktop.org, Linus Torvalds , rong.a.chen@intel.com, kraxel@redhat.com, Daniel Vetter , Linux List Kernel Mailing , lkp@01.org Subject: Re: [PATCH] drm/fb-helper: fix leaks in error path of drm_fb_helper_fbdev_setup Message-ID: <20181223231033.GA31596@al> References: <20181223004315.GA11455@al> <20181223005507.28328-1-peter@lekensteyn.nl> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: User-Agent: Mutt/1.11.1 (2018-12-01) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sun, Dec 23, 2018 at 02:55:52PM +0100, Noralf Trønnes wrote: > > > Den 23.12.2018 01.55, skrev Peter Wu: > > After drm_fb_helper_fbdev_setup calls drm_fb_helper_init, > > "dev->fb_helper" will be initialized (and thus drm_fb_helper_fini will > > have some effect). After that, drm_fb_helper_initial_config is called > > which may call the "fb_probe" driver callback. > > > > This driver callback may call drm_fb_helper_defio_init (as is done by > > drm_fb_helper_generic_probe) or set a framebuffer (as is done by bochs) > > as documented. These are normally cleaned up on exit by > > drm_fb_helper_fbdev_teardown which also calls drm_fb_helper_fini. > > > > If an error occurs after "fb_probe", but before setup is complete, then > > calling just drm_fb_helper_fini will leak resources. This was triggered > > by df2052cc922 ("bochs: convert to drm_fb_helper_fbdev_setup/teardown"): > > > > [ 50.008030] bochsdrmfb: enable CONFIG_FB_LITTLE_ENDIAN to support this framebuffer > > [ 50.009436] bochs-drm 0000:00:02.0: [drm:drm_fb_helper_fbdev_setup] *ERROR* fbdev: Failed to set configuration (ret=-38) > > [ 50.011456] [drm] Initialized bochs-drm 1.0.0 20130925 for 0000:00:02.0 on minor 2 > > [ 50.013604] WARNING: CPU: 1 PID: 1 at drivers/gpu/drm/drm_mode_config.c:477 drm_mode_config_cleanup+0x280/0x2a0 > > [ 50.016175] CPU: 1 PID: 1 Comm: swapper/0 Tainted: G T 4.20.0-rc7 #1 > > [ 50.017732] EIP: drm_mode_config_cleanup+0x280/0x2a0 > > ... > > [ 50.023155] Call Trace: > > [ 50.023155] ? bochs_kms_fini+0x1e/0x30 > > [ 50.023155] ? bochs_unload+0x18/0x40 > > > > This can be reproduced with QEMU and CONFIG_FB_LITTLE_ENDIAN=n. > > > > Link: https://lkml.kernel.org/r/20181221083226.GI23332@shao2-debian > > Link: https://lkml.kernel.org/r/20181223004315.GA11455@al > > Fixes: 8741216396b2 ("drm/fb-helper: Add drm_fb_helper_fbdev_setup/teardown()") > > Reported-by: kernel test robot > > Cc: Noralf Trønnes > > Signed-off-by: Peter Wu > > --- > > drivers/gpu/drm/drm_fb_helper.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c > > index 9d64f874f965..432e0f3b9267 100644 > > --- a/drivers/gpu/drm/drm_fb_helper.c > > +++ b/drivers/gpu/drm/drm_fb_helper.c > > @@ -2860,7 +2860,7 @@ int drm_fb_helper_fbdev_setup(struct drm_device *dev, > > return 0; > > err_drm_fb_helper_fini: > > - drm_fb_helper_fini(fb_helper); > > + drm_fb_helper_fbdev_teardown(dev); > > This change will break the error path for drm_fbdev_generic_setup() > because drm_fb_helper_generic_probe() cleans up on error but doesn't > clear drm_fb_helper->fb resulting in a double drm_framebuffer_remove(). This should probably considered a bug of drm_fb_helper_generic_probe. Ownership of fb_helper should remain with the caller. The caller can detect an error and act accordingly. > My assumption has been that the drm_fb_helper_funcs->fb_probe callback > cleans up its resources on error. Clearly this is not the case for bochs, so > my take on this is that bochsfb_create() needs to clean up on error. That assumption still holds for bochs. The problem is this sequence: - drm_fb_helper_fbdev_setup is called. - fb_probe succeeds (this is crucial). - register_framebuffer fails. - error path of setup is triggered. As fb_helper is fully setup by drivers, the drm_fb_helper core should fully deallocate it again on the error path or else a leak occurs. > Gerd has a patchset that switches bochs over to the generic fbdev > emulation, but ofc that doesn't help with 4.20: > https://patchwork.freedesktop.org/series/54269/ And that does not help with other users of the drm_fb_helper who use functions like drm_fb_helper_defio_init. They will likely run in the same problem. I don't have a way to test tinydrm or other drivers, but if you force register_framebuffer to fail, you should be able to reproduce the problem with drm_fb_helper_generic_probe. -- Kind regards, Peter Wu https://lekensteyn.nl From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peter Wu Subject: Re: [PATCH] drm/fb-helper: fix leaks in error path of drm_fb_helper_fbdev_setup Date: Mon, 24 Dec 2018 00:10:33 +0100 Message-ID: <20181223231033.GA31596@al> References: <20181223004315.GA11455@al> <20181223005507.28328-1-peter@lekensteyn.nl> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail.lekensteyn.nl (mail.lekensteyn.nl [IPv6:2a02:2308::360:1:25]) by gabe.freedesktop.org (Postfix) with ESMTPS id 90E3F6E04E for ; Sun, 23 Dec 2018 23:10:44 +0000 (UTC) Content-Disposition: inline In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Noralf =?iso-8859-1?Q?Tr=F8nnes?= Cc: lkp@01.org, rong.a.chen@intel.com, Daniel Vetter , Linux List Kernel Mailing , dri-devel@lists.freedesktop.org, kraxel@redhat.com, Linus Torvalds List-Id: dri-devel@lists.freedesktop.org T24gU3VuLCBEZWMgMjMsIDIwMTggYXQgMDI6NTU6NTJQTSArMDEwMCwgTm9yYWxmIFRyw7hubmVz IHdyb3RlOgo+IAo+IAo+IERlbiAyMy4xMi4yMDE4IDAxLjU1LCBza3JldiBQZXRlciBXdToKPiA+ IEFmdGVyIGRybV9mYl9oZWxwZXJfZmJkZXZfc2V0dXAgY2FsbHMgZHJtX2ZiX2hlbHBlcl9pbml0 LAo+ID4gImRldi0+ZmJfaGVscGVyIiB3aWxsIGJlIGluaXRpYWxpemVkIChhbmQgdGh1cyBkcm1f ZmJfaGVscGVyX2Zpbmkgd2lsbAo+ID4gaGF2ZSBzb21lIGVmZmVjdCkuIEFmdGVyIHRoYXQsIGRy bV9mYl9oZWxwZXJfaW5pdGlhbF9jb25maWcgaXMgY2FsbGVkCj4gPiB3aGljaCBtYXkgY2FsbCB0 aGUgImZiX3Byb2JlIiBkcml2ZXIgY2FsbGJhY2suCj4gPiAKPiA+IFRoaXMgZHJpdmVyIGNhbGxi YWNrIG1heSBjYWxsIGRybV9mYl9oZWxwZXJfZGVmaW9faW5pdCAoYXMgaXMgZG9uZSBieQo+ID4g ZHJtX2ZiX2hlbHBlcl9nZW5lcmljX3Byb2JlKSBvciBzZXQgYSBmcmFtZWJ1ZmZlciAoYXMgaXMg ZG9uZSBieSBib2NocykKPiA+IGFzIGRvY3VtZW50ZWQuIFRoZXNlIGFyZSBub3JtYWxseSBjbGVh bmVkIHVwIG9uIGV4aXQgYnkKPiA+IGRybV9mYl9oZWxwZXJfZmJkZXZfdGVhcmRvd24gd2hpY2gg YWxzbyBjYWxscyBkcm1fZmJfaGVscGVyX2ZpbmkuCj4gPiAKPiA+IElmIGFuIGVycm9yIG9jY3Vy cyBhZnRlciAiZmJfcHJvYmUiLCBidXQgYmVmb3JlIHNldHVwIGlzIGNvbXBsZXRlLCB0aGVuCj4g PiBjYWxsaW5nIGp1c3QgZHJtX2ZiX2hlbHBlcl9maW5pIHdpbGwgbGVhayByZXNvdXJjZXMuIFRo aXMgd2FzIHRyaWdnZXJlZAo+ID4gYnkgZGYyMDUyY2M5MjIgKCJib2NoczogY29udmVydCB0byBk cm1fZmJfaGVscGVyX2ZiZGV2X3NldHVwL3RlYXJkb3duIik6Cj4gPiAKPiA+ICAgICAgWyAgIDUw LjAwODAzMF0gYm9jaHNkcm1mYjogZW5hYmxlIENPTkZJR19GQl9MSVRUTEVfRU5ESUFOIHRvIHN1 cHBvcnQgdGhpcyBmcmFtZWJ1ZmZlcgo+ID4gICAgICBbICAgNTAuMDA5NDM2XSBib2Nocy1kcm0g MDAwMDowMDowMi4wOiBbZHJtOmRybV9mYl9oZWxwZXJfZmJkZXZfc2V0dXBdICpFUlJPUiogZmJk ZXY6IEZhaWxlZCB0byBzZXQgY29uZmlndXJhdGlvbiAocmV0PS0zOCkKPiA+ICAgICAgWyAgIDUw LjAxMTQ1Nl0gW2RybV0gSW5pdGlhbGl6ZWQgYm9jaHMtZHJtIDEuMC4wIDIwMTMwOTI1IGZvciAw MDAwOjAwOjAyLjAgb24gbWlub3IgMgo+ID4gICAgICBbICAgNTAuMDEzNjA0XSBXQVJOSU5HOiBD UFU6IDEgUElEOiAxIGF0IGRyaXZlcnMvZ3B1L2RybS9kcm1fbW9kZV9jb25maWcuYzo0NzcgZHJt X21vZGVfY29uZmlnX2NsZWFudXArMHgyODAvMHgyYTAKPiA+ICAgICAgWyAgIDUwLjAxNjE3NV0g Q1BVOiAxIFBJRDogMSBDb21tOiBzd2FwcGVyLzAgVGFpbnRlZDogRyAgICAgICAgICAgICAgICBU IDQuMjAuMC1yYzcgIzEKPiA+ICAgICAgWyAgIDUwLjAxNzczMl0gRUlQOiBkcm1fbW9kZV9jb25m aWdfY2xlYW51cCsweDI4MC8weDJhMAo+ID4gICAgICAuLi4KPiA+ICAgICAgWyAgIDUwLjAyMzE1 NV0gQ2FsbCBUcmFjZToKPiA+ICAgICAgWyAgIDUwLjAyMzE1NV0gID8gYm9jaHNfa21zX2Zpbmkr MHgxZS8weDMwCj4gPiAgICAgIFsgICA1MC4wMjMxNTVdICA/IGJvY2hzX3VubG9hZCsweDE4LzB4 NDAKPiA+IAo+ID4gVGhpcyBjYW4gYmUgcmVwcm9kdWNlZCB3aXRoIFFFTVUgYW5kIENPTkZJR19G Ql9MSVRUTEVfRU5ESUFOPW4uCj4gPiAKPiA+IExpbms6IGh0dHBzOi8vbGttbC5rZXJuZWwub3Jn L3IvMjAxODEyMjEwODMyMjYuR0kyMzMzMkBzaGFvMi1kZWJpYW4KPiA+IExpbms6IGh0dHBzOi8v bGttbC5rZXJuZWwub3JnL3IvMjAxODEyMjMwMDQzMTUuR0ExMTQ1NUBhbAo+ID4gRml4ZXM6IDg3 NDEyMTYzOTZiMiAoImRybS9mYi1oZWxwZXI6IEFkZCBkcm1fZmJfaGVscGVyX2ZiZGV2X3NldHVw L3RlYXJkb3duKCkiKQo+ID4gUmVwb3J0ZWQtYnk6IGtlcm5lbCB0ZXN0IHJvYm90IDxyb25nLmEu Y2hlbkBpbnRlbC5jb20+Cj4gPiBDYzogTm9yYWxmIFRyw7hubmVzIDxub3JhbGZAdHJvbm5lcy5v cmc+Cj4gPiBTaWduZWQtb2ZmLWJ5OiBQZXRlciBXdSA8cGV0ZXJAbGVrZW5zdGV5bi5ubD4KPiA+ IC0tLQo+ID4gICBkcml2ZXJzL2dwdS9kcm0vZHJtX2ZiX2hlbHBlci5jIHwgMiArLQo+ID4gICAx IGZpbGUgY2hhbmdlZCwgMSBpbnNlcnRpb24oKyksIDEgZGVsZXRpb24oLSkKPiA+IAo+ID4gZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fZmJfaGVscGVyLmMgYi9kcml2ZXJzL2dwdS9k cm0vZHJtX2ZiX2hlbHBlci5jCj4gPiBpbmRleCA5ZDY0Zjg3NGY5NjUuLjQzMmUwZjNiOTI2NyAx MDA2NDQKPiA+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fZmJfaGVscGVyLmMKPiA+ICsrKyBi L2RyaXZlcnMvZ3B1L2RybS9kcm1fZmJfaGVscGVyLmMKPiA+IEBAIC0yODYwLDcgKzI4NjAsNyBA QCBpbnQgZHJtX2ZiX2hlbHBlcl9mYmRldl9zZXR1cChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAo+ ID4gICAJcmV0dXJuIDA7Cj4gPiAgIGVycl9kcm1fZmJfaGVscGVyX2Zpbmk6Cj4gPiAtCWRybV9m Yl9oZWxwZXJfZmluaShmYl9oZWxwZXIpOwo+ID4gKwlkcm1fZmJfaGVscGVyX2ZiZGV2X3RlYXJk b3duKGRldik7Cj4gCj4gVGhpcyBjaGFuZ2Ugd2lsbCBicmVhayB0aGUgZXJyb3IgcGF0aCBmb3Ig ZHJtX2ZiZGV2X2dlbmVyaWNfc2V0dXAoKQo+IGJlY2F1c2UgZHJtX2ZiX2hlbHBlcl9nZW5lcmlj X3Byb2JlKCkgY2xlYW5zIHVwIG9uIGVycm9yIGJ1dCBkb2Vzbid0Cj4gY2xlYXIgZHJtX2ZiX2hl bHBlci0+ZmIgcmVzdWx0aW5nIGluIGEgZG91YmxlIGRybV9mcmFtZWJ1ZmZlcl9yZW1vdmUoKS4K ClRoaXMgc2hvdWxkIHByb2JhYmx5IGNvbnNpZGVyZWQgYSBidWcgb2YgZHJtX2ZiX2hlbHBlcl9n ZW5lcmljX3Byb2JlLgpPd25lcnNoaXAgb2YgZmJfaGVscGVyIHNob3VsZCByZW1haW4gd2l0aCB0 aGUgY2FsbGVyLiBUaGUgY2FsbGVyIGNhbgpkZXRlY3QgYW4gZXJyb3IgYW5kIGFjdCBhY2NvcmRp bmdseS4KCj4gTXkgYXNzdW1wdGlvbiBoYXMgYmVlbiB0aGF0IHRoZSBkcm1fZmJfaGVscGVyX2Z1 bmNzLT5mYl9wcm9iZSBjYWxsYmFjawo+IGNsZWFucyB1cCBpdHMgcmVzb3VyY2VzIG9uIGVycm9y LiBDbGVhcmx5IHRoaXMgaXMgbm90IHRoZSBjYXNlIGZvciBib2Nocywgc28KPiBteSB0YWtlIG9u IHRoaXMgaXMgdGhhdCBib2Noc2ZiX2NyZWF0ZSgpIG5lZWRzIHRvIGNsZWFuIHVwIG9uIGVycm9y LgoKVGhhdCBhc3N1bXB0aW9uIHN0aWxsIGhvbGRzIGZvciBib2Nocy4gVGhlIHByb2JsZW0gaXMg dGhpcyBzZXF1ZW5jZToKLSBkcm1fZmJfaGVscGVyX2ZiZGV2X3NldHVwIGlzIGNhbGxlZC4KLSBm Yl9wcm9iZSBzdWNjZWVkcyAodGhpcyBpcyBjcnVjaWFsKS4KLSByZWdpc3Rlcl9mcmFtZWJ1ZmZl ciBmYWlscy4KLSBlcnJvciBwYXRoIG9mIHNldHVwIGlzIHRyaWdnZXJlZC4KCkFzIGZiX2hlbHBl ciBpcyBmdWxseSBzZXR1cCBieSBkcml2ZXJzLCB0aGUgZHJtX2ZiX2hlbHBlciBjb3JlIHNob3Vs ZApmdWxseSBkZWFsbG9jYXRlIGl0IGFnYWluIG9uIHRoZSBlcnJvciBwYXRoIG9yIGVsc2UgYSBs ZWFrIG9jY3Vycy4KCj4gR2VyZCBoYXMgYSBwYXRjaHNldCB0aGF0IHN3aXRjaGVzIGJvY2hzIG92 ZXIgdG8gdGhlIGdlbmVyaWMgZmJkZXYKPiBlbXVsYXRpb24sIGJ1dCBvZmMgdGhhdCBkb2Vzbid0 IGhlbHAgd2l0aCA0LjIwOgo+IGh0dHBzOi8vcGF0Y2h3b3JrLmZyZWVkZXNrdG9wLm9yZy9zZXJp ZXMvNTQyNjkvCgpBbmQgdGhhdCBkb2VzIG5vdCBoZWxwIHdpdGggb3RoZXIgdXNlcnMgb2YgdGhl IGRybV9mYl9oZWxwZXIgd2hvIHVzZQpmdW5jdGlvbnMgbGlrZSBkcm1fZmJfaGVscGVyX2RlZmlv X2luaXQuIFRoZXkgd2lsbCBsaWtlbHkgcnVuIGluIHRoZQpzYW1lIHByb2JsZW0uCgpJIGRvbid0 IGhhdmUgYSB3YXkgdG8gdGVzdCB0aW55ZHJtIG9yIG90aGVyIGRyaXZlcnMsIGJ1dCBpZiB5b3Ug Zm9yY2UKcmVnaXN0ZXJfZnJhbWVidWZmZXIgdG8gZmFpbCwgeW91IHNob3VsZCBiZSBhYmxlIHRv IHJlcHJvZHVjZSB0aGUKcHJvYmxlbSB3aXRoIGRybV9mYl9oZWxwZXJfZ2VuZXJpY19wcm9iZS4K LS0gCktpbmQgcmVnYXJkcywKUGV0ZXIgV3UKaHR0cHM6Ly9sZWtlbnN0ZXluLm5sCl9fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5n IGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVk ZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: multipart/mixed; boundary="===============2142144069373364277==" MIME-Version: 1.0 From: Peter Wu To: lkp@lists.01.org Subject: Re: [PATCH] drm/fb-helper: fix leaks in error path of drm_fb_helper_fbdev_setup Date: Mon, 24 Dec 2018 00:10:33 +0100 Message-ID: <20181223231033.GA31596@al> In-Reply-To: List-Id: --===============2142144069373364277== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable On Sun, Dec 23, 2018 at 02:55:52PM +0100, Noralf Tr=C3=B8nnes wrote: > = > = > Den 23.12.2018 01.55, skrev Peter Wu: > > After drm_fb_helper_fbdev_setup calls drm_fb_helper_init, > > "dev->fb_helper" will be initialized (and thus drm_fb_helper_fini will > > have some effect). After that, drm_fb_helper_initial_config is called > > which may call the "fb_probe" driver callback. > > = > > This driver callback may call drm_fb_helper_defio_init (as is done by > > drm_fb_helper_generic_probe) or set a framebuffer (as is done by bochs) > > as documented. These are normally cleaned up on exit by > > drm_fb_helper_fbdev_teardown which also calls drm_fb_helper_fini. > > = > > If an error occurs after "fb_probe", but before setup is complete, then > > calling just drm_fb_helper_fini will leak resources. This was triggered > > by df2052cc922 ("bochs: convert to drm_fb_helper_fbdev_setup/teardown"): > > = > > [ 50.008030] bochsdrmfb: enable CONFIG_FB_LITTLE_ENDIAN to suppo= rt this framebuffer > > [ 50.009436] bochs-drm 0000:00:02.0: [drm:drm_fb_helper_fbdev_se= tup] *ERROR* fbdev: Failed to set configuration (ret=3D-38) > > [ 50.011456] [drm] Initialized bochs-drm 1.0.0 20130925 for 0000= :00:02.0 on minor 2 > > [ 50.013604] WARNING: CPU: 1 PID: 1 at drivers/gpu/drm/drm_mode_= config.c:477 drm_mode_config_cleanup+0x280/0x2a0 > > [ 50.016175] CPU: 1 PID: 1 Comm: swapper/0 Tainted: G = T 4.20.0-rc7 #1 > > [ 50.017732] EIP: drm_mode_config_cleanup+0x280/0x2a0 > > ... > > [ 50.023155] Call Trace: > > [ 50.023155] ? bochs_kms_fini+0x1e/0x30 > > [ 50.023155] ? bochs_unload+0x18/0x40 > > = > > This can be reproduced with QEMU and CONFIG_FB_LITTLE_ENDIAN=3Dn. > > = > > Link: https://lkml.kernel.org/r/20181221083226.GI23332(a)shao2-debian > > Link: https://lkml.kernel.org/r/20181223004315.GA11455(a)al > > Fixes: 8741216396b2 ("drm/fb-helper: Add drm_fb_helper_fbdev_setup/tear= down()") > > Reported-by: kernel test robot > > Cc: Noralf Tr=C3=B8nnes > > Signed-off-by: Peter Wu > > --- > > drivers/gpu/drm/drm_fb_helper.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > = > > diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_h= elper.c > > index 9d64f874f965..432e0f3b9267 100644 > > --- a/drivers/gpu/drm/drm_fb_helper.c > > +++ b/drivers/gpu/drm/drm_fb_helper.c > > @@ -2860,7 +2860,7 @@ int drm_fb_helper_fbdev_setup(struct drm_device *= dev, > > return 0; > > err_drm_fb_helper_fini: > > - drm_fb_helper_fini(fb_helper); > > + drm_fb_helper_fbdev_teardown(dev); > = > This change will break the error path for drm_fbdev_generic_setup() > because drm_fb_helper_generic_probe() cleans up on error but doesn't > clear drm_fb_helper->fb resulting in a double drm_framebuffer_remove(). This should probably considered a bug of drm_fb_helper_generic_probe. Ownership of fb_helper should remain with the caller. The caller can detect an error and act accordingly. > My assumption has been that the drm_fb_helper_funcs->fb_probe callback > cleans up its resources on error. Clearly this is not the case for bochs,= so > my take on this is that bochsfb_create() needs to clean up on error. That assumption still holds for bochs. The problem is this sequence: - drm_fb_helper_fbdev_setup is called. - fb_probe succeeds (this is crucial). - register_framebuffer fails. - error path of setup is triggered. As fb_helper is fully setup by drivers, the drm_fb_helper core should fully deallocate it again on the error path or else a leak occurs. > Gerd has a patchset that switches bochs over to the generic fbdev > emulation, but ofc that doesn't help with 4.20: > https://patchwork.freedesktop.org/series/54269/ And that does not help with other users of the drm_fb_helper who use functions like drm_fb_helper_defio_init. They will likely run in the same problem. I don't have a way to test tinydrm or other drivers, but if you force register_framebuffer to fail, you should be able to reproduce the problem with drm_fb_helper_generic_probe. -- = Kind regards, Peter Wu https://lekensteyn.nl --===============2142144069373364277==--