From patchwork Tue May 20 19:08:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Connor Abbott X-Patchwork-Id: 891338 Received: from mail-qt1-f180.google.com (mail-qt1-f180.google.com [209.85.160.180]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8D93C2701A0 for ; Tue, 20 May 2025 19:09:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747768143; cv=none; b=ufK7OxWcOWoVcmGyFavEXEu/n+hiQT93q3YUhtrPkGFs6NOzZBFjbXUovHeuyFpBuKk8vWyVt9A7r14VB8lWRGPb/nhzdWzQCrn27mPiUzwib694XwrE/cX4sN/ZfohE/3WrCHambFVfxstGo1VlidLcLmYSTP43ugl4WOVAeeY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747768143; c=relaxed/simple; bh=ZBvYKn5K11+lNsz4zT1zMYa5IeR/X4du0GnqkshS5cY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=XWkhhQX79QtOs16h0rRe9XhXi8LUUZCtr43wLRwlkQDIPpx3HteqkWI8oAH9L4GFLvVKvN3znL5AimUdvvgCdnCj5yToo/wKs5ybO/L5FYBVm/mJWQjtGA1S0Vy7teZUtyqbTZeDEywK60UQ2IFV3GgysTz3cCVVRQPEfDkZmP8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=VF78do8q; arc=none smtp.client-ip=209.85.160.180 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="VF78do8q" Received: by mail-qt1-f180.google.com with SMTP id d75a77b69052e-47745b4b9aaso11537141cf.0 for ; Tue, 20 May 2025 12:09:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1747768140; x=1748372940; 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=lvaowTnmN7oLC96D2HQ8Iw/m6LXgQG1UkyHMoTmfSNI=; b=VF78do8qSEfEPP2ASD+3uEpJNGt3vD7doXcjFAf8GAdg8d0P+tslmoX5AuYGT8x2W/ U2eYRHrW6gP/UguTCJUCpB/EZLKzVT3lPDJwC8NGfrUXFW/zscmusCshfaXvMQEf61ir dbkoiJQSYXqNW2dMP3IHLv0nlzmp41oU5qHi8EQOulaC8Dj6xMD9OdNSzZDwoaU2iQH5 gtNGT117wCIYNKya0GlE/rEVk0K7JYE4+Mlp/uUJ8YEzL3zOY7psQbesnhdBjIevh1tM LXhZv5hW0T/PgThRF4kDu3cHICuIZ1oDxiLGVJKlg5mYz/Qw3bAt50xJ53CSZPb2Tzy8 bvoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747768140; x=1748372940; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lvaowTnmN7oLC96D2HQ8Iw/m6LXgQG1UkyHMoTmfSNI=; b=KdWM3BmQAjBEu8avsWbfZyWNvPum5tS802atB1Ymza9nwSEc0AQTUEuSuCnIVH5JKi BYZ9XDkgAVpKxDo6ZQYAy2YuvOT6qzBWKVNVGQK7dSL0k+gsaNtcb2m/QvNNRfxbqCEw wA+nU4+sQwEpo2DcqF8zG9NprwyzT+sYHzkA3dj4Fxps+CiJQeiBwBRycyQdsIYjtmxq ACiVpJ8xt1dyu9XsmvydDBgmmBzNTt23fJic/aEx2P1OLdAlg8oCJpV/g2saqjk0mk/q KaweUgMQ0bZSlO6EL2V81P2mbiNLg3E/iXjb3IvCsWt06cbAQYrRVixetYsbot/+R7Tp vFIA== X-Forwarded-Encrypted: i=1; AJvYcCVLm6T9otU1LfCcaJRfgProHqfCCIaQQ0ZX3etXmhagR8q3ALs9OKTLScnj5G2OnoxIqFgXKtKxYHp+zHXg@vger.kernel.org X-Gm-Message-State: AOJu0YwH+Hh69VHgyOF8I/sOa9dMkw8tge1MVlxtgkxVsmj3iF5gLNwH uTRV2JQ590xXkXoqn/lyB4Sfsgk+kToIwbGznOCDXjHm68R6RFA8OQua X-Gm-Gg: ASbGncthUoC8SKhmbP949SSsAJvmy+BbwJDyml0znLGvxmoDcwaeA+7egd7X8fomvzO N5lShXmkCcItWHI3/9uiLVmiOfwkzuifMPuK0wIjCnmtv/piwOVk8dSQI5jaui1C3yGaYvUzkas lzC1NXyI2mwsE1JuRFp6ksDKqB6fXKlER7ZAj/Fh79442TuYp7M1YKDWYJfLI0G5y+jPQeJXTKP jkpUjzyPcCnp9kDCZyytKxhs2/KYa5zGEWFrnwOv9kFS2LaoPpfgYT2bN/Gj7J3OR1c86IAchui V+zfQNko560049ZbCQ9dJYdCj+uwbFui0omtGuFxmVBztiHw3LXIK2/sSu5emN0i0Q2kIXOYmEN QRRZCW9m+tyGrxt05uNbZySKiYhVsDg== X-Google-Smtp-Source: AGHT+IHrhoVKr8ZuMW3LLmVacxqlRwznTBlrPPx7593+XpI6zjzFhRF7/0TUgT772pugTudEsg+iFQ== X-Received: by 2002:a05:622a:22a4:b0:494:b869:ac06 with SMTP id d75a77b69052e-494b869b287mr85977441cf.6.1747768140371; Tue, 20 May 2025 12:09:00 -0700 (PDT) Received: from [192.168.124.1] (syn-067-243-142-039.res.spectrum.com. [67.243.142.39]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-494ae445b99sm76554051cf.48.2025.05.20.12.08.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 May 2025 12:08:59 -0700 (PDT) From: Connor Abbott Date: Tue, 20 May 2025 15:08:54 -0400 Subject: [PATCH v8 1/7] iommu/arm-smmu-qcom: Enable threaded IRQ for Adreno SMMUv2/MMU500 Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250520-msm-gpu-fault-fixes-next-v8-1-fce6ee218787@gmail.com> References: <20250520-msm-gpu-fault-fixes-next-v8-0-fce6ee218787@gmail.com> In-Reply-To: <20250520-msm-gpu-fault-fixes-next-v8-0-fce6ee218787@gmail.com> To: Rob Clark , Will Deacon , Robin Murphy , Joerg Roedel , Sean Paul , Konrad Dybcio , Abhinav Kumar , Dmitry Baryshkov , Marijn Suijten Cc: iommu@lists.linux.dev, linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, freedreno@lists.freedesktop.org, Connor Abbott X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1747768138; l=2173; i=cwabbott0@gmail.com; s=20240426; h=from:subject:message-id; bh=ZBvYKn5K11+lNsz4zT1zMYa5IeR/X4du0GnqkshS5cY=; b=ViPeijvXoIUFv2QAC6sXPESomfVyzJ6s9UWCJTU2K3EndiqfiDH0VcJPIhmS25TOOhh6IVZsY tWgr3r9EDqOCOO+X64zLIEayNFmirrauIr4/BJjbDt38yQUW2T81wXA X-Developer-Key: i=cwabbott0@gmail.com; a=ed25519; pk=dkpOeRSXLzVgqhy0Idr3nsBr4ranyERLMnoAgR4cHmY= The recommended flow for stall-on-fault in SMMUv2 is the following: 1. Resolve the fault. 2. Write to FSR to clear the fault bits. 3. Write RESUME to retry or fail the transaction. MMU500 is designed with this sequence in mind. For example, experimentally we have seen on MMU500 that writing RESUME does not clear FSR.SS unless the original fault is cleared in FSR, so 2 must come before 3. FSR.SS is allowed to signal a fault (and does on MMU500) so that if we try to do 2 -> 1 -> 3 (while exiting from the fault handler after 2) we can get duplicate faults without hacks to disable interrupts. However, resolving the fault typically requires lengthy operations that can stall, like bringing in pages from disk. The only current user, drm/msm, dumps GPU state before failing the transaction which indeed can stall. Therefore, from now on we will require implementations that want to use stall-on-fault to also enable threaded IRQs. Do that with the Adreno MMU implementations. Signed-off-by: Connor Abbott --- drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c index 59d02687280e8d37b5e944619fcfe4ebd1bd6926..4d3b99babd3584ec971bef30cd533c35904fe7f5 100644 --- a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c +++ b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c @@ -585,6 +585,7 @@ static const struct arm_smmu_impl qcom_adreno_smmu_v2_impl = { .alloc_context_bank = qcom_adreno_smmu_alloc_context_bank, .write_sctlr = qcom_adreno_smmu_write_sctlr, .tlb_sync = qcom_smmu_tlb_sync, + .context_fault_needs_threaded_irq = true, }; static const struct arm_smmu_impl qcom_adreno_smmu_500_impl = { @@ -594,6 +595,7 @@ static const struct arm_smmu_impl qcom_adreno_smmu_500_impl = { .alloc_context_bank = qcom_adreno_smmu_alloc_context_bank, .write_sctlr = qcom_adreno_smmu_write_sctlr, .tlb_sync = qcom_smmu_tlb_sync, + .context_fault_needs_threaded_irq = true, }; static struct arm_smmu_device *qcom_smmu_create(struct arm_smmu_device *smmu, From patchwork Tue May 20 19:08:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Connor Abbott X-Patchwork-Id: 892017 Received: from mail-qv1-f49.google.com (mail-qv1-f49.google.com [209.85.219.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2950B27815B for ; Tue, 20 May 2025 19:09:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747768144; cv=none; b=FoCzSZm+Qs1yEQOTGkKk0/tgxPN2VbpKCEEAwkqByykGfd8Ri2xk8qQ2yFoyQRfJjWMljQNPJ9g2v4hVApStUgz8vFS17e52NNl4l3CIyAKNTjlY6cczaypOiEH7d0Uf0E18K19SkOl6NCQzUvcWPRQWpq7Lplii0vBPdxUr7eE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747768144; c=relaxed/simple; bh=xmVtxKp7l1nH9HRMvlhp+AXA8iIyclW4FjVkhjfpiJg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=dF8I0YCy8AC11HYJ9UaSoY4STEo0uGO8X2FfNBIxeFKGyB8U0Bvz3JlNUzOFPB19pllnb4xyEXrPyLNHnkrnzV0jVpgyu5HJOIHyH2RHa+2TeuTwOa5fkjG2cOvuRAplqixpbI4fRlRW/MRXXdth+VJkgTfHbae4+OeEGqyEZak= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=FwColbzL; arc=none smtp.client-ip=209.85.219.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="FwColbzL" Received: by mail-qv1-f49.google.com with SMTP id 6a1803df08f44-6f2b58f0d09so8847356d6.3 for ; Tue, 20 May 2025 12:09:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1747768142; x=1748372942; 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=Ii8Ima0T9o2vsm/Kvny8YHfjV8PP21HFA5Cwpdauwc4=; b=FwColbzLglaYHzf6Qz9wu/K3SdGiE2vaCd0k3UcvvBzZ80d7tUudwvSs8AbBxT1RUA 2ApZ+DbrJCJc1RQcdUjUc+KrSIQXOOKtMEY+mqLmLILhPk7EAu56RY1t7nV0eyZbqLRo 5zCLajqPLyDrZsi86//SB1K5247F2yWSn0fVLguSK6EWQPbqAGJkccg6933oo27oW8IK O0iHVr3+Z/jnqQHEEzm2dvybHlNMejCAUvJPRmeQOGMDAx4vk+XUkF5MCxBJhXHKh20J OS749VXvBGWDFlNvdzXTeZgoXxCsa54Aif2ma2GhvG3Zaf2SDyc5WEzV1s/V2GeV5XqK i6Hw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747768142; x=1748372942; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Ii8Ima0T9o2vsm/Kvny8YHfjV8PP21HFA5Cwpdauwc4=; b=mAYIYgBRjmdriMKbO/f1VStWJTTuSEPuXUWdNc7ZM+0eedK1h41aGv+d+LRHgY80Gp x9gH/Cyh1LXF70BmsPrkzhwUOHWlQ7A1hWedNHigWUSvEfPjXvY+L8nHkaZ5q2nrL43H sPtaToI+Y+HHLIvw+9eC+0zTz8q37Vl/acPbCYIZYamaC1hzRshzWjJlk0q6yFQAfdue VwGtsA8vBMuudQ5azPz/8mop/DAoyr7WfKkNe3czpq/G4pc9BrR1AZxZ4Hkjbd13P2BI 2ytII1KHvx3QB0TwjrzqELnL248RNQh6UfkgvmSGKF3rRjQWLcMbyTuCTVqG+4ClKQeZ xU6g== X-Forwarded-Encrypted: i=1; AJvYcCUJP3nQq89zJw3Y4usbNRq+t2htksFE5p3tPVkCyrCMvlv+voTREYT5t9j3LRDRSpauUL4YpkEihTZMYKLV@vger.kernel.org X-Gm-Message-State: AOJu0YxyaIrHb/5xTpszCWH4HLtXE8J//I1yIdTSiS9ZY9Tm3N+zz6gf R8fculRS9ONGuh+hn2ZvI//rHi7bNTtZd+LmP2089stzBDci9m+JpeUx X-Gm-Gg: ASbGncuYqMOIQ2S+lDdu4+P5MMJ1w8v5MuJa1tw7IpR3Ul5EXFRDWa95coW74UyEHB1 JmXqjTLfJVOrf8N1ADTyvrlcmcATtd5AYSRo4cYYkzdX46t9pvKCT4oUHkVgPppJBhxQV9XJiSS u/d6ctWt8Ce79pc4o2KOxwA8hDveaAtIbKCb2Mixf+6q+GvWrNMGDl4eSR5eDE8hJZb4zATJGwD 4RhMdXE3MarlZVAmrh4hDwLVHfuXwWa0LS0FVRCt3qPfJ4eWUcrxenDBDnxNVLoxG0DRZICtuV+ qMSaLImdJeH7L2bl2iQUzr59q7DbmPNPvKSX2tj2j0rTiBnIzl9Wwe4CI9mYEc1LcL17vhFVySD abxHNDqo/bj4QbS42mwc= X-Google-Smtp-Source: AGHT+IFjLmYqaKLHPS+01zHa2///cFu/CXjL/ulMSueMZ2cjR11HyScFFNVGZ0K50+a/0b0pvW5/Nw== X-Received: by 2002:a05:622a:1444:b0:471:ea1a:d9e with SMTP id d75a77b69052e-494ae3f24abmr103477651cf.12.1747768141896; Tue, 20 May 2025 12:09:01 -0700 (PDT) Received: from [192.168.124.1] (syn-067-243-142-039.res.spectrum.com. [67.243.142.39]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-494ae445b99sm76554051cf.48.2025.05.20.12.09.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 May 2025 12:09:01 -0700 (PDT) From: Connor Abbott Date: Tue, 20 May 2025 15:08:55 -0400 Subject: [PATCH v8 2/7] iommu/arm-smmu: Move handing of RESUME to the context fault handler Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250520-msm-gpu-fault-fixes-next-v8-2-fce6ee218787@gmail.com> References: <20250520-msm-gpu-fault-fixes-next-v8-0-fce6ee218787@gmail.com> In-Reply-To: <20250520-msm-gpu-fault-fixes-next-v8-0-fce6ee218787@gmail.com> To: Rob Clark , Will Deacon , Robin Murphy , Joerg Roedel , Sean Paul , Konrad Dybcio , Abhinav Kumar , Dmitry Baryshkov , Marijn Suijten Cc: iommu@lists.linux.dev, linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, freedreno@lists.freedesktop.org, Connor Abbott X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1747768138; l=5304; i=cwabbott0@gmail.com; s=20240426; h=from:subject:message-id; bh=xmVtxKp7l1nH9HRMvlhp+AXA8iIyclW4FjVkhjfpiJg=; b=R9Qrdk+aCSBCIG9HTDvSktf7A7GtrulqV4E10X0kJ7Yd5pExhrEumGzEbGK+ajvv2fm2NcdnU zCVQ7U/1Bn6Coy3wGGCl4TjDEVPJPXR5CoRuRTG6lRNa2ucwCE6WGoU X-Developer-Key: i=cwabbott0@gmail.com; a=ed25519; pk=dkpOeRSXLzVgqhy0Idr3nsBr4ranyERLMnoAgR4cHmY= The upper layer fault handler is now expected to handle everything required to retry the transaction or dump state related to it, since we enable threaded IRQs. This means that we can take charge of writing RESUME, making sure that we always write it after writing FSR as recommended by the specification. The iommu handler should write -EAGAIN if a transaction needs to be retried. This avoids tricky cross-tree changes in drm/msm, since it never wants to retry the transaction and it already returns 0 from its fault handler. Therefore it will continue to correctly terminate the transaction without any changes required. devcoredumps from drm/msm will temporarily be broken until it is fixed to collect devcoredumps inside its fault handler, but fixing that first would actually be worse because MMU-500 ignores writes to RESUME unless all fields of FSR (except SS of course) are clear and raises an interrupt when only SS is asserted. Right now, things happen to work most of the time if we collect a devcoredump, because RESUME is written asynchronously in the fault worker after the fault handler clears FSR and finishes, although there will be some spurious faults, but if this is changed before this commit fixes the FSR/RESUME write order then SS will never be cleared, the interrupt will never be cleared, and the whole system will hang every time a fault happens. It will therefore help bisectability if this commit goes first. I've changed the TBU path to also accept -EAGAIN and do the same thing, while keeping the old -EBUSY behavior. Although the old path was broken because you'd get a storm of interrupts due to returning IRQ_NONE that would eventually result in the interrupt being disabled, and I think it was dead code anyway, so it should eventually be deleted. Note that drm/msm never uses TBU so this is untested. Signed-off-by: Connor Abbott --- drivers/iommu/arm/arm-smmu/arm-smmu-qcom-debug.c | 9 +++++++++ drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 14 -------------- drivers/iommu/arm/arm-smmu/arm-smmu.c | 6 ++++++ 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom-debug.c b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom-debug.c index d03b2239baad48680eb6c3201c85f924ec4a0e07..65e0ef6539fe70aabffa0c8fbe444c34c620d367 100644 --- a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom-debug.c +++ b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom-debug.c @@ -406,6 +406,12 @@ irqreturn_t qcom_smmu_context_fault(int irq, void *dev) arm_smmu_print_context_fault_info(smmu, idx, &cfi); arm_smmu_cb_write(smmu, idx, ARM_SMMU_CB_FSR, cfi.fsr); + + if (cfi.fsr & ARM_SMMU_CB_FSR_SS) { + arm_smmu_cb_write(smmu, idx, ARM_SMMU_CB_RESUME, + ret == -EAGAIN ? 0 : ARM_SMMU_RESUME_TERMINATE); + } + return IRQ_HANDLED; } @@ -416,6 +422,9 @@ irqreturn_t qcom_smmu_context_fault(int irq, void *dev) if (!tmp || tmp == -EBUSY) { ret = IRQ_HANDLED; resume = ARM_SMMU_RESUME_TERMINATE; + } else if (tmp == -EAGAIN) { + ret = IRQ_HANDLED; + resume = 0; } else { phys_addr_t phys_atos = qcom_smmu_verify_fault(smmu_domain, cfi.iova, cfi.fsr); diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c index 4d3b99babd3584ec971bef30cd533c35904fe7f5..c84730d33a30c013a37e603d10319fb83203eaa5 100644 --- a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c +++ b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c @@ -120,19 +120,6 @@ static void qcom_adreno_smmu_set_stall(const void *cookie, bool enabled) qsmmu->stall_enabled &= ~BIT(cfg->cbndx); } -static void qcom_adreno_smmu_resume_translation(const void *cookie, bool terminate) -{ - struct arm_smmu_domain *smmu_domain = (void *)cookie; - struct arm_smmu_cfg *cfg = &smmu_domain->cfg; - struct arm_smmu_device *smmu = smmu_domain->smmu; - u32 reg = 0; - - if (terminate) - reg |= ARM_SMMU_RESUME_TERMINATE; - - arm_smmu_cb_write(smmu, cfg->cbndx, ARM_SMMU_CB_RESUME, reg); -} - static void qcom_adreno_smmu_set_prr_bit(const void *cookie, bool set) { struct arm_smmu_domain *smmu_domain = (void *)cookie; @@ -337,7 +324,6 @@ static int qcom_adreno_smmu_init_context(struct arm_smmu_domain *smmu_domain, priv->set_ttbr0_cfg = qcom_adreno_smmu_set_ttbr0_cfg; priv->get_fault_info = qcom_adreno_smmu_get_fault_info; priv->set_stall = qcom_adreno_smmu_set_stall; - priv->resume_translation = qcom_adreno_smmu_resume_translation; priv->set_prr_bit = NULL; priv->set_prr_addr = NULL; diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu.c b/drivers/iommu/arm/arm-smmu/arm-smmu.c index 8f439c265a23f16bd11801a93dae12fd476ddfb2..8d95b14c7d5a4040bb8add56475e297beb16b162 100644 --- a/drivers/iommu/arm/arm-smmu/arm-smmu.c +++ b/drivers/iommu/arm/arm-smmu/arm-smmu.c @@ -474,6 +474,12 @@ static irqreturn_t arm_smmu_context_fault(int irq, void *dev) arm_smmu_print_context_fault_info(smmu, idx, &cfi); arm_smmu_cb_write(smmu, idx, ARM_SMMU_CB_FSR, cfi.fsr); + + if (cfi.fsr & ARM_SMMU_CB_FSR_SS) { + arm_smmu_cb_write(smmu, idx, ARM_SMMU_CB_RESUME, + ret == -EAGAIN ? 0 : ARM_SMMU_RESUME_TERMINATE); + } + return IRQ_HANDLED; } From patchwork Tue May 20 19:08:56 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Connor Abbott X-Patchwork-Id: 891337 Received: from mail-qv1-f44.google.com (mail-qv1-f44.google.com [209.85.219.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0E8E32701A0 for ; Tue, 20 May 2025 19:09:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747768146; cv=none; b=T+OAmRqYJoXMC1SHBTaluWUxOQAkT4L9jNLXPv+4dlL87ENVlL5Th5gZP/BMc9WZMuXDtHU26TZ4Jz29Wqxj3CSUgQJYGFXOyI7XpjiE4vGc6EQDrvFX0vc5UQj+H7OeYWQM9sy1sIAWIDFC9nFvZ4Flwdu8I5veR8Z5dAyTxKM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747768146; c=relaxed/simple; bh=RnNUWR8apEx6WPWRc8HjEOtdMZqQUWqHrofPXnVy62Q=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=H46EXwg4d3zqYuNx9m5Xy3TaDWxW7ole9GkQFRQUZ95LR5uMUgIsfieQVShLJurKId/MMKewAB4LEoUkdDMvbe9WDayS2nRmveXoNEkM789IFdNGMZKLLzOglNwUD9QNpbBR7vJ4Or6xDAqE0D9nOYRaQ/XOsCfquhqKyef+S2k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Zr6M+960; arc=none smtp.client-ip=209.85.219.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Zr6M+960" Received: by mail-qv1-f44.google.com with SMTP id 6a1803df08f44-6f8a694d622so12034966d6.1 for ; Tue, 20 May 2025 12:09:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1747768143; x=1748372943; 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=rlMnByBJdLmm3G9/G0GQ/d4DyVfZJhKLZ7MqYnU+doc=; b=Zr6M+960UCNPDsHwNKtH2UO6bGEth31KSeqog5z1kvqBHw4PPy7Rd1nFtV+b/iwpmS wDDzoAuL2VUjNahLXhXsxzpwWLJustrfFrLwAxy6B0rg0lu81SIvchy56EV/DW/uLEUE tHwYzeQIJPl0GjZUs+wFyZDExdP9mMelwWPpqs7PzhXrZ9f55D5JlZVp9KBsjtt0gf3G RJY4j50rUwGpLZQlOsbDa6/b7U47c27RgAZoFsN05z8EStP8ExsYgifZGWQQKfJQdoyI StRkkbh2L/VqTwiJekNqMUa5yP6Os0lk1z0mGGHZuDIgCPiC221arhYyDfyZHdoTu3JL oh/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747768143; x=1748372943; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rlMnByBJdLmm3G9/G0GQ/d4DyVfZJhKLZ7MqYnU+doc=; b=Pp2DObWZPNaMxAY6J2cUXxtxmhpe3+RS8hXJAnVH345ubwjQenue5+fwHQn3DPlYYo HVbjYE5XAhzmHHmr9AaYg/IAzS9dBHcM7QUdRlBXDO3653FAunK282dAsTUt7M9ymQB3 AdCWXIv3Ar0Cf2X0nyM2F1XX5MRLcyjjmzzRC2PJYfWZgPF2+0D7Bo3taxgYvfpGkN4l RNdH61osgd1V+UDh0oSoQgk1x8WPErsF9gCj5dcLMjxH7vuCGcS1zBvwE+m9Wg7JJ5aH DkJwJ+IqnQiNo6f/fEwaCQ70XWkCXri2MKcMDMvuuqjb0Jubkhz3vw+/bfDf+MJ9odbN 2N2w== X-Forwarded-Encrypted: i=1; AJvYcCUXVQDPKwGNWHfzJTRO2um+zLcSJCT9lr+U/LKLb+5EaVNernUO/zwFu9aoq/1VhYNF1pE8A7wU96H43WhT@vger.kernel.org X-Gm-Message-State: AOJu0YznkqQJ/ZtYusZaWxZfwSKQYU7xOIKffjumB83JPLZpxSVzUH2P 5vJezYwNSdZ9apJIvjnhSoWuswsJekoBqUKZoVFa8fhHVB6wkpWqVHcI X-Gm-Gg: ASbGnctEm8gmRnEqYWr69yCN9ppgXdXyW3ta7LOatHZ7OtdIM6bAxNPICYDo2ZLY1Mb WOqR9q6Ze6ewfjZRf9OljSmFzq5EwSCfRtDUjWSz9KPdjvW6REjAUNVg+2r/PTf0TDn3ziBFjZx 1ypyhNY1ykegWAM73lS4sWUZZQ3bI8QtDQdXNbRTZ3H8rPDBTz9DOdcukwPiDMnrcAvX7DegL2G 0oHYnLpetyXfYWJbWTKpI3t/KdvKNhmN1OyaNnaa+7d8qfwCp1lfi4VOF12nYCBgtQzfePKqqLh UTru9+q+RwEehNb3VrFEHbbYaRbxqE5jc+K50Q2I46GDDCBREbaNii+HX8bI/2Zj0KxCpvbvJjk WV19gZ4LZQ9tXO047WS0= X-Google-Smtp-Source: AGHT+IGIrgJ2dmANNY3EjX9kZvxGmi8VdnrE3uOp5o3gsUKwQp+d16sgiHehsoeADCEn10ddqVWxMg== X-Received: by 2002:a05:622a:587:b0:48b:6eeb:f98e with SMTP id d75a77b69052e-494ae330988mr104811741cf.2.1747768142906; Tue, 20 May 2025 12:09:02 -0700 (PDT) Received: from [192.168.124.1] (syn-067-243-142-039.res.spectrum.com. [67.243.142.39]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-494ae445b99sm76554051cf.48.2025.05.20.12.09.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 May 2025 12:09:02 -0700 (PDT) From: Connor Abbott Date: Tue, 20 May 2025 15:08:56 -0400 Subject: [PATCH v8 3/7] iommu/arm-smmu-qcom: Make set_stall work when the device is on Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250520-msm-gpu-fault-fixes-next-v8-3-fce6ee218787@gmail.com> References: <20250520-msm-gpu-fault-fixes-next-v8-0-fce6ee218787@gmail.com> In-Reply-To: <20250520-msm-gpu-fault-fixes-next-v8-0-fce6ee218787@gmail.com> To: Rob Clark , Will Deacon , Robin Murphy , Joerg Roedel , Sean Paul , Konrad Dybcio , Abhinav Kumar , Dmitry Baryshkov , Marijn Suijten Cc: iommu@lists.linux.dev, linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, freedreno@lists.freedesktop.org, Connor Abbott X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1747768138; l=3453; i=cwabbott0@gmail.com; s=20240426; h=from:subject:message-id; bh=RnNUWR8apEx6WPWRc8HjEOtdMZqQUWqHrofPXnVy62Q=; b=Gva2s5Z7Ds/ygUrvduDeZ/TWE6RzxCRXnJg0Zhx6Z4wRmr7VRKNIHU/2xJaO+oPPC4dZhG1Tb GdN7Dm+NI2yANHk93Y3MujPoXjVnGL92q+a8IWtX3FmhfkHr+wCKih3 X-Developer-Key: i=cwabbott0@gmail.com; a=ed25519; pk=dkpOeRSXLzVgqhy0Idr3nsBr4ranyERLMnoAgR4cHmY= Up until now we have only called the set_stall callback during initialization when the device is off. But we will soon start calling it to temporarily disable stall-on-fault when the device is on, so handle that by checking if the device is on and writing SCTLR. Signed-off-by: Connor Abbott Reviewed-by: Rob Clark --- drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 33 +++++++++++++++++++++++++++--- include/linux/adreno-smmu-priv.h | 6 +++--- 2 files changed, 33 insertions(+), 6 deletions(-) diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c index c84730d33a30c013a37e603d10319fb83203eaa5..f7430c131c21f40308df36fe25fe75d31558c817 100644 --- a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c +++ b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c @@ -112,12 +112,39 @@ static void qcom_adreno_smmu_set_stall(const void *cookie, bool enabled) { struct arm_smmu_domain *smmu_domain = (void *)cookie; struct arm_smmu_cfg *cfg = &smmu_domain->cfg; - struct qcom_smmu *qsmmu = to_qcom_smmu(smmu_domain->smmu); + struct arm_smmu_device *smmu = smmu_domain->smmu; + struct qcom_smmu *qsmmu = to_qcom_smmu(smmu); + u32 mask = BIT(cfg->cbndx); + bool stall_changed = !!(qsmmu->stall_enabled & mask) != enabled; + unsigned long flags; if (enabled) - qsmmu->stall_enabled |= BIT(cfg->cbndx); + qsmmu->stall_enabled |= mask; else - qsmmu->stall_enabled &= ~BIT(cfg->cbndx); + qsmmu->stall_enabled &= ~mask; + + /* + * If the device is on and we changed the setting, update the register. + * The spec pseudocode says that CFCFG is resampled after a fault, and + * we believe that no implementations cache it in the TLB, so it should + * be safe to change it without a TLB invalidation. + */ + if (stall_changed && pm_runtime_get_if_active(smmu->dev) > 0) { + spin_lock_irqsave(&smmu_domain->cb_lock, flags); + + u32 reg = arm_smmu_cb_read(smmu, cfg->cbndx, ARM_SMMU_CB_SCTLR); + + if (enabled) + reg |= ARM_SMMU_SCTLR_CFCFG; + else + reg &= ~ARM_SMMU_SCTLR_CFCFG; + + arm_smmu_cb_write(smmu, cfg->cbndx, ARM_SMMU_CB_SCTLR, reg); + + spin_unlock_irqrestore(&smmu_domain->cb_lock, flags); + + pm_runtime_put_autosuspend(smmu->dev); + } } static void qcom_adreno_smmu_set_prr_bit(const void *cookie, bool set) diff --git a/include/linux/adreno-smmu-priv.h b/include/linux/adreno-smmu-priv.h index abec23c7744f49bea70f3352da9385304ed3702e..d83c9175828f792f1f43bcc8056102a43d822c96 100644 --- a/include/linux/adreno-smmu-priv.h +++ b/include/linux/adreno-smmu-priv.h @@ -45,9 +45,9 @@ struct adreno_smmu_fault_info { * TTBR0 translation is enabled with the specified cfg * @get_fault_info: Called by the GPU fault handler to get information about * the fault - * @set_stall: Configure whether stall on fault (CFCFG) is enabled. Call - * before set_ttbr0_cfg(). If stalling on fault is enabled, - * the GPU driver must call resume_translation() + * @set_stall: Configure whether stall on fault (CFCFG) is enabled. If + * stalling on fault is enabled, the GPU driver must call + * resume_translation() * @resume_translation: Resume translation after a fault * * @set_prr_bit: [optional] Configure the GPU's Partially Resident From patchwork Tue May 20 19:08:57 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Connor Abbott X-Patchwork-Id: 891336 Received: from mail-qk1-f169.google.com (mail-qk1-f169.google.com [209.85.222.169]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B94C928003E for ; Tue, 20 May 2025 19:09:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747768147; cv=none; b=B+bn0ECMO2yMcSH1zRuTjGkSxQcyeTtGDxCjBil3+0Nr4v0GF7Kc4M9xtJgGGOFPXB81B0CY7lkwRFKMHjPy7/k/s3UErseSl0C7qIWDTnWwp99RVf+3klmR3V98VG/PVJjXz0T3fVdX9gn5/YMe9okiuWTAs45u0zeIqd2QDmE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747768147; c=relaxed/simple; bh=gk8DwE6MH3TUftDA43LAG4YX9fts1PWBfmK+nfds2g0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=f6zCVhFQ4q6N5Wg55TaCpo4nPli63LoIKHqR9r6RTlOeMeg7myzajxq5+S7nEW1DkERO5LFX/MeIWyNNFC2XkW9UTqnFM3Kg/z7aMKfkvUvDVvWEZTZOAOEvpRyTRPitsTH57mIQzshVsNIOSck5J87jrFeSzwMQTpcbZrgm5ps= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=VmHH20w6; arc=none smtp.client-ip=209.85.222.169 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="VmHH20w6" Received: by mail-qk1-f169.google.com with SMTP id af79cd13be357-7c5445cb72dso59874785a.3 for ; Tue, 20 May 2025 12:09:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1747768145; x=1748372945; 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=MuutgzGDaH8CjNyI4g6TYCQbDYXMk/DcTGlIQTdOozs=; b=VmHH20w6OejqgQKGBRruhkpIV/Z+AlPvPZoIrF0hUlCN/XNJvIlMw90sbrk3+z50+r TruAsCCBtRQoyz2OCCSmyzb6xhLJo6GJYRQNhPtCn5n1iydM3wvNIfJt2S3A8gmuLZj4 kQ686x3qbi1ec1Q2KDiyNlFeHTinBEwbJR5hH1mePsfg/St9oUE3tO07qOt8n4VYyleQ E0qUqqlNFcc1WMhZuf/nYXfHCPqUc+izj7Q6aLOmO0UKzQ0F3XN+1rZbheRt3LkVeB1I lgPPkUVzw2QmnwNhEHGLtxunu+E4QchdqUCMxtel2NJ0vGmmiie3DOl6gHS4hIwVEp+t 0ONA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747768145; x=1748372945; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MuutgzGDaH8CjNyI4g6TYCQbDYXMk/DcTGlIQTdOozs=; b=MJFD8uADQt+1xd8Fju9O4o2ZMtJwmLiKjqg0yHI5JaFPjvUa1x+HyW8t39RRKntx7m ppXLsuFgpisZ0rJNDRnNO4U2z8bnJ03DzivO/Y7DPhggoOPlrsHqHQQta65a6M18Vgav y1kw7aV36WbiITJ1QsYNsEba4ENBAN6mqx4zd5pI3IdoEknwNO1+fX5wbKrIXYUMGl4k L9n58b59G79zxtCkZikXB3NOOUKa/zjeUYYD/6T9tldh9lrpbXEYqQlZl/6H6hL7PTmP 01Pjr5dSHxiJB/8r2eJ7Z1hKbqe5o+oy9XMnP5744z5clYQkH+ufFM+lCWQV5j1DZV33 zRtQ== X-Forwarded-Encrypted: i=1; AJvYcCWqv3xaFlbRdYYEigJ9Jd35SSaBaZOQpteXTENsd+M+FyU4nfB4Uj/1SYCj12JqD8c7HaQJxvYADGOXyVzX@vger.kernel.org X-Gm-Message-State: AOJu0YxhPMwC9ewUYFSTHlEkMugLGhDc8GsdkRMTrmkKs7IZpAj8AxZy 4n9MO7Fe/YFuCiJ4I8Meb/dQgMlL4E2/nhnoi8Dtd3K7p1akC1mq59hI X-Gm-Gg: ASbGncuHkZDgCYg/NyfxVJ2sBkkz8fTOYHPNNEc3q4brA8tTek+adY05PfhQPeCX8/G Re8+ZiQ+ZL3gPvoD/qkONpK1Tr0S/4TMVJ84fG1Av/Ihea7np9rZaKayogpxwcubHRC3YUgXT/H R3YVw9VUeIcvIMDMgkCDI/4++XMtj0ROMpjsP2RcblsiaV43e0JACEey193TyeY7gEkSj2JHvzj IqZDlUiLewBpIa4jrlOyJTmg5jh7bzbi//qiOAYoEDY37zUc9DgXZFMF7GWBQi9aAlXgjoJtL5n VkiFy2Mz+wiLdRH8hMgoTyjtH5tNGIJjnAGnejNuXwL8ogeuCTHmPFxGsV5d1MJCHStZzu41BU7 YMsCNeuZcfA5DrvBej7DikonK2eMfLg== X-Google-Smtp-Source: AGHT+IGTEuOT5AKSY9QNH3BI4uSkpEqMzwIX5HeR3aoY35A9UU3EKtm3GcLNIXZ3fsDigIbw6flk4w== X-Received: by 2002:a05:622a:2c9:b0:474:fcf8:8f0e with SMTP id d75a77b69052e-494ae3736d5mr107613701cf.8.1747768144604; Tue, 20 May 2025 12:09:04 -0700 (PDT) Received: from [192.168.124.1] (syn-067-243-142-039.res.spectrum.com. [67.243.142.39]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-494ae445b99sm76554051cf.48.2025.05.20.12.09.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 May 2025 12:09:04 -0700 (PDT) From: Connor Abbott Date: Tue, 20 May 2025 15:08:57 -0400 Subject: [PATCH v8 4/7] drm/msm: Don't use a worker to capture fault devcoredump Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250520-msm-gpu-fault-fixes-next-v8-4-fce6ee218787@gmail.com> References: <20250520-msm-gpu-fault-fixes-next-v8-0-fce6ee218787@gmail.com> In-Reply-To: <20250520-msm-gpu-fault-fixes-next-v8-0-fce6ee218787@gmail.com> To: Rob Clark , Will Deacon , Robin Murphy , Joerg Roedel , Sean Paul , Konrad Dybcio , Abhinav Kumar , Dmitry Baryshkov , Marijn Suijten Cc: iommu@lists.linux.dev, linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, freedreno@lists.freedesktop.org, Connor Abbott X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1747768138; l=6008; i=cwabbott0@gmail.com; s=20240426; h=from:subject:message-id; bh=gk8DwE6MH3TUftDA43LAG4YX9fts1PWBfmK+nfds2g0=; b=B32zCFW6SjtAi/CSZwadfMTfzVtd5ahW7RYfl/ZOrAxW3x+ocg/HybRu5g3ZhTJm3x1MT8Sqx WcJt0qdXT4yBHPiW79Lj1VsiIe6m5qQgOqfSuL7uWBBsyLhmx41dhDo X-Developer-Key: i=cwabbott0@gmail.com; a=ed25519; pk=dkpOeRSXLzVgqhy0Idr3nsBr4ranyERLMnoAgR4cHmY= Now that we use a threaded IRQ, it should be safe to do this in the fault handler. We can also remove fault_info from struct msm_gpu and just pass it directly. Signed-off-by: Connor Abbott --- drivers/gpu/drm/msm/adreno/adreno_gpu.c | 22 ++++++++-------------- drivers/gpu/drm/msm/msm_gpu.c | 20 +++++++++----------- drivers/gpu/drm/msm/msm_gpu.h | 8 ++------ 3 files changed, 19 insertions(+), 31 deletions(-) diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/adreno/adreno_gpu.c index 26db1f4b5fb90930bdbd2f17682bf47e35870936..4a6dc29ff7071940e440297f5fbbe4e2d06c3ffd 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c @@ -257,14 +257,6 @@ int adreno_fault_handler(struct msm_gpu *gpu, unsigned long iova, int flags, const char *type = "UNKNOWN"; bool do_devcoredump = info && !READ_ONCE(gpu->crashstate); - /* - * If we aren't going to be resuming later from fault_worker, then do - * it now. - */ - if (!do_devcoredump) { - gpu->aspace->mmu->funcs->resume_translation(gpu->aspace->mmu); - } - /* * Print a default message if we couldn't get the data from the * adreno-smmu-priv @@ -291,16 +283,18 @@ int adreno_fault_handler(struct msm_gpu *gpu, unsigned long iova, int flags, scratch[0], scratch[1], scratch[2], scratch[3]); if (do_devcoredump) { + struct msm_gpu_fault_info fault_info = {}; + /* Turn off the hangcheck timer to keep it from bothering us */ timer_delete(&gpu->hangcheck_timer); - gpu->fault_info.ttbr0 = info->ttbr0; - gpu->fault_info.iova = iova; - gpu->fault_info.flags = flags; - gpu->fault_info.type = type; - gpu->fault_info.block = block; + fault_info.ttbr0 = info->ttbr0; + fault_info.iova = iova; + fault_info.flags = flags; + fault_info.type = type; + fault_info.block = block; - kthread_queue_work(gpu->worker, &gpu->fault_work); + msm_gpu_fault_crashstate_capture(gpu, &fault_info); } return 0; diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c index c380d9d9f5af10b90ef733b05f5b0295c0445f38..457f019d507e954daeb609c313d37ee64fd492f9 100644 --- a/drivers/gpu/drm/msm/msm_gpu.c +++ b/drivers/gpu/drm/msm/msm_gpu.c @@ -257,7 +257,8 @@ static void msm_gpu_crashstate_get_bo(struct msm_gpu_state *state, } static void msm_gpu_crashstate_capture(struct msm_gpu *gpu, - struct msm_gem_submit *submit, char *comm, char *cmd) + struct msm_gem_submit *submit, struct msm_gpu_fault_info *fault_info, + char *comm, char *cmd) { struct msm_gpu_state *state; @@ -276,7 +277,8 @@ static void msm_gpu_crashstate_capture(struct msm_gpu *gpu, /* Fill in the additional crash state information */ state->comm = kstrdup(comm, GFP_KERNEL); state->cmd = kstrdup(cmd, GFP_KERNEL); - state->fault_info = gpu->fault_info; + if (fault_info) + state->fault_info = *fault_info; if (submit) { int i; @@ -308,7 +310,8 @@ static void msm_gpu_crashstate_capture(struct msm_gpu *gpu, } #else static void msm_gpu_crashstate_capture(struct msm_gpu *gpu, - struct msm_gem_submit *submit, char *comm, char *cmd) + struct msm_gem_submit *submit, struct msm_gpu_fault_info *fault_info, + char *comm, char *cmd) { } #endif @@ -405,7 +408,7 @@ static void recover_worker(struct kthread_work *work) /* Record the crash state */ pm_runtime_get_sync(&gpu->pdev->dev); - msm_gpu_crashstate_capture(gpu, submit, comm, cmd); + msm_gpu_crashstate_capture(gpu, submit, NULL, comm, cmd); kfree(cmd); kfree(comm); @@ -459,9 +462,8 @@ static void recover_worker(struct kthread_work *work) msm_gpu_retire(gpu); } -static void fault_worker(struct kthread_work *work) +void msm_gpu_fault_crashstate_capture(struct msm_gpu *gpu, struct msm_gpu_fault_info *fault_info) { - struct msm_gpu *gpu = container_of(work, struct msm_gpu, fault_work); struct msm_gem_submit *submit; struct msm_ringbuffer *cur_ring = gpu->funcs->active_ring(gpu); char *comm = NULL, *cmd = NULL; @@ -484,16 +486,13 @@ static void fault_worker(struct kthread_work *work) /* Record the crash state */ pm_runtime_get_sync(&gpu->pdev->dev); - msm_gpu_crashstate_capture(gpu, submit, comm, cmd); + msm_gpu_crashstate_capture(gpu, submit, fault_info, comm, cmd); pm_runtime_put_sync(&gpu->pdev->dev); kfree(cmd); kfree(comm); resume_smmu: - memset(&gpu->fault_info, 0, sizeof(gpu->fault_info)); - gpu->aspace->mmu->funcs->resume_translation(gpu->aspace->mmu); - mutex_unlock(&gpu->lock); } @@ -882,7 +881,6 @@ int msm_gpu_init(struct drm_device *drm, struct platform_device *pdev, init_waitqueue_head(&gpu->retire_event); kthread_init_work(&gpu->retire_work, retire_worker); kthread_init_work(&gpu->recover_work, recover_worker); - kthread_init_work(&gpu->fault_work, fault_worker); priv->hangcheck_period = DRM_MSM_HANGCHECK_DEFAULT_PERIOD; diff --git a/drivers/gpu/drm/msm/msm_gpu.h b/drivers/gpu/drm/msm/msm_gpu.h index e25009150579c08f7b98d4461a75757d1093734a..bed0692f5adb30e50d0448640a329158d1ffe5e5 100644 --- a/drivers/gpu/drm/msm/msm_gpu.h +++ b/drivers/gpu/drm/msm/msm_gpu.h @@ -253,12 +253,6 @@ struct msm_gpu { #define DRM_MSM_HANGCHECK_PROGRESS_RETRIES 3 struct timer_list hangcheck_timer; - /* Fault info for most recent iova fault: */ - struct msm_gpu_fault_info fault_info; - - /* work for handling GPU ioval faults: */ - struct kthread_work fault_work; - /* work for handling GPU recovery: */ struct kthread_work recover_work; @@ -705,6 +699,8 @@ static inline void msm_gpu_crashstate_put(struct msm_gpu *gpu) mutex_unlock(&gpu->lock); } +void msm_gpu_fault_crashstate_capture(struct msm_gpu *gpu, struct msm_gpu_fault_info *fault_info); + /* * Simple macro to semi-cleanly add the MAP_PRIV flag for targets that can * support expanded privileges From patchwork Tue May 20 19:08:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Connor Abbott X-Patchwork-Id: 892015 Received: from mail-qt1-f176.google.com (mail-qt1-f176.google.com [209.85.160.176]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2F4C8281343 for ; Tue, 20 May 2025 19:09:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747768148; cv=none; b=ChoeBvOqXx2JmgR2P2WUrvISiapwK8tN9b40zi9znIarXeg+6dPSAkidmaFn6Ki0j1AxlaFZ1G9xc2F/6UsCa9EDtTxduc6UH+Xvi3xiMpMXckwTCaV4Jx95Mh3BVRDCli/WlhWblu6Tb7pWhxTcdBZ/PlTfMgiJk+7EzL4+qu0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747768148; c=relaxed/simple; bh=IRNUvyOjaxw/F2ca+hPqiQkWq4EHwHVBbpQuon23Uj4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=PVZ66V1L3zXTdURSb+iEyFXRzVUpvxh+irWqE5ym5eTlK1h4gHo4BTp0X569g/Ag9vhzh8tHRUkZg5h41YaawvSEdX8vf1+JLv4vRKfMMge05N8CLfwlPhWHLjU7o2hhEXGGbGlcpHNYS4o+VuVY2KaJPgpzXWEtsWzfgl2WNtc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Q8jVaKzj; arc=none smtp.client-ip=209.85.160.176 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Q8jVaKzj" Received: by mail-qt1-f176.google.com with SMTP id d75a77b69052e-47675dc7c79so3046141cf.1 for ; Tue, 20 May 2025 12:09:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1747768146; x=1748372946; 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=cADqZ1V/EGiLXKG6qQOYNjFrT4sU1TPLVJeXzQQLmA0=; b=Q8jVaKzjo/f52rALveH69+17x1z6GluZA7LqBNu4uDp7Q1QqWT0z6fqsoRL5zqXQbc J/+CgLJHQ257sAVwleVwKKAC9e0nxYkvIV3xW5okaV4ZcV6aJnR1INqLYNDdvkuSsvKg gMmOKa/5yB39KxE0Zm8FE8+qxPAD2ujZlSEQPHV4hq3aYHr8f/yT9u184jfj7oYr/VKg YaF3oF7ytjejX6dqPwb4BCCvz7+rZq1YnOpxfZRGjBQR6ILHUy5M+ER4C7C80HoE8KLv jtWT+NsHFN62NUanflv8g0G/zZwhyGzT++YVHoehP/ryjA2INDcrEsKY9WUkkSkX3aOs 6DmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747768146; x=1748372946; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=cADqZ1V/EGiLXKG6qQOYNjFrT4sU1TPLVJeXzQQLmA0=; b=M1/B2p1lahy//NPsSXAGmYn6Q9psHz8h42kzQFqr8cjsAiJrWRG9CuN6vSa2l+wUh4 Gn1dCWJh2ht1upndQGqybFucIrjHUaixWHm09ChjN0UYQ6Ob8SRTDIdFEazWUnoAL1oX J8V804Yjv89f5QYTY9sUVkqrAvjHvVR9eSfH3uAGIIY0kmGV5dEdn/9MtGcDYdMQKGM8 nf5pXkQmd7w+LJci1FAYcBqPqRlyG85Jjp49/JyumfNfcz8HctULMT5yDgmYIjhW31s3 B8MxfypIhczunOXH8YFE8Sq1MuMrGrACmnCDWrPTCUny54NHKpYj4BqaEWFhdBwumO7t +9Hw== X-Forwarded-Encrypted: i=1; AJvYcCWY3L22X1+AxNIpU9sMeYGLnZa1huLkE3th6zFQzkN+RCKD74ZikobZlN4+26It26wAAUPZ8eKE/iB1Q1vL@vger.kernel.org X-Gm-Message-State: AOJu0YzrtrveFn9cuQwD/6K58uECyYIEcG4R4SqBn+vvT3U6F6sCsvT0 6Ijy4cWoB8i2fK6gbV/t4THzPHpBkeesitXgEACpBUwToe5YxgO7vKHW X-Gm-Gg: ASbGncsXFOx+ZtO+4HOqS4Kf5vNR1gnlSqMmZ3cTyRBkh+GMB9lW7ve1x6oXMlbd4e+ CK0JCGNgM+4iT732p7iGD1jKhxyl5pyrYlsPPUeFrv0I5ZuYL5PkK03SXhpsSa15Su1K4TgxMcE BeBbxV79aA9bY6RBk3BfB5uVY2JPyRkrJbMEp7mQuMFYtvnNb445+myH5ZSec30BL1DHvV2nKvH nxjQO6bkMx+02W7MHO0n6C0FNRD5iHL2yBT9rb9LW+j7N7JtB4lcKL4Qu9+48g0m0KizaG3GEMM Q0SMABwzkgNPD76XUjtSbbCgwH1H6Pnk6sp6oaO3rquAIu0ai1a3LRSVZXSWzSXqSHNNd9kFJVM WqG6J4egLctbYGTShHBI= X-Google-Smtp-Source: AGHT+IH/sySa48mHF1j+xGqwAb4OUN56/osDwaowVOBbvnddvZtTNPPLhnoNhpJNu3NLmENNp9KeEA== X-Received: by 2002:a05:622a:295:b0:474:e213:7480 with SMTP id d75a77b69052e-494ae4557f3mr113963491cf.15.1747768145897; Tue, 20 May 2025 12:09:05 -0700 (PDT) Received: from [192.168.124.1] (syn-067-243-142-039.res.spectrum.com. [67.243.142.39]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-494ae445b99sm76554051cf.48.2025.05.20.12.09.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 May 2025 12:09:05 -0700 (PDT) From: Connor Abbott Date: Tue, 20 May 2025 15:08:58 -0400 Subject: [PATCH v8 5/7] drm/msm: Delete resume_translation() Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250520-msm-gpu-fault-fixes-next-v8-5-fce6ee218787@gmail.com> References: <20250520-msm-gpu-fault-fixes-next-v8-0-fce6ee218787@gmail.com> In-Reply-To: <20250520-msm-gpu-fault-fixes-next-v8-0-fce6ee218787@gmail.com> To: Rob Clark , Will Deacon , Robin Murphy , Joerg Roedel , Sean Paul , Konrad Dybcio , Abhinav Kumar , Dmitry Baryshkov , Marijn Suijten Cc: iommu@lists.linux.dev, linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, freedreno@lists.freedesktop.org, Connor Abbott X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1747768138; l=3387; i=cwabbott0@gmail.com; s=20240426; h=from:subject:message-id; bh=IRNUvyOjaxw/F2ca+hPqiQkWq4EHwHVBbpQuon23Uj4=; b=5d0rxfRs5HCrkUIw2Arap8ZqFIuAGJ4FzZ6nBN1RaYGc2iwrZQL0YnVpt1p+/vjsJdBWdGDLK wKpde4hDDxRAJWeKAxM6zuLjWRz2y2+sHM1RYmSEmKQLnJbDbCP4lc7 X-Developer-Key: i=cwabbott0@gmail.com; a=ed25519; pk=dkpOeRSXLzVgqhy0Idr3nsBr4ranyERLMnoAgR4cHmY= Unused since the previous commit. Signed-off-by: Connor Abbott --- drivers/gpu/drm/msm/adreno/a2xx_gpummu.c | 5 ----- drivers/gpu/drm/msm/msm_iommu.c | 13 ------------- drivers/gpu/drm/msm/msm_mmu.h | 1 - 3 files changed, 19 deletions(-) diff --git a/drivers/gpu/drm/msm/adreno/a2xx_gpummu.c b/drivers/gpu/drm/msm/adreno/a2xx_gpummu.c index 39641551eeb66d1441810c9691708ef448192578..4280f71e472a4130a62ba74e936870905ca260bb 100644 --- a/drivers/gpu/drm/msm/adreno/a2xx_gpummu.c +++ b/drivers/gpu/drm/msm/adreno/a2xx_gpummu.c @@ -71,10 +71,6 @@ static int a2xx_gpummu_unmap(struct msm_mmu *mmu, uint64_t iova, size_t len) return 0; } -static void a2xx_gpummu_resume_translation(struct msm_mmu *mmu) -{ -} - static void a2xx_gpummu_destroy(struct msm_mmu *mmu) { struct a2xx_gpummu *gpummu = to_a2xx_gpummu(mmu); @@ -90,7 +86,6 @@ static const struct msm_mmu_funcs funcs = { .map = a2xx_gpummu_map, .unmap = a2xx_gpummu_unmap, .destroy = a2xx_gpummu_destroy, - .resume_translation = a2xx_gpummu_resume_translation, }; struct msm_mmu *a2xx_gpummu_new(struct device *dev, struct msm_gpu *gpu) diff --git a/drivers/gpu/drm/msm/msm_iommu.c b/drivers/gpu/drm/msm/msm_iommu.c index fd73dcd3f30e75878364cb28dd26475c2ff80a85..aae885d048d0d2fd617d7b2a16833da25f5e84cc 100644 --- a/drivers/gpu/drm/msm/msm_iommu.c +++ b/drivers/gpu/drm/msm/msm_iommu.c @@ -345,7 +345,6 @@ static int msm_gpu_fault_handler(struct iommu_domain *domain, struct device *dev unsigned long iova, int flags, void *arg) { struct msm_iommu *iommu = arg; - struct msm_mmu *mmu = &iommu->base; struct adreno_smmu_priv *adreno_smmu = dev_get_drvdata(iommu->base.dev); struct adreno_smmu_fault_info info, *ptr = NULL; @@ -359,9 +358,6 @@ static int msm_gpu_fault_handler(struct iommu_domain *domain, struct device *dev pr_warn_ratelimited("*** fault: iova=%16lx, flags=%d\n", iova, flags); - if (mmu->funcs->resume_translation) - mmu->funcs->resume_translation(mmu); - return 0; } @@ -376,14 +372,6 @@ static int msm_disp_fault_handler(struct iommu_domain *domain, struct device *de return -ENOSYS; } -static void msm_iommu_resume_translation(struct msm_mmu *mmu) -{ - struct adreno_smmu_priv *adreno_smmu = dev_get_drvdata(mmu->dev); - - if (adreno_smmu->resume_translation) - adreno_smmu->resume_translation(adreno_smmu->cookie, true); -} - static void msm_iommu_detach(struct msm_mmu *mmu) { struct msm_iommu *iommu = to_msm_iommu(mmu); @@ -431,7 +419,6 @@ static const struct msm_mmu_funcs funcs = { .map = msm_iommu_map, .unmap = msm_iommu_unmap, .destroy = msm_iommu_destroy, - .resume_translation = msm_iommu_resume_translation, }; struct msm_mmu *msm_iommu_new(struct device *dev, unsigned long quirks) diff --git a/drivers/gpu/drm/msm/msm_mmu.h b/drivers/gpu/drm/msm/msm_mmu.h index daf91529e02b6c491d624e9de686173eeef86a9b..c3d17aae88b0a57b3c7d1df3351b39ec39bca60a 100644 --- a/drivers/gpu/drm/msm/msm_mmu.h +++ b/drivers/gpu/drm/msm/msm_mmu.h @@ -15,7 +15,6 @@ struct msm_mmu_funcs { size_t len, int prot); int (*unmap)(struct msm_mmu *mmu, uint64_t iova, size_t len); void (*destroy)(struct msm_mmu *mmu); - void (*resume_translation)(struct msm_mmu *mmu); }; enum msm_mmu_type { From patchwork Tue May 20 19:08:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Connor Abbott X-Patchwork-Id: 892014 Received: from mail-qk1-f181.google.com (mail-qk1-f181.google.com [209.85.222.181]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 46154281528 for ; Tue, 20 May 2025 19:09:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747768151; cv=none; b=RZufhKwn9mQ7a2ZXwyS9MoD1pq4r8/YWkS7fAmbtl4DR0dsfYVtpEvFRdwwnVOD987C4V8OmcISbFsLv9aBFKGfcSKQQWOPAGyipvaR140USEnt1rR7kMbVQbq4pJ65ElcCQlwbeAviDqSAdi30o3ve/msp6b3kjy8R9q/vU4yU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747768151; c=relaxed/simple; bh=FCsMQ/lDosid4e/Pi7b+7W8zAGLYgmp9uHd4ek8IEi4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=rN7zGJ+JpjqPKHzBmTwVe4PhxDOnsv4ET2iwbxwyMA2nCUUvbEbVhVU/Oy0vR6mZW9mg8HqJ2K6UDCz6Jy9qcPSIR3AE1449AehfDthiRPhl3g2IAJ5mRiCv3d9i3FmPabN8wBUVhu5pZj/6u1YnszNhcPgw+kWtX5GQdepBoyQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=JYmxYR5D; arc=none smtp.client-ip=209.85.222.181 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="JYmxYR5D" Received: by mail-qk1-f181.google.com with SMTP id af79cd13be357-7cd43fd56bcso76915585a.2 for ; Tue, 20 May 2025 12:09:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1747768147; x=1748372947; 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=p605H/gwYQGbgiKDoVqvqTFDpgFsHP3ae2OvlNB6R7c=; b=JYmxYR5DN3Xk8xwYrqfKeICIIUQ42We3IzpOgjukBbWb3/pWSAU0pp/2i7DIi5EL9n sYf18YcIGk5gSFVNYCZqaWTjx1W3wEeO5Bct2tYLFxDIVr+MAsq76uVDPTC/OkLrTQsC U4KicrHyC0MO9unlHA6sYlEWhNBrXayCr2Rr7wApMHta2zZFV0Su5osRo00ft72m677q LyPE/6QGCyAiH2go3NhPp3IPKkas3hMMbuA1s0KNws4jGfSNITjbDkyvGt/+4oTb1F4H zO7NZDpCz1j8/4Qv2N8qIPHpokY+GxS2CEdm5w/pSX0SXKPmlYvP22rKBxPg/JvQljSA kGYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747768147; x=1748372947; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=p605H/gwYQGbgiKDoVqvqTFDpgFsHP3ae2OvlNB6R7c=; b=jayd48NNh/KXJrahHMAr4xeo6vTclaWm3PYrD8MsxMmgYmEYGKPmRCQ8+dYSgGVQt1 sqXqGxx60wuu/BbwBnCy6iuyrMwN9XEinXopl5xKy2bXWUeYy1BM7P1jiH/5C6CgSrQH t66X4WvtxdiDc+GE3v/dhMvA3m5wMfgob5QsO66AbOq6bYFT/ZbZYEqV9IoX+V66dt6z W+FQ2VOn7Yl9KYoAJMBdXF1MJqka+mk5ymL+Ia9oPoI2c+DfHTkaIkShLE1I5zrYC9tl zdHyC8TAUsQWQ51S3uxpYUYNOb3z7RBPPcGjldWJzmGZMlkRwGM6E1jRMpRvdKuLpBWU s63w== X-Forwarded-Encrypted: i=1; AJvYcCWPuGEa/Zxk52pOhYA6QHatBvRlNn5axJEzdQEWKTFXTWAROcd7PukikhYcp/JsoJ2aEyS7VwrweeZrWSsm@vger.kernel.org X-Gm-Message-State: AOJu0YweSiCZPkOpV5offigK9hwnthV11B6y59pYrwdzTdazdAh3SjTb BbjAdPQStKKIt+8zZXjV1kGZat+mYbobde6SB6y1oqUA3DxIbyQWyszZDKynxGne X-Gm-Gg: ASbGncv65Ugw0g8GfCaT8rgFkX5MbJ3WG1gM2i3LsrUYrmV/LUAOY1dTvkOaeY/J5Wt TqZPaPlwMPYSBEIEOjVKOlgqlE1QFUXcepfkiIgs6jsiRk6CKeFq61MFlNu7bD7kuGd6TPTrYJd VES+J7ZP2jbYnq2LHDDYdkcXfVaxQQkQ+pNHXuwHu8Qxu7gtXrM+/LygLg3X4mXLF3Z4T8XPUvc jCpND75YIN9pahtUiFnaO3g1pzPXVf1JPunCuPIJfWwuTlyGvv76wtvDKeRMhLFCsl220ttF0EI mQM9POKo4TIeJyhhNCP2BQ6reFg55QOmBFvDocY+P9TXIcMWSnrK5Vh6gPbMixk17ydfzNTiK+Y /DMMZT8W+NFqZLaF2SWU= X-Google-Smtp-Source: AGHT+IERko68tjSRXwzHehFMdLYwGfBcZEiVZ+HJEyjzfXIk8XlXd8CWDgt9mnwB3yU5B9kiA/nGyw== X-Received: by 2002:a05:622a:19a0:b0:474:faeb:50aa with SMTP id d75a77b69052e-494ae3509fcmr97992671cf.5.1747768147025; Tue, 20 May 2025 12:09:07 -0700 (PDT) Received: from [192.168.124.1] (syn-067-243-142-039.res.spectrum.com. [67.243.142.39]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-494ae445b99sm76554051cf.48.2025.05.20.12.09.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 May 2025 12:09:06 -0700 (PDT) From: Connor Abbott Date: Tue, 20 May 2025 15:08:59 -0400 Subject: [PATCH v8 6/7] drm/msm: Temporarily disable stall-on-fault after a page fault Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250520-msm-gpu-fault-fixes-next-v8-6-fce6ee218787@gmail.com> References: <20250520-msm-gpu-fault-fixes-next-v8-0-fce6ee218787@gmail.com> In-Reply-To: <20250520-msm-gpu-fault-fixes-next-v8-0-fce6ee218787@gmail.com> To: Rob Clark , Will Deacon , Robin Murphy , Joerg Roedel , Sean Paul , Konrad Dybcio , Abhinav Kumar , Dmitry Baryshkov , Marijn Suijten Cc: iommu@lists.linux.dev, linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, freedreno@lists.freedesktop.org, Connor Abbott X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1747768138; l=11849; i=cwabbott0@gmail.com; s=20240426; h=from:subject:message-id; bh=FCsMQ/lDosid4e/Pi7b+7W8zAGLYgmp9uHd4ek8IEi4=; b=1H940zl22KNPnuJyClBlD1/DnqrUirZl5DpdXOyMTw/3GpoHapw90t4z6143/3qezWcEmP6Dx q7IbxNp6LYFAzyH62QyvwvsM14dulXC5iwBNsZ1KnA55wXpDtrbIg55 X-Developer-Key: i=cwabbott0@gmail.com; a=ed25519; pk=dkpOeRSXLzVgqhy0Idr3nsBr4ranyERLMnoAgR4cHmY= When things go wrong, the GPU is capable of quickly generating millions of faulting translation requests per second. When that happens, in the stall-on-fault model each access will stall until it wins the race to signal the fault and then the RESUME register is written. This slows processing page faults to a crawl as the GPU can generate faults much faster than the CPU can acknowledge them. It also means that all available resources in the SMMU are saturated waiting for the stalled transactions, so that other transactions such as transactions generated by the GMU, which shares translation resources with the GPU, cannot proceed. This causes a GMU watchdog timeout, which leads to a failed reset because GX cannot collapse when there is a transaction pending and a permanently hung GPU. On older platforms with qcom,smmu-v2, it seems that when one transaction is stalled subsequent faulting transactions are terminated, which avoids this problem, but the MMU-500 follows the spec here. To work around these problems, disable stall-on-fault as soon as we get a page fault until a cooldown period after pagefaults stop. This allows the GMU some guaranteed time to continue working. We only use stall-on-fault to halt the GPU while we collect a devcoredump and we always terminate the transaction afterward, so it's fine to miss some subsequent page faults. We also keep it disabled so long as the current devcoredump hasn't been deleted, because in that case we likely won't capture another one if there's a fault. After this commit HFI messages still occasionally time out, because the crashdump handler doesn't run fast enough to let the GMU resume, but the driver seems to recover from it. This will probably go away after the HFI timeout is increased. Signed-off-by: Connor Abbott Reviewed-by: Rob Clark --- drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 2 ++ drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 4 ++++ drivers/gpu/drm/msm/adreno/adreno_gpu.c | 40 ++++++++++++++++++++++++++++++++- drivers/gpu/drm/msm/adreno/adreno_gpu.h | 2 ++ drivers/gpu/drm/msm/msm_debugfs.c | 32 ++++++++++++++++++++++++++ drivers/gpu/drm/msm/msm_drv.c | 4 ++++ drivers/gpu/drm/msm/msm_drv.h | 23 +++++++++++++++++++ drivers/gpu/drm/msm/msm_iommu.c | 9 ++++++++ drivers/gpu/drm/msm/msm_mmu.h | 1 + 9 files changed, 116 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c index 650e5bac225f372e819130b891f1d020b464f17f..60aef079623606bb1ae44ba59ac45e391595b0ba 100644 --- a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c @@ -131,6 +131,8 @@ static void a5xx_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit) struct msm_ringbuffer *ring = submit->ring; unsigned int i, ibs = 0; + adreno_check_and_reenable_stall(adreno_gpu); + if (IS_ENABLED(CONFIG_DRM_MSM_GPU_SUDO) && submit->in_rb) { ring->cur_ctx_seqno = 0; a5xx_submit_in_rb(gpu, submit); diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c index 06465bc2d0b4b128cddfcfcaf1fe4252632b6777..afa4626d58f577d5d47f47b494b26953adcf230f 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c @@ -212,6 +212,8 @@ static void a6xx_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit) struct msm_ringbuffer *ring = submit->ring; unsigned int i, ibs = 0; + adreno_check_and_reenable_stall(adreno_gpu); + a6xx_set_pagetable(a6xx_gpu, ring, submit); get_stats_counter(ring, REG_A6XX_RBBM_PERFCTR_CP(0), @@ -335,6 +337,8 @@ static void a7xx_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit) struct msm_ringbuffer *ring = submit->ring; unsigned int i, ibs = 0; + adreno_check_and_reenable_stall(adreno_gpu); + /* * Toggle concurrent binning for pagetable switch and set the thread to * BR since only it can execute the pagetable switch packets. diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/adreno/adreno_gpu.c index 4a6dc29ff7071940e440297f5fbbe4e2d06c3ffd..0f8211641c318f1b619e1a72bb77f064fb78397b 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c @@ -246,16 +246,54 @@ u64 adreno_private_address_space_size(struct msm_gpu *gpu) return SZ_4G; } +void adreno_check_and_reenable_stall(struct adreno_gpu *adreno_gpu) +{ + struct msm_gpu *gpu = &adreno_gpu->base; + struct msm_drm_private *priv = gpu->dev->dev_private; + unsigned long flags; + + /* + * Wait until the cooldown period has passed and we would actually + * collect a crashdump to re-enable stall-on-fault. + */ + spin_lock_irqsave(&priv->fault_stall_lock, flags); + if (!priv->stall_enabled && + ktime_after(ktime_get(), priv->stall_reenable_time) && + !READ_ONCE(gpu->crashstate)) { + priv->stall_enabled = true; + + gpu->aspace->mmu->funcs->set_stall(gpu->aspace->mmu, true); + } + spin_unlock_irqrestore(&priv->fault_stall_lock, flags); +} + #define ARM_SMMU_FSR_TF BIT(1) #define ARM_SMMU_FSR_PF BIT(3) #define ARM_SMMU_FSR_EF BIT(4) +#define ARM_SMMU_FSR_SS BIT(30) int adreno_fault_handler(struct msm_gpu *gpu, unsigned long iova, int flags, struct adreno_smmu_fault_info *info, const char *block, u32 scratch[4]) { + struct msm_drm_private *priv = gpu->dev->dev_private; const char *type = "UNKNOWN"; - bool do_devcoredump = info && !READ_ONCE(gpu->crashstate); + bool do_devcoredump = info && (info->fsr & ARM_SMMU_FSR_SS) && + !READ_ONCE(gpu->crashstate); + unsigned long irq_flags; + + /* + * In case there is a subsequent storm of pagefaults, disable + * stall-on-fault for at least half a second. + */ + spin_lock_irqsave(&priv->fault_stall_lock, irq_flags); + if (priv->stall_enabled) { + priv->stall_enabled = false; + + gpu->aspace->mmu->funcs->set_stall(gpu->aspace->mmu, false); + } + priv->stall_reenable_time = ktime_add_ms(ktime_get(), 500); + spin_unlock_irqrestore(&priv->fault_stall_lock, irq_flags); /* * Print a default message if we couldn't get the data from the diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.h b/drivers/gpu/drm/msm/adreno/adreno_gpu.h index 92caba3584da0400b44a903e465814af165d40a3..6116f03e3d39bb208c7fa34f203931c563e029f9 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.h +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.h @@ -634,6 +634,8 @@ int adreno_fault_handler(struct msm_gpu *gpu, unsigned long iova, int flags, struct adreno_smmu_fault_info *info, const char *block, u32 scratch[4]); +void adreno_check_and_reenable_stall(struct adreno_gpu *gpu); + int adreno_read_speedbin(struct device *dev, u32 *speedbin); /* diff --git a/drivers/gpu/drm/msm/msm_debugfs.c b/drivers/gpu/drm/msm/msm_debugfs.c index 7ab607252d183f78b99c3a8b878c949ed5f99fec..6af72162cda4c8d4bc8dd4c6473cbc29817bb3c6 100644 --- a/drivers/gpu/drm/msm/msm_debugfs.c +++ b/drivers/gpu/drm/msm/msm_debugfs.c @@ -208,6 +208,35 @@ DEFINE_DEBUGFS_ATTRIBUTE(shrink_fops, shrink_get, shrink_set, "0x%08llx\n"); +/* + * Return the number of microseconds to wait until stall-on-fault is + * re-enabled. If 0 then it is already enabled or will be re-enabled on the + * next submit (unless there's a leftover devcoredump). This is useful for + * kernel tests that intentionally produce a fault and check the devcoredump to + * wait until the cooldown period is over. + */ + +static int +stall_reenable_time_get(void *data, u64 *val) +{ + struct msm_drm_private *priv = data; + unsigned long irq_flags; + + spin_lock_irqsave(&priv->fault_stall_lock, irq_flags); + + if (priv->stall_enabled) + *val = 0; + else + *val = max(ktime_us_delta(priv->stall_reenable_time, ktime_get()), 0); + + spin_unlock_irqrestore(&priv->fault_stall_lock, irq_flags); + + return 0; +} + +DEFINE_DEBUGFS_ATTRIBUTE(stall_reenable_time_fops, + stall_reenable_time_get, NULL, + "%lld\n"); static int msm_gem_show(struct seq_file *m, void *arg) { @@ -319,6 +348,9 @@ static void msm_debugfs_gpu_init(struct drm_minor *minor) debugfs_create_bool("disable_err_irq", 0600, minor->debugfs_root, &priv->disable_err_irq); + debugfs_create_file("stall_reenable_time_us", 0400, minor->debugfs_root, + priv, &stall_reenable_time_fops); + gpu_devfreq = debugfs_create_dir("devfreq", minor->debugfs_root); debugfs_create_bool("idle_clamp",0600, gpu_devfreq, diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c index c3588dc9e53764a27efda1901b094724cec8928a..04a4bde2d33b03ae8fb06b2134ee1910debd774a 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -245,6 +245,10 @@ static int msm_drm_init(struct device *dev, const struct drm_driver *drv) drm_gem_lru_init(&priv->lru.willneed, &priv->lru.lock); drm_gem_lru_init(&priv->lru.dontneed, &priv->lru.lock); + /* Initialize stall-on-fault */ + spin_lock_init(&priv->fault_stall_lock); + priv->stall_enabled = true; + /* Teach lockdep about lock ordering wrt. shrinker: */ fs_reclaim_acquire(GFP_KERNEL); might_lock(&priv->lru.lock); diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h index a65077855201746c37ee742364b61116565f3794..c8afb1ea6040b1ac94ac95a785e6fc366c8dbfd1 100644 --- a/drivers/gpu/drm/msm/msm_drv.h +++ b/drivers/gpu/drm/msm/msm_drv.h @@ -222,6 +222,29 @@ struct msm_drm_private { * the sw hangcheck mechanism. */ bool disable_err_irq; + + /** + * @fault_stall_lock: + * + * Serialize changes to stall-on-fault state. + */ + spinlock_t fault_stall_lock; + + /** + * @fault_stall_reenable_time: + * + * If stall_enabled is false, when to reenable stall-on-fault. + * Protected by @fault_stall_lock. + */ + ktime_t stall_reenable_time; + + /** + * @stall_enabled: + * + * Whether stall-on-fault is currently enabled. Protected by + * @fault_stall_lock. + */ + bool stall_enabled; }; const struct msm_format *mdp_get_format(struct msm_kms *kms, uint32_t format, uint64_t modifier); diff --git a/drivers/gpu/drm/msm/msm_iommu.c b/drivers/gpu/drm/msm/msm_iommu.c index aae885d048d0d2fd617d7b2a16833da25f5e84cc..739ce2c283a4613e74df4542ca3b68f180aa8335 100644 --- a/drivers/gpu/drm/msm/msm_iommu.c +++ b/drivers/gpu/drm/msm/msm_iommu.c @@ -372,6 +372,14 @@ static int msm_disp_fault_handler(struct iommu_domain *domain, struct device *de return -ENOSYS; } +static void msm_iommu_set_stall(struct msm_mmu *mmu, bool enable) +{ + struct adreno_smmu_priv *adreno_smmu = dev_get_drvdata(mmu->dev); + + if (adreno_smmu->set_stall) + adreno_smmu->set_stall(adreno_smmu->cookie, enable); +} + static void msm_iommu_detach(struct msm_mmu *mmu) { struct msm_iommu *iommu = to_msm_iommu(mmu); @@ -419,6 +427,7 @@ static const struct msm_mmu_funcs funcs = { .map = msm_iommu_map, .unmap = msm_iommu_unmap, .destroy = msm_iommu_destroy, + .set_stall = msm_iommu_set_stall, }; struct msm_mmu *msm_iommu_new(struct device *dev, unsigned long quirks) diff --git a/drivers/gpu/drm/msm/msm_mmu.h b/drivers/gpu/drm/msm/msm_mmu.h index c3d17aae88b0a57b3c7d1df3351b39ec39bca60a..0c694907140d00bae86eb20411aed45650367e74 100644 --- a/drivers/gpu/drm/msm/msm_mmu.h +++ b/drivers/gpu/drm/msm/msm_mmu.h @@ -15,6 +15,7 @@ struct msm_mmu_funcs { size_t len, int prot); int (*unmap)(struct msm_mmu *mmu, uint64_t iova, size_t len); void (*destroy)(struct msm_mmu *mmu); + void (*set_stall)(struct msm_mmu *mmu, bool enable); }; enum msm_mmu_type { From patchwork Tue May 20 19:09:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Connor Abbott X-Patchwork-Id: 891335 Received: from mail-qv1-f51.google.com (mail-qv1-f51.google.com [209.85.219.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D18A428137F for ; Tue, 20 May 2025 19:09:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747768151; cv=none; b=llmvkHmUuwZZt7aohbAI2jbqVDGBhlkSoU8JIc1naXaYwW07q7+5c5QeeXnwP1VfsPQzNzofvV1fzggUUP7JYGVnK8RBQF6RgglFWF1PISpjWMva5JuM212lC7QdRnWgd+7T1QzsYdCuNwQF2UQD1aAdNdCRJmhC+OQ9byncwfM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747768151; c=relaxed/simple; bh=T92V8eX3Vz4beQQo+V6nyo4FyO6B+nwmyPWJT1oO+Pk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=stOyKkiX+Pq2B91PWFwl11TUaoEFSqeiK4BOoPM52jzbomcAMhU25j8EUJY01X1k+hUEIpvE7gz2wUwJYzHXQdRv4SkAOZi1fbnHdh8hRIdzkomeXMqQ9NFBppXURCaSWohuJ+QhnZehpYfxc/6gm2rr5myntyfhVc/0nIxv2hQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=KaCkP+iV; arc=none smtp.client-ip=209.85.219.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="KaCkP+iV" Received: by mail-qv1-f51.google.com with SMTP id 6a1803df08f44-6eeceb05894so8083856d6.0 for ; Tue, 20 May 2025 12:09:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1747768149; x=1748372949; 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=k/0lqXBgLimY0A+nlogIvRC91H4XJPyHb2uLAtGHc+4=; b=KaCkP+iVUH3vnC3EnbId1PTIzQailqTd+DO2fV8MPiO16MMYCbtaInTHTJClZMnrnc rILiaO/VYgLKCXy0oVJHAIX4gcfa6RmBlKTVlVt1+8X7aJtu9M/il3FWTLD7khmXTOZP yK9cTnUMKChs/xVA3vDihW8ElOoB2J9caCcTYqpGjOW6STWsPGnpmwcW/feRHqmSryqD 2u5FuDvXU9QsUoVMnYdVyS7kV+B6HDIx/Jr4xAxXMPpmdvb3URfn/c+jEA0ZcRGjP/eN eauKGxzQf1pYON5JgfgY+2VDmFAbs6VxmypXa3dA4UsUOsI2piuVF+WZ1hzGczNlHtKZ HAkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747768149; x=1748372949; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=k/0lqXBgLimY0A+nlogIvRC91H4XJPyHb2uLAtGHc+4=; b=S5zt4Kf08v5ktu0QYVSuItffKE4Z5psg68g6p97xFZVQwSHxOC/H7t6LkDvs3F9N5k 78LnFfWeDRQ4vQloSsI28cvJPRRPOXIIep7oBRAHWiGbdrarXzhpvDtyStrumQc7DYan Zn6jRFUdqi4Ia05SMV5XYIQDwlwQ0zvZ2/2g4TnKH4bY/Z9A/q4S+dmJLJPxjj5DFG3R 5LENyc+tKSZGMH66DSzkO/Zv0v4+sF2KKu/DnWIPe70Xps1Pu3qDD/k0dUXJCcKqPfnq 9nlTQdNZgVS+W0VDPY9aZwZcFbSjuuGaH1mJcqmE6A1hBhCSgALWeh7FO/YuL93CaEZg eqmg== X-Forwarded-Encrypted: i=1; AJvYcCWudHkkrtg7Pf06AT+Ecsl+2+7i8ZbhAz3yAopBKD3tpK15pF8beCZxlSw534APT7DUhXWmgCyVkVIH6C/3@vger.kernel.org X-Gm-Message-State: AOJu0YyU1k90oWPVBBD3dmj8F9Lf2xp79X4eBnaOCg1r2SdFthN1dkwu M/E9v6quWGRBGQSQDUF6OIltR3u3+bmKj8N/h5skWBec98qzZGawNoI+za21vtqO X-Gm-Gg: ASbGncuyL08ti4b+ieLro7kl+HiBqCHM6cS6MH87qAN/OKnZJv+cw1KWUhLe6jpGtpw nPZtdc/II9JlJZRtpMDWOem47UxuHxqoDLCjwJ6I+PW8ge0eIaURGkX6bPOkzlU863HiuQuSwpl hH35lHoPG3kpyF2ZoiJnlJ8RBQ1ZyK088A9dVAULlA3l9FI1OQ58XCgTCM/fsYvObGoQ/gccD+b /1LgzVoAL+1QE9JdlUfs5r5kUs8Q3snwrULkLBb3H4W1AFDH8phhDCNVKwvNcG+lZcn8YrYKnyF d3mNJD1JXdzcHyyhvkrSo2brxSdWqYCzIB62eMqctu7Xd4eB8Twoj2e2p9YygEpTxrxq3oZR5aH VJAUvDbscHNfoX3e87K/cKPzHnr0W3g== X-Google-Smtp-Source: AGHT+IFR5pt9/GVP1EPATJ5cgZRIzs6LVruq0q5vYeQ0eAM0wqovWxYcOeeO8H0l7rzEaFl4O0FbJQ== X-Received: by 2002:ac8:5893:0:b0:47a:e5b6:50d4 with SMTP id d75a77b69052e-494ae3f7e46mr90403491cf.10.1747768148499; Tue, 20 May 2025 12:09:08 -0700 (PDT) Received: from [192.168.124.1] (syn-067-243-142-039.res.spectrum.com. [67.243.142.39]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-494ae445b99sm76554051cf.48.2025.05.20.12.09.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 May 2025 12:09:07 -0700 (PDT) From: Connor Abbott Date: Tue, 20 May 2025 15:09:00 -0400 Subject: [PATCH v8 7/7] iommu/smmu-arm-qcom: Delete resume_translation() Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250520-msm-gpu-fault-fixes-next-v8-7-fce6ee218787@gmail.com> References: <20250520-msm-gpu-fault-fixes-next-v8-0-fce6ee218787@gmail.com> In-Reply-To: <20250520-msm-gpu-fault-fixes-next-v8-0-fce6ee218787@gmail.com> To: Rob Clark , Will Deacon , Robin Murphy , Joerg Roedel , Sean Paul , Konrad Dybcio , Abhinav Kumar , Dmitry Baryshkov , Marijn Suijten Cc: iommu@lists.linux.dev, linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, freedreno@lists.freedesktop.org, Connor Abbott X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1747768138; l=1671; i=cwabbott0@gmail.com; s=20240426; h=from:subject:message-id; bh=T92V8eX3Vz4beQQo+V6nyo4FyO6B+nwmyPWJT1oO+Pk=; b=V6LelLjLszEjGIEg7Z7nBX+1w5ysEhFN0tIa8dRMNROYBzA6VMJ+NwDe2jnJAGKdUiJCz18nz McgNjrJt/A6BgWCGL2r/nQUpmNIJeHTCHHVFZazeqlf0zl9zY1lh5XO X-Developer-Key: i=cwabbott0@gmail.com; a=ed25519; pk=dkpOeRSXLzVgqhy0Idr3nsBr4ranyERLMnoAgR4cHmY= Unused since "drm/msm: Delete resume_translation()". Signed-off-by: Connor Abbott --- include/linux/adreno-smmu-priv.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/include/linux/adreno-smmu-priv.h b/include/linux/adreno-smmu-priv.h index d83c9175828f792f1f43bcc8056102a43d822c96..4106b6b372117119bbebe67896de18fc6286fb44 100644 --- a/include/linux/adreno-smmu-priv.h +++ b/include/linux/adreno-smmu-priv.h @@ -46,9 +46,8 @@ struct adreno_smmu_fault_info { * @get_fault_info: Called by the GPU fault handler to get information about * the fault * @set_stall: Configure whether stall on fault (CFCFG) is enabled. If - * stalling on fault is enabled, the GPU driver must call - * resume_translation() - * @resume_translation: Resume translation after a fault + * stalling on fault is enabled, the GPU driver should return + * -EAGAIN from the fault handler if retrying is required. * * @set_prr_bit: [optional] Configure the GPU's Partially Resident * Region (PRR) bit in the ACTLR register. @@ -71,7 +70,6 @@ struct adreno_smmu_priv { int (*set_ttbr0_cfg)(const void *cookie, const struct io_pgtable_cfg *cfg); void (*get_fault_info)(const void *cookie, struct adreno_smmu_fault_info *info); void (*set_stall)(const void *cookie, bool enabled); - void (*resume_translation)(const void *cookie, bool terminate); void (*set_prr_bit)(const void *cookie, bool set); void (*set_prr_addr)(const void *cookie, phys_addr_t page_addr); };