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 492EBCAC5BB for ; Wed, 1 Oct 2025 07:37:53 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8788F10E692; Wed, 1 Oct 2025 07:37:52 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=fairphone.com header.i=@fairphone.com header.b="uq+SudJJ"; dkim-atps=neutral Received: from mail-ej1-f47.google.com (mail-ej1-f47.google.com [209.85.218.47]) by gabe.freedesktop.org (Postfix) with ESMTPS id B13D510E699 for ; Wed, 1 Oct 2025 07:37:50 +0000 (UTC) Received: by mail-ej1-f47.google.com with SMTP id a640c23a62f3a-b3727611d76so1016048866b.2 for ; Wed, 01 Oct 2025 00:37:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fairphone.com; s=fair; t=1759304269; x=1759909069; darn=lists.freedesktop.org; h=in-reply-to:references:subject:cc:to:from:message-id:date :content-transfer-encoding:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=CCBC31964+c7FoQA1HUfYfeEbUaDgsaFIT9ZaWC1avo=; b=uq+SudJJZkQ+FyaGoewFcqJnCh4Exn2nn0JqhvuktCeECHiK2fKsj+VVxmTxDmwlfd DHTWbYmiKuTHvTBWJN1oH/+7Pz0ulvcvTAhEd1Ha1DZmPgTYgqPw0l44HBm5e486JkgG m9W2nuf7Y4QD6CI/F627yP9hUNpweXMBq8bsfjoVb+4GVQKTDt3dam/Q4corSL2Wvl3m jr6XtGUngcn60L0+2U1fSg0V+viOqBTeyqrXjXtCXFWe7QDO4zyOHAqdbsmGwUZFd+P4 I8whY9MnsgP5CHNXuz1xcw4TWIJKNzX1na9TM0Rt5ZDGu4xaRTojJVhfCyW13X6LNecX 9Jzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759304269; x=1759909069; h=in-reply-to:references:subject:cc:to:from:message-id:date :content-transfer-encoding:mime-version:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=CCBC31964+c7FoQA1HUfYfeEbUaDgsaFIT9ZaWC1avo=; b=qlYYIgEMp19jWJvVvcdkCxcx/PZ7srYRx8wZ0W7KZZq/AHhqmu0MjlMQ7TkV977CqV Hd4ef77Uf0XjlNCAsemA/P4bQ/1oTyFa5GGTKy2q5IRLrw+mv3Wj4+soqcUFb6WsaQO6 uex344srehLrqc+OuFjDrqX9weIMyEEa4Tob1gOND2q0pcSLNoaQBT7RVZCoQLAFqmLn 4BgQME0sBiV/WicwHUGTc6E0Y93Yx8d7u5trDSGS5AnotIvWsTidlXDc8fQZZZ7RRD22 usrVcQfplMWJV5ljOPRfYpD1ZKWImn0COWSSZIX0aoTwkN4mIiSkqfzYcq6Fjn7ebabG Td1g== X-Forwarded-Encrypted: i=1; AJvYcCWlTpG34wkfXcP1kE5DY2op3OhBLYgGEUFFLRyP2tIUk9jvlpIlGk9dc9gyrbe3ZDkW0eAdfPhVVoI=@lists.freedesktop.org X-Gm-Message-State: AOJu0YznqmLaRZDpxtJ4vMCOEPk/VCSMn7znubJxs6Uuz2EGv8v1+uQE IUa6ewRiRe3CSGD4O/OLGOApMvZWt6nMi0S8/k2A5Mo3iPC9YBCpQDuSo1R2WglRtcE= X-Gm-Gg: ASbGncsXgYLQaIJ64gY9fX3kl7IUgK/oXf5tkL+8SVubf6LzBb0RUpauhXO6Igfw0F+ Y0KfRPbqfRMe9is9y2Gz+gj4sbEXGIbZoVP3uWNZz823QGnX8ckA6wElcKJbAL2ywkCD2l5AwAi TMAAE2nA7g8LOrP+YHm+hkZy+x+4LafhBA/8QeNc9DvC5TuaIgRJmKKH6abdt8nUtpClM90diIf 41UX50unt5ExV/cWkpNyAwOtb6z4MxmirVldA24HLAXAjNuCAX2E59+Adcb3wi4O2UcC/Ib2mHN yqGynUkUk4L7N9ypCLsuEXiYKt/z5ubxVyKryqrLziA+p+i3+1l59W+0XlDm0xZuEd92xAHuHVu d7Jm2xdTDK7zjgorzDbD7XYWZCw1D6xh5E9XMCDl9t4KOvW1zKgje4rWneUK4GRVR5a51eaWT0j TssDv/K6x7RozTfpmK X-Google-Smtp-Source: AGHT+IECncxzo44p2ti1eqVfThffaFqPYdNBkWZ/Tki6amN33j9mO0FxuVRZFb9kMJ5ZWSnhCBIzXQ== X-Received: by 2002:a17:907:3cc8:b0:b3e:c7d5:4cb5 with SMTP id a640c23a62f3a-b46e632f76emr337033566b.31.1759304269133; Wed, 01 Oct 2025 00:37:49 -0700 (PDT) Received: from localhost (144-178-202-138.static.ef-service.nl. [144.178.202.138]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b3d27759835sm693220566b.13.2025.10.01.00.37.48 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 01 Oct 2025 00:37:48 -0700 (PDT) Mime-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=UTF-8 Date: Wed, 01 Oct 2025 09:37:47 +0200 Message-Id: From: "Luca Weiss" To: "Rob Clark" , Cc: , , "Stephan Gerhold" , "Dmitry Baryshkov" , "Abhinav Kumar" , "Jessica Zhang" , "Sean Paul" , "Marijn Suijten" , "David Airlie" , "Simona Vetter" , "open list" Subject: Re: [PATCH] drm/msm: Fix GEM free for imported dma-bufs X-Mailer: aerc 0.21.0-0-g5549850facc2 References: <20250923140441.746081-1-robin.clark@oss.qualcomm.com> In-Reply-To: <20250923140441.746081-1-robin.clark@oss.qualcomm.com> X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Tue Sep 23, 2025 at 4:04 PM CEST, Rob Clark wrote: > Imported dma-bufs also have obj->resv !=3D &obj->_resv. So we should > check both this condition in addition to flags for handling the > _NO_SHARE case. > > Fixes this splat that was reported with IRIS video playback: > > ------------[ cut here ]------------ > WARNING: CPU: 3 PID: 2040 at drivers/gpu/drm/msm/msm_gem.c:1127 msm_g= em_free_object+0x1f8/0x264 [msm] > CPU: 3 UID: 1000 PID: 2040 Comm: .gnome-shell-wr Not tainted 6.17.0-r= c7 #1 PREEMPT > pstate: 81400005 (Nzcv daif +PAN -UAO -TCO +DIT -SSBS BTYPE=3D--) > pc : msm_gem_free_object+0x1f8/0x264 [msm] > lr : msm_gem_free_object+0x138/0x264 [msm] > sp : ffff800092a1bb30 > x29: ffff800092a1bb80 x28: ffff800092a1bce8 x27: ffffbc702dbdbe08 > x26: 0000000000000008 x25: 0000000000000009 x24: 00000000000000a6 > x23: ffff00083c72f850 x22: ffff00083c72f868 x21: ffff00087e69f200 > x20: ffff00087e69f330 x19: ffff00084d157ae0 x18: 0000000000000000 > x17: 0000000000000000 x16: ffffbc704bd46b80 x15: 0000ffffd0959540 > x14: 0000000000000000 x13: 0000000000000000 x12: 0000000000000000 > x11: ffffbc702e6cdb48 x10: 0000000000000000 x9 : 000000000000003f > x8 : ffff800092a1ba90 x7 : 0000000000000000 x6 : 0000000000000020 > x5 : ffffbc704bd46c40 x4 : fffffdffe102cf60 x3 : 0000000000400032 > x2 : 0000000000020000 x1 : ffff00087e6978e8 x0 : ffff00087e6977e8 > Call trace: > msm_gem_free_object+0x1f8/0x264 [msm] (P) > drm_gem_object_free+0x1c/0x30 [drm] > drm_gem_object_handle_put_unlocked+0x138/0x150 [drm] > drm_gem_object_release_handle+0x5c/0xcc [drm] > drm_gem_handle_delete+0x68/0xbc [drm] > drm_gem_close_ioctl+0x34/0x40 [drm] > drm_ioctl_kernel+0xc0/0x130 [drm] > drm_ioctl+0x360/0x4e0 [drm] > __arm64_sys_ioctl+0xac/0x104 > invoke_syscall+0x48/0x104 > el0_svc_common.constprop.0+0x40/0xe0 > do_el0_svc+0x1c/0x28 > el0_svc+0x34/0xec > el0t_64_sync_handler+0xa0/0xe4 > el0t_64_sync+0x198/0x19c > ---[ end trace 0000000000000000 ]--- > ------------[ cut here ]------------ Also fixes log spam when opening GNOME Camera on Fairphone 5. Tested-by: Luca Weiss Regards Luca > > Reported-by: Stephan Gerhold > Fixes: de651b6e040b ("drm/msm: Fix refcnt underflow in error path") > Signed-off-by: Rob Clark > --- > drivers/gpu/drm/msm/msm_gem.c | 10 +++++++--- > 1 file changed, 7 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.= c > index 9f0f5b77f1bd..3aea9b493375 100644 > --- a/drivers/gpu/drm/msm/msm_gem.c > +++ b/drivers/gpu/drm/msm/msm_gem.c > @@ -1121,12 +1121,16 @@ static void msm_gem_free_object(struct drm_gem_ob= ject *obj) > put_pages(obj); > } > =20 > - if (obj->resv !=3D &obj->_resv) { > + /* > + * In error paths, we could end up here before msm_gem_new_handle() > + * has changed obj->resv to point to the shared resv. In this case, > + * we don't want to drop a ref to the shared r_obj that we haven't > + * taken yet. > + */ > + if ((msm_obj->flags & MSM_BO_NO_SHARE) && (obj->resv !=3D &obj->_resv))= { > struct drm_gem_object *r_obj =3D > container_of(obj->resv, struct drm_gem_object, _resv); > =20 > - WARN_ON(!(msm_obj->flags & MSM_BO_NO_SHARE)); > - > /* Drop reference we hold to shared resv obj: */ > drm_gem_object_put(r_obj); > }