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 A6321C54795 for ; Mon, 19 May 2025 17:58:42 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6CE2B10E487; Mon, 19 May 2025 17:58:40 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="gJjfpjRw"; dkim-atps=neutral Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by gabe.freedesktop.org (Postfix) with ESMTPS id BD76410E481; Mon, 19 May 2025 17:58:33 +0000 (UTC) Received: by mail-pf1-f182.google.com with SMTP id d2e1a72fcca58-742c3d06de3so2145338b3a.0; Mon, 19 May 2025 10:58:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1747677513; x=1748282313; 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=gJjfpjRwgdNtTmqssGnIZSz8NME3F6VlQT6dSPBM8CI4LdBPcbPir2gZK5yGtjyQg/ bedImADOltXfOvHcKy31ckk2b+phu/gcIXxku32gR9kdd+jcC+tphb/3nLEAI9DcViOH GjdvU0ybd7aX7VrKOGrE7sdaEYeSVg2U+iOqhZTjYZen7ccBmCFd++6Ma9Gon0MkVQud mdYIPLBCEwgXn8aqFWS0HDrhYpWTwjs392Y2AYJAuTcJH/RcS9Yi/S6ahuPDH3ze4Qax 7tef0wwR/40OHEwMgShopGxYP1SY+lr1R6vSpYkpZJsTn8ZEf+ZoUIeTYyyemRcUVQ21 WBAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747677513; x=1748282313; 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=aB0O+NTGt2Bm2Cs3m0x0p6Dph7QoJ0mAqcg4ivjKccGTxsNC3PcspwYt8lIJWAdkBN GHU4tkqAE+PrnFOCigBvmum33wzAyepAdLOxEUH/R0BPurLSFglgYEW/BrB0gv3vZYzR H3+yUH7Tbd7HpEgS4Gig9UbvpoL78e1DybGGdqeSPeXKWLbcoVRfEw+WihDbk/AwxTmv NBsA1INsIV1SdSgT4xUCAOokuoyofh9HEEHyuTneCsx8UpZGmHpFxOXWn09rRWeCqVYB ntfCBj4gXNnfY/nHNLwS9cQd6wjwwcp5jwXlBkgAYSsGV1I/kDHMxQq6H7Jg6B9mxHw6 8bXQ== X-Gm-Message-State: AOJu0Yy9U0trFoBcrVRVeitxabZVNdmWggyJYAYJAfKVtlFO0vmO+Kx4 eou/TqVxnDT8WEK8IqP/6ojRgA0OcQRRtXMaWHpF1gvEOfA8HWZXD3XbP+bfEA== X-Gm-Gg: ASbGncuBUognt1fnCI6Ebq6L1xsJ/zT2/RdQDVlk7qdBQ/3MVd9N0+k9+XELQRgurub hlnEDUPQVqQAIYh+ro3G9qc1QUweC12fUJUA94QzqYmyagmJa/sREM5u6fWKaipIJL7tDUkz+jp 890A3RDX0sqAM38fAKqi9YtUz26vHIS+0JTsC7XotXEvChc0J0FoPPsH46qJvw2IADtJfQDDYul 93rRxjFY5JU6tFRE4h2PLzW7aevlrUMUO1d9aK0zFmu0wSc4iirMjt6vdXjyIYRPiFCr2rPtJlb cNa0O5+s6WaP6fN0e0/3m/LUzPcixVK/TyC1OUHajZ2ueCz2PGRXJIKhSwSc4E3psg2nqcQoSbD mK+hoGRHbzKFjrNPYCC6gBaS+/zOJUv30RiNc X-Google-Smtp-Source: AGHT+IFUxK2Us5L6gTZXlOtrwuoPQ/zSMm9MPFd7jSFIQ7VrGyhlBc7R6pQsPS3u5sVrKCGwMMnmdQ== X-Received: by 2002:a05:6a00:3492:b0:742:9bd3:cd1f with SMTP id d2e1a72fcca58-742acd728eamr16972300b3a.23.1747677512785; Mon, 19 May 2025 10:58:32 -0700 (PDT) Received: from localhost ([2a00:79e0:3e00:2601:3afc:446b:f0df:eadc]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-742a9876dcdsm6728589b3a.138.2025.05.19.10.58.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 May 2025 10:58:32 -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 v5 27/40] drm/msm: Crashdec support for sparse Date: Mon, 19 May 2025 10:57:24 -0700 Message-ID: <20250519175755.13037-15-robdclark@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250519175755.13037-1-robdclark@gmail.com> References: <20250519175348.11924-1-robdclark@gmail.com> <20250519175755.13037-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