From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A1B5DC3ABD8 for ; Wed, 14 May 2025 17:57:14 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 172BB10E6F6; Wed, 14 May 2025 17:57:14 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="CgDNoF/y"; dkim-atps=neutral Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by gabe.freedesktop.org (Postfix) with ESMTPS id 93EEA10E6EA; Wed, 14 May 2025 17:57:12 +0000 (UTC) Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-22e09f57ed4so13898695ad.0; Wed, 14 May 2025 10:57:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1747245432; x=1747850232; darn=lists.freedesktop.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=zY1avGRqORwj7W2bUyBF8WM5IlOJxuqb8uwI4O2Hev0=; b=CgDNoF/yJSY48iyNK6pFcs31j48PZSF0myUVGUbJ8kJmXx1ASaiFHZYb/AneSWuZ2x 6Qg4CQJCphMHqJS0oHI/LvyM9XmNF6tLhyo8muvMVUnvMMWHKpBJ3Lc8E/cS/3g6BN/0 uO86wVh4ooVX7S5iMrNNOR9iJJ/tuTC7AkMVD0etMUyh72xpJEw4EumfoBGFB1MLFCLI WSnoAvl6c7fd98LX9PKR1hYzVcosJ/1wklpaTwCP75/eaXvhTgPliMvhxyHrEagh6EFm gsvTq8bM3x6EH/RR/hTwp7a8dJ44SG32KEvuZUV/DUpc251H7RfSJg6TzQVCaWTlHFil nUmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747245432; x=1747850232; 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=zY1avGRqORwj7W2bUyBF8WM5IlOJxuqb8uwI4O2Hev0=; b=CPsQzGe01L2tU9DPqxeR0DfTTIpabWYIC98/LT30+wMoOIjBBpnCg1yXRtO5SESN/j 9aPbA0+t8Ec5aY8ALMFKCuJNtSIPixNujVZFfnNBtAcUrho9bq/vMJaJPgnpc++VZOZv a0mfB/cy/VnsQjJxFRtFy3g0ljmDc0TM91XdXwAsrMuVYYDx2GRgoL+jO1+r4Ke1cJuQ OPIusz1IpzyJdSLeY/skMaauuW9u4hq5yyYt8DQTB7DvMoe2S9NC8cHQMdJKkCDhghyv V1N2ljwKiRTBonVN8P3wAcEN6zzxnlzAAlAYFfLSKEARAqW/yjrBJIU4atiX2KBRoy0H 18RA== X-Gm-Message-State: AOJu0YxM7BWcSMK+eBhEgoK1HcNgNdzsFjWNljI3qU0KO1RKtysnqrdt EIHHbPQDuNziDQk5fpBv5zbIee4VeLwtZ0+nEndf2CPuUnbJW/2YcVn0Sx19zA== X-Gm-Gg: ASbGncsXiDNq18J8CEUgYu9Uv82Dh7EwOzgL1BEisKELf9IBxgD6hD5JFNW2PYiCGVo 1NQdWqQNHVkgn9IySmafXYBOyVVvYtm8j2dR7p3azlcXxztr1xRC1/sSEoYN0uWaGfToMeFn2zM bc4U5G/F9spIPmINJINncixNjSiywoB+PTN1j4N0DfV24J/O1fcLWJKw1ujWfpGa/dW1tt4AgfT tkJygVAx3oRJ+WocYBqsDxHekazwrjDBBG2fyE3gBeml5iXMuJpZbfaIn/cW6xRkS19BJ2R7E8N w19OjOq33PuosMuaVOiL1IgmxKEgBftQzn2PA0ytXcq3CFMUSIw6RegVArxhhI9wDJizkM05N77 tnMyhjK6m1VQbzkNJy9I43KfFvg== X-Google-Smtp-Source: AGHT+IG/+xY6qb4AV9LP07ImSMvm3YeFfAWitThhxMXxaIU6sLb9wVec6ZxoTIx6/t7EiUtMMCTfpg== X-Received: by 2002:a17:903:28c:b0:21f:98fc:8414 with SMTP id d9443c01a7336-231b39ee975mr6079305ad.26.1747245431695; Wed, 14 May 2025 10:57:11 -0700 (PDT) Received: from localhost ([2a00:79e0:3e00:2601:3afc:446b:f0df:eadc]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-b2350ddb6e8sm9229093a12.57.2025.05.14.10.57.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 May 2025 10:57:11 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, Connor Abbott , Rob Clark , Rob Clark , Sean Paul , Konrad Dybcio , Abhinav Kumar , Dmitry Baryshkov , Marijn Suijten , David Airlie , Simona Vetter , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v4 27/40] drm/msm: Crashdec support for sparse Date: Wed, 14 May 2025 10:53:41 -0700 Message-ID: <20250514175527.42488-28-robdclark@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250514175527.42488-1-robdclark@gmail.com> References: <20250514175527.42488-1-robdclark@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Rob Clark In this case, we need to iterate the VMAs looking for ones with MSM_VMA_DUMP flag. Signed-off-by: Rob Clark --- drivers/gpu/drm/msm/msm_gpu.c | 96 ++++++++++++++++++++++++++--------- 1 file changed, 72 insertions(+), 24 deletions(-) diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c index 2eaca2a22de9..b70355fc8570 100644 --- a/drivers/gpu/drm/msm/msm_gpu.c +++ b/drivers/gpu/drm/msm/msm_gpu.c @@ -241,9 +241,7 @@ static void msm_gpu_crashstate_get_bo(struct msm_gpu_state *state, if (!state_bo->data) goto out; - msm_gem_lock(obj); ptr = msm_gem_get_vaddr_active(obj); - msm_gem_unlock(obj); if (IS_ERR(ptr)) { kvfree(state_bo->data); state_bo->data = NULL; @@ -251,12 +249,75 @@ static void msm_gpu_crashstate_get_bo(struct msm_gpu_state *state, } memcpy(state_bo->data, ptr + offset, size); - msm_gem_put_vaddr(obj); + msm_gem_put_vaddr_locked(obj); } out: state->nr_bos++; } +static void crashstate_get_bos(struct msm_gpu_state *state, struct msm_gem_submit *submit) +{ + extern bool rd_full; + + if (!submit) + return; + + if (msm_context_is_vmbind(submit->queue->ctx)) { + struct drm_exec exec; + struct drm_gpuva *vma; + unsigned cnt = 0; + + drm_exec_init(&exec, DRM_EXEC_IGNORE_DUPLICATES, 0); + drm_exec_until_all_locked(&exec) { + cnt = 0; + + drm_exec_lock_obj(&exec, drm_gpuvm_resv_obj(submit->vm)); + drm_exec_retry_on_contention(&exec); + + drm_gpuvm_for_each_va (vma, submit->vm) { + if (!vma->gem.obj) + continue; + + cnt++; + drm_exec_lock_obj(&exec, vma->gem.obj); + drm_exec_retry_on_contention(&exec); + } + + } + + drm_gpuvm_for_each_va (vma, submit->vm) + cnt++; + + state->bos = kcalloc(cnt, sizeof(struct msm_gpu_state_bo), GFP_KERNEL); + + drm_gpuvm_for_each_va (vma, submit->vm) { + bool dump = rd_full || (vma->flags & MSM_VMA_DUMP); + + /* Skip MAP_NULL/PRR VMAs: */ + if (!vma->gem.obj) + continue; + + msm_gpu_crashstate_get_bo(state, vma->gem.obj, vma->va.addr, + dump, vma->gem.offset, vma->va.range); + } + + drm_exec_fini(&exec); + } else { + state->bos = kcalloc(submit->nr_bos, + sizeof(struct msm_gpu_state_bo), GFP_KERNEL); + + for (int i = 0; state->bos && i < submit->nr_bos; i++) { + struct drm_gem_object *obj = submit->bos[i].obj; + bool dump = rd_full || (submit->bos[i].flags & MSM_SUBMIT_BO_DUMP); + + msm_gem_lock(obj); + msm_gpu_crashstate_get_bo(state, obj, submit->bos[i].iova, + dump, 0, obj->size); + msm_gem_unlock(obj); + } + } +} + static void msm_gpu_crashstate_capture(struct msm_gpu *gpu, struct msm_gem_submit *submit, char *comm, char *cmd) { @@ -279,30 +340,17 @@ static void msm_gpu_crashstate_capture(struct msm_gpu *gpu, state->cmd = kstrdup(cmd, GFP_KERNEL); state->fault_info = gpu->fault_info; - if (submit) { - extern bool rd_full; - int i; - - if (state->fault_info.ttbr0) { - struct msm_gpu_fault_info *info = &state->fault_info; - struct msm_mmu *mmu = to_msm_vm(submit->vm)->mmu; + if (submit && state->fault_info.ttbr0) { + struct msm_gpu_fault_info *info = &state->fault_info; + struct msm_mmu *mmu = to_msm_vm(submit->vm)->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); - - for (i = 0; state->bos && i < submit->nr_bos; i++) { - struct drm_gem_object *obj = submit->bos[i].obj; - bool dump = rd_full || (submit->bos[i].flags & MSM_SUBMIT_BO_DUMP); - msm_gpu_crashstate_get_bo(state, obj, submit->bos[i].iova, - dump, 0, obj->size); - } + msm_iommu_pagetable_params(mmu, &info->pgtbl_ttbr0, + &info->asid); + msm_iommu_pagetable_walk(mmu, info->iova, info->ptes); } + crashstate_get_bos(state, submit); + /* Set the active crash state to be dumped on failure */ gpu->crashstate = state; -- 2.49.0