From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.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 855C415C0 for ; Sat, 23 Aug 2025 00:12:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755907930; cv=none; b=hiUjj7F/85k0Uzbr1cbUs664PydkjHwQX7ytCmtd9wiYrL1WYcxSzOmgvCbeSVvHceco+bVrLjsnTqQTgoHASpqi2C6TD/V3KuWLGyxYuBZX9sogx5DvCWMVoxKjYcnEHc4+zNxO6YRwUNj95pd9P4JvvnVAV7SoHGLchaZa2NM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755907930; c=relaxed/simple; bh=izTeRDcb3LUu2+xcZ1pXgxZuqtAbJOSjKbwv77VWnSo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To:Cc; b=K5k21EfTBoBh17A/LWQiq3xR86wnaoOQouOZnxIfD2KuyIvmVqKhf9TFoe+80K/FJdqNOv+FYgoUEzILkB86rn2pz5awqPzx8VLuZWmfZ5T8g8Zx94cprChG0/fp5z2u+xI3vfTlYzFnxyU3wMVB+zmhRRwk7dbCcJ3mlzkBwlk= 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=XvkAguRV; arc=none smtp.client-ip=205.220.168.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="XvkAguRV" Received: from pps.filterd (m0279864.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 57MHVHaa021302 for ; Sat, 23 Aug 2025 00:12:06 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:message-id :mime-version:subject:to; s=qcppdkim1; bh=LKH3UmwyCqZl4E/zd7SLx5 cyJ5JW0DFn9aa/Um4dYq4=; b=XvkAguRVqkCgLToup5Ft4AYtG1pSR2nQsaPp9J 24p6CUG2X8tVecbxiNnnba3XmgJLI5/nhj39UriZIo6f728hmSywHqcKnFPc+u2+ rY674Ta6yoewXff4d2UhYXwc2kT1lxeT+1YZ5ttAnzqQ/GnBVAk4ST858c11S/G0 UURk0q2sNTsL+bDWs+sIVPXQiucINHqEIBRa+tE5DHWfwtEffkyGg/lGItysAy4g y+dn7zjuHFUB4kPQFKU0FprwgiBgY7ei1kqzqc0+8fZAtuhLF9/QWrX3kmFdJmCv K6yjm8gAazAz/P78AIPYfBiSViUxF3bQosvUs5ZD0swvZ7Ww== Received: from mail-qt1-f197.google.com (mail-qt1-f197.google.com [209.85.160.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 48pw13gss9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Sat, 23 Aug 2025 00:12:06 +0000 (GMT) Received: by mail-qt1-f197.google.com with SMTP id d75a77b69052e-4b10990a1f0so76032331cf.0 for ; Fri, 22 Aug 2025 17:12:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755907925; x=1756512725; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=LKH3UmwyCqZl4E/zd7SLx5cyJ5JW0DFn9aa/Um4dYq4=; b=p5YpHmV4ke6ouLQEX4nepw79epc+QBbf8hi+Fm20mhVGnYqlf9CfiE6phCgx8eQWho 7djERiqOoAyBFFh14YEWvXH3AaNCglPzZ1MtAYZqZHo5XFbPh5APSle0NU7YijARG2KB 7fz+YhPJEcRKMNEk/NAJUv7cAklmF6JcAXTD4jSUejgmTa0k539xmaDtuQ4n8lO0UnmQ mlvTrMeRxKZu++3chWFVzNT+mdKrkOICftPKnSQAteXruqlOmvHVCrZHpvxbxvRqmPn4 9p9819JN2KGKLyLHk2f2fgeN79ul7MFyq3jld43nBZvxLw3EDCAx3nUJoNAeXVMtS67O MUkQ== X-Gm-Message-State: AOJu0Yxu4Vu3mAb2tX3PRuf4wtmadwpH2B+jjiRf7QdjD8reVwVpgDVk uD2O0GTKX0Iu+QEHI+acKav1CSFagM3y0pvq+4m1dus8R81NOHkn1YLO8C8YvSLeHv3cvPZQxdR kB5F/fOybg8ST6xrcT9mRrz/WIOWAO94tb3MwX3CyG1Fwv5oxjZ89lVHt7dcodVa1bXoe X-Gm-Gg: ASbGncsMc9+LHMPlgD0ImsVA1gQhDPMRah4qW6Z6czVGyQRGX8ivElN4XbQxC9VrYSu U22/KUBAGnLn3u+kR6rZz9eBn7XvXOfDQOlEiytPQw0uZmfvluzBWBEYsqFnbK+MWG5l3aFsXF2 xuXeykp5i92otkHOIOR2EPgaKgFZsHwB3b23zpG+1ctPQPATjGJc/8S06OHFPJSw0NF81RvwPvL 7gbg2y7KMVQJ92uDVuIVsVobHdL/1ut9tyTpms6nImi1PBfyDz8q5wk+eV6/QKuoRXtd9Ekth6w g+Lr8owCCGSrJFHuKJX1/hefEjqqPiRMm2xu3kyVmGoeqoG6ZRMFTin8xhAAZXtrjdX7cn7PgsF rJGVAL/IsCBO1Jc7SF4dyhJ7Bze4RUUECV1SSwemYwns0MKYXD/KL X-Received: by 2002:a05:622a:248c:b0:4b0:eb79:931d with SMTP id d75a77b69052e-4b2aaa561b3mr63251931cf.2.1755907924816; Fri, 22 Aug 2025 17:12:04 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGjRcYFg4ZlcT2OcnbWB43OpYbpLPRq63IBEUW/yX7KrugkfRBNsErbT8C9Dy4q63T/Oz64nQ== X-Received: by 2002:a05:622a:248c:b0:4b0:eb79:931d with SMTP id d75a77b69052e-4b2aaa561b3mr63251531cf.2.1755907924269; Fri, 22 Aug 2025 17:12:04 -0700 (PDT) Received: from umbar.lan (2001-14ba-a0c3-3a00-264b-feff-fe8b-be8a.rev.dnainternet.fi. [2001:14ba:a0c3:3a00:264b:feff:fe8b:be8a]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-55f35c8ba2dsm208929e87.77.2025.08.22.17.12.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Aug 2025 17:12:02 -0700 (PDT) From: Dmitry Baryshkov Date: Sat, 23 Aug 2025 03:12:00 +0300 Subject: [PATCH] drm/msm: fix msm_gem_vma_new() allocations for managed GPUVMs Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250823-msm-fix-gpuvm-init-v1-1-e199cd5b1983@oss.qualcomm.com> X-B4-Tracking: v=1; b=H4sIAE8HqWgC/x2MQQqAIBAAvxJ7bsE2Kukr0aFysz1oohVB9Pek4 8DMPJA4CifoiwciX5Jk9xmqsoBlm7xlFJMZSFGjNNXoksNVbrThvByKlwMbUkZ3PC8rtZDDEDk b/3QY3/cDlPxl9GQAAAA= X-Change-ID: 20250823-msm-fix-gpuvm-init-520d87ebcf26 To: Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Matthew Brost , Himal Prasad Ghimiray , Danilo Krummrich , Boris Brezillon Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Danct12 X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2074; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=izTeRDcb3LUu2+xcZ1pXgxZuqtAbJOSjKbwv77VWnSo=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBoqQdQnWFc2erhkmlZkodf2OTqrgXkxW7pdw437 37G1d3E8l2JATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaKkHUAAKCRCLPIo+Aiko 1dAzB/4wwaKA7WZL9E0yYd1cJks/dBt54lwvKms5QB1urUJqn4s3R8HawZOj6/PHvvNfOSGQtWt HS6BJvmXj38WrfrHOJOGq/ndCib3iVdLmzHccrKenBuszzTmd9bKBbpLU0OmfXpMODSTFRe+lZV BdQoMbzHGZnMhNa+raq2b8L2GZQId0Ls6wIdV4eCzDD9FHhBJzEwubPWtbVcD5tVT1s0mSHgUVP k88E6Zm1yzUXdgQYYg+9rVLLREEZCdJae68Ai6a97cWNcGbdRD+c1qclyxYICn8dKcq/WKPwUW1 To3j3KXRZe1APQYAm9z6u20OdAU/ovFhR9lWbeb422fc9KBp X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwODIyMDE2MCBTYWx0ZWRfX48z2zivn0GPC DG0o05YU9ClBvdvg8ofU4JkWk3vDD3CZaz4k6JtLjFHAbFTOeh1gSEcObY7XkO4Yv0CRWYEUn/K l2N4xvjuAP+h9HsSrqAup3qz1YXKk5DT96CY88GoYluL22/EWX85eqKpUjlVzto4VPdErdkkasA QJV0IvkZCNR3GkMp1yuqScKdU5Xwa4czU5rktAE8bVLlCpqOkoz77CsCIBnA2r0UrId1MOJKMZS X9R8eaKLwytAItfMVUeA8ue99yP8Is4rIZ72Dwpx21LV0Gto70rYsE+/3p81pYDsbg4cFS7Up0h KHMb3YZ8BILSJrcoGzenMs/uOSgpZipy4b3Jv3ymxJEPGdQsvXDygbDtOsJgVJmGkczcIIVifML 2ru/sYbZ X-Proofpoint-ORIG-GUID: 6V5IEyPrMbfqeHcZtPxEEzuGzCvQpS3- X-Authority-Analysis: v=2.4 cv=F6NXdrhN c=1 sm=1 tr=0 ts=68a90756 cx=c_pps a=EVbN6Ke/fEF3bsl7X48z0g==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=2OwXVqhp2XgA:10 a=LpNgXrTXAAAA:8 a=EUspDBNiAAAA:8 a=O0ltPWiidyXzGDMWRkgA:9 a=QEXdDO2ut3YA:10 a=a_PwQJl-kcHnX1M80qC6:22 a=LqOpv0_-CX5VL_7kjZO3:22 X-Proofpoint-GUID: 6V5IEyPrMbfqeHcZtPxEEzuGzCvQpS3- X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-08-22_05,2025-08-20_03,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 priorityscore=1501 impostorscore=0 adultscore=0 phishscore=0 bulkscore=0 malwarescore=0 clxscore=1015 spamscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2507300000 definitions=main-2508220160 Since commit 3309323241fb ("drm/gpuvm: Kill drm_gpuva_init()") MSM driver fails to init, failing with "[drm:msm_gpu_init] *ERROR* could not allocate memptrs: -22" errors. The mentioned commit reworked the function, but didn't take into account that op_map is initialized at the top of the function, while ranges might change if GPUVM is managed by the kernel. Move op_mode initialization after finalizing all addresses and right before the drm_gpuva_init_from_op() call. Reported-by: Danct12 Fixes: 3309323241fb ("drm/gpuvm: Kill drm_gpuva_init()") Suggested-by: Rob Clark Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/msm_gem_vma.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/msm/msm_gem_vma.c b/drivers/gpu/drm/msm/msm_gem_vma.c index 3f440bc1f7106f3b0091f037611d0b433e5e2c18..6df6b7c0984da57fe64de41fa54f7dea0a324c74 100644 --- a/drivers/gpu/drm/msm/msm_gem_vma.c +++ b/drivers/gpu/drm/msm/msm_gem_vma.c @@ -368,12 +368,6 @@ struct drm_gpuva * msm_gem_vma_new(struct drm_gpuvm *gpuvm, struct drm_gem_object *obj, u64 offset, u64 range_start, u64 range_end) { - struct drm_gpuva_op_map op_map = { - .va.addr = range_start, - .va.range = range_end - range_start, - .gem.obj = obj, - .gem.offset = offset, - }; struct msm_gem_vm *vm = to_msm_vm(gpuvm); struct drm_gpuvm_bo *vm_bo; struct msm_gem_vma *vma; @@ -402,6 +396,13 @@ msm_gem_vma_new(struct drm_gpuvm *gpuvm, struct drm_gem_object *obj, if (obj) GEM_WARN_ON((range_end - range_start) > obj->size); + struct drm_gpuva_op_map op_map = { + .va.addr = range_start, + .va.range = range_end - range_start, + .gem.obj = obj, + .gem.offset = offset, + }; + drm_gpuva_init_from_op(&vma->base, &op_map); vma->mapped = false; --- base-commit: 0f4c93f7eb861acab537dbe94441817a270537bf change-id: 20250823-msm-fix-gpuvm-init-520d87ebcf26 Best regards, -- With best wishes Dmitry