From nobody Wed Oct 8 19:25:04 2025 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DF61D2E11B5 for ; Wed, 25 Jun 2025 18:59:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750877962; cv=none; b=Ltj0Ijl6uInPICvdaAfjQ3hhVMF4Zma6vxiszNMvvwNwBIicKKTkBNz1W1VLND29FAK2AismS6HI4lPAwRx7uDJJ4ziCPX9HYePs44ggx2u+iGRjtaI3882owCMP9x5vB1wcXazPzowQcmdxSi6qNqUx1YHwu0O/87QcytJcFf4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750877962; c=relaxed/simple; bh=PsaIIHYp0cre6Epw63fH/Cz+I+fRn0wM45fSqqUqlsE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=j6WcTbs4OP6yBuCjFGBUFFs/8NQDhq93wtgwggx2xFDujvHK4KLiS1PZLJLZnTAsbD8vJlH1XoFkNaUBwsi6xwr5aUhds8xTTYdlPYPfkrq8ivdvOuhvNZLJShOXsvof7K5nXwE0F+CNxB8RySKT0ipmEHwyTtcUvbm3jGyKx7U= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=ZzKlFUqK; arc=none smtp.client-ip=205.220.180.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="ZzKlFUqK" Received: from pps.filterd (m0279868.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 55PB1egC022996 for ; Wed, 25 Jun 2025 18:59:20 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=St2ndJNB5T5 qxjvTBi+Qboj7ahOA3a+vNQ3fmIRIIqc=; b=ZzKlFUqKEOVyFXcMOdJUfarENsq O2Eb5I7wLaeCVGo4vVuFEMsHLMiOzr7K1po5u//ATfuu1UzO7AQrZqYX0JFY3u+1 4pONbArdLl0JLXNQw5fuSzeI3/4vNR8wUsI7ZC8iU3HtpjCGX+aPRkBQEae1yB8g Whjw4ki6Shcf3Z/B4kLj8W4Vvawr0+tQkwpnLQ07qj/UWBrs7byXdnzbnqzNqQZn q7TP4eABYaUMzzZJcKUx9fGdpcyezNd2j+qNEEcdrl8Ah4xyA7paoj6QVIFLvoBt ItFgY7A33husmTVHRyCBwiWpADIB++/OUE9NXA8XHXcM2j8yLrDtvlOchYg== Received: from mail-pl1-f197.google.com (mail-pl1-f197.google.com [209.85.214.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 47g88fapqm-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Wed, 25 Jun 2025 18:59:19 +0000 (GMT) Received: by mail-pl1-f197.google.com with SMTP id d9443c01a7336-2355651d204so1581485ad.2 for ; Wed, 25 Jun 2025 11:59:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750877958; x=1751482758; 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=St2ndJNB5T5qxjvTBi+Qboj7ahOA3a+vNQ3fmIRIIqc=; b=IOsQwz8F1tAXC6/9kYDevfXbOuK104K/eaMT0TteW8RBGvSGanl8e8+OkCXo4m1zyj AOna1gIQ44mcphBDTkSV7RKLs2Ga313XQsNGKNh6xVE2hGbkYr3RotGNwaIKdvvmPCts IBnaOwaJMthNS/oXXrTy0FBsvtt6endDUzMVGxfrNM09WZ1+BOhAy6V2khdFWLveFMxv dq9E8CG/BCbvleeWsMreHon7W0WooGM0Gu6m/d1EDcWfZzCS2cvvaW5IKkgcaLlbuylW bq1ja67O0PbQYVU80+ZDBuYzb8XAqsUwhANRT4ZKLIAXUxvqtuXMWm9aSkgy/XOF0yvC RLpQ== X-Forwarded-Encrypted: i=1; AJvYcCUzMDv+67Td5MUhyFBTtPga9AOoeEQelXsKgzKUcoLzUp+f9spMRjZmXz1YEKmZcxzkomKl90b+vu/dyk0=@vger.kernel.org X-Gm-Message-State: AOJu0YxeOAC3eKIWSiHg7FoSqTOV1vZqNBjLE1doY7bZTBX+BRwdymVF nm2Ho3QaOPiNByxN6eKHWgwzB3n4mElIPa487C07WIpcPjqEOlARuyR4G559xT7YuqQ7uiB+sSW syiBC8nnbx2GOlfa/jqeptHf9iLZyioYaScP7/AXSKVzYoMUmTerQAJP7WyNEFRs6U/0= X-Gm-Gg: ASbGnct9WfY8cZkpM71fgQ8K8bRrqrRTWahgdIuIg28p+gjfIXW3QadI3HV3+iyZSWs eW9P1J0MusoGT5pasnBjMK+3slw2ZyHnTClO/llqjoUoK6z31IyAzrfs03Vn4UJnzIiymVInwt8 mfwriaLhzyecQ7BiJQ4VguOxaWzpnSf9oY0L86fSKW0dyYhCiERye4PxaM/40FeR/IRzm2uG23E NwPqIHcMPgd1k0vDATWG3Hp7P9UxF9j56SzsUF/NjEGFX+ryMFhB0hb4DARNexGdDzvbLuGfrvB YMoODPAr2bcGHZoKpWPlqVfWqf3HmLJi X-Received: by 2002:a17:902:e890:b0:235:6e1:3edf with SMTP id d9443c01a7336-23824039f7amr77982825ad.34.1750877958521; Wed, 25 Jun 2025 11:59:18 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF/Y9lB16IKtQS7RqL3y30IZ+jiD7LUeSPJzyPzPcOjdlpXE/X4dI8MmjryvmUd3anc1LWsJw== X-Received: by 2002:a17:902:e890:b0:235:6e1:3edf with SMTP id d9443c01a7336-23824039f7amr77982545ad.34.1750877958122; Wed, 25 Jun 2025 11:59:18 -0700 (PDT) Received: from localhost ([2601:1c0:5000:d5c:5b3e:de60:4fda:e7b1]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2380d1a9d79sm42665515ad.93.2025.06.25.11.59.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Jun 2025 11:59:17 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, Connor Abbott , Antonino Maniscalco , Rob Clark , Rob Clark , Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v7 37/42] drm/msm: Add VMA unmap reason Date: Wed, 25 Jun 2025 11:47:30 -0700 Message-ID: <20250625184918.124608-38-robin.clark@oss.qualcomm.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250625184918.124608-1-robin.clark@oss.qualcomm.com> References: <20250625184918.124608-1-robin.clark@oss.qualcomm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjI1MDE0MiBTYWx0ZWRfXzY2xQsWaXdMg TAJLlSHKU5LvIXIyzgaKd605NWpxnIx+gHcBWIsNB26ipY7XZ0/YLXWutEbJYIfSkg0cutSz1mz 1li4iDAsNupi7XtznPWKckqqNW9i/F2XOgDGbV9DVI3ZKyCgMTzvYylRgUBducn/At9b7xkkmcz Hzm03nbEX3mOmhdm7jZvxEuTLF4HlEQQocmA8qv2lcHmCBncTszq3luYzl0lUmd+eLa7i/p7CXB 3+z6ZyiHlu1lVy5mw/rfQm7K+sQAmE/uq/KUU/V4YEf2XzhWQ9y+4VCgIW1mO4ZwbuKnLkz/u4G Z9bblXKqGoxL2M/r33NolrAivWgz8qSVDf5bO3qw9D6i0xMtMsi2Q1r02QAhW48Wf/9wb2WoZKp 4uamhsUixY8nWjuv+ZU5L7tX3OibMK4I6FWtlZeyXgAj18NIFrRrgYQ5Gv7G+sGO+z25xcSu X-Proofpoint-ORIG-GUID: eJU7hzYHL41azaj1j2sNZpSR6UkF92Vg X-Proofpoint-GUID: eJU7hzYHL41azaj1j2sNZpSR6UkF92Vg X-Authority-Analysis: v=2.4 cv=LNNmQIW9 c=1 sm=1 tr=0 ts=685c4707 cx=c_pps a=cmESyDAEBpBGqyK7t0alAg==:117 a=xqWC_Br6kY4A:10 a=6IFa9wvqVegA:10 a=cm27Pg_UAAAA:8 a=EUspDBNiAAAA:8 a=S93TA_zjY9FrSvCmoiAA:9 a=1OuFwYUASf3TG4hYMiVC:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.7,FMLib:17.12.80.40 definitions=2025-06-25_06,2025-06-25_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 suspectscore=0 spamscore=0 bulkscore=0 mlxlogscore=999 impostorscore=0 mlxscore=0 clxscore=1015 adultscore=0 priorityscore=1501 lowpriorityscore=0 phishscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2506250142 Content-Type: text/plain; charset="utf-8" From: Rob Clark Make the VM log a bit more useful by providing a reason for the unmap (ie. closing VM vs evict/purge, etc) Signed-off-by: Rob Clark Signed-off-by: Rob Clark --- drivers/gpu/drm/msm/msm_gem.c | 20 +++++++++++--------- drivers/gpu/drm/msm/msm_gem.h | 2 +- drivers/gpu/drm/msm/msm_gem_vma.c | 15 ++++++++++++--- 3 files changed, 24 insertions(+), 13 deletions(-) diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c index fea13a993629..e415e6e32a59 100644 --- a/drivers/gpu/drm/msm/msm_gem.c +++ b/drivers/gpu/drm/msm/msm_gem.c @@ -47,7 +47,8 @@ static int msm_gem_open(struct drm_gem_object *obj, struc= t drm_file *file) return 0; } =20 -static void put_iova_spaces(struct drm_gem_object *obj, struct drm_gpuvm *= vm, bool close); +static void put_iova_spaces(struct drm_gem_object *obj, struct drm_gpuvm *= vm, + bool close, const char *reason); =20 static void detach_vm(struct drm_gem_object *obj, struct drm_gpuvm *vm) { @@ -61,7 +62,7 @@ static void detach_vm(struct drm_gem_object *obj, struct = drm_gpuvm *vm) drm_gpuvm_bo_for_each_va (vma, vm_bo) { if (vma->vm !=3D vm) continue; - msm_gem_vma_unmap(vma); + msm_gem_vma_unmap(vma, "detach"); msm_gem_vma_close(vma); break; } @@ -101,7 +102,7 @@ static void msm_gem_close(struct drm_gem_object *obj, s= truct drm_file *file) MAX_SCHEDULE_TIMEOUT); =20 msm_gem_lock_vm_and_obj(&exec, obj, ctx->vm); - put_iova_spaces(obj, ctx->vm, true); + put_iova_spaces(obj, ctx->vm, true, "close"); detach_vm(obj, ctx->vm); drm_exec_fini(&exec); /* drop locks */ } @@ -429,7 +430,8 @@ static struct drm_gpuva *lookup_vma(struct drm_gem_obje= ct *obj, * mapping. */ static void -put_iova_spaces(struct drm_gem_object *obj, struct drm_gpuvm *vm, bool clo= se) +put_iova_spaces(struct drm_gem_object *obj, struct drm_gpuvm *vm, + bool close, const char *reason) { struct drm_gpuvm_bo *vm_bo, *tmp; =20 @@ -444,7 +446,7 @@ put_iova_spaces(struct drm_gem_object *obj, struct drm_= gpuvm *vm, bool close) drm_gpuvm_bo_get(vm_bo); =20 drm_gpuvm_bo_for_each_va_safe (vma, vmatmp, vm_bo) { - msm_gem_vma_unmap(vma); + msm_gem_vma_unmap(vma, reason); if (close) msm_gem_vma_close(vma); } @@ -625,7 +627,7 @@ static int clear_iova(struct drm_gem_object *obj, if (!vma) return 0; =20 - msm_gem_vma_unmap(vma); + msm_gem_vma_unmap(vma, NULL); msm_gem_vma_close(vma); =20 return 0; @@ -837,7 +839,7 @@ void msm_gem_purge(struct drm_gem_object *obj) GEM_WARN_ON(!is_purgeable(msm_obj)); =20 /* Get rid of any iommu mapping(s): */ - put_iova_spaces(obj, NULL, false); + put_iova_spaces(obj, NULL, false, "purge"); =20 msm_gem_vunmap(obj); =20 @@ -875,7 +877,7 @@ void msm_gem_evict(struct drm_gem_object *obj) GEM_WARN_ON(is_unevictable(msm_obj)); =20 /* Get rid of any iommu mapping(s): */ - put_iova_spaces(obj, NULL, false); + put_iova_spaces(obj, NULL, false, "evict"); =20 drm_vma_node_unmap(&obj->vma_node, dev->anon_inode->i_mapping); =20 @@ -1087,7 +1089,7 @@ static void msm_gem_free_object(struct drm_gem_object= *obj) drm_exec_retry_on_contention(&exec); } } - put_iova_spaces(obj, NULL, true); + put_iova_spaces(obj, NULL, true, "free"); drm_exec_fini(&exec); /* drop locks */ } =20 diff --git a/drivers/gpu/drm/msm/msm_gem.h b/drivers/gpu/drm/msm/msm_gem.h index efbf58594c08..57252b5e08d0 100644 --- a/drivers/gpu/drm/msm/msm_gem.h +++ b/drivers/gpu/drm/msm/msm_gem.h @@ -168,7 +168,7 @@ struct msm_gem_vma { struct drm_gpuva * msm_gem_vma_new(struct drm_gpuvm *vm, struct drm_gem_object *obj, u64 offset, u64 range_start, u64 range_end); -void msm_gem_vma_unmap(struct drm_gpuva *vma); +void msm_gem_vma_unmap(struct drm_gpuva *vma, const char *reason); int msm_gem_vma_map(struct drm_gpuva *vma, int prot, struct sg_table *sgt); void msm_gem_vma_close(struct drm_gpuva *vma); =20 diff --git a/drivers/gpu/drm/msm/msm_gem_vma.c b/drivers/gpu/drm/msm/msm_ge= m_vma.c index 729027245986..907ebf5073e6 100644 --- a/drivers/gpu/drm/msm/msm_gem_vma.c +++ b/drivers/gpu/drm/msm/msm_gem_vma.c @@ -53,6 +53,9 @@ struct msm_vm_unmap_op { /** @range: size of region to unmap */ uint64_t range; =20 + /** @reason: The reason for the unmap */ + const char *reason; + /** * @queue_id: The id of the submitqueue the operation is performed * on, or zero for (in particular) UNMAP ops triggered outside of @@ -242,7 +245,12 @@ vm_log(struct msm_gem_vm *vm, const char *op, uint64_t= iova, uint64_t range, int static void vm_unmap_op(struct msm_gem_vm *vm, const struct msm_vm_unmap_op *op) { - vm_log(vm, "unmap", op->iova, op->range, op->queue_id); + const char *reason =3D op->reason; + + if (!reason) + reason =3D "unmap"; + + vm_log(vm, reason, op->iova, op->range, op->queue_id); =20 vm->mmu->funcs->unmap(vm->mmu, op->iova, op->range); } @@ -257,7 +265,7 @@ vm_map_op(struct msm_gem_vm *vm, const struct msm_vm_ma= p_op *op) } =20 /* Actually unmap memory for the vma */ -void msm_gem_vma_unmap(struct drm_gpuva *vma) +void msm_gem_vma_unmap(struct drm_gpuva *vma, const char *reason) { struct msm_gem_vm *vm =3D to_msm_vm(vma->vm); struct msm_gem_vma *msm_vma =3D to_msm_vma(vma); @@ -277,6 +285,7 @@ void msm_gem_vma_unmap(struct drm_gpuva *vma) vm_unmap_op(vm, &(struct msm_vm_unmap_op){ .iova =3D vma->va.addr, .range =3D vma->va.range, + .reason =3D reason, }); =20 if (!vm->managed) @@ -863,7 +872,7 @@ msm_gem_vm_close(struct drm_gpuvm *gpuvm) drm_exec_retry_on_contention(&exec); } =20 - msm_gem_vma_unmap(vma); + msm_gem_vma_unmap(vma, "close"); msm_gem_vma_close(vma); =20 if (obj) { --=20 2.49.0