From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A593218D634 for ; Fri, 14 Mar 2025 08:08:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741939726; cv=none; b=jeQPeOE3oFdNQ+LVyBJqUMlJiGFU6F5qz8epgkWfDrxG+0/cZQRx7MHUzg0TVh266B0sNXbMRCYbNcBMwMAPyprRjWj/aILI7ReqDBvUITJN3si9BN+qsF95jx2KHzAJtQquYI1YZaN151YlfwuMuoo8Nirb/9LkJ8QhC46Idrs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741939726; c=relaxed/simple; bh=1+GbXui7qSNZZjX2DCOuSK3yJG/NlSYRTj+AYprHzCI=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=kkGcs/+KRriB6rkqRXypun81hvTPad3y4SJqZSKUuxSsTNxWk8wo29kerbjqeEsawl0rVAaMdGO97EWRdMLXZbAz4Ly3/9kHc3E3dXWpxfa1N9oQTwTlERyByBp0zFXMoxpGfz7xJcOh7yLJH6jJfRLd+zChiWjAVJUmlXPqbuw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de; spf=pass smtp.mailfrom=suse.de; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=zO6YHalT; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=0RuE5T0d; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=zO6YHalT; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=0RuE5T0d; arc=none smtp.client-ip=195.135.223.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="zO6YHalT"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="0RuE5T0d"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="zO6YHalT"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="0RuE5T0d" Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 9A5AF1F388; Fri, 14 Mar 2025 08:08:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1741939722; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=bbXxWzKJSKw+FmaFqqGmVwbSRwltPj1ubQ+FiAedef0=; b=zO6YHalT+b6r/AiJ+SdTD0C/vPaOwlT27l8WQ+j8GGItRtZle0gIhzwTjEOPT4PfgkkyV9 TqsFjc60cihOzxTmyxFj/WTbcjlEE+7xy0aRhK6Lgppcb/mIlD08sNNAv+meCj66DPIIEb WxfgJNg4JOJEwkc/0FpZhO74bfzfuh8= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1741939722; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=bbXxWzKJSKw+FmaFqqGmVwbSRwltPj1ubQ+FiAedef0=; b=0RuE5T0d41tFHJ0EJr3TiCfw7CdlnIXLzMl+PbdhlOBgqlK06ChaZFiWk61DBPuOkZ/ZYc ArNV6MU6j7QhIIBw== Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=zO6YHalT; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=0RuE5T0d DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1741939722; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=bbXxWzKJSKw+FmaFqqGmVwbSRwltPj1ubQ+FiAedef0=; b=zO6YHalT+b6r/AiJ+SdTD0C/vPaOwlT27l8WQ+j8GGItRtZle0gIhzwTjEOPT4PfgkkyV9 TqsFjc60cihOzxTmyxFj/WTbcjlEE+7xy0aRhK6Lgppcb/mIlD08sNNAv+meCj66DPIIEb WxfgJNg4JOJEwkc/0FpZhO74bfzfuh8= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1741939722; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=bbXxWzKJSKw+FmaFqqGmVwbSRwltPj1ubQ+FiAedef0=; b=0RuE5T0d41tFHJ0EJr3TiCfw7CdlnIXLzMl+PbdhlOBgqlK06ChaZFiWk61DBPuOkZ/ZYc ArNV6MU6j7QhIIBw== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 24B1513A31; Fri, 14 Mar 2025 08:08:42 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id Kkc2Bwrk02eXNwAAD6G6ig (envelope-from ); Fri, 14 Mar 2025 08:08:42 +0000 Message-ID: <46140633-a41d-4498-bc78-e43a1bd6b348@suse.de> Date: Fri, 14 Mar 2025 09:08:41 +0100 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] drm/mxsfb: fix missing rollback on failure in mxsfb_probe() To: Dario Binacchi Cc: Luca Ceresoli , Marek Vasut , Stefan Agner , Maarten Lankhorst , Maxime Ripard , David Airlie , Simona Vetter , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , Michael Trimarchi , Thomas Petazzoni , dri-devel@lists.freedesktop.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org References: <20250313-mxsfb_probe-fix-rollback-on-error-v1-1-ad2fb79de4cb@bootlin.com> <468c6352-3301-4f0b-a2d4-d6a013417a0e@suse.de> Content-Language: en-US From: Thomas Zimmermann Autocrypt: addr=tzimmermann@suse.de; keydata= xsBNBFs50uABCADEHPidWt974CaxBVbrIBwqcq/WURinJ3+2WlIrKWspiP83vfZKaXhFYsdg XH47fDVbPPj+d6tQrw5lPQCyqjwrCPYnq3WlIBnGPJ4/jreTL6V+qfKRDlGLWFjZcsrPJGE0 BeB5BbqP5erN1qylK9i3gPoQjXGhpBpQYwRrEyQyjuvk+Ev0K1Jc5tVDeJAuau3TGNgah4Yc hdHm3bkPjz9EErV85RwvImQ1dptvx6s7xzwXTgGAsaYZsL8WCwDaTuqFa1d1jjlaxg6+tZsB 9GluwvIhSezPgnEmimZDkGnZRRSFiGP8yjqTjjWuf0bSj5rUnTGiyLyRZRNGcXmu6hjlABEB AAHNJ1Rob21hcyBaaW1tZXJtYW5uIDx0emltbWVybWFubkBzdXNlLmRlPsLAjgQTAQgAOAIb AwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgBYhBHIX+6yM6c9jRKFo5WgNwR1TC3ojBQJftODH AAoJEGgNwR1TC3ojx1wH/0hKGWugiqDgLNXLRD/4TfHBEKmxIrmfu9Z5t7vwUKfwhFL6hqvo lXPJJKQpQ2z8+X2vZm/slsLn7J1yjrOsoJhKABDi+3QWWSGkaGwRJAdPVVyJMfJRNNNIKwVb U6B1BkX2XDKDGffF4TxlOpSQzdtNI/9gleOoUA8+jy8knnDYzjBNOZqLG2FuTdicBXblz0Mf vg41gd9kCwYXDnD91rJU8tzylXv03E75NCaTxTM+FBXPmsAVYQ4GYhhgFt8S2UWMoaaABLDe 7l5FdnLdDEcbmd8uLU2CaG4W2cLrUaI4jz2XbkcPQkqTQ3EB67hYkjiEE6Zy3ggOitiQGcqp j//OwE0EWznS4AEIAMYmP4M/V+T5RY5at/g7rUdNsLhWv1APYrh9RQefODYHrNRHUE9eosYb T6XMryR9hT8XlGOYRwKWwiQBoWSDiTMo/Xi29jUnn4BXfI2px2DTXwc22LKtLAgTRjP+qbU6 3Y0xnQN29UGDbYgyyK51DW3H0If2a3JNsheAAK+Xc9baj0LGIc8T9uiEWHBnCH+RdhgATnWW GKdDegUR5BkDfDg5O/FISymJBHx2Dyoklv5g4BzkgqTqwmaYzsl8UxZKvbaxq0zbehDda8lv hFXodNFMAgTLJlLuDYOGLK2AwbrS3Sp0AEbkpdJBb44qVlGm5bApZouHeJ/+n+7r12+lqdsA EQEAAcLAdgQYAQgAIAIbDBYhBHIX+6yM6c9jRKFo5WgNwR1TC3ojBQJftOH6AAoJEGgNwR1T C3ojVSkIALpAPkIJPQoURPb1VWjh34l0HlglmYHvZszJWTXYwavHR8+k6Baa6H7ufXNQtThR yIxJrQLW6rV5lm7TjhffEhxVCn37+cg0zZ3j7zIsSS0rx/aMwi6VhFJA5hfn3T0TtrijKP4A SAQO9xD1Zk9/61JWk8OysuIh7MXkl0fxbRKWE93XeQBhIJHQfnc+YBLprdnxR446Sh8Wn/2D Ya8cavuWf2zrB6cZurs048xe0UbSW5AOSo4V9M0jzYI4nZqTmPxYyXbm30Kvmz0rYVRaitYJ 4kyYYMhuULvrJDMjZRvaNe52tkKAvMevcGdt38H4KSVXAylqyQOW5zvPc4/sq9c= In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 9A5AF1F388 X-Spam-Level: X-Spamd-Result: default: False [-4.51 / 50.00]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; FREEMAIL_ENVRCPT(0.00)[gmail.com]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FUZZY_BLOCKED(0.00)[rspamd.com]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; ARC_NA(0.00)[]; RCPT_COUNT_TWELVE(0.00)[18]; MIME_TRACE(0.00)[0:+]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FREEMAIL_CC(0.00)[bootlin.com,denx.de,agner.ch,linux.intel.com,kernel.org,gmail.com,ffwll.ch,pengutronix.de,amarulasolutions.com,lists.freedesktop.org,lists.linux.dev,lists.infradead.org,vger.kernel.org]; RCVD_TLS_ALL(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RECEIVED_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:106:10:150:64:167:received]; DKIM_TRACE(0.00)[suse.de:+]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo,imap1.dmz-prg2.suse.org:rdns,suse.de:email,suse.de:dkim,suse.de:mid] X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Rspamd-Action: no action X-Spam-Score: -4.51 X-Spam-Flag: NO Hi Am 13.03.25 um 21:43 schrieb Dario Binacchi: > Hi All, > > On Thu, Mar 13, 2025 at 3:40 PM Thomas Zimmermann wrote: >> Hi >> >> Am 13.03.25 um 15:25 schrieb Luca Ceresoli: >>> When aperture_remove_all_conflicting_devices() fails, the current code >>> returns without going through the rollback actions at the end of the >>> function, thus the actions done by drm_dev_alloc() and mxsfb_load() are not >>> undone. >>> >>> Fix by using a goto statament, as done for the previous and following error >>> conditions. >>> >>> Fixes: c8e7b185d45b ("drm/mxsfb: Remove generic DRM drivers in probe function") >>> Signed-off-by: Luca Ceresoli >>> --- >>> The offending commit is not yet merged into master, and even less in a >>> released kernel, so this does not need to go through stable. >>> --- >>> drivers/gpu/drm/mxsfb/mxsfb_drv.c | 7 ++++--- >>> 1 file changed, 4 insertions(+), 3 deletions(-) >>> >>> diff --git a/drivers/gpu/drm/mxsfb/mxsfb_drv.c b/drivers/gpu/drm/mxsfb/mxsfb_drv.c >>> index c183b1112bc4e9fe4f3b048a2b6e4c98d1d47cb3..b4273e678d26dbc3dee2014266d61470da4e8010 100644 >>> --- a/drivers/gpu/drm/mxsfb/mxsfb_drv.c >>> +++ b/drivers/gpu/drm/mxsfb/mxsfb_drv.c >>> @@ -365,9 +365,10 @@ static int mxsfb_probe(struct platform_device *pdev) >>> * located anywhere in RAM >>> */ >>> ret = aperture_remove_all_conflicting_devices(mxsfb_driver.name); >>> - if (ret) >>> - return dev_err_probe(&pdev->dev, ret, >>> - "can't kick out existing framebuffers\n"); >>> + if (ret) { >>> + dev_err_probe(&pdev->dev, ret, "can't kick out existing framebuffers\n"); >>> + goto err_unload; >>> + } >> I must have missed that when I reviewed the patch. But this call should >> happen much earlier. right at the top of the probe function before >> drm_dev_alloc(). > I had added the call to aperture_remove_all_conflicting_devices() > after mxsfb_load() to > keep the splash screen loaded by U-Boot. So, IMHO, it would be better > to add the > goto in case of an error rather than moving > aperture_remove_all_conflicting_devices() > to the beginning of the probe function. But is that really safe?  Once you start touching any of the graphics registers, the previous framebuffer and display mode potentially becomes invalid. (Depends on the details of the driver and hardware, of course.) Best regards Thomas > > Thanks and regards, > Dario > >> Conflicting drivers need to be kicked out before >> setting up DRM. Could you please send a patch to move the call to the >> top? No extra cleanup would be required then. >> >> Best regards >> Thomas >> >>> ret = drm_dev_register(drm, 0); >>> if (ret) >>> >>> --- >>> base-commit: f9f087d946266bc5da7c3a17bd8fd9d01969e3cf >>> change-id: 20250313-mxsfb_probe-fix-rollback-on-error-3074b9080f34 >>> >>> Best regards, >> -- >> -- >> Thomas Zimmermann >> Graphics Driver Developer >> SUSE Software Solutions Germany GmbH >> Frankenstrasse 146, 90461 Nuernberg, Germany >> GF: Ivo Totev, Andrew Myers, Andrew McDonald, Boudien Moerman >> HRB 36809 (AG Nuernberg) >> > -- -- Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Frankenstrasse 146, 90461 Nuernberg, Germany GF: Ivo Totev, Andrew Myers, Andrew McDonald, Boudien Moerman HRB 36809 (AG Nuernberg)