From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.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 3AA7633C502 for ; Thu, 4 Jun 2026 20:10:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780603819; cv=none; b=ZIs+pNdm6JgaeRPgGueOB/X9TshREtlDj+Ax8SkfTuhzjoE8oahmf6hQ84bTechU6n71AIRXKkdwLRXBdqxYI4keXjvbkeCVKJHpvfn7FHVw/pIq+Yt1BxbjYS/8JYyfzAAkCskErfDMINXFk5uQlRq92pNZAL7vHhZgUwUtvpg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780603819; c=relaxed/simple; bh=EVHNeRZOgXVAU+U68Pm5LEIL/hpQq55cLxn5qLgvDcU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=qXgmeMIi5Oulzf2sTBbNj+JO+9J/pydnvPhA6Oqdg4emZJGcWr2GQjLHzr5yBzS4R9J+zdVmjTxy8/AMbJENkvlgN1e5KVn4wmVYIcSm//JeRFKjZG6y9CxxNPKJjPhrF01fj4GXqi0Yck38xx9nl9xPUo94axhH6+jWjFqPgds= 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=Vh/Hkonu; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=EpgWgyk4; arc=none smtp.client-ip=205.220.180.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="Vh/Hkonu"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="EpgWgyk4" Received: from pps.filterd (m0279870.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 654EUTnt141926 for ; Thu, 4 Jun 2026 20:10:17 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= ilxmFuDlZLO8catcEmMGA/pntCC0AnEtroDNREYCuIg=; b=Vh/HkonuWet9ZMa1 vZ90B1nQn4A3WwXoc+N+wGPagdxZzVZe+CP5DC12bSCEDNcHXcwH99K9Ii7SWkEk GDKVJbnmchm/DH32w4tveLMTsj9Yo4SW23vCP+F6L1iXuolt2P+EMRqTk8jCS+I0 INe3n1dB7qZqQW4nC+TzrmfznLhPi2R9pr2qQ+cXM8LpctQknLs3WXSFLtg7hYwf D60W4kVKRQ6HchOVecl9IrHYCwJmsVRq4+4F/JvRHMfabuQKPGlntuH1KaQPQEVP oUBu3Y9bxwB9rqPbprERVcI16P1cEB9j0DJCH8tZzthJOPlnQv1krjyhclHh6q7/ BN5phg== Received: from mail-pf1-f199.google.com (mail-pf1-f199.google.com [209.85.210.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ejyencfqg-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 04 Jun 2026 20:10:17 +0000 (GMT) Received: by mail-pf1-f199.google.com with SMTP id d2e1a72fcca58-8425a9979e1so724883b3a.2 for ; Thu, 04 Jun 2026 13:10:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1780603816; x=1781208616; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=ilxmFuDlZLO8catcEmMGA/pntCC0AnEtroDNREYCuIg=; b=EpgWgyk4IYy15jGXXle8COwIp4Nxb5RMnxQ4keuBxHRgnCDEL2djauZq2N8JyXSGN0 Di5FuD+vENu7pR9FUKoQ0T+2UkC/StFbXEC2XDNRu/2h0vcSzjUWuBdMJ8qiIerBs31j 4b5FWfObrUiSnUey+R3L1vngLaM3g2HSw7ZNtUy0c9odBONXph4xypc6qX7fG0V2Zo+B ub/stb+kwkY2zkMcxOlZPuMdQbbOQKIvVRqJLKnrXNcoB5u3h64NIyZvu4JjfVCj8a2E fbFIffBqaDVnMkv5wrV4r1CnzQ9020H9+hYim+7vMb3G6EVuPR0UR3LXLhr6eF8t/ozz Unew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780603816; x=1781208616; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=ilxmFuDlZLO8catcEmMGA/pntCC0AnEtroDNREYCuIg=; b=RMPySZFyg1Dgetg8zoGQmsNWhpROcLCtojZN2Aay/JkWLCaVc5/1ERV31p8M6rrm4c uzcV8O8OjlDgW5ioKNDqqQ3J6BGsdVF5bxF5XPy1iBB1n5nwrU8vLqJNYSAnu3DtG0Wp s6Ejh8GF8ZuPRdVOCaTedaE8AiOGBdGAC0Bu492OtKC59i7ml21Ax3aOt6LIT6MdnPeC YaZRWWkkunnsHGGLYwC0WGcEBs87qx62vjC31I4LZE5Zb8xNwiCwdt1RSxImfXrvYvK+ kqkusRcmDNueG7iBsjLW/z2p6zKNvM6CbdPl93Ls81NHW7CVjgsP2s7MuXI/B8oKf17y /Lxg== X-Forwarded-Encrypted: i=1; AFNElJ8vYLtgbXP6akNrJkNCuTimonyM5P/QrDQjJtckgVHRV1SW10KI7YTEj/k6NDtN7FD5s0lXT4YNNVvpfCk=@vger.kernel.org X-Gm-Message-State: AOJu0YwKK2255fko729E0OMm2Me9Zg4ROBYaU2CDcYqC/qNYKeDwNExQ HmMJCtReqTY8ba231pso68EkcgPhnq1SHutm5a7UWCRsB6QVezTKrD7Upi/Q0KRxAr7wZsfgBXj vnmwgdCnMXc7Dgp0sYmB3ggtArK/stb7oO4P1Q4vaDGaqL6uO1OuVtVYrFSOtCY8qQfsNi8rMn+ o= X-Gm-Gg: Acq92OGs+dBzBWQQr5zPSauGuC55HZMQQ0/tNF+qJTsS3xQSoPBbP9mJv4/Ib0XDaRY cW8PGa+2L5jLar7G+Wsl6H+JE8Qzxi6zReu9dOzUFjfMcaORuqwnUFcZhUamBnS32K8JsHNedkP vyb/KFjuF+oMSHff7FySc909Z3gGnYPApxsSaNiGqsIwJiLaHOCVY5jr5DU9+21SYpmtG6hMMbi iKVR9zDf+rYbSP0Ow6gZDN0m/wAjpR5ZLXwQfn8Q904is/JtCZ7VjKHS+pogVQOV4+WJ1CWrVF3 zgbVkFWt5KZlu2aGpaK7uDY1+DfKqIlhkebxAxst6CQvWfybFymgSXMeyBLc7aNhY297fGWXNKk pkcXIh6pTO+WOHQvoNu3hygjZ2jJ7ZIrCP0wf6FhMdQ9k8us34WE2Te+u X-Received: by 2002:a05:6a00:bc81:b0:842:5a18:9af4 with SMTP id d2e1a72fcca58-842b0efb8fbmr208269b3a.18.1780603816370; Thu, 04 Jun 2026 13:10:16 -0700 (PDT) X-Received: by 2002:a05:6a00:bc81:b0:842:5a18:9af4 with SMTP id d2e1a72fcca58-842b0efb8fbmr208229b3a.18.1780603815857; Thu, 04 Jun 2026 13:10:15 -0700 (PDT) Received: from hu-akhilpo-hyd.qualcomm.com ([202.46.23.25]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-8428290067dsm6721425b3a.53.2026.06.04.13.10.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Jun 2026 13:10:15 -0700 (PDT) From: Akhil P Oommen Date: Fri, 05 Jun 2026 01:38:18 +0530 Subject: [PATCH 2/6] drm/msm: Recover HW before retire hung submit Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260605-assorted-fixes-june-v1-2-2caa04f7287c@oss.qualcomm.com> References: <20260605-assorted-fixes-june-v1-0-2caa04f7287c@oss.qualcomm.com> In-Reply-To: <20260605-assorted-fixes-june-v1-0-2caa04f7287c@oss.qualcomm.com> To: Rob Clark , Sean Paul , Konrad Dybcio , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Marijn Suijten , David Airlie , Simona Vetter , Puranam V G Tejaswi , Jie Zhang , =?utf-8?q?Ma=C3=ADra_Canal?= Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Akhil P Oommen , Jie Zhang X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1780603799; l=1149; i=akhilpo@oss.qualcomm.com; s=20240726; h=from:subject:message-id; bh=sCyhvltmN32cvMyVIs4m/if40/Cj5ebIU1UMeNNMVWo=; b=dhPyHwxuQ2yTZzxERFHZWt8Iw4FNwVHUnlfxMyfMHEXDatrPKhl7skcv2878t4g440BzWIJnX QyOLU9xFtMOD3PE8zqUgAeW7aobGJ82pjOLAe/74FKjjRAR/v7NKWPv X-Developer-Key: i=akhilpo@oss.qualcomm.com; a=ed25519; pk=lmVtttSHmAUYFnJsQHX80IIRmYmXA4+CzpGcWOOsfKA= X-Authority-Analysis: v=2.4 cv=JaSMa0KV c=1 sm=1 tr=0 ts=6a21dba9 cx=c_pps a=WW5sKcV1LcKqjgzy2JUPuA==:117 a=ZePRamnt/+rB5gQjfz0u9A==:17 a=IkcTkHD0fZMA:10 a=FelO9ux0wxsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=gowsoOTTUOVcmtlkKump:22 a=EUspDBNiAAAA:8 a=-HvVqG6-LJ5utcurNgEA:9 a=QEXdDO2ut3YA:10 a=OpyuDcXvxspvyRM73sMx:22 X-Proofpoint-ORIG-GUID: 2jSVJzzCVjmaaST9XUFowFMJdxrS6D5m X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjA0MDE5NyBTYWx0ZWRfX9YS4tjADo2vX gXugnQE7Fc/AGG8Gc4AxA/F7pDSKqpAvXXzNnu7O7Nlri73gLP7OsbhKj9To0fHti/Ho+gQu4+A rmwRt3TQiQ27BDTMLlm1JiSvX4HcUD+wqJH9yGL6S5FxZZzIABzRUdbOE6fqG/y8sb7z1ZWoVj3 B+TcqXG+hLa3ZHCKB9A4e9DPqPDJvbySytAGzL/86mj433SCYY1DkIPIXHcZ+LeUwaJeXNNdsCP NRv8gxM/Z394Rx8eDFIAdH0cgjM17Ld6VEJZS0sEdymlppI3VNYgR0hZyk1lPiDHkGwkSLmmBq4 vta+3xOmepGuevstlrq848qvab0DNxmkOv6q7IoLYi1jVuVxMJk1NhB03q+ocRZTiIRswIadPNP NN5R4C3LHFlPpC/ZKvZ0n64GRKP5p8qhKgxThjHkJaZVxmoC/EqvO4XNbsmgWQ0UQ/b9IbY5QhE 2xXLaogpFMrc7YkROdg== X-Proofpoint-GUID: 2jSVJzzCVjmaaST9XUFowFMJdxrS6D5m X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.125,FMLib:17.12.100.49 definitions=2026-06-04_05,2026-05-28_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 phishscore=0 bulkscore=0 adultscore=0 lowpriorityscore=0 suspectscore=0 clxscore=1015 malwarescore=0 priorityscore=1501 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605210000 definitions=main-2606040197 From: Jie Zhang During recovery, it is not safe to retire the hung submit before we recover the GPU. Retiring the submit triggers BO free and that can result in GPU pagefaults since the GPU may be actively accessing those BOs. To fix this, retire the submits after gpu recovery is complete in recover_worker(). Fixes: 1a370be9ac51 ("drm/msm: restart queued submits after hang") Signed-off-by: Jie Zhang Signed-off-by: Akhil P Oommen --- drivers/gpu/drm/msm/msm_gpu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c index 18ed00e5f143..9ac7740a87f0 100644 --- a/drivers/gpu/drm/msm/msm_gpu.c +++ b/drivers/gpu/drm/msm/msm_gpu.c @@ -552,11 +552,11 @@ static void recover_worker(struct kthread_work *work) msm_update_fence(ring->fctx, fence); } + gpu->funcs->recover(gpu); + /* retire completed submits, plus the one that hung: */ retire_submits(gpu); - gpu->funcs->recover(gpu); - /* * Replay all remaining submits starting with highest priority * ring -- 2.51.0