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 76A81C83F03 for ; Wed, 9 Jul 2025 13:54:18 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3401E10E7F5; Wed, 9 Jul 2025 13:54:18 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (1024-bit key; secure) header.d=ffwll.ch header.i=@ffwll.ch header.b="ER4h1V2Q"; dkim-atps=neutral Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by gabe.freedesktop.org (Postfix) with ESMTPS id E1CEA10E7F8 for ; Wed, 9 Jul 2025 13:54:17 +0000 (UTC) Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-454b1d0a115so19930555e9.2 for ; Wed, 09 Jul 2025 06:54:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; t=1752069256; x=1752674056; darn=lists.freedesktop.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=6vLeNNO8152O2umrZswKv7pwUlDj7EkRHEDFrV26qmg=; b=ER4h1V2QTvZy4FkUPlcvV5LYSaYfqdHHK7H90WdkdtqQxifSY03u80yRKB4ZLOO/M8 AyF3QDy9YQeS2nCB+dl6IwX0CNcrCjaeMxrQ4BM5bQEI7f0C72qa81iYbrad0QFX0Bs7 HUAlcSju1x2MCbNxks/vimONeXfhNMbPPpngM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752069256; x=1752674056; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=6vLeNNO8152O2umrZswKv7pwUlDj7EkRHEDFrV26qmg=; b=GjN5Kn524zN0m28T59vBh34NGkGiNJ+uVS7pmPsbQfEoeiYmIJCaUZOGCobRgrwpaH eJQJASQOLpoxmOtbGiF+2u1HrLCXaKdC/GB+04nnhn4Y3iL5pjN06Chb1VpW6gt4a8ZU ng6yUIMz+VdFnhi0o8YJZQBMEcWVMhAzAgrqSnQ+2st984TWkdFqRTIM16aY+oSv9JT9 xGCGz3tLCaweCV4t8/gqRVApsJ7ui1qsM9vH9KJIk4yrljSUPTPkIcLw8xB9iXrR1PHu 18nwAuDzKnQxiGxSfrnVwo0+KPNPx6FSmWUyKbbNNaXdT3/6aFUzBkf6MXrZkkeG8tnq 0EDg== X-Gm-Message-State: AOJu0Ywi38COmTWldX9+3nSpZgEuIcXtuYJUBcBOVue5c4c7B+yvYUyi JO1hzJFtKsEFZhBqj1BbrrwwYEpDFwMTb1Gfsy+cJrSExFMG0cPtJDRbOf+Jk0vpgVE= X-Gm-Gg: ASbGncuJ3Fx+rCmJXgI0ikcH3BiR6Knn4srd50ab9oPtK30WBjAr4+Z7VRdwRvWvexu IgqDCt1S1XirWv4V0vq3hkpyraAgE2OyBV31SEaja9EK7BkEMlMjxKUc+KKLFGI1KFwPozEFPrD 4HFISMPfwfj8s2z80lgvyq73qopt89p6euL9d65HXHIr1PJBCTncdsesItSLEiu4W8Ag/z8DYUP uqz6ec7PHe0eS2v1ORxW4rQ966GCgv0e+xG8R3+RwqMBf3xWOdUzROLG++Tnfkh391RF8IK8Tr8 DHOUF7y5y9pRUsWw4iAyUSnynPLKC4NZQGImgXEx9uaulta2sgv/o9oJKUB7L24Y2C41BbLupA= = X-Google-Smtp-Source: AGHT+IFQ64bJI0YogKdzo+Zkc2dfr0OjXcld75k0uMW3P0ftqy2V9CVtvBoV6ut+g73nqKeYrS+C3Q== X-Received: by 2002:a05:600c:4709:b0:453:62e9:125a with SMTP id 5b1f17b1804b1-454d53ef39amr27994395e9.18.1752069256234; Wed, 09 Jul 2025 06:54:16 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:5485:d4b2:c087:b497]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-454d50516e3sm24944955e9.15.2025.07.09.06.54.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Jul 2025 06:54:15 -0700 (PDT) Date: Wed, 9 Jul 2025 15:54:13 +0200 From: Simona Vetter To: DRI Development Cc: Intel Xe Development , Simona Vetter , Jacek Lawrynowicz , Thomas Zimmermann , stable@vger.kernel.org, Maarten Lankhorst , Maxime Ripard , David Airlie , Simona Vetter , Simona Vetter Subject: Re: [PATCH 1/2] drm/gem: Fix race in drm_gem_handle_create_tail() Message-ID: References: <20250707151814.603897-1-simona.vetter@ffwll.ch> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20250707151814.603897-1-simona.vetter@ffwll.ch> X-Operating-System: Linux phenom 6.12.30-amd64 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" On Mon, Jul 07, 2025 at 05:18:13PM +0200, Simona Vetter wrote: > Object creation is a careful dance where we must guarantee that the > object is fully constructed before it is visible to other threads, and > GEM buffer objects are no difference. > > Final publishing happens by calling drm_gem_handle_create(). After > that the only allowed thing to do is call drm_gem_object_put() because > a concurrent call to the GEM_CLOSE ioctl with a correctly guessed id > (which is trivial since we have a linear allocator) can already tear > down the object again. > > Luckily most drivers get this right, the very few exceptions I've > pinged the relevant maintainers for. Unfortunately we also need > drm_gem_handle_create() when creating additional handles for an > already existing object (e.g. GETFB ioctl or the various bo import > ioctl), and hence we cannot have a drm_gem_handle_create_and_put() as > the only exported function to stop these issues from happening. > > Now unfortunately the implementation of drm_gem_handle_create() isn't > living up to standards: It does correctly finishe object > initialization at the global level, and hence is safe against a > concurrent tear down. But it also sets up the file-private aspects of > the handle, and that part goes wrong: We fully register the object in > the drm_file.object_idr before calling drm_vma_node_allow() or > obj->funcs->open, which opens up races against concurrent removal of > that handle in drm_gem_handle_delete(). > > Fix this with the usual two-stage approach of first reserving the > handle id, and then only registering the object after we've completed > the file-private setup. > > Jacek reported this with a testcase of concurrently calling GEM_CLOSE > on a freshly-created object (which also destroys the object), but it > should be possible to hit this with just additional handles created > through import or GETFB without completed destroying the underlying > object with the concurrent GEM_CLOSE ioctl calls. > > Note that the close-side of this race was fixed in f6cd7daecff5 ("drm: > Release driver references to handle before making it available > again"), which means a cool 9 years have passed until someone noticed > that we need to make this symmetry or there's still gaps left :-/ > Without the 2-stage close approach we'd still have a race, therefore > that's an integral part of this bugfix. > > More importantly, this means we can have NULL pointers behind > allocated id in our drm_file.object_idr. We need to check for that > now: > > - drm_gem_handle_delete() checks for ERR_OR_NULL already > > - drm_gem.c:object_lookup() also chekcs for NULL > > - drm_gem_release() should never be called if there's another thread > still existing that could call into an IOCTL that creates a new > handle, so cannot race. For paranoia I added a NULL check to > drm_gem_object_release_handle() though. > > - most drivers (etnaviv, i915, msm) are find because they use > idr_find(), which maps both ENOENT and NULL to NULL. > > - drivers using idr_for_each_entry() should also be fine, because > idr_get_next does filter out NULL entries and continues the > iteration. > > - The same holds for drm_show_memory_stats(). > > v2: Use drm_WARN_ON (Thomas) > > Reported-by: Jacek Lawrynowicz > Tested-by: Jacek Lawrynowicz > Reviewed-by: Thomas Zimmermann > Cc: stable@vger.kernel.org > Cc: Jacek Lawrynowicz > Cc: Maarten Lankhorst > Cc: Maxime Ripard > Cc: Thomas Zimmermann > Cc: David Airlie > Cc: Simona Vetter > Signed-off-by: Simona Vetter > Signed-off-by: Simona Vetter Pushed to drm-misc-fixes, thanks for the reviews. -Sima > --- > drivers/gpu/drm/drm_gem.c | 10 +++++++++- > include/drm/drm_file.h | 3 +++ > 2 files changed, 12 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c > index bc505d938b3e..1aa9192c4cc6 100644 > --- a/drivers/gpu/drm/drm_gem.c > +++ b/drivers/gpu/drm/drm_gem.c > @@ -316,6 +316,9 @@ drm_gem_object_release_handle(int id, void *ptr, void *data) > struct drm_file *file_priv = data; > struct drm_gem_object *obj = ptr; > > + if (drm_WARN_ON(obj->dev, !data)) > + return 0; > + > if (obj->funcs->close) > obj->funcs->close(obj, file_priv); > > @@ -436,7 +439,7 @@ drm_gem_handle_create_tail(struct drm_file *file_priv, > idr_preload(GFP_KERNEL); > spin_lock(&file_priv->table_lock); > > - ret = idr_alloc(&file_priv->object_idr, obj, 1, 0, GFP_NOWAIT); > + ret = idr_alloc(&file_priv->object_idr, NULL, 1, 0, GFP_NOWAIT); > > spin_unlock(&file_priv->table_lock); > idr_preload_end(); > @@ -457,6 +460,11 @@ drm_gem_handle_create_tail(struct drm_file *file_priv, > goto err_revoke; > } > > + /* mirrors drm_gem_handle_delete to avoid races */ > + spin_lock(&file_priv->table_lock); > + obj = idr_replace(&file_priv->object_idr, obj, handle); > + WARN_ON(obj != NULL); > + spin_unlock(&file_priv->table_lock); > *handlep = handle; > return 0; > > diff --git a/include/drm/drm_file.h b/include/drm/drm_file.h > index eab7546aad79..115763799625 100644 > --- a/include/drm/drm_file.h > +++ b/include/drm/drm_file.h > @@ -300,6 +300,9 @@ struct drm_file { > * > * Mapping of mm object handles to object pointers. Used by the GEM > * subsystem. Protected by @table_lock. > + * > + * Note that allocated entries might be NULL as a transient state when > + * creating or deleting a handle. > */ > struct idr object_idr; > > -- > 2.49.0 > -- Simona Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch