From nobody Wed Dec 17 08:58:06 2025 Received: from fanzine2.igalia.com (fanzine2.igalia.com [213.97.179.56]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C35EE2110 for ; Fri, 9 May 2025 14:26:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=213.97.179.56 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746800820; cv=none; b=Zb6ofeFk9SYbmTHUVl5emCD8M8CPsiRDlvJux3B4IjHme4I3h6yS2yoX9Wmity/oM54lg0jJxREhi8OZERp26scTZUXODtA5ndJ0xTM1QpVRFBIkzODiSHCS62l1ucOqf5dtPZrjPJerBpBMV4EjcoiTgS0e+P22MEP2l7l2SqU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746800820; c=relaxed/simple; bh=dfI1XQ06pm+RwwZuvsgWrC3w74XG/uNfQ1+5HHMCiIg=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type; b=Jz/96ocn4Gl50ZS+0LOG1EipVx61oyvfRog8y51vs085Qjj8ZCGq+vnc6Xo2JA0rwc6Vd7L2GUnkQWvoG/sKmErfQC25tdobVecjF29Ak3PwhTTTbiZcIV7oeilB/3HyFIRODamtuyYNJC9wiMnKX3utxcD/ReXUPUpMDemnX8M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=igalia.com; spf=pass smtp.mailfrom=igalia.com; dkim=pass (2048-bit key) header.d=igalia.com header.i=@igalia.com header.b=mlFaRE7g; arc=none smtp.client-ip=213.97.179.56 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=igalia.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=igalia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=igalia.com header.i=@igalia.com header.b="mlFaRE7g" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=Content-Transfer-Encoding:Content-Type:MIME-Version:Message-ID: Date:Subject:Cc:To:From:Sender:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=xcMcmNP1V8nnDAsJC1Qdyo8awocg5tbRjm5hYQIYwCA=; b=mlFaRE7goJIA7a/dtWhjCovRGq A+A6iQc8RvBHnZOCzA0XKdfCzoMcwk4G2LzosXd24ED+Z53q2pUrAtpltZJ2/4BYRrrGJr5CV8AbM adlbmTJMl0YaAM1Bh9J6zShqOX1OdPK1h8MZPH39ne6BfMrfqDLHYNdRD8O01dET+lgrDAW9AReD4 CkDp3LnnuN92oSLxm1NvjJuEn+qydL9Xl8p9irqBBRFUu+CFK1i6vJZ4yKBIRyAlI+7ni7/uoQjN4 CWgQTnGj3Yk1srYMBGR7moMYGw8tW6yTPUROXcCE6W3CICq8kJv58fF0BcfTxkEDD35uvZiAe/9jj sGh7VhPA==; Received: from [191.204.192.64] (helo=localhost.localdomain) by fanzine2.igalia.com with esmtpsa (Cipher TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim) id 1uDObs-005mcX-BF; Fri, 09 May 2025 16:26:32 +0200 From: =?UTF-8?q?Andr=C3=A9=20Almeida?= To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, kernel-dev@igalia.com, Kees Cook , Tvrtko Ursulin , =?UTF-8?q?Andr=C3=A9=20Almeida?= Subject: [PATCH] drm: drm_auth: Convert mutex usage to guard(mutex) Date: Fri, 9 May 2025 11:26:27 -0300 Message-ID: <20250509142627.639419-1-andrealmeid@igalia.com> X-Mailer: git-send-email 2.49.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Replace open-coded mutex handling with cleanup.h guard(mutex). This simplifies the code and removes the "goto unlock" pattern. Tested with igt tests core_auth and core_setmaster. Signed-off-by: Andr=C3=A9 Almeida Reviewed-by: Thomas Zimmermann --- For more information about guard(mutex): https://www.kernel.org/doc/html/latest/core-api/cleanup.html --- drivers/gpu/drm/drm_auth.c | 64 ++++++++++++++------------------------ 1 file changed, 23 insertions(+), 41 deletions(-) diff --git a/drivers/gpu/drm/drm_auth.c b/drivers/gpu/drm/drm_auth.c index 22aa015df387..d6bf605b4b90 100644 --- a/drivers/gpu/drm/drm_auth.c +++ b/drivers/gpu/drm/drm_auth.c @@ -95,7 +95,7 @@ int drm_getmagic(struct drm_device *dev, void *data, stru= ct drm_file *file_priv) struct drm_auth *auth =3D data; int ret =3D 0; =20 - mutex_lock(&dev->master_mutex); + guard(mutex)(&dev->master_mutex); if (!file_priv->magic) { ret =3D idr_alloc(&file_priv->master->magic_map, file_priv, 1, 0, GFP_KERNEL); @@ -103,7 +103,6 @@ int drm_getmagic(struct drm_device *dev, void *data, st= ruct drm_file *file_priv) file_priv->magic =3D ret; } auth->magic =3D file_priv->magic; - mutex_unlock(&dev->master_mutex); =20 drm_dbg_core(dev, "%u\n", auth->magic); =20 @@ -118,13 +117,12 @@ int drm_authmagic(struct drm_device *dev, void *data, =20 drm_dbg_core(dev, "%u\n", auth->magic); =20 - mutex_lock(&dev->master_mutex); + guard(mutex)(&dev->master_mutex); file =3D idr_find(&file_priv->master->magic_map, auth->magic); if (file) { file->authenticated =3D 1; idr_replace(&file_priv->master->magic_map, NULL, auth->magic); } - mutex_unlock(&dev->master_mutex); =20 return file ? 0 : -EINVAL; } @@ -248,41 +246,33 @@ int drm_setmaster_ioctl(struct drm_device *dev, void = *data, { int ret; =20 - mutex_lock(&dev->master_mutex); + guard(mutex)(&dev->master_mutex); =20 ret =3D drm_master_check_perm(dev, file_priv); if (ret) - goto out_unlock; + return ret; =20 if (drm_is_current_master_locked(file_priv)) - goto out_unlock; + return ret; =20 - if (dev->master) { - ret =3D -EBUSY; - goto out_unlock; - } + if (dev->master) + return -EBUSY; =20 - if (!file_priv->master) { - ret =3D -EINVAL; - goto out_unlock; - } + if (!file_priv->master) + return -EINVAL; =20 - if (!file_priv->is_master) { - ret =3D drm_new_set_master(dev, file_priv); - goto out_unlock; - } + if (!file_priv->is_master) + return drm_new_set_master(dev, file_priv); =20 if (file_priv->master->lessor !=3D NULL) { drm_dbg_lease(dev, "Attempt to set lessee %d as master\n", file_priv->master->lessee_id); - ret =3D -EINVAL; - goto out_unlock; + return -EINVAL; } =20 drm_set_master(dev, file_priv, false); -out_unlock: - mutex_unlock(&dev->master_mutex); + return ret; } =20 @@ -299,33 +289,27 @@ int drm_dropmaster_ioctl(struct drm_device *dev, void= *data, { int ret; =20 - mutex_lock(&dev->master_mutex); + guard(mutex)(&dev->master_mutex); =20 ret =3D drm_master_check_perm(dev, file_priv); if (ret) - goto out_unlock; + return ret; =20 - if (!drm_is_current_master_locked(file_priv)) { - ret =3D -EINVAL; - goto out_unlock; - } + if (!drm_is_current_master_locked(file_priv)) + return -EINVAL; =20 - if (!dev->master) { - ret =3D -EINVAL; - goto out_unlock; - } + if (!dev->master) + return -EINVAL; =20 if (file_priv->master->lessor !=3D NULL) { drm_dbg_lease(dev, "Attempt to drop lessee %d as master\n", file_priv->master->lessee_id); - ret =3D -EINVAL; - goto out_unlock; + return -EINVAL; } =20 drm_drop_master(dev, file_priv); -out_unlock: - mutex_unlock(&dev->master_mutex); + return ret; } =20 @@ -337,7 +321,7 @@ int drm_master_open(struct drm_file *file_priv) /* if there is no current master make this fd it, but do not create * any master object for render clients */ - mutex_lock(&dev->master_mutex); + guard(mutex)(&dev->master_mutex); if (!dev->master) { ret =3D drm_new_set_master(dev, file_priv); } else { @@ -345,7 +329,6 @@ int drm_master_open(struct drm_file *file_priv) file_priv->master =3D drm_master_get(dev->master); spin_unlock(&file_priv->master_lookup_lock); } - mutex_unlock(&dev->master_mutex); =20 return ret; } @@ -355,7 +338,7 @@ void drm_master_release(struct drm_file *file_priv) struct drm_device *dev =3D file_priv->minor->dev; struct drm_master *master; =20 - mutex_lock(&dev->master_mutex); + guard(mutex)(&dev->master_mutex); master =3D file_priv->master; if (file_priv->magic) idr_remove(&file_priv->master->magic_map, file_priv->magic); @@ -376,7 +359,6 @@ void drm_master_release(struct drm_file *file_priv) /* drop the master reference held by the file priv */ if (file_priv->master) drm_master_put(&file_priv->master); - mutex_unlock(&dev->master_mutex); } =20 /** --=20 2.49.0