From nobody Tue Apr 7 01:16:57 2026 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (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 DAE4F373C02 for ; Mon, 16 Mar 2026 22:39:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773700747; cv=none; b=BTO15Y6o9cG6yb58y2bcu7voH2Lujsr/dtBMo3d5gOZxbJXqkt4grOxVKcLuj9USI4xTzocDvRh7qL/BlCn1ZGZFB40QbTN/UErJmt3hgQSt6FzevFaC4ITZlQz/Zu/odCnbidO8TYXT9hHAQJ4fuMTnO0mCvCQ08QF4mTumrtw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773700747; c=relaxed/simple; bh=Twp7Nz7xLRYF7/mEhhf6UKxXI0LmdBklYei7YIRbHv8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=f1WuO/frdLrWjumx2W446PAX+xhUCdAez+yBNClas2z0GwbrlDOVOfFJt02XSnTP+P6oINAH/qX3K/QtlsN8M8/+/zj8oNVa76F8aEmqgsv23Wg1JGok2tqsHqMIgFNZbS/xVN5Sksy5grot94x1s9MtmTQ3XxXL5E1druHGyX8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=nE24yi+A; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=Cg3YIENJ; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="nE24yi+A"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="Cg3YIENJ" Received: from pps.filterd (m0279864.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 62GGMvWN3101961 for ; Mon, 16 Mar 2026 22:39:04 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=RUqvixG5Wks FkWvaUmguT5wloH9h3qhuAtu4mv/i960=; b=nE24yi+AyoZ/YThQsSaCF1IF2Cw XbsrUSrLpTKMf7T4+++m6qxsn1F+sJMeUldisbR4LMOfV4tLuuUme+JQ0HLzPdx/ Jp1Atik3pmeixNshyzxMjvClsPMIaiysy9S5CwZuSYH2La1o+RwT98H2Kb9qSA+u LDWcM8Q/ilSk1C/jvN2fMXn2qtCV238vAzhbvUlJ9KPLyWj+ApLCiS1n3qc4VTVX tx7ip3JELmUvZFVjmjhh74Cho6gge30+0C7gpFJE0rq9hxklkMbGXSn+7HeTNLfd p2rLvrNyjHDxt1pH6acqJc2EJtldPQgZTc90s14txEvCFQmdu0CtbyphD3g== Received: from mail-pj1-f71.google.com (mail-pj1-f71.google.com [209.85.216.71]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4cxnb796me-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 16 Mar 2026 22:39:03 +0000 (GMT) Received: by mail-pj1-f71.google.com with SMTP id 98e67ed59e1d1-35641c14663so5709967a91.2 for ; Mon, 16 Mar 2026 15:39:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1773700743; x=1774305543; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=RUqvixG5WksFkWvaUmguT5wloH9h3qhuAtu4mv/i960=; b=Cg3YIENJErnD8dEp2BY2nQChbZow7CCKoqrgu+Oq2wNv7qR0nLDMqBLNxYwYdaZyfO rx6xP4PLj1dnJCdhLmTDjhi5MBgvrM5VI3+lcUtOwkGocFKi9/61XkUEsx9gn01AhzFm h+IA98ebAFlD3YqFFfMLZ8NZ8EO1ZyXsxyUlvOWHtPxdZGHtpbj22OtYD1nPqBhpJJaX VNUPpcmbSCCdq/E1HwM65ht8ImKs1J6Ff9hncVIPw48ZQZLSKmKUHx6cst4y8py5CGEG zY6hnXOgxoC4m0XZvA5Och58tdM5HMA1HTT+qksaiJfGTCLalE28yHFKmBciAzsQX7dk 2IOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773700743; x=1774305543; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=RUqvixG5WksFkWvaUmguT5wloH9h3qhuAtu4mv/i960=; b=Tg/04Hpvoiarleo2EHk1KnwGiW/G2+DiCAFGQ2oG4eIXakdHz9/v5U9281s7dkOc38 YkFji0wiGvZ6aPc6DhFJ2LohkiE+vhFFgEQjh/YoBkxlIEtzLx7F7/1nJvhBX2FS8YZK sxRskq8swUR438XWVSV3XyRlHzShMxiAKt9MP7hYKi2ZrOIrpH0RgI6ReBt2WTRXY+q0 uT+zIiTsu8LrblutvKBYFjsUG2/6MBdRvsChncOuYcLrXZyZWf4gBve6CtJ8QHH8fe6n nABeLiSTgYh6Ufs07smq98kVqSNcyerqIQ6hAvMO6/6XItmRRz80YwD3GZ06nNGRiA93 Fyng== X-Forwarded-Encrypted: i=1; AJvYcCWd9NerZF+kVLC8hbe8qm50gz+T1n8t0oyQF8Vp0RhvdtJIWR2fTDHRUWUWs/94jK6WnhHZ2nxW7ePT1sc=@vger.kernel.org X-Gm-Message-State: AOJu0YyWYKAZjeV4VQL02/l6ixnNZnlr7Mgu4c6FVyIFtHyBS9DKRRlh UawRt4EDV/Fi9zEG9sbCrNBUiEkr6nLtSD4GRPCUJdPcflGNzB8rGeyI91az1Xi4tks2guUKhzG oc+WoTrdNCbLZ0qeseIsZcOQfMzSHY3v8JVXUZCoTqdiTUCkaECqhE8UcgCkkdStqt2M= X-Gm-Gg: ATEYQzzFMwzrPSHf0ehSrDzfc9xpoGgB7VvZWy8No2T0sAUMnIxiHs/PJIEEXT7uUnh 0trgn7cbXhLy1TJBDKDaVbQE7bwxJCUE00S2hiY/vSYfHjH7DQUws2krmfePMnYkfXZRZOSdJph 1ZMs8ZNoNA726hgfuy9fhbISHSRd9CSlnUotuo4+eRZnHdxyDfImj2KCJRvJNCofT4Qoobgs71y MTwTrZfdwhKOuxHYnMluQEXDZ3gY+PSgRhPrT5sZUoGQy8CfjckL5mAgyEFCLnkhOOneAaIZBil 99bFM/ne8fsH4syYUYTlrAbtzzTXMJacJ3Hh7yTLcF3tM1BYWxxxNFCjTV8w6ALvHazSM/tJKqP B4msjbbnqKADxTdaJkzBKQFZHKNFF6sly X-Received: by 2002:a17:90b:5828:b0:359:ff8a:ee47 with SMTP id 98e67ed59e1d1-35a21e1c7b6mr13704161a91.6.1773700743250; Mon, 16 Mar 2026 15:39:03 -0700 (PDT) X-Received: by 2002:a17:90b:5828:b0:359:ff8a:ee47 with SMTP id 98e67ed59e1d1-35a21e1c7b6mr13704145a91.6.1773700742801; Mon, 16 Mar 2026 15:39:02 -0700 (PDT) Received: from localhost ([2601:1c0:5000:d5c:4ec8:83f5:8254:6891]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-35bad8b5cdesm723408a91.0.2026.03.16.15.39.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Mar 2026 15:39:02 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, Rob Clark , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , linux-kernel@vger.kernel.org (open list) Subject: [RFC 1/2] drm: Add sysrq key to kill current job on GPU Date: Mon, 16 Mar 2026 15:38:49 -0700 Message-ID: <20260316223855.711574-2-robin.clark@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260316223855.711574-1-robin.clark@oss.qualcomm.com> References: <20260316223855.711574-1-robin.clark@oss.qualcomm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzE2MDE4NyBTYWx0ZWRfX0kDaLEtiTpYr 6evCapNWY3c0oWM5Q38ZKpmyHhV6qdVw75wvLviFFewxECzF6x8ZMvo26LzCE56Pb5hHwuQaW1I UE3essJZ5rwD/1DjwLAl7gan4uwC0F9a6dOc5Ml0jn3Y5plwZQXGEyZMvqVz5VfzM+NGcC6UsPt I8ZgcTMaCu0aJAd8uh1dgfNcD9TlKvPthWP5d67eZaLX3qad2yxbceHkVTe7na5rx5j0Ji+S/7e 8tI2CoBuJcm42dFLOEeErHlxY/XwyMjCf2zdLaeC6cvztF9vW0p/HhTxzNhWdhgkM0eAR03caV6 VoUSkPg55/TVrvtSw9mhCae+xjUHtyNHQn+EXcj1h/vkTYJ65fZZgTsQD4cFeR0Mv4aiCVlY0cO GOsubaijuYo5ygrXv6LeukaVh2nygQR5HGrSOdVq/t/tqyWSnV91019onuFFfxVCQpNieK9tRJE FB6rM3cY+Iorq3HgRgQ== X-Authority-Analysis: v=2.4 cv=D7pK6/Rj c=1 sm=1 tr=0 ts=69b88687 cx=c_pps a=UNFcQwm+pnOIJct1K4W+Mw==:117 a=xqWC_Br6kY4A:10 a=Yq5XynenixoA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=DJpcGTmdVt4CTyJn9g5Z:22 a=EUspDBNiAAAA:8 a=qvQf7nBXRcI791bLINIA:9 a=uKXjsCUrEbL0IQVhDsJ9:22 X-Proofpoint-ORIG-GUID: dFfI7fzXeUDjobTz3h0srPfcPgjHcR8O X-Proofpoint-GUID: dFfI7fzXeUDjobTz3h0srPfcPgjHcR8O X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-03-16_06,2026-03-16_06,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 adultscore=0 clxscore=1015 suspectscore=0 spamscore=0 malwarescore=0 lowpriorityscore=0 phishscore=0 bulkscore=0 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2603050001 definitions=main-2603160187 Content-Type: text/plain; charset="utf-8" If your compositor is getting starved for GPU time, it is useful to have a way to kill the current thing that is hogging the GPU. Signed-off-by: Rob Clark --- drivers/gpu/drm/Makefile | 1 + drivers/gpu/drm/drm_dev_sysrq.c | 67 +++++++++++++++++++++++++++++++++ drivers/gpu/drm/drm_drv.c | 3 ++ drivers/gpu/drm/drm_internal.h | 11 ++++++ include/drm/drm_device.h | 8 ++++ include/drm/drm_drv.h | 7 ++++ 6 files changed, 97 insertions(+) create mode 100644 drivers/gpu/drm/drm_dev_sysrq.c diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile index 0e1c668b46d2..337af859753f 100644 --- a/drivers/gpu/drm/Makefile +++ b/drivers/gpu/drm/Makefile @@ -44,6 +44,7 @@ drm-y :=3D \ drm_colorop.o \ drm_connector.o \ drm_crtc.o \ + drm_dev_sysrq.o \ drm_displayid.o \ drm_drv.o \ drm_dumb_buffers.o \ diff --git a/drivers/gpu/drm/drm_dev_sysrq.c b/drivers/gpu/drm/drm_dev_sysr= q.c new file mode 100644 index 000000000000..47e029b7cd0b --- /dev/null +++ b/drivers/gpu/drm/drm_dev_sysrq.c @@ -0,0 +1,67 @@ +// SPDX-License-Identifier: GPL-2.0 or MIT + +#include + +#include +#include +#include + +#include "drm_internal.h" + +#ifdef CONFIG_MAGIC_SYSRQ +static LIST_HEAD(drm_dev_sysrq_dev_list); +static DEFINE_MUTEX(drm_dev_sysrq_dev_lock); + +/* emergency restore, don't bother with error reporting */ +static void drm_dev_sysrq_restore_work_fn(struct work_struct *ignored) +{ + struct drm_device *dev; + + guard(mutex)(&drm_dev_sysrq_dev_lock); + + list_for_each_entry(dev, &drm_dev_sysrq_dev_list, dev_sysrq_list) { + dev->driver->sysrq_kill(dev); + } +} + +static DECLARE_WORK(drm_dev_sysrq_restore_work, drm_dev_sysrq_restore_work= _fn); + +static void drm_dev_sysrq_restore_handler(u8 ignored) +{ + schedule_work(&drm_dev_sysrq_restore_work); +} + +static const struct sysrq_key_op drm_dev_sysrq_kill_op =3D { + .handler =3D drm_dev_sysrq_restore_handler, + .help_msg =3D "kill-gpu-job(G)", + .action_msg =3D "Kill current job on the GPU", +}; + +void drm_dev_sysrq_register(struct drm_device *dev) +{ + const struct drm_driver *driver =3D dev->driver; + + if (!driver->sysrq_kill) + return; + + guard(mutex)(&drm_dev_sysrq_dev_lock); + + if (list_empty(&drm_dev_sysrq_dev_list)) + register_sysrq_key('G', &drm_dev_sysrq_kill_op); + + list_add(&dev->dev_sysrq_list, &drm_dev_sysrq_dev_list); +} + +void drm_dev_sysrq_unregister(struct drm_device *dev) +{ + guard(mutex)(&drm_dev_sysrq_dev_lock); + + /* remove device from global restore list */ + if (!drm_WARN_ON(dev, list_empty(&dev->dev_sysrq_list))) + list_del(&dev->dev_sysrq_list); + + /* no devices left; unregister key */ + if (list_empty(&drm_dev_sysrq_dev_list)) + unregister_sysrq_key('G', &drm_dev_sysrq_kill_op); +} +#endif diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c index 2915118436ce..c1f5a4ee6d58 100644 --- a/drivers/gpu/drm/drm_drv.c +++ b/drivers/gpu/drm/drm_drv.c @@ -734,6 +734,7 @@ static int drm_dev_init(struct drm_device *dev, INIT_LIST_HEAD(&dev->filelist_internal); INIT_LIST_HEAD(&dev->clientlist); INIT_LIST_HEAD(&dev->client_sysrq_list); + INIT_LIST_HEAD(&dev->dev_sysrq_list); INIT_LIST_HEAD(&dev->vblank_event_list); =20 spin_lock_init(&dev->event_lock); @@ -1102,6 +1103,7 @@ int drm_dev_register(struct drm_device *dev, unsigned= long flags) } drm_panic_register(dev); drm_client_sysrq_register(dev); + drm_dev_sysrq_register(dev); =20 DRM_INFO("Initialized %s %d.%d.%d for %s on minor %d\n", driver->name, driver->major, driver->minor, @@ -1146,6 +1148,7 @@ void drm_dev_unregister(struct drm_device *dev) { dev->registered =3D false; =20 + drm_dev_sysrq_unregister(dev); drm_client_sysrq_unregister(dev); drm_panic_unregister(dev); =20 diff --git a/drivers/gpu/drm/drm_internal.h b/drivers/gpu/drm/drm_internal.h index f893b1e3a596..164ff588aea4 100644 --- a/drivers/gpu/drm/drm_internal.h +++ b/drivers/gpu/drm/drm_internal.h @@ -67,6 +67,17 @@ static inline void drm_client_sysrq_unregister(struct dr= m_device *dev) { } #endif =20 +/* drm_dev_sysrq.c */ +#ifdef CONFIG_MAGIC_SYSRQ +void drm_dev_sysrq_register(struct drm_device *dev); +void drm_dev_sysrq_unregister(struct drm_device *dev); +#else +static inline void drm_dev_sysrq_register(struct drm_device *dev) +{ } +static inline void drm_dev_sysrq_unregister(struct drm_device *dev) +{ } +#endif + /* drm_file.c */ extern struct mutex drm_global_mutex; bool drm_dev_needs_global_mutex(struct drm_device *dev); diff --git a/include/drm/drm_device.h b/include/drm/drm_device.h index 5af49c5c3778..c6c0987dba36 100644 --- a/include/drm/drm_device.h +++ b/include/drm/drm_device.h @@ -246,6 +246,14 @@ struct drm_device { */ struct list_head client_sysrq_list; =20 + /** + * @dev_sysrq_list: + * + * Entry into list of devices registered for sysrq to kill current + * GPU job. + */ + struct list_head dev_sysrq_list; + /** * @vblank_disable_immediate: * diff --git a/include/drm/drm_drv.h b/include/drm/drm_drv.h index 42fc085f986d..8e9d5d597451 100644 --- a/include/drm/drm_drv.h +++ b/include/drm/drm_drv.h @@ -385,6 +385,13 @@ struct drm_driver { int (*fbdev_probe)(struct drm_fb_helper *fbdev_helper, struct drm_fb_helper_surface_size *sizes); =20 + /** + * @sysrq_kill: + * + * Handler for magic sysrq key to kill current job on the GPU. + */ + void (*sysrq_kill)(struct drm_device *dev); + /** * @show_fdinfo: * --=20 2.53.0 From nobody Tue Apr 7 01:16:57 2026 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (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 7DA4F374E59 for ; Mon, 16 Mar 2026 22:39:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773700749; cv=none; b=nWYo7wDM3Fm0zSr2TGftFpvCG7zMMYWuHN0Lu6Y/J86bEm04sN2SR0Xc+RPdvzMiocuKPjFmy8OShYkYX7q1PPoX1l+oQjLBBtypwUbJjUQ/u8c63lTLJvMT8LSuazbtRlFVPDgQ4WEMZdDfqchEmhcefV2oEky/FHQ3v6z1VtM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773700749; c=relaxed/simple; bh=Yhvgjs0biEc18D3h5Bmfm7+k+P+S2aEqL0rjlPXQ064=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=K9mPqQeEm3KqKqPoGCe+iQIA0fv6x7mj/z/b15IoExVYkvsYjv7blPJMjmplQctbxlHEfwLOD7WQLXHBpgJ85/O3TmnV7OIe0fUXe2GRkQxBvsPfYz3x9T5Dd3uyKNB1W7v3EO1wRqDB/2oPg68a1uOYNVstwjpvQw4Fonjh8EU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=WYeNt/Vz; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=cc+Bd3KX; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="WYeNt/Vz"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="cc+Bd3KX" Received: from pps.filterd (m0279862.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 62GGNRME3124546 for ; Mon, 16 Mar 2026 22:39:05 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=fsmwNOdowI2 irHmpBpqjFmGIGle+yKJW1O1LMz6nMl8=; b=WYeNt/VzlVl2SyKYh/sQcC2mT+z HiX7soshfCMz1QYooUs7E3nnt45s4tcWmVZ3mjXPCfghCBoLxb5xn6dAlc5hiT79 71W+wQ7jb3NDVoZ4k1kVkIAgdQ+WOkAFJXaChY8COo4+tZWW5DJnknMb9UlDXLQV 74JfPNtjp09SNeH8vcpUMdkDuqmVBuKB7Ix5mDwfxBZ+swXhM+wlEh7nUF152hv6 2nPlDzmbAgbnlQrHzGZEpdc76sgBFG4qxBhL9A/po9DjmUYJKh4QxzK8qhlH7v1O sdMSqQllrHVf6QNnusoOo7Y8x9FXiUjJErICbTQB3GNY3TwpGTUuWg4DSjw== Received: from mail-pl1-f199.google.com (mail-pl1-f199.google.com [209.85.214.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4cxfsmjhsm-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 16 Mar 2026 22:39:05 +0000 (GMT) Received: by mail-pl1-f199.google.com with SMTP id d9443c01a7336-2ae4b96c259so2415425ad.1 for ; Mon, 16 Mar 2026 15:39:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1773700745; x=1774305545; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fsmwNOdowI2irHmpBpqjFmGIGle+yKJW1O1LMz6nMl8=; b=cc+Bd3KXGX5lEWRnQxq7xjH15gVqa6M6JsGgt/M7hUv8bclViwdc7kLPa0ZGfPIdFR s1zE0IM0Ywgw6G/A9k0fgcwhvs5CYfe7oRZ1+8IYriD1aAnE4gBKr+CA1/vU+k79nHT8 Xh5BSUueUsndRur/fu5K8Zu5FmlTmIxUb5pOQxRfUEi+TTDiIqwDgZLevHlx+h7g5lT9 kMPTJXZczeOMRU8qg6u7YuZGBqLWuIG5EGV60etONaATSVCFA5ot2/oJ9CCnEDuc9I3I aDf6M3TMfI3obVf483dEsz2dPNOHgMPW3LPBJnmuBJBSRdLi+F61fb6g3vMLpexkAyba veMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773700745; x=1774305545; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=fsmwNOdowI2irHmpBpqjFmGIGle+yKJW1O1LMz6nMl8=; b=Wh+Vl8Ue7I0ZbrYK+dGWsFqXwwk2L6xDRrpUbB5Iwv0bjRXJxgBtwhfw/SSi17QRwV VwNsENNElFAUKVQqSS+C5nxh2+ZWzY8D/zY4PLI4ZgkVi6Mu2O+Z2OEiOvTOV6pOz3kx 6cKOMoV9XQfX9DOOdtUgOt0IVfGcRmcU0Qgw1tVmLMMhV2nqgmXfYw+Bbt+48ghbtVUP pcskEntWrRxmUof4yKKNyOyAcOPDk5talYrK9MnRWv71HRRw9SQdURHY/+ZlhMvyy6aW 6gk4Rvb9xnrmSiBSFvEy7ODiZeWAxU8l54dlLDjPNmUGp0hd84/zru5iXcGLpop7WlyE L9hw== X-Forwarded-Encrypted: i=1; AJvYcCVURVw5gQlOctFHDPzXi9FQ8lrPkKFLXtl8YzY5MOY48jZpFk4zoGNW6C3hyiwD2ewfaDE1ppgmDbeDMsY=@vger.kernel.org X-Gm-Message-State: AOJu0YwHego1hfIf+YXC/gHlhoRrCLnuI+rhS4vhGCeYvIDrmnM5J3if j4U0zi8iQZUMZ4XSPMWxoxztQQHelvwe15TDNNSub+hiiWDpEodp/ihK/yNvGbvMpnQUGzKNHON f09cSq01H/duCdeHr3qnYfswfHMz+DJVLuLbOHBjkYEjnkowQI5K2TDEw2koORuMzuNY= X-Gm-Gg: ATEYQzzbWq728lDVyZgqZNSVejLPlVmrt0ZeuEVnMej0HjFixr29yVgDsgVwPPy+oGm TnFmxqVpWG8++7W1O0yh/NWN3G0v58yVYJEnagdmIFbpRZ9B6E4EhzLPutGZQ5lWFNFuxE/wBSk hbbDu+8Yv7aWxLlWr8vcaCt7if3Ra8DLrGVQf5Z2E955enDKvNOl0WrjgKhL8yTOoe8js4DW6ON At9UPiEpWl2m7IVcm3xnp7dJL5pz0utQf3PSmpyK3Z5dLU+hN7OU7Yqjyhha8XO9w2/uCEehBSp KczntejWQTusXzVVwZQP2d0ICC4qXm8HU1tVD0hmGmovSwgnX4S3xpAdeNWjJ2KDXHYgX7CC6YS wPCWYhs1S9/A5eiFtDKaBgNKKtNqODrVB X-Received: by 2002:a17:903:283:b0:2b0:4fb3:c771 with SMTP id d9443c01a7336-2b06357ea62mr10456685ad.6.1773700744820; Mon, 16 Mar 2026 15:39:04 -0700 (PDT) X-Received: by 2002:a17:903:283:b0:2b0:4fb3:c771 with SMTP id d9443c01a7336-2b06357ea62mr10456475ad.6.1773700744288; Mon, 16 Mar 2026 15:39:04 -0700 (PDT) Received: from localhost ([2601:1c0:5000:d5c:4ec8:83f5:8254:6891]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2aece7edd1fsm152594935ad.47.2026.03.16.15.39.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Mar 2026 15:39:03 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Konrad Dybcio , Akhil P Oommen , linux-kernel@vger.kernel.org (open list) Subject: [RFC 2/2] drm/msm: Add sysrq_kill handler Date: Mon, 16 Mar 2026 15:38:50 -0700 Message-ID: <20260316223855.711574-3-robin.clark@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260316223855.711574-1-robin.clark@oss.qualcomm.com> References: <20260316223855.711574-1-robin.clark@oss.qualcomm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzE2MDE4NyBTYWx0ZWRfXws1vj29/2bdu ZCRbw4Ud20JZsx8H7nxG0paWH1MWuFkqAEuyiOhVNy1lwYHRsQq9AjfEkxxK8G+uVKwNxLXu9dd 1IZIJ3xZyW85pi0gVbdir5vwM7yNE2w5o4erfszKlwa0wPE93BXBxQjjr2H0vxliNKDp3qFKo7b 8+1NB+BB5lAE60jWbJt3w6/0KO4brVA/voLzXQvoHypJJr01IazQc5ublwdBusd4W/nbUCbsXrk NLyB4YURGrowWKydZ92duGucblJT48U/VQiLyCI0+nHAP25m6r7FkWXBeWMT5cP7OWZKJGsimFK r0IWKzryqWHUBvtA56Qrep0Ee9MONcF5sB44PF9mZdK4wbwODfygCAKdJlGnAcsy8P2z6EdtGxZ XjkytgNzfl3QWhfvqSelPo378ZKqyc5+VgFiq/sVPHlsocc3rb2O102ddQA5ucfZ8I5Db8zVFqW 2KqZqMpFd2hagaFNkEA== X-Proofpoint-GUID: tEGxOngmtt1vWVcH9IuUxJvrgyOQ3Fxs X-Authority-Analysis: v=2.4 cv=V/hwEOni c=1 sm=1 tr=0 ts=69b88689 cx=c_pps a=JL+w9abYAAE89/QcEU+0QA==:117 a=xqWC_Br6kY4A:10 a=Yq5XynenixoA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=_K5XuSEh1TEqbUxoQ0s3:22 a=EUspDBNiAAAA:8 a=s7vrW_VSA_84OnxZi_AA:9 a=324X-CrmTo6CU4MGRt3R:22 X-Proofpoint-ORIG-GUID: tEGxOngmtt1vWVcH9IuUxJvrgyOQ3Fxs X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-03-16_06,2026-03-16_06,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 impostorscore=0 malwarescore=0 lowpriorityscore=0 adultscore=0 priorityscore=1501 clxscore=1015 phishscore=0 spamscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2603050001 definitions=main-2603160187 Content-Type: text/plain; charset="utf-8" This does the same thing as an immediately expiring hangcheck timer. Signed-off-by: Rob Clark --- drivers/gpu/drm/msm/msm_drv.c | 12 ++++++++++++ drivers/gpu/drm/msm/msm_gpu.c | 18 ++++++++++++++++++ drivers/gpu/drm/msm/msm_gpu.h | 1 + 3 files changed, 31 insertions(+) diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c index ed2a61c66ac9..ac04d83724b9 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -812,6 +812,16 @@ static void msm_show_fdinfo(struct drm_printer *p, str= uct drm_file *file) drm_show_memory_stats(p, file); } =20 +static void msm_sysrq_kill(struct drm_device *dev) +{ + struct msm_drm_private *priv =3D dev->dev_private; + + if (!priv->gpu) + return; + + msm_gpu_sysrq_kill(priv->gpu); +} + static const struct file_operations fops =3D { .owner =3D THIS_MODULE, DRM_GEM_FOPS, @@ -846,6 +856,7 @@ static const struct drm_driver msm_driver =3D { #endif MSM_FBDEV_DRIVER_OPS, .show_fdinfo =3D msm_show_fdinfo, + .sysrq_kill =3D msm_sysrq_kill, .ioctls =3D msm_ioctls, .num_ioctls =3D ARRAY_SIZE(msm_ioctls), .fops =3D &fops, @@ -885,6 +896,7 @@ static const struct drm_driver msm_gpu_driver =3D { .debugfs_init =3D msm_debugfs_init, #endif .show_fdinfo =3D msm_show_fdinfo, + .sysrq_kill =3D msm_sysrq_kill, .ioctls =3D msm_ioctls, .num_ioctls =3D ARRAY_SIZE(msm_ioctls), .fops =3D &fops, diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c index 995549d0bbbc..6b1c284ad631 100644 --- a/drivers/gpu/drm/msm/msm_gpu.c +++ b/drivers/gpu/drm/msm/msm_gpu.c @@ -673,6 +673,24 @@ static void hangcheck_handler(struct timer_list *t) msm_gpu_retire(gpu); } =20 +void msm_gpu_sysrq_kill(struct msm_gpu *gpu) +{ + struct msm_ringbuffer *ring =3D gpu->funcs->active_ring(gpu); + uint32_t fence =3D ring->memptrs->fence; + struct drm_device *dev =3D gpu->dev; + + if (fence_before(fence, ring->fctx->last_fence)) { + DRM_DEV_ERROR(dev->dev, "%s: sysrq kill job, rb %d!\n", + gpu->name, ring->id); + DRM_DEV_ERROR(dev->dev, "%s: completed fence: %u\n", + gpu->name, fence); + DRM_DEV_ERROR(dev->dev, "%s: submitted fence: %u\n", + gpu->name, ring->fctx->last_fence); + + kthread_queue_work(gpu->worker, &gpu->recover_work); + } +} + /* * Performance Counters: */ diff --git a/drivers/gpu/drm/msm/msm_gpu.h b/drivers/gpu/drm/msm/msm_gpu.h index 666cf499b7ec..07abbe33d992 100644 --- a/drivers/gpu/drm/msm/msm_gpu.h +++ b/drivers/gpu/drm/msm/msm_gpu.h @@ -696,6 +696,7 @@ int msm_gpu_perfcntr_sample(struct msm_gpu *gpu, uint32= _t *activetime, =20 void msm_gpu_retire(struct msm_gpu *gpu); void msm_gpu_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit); +void msm_gpu_sysrq_kill(struct msm_gpu *gpu); =20 int msm_gpu_init(struct drm_device *drm, struct platform_device *pdev, struct msm_gpu *gpu, const struct msm_gpu_funcs *funcs, --=20 2.53.0