From patchwork Wed Jul 17 16:36:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Clark X-Patchwork-Id: 813045 Received: from mail-pg1-f176.google.com (mail-pg1-f176.google.com [209.85.215.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 0FD431822FC; Wed, 17 Jul 2024 16:36:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721234210; cv=none; b=AuwGUQkmfc2YBwUak7ckDr1CY7qDnjk592mx3u9+3I0wu/aSeNMAnlszWvsF+Y+Ifx+SAWIoBRBEPvVvGxoshjCvyqLTjBMkbXM2PGAzQOHUBGjWQtnsM8pKabc2xem/sz5hGl4faIONCsk4bq3iwMT6gIvTLzmr1UIv5C3+VpA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721234210; c=relaxed/simple; bh=EXa+5vTmcxoUuXvQQRPtLI8UEFIgaX83Fl5fQzX0jNA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=I/33EEhhVmmPup+WceHJOoCcHsc/ItIVg5N+HbQ4mraqGyTymj+hkejI5wEWHN7Qey23PnPPVmPw6jClnRazoHmFiZm7w35y3qqEHyV0kC+GN/f+sUn9eP+j2vLRppO/UXd2j1Man36jtN2pfUvM9ipES0zLJRnM3DKTnMsWelI= 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=bkPpvfNV; arc=none smtp.client-ip=209.85.215.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="bkPpvfNV" Received: by mail-pg1-f176.google.com with SMTP id 41be03b00d2f7-78135be2d46so5059708a12.0; Wed, 17 Jul 2024 09:36:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721234208; x=1721839008; 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=k6Tzu3jqDnrHHZ5FSIBBjtL4u5IM8MddfjcNgRKO5h4=; b=bkPpvfNVtvRcYY7hkkzPJ1sx69vPd/TdBQIBH/qqGFuEIXLJFIHdYqPhqS2U9vpXJ1 ShfwTmHu32+3yomm0iYt7EpPsElxeJdaI0zkCo61hy31JFo5og58vwPmiUmuPI5MnIzl fWSktm7rFo2RXC57BMZQjL5KjjYErEvASt6ZylMyD9Ge0UIBFTuyarF8yDN9mmnHGmSn 6y0dEIfrx3H/My68N3brnj1wRkl7T/uqEGn1Klwu+HFSzDL8t3i5jHCkg4PUZQZpPX48 6obFfHSSD3Ii23eqGDdl73pF4/YTudtF8AeLMJfzSRcU9nJHRiL3D4leZbb6rsas6ey7 YCVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721234208; x=1721839008; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=k6Tzu3jqDnrHHZ5FSIBBjtL4u5IM8MddfjcNgRKO5h4=; b=Q+rkA5yOi8CibBJBCm4Rhvh4QFXsh/gpL9ZmdbLGBSLg6tus5ZnpgY0BsXSfh0m5Ho wD9zga4RmiGTHNmgi0zRMTcZrr6ZXZfQCPY9tlOFltSnmPY8kcuizTim8p2/9axtuhii TQMYyGqxbv8zb0KT+dYm6OuYsMyv8m2KP6XsZCcVjZZewWFzpo6cRWGxI6oS/jCfgmU2 JduqR2L5N01EEPbs8joDuxXAZOgW+4LCIfbTAHLLLfrBtHGJodRFQjiQLqyyrFzXfWni Ucre+MaerVOmczseyxxMExY3VuqqLYtuOIgcFXGBoxKB518gwWVZXZJuq/9zK+b+H01Q RZXA== X-Forwarded-Encrypted: i=1; AJvYcCVeIhnYpiPrm2kWt2KjwoBq7j6e2x9bXe8tqQ9rDQgqMyFnIhLx+kxuDzW8Sj4+VTv/951FsECICoMHdDvA0dN9p/oTDOOYj/XEf5Wx X-Gm-Message-State: AOJu0YwF1TgHelTkmPTWTH3sLQIAv65BMd+CuIGFEQ3+vpH7wo6Btgdg z7irRccVgGkXIkCCNqYYM+j91IKCTblB+7Id8MNPQ9duj5XpYfKz X-Google-Smtp-Source: AGHT+IGIVLKct6v1Oci+VuGJ7UT7SE6hP+ygLz1F90SRFxG4sJMTvo9g2QIVO0csBQ8iVqkgrRwXeA== X-Received: by 2002:a05:6a20:b603:b0:1c3:b61c:57cb with SMTP id adf61e73a8af0-1c3fdddac55mr2602613637.53.1721234208143; Wed, 17 Jul 2024 09:36:48 -0700 (PDT) Received: from localhost ([2a00:79e1:2e00:1301:e1c5:6354:b45d:8ffc]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-70b7ebd0a8bsm8646251b3a.90.2024.07.17.09.36.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Jul 2024 09:36:46 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, iommu@lists.linux.dev, Will Deacon , Rob Clark , Rob Clark , Sean Paul , Konrad Dybcio , Abhinav Kumar , Dmitry Baryshkov , Marijn Suijten , David Airlie , Daniel Vetter , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v6 2/2] drm/msm: Extend gpu devcore dumps with pgtbl info Date: Wed, 17 Jul 2024 09:36:22 -0700 Message-ID: <20240717163627.43423-3-robdclark@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240717163627.43423-1-robdclark@gmail.com> References: <20240717163627.43423-1-robdclark@gmail.com> Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Rob Clark In the case of iova fault triggered devcore dumps, include additional debug information based on what we think is the current page tables, including the TTBR0 value (which should match what we have in adreno_smmu_fault_info unless things have gone horribly wrong), and the pagetable entries traversed in the process of resolving the faulting iova. Signed-off-by: Rob Clark --- drivers/gpu/drm/msm/adreno/adreno_gpu.c | 10 ++++++++++ drivers/gpu/drm/msm/msm_gpu.c | 9 +++++++++ drivers/gpu/drm/msm/msm_gpu.h | 8 ++++++++ drivers/gpu/drm/msm/msm_iommu.c | 22 ++++++++++++++++++++++ drivers/gpu/drm/msm/msm_mmu.h | 3 ++- 5 files changed, 51 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/adreno/adreno_gpu.c index 99661af8d941..422dae873b6b 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c @@ -861,6 +861,16 @@ void adreno_show(struct msm_gpu *gpu, struct msm_gpu_state *state, drm_printf(p, " - dir=%s\n", info->flags & IOMMU_FAULT_WRITE ? "WRITE" : "READ"); drm_printf(p, " - type=%s\n", info->type); drm_printf(p, " - source=%s\n", info->block); + + /* Information extracted from what we think are the current + * pgtables. Hopefully the TTBR0 matches what we've extracted + * from the SMMU registers in smmu_info! + */ + drm_puts(p, "pgtable-fault-info:\n"); + drm_printf(p, " - ttbr0: %.16llx\n", (u64)info->pgtbl_ttbr0); + drm_printf(p, " - asid: %d\n", info->asid); + drm_printf(p, " - ptes: %.16llx %.16llx %.16llx %.16llx\n", + info->ptes[0], info->ptes[1], info->ptes[2], info->ptes[3]); } drm_printf(p, "rbbm-status: 0x%08x\n", state->rbbm_status); diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c index 3666b42b4ecd..bf2f8b2a7ccc 100644 --- a/drivers/gpu/drm/msm/msm_gpu.c +++ b/drivers/gpu/drm/msm/msm_gpu.c @@ -281,6 +281,15 @@ static void msm_gpu_crashstate_capture(struct msm_gpu *gpu, if (submit) { int i; + if (state->fault_info.ttbr0) { + struct msm_gpu_fault_info *info = &state->fault_info; + struct msm_mmu *mmu = submit->aspace->mmu; + + msm_iommu_pagetable_params(mmu, &info->pgtbl_ttbr0, + &info->asid); + msm_iommu_pagetable_walk(mmu, info->iova, info->ptes); + } + state->bos = kcalloc(submit->nr_bos, sizeof(struct msm_gpu_state_bo), GFP_KERNEL); diff --git a/drivers/gpu/drm/msm/msm_gpu.h b/drivers/gpu/drm/msm/msm_gpu.h index 1f02bb9956be..82e838ba8c80 100644 --- a/drivers/gpu/drm/msm/msm_gpu.h +++ b/drivers/gpu/drm/msm/msm_gpu.h @@ -101,6 +101,14 @@ struct msm_gpu_fault_info { int flags; const char *type; const char *block; + + /* Information about what we think/expect is the current SMMU state, + * for example expected_ttbr0 should match smmu_info.ttbr0 which + * was read back from SMMU registers. + */ + phys_addr_t pgtbl_ttbr0; + u64 ptes[4]; + int asid; }; /** diff --git a/drivers/gpu/drm/msm/msm_iommu.c b/drivers/gpu/drm/msm/msm_iommu.c index d5512037c38b..0c35a5b597f3 100644 --- a/drivers/gpu/drm/msm/msm_iommu.c +++ b/drivers/gpu/drm/msm/msm_iommu.c @@ -195,6 +195,28 @@ struct iommu_domain_geometry *msm_iommu_get_geometry(struct msm_mmu *mmu) return &iommu->domain->geometry; } +int +msm_iommu_pagetable_walk(struct msm_mmu *mmu, unsigned long iova, uint64_t ptes[4]) +{ + struct msm_iommu_pagetable *pagetable; + struct arm_lpae_io_pgtable_walk_data wd = {}; + + if (mmu->type != MSM_MMU_IOMMU_PAGETABLE) + return -EINVAL; + + pagetable = to_pagetable(mmu); + + if (!pagetable->pgtbl_ops->pgtable_walk) + return -EINVAL; + + pagetable->pgtbl_ops->pgtable_walk(pagetable->pgtbl_ops, iova, &wd); + + for (int i = 0; i < ARRAY_SIZE(wd.ptes); i++) + ptes[i] = wd.ptes[i]; + + return 0; +} + static const struct msm_mmu_funcs pagetable_funcs = { .map = msm_iommu_pagetable_map, .unmap = msm_iommu_pagetable_unmap, diff --git a/drivers/gpu/drm/msm/msm_mmu.h b/drivers/gpu/drm/msm/msm_mmu.h index 88af4f490881..96e509bd96a6 100644 --- a/drivers/gpu/drm/msm/msm_mmu.h +++ b/drivers/gpu/drm/msm/msm_mmu.h @@ -53,7 +53,8 @@ static inline void msm_mmu_set_fault_handler(struct msm_mmu *mmu, void *arg, struct msm_mmu *msm_iommu_pagetable_create(struct msm_mmu *parent); int msm_iommu_pagetable_params(struct msm_mmu *mmu, phys_addr_t *ttbr, - int *asid); + int *asid); +int msm_iommu_pagetable_walk(struct msm_mmu *mmu, unsigned long iova, uint64_t ptes[4]); struct iommu_domain_geometry *msm_iommu_get_geometry(struct msm_mmu *mmu); #endif /* __MSM_MMU_H__ */