From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795180222; b=bhKmdNLeHTJO59kHTVYNY+p3idsLHrLtsMjYVn9PNHBZyCyBly5L/sH1YWciSjrRjiYF J66J6LgPIKCDLO4QfNtVQtr51Ppa/QwEzpQWAALvkqqnsnz1YU4pFGdV7ZEIbe/uMipl+ a7ua3OIUl+eSayuE5UolLj5LqZLUM7hu8y3krciYw3Ime5MwuFPZmi60hwg6pNZ4ksSG2 BVWArRR7tXZuhm56/VW9qVaA7cXnGpwst7AsLT96fkkR3qMGucdeQJ56pEwJS7PXBiY8r qLsvW1oDBWSgZ58zTdHclTHVims0KCA6ZOz7keVJQ7rFYCWRnGhIUelO+6HKhAa5dPQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795180222; h=Received:DKIM-Signature:From:Date:Subject:MIME-Version:Content-Type: Content-Transfer-Encoding:Message-Id:References:In-Reply-To:To:Cc: X-Mailer:X-Developer-Signature:X-Developer-Key; bh=IXgoYIfGjlbitGYGGNCvf9f3ek7U+8itIwrInXRhn4g=; b=csd8qNmF+HGO5pLgw7lBqxt79UGG60CgNAECa+/tdNY1qGvF6Fc9iRTlE8nSS7vNlkrn VAshzlu01CvK43DHMXkc6MayYqIdIGGCCbuEn4OcOu0iYO3R+ctgAdAwGWIXtPtB2u2Xz 9Ws5ofB2m4XaEW2unB84dooWfqAn6YnzRcYr5gHlbtNRnRruTtpN45WJmmcR8y0S+40sX gAo61vMib1chLht9URgvJdydItP4Vjbql4SL6dzdyNswWYZ57702tGOTHKtqNDm4/YctL 8pb3fsCoSRCBqE189b14CX2YL4Zm4fdqjLD2Q8yzlxEwqAC8/u4ydWhQQcBw4WWkfug== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=GaeMrQyg; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F2928606A33C for ; Fri, 20 Nov 2026 13:10:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=GaeMrQyg Received: by smtp.kernel.org (Postfix) with ESMTPSA id F28211F000D2; Fri, 20 Nov 2026 13:10:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1795180221; bh=IXgoYIfGjlbitGYGGNCvf9f3ek7U+8itIwrInXRhn4g=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=GaeMrQygGMdT1dV4zUcAXXvN3iGkYbbzyXhEsqYQQfOr7CNRsKwBbJcDd4/zNonj4 shZwGWaNUxArsViUp8DVUP90BR9i9msFEjujKCqLJcBHbmshgYJzDDmgy4ZnsN39uN +xXBxrElWrfUj/jhmW0/w1V/Gjs5ANlw2hXSAYE/COvnK8PBfSBmkPuJCsXRggtpop g6K7wPSxH/giSt/0lMpH9Xr/e9z15KzKI5pok/OCoMnwZOgFXF2tYx7VxuRrQnKd8L Ca5ylsJC5yquAczht0h26c5MAJzCyGqk2sII0xAcm2/dcFJiii/zPf9XY0o01hEIRv vfShdl8tPovRA== From: Maxime Ripard Date: Fri, 20 Nov 2026 14:10:08 +0100 Subject: [PATCH v12 1/9] drm/lease: Add a helper to tell whether a lease was revoked X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20261120-drm-reset-state-flag-v12-1-42d63d7417fc@kernel.org> References: <20261120-drm-reset-state-flag-v12-0-42d63d7417fc@kernel.org> In-Reply-To: <20261120-drm-reset-state-flag-v12-0-42d63d7417fc@kernel.org> To: Maarten Lankhorst , Thomas Zimmermann , David Airlie , Simona Vetter , Louis Chauvet , Haneen Mohammed , Melissa Wen Cc: Daniel Stone , Harry Wentland , Jocelyn Falempe , =?utf-8?q?Jonas_=C3=85dahl?= , =?utf-8?q?Michel_D=C3=A4nzer?= , Pekka Paalanen , Sebastian Wick , Simon Ser , Victoria Brekenfeld , Xaver Hugl , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Maxime Ripard X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=3964; i=mripard@kernel.org; h=from:subject:message-id; bh=ZEseRsekpeEW7ibj0o6zlVrZFrh5rtPHu8VP1Nrf/f8=; b=owGbwMvMwCmsHn9OcpHtvjLG02pJDNkMbpvVT4Qeq6ht/sj8Qu/NvIlT9sqYdVtuimJNuax6a fer+9qdHVNZGIQ5GWTFFFmeyISdXt6+uMrBfuUPmDmsTCBDGLg4BWAiEWcY6+Nft/La7vgVUa4m Xjd7e4xWmGAF46ppRttXzy6IkPy0s3iN0TVPlUm/N35P/HXwxOlZMoz1dfq3LwiVmARedNx29SS 3c5D0dEVbfv1e6QsLrWcebA+dZlrXrRFx5HP9iaPLRFa2/fQEAA== X-Developer-Key: i=mripard@kernel.org; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D drm_lease_held() only answers whether a given object is part of a lease, and the answer can change from one call to the next. Code that needs to look at several objects in a row has no way to tell whether the lease it has been checking against is still around by the time it is done. Add a helper reporting whether a lease has been revoked, so that such code can bail out instead of acting on a lease that went away. Signed-off-by: Maxime Ripard --- drivers/gpu/drm/drm_lease.c | 30 ++++++++++++++++++++++++++++++ include/drm/drm_auth.h | 11 +++++++++++ include/drm/drm_lease.h | 2 ++ 3 files changed, 43 insertions(+) diff --git a/drivers/gpu/drm/drm_lease.c b/drivers/gpu/drm/drm_lease.c index 5d2cf724cbd7..f2370a9a18fc 100644 --- a/drivers/gpu/drm/drm_lease.c +++ b/drivers/gpu/drm/drm_lease.c @@ -145,10 +145,38 @@ bool drm_lease_held(struct drm_file *file_priv, int id) out: drm_master_put(&master); return ret; } +/* + * Checks whether the file is a lessee whose lease has been revoked. A + * lease is always revoked as a whole, but empty leases can also be + * created on purpose, so the revocation is tracked explicitly in + * drm_master rather than inferred from an empty lease. + */ +bool drm_lease_revoked(struct drm_file *file_priv) +{ + struct drm_master *master; + bool ret = false; + + if (!file_priv) + return false; + + master = drm_file_get_master(file_priv); + if (!master) + return false; + + if (master->lessor) { + mutex_lock(&master->dev->mode_config.idr_mutex); + ret = master->lease_revoked; + mutex_unlock(&master->dev->mode_config.idr_mutex); + } + + drm_master_put(&master); + return ret; +} + /* * Given a bitmask of crtcs to check, reconstructs a crtc mask based on the * crtcs which are visible through the specified file. */ uint32_t drm_lease_filter_crtcs(struct drm_file *file_priv, uint32_t crtcs_in) @@ -315,10 +343,12 @@ static void _drm_lease_revoke(struct drm_master *top) /* Evacuate the lease */ idr_for_each_entry(&master->leases, entry, object) idr_remove(&master->leases, object); + master->lease_revoked = true; + /* Depth-first list walk */ /* Down */ if (!list_empty(&master->lessees)) { master = list_first_entry(&master->lessees, struct drm_master, lessee_list); diff --git a/include/drm/drm_auth.h b/include/drm/drm_auth.h index 50131383ed81..b1962f197b05 100644 --- a/include/drm/drm_auth.h +++ b/include/drm/drm_auth.h @@ -118,10 +118,21 @@ struct drm_master { * Objects are leased all together in drm_lease_create(), and are * removed all together when the lease is revoked. */ struct idr leases; + /** + * @lease_revoked: + * + * Whether the lease of this drm_master has been revoked. Since empty + * leases can be created on purpose, an empty &leases doesn't imply a + * revocation, so it has to be tracked explicitly. Never cleared once + * set: a revoked master cannot be leased anything again. Protected by + * &drm_device.mode_config's &drm_mode_config.idr_mutex. + */ + bool lease_revoked; + /** * @lessee_idr: * * All lessees under this owner (only used where @lessor is NULL). * Protected by &drm_device.mode_config's &drm_mode_config.idr_mutex. diff --git a/include/drm/drm_lease.h b/include/drm/drm_lease.h index 53545b4ca9ef..03f7ea36c37c 100644 --- a/include/drm/drm_lease.h +++ b/include/drm/drm_lease.h @@ -18,10 +18,12 @@ void drm_lease_destroy(struct drm_master *lessee); bool drm_lease_held(struct drm_file *file_priv, int id); bool _drm_lease_held(struct drm_file *file_priv, int id); +bool drm_lease_revoked(struct drm_file *file_priv); + void drm_lease_revoke(struct drm_master *master); uint32_t drm_lease_filter_crtcs(struct drm_file *file_priv, uint32_t crtcs); int drm_mode_create_lease_ioctl(struct drm_device *dev, -- 2.56.1