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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 909B4CF9C69 for ; Mon, 23 Sep 2024 12:40:34 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5D3CE10E3FD; Mon, 23 Sep 2024 12:40:34 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; secure) header.d=web.de header.i=markus.elfring@web.de header.b="bSj9lUF4"; dkim-atps=neutral Received: from mout.web.de (mout.web.de [212.227.15.14]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5CD5E10E574; Wed, 18 Sep 2024 09:39:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=web.de; s=s29768273; t=1726652341; x=1727257141; i=markus.elfring@web.de; bh=ryEsDHPLtBndKjOllvUbBdBogtS9EuS9iEH04QnZOw4=; h=X-UI-Sender-Class:Message-ID:Date:MIME-Version:Subject:To:Cc: References:From:In-Reply-To:Content-Type: Content-Transfer-Encoding:cc:content-transfer-encoding: content-type:date:from:message-id:mime-version:reply-to:subject: to; b=bSj9lUF4AoSwexF9Mvpvb70mSt3BsmDf2w+sAdmHsr/1ocF2pWPPjdOjlEtKSUy7 IDEtDXylMk5ARaBcKx06bcduLcYmwLsTxb22zFI5d/kfWHMg5sXHlhV6mOL5gE1tx RW1r071EMSQwoDBaS91QucrqP90Dt2khRzTVzYkZRoIUnsUTYOXTVWIAuwOZd8ppV c+DhDTIFj1wVTWlHDh0U4dbrGnDk01A1EboEozX1iRdOv0UccLH891X5lPEW6tkDa O5doYTNHR7Q6hJmuDgvChCevQKJ0Xrvx1TYEMV5G5dHtE21ogUNzA4RwLXJW35Cn3 fdWcCYozEha67V6L4A== X-UI-Sender-Class: 814a7b36-bfc1-4dae-8640-3722d8ec6cd6 Received: from [192.168.178.21] ([94.31.85.95]) by smtp.web.de (mrweb006 [213.165.67.108]) with ESMTPSA (Nemesis) id 1MLAVa-1sYm4F1Nj8-00XN26; Wed, 18 Sep 2024 11:39:01 +0200 Message-ID: <4eef2944-9ce7-4126-bf09-3e4afcc52dbf@web.de> Date: Wed, 18 Sep 2024 11:38:57 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] drm/xe/query: Refactor copy_to_user() usage in four functions To: Jani Nikula , intel-xe@lists.freedesktop.org, dri-devel@lists.freedesktop.org, kernel-janitors@vger.kernel.org, Daniel Vetter , David Airlie , Faith Ekstrand , Francois Dugast , =?UTF-8?Q?Jos=C3=A9_Roberto_de_Souza?= , Lucas De Marchi , Maarten Lankhorst , Matt Roper , Matthew Brost , Mauro Carvalho Chehab , Maxime Ripard , Nirmoy Das , Philippe Lecluse , Rodrigo Vivi , Simona Vetter , =?UTF-8?Q?Thomas_Hellstr=C3=B6m?= , Thomas Zimmermann Cc: LKML References: <87plp1b989.fsf@intel.com> Content-Language: en-GB From: Markus Elfring In-Reply-To: <87plp1b989.fsf@intel.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:tP4z8gat/ogxMxUw7ZhKbdxBkZUFAX10K7GLmI6NQYyBVdXQIgu NgktDNeUEyrDSWL5lhqYOoCycQMUF8a2S4pHH3p2DlqisSC/XxwhGSJjkddtZSeaIr7CE6Z UDoMcJDsoUx8oPQwmHZL/nGPjNFbK7smbtCMLOHydAzRjwugJIY1igTzHOG/8dVK4Pt3Vs3 zv6ugvY4WUClBiyJtzwwA== UI-OutboundReport: notjunk:1;M01:P0:8akf+dFK2/0=;giGbhwRF45vuMwQLyirVIC9BFIa 5N/ELhOQde0TLBo+l1dQPKoqJAy/SYbZKKK6Q06wM8Fa39DNv4/HeatJv/R9EWNUsCZnmOHdf eoMUeif8Z0OxUTXT/Hs6cnU9wBwtTSowLBdgztZN7spkJzFG2JOYMC5ohlC0WRBJJRPq6tuXy VuFR4IDnFCfVnT5vbj1EH9w9uR9HH2NDdfO2s6kbHaofYwaLoBxvNhKneJOhKqzZV8M0Fqhcl qnKr18Hc6jlSMvBw0aKYKG7e7Ag5uE7PdEiFqL9l/6v4bV7NvRqpTQa5z1mFUO9pjE/kg9Zn0 g+sikyeljAnSurIx7PZmKq69gwpSQNuMOqdokNl4aC/UMqTT2ijri7PPnJN5xmkrl7N+etAQ5 gMpv5w0OSHOfNIYpzLLvtzRGDnWZBD3lBNNaDJ/HAGXpKxUVNzMevj2pVgCtn68A7JpCuDw4g /9P8Wa3PEpTD1dwDJhOJusvuwUkruTAdg6evlfoUSnJqcdPqPyaYITESv4ZaIOT9f/mbpQO8Z s3CS2xVJox2dVBX138RwOgwZYrtoxR66NDJaXd0EuyFG+u5vWBw6gK1AXh27ADC9/CAs/1gzM vjpgUzZWwiAUnG5FlAwRuNxCixtzEqh6LnuiDZeJ8ym3DP1VS/aMFRYmik6iJwsoviuQgq7QM uCvQo6dlZUmLUCO5o2zjXZCefmuXJRnrpzfBhPwABm5N8aG1e86RtccftXBUpyoEc0D3kUpTP iT7+01tezJyDqV0OgGTxX1U7UkPVRPID/HPVtIzZEc2AE7670Fqf7NA42eDjTTqEQaNGG0KY1 zWy2UNDBMhL/l7/krjj8pY9A== X-Mailman-Approved-At: Mon, 23 Sep 2024 12:40:18 +0000 X-BeenThere: intel-xe@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Xe graphics driver List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" >> Assign return values from copy_to_user() calls to additional local vari= ables >> so that four kfree() calls and return statements can be omitted accordi= ngly. =E2=80=A6 >> +++ b/drivers/gpu/drm/xe/xe_query.c >> @@ -220,13 +220,11 @@ static int query_engines(struct xe_device *xe, >> >> engines->num_engines =3D i; >> >> - if (copy_to_user(query_ptr, engines, size)) { >> + { > > Please don't leave blocks like this behind when you remove the if. =E2=80=A6 >> + unsigned long ctu =3D copy_to_user(query_ptr, engines, size); >> kfree(engines); >> - return -EFAULT; >> + return ctu ? -EFAULT : 0; >> } >> - kfree(engines); >> - >> - return 0; >> } =E2=80=A6 Would you tolerate the shown variable definition without the proposed compound statement? Regards, Markus