From nobody Tue Apr 7 03:52:38 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