From nobody Wed Oct 8 10:58:50 2025 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 8DBE219F11F for ; Sun, 29 Jun 2025 14:07:02 +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=1751206024; cv=none; b=VrgyIKxdYVwmMVI6di4d87Zgw4f54PxT+wGUs1Otd4KX0E6IVdi3qpvz2/sBm7NpXd6cgyCWypvB8GD6F0EPedTqYLqW0NBYaECPMjl9IwA5qrBKVP2v9+y5M23YrMSsa8ROb8DEp0R5ds7DcAuS3qe0Wi4AaQov7wELN9D1xuk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751206024; c=relaxed/simple; bh=8HUCsu07hAS/bP/QpqqCRLMr8xpiWxvBNsplcx3L6YU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Rk7Gf3O6+cWpoJFNjmaokGjj2Gr1bWPzJbKi5rv78aSI2Gg/zKdkH93oKpRnBOnDJMGttJc8hpRWSuRiBXdxsBC+Jbe0rtyz7oJp+gQBiQ/nSFWhnRyAEhVj7XVj7IFvlEgWG1FPqbU6DLmtWsXfxThjhXb3jRTBN23HA3waYUQ= 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=JJSAR4tE; 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="JJSAR4tE" Received: from pps.filterd (m0279865.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 55TCq5c3016505 for ; Sun, 29 Jun 2025 14:07:01 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=/I8w26relc0 8VGTXOUezTNb1wMArJgWD1sc2fjaEtTk=; b=JJSAR4tERUHwHwcadQJAfq5Q4Ua p0kSHSAWTYEHTVrc3octjQkZXECoUrtgSHD9JZKNY7VohX2hAvtwB16FLQ97wHl3 EPGWRWHhGOhro8CYGSKUFIlMzPjGrhxU+iSCTfgkP51EYqkPGJMPXk718ZZdGBgk FNfGSQfvF8dD6KV4q4mindWrASbL/geWg+0uTpPCTTpWxUUfMnw63geI9xePVCaj dJjbuGaAeBneAhjFHD8MLiIIZy1iUFoKIqooIsfgoaL6JSTFNAWmF4HJG0rLuUim iVpyNiMq03kgEqMTjnmN2r/AfElSoZxZJgo7CFksbIID3YoUsU0DT9ZU+wg== Received: from mail-pf1-f197.google.com (mail-pf1-f197.google.com [209.85.210.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 47j7bvj9p2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Sun, 29 Jun 2025 14:07:01 +0000 (GMT) Received: by mail-pf1-f197.google.com with SMTP id d2e1a72fcca58-748d96b974cso3149584b3a.2 for ; Sun, 29 Jun 2025 07:07:01 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751206020; x=1751810820; 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=/I8w26relc08VGTXOUezTNb1wMArJgWD1sc2fjaEtTk=; b=I7mafIe3B5PuiN+y0uJl07QSSY1JmVe4AFItws/0PcpZrO2eLRy5fPfZkCGDsf5Sa9 W4ttatzHKRhL6BUMcqr1ADQSSUk0/uj7XWay9Zd4hPbclIMzZ874gMH9F92mo5AZYAR1 lq4BjyGyTuFnjgAdlyJy9mEHKltwVaRFDiRwxZ3yZgk7nlb4mtagudSmGZ/NdPiOoP8M EzFpUe19Zst2BCEa1wQlIb01HmDpGaAetK1Q7PJ++aqga9czpAh6KcdxXL0efryktjN/ siXA6+hLnLnK7N9zFU2s9Z3OdpLpB9RZ+kjwOPlNxNgaPTGLQuyLKzTehaASMOeE5iKc jfHg== X-Forwarded-Encrypted: i=1; AJvYcCVYcGF3B6rjBqTREbb2rvdZa6PqNIW0YYrSTJNeSZTXPSfl2ymYaWfHcu2A3VaBXN+rwswDQkMpitd4kCE=@vger.kernel.org X-Gm-Message-State: AOJu0Yw208Mm57MsaoasS9dh6WnM8/+eVim4876EKMrOGCvFjvfEuqlK 7hcDZHa7kY17t0UWgsAKxaWivF30JQhnxKwVTUDJaLX1tq+8PPo+QWummhvnltOfFpxpf+2Ht6M /jTk69oYdERrrhx0OuApqLw7ieIGtgRcqvYXJJ5c7h8Avy6aYV8/3G1g+t6jmhvymyks= X-Gm-Gg: ASbGnctAC+Jp2u5Un2R741NLb4MCJMtpEIgkzvUBS9GXynVTO5jwKg69RgWMK6TLguf Vu+JoTmGA3K865WJQsFVU8CktyVG2wov+g2qvTqVhoWp6NpB8YbRAJKu92hxQCsqUf/6eQv0BCH BXy9a3hKsN6LXKaS0Tt04JXrXXqR5ZEAMoMmj6rRPgPi/eMYRHiy7tK91txDWBMOdehYGrzpTu3 iVYxI6ENG6F88yXtQ0lKIAq2g2e0Vnf5RtN30LSPbe1smX2fqNdeNGehXJ14AcvxXmus2h7uTPq Fh4b39E5ZQgo8F7KOJCO1vLlqYBwyVDG X-Received: by 2002:a05:6a00:2ea7:b0:748:2b23:308c with SMTP id d2e1a72fcca58-74af6f445e8mr12526311b3a.14.1751206020524; Sun, 29 Jun 2025 07:07:00 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHWD00aCTKp3rmy1fVmYh7PmkKjE2n/hAouI0pUy6N9MI8tjXuNWwJzmYWFZ+STLslS/wIm7A== X-Received: by 2002:a05:6a00:2ea7:b0:748:2b23:308c with SMTP id d2e1a72fcca58-74af6f445e8mr12526273b3a.14.1751206020100; Sun, 29 Jun 2025 07:07:00 -0700 (PDT) Received: from localhost ([2601:1c0:5000:d5c:5b3e:de60:4fda:e7b1]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-74af5574604sm6982706b3a.86.2025.06.29.07.06.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Jun 2025 07:06:59 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, Connor Abbott , Antonino Maniscalco , Danilo Krummrich , Rob Clark , Danilo Krummrich , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v8 01/42] drm/gpuvm: Fix doc comments Date: Sun, 29 Jun 2025 07:03:04 -0700 Message-ID: <20250629140537.30850-2-robin.clark@oss.qualcomm.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250629140537.30850-1-robin.clark@oss.qualcomm.com> References: <20250629140537.30850-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-GUID: 8GkCNdbhjLNXiPYMmmBnOtGgug4TxoQD X-Authority-Analysis: v=2.4 cv=RJCzH5i+ c=1 sm=1 tr=0 ts=68614885 cx=c_pps a=rEQLjTOiSrHUhVqRoksmgQ==:117 a=xqWC_Br6kY4A:10 a=6IFa9wvqVegA:10 a=EUspDBNiAAAA:8 a=VwQbUJbxAAAA:8 a=pGLkceISAAAA:8 a=5Yek0j1-lJT91Je3aSMA:9 a=+jEqtf1s3R9VXZ0wqowq2kgwd+I=:19 a=0bXxn9q0MV6snEgNplNhOjQmxlI=:19 a=2VI0MkxyNR6bbpdq8BZq:22 X-Proofpoint-ORIG-GUID: 8GkCNdbhjLNXiPYMmmBnOtGgug4TxoQD X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjI5MDExOSBTYWx0ZWRfX6NlYyyOPx3ep ww8Y1PXdWiisaYkfHlkkixcvmMOeV3ZJjBSkcKaVAhoR+qdsvJJqeWZ7YZkV3UDQOF5qdliuAVQ +Vl8UOSZNGli2HBBI8H6KZZ+iELhy71r0+wnljGUxvtGj1D4Gv62sxydKbRfDGY2JPUdqbOzRen qDUkJTwerbNlgdzR3rdmZCYkNzpALgJTcsKq7LcDuk665prK9iNH51MZ8Hyco5HwYFgX05cHfOq K+/xDjIB+nyL3lzPCAGPJ3XJwBAgYvO+aiSfzEJlT0/mbkM4eJHwSj1RC4L+q5kGPK/dOhqs1QU 6vdMNbNINO/0iZDj1CsTAnckaR3UW2L7saoXIN72BW4ccDe+ntpQlXnGzgTV4vnywe7t4pMu3eg 0Xi/LyJUoytJ90Cp4Y7PUhaU/GGRszur9y52JJmrbBh2SLIAEDFeyibXrNjW/5OftALZewV3 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-27_05,2025-06-27_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 impostorscore=0 priorityscore=1501 mlxlogscore=999 adultscore=0 malwarescore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 phishscore=0 bulkscore=0 suspectscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2506290119 Content-Type: text/plain; charset="utf-8" Correctly summerize drm_gpuvm_sm_map/unmap, and fix the parameter order and names. Just something I noticed in passing. v2: Don't rename the arg names in prototypes to match function declarations [Danilo] Signed-off-by: Rob Clark Acked-by: Danilo Krummrich Tested-by: Antonino Maniscalco Reviewed-by: Antonino Maniscalco --- drivers/gpu/drm/drm_gpuvm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/drm_gpuvm.c b/drivers/gpu/drm/drm_gpuvm.c index f9eb56f24bef..0ca717130541 100644 --- a/drivers/gpu/drm/drm_gpuvm.c +++ b/drivers/gpu/drm/drm_gpuvm.c @@ -2299,13 +2299,13 @@ __drm_gpuvm_sm_unmap(struct drm_gpuvm *gpuvm, } =20 /** - * drm_gpuvm_sm_map() - creates the &drm_gpuva_op split/merge steps + * drm_gpuvm_sm_map() - calls the &drm_gpuva_op split/merge steps * @gpuvm: the &drm_gpuvm representing the GPU VA space + * @priv: pointer to a driver private data structure * @req_addr: the start address of the new mapping * @req_range: the range of the new mapping * @req_obj: the &drm_gem_object to map * @req_offset: the offset within the &drm_gem_object - * @priv: pointer to a driver private data structure * * This function iterates the given range of the GPU VA space. It utilizes= the * &drm_gpuvm_ops to call back into the driver providing the split and mer= ge @@ -2349,7 +2349,7 @@ drm_gpuvm_sm_map(struct drm_gpuvm *gpuvm, void *priv, EXPORT_SYMBOL_GPL(drm_gpuvm_sm_map); =20 /** - * drm_gpuvm_sm_unmap() - creates the &drm_gpuva_ops to split on unmap + * drm_gpuvm_sm_unmap() - calls the &drm_gpuva_ops to split on unmap * @gpuvm: the &drm_gpuvm representing the GPU VA space * @priv: pointer to a driver private data structure * @req_addr: the start address of the range to unmap --=20 2.50.0 From nobody Wed Oct 8 10:58:50 2025 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 E03EE1E32A3 for ; Sun, 29 Jun 2025 14:07:03 +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=1751206025; cv=none; b=dys7lnekMt14kE5EcdxI0jVjp6Wijo4jHZjopb3ABs7a2KD7uh6NXMblyFb6sWquBYWT3rId3iWas14buQdCG85w2tvBmfI7N0tC02Ru0RxcOQl9uGdW99/JgXSCtWfropi4nX7r2AlIeUJawrSDu8T4UOybX+f04nqUqgatqME= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751206025; c=relaxed/simple; bh=rfpJAaPwovudJjMudjp8rOGcHhiThmEP/oenwjR3k50=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ifKC3Njpmtx2NA7SY0qhvhMdKmUpTZzK4CCK+f0mkkAKLVuD9dd7KwODcBjuQuIIcTKAqYv6r8Jgt41RuMR8ZBFOn4WjNqCvygdGP0ZYIvHRyKj2CHD6PRWQGqlExskLuYyNG77AeHoq5ETXWgSFUQRtUvsDEV8oZEKqvbh5bE8= 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=gAedCRys; 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="gAedCRys" Received: from pps.filterd (m0279867.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 55TAvT3m018611 for ; Sun, 29 Jun 2025 14:07:03 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=3giSzjraTy3 ka5GjGMGM1+HP9AjwgWqhZykCSGcdkbs=; b=gAedCRyscmRZVBByRZkr4RnjgbV OmDPMpSHfODB8+PuGvjU4vC3WDVsGxbglW9T7o/niac1i1+qyL/cNbjjU/u6B0GN X/42JW+W3/MYEELy5ywvU0CvbB0FFopZ0oV+9CSuxfsvaUgd8LkD28qr4JTuRAb9 XW+VKTpMjBRSiJH1afgRism+rSGFfppjJrEG3Yg2oELrKIN+d1V7ssZLFfZjZKKQ y9XheLdKZyAri20zEzgIRglg2b4sUz2/Kt+N/SXJr3QioJlH2J+bnxqihKjX36bE z/nSjYbg2JzK3J8OXgTngHdF89oys6lWWpA8xdPCSKAu7MUVE0rAKz12TMA== Received: from mail-pf1-f199.google.com (mail-pf1-f199.google.com [209.85.210.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 47j63k2dxw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Sun, 29 Jun 2025 14:07:03 +0000 (GMT) Received: by mail-pf1-f199.google.com with SMTP id d2e1a72fcca58-748cf01de06so3282441b3a.3 for ; Sun, 29 Jun 2025 07:07:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751206022; x=1751810822; 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=3giSzjraTy3ka5GjGMGM1+HP9AjwgWqhZykCSGcdkbs=; b=HTd3YCx4grNo/cftNp9yQW9a6ayjE2P5j9Dpa5M5wAJ7g/pIi+s6XgblRuWQLVwsB6 G5jdejxBfmfV74vV69d34Wa8Z5PzT7F1umUgl5EOzEEpAmL6m0vR3RVng1pDusV/hgUG /h3jKqE/GV22dBB4Pi9aNzxr06fccXucHHDJxlUZ/7K61S1yGc1Yd7W+b/Etp7LfywJJ fN64Op+rznr0Pe2Oo97J5hiSNGtFrVwwWYT6e0CeeYTsQhG04hiDPaYJKorOv4zmfb4+ AJFUKOjMcbNC0WEUM5lNzDhUZEHqSz56fb7Fad/1QFLk+68qa2iXTZrqtrdi3r24o8a6 3pOg== X-Forwarded-Encrypted: i=1; AJvYcCVHRLpCW8rdT3gSsdFx9TQhiVyXGYXrjPLwb3xHK0t/w5noOtBUe3B/6X2b7koCdL3rlU3ObBhocaxSJmQ=@vger.kernel.org X-Gm-Message-State: AOJu0YzO0IZd6b9zLJbGVEJF3BtS8F1jU2tL9JIY+gvreMd8HBxXK+J/ jXR7DkfOgi4WoiYPEphrtWCuLlX2WTiAq3ngTxoa7mnqCG/SMk6NQt2ymxXRh5hvS2ZUONsS+3g VFVP2Ex4bp/uhTtbSqh8alSOZXd0Qc4S9oE9I1AG38IerH7TOL3is59WKaGGscgTz5wE= X-Gm-Gg: ASbGnct36Nz+SDbk/Yza1nl+5mRqPKFvdhMMpCLDohdk/xQckL76xvSq689FQZo1cnU hruyw+VyjyqmhSkUbjhbm4YdoMGraqQW8N9PnqsPyeVPJrVrgOaZmA9x9pIurX5j9/r0FntyL3s HfdS39R/6VBWeqm2H+SJNTljLPtpXnKIDjkFe6ZR7RYeidIH6kMk6sm2wAAzJ9v3iauaq00F96J BZKFizm7nHx+5IM2PuX8rHSEsGajg7bLFLH9pf6emgIrcZGdfU22oceQkjt1aSx+p8d5eW7I3Go dNiSc1vu99x/bUFlmFLU0nx0uO3pfWzN X-Received: by 2002:a05:6a00:928d:b0:736:2a73:6756 with SMTP id d2e1a72fcca58-74af70a7cd5mr12081307b3a.21.1751206021987; Sun, 29 Jun 2025 07:07:01 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHH8aoymgZZWAQ1ofdh1nraDblcv+QibjcBdGmQ1h2Vx5/pIpyp/HOErfyJRTsXKoz6RnP7vQ== X-Received: by 2002:a05:6a00:928d:b0:736:2a73:6756 with SMTP id d2e1a72fcca58-74af70a7cd5mr12081273b3a.21.1751206021463; Sun, 29 Jun 2025 07:07:01 -0700 (PDT) Received: from localhost ([2601:1c0:5000:d5c:5b3e:de60:4fda:e7b1]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-b34e31da436sm5837098a12.57.2025.06.29.07.07.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Jun 2025 07:07:01 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, Connor Abbott , Antonino Maniscalco , Danilo Krummrich , Rob Clark , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v8 02/42] drm/gpuvm: Add locking helpers Date: Sun, 29 Jun 2025 07:03:05 -0700 Message-ID: <20250629140537.30850-3-robin.clark@oss.qualcomm.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250629140537.30850-1-robin.clark@oss.qualcomm.com> References: <20250629140537.30850-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-Authority-Analysis: v=2.4 cv=ZKfXmW7b c=1 sm=1 tr=0 ts=68614887 cx=c_pps a=WW5sKcV1LcKqjgzy2JUPuA==:117 a=xqWC_Br6kY4A:10 a=6IFa9wvqVegA:10 a=EUspDBNiAAAA:8 a=pGLkceISAAAA:8 a=gXmLzIc8hE4PcKHQkQgA:9 a=OpyuDcXvxspvyRM73sMx:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjI5MDExOSBTYWx0ZWRfX3ng4YcU3AH2w 7dQdRd3ataAosW0gUUTGfe73U4Dxhz9KS0K79D/Jtxjixcfs2dT3+zwg5XzDpsRQlkAyaRJrz76 9seFedSRxgv69DfL45wZYDL6F/V/ISR/59Ead4cwWFetsYc9nOEMjw83onyva+F25puoNyQe4XP adOPMaYpeiNGTbtmgW9CyMw7ZM/DluyMi4Vq6YHhDaG9bcFCHfvAFo0pawrXUxDNzfuP2Cw+/70 1T+kb4ATubvkxzTzUxSKcOtRhqdD0t3TCD6c3B80lTtbCR8QWJaG805FU3OkBLe6LyNAuSTwFWs NR50L7GwtsU0/NlmnHY3MAOKw4An9i04P8b4mtnpE2NrlzEEu0/QDVm1ohfi4+lK9wGvfWtYZkG dpfWued1B935UUdYGL59IZDm2nkZrRr3z3RMzSXmAcCMrBQ7RSexmQ0wt/EBck7/Gjrqlr00 X-Proofpoint-ORIG-GUID: -Si2ZO9OitHDcUlQCTwNKqQXbTY2VRQF X-Proofpoint-GUID: -Si2ZO9OitHDcUlQCTwNKqQXbTY2VRQF 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-27_05,2025-06-27_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 mlxscore=0 mlxlogscore=999 spamscore=0 suspectscore=0 bulkscore=0 priorityscore=1501 lowpriorityscore=0 phishscore=0 impostorscore=0 malwarescore=0 clxscore=1015 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2506290119 Content-Type: text/plain; charset="utf-8" For UNMAP/REMAP steps we could be needing to lock objects that are not explicitly listed in the VM_BIND ioctl in order to tear-down unmapped VAs. These helpers handle locking/preparing the needed objects. Note that these functions do not strictly require the VM changes to be applied before the next drm_gpuvm_sm_map_lock()/_unmap_lock() call. In the case that VM changes from an earlier drm_gpuvm_sm_map()/_unmap() call result in a differing sequence of steps when the VM changes are actually applied, it will be the same set of GEM objects involved, so the locking is still correct. v2: Rename to drm_gpuvm_sm_*_exec_locked() [Danilo] v3: Expand comments to show expected usage, and explain how the usage is safe in the case of overlapping driver VM_BIND ops. Signed-off-by: Rob Clark Tested-by: Antonino Maniscalco Reviewed-by: Antonino Maniscalco Acked-by: Danilo Krummrich --- drivers/gpu/drm/drm_gpuvm.c | 126 ++++++++++++++++++++++++++++++++++++ include/drm/drm_gpuvm.h | 8 +++ 2 files changed, 134 insertions(+) diff --git a/drivers/gpu/drm/drm_gpuvm.c b/drivers/gpu/drm/drm_gpuvm.c index 0ca717130541..a811471b888e 100644 --- a/drivers/gpu/drm/drm_gpuvm.c +++ b/drivers/gpu/drm/drm_gpuvm.c @@ -2390,6 +2390,132 @@ drm_gpuvm_sm_unmap(struct drm_gpuvm *gpuvm, void *p= riv, } EXPORT_SYMBOL_GPL(drm_gpuvm_sm_unmap); =20 +static int +drm_gpuva_sm_step_lock(struct drm_gpuva_op *op, void *priv) +{ + struct drm_exec *exec =3D priv; + + switch (op->op) { + case DRM_GPUVA_OP_REMAP: + if (op->remap.unmap->va->gem.obj) + return drm_exec_lock_obj(exec, op->remap.unmap->va->gem.obj); + return 0; + case DRM_GPUVA_OP_UNMAP: + if (op->unmap.va->gem.obj) + return drm_exec_lock_obj(exec, op->unmap.va->gem.obj); + return 0; + default: + return 0; + } +} + +static const struct drm_gpuvm_ops lock_ops =3D { + .sm_step_map =3D drm_gpuva_sm_step_lock, + .sm_step_remap =3D drm_gpuva_sm_step_lock, + .sm_step_unmap =3D drm_gpuva_sm_step_lock, +}; + +/** + * drm_gpuvm_sm_map_exec_lock() - locks the objects touched by a drm_gpuvm= _sm_map() + * @gpuvm: the &drm_gpuvm representing the GPU VA space + * @exec: the &drm_exec locking context + * @num_fences: for newly mapped objects, the # of fences to reserve + * @req_addr: the start address of the range to unmap + * @req_range: the range of the mappings to unmap + * @req_obj: the &drm_gem_object to map + * @req_offset: the offset within the &drm_gem_object + * + * This function locks (drm_exec_lock_obj()) objects that will be unmapped/ + * remapped, and locks+prepares (drm_exec_prepare_object()) objects that + * will be newly mapped. + * + * The expected usage is: + * + * vm_bind { + * struct drm_exec exec; + * + * // IGNORE_DUPLICATES is required, INTERRUPTIBLE_WAIT is recommen= ded: + * drm_exec_init(&exec, IGNORE_DUPLICATES | INTERRUPTIBLE_WAIT, 0); + * + * drm_exec_until_all_locked (&exec) { + * for_each_vm_bind_operation { + * switch (op->op) { + * case DRIVER_OP_UNMAP: + * ret =3D drm_gpuvm_sm_unmap_exec_lock(gpuvm, &exec, o= p->addr, op->range); + * break; + * case DRIVER_OP_MAP: + * ret =3D drm_gpuvm_sm_map_exec_lock(gpuvm, &exec, num= _fences, + * op->addr, op->range, + * obj, op->obj_offset= ); + * break; + * } + * + * drm_exec_retry_on_contention(&exec); + * if (ret) + * return ret; + * } + * } + * } + * + * This enables all locking to be performed before the driver begins modif= ying + * the VM. This is safe to do in the case of overlapping DRIVER_VM_BIND_O= Ps, + * where an earlier op can alter the sequence of steps generated for a lat= er + * op, because the later altered step will involve the same GEM object(s) + * already seen in the earlier locking step. For example: + * + * 1) An earlier driver DRIVER_OP_UNMAP op removes the need for a + * DRM_GPUVA_OP_REMAP/UNMAP step. This is safe because we've already + * locked the GEM object in the earlier DRIVER_OP_UNMAP op. + * + * 2) An earlier DRIVER_OP_MAP op overlaps with a later DRIVER_OP_MAP/UNMAP + * op, introducing a DRM_GPUVA_OP_REMAP/UNMAP that wouldn't have been + * required without the earlier DRIVER_OP_MAP. This is safe because we= 've + * already locked the GEM object in the earlier DRIVER_OP_MAP step. + * + * Returns: 0 on success or a negative error codec + */ +int +drm_gpuvm_sm_map_exec_lock(struct drm_gpuvm *gpuvm, + struct drm_exec *exec, unsigned int num_fences, + u64 req_addr, u64 req_range, + struct drm_gem_object *req_obj, u64 req_offset) +{ + if (req_obj) { + int ret =3D drm_exec_prepare_obj(exec, req_obj, num_fences); + if (ret) + return ret; + } + + return __drm_gpuvm_sm_map(gpuvm, &lock_ops, exec, + req_addr, req_range, + req_obj, req_offset); + +} +EXPORT_SYMBOL_GPL(drm_gpuvm_sm_map_exec_lock); + +/** + * drm_gpuvm_sm_unmap_exec_lock() - locks the objects touched by drm_gpuvm= _sm_unmap() + * @gpuvm: the &drm_gpuvm representing the GPU VA space + * @exec: the &drm_exec locking context + * @req_addr: the start address of the range to unmap + * @req_range: the range of the mappings to unmap + * + * This function locks (drm_exec_lock_obj()) objects that will be unmapped/ + * remapped by drm_gpuvm_sm_unmap(). + * + * See drm_gpuvm_sm_map_exec_lock() for expected usage. + * + * Returns: 0 on success or a negative error code + */ +int +drm_gpuvm_sm_unmap_exec_lock(struct drm_gpuvm *gpuvm, struct drm_exec *exe= c, + u64 req_addr, u64 req_range) +{ + return __drm_gpuvm_sm_unmap(gpuvm, &lock_ops, exec, + req_addr, req_range); +} +EXPORT_SYMBOL_GPL(drm_gpuvm_sm_unmap_exec_lock); + static struct drm_gpuva_op * gpuva_op_alloc(struct drm_gpuvm *gpuvm) { diff --git a/include/drm/drm_gpuvm.h b/include/drm/drm_gpuvm.h index 2a9629377633..274532facfd6 100644 --- a/include/drm/drm_gpuvm.h +++ b/include/drm/drm_gpuvm.h @@ -1211,6 +1211,14 @@ int drm_gpuvm_sm_map(struct drm_gpuvm *gpuvm, void *= priv, int drm_gpuvm_sm_unmap(struct drm_gpuvm *gpuvm, void *priv, u64 addr, u64 range); =20 +int drm_gpuvm_sm_map_exec_lock(struct drm_gpuvm *gpuvm, + struct drm_exec *exec, unsigned int num_fences, + u64 req_addr, u64 req_range, + struct drm_gem_object *obj, u64 offset); + +int drm_gpuvm_sm_unmap_exec_lock(struct drm_gpuvm *gpuvm, struct drm_exec = *exec, + u64 req_addr, u64 req_range); + void drm_gpuva_map(struct drm_gpuvm *gpuvm, struct drm_gpuva *va, struct drm_gpuva_op_map *op); --=20 2.50.0 From nobody Wed Oct 8 10:58:50 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 8BC38227E88 for ; Sun, 29 Jun 2025 14:07:11 +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=1751206033; cv=none; b=Mp80gvpxY7qttiokUHhGxKdEhEY3V/jW5MqWZIDKf7RGr3jJ3qGXHIt+wOLrR2pn2tQx387GDSE0tWfDnq9VbmOlU3wNjtzihsIk3lrOr9+vceP3Wz0AqM0NaqfH8x3nXWHTTOZIoR0rqDT+7o7LZKAvzNHGebDE/bjOX9EOPX8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751206033; c=relaxed/simple; bh=XRVvkiZdyuUD3BzpHrxk2CyWGEjPti1XCiRHl00bWx4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DUs9cHdBtV34L6iNOhEw3JXveW4a/fi6pH2+EdMx6hR1wUcyJyMC19JAnkCfZlK5OohqDqaTZTcxw51DV/ki4ObI6h6LwP7mwdU2Gm/ndRJVLW+2eoJMOQULiF3JdeCquFXvtPBkhOh65pANAG5feeRofR4KvSQothcStARlkpM= 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=G8p4peux; 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="G8p4peux" Received: from pps.filterd (m0279872.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 55TDRoLj010344 for ; Sun, 29 Jun 2025 14:07:05 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=UaLuKm/3fKy TMFvsdO3Mo5+i/aFeJ7ZuYdAPUo3GE+o=; b=G8p4peux7N+5tDdYCe9rJ2y5b/z dL+Fg7E1BREfn752e39SMxTzRfXBNnBTmNR/qoow9UgpnI07Y7YrfO7l/S/lwSyb GCDw1ZV4ofDxgCnuvlbPgOyLOHhB5VkEehkMsCnDjQqG8MNVMlay9idBjxGUZy+M QlG2ss3q6JBECXDzrcydv6yqx7QnVjvgJq0xf4FbeCfX4al6wYtfp7tZTwT2TCHb LmCxT+7+nDi+TRdBYfWvgMykNiPtKT1y19Ey4PkjDF+Zk8+xF1Ba7ZrfT6XQske0 pZ/FYMYEyLTUPImbKJAVb1FntQe/lQviX2agE6HH39dxnNmk72iFZ6NwCuA== Received: from mail-pf1-f198.google.com (mail-pf1-f198.google.com [209.85.210.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 47j8s9a5ux-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Sun, 29 Jun 2025 14:07:04 +0000 (GMT) Received: by mail-pf1-f198.google.com with SMTP id d2e1a72fcca58-740774348f6so2965772b3a.1 for ; Sun, 29 Jun 2025 07:07:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751206023; x=1751810823; 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=UaLuKm/3fKyTMFvsdO3Mo5+i/aFeJ7ZuYdAPUo3GE+o=; b=bJTFLOPUYV7l3sWsGReub0qZ+j9trXKrCbNkC9KxtuUcovCuh5iq+vDEjv+DVtIZMd TBLuTUM0k78bPC6hn4H7XJSsxF9Y06q8nlt+TWsWOxpksBMaHLPAX8uJanfXlkYM/x10 Wvze4U7KwO2kGIva1hwbVAvBaBfLIHu/CwtI53LiB37Hw8WQVMvtLzzoxRFCQoj0Tnis tFdFMe/b9cXE+EMJmxuqyLOL88EiOWE+liCFIA7PGTLWnVx7DD7SaNYUi5aldlck9ojI UsJ/kvUrfdVg0MZDCJoAaZM5mvcTHUJ2Minvn6O9d00llPBoxh/XZfchvjnpYC405766 9IPg== X-Forwarded-Encrypted: i=1; AJvYcCV8hlYdgHPrCZZUbS70ZTMvw9n9ompWK/lAzBovEjUN4IBLWCkxnzWhy9OmmiB/NNuwBdPedM08qWkj8Ps=@vger.kernel.org X-Gm-Message-State: AOJu0YxOdoYrtrMBSZ0HRBvFGb3DBc5T0lVQst9Zj1XIIoIxvGqJY1+w j9L2O4vUZgPKYnKPB3BMupsrn5DluER7zwRfHarOTHYMlYh2veJFwqC5XjLt2K03Zodh6B0chHX Pi8tTK9uEvyrfwckyShqOJkUSX6b3mJoeWVRBXzVULYsZ96bNbZge/Mur23tSw3dSUMo= X-Gm-Gg: ASbGncsJflCEILORMz66okja8H5kHybPvipPht4sxTcS4wH9FOOIwKi43tssBgGVRNS m+E45hsrlL8NuetiyXUUhXTY0bjoEu3JpLfhpk6z/4A1Yc/ylZepqizxxavV0BR2MNIZUXvkjJt NzZafBNAvtChYzjPinVGchjGX2DnsQRhwdZ/xxC4JyslU/Z7uLWJl5HAULXJJSNlKpyA9EoqNh7 rwoBMTh38qk1KMI7NZO0K3Tm69PB8B5vycJgJu8SuZDPCsmlcnBX/eyWl0KMJ/qM1dd4AoQvSIq WETyZi7rVeEYXTFWRAo/F4Mnvp5/Iil4 X-Received: by 2002:a05:6a00:92a6:b0:748:323f:ba21 with SMTP id d2e1a72fcca58-74af6e27ba7mr12454249b3a.1.1751206023410; Sun, 29 Jun 2025 07:07:03 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF64qcH/Dvu1RsA66gxeamabybbwejYBsbv5pTYh18PMePejoeduNagkrBZeEp0IvcikwbAuw== X-Received: by 2002:a05:6a00:92a6:b0:748:323f:ba21 with SMTP id d2e1a72fcca58-74af6e27ba7mr12454211b3a.1.1751206022909; Sun, 29 Jun 2025 07:07:02 -0700 (PDT) Received: from localhost ([2601:1c0:5000:d5c:5b3e:de60:4fda:e7b1]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-b34e31da8f7sm5914737a12.62.2025.06.29.07.07.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Jun 2025 07:07:02 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, Connor Abbott , Antonino Maniscalco , Danilo Krummrich , Rob Clark , Rob Clark , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v8 03/42] drm/gem: Add ww_acquire_ctx support to drm_gem_lru_scan() Date: Sun, 29 Jun 2025 07:03:06 -0700 Message-ID: <20250629140537.30850-4-robin.clark@oss.qualcomm.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250629140537.30850-1-robin.clark@oss.qualcomm.com> References: <20250629140537.30850-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-Authority-Analysis: v=2.4 cv=H/Pbw/Yi c=1 sm=1 tr=0 ts=68614888 cx=c_pps a=m5Vt/hrsBiPMCU0y4gIsQw==:117 a=xqWC_Br6kY4A:10 a=6IFa9wvqVegA:10 a=cm27Pg_UAAAA:8 a=EUspDBNiAAAA:8 a=pGLkceISAAAA:8 a=Xs8HUT0FnXyYc1zbtowA:9 a=IoOABgeZipijB_acs4fv:22 X-Proofpoint-ORIG-GUID: ge-fRjow3Ol6unoRtMnDLBNWHS98XofP X-Proofpoint-GUID: ge-fRjow3Ol6unoRtMnDLBNWHS98XofP X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjI5MDExOCBTYWx0ZWRfX7Yr3OLJLmRpv na1+ncwGB3TpnKLtJR/lyUIrn0C9UhgCOZpfoKk5ibWQs/ZYciur3SUJIqxDRftySd2LeORf/sQ 4NiDjbROmxIqda1DPhfgTGSBHnAwGCdtcLWNxP4Ut9U8sI4GuVib3eqjeVc/hVjO9jgtFLovAwY KLjm1YYVpgKYZxDwXH1K7slndpYOHyHyY+pBBi7EYyyVf6NuE0Dgq9ej+ENzbf0aLSvgkDBcrz5 ZgZGBtb4/TNjjCCfihzN6yFcCfarV08Eyl1rlgyYw6n1H5UGjTiLLz4VqIixVU8LqDpsQfz1rX2 L5vbk5LuSLM4piO2lm3YqfWUToSOwfCjVeJ+0riwSBEMT4dCu9iYyFc6rNLpxqkPia0CSQKEWQI xVmJLsjY8LUhtzyHD1ZfaQMKAgqPjyzdiBgJreLFhYM+klT6nAcx1Ioo1Z9ybHPEeFE49pZH 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-27_05,2025-06-27_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 malwarescore=0 suspectscore=0 mlxlogscore=999 priorityscore=1501 clxscore=1015 mlxscore=0 lowpriorityscore=0 spamscore=0 adultscore=0 bulkscore=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-2506290118 Content-Type: text/plain; charset="utf-8" From: Rob Clark If the callback is going to have to attempt to grab more locks, it is useful to have an ww_acquire_ctx to avoid locking order problems. Why not use the drm_exec helper instead? Mainly because (a) where ww_acquire_init() is called is awkward, and (b) we don't really need to retry after backoff, we can just move on to the next object. Signed-off-by: Rob Clark Signed-off-by: Rob Clark Tested-by: Antonino Maniscalco Reviewed-by: Antonino Maniscalco --- drivers/gpu/drm/drm_gem.c | 14 +++++++++++--- drivers/gpu/drm/msm/msm_gem_shrinker.c | 24 +++++++++++++----------- include/drm/drm_gem.h | 10 ++++++---- 3 files changed, 30 insertions(+), 18 deletions(-) diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c index 1e659d2660f7..95158cd7145e 100644 --- a/drivers/gpu/drm/drm_gem.c +++ b/drivers/gpu/drm/drm_gem.c @@ -1460,12 +1460,14 @@ EXPORT_SYMBOL(drm_gem_lru_move_tail); * @nr_to_scan: The number of pages to try to reclaim * @remaining: The number of pages left to reclaim, should be initialized = by caller * @shrink: Callback to try to shrink/reclaim the object. + * @ticket: Optional ww_acquire_ctx context to use for locking */ unsigned long drm_gem_lru_scan(struct drm_gem_lru *lru, unsigned int nr_to_scan, unsigned long *remaining, - bool (*shrink)(struct drm_gem_object *obj)) + bool (*shrink)(struct drm_gem_object *obj, struct ww_acquire_ctx *ticke= t), + struct ww_acquire_ctx *ticket) { struct drm_gem_lru still_in_lru; struct drm_gem_object *obj; @@ -1498,17 +1500,20 @@ drm_gem_lru_scan(struct drm_gem_lru *lru, */ mutex_unlock(lru->lock); =20 + if (ticket) + ww_acquire_init(ticket, &reservation_ww_class); + /* * Note that this still needs to be trylock, since we can * hit shrinker in response to trying to get backing pages * for this obj (ie. while it's lock is already held) */ - if (!dma_resv_trylock(obj->resv)) { + if (!ww_mutex_trylock(&obj->resv->lock, ticket)) { *remaining +=3D obj->size >> PAGE_SHIFT; goto tail; } =20 - if (shrink(obj)) { + if (shrink(obj, ticket)) { freed +=3D obj->size >> PAGE_SHIFT; =20 /* @@ -1522,6 +1527,9 @@ drm_gem_lru_scan(struct drm_gem_lru *lru, =20 dma_resv_unlock(obj->resv); =20 + if (ticket) + ww_acquire_fini(ticket); + tail: drm_gem_object_put(obj); mutex_lock(lru->lock); diff --git a/drivers/gpu/drm/msm/msm_gem_shrinker.c b/drivers/gpu/drm/msm/m= sm_gem_shrinker.c index 07ca4ddfe4e3..de185fc34084 100644 --- a/drivers/gpu/drm/msm/msm_gem_shrinker.c +++ b/drivers/gpu/drm/msm/msm_gem_shrinker.c @@ -44,7 +44,7 @@ msm_gem_shrinker_count(struct shrinker *shrinker, struct = shrink_control *sc) } =20 static bool -purge(struct drm_gem_object *obj) +purge(struct drm_gem_object *obj, struct ww_acquire_ctx *ticket) { if (!is_purgeable(to_msm_bo(obj))) return false; @@ -58,7 +58,7 @@ purge(struct drm_gem_object *obj) } =20 static bool -evict(struct drm_gem_object *obj) +evict(struct drm_gem_object *obj, struct ww_acquire_ctx *ticket) { if (is_unevictable(to_msm_bo(obj))) return false; @@ -79,21 +79,21 @@ wait_for_idle(struct drm_gem_object *obj) } =20 static bool -active_purge(struct drm_gem_object *obj) +active_purge(struct drm_gem_object *obj, struct ww_acquire_ctx *ticket) { if (!wait_for_idle(obj)) return false; =20 - return purge(obj); + return purge(obj, ticket); } =20 static bool -active_evict(struct drm_gem_object *obj) +active_evict(struct drm_gem_object *obj, struct ww_acquire_ctx *ticket) { if (!wait_for_idle(obj)) return false; =20 - return evict(obj); + return evict(obj, ticket); } =20 static unsigned long @@ -102,7 +102,7 @@ msm_gem_shrinker_scan(struct shrinker *shrinker, struct= shrink_control *sc) struct msm_drm_private *priv =3D shrinker->private_data; struct { struct drm_gem_lru *lru; - bool (*shrink)(struct drm_gem_object *obj); + bool (*shrink)(struct drm_gem_object *obj, struct ww_acquire_ctx *ticket= ); bool cond; unsigned long freed; unsigned long remaining; @@ -122,8 +122,9 @@ msm_gem_shrinker_scan(struct shrinker *shrinker, struct= shrink_control *sc) continue; stages[i].freed =3D drm_gem_lru_scan(stages[i].lru, nr, - &stages[i].remaining, - stages[i].shrink); + &stages[i].remaining, + stages[i].shrink, + NULL); nr -=3D stages[i].freed; freed +=3D stages[i].freed; remaining +=3D stages[i].remaining; @@ -164,7 +165,7 @@ msm_gem_shrinker_shrink(struct drm_device *dev, unsigne= d long nr_to_scan) static const int vmap_shrink_limit =3D 15; =20 static bool -vmap_shrink(struct drm_gem_object *obj) +vmap_shrink(struct drm_gem_object *obj, struct ww_acquire_ctx *ticket) { if (!is_vunmapable(to_msm_bo(obj))) return false; @@ -192,7 +193,8 @@ msm_gem_shrinker_vmap(struct notifier_block *nb, unsign= ed long event, void *ptr) unmapped +=3D drm_gem_lru_scan(lrus[idx], vmap_shrink_limit - unmapped, &remaining, - vmap_shrink); + vmap_shrink, + NULL); } =20 *(unsigned long *)ptr +=3D unmapped; diff --git a/include/drm/drm_gem.h b/include/drm/drm_gem.h index a3133a08267c..02b5e9402e32 100644 --- a/include/drm/drm_gem.h +++ b/include/drm/drm_gem.h @@ -559,10 +559,12 @@ void drm_gem_lru_init(struct drm_gem_lru *lru, struct= mutex *lock); void drm_gem_lru_remove(struct drm_gem_object *obj); void drm_gem_lru_move_tail_locked(struct drm_gem_lru *lru, struct drm_gem_= object *obj); void drm_gem_lru_move_tail(struct drm_gem_lru *lru, struct drm_gem_object = *obj); -unsigned long drm_gem_lru_scan(struct drm_gem_lru *lru, - unsigned int nr_to_scan, - unsigned long *remaining, - bool (*shrink)(struct drm_gem_object *obj)); +unsigned long +drm_gem_lru_scan(struct drm_gem_lru *lru, + unsigned int nr_to_scan, + unsigned long *remaining, + bool (*shrink)(struct drm_gem_object *obj, struct ww_acquire_ctx *ticke= t), + struct ww_acquire_ctx *ticket); =20 int drm_gem_evict_locked(struct drm_gem_object *obj); =20 --=20 2.50.0 From nobody Wed Oct 8 10:58:50 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 0D48F2264B1 for ; Sun, 29 Jun 2025 14:07:07 +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=1751206030; cv=none; b=ot/S1WvHEr+rPzTrJsm40AW1LIJGdYgtwEYMkcsrxM/e026hDy2ViXySMRiTOAfkhG4Hs2hw5Zdv4NLN/7uvjmg7ImQj8fuyp96VRprPxFsLc/T14kTdlmQJn1V7nOgvOP7hIG5I3TnZhslJrR1alHGQqe0cb2qCOqJ/F3t12xM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751206030; c=relaxed/simple; bh=tk6N32eJ7GdNrzAEVW5eaRrz3mViSH8EIgbl5lfs/ZA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZLWRI6WoX4bvFwqYRw5fVxgyt2+PCwHirqThPq0o8D1k5+MvXI7WfsQV3IyOC0/JhKNsbPvyKobsDMRjehe1FwjvwU6Vwj9RoUeLR0KDnSrLEepAEvybDC3jBbbgVPakBj0Df0g0c5ecLC3o4t2/Er4iQKXfEmTCzyXJ0FLJ6Xo= 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=Q00D0Cy4; 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="Q00D0Cy4" 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 55TCL5F9003704 for ; Sun, 29 Jun 2025 14:07:07 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=TaFvg5tKZ6Z RWJDBBSLZsqiTWRlMEYOfJPHM6b2hu5U=; b=Q00D0Cy4v2cS24S6g8JtL4bLyD0 OEXPth4GoZrFk0iO/NgrzXTWIuvMmEtnkQKQDBN2wK9JFxLf92dh/xgY74zFTFqY 5AZzUVModN2v/rqhSMq7FfXntDNSRiZXkZKktNLFUcOKvBXXTfM7GnZnEiDAqBoV HSdQJ7xRBHagOZQ9WdKM9dOFgZtzqP4vsWDXp2cQCRgVipsrWUs+zADndZLRnLz5 JpjYuXnTPWmTQ5R55G2NsGngtyPsZROa1WG2B05ju86klYnlRzgf7OMkPhDqDBBL TvlPYm5VIUKUROfWdoO676/mdGz/CMhQNrJQVHUAl19ZPnz41LTovxH/zHg== Received: from mail-pf1-f200.google.com (mail-pf1-f200.google.com [209.85.210.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 47j7qm280x-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Sun, 29 Jun 2025 14:07:06 +0000 (GMT) Received: by mail-pf1-f200.google.com with SMTP id d2e1a72fcca58-74ae13e99d6so3167703b3a.0 for ; Sun, 29 Jun 2025 07:07:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751206025; x=1751810825; 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=TaFvg5tKZ6ZRWJDBBSLZsqiTWRlMEYOfJPHM6b2hu5U=; b=Zk06dpKGBXa6UiUJspIaqWzvUDiVDRdmdn/eF7rs3FbzrSitJaVTGttUZxjD789jhD 1VoCvNAz/4G7Lw0lqmGmheWDZHdDH3BLFY05rLgJ0ezJmDAGtylBEeqb6ujHbO2ysCy1 DAP/CELQ6SCCwEC/MRUgjbSPA6G1xZU50KDviNRQ9Y+eOVCMhCurj7M7eWFCwK7RRdr4 9FFW+1eCPIi/dCquUDfi1c/TgQplXENmJw62Dsw9YNi+3NULyOzsAEXVLjQ4W0JXy090 wEK/+5oLeUzS5z4M/hJcq6U26lx7UPoFJI4JN607EJmE82aGqmqdzvdoAQT204NBUEt4 Js5w== X-Forwarded-Encrypted: i=1; AJvYcCXyrq6Ruu4+3FZoOwuNO0jBMx5jr0H+acp+Yd2Z2Zv0BLfd3vi7MmzNPUZ21Doeimv8eixUb2NznKuA5aU=@vger.kernel.org X-Gm-Message-State: AOJu0YyGk9L9PsAhR6eKnnTXX9sQSuJrzJCwI99ANiVfoXXJTnZfVu6y cmdJs8D4id/Std4nbablXsuLsRS4Jatd62xowEdgB1cqgY/NiqaV4fo8Puoh3Kc7Z/jKRZmIPiQ fWfgas7XkcjwCgGrJGbaaNE/p5oiQeFVF8aR8KpyajR+rmmN51X9vAVDSHUdGEquIt2k= X-Gm-Gg: ASbGncv4V4s24BGzUWE3JpY59JuLFMwBGyJ0tyDwqpieM+H43ndkQ2rSHMJ+w/3Xkyi 6fa/CBVjFG1byGymiCEfHxsunujHGmDo+oxPNqVCjHdN1fEWS9Y5E9TwkcRDJvNMoMiCwuSx2nd Wpx0miG/GHg6FtLk31kBVDkUGhY0+se4Rhp5zw3lnyn0ZpVnaCBbCFc7+ns0bkS9Vrd48pg+rBY GVzTc2558eBqBsZYuJEUwjOS+vLU4JF/DjuFbTCweajRFicm6AyqlPkacY0OONagEQGkuCJT8qZ Tka6SRxQjy5807QbkBZrJC1VRXridKf7 X-Received: by 2002:a05:6a20:12cb:b0:220:3a2:e0c6 with SMTP id adf61e73a8af0-2208d0692bamr25755852637.6.1751206025254; Sun, 29 Jun 2025 07:07:05 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEPHS9tVuK3efNVehtLfqIRG0qAd8hfSpSR2ViZ9kGJAkmj4xh8Po+ddfXkjVXdeYkOmP9R1w== X-Received: by 2002:a05:6a20:12cb:b0:220:3a2:e0c6 with SMTP id adf61e73a8af0-2208d0692bamr25755788637.6.1751206024603; Sun, 29 Jun 2025 07:07:04 -0700 (PDT) Received: from localhost ([2601:1c0:5000:d5c:5b3e:de60:4fda:e7b1]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-b350d81f0ecsm755277a12.27.2025.06.29.07.07.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Jun 2025 07:07:04 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, Connor Abbott , Antonino Maniscalco , Danilo Krummrich , Rob Clark , Dmitry Baryshkov , Rob Clark , Sean Paul , Konrad Dybcio , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Marijn Suijten , David Airlie , Simona Vetter , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v8 04/42] drm/msm: Rename msm_file_private -> msm_context Date: Sun, 29 Jun 2025 07:03:07 -0700 Message-ID: <20250629140537.30850-5-robin.clark@oss.qualcomm.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250629140537.30850-1-robin.clark@oss.qualcomm.com> References: <20250629140537.30850-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-Authority-Analysis: v=2.4 cv=C4TpyRP+ c=1 sm=1 tr=0 ts=6861488a cx=c_pps a=mDZGXZTwRPZaeRUbqKGCBw==:117 a=xqWC_Br6kY4A:10 a=6IFa9wvqVegA:10 a=cm27Pg_UAAAA:8 a=EUspDBNiAAAA:8 a=pGLkceISAAAA:8 a=f_Su2nKqq5cPEY4CjHUA:9 a=zc0IvFSfCIW2DFIPzwfm:22 X-Proofpoint-ORIG-GUID: RKwPyMloNcGtLaqa0yh6b6cucr3gu7bQ X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjI5MDExOSBTYWx0ZWRfX4JswI0iEg+nD TLWFcp7HVk4S30NytGZKhtfTibjLQ3EEH696etoHB+rc4QdXBt/tA4R/4pNvu0FpotikcTaGZoS dHaxp+Q3ZHLphgvWw917UXW54dvtU9qOzF51qgKpgx/wCTd0E7nBNv6/GUjFkvJRZDv9lMsk5sn NDCPCKdA/yrm2aHiJdgazrQv2LgVnlFgXiVkhaLDTdyKQkbqqQ53/521TLroH/Ko6oQHZmRf/rW FaYPmG+LKt2GIeVHD7NBXLzpCPxaEVMH38sOigNTFH2T/izLLDsyzEpNWwxrGESLPeH12RjyrTj XiMpqROVP5lj85WV2BwH+UWtpCI7M3BiTJW9rbf/16hHBN9I855A4cAA+GuhAU6hu4zaf+6S+aZ zZECM3NkoTd5XlxxrfVWULvVRqakIp9pKTCuYLzq+A1jQWxupokIggavNhcMPDF8ygn+mM8R X-Proofpoint-GUID: RKwPyMloNcGtLaqa0yh6b6cucr3gu7bQ 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-27_05,2025-06-27_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 phishscore=0 suspectscore=0 bulkscore=0 lowpriorityscore=0 clxscore=1015 priorityscore=1501 spamscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 malwarescore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2506290119 Content-Type: text/plain; charset="utf-8" From: Rob Clark This is a more descriptive name. Signed-off-by: Rob Clark Reviewed-by: Dmitry Baryshkov Signed-off-by: Rob Clark Tested-by: Antonino Maniscalco Reviewed-by: Antonino Maniscalco --- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 2 +- drivers/gpu/drm/msm/adreno/adreno_gpu.c | 6 ++-- drivers/gpu/drm/msm/adreno/adreno_gpu.h | 4 +-- drivers/gpu/drm/msm/msm_drv.c | 14 ++++----- drivers/gpu/drm/msm/msm_gem.c | 2 +- drivers/gpu/drm/msm/msm_gem_submit.c | 2 +- drivers/gpu/drm/msm/msm_gpu.c | 4 +-- drivers/gpu/drm/msm/msm_gpu.h | 39 ++++++++++++------------- drivers/gpu/drm/msm/msm_submitqueue.c | 27 +++++++++-------- 9 files changed, 49 insertions(+), 51 deletions(-) diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c b/drivers/gpu/drm/msm/ad= reno/a6xx_gpu.c index 491fde0083a2..a8e6f62b6873 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c @@ -111,7 +111,7 @@ static void a6xx_set_pagetable(struct a6xx_gpu *a6xx_gp= u, struct msm_ringbuffer *ring, struct msm_gem_submit *submit) { bool sysprof =3D refcount_read(&a6xx_gpu->base.base.sysprof_active) > 1; - struct msm_file_private *ctx =3D submit->queue->ctx; + struct msm_context *ctx =3D submit->queue->ctx; struct adreno_gpu *adreno_gpu =3D &a6xx_gpu->base; phys_addr_t ttbr; u32 asid; diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/= adreno/adreno_gpu.c index 86bff915c3e7..5f4de4c25b97 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c @@ -351,7 +351,7 @@ int adreno_fault_handler(struct msm_gpu *gpu, unsigned = long iova, int flags, return 0; } =20 -int adreno_get_param(struct msm_gpu *gpu, struct msm_file_private *ctx, +int adreno_get_param(struct msm_gpu *gpu, struct msm_context *ctx, uint32_t param, uint64_t *value, uint32_t *len) { struct adreno_gpu *adreno_gpu =3D to_adreno_gpu(gpu); @@ -439,7 +439,7 @@ int adreno_get_param(struct msm_gpu *gpu, struct msm_fi= le_private *ctx, } } =20 -int adreno_set_param(struct msm_gpu *gpu, struct msm_file_private *ctx, +int adreno_set_param(struct msm_gpu *gpu, struct msm_context *ctx, uint32_t param, uint64_t value, uint32_t len) { struct drm_device *drm =3D gpu->dev; @@ -485,7 +485,7 @@ int adreno_set_param(struct msm_gpu *gpu, struct msm_fi= le_private *ctx, case MSM_PARAM_SYSPROF: if (!capable(CAP_SYS_ADMIN)) return UERR(EPERM, drm, "invalid permissions"); - return msm_file_private_set_sysprof(ctx, gpu, value); + return msm_context_set_sysprof(ctx, gpu, value); default: return UERR(EINVAL, drm, "%s: invalid param: %u", gpu->name, param); } diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.h b/drivers/gpu/drm/msm/= adreno/adreno_gpu.h index bc063594a359..a4abafca7782 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.h +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.h @@ -581,9 +581,9 @@ static inline int adreno_is_a7xx(struct adreno_gpu *gpu) /* Put vm_start above 32b to catch issues with not setting xyz_BASE_HI */ #define ADRENO_VM_START 0x100000000ULL u64 adreno_private_address_space_size(struct msm_gpu *gpu); -int adreno_get_param(struct msm_gpu *gpu, struct msm_file_private *ctx, +int adreno_get_param(struct msm_gpu *gpu, struct msm_context *ctx, uint32_t param, uint64_t *value, uint32_t *len); -int adreno_set_param(struct msm_gpu *gpu, struct msm_file_private *ctx, +int adreno_set_param(struct msm_gpu *gpu, struct msm_context *ctx, uint32_t param, uint64_t value, uint32_t len); const struct firmware *adreno_request_fw(struct adreno_gpu *adreno_gpu, const char *fwname); diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c index d007687c2446..324ee2089b34 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -337,7 +337,7 @@ static int context_init(struct drm_device *dev, struct = drm_file *file) { static atomic_t ident =3D ATOMIC_INIT(0); struct msm_drm_private *priv =3D dev->dev_private; - struct msm_file_private *ctx; + struct msm_context *ctx; =20 ctx =3D kzalloc(sizeof(*ctx), GFP_KERNEL); if (!ctx) @@ -367,23 +367,23 @@ static int msm_open(struct drm_device *dev, struct dr= m_file *file) return context_init(dev, file); } =20 -static void context_close(struct msm_file_private *ctx) +static void context_close(struct msm_context *ctx) { msm_submitqueue_close(ctx); - msm_file_private_put(ctx); + msm_context_put(ctx); } =20 static void msm_postclose(struct drm_device *dev, struct drm_file *file) { struct msm_drm_private *priv =3D dev->dev_private; - struct msm_file_private *ctx =3D file->driver_priv; + struct msm_context *ctx =3D file->driver_priv; =20 /* * It is not possible to set sysprof param to non-zero if gpu * is not initialized: */ if (priv->gpu) - msm_file_private_set_sysprof(ctx, priv->gpu, 0); + msm_context_set_sysprof(ctx, priv->gpu, 0); =20 context_close(ctx); } @@ -515,7 +515,7 @@ static int msm_ioctl_gem_info_iova(struct drm_device *d= ev, uint64_t *iova) { struct msm_drm_private *priv =3D dev->dev_private; - struct msm_file_private *ctx =3D file->driver_priv; + struct msm_context *ctx =3D file->driver_priv; =20 if (!priv->gpu) return -EINVAL; @@ -535,7 +535,7 @@ static int msm_ioctl_gem_info_set_iova(struct drm_devic= e *dev, uint64_t iova) { struct msm_drm_private *priv =3D dev->dev_private; - struct msm_file_private *ctx =3D file->driver_priv; + struct msm_context *ctx =3D file->driver_priv; =20 if (!priv->gpu) return -EINVAL; diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c index 2995e80fec3b..259919b0e887 100644 --- a/drivers/gpu/drm/msm/msm_gem.c +++ b/drivers/gpu/drm/msm/msm_gem.c @@ -44,7 +44,7 @@ static void update_device_mem(struct msm_drm_private *pri= v, ssize_t size) =20 static void update_ctx_mem(struct drm_file *file, ssize_t size) { - struct msm_file_private *ctx =3D file->driver_priv; + struct msm_context *ctx =3D file->driver_priv; uint64_t ctx_mem =3D atomic64_add_return(size, &ctx->ctx_mem); =20 rcu_read_lock(); /* Locks file->pid! */ diff --git a/drivers/gpu/drm/msm/msm_gem_submit.c b/drivers/gpu/drm/msm/msm= _gem_submit.c index d4f71bb54e84..3aabf7f1da6d 100644 --- a/drivers/gpu/drm/msm/msm_gem_submit.c +++ b/drivers/gpu/drm/msm/msm_gem_submit.c @@ -651,7 +651,7 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void *= data, { struct msm_drm_private *priv =3D dev->dev_private; struct drm_msm_gem_submit *args =3D data; - struct msm_file_private *ctx =3D file->driver_priv; + struct msm_context *ctx =3D file->driver_priv; struct msm_gem_submit *submit =3D NULL; struct msm_gpu *gpu =3D priv->gpu; struct msm_gpu_submitqueue *queue; diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c index 3947f7ba1421..a8280b579832 100644 --- a/drivers/gpu/drm/msm/msm_gpu.c +++ b/drivers/gpu/drm/msm/msm_gpu.c @@ -148,7 +148,7 @@ int msm_gpu_pm_suspend(struct msm_gpu *gpu) return 0; } =20 -void msm_gpu_show_fdinfo(struct msm_gpu *gpu, struct msm_file_private *ctx, +void msm_gpu_show_fdinfo(struct msm_gpu *gpu, struct msm_context *ctx, struct drm_printer *p) { drm_printf(p, "drm-engine-gpu:\t%llu ns\n", ctx->elapsed_ns); @@ -342,7 +342,7 @@ static void retire_submits(struct msm_gpu *gpu); =20 static void get_comm_cmdline(struct msm_gem_submit *submit, char **comm, c= har **cmd) { - struct msm_file_private *ctx =3D submit->queue->ctx; + struct msm_context *ctx =3D submit->queue->ctx; struct task_struct *task; =20 WARN_ON(!mutex_is_locked(&submit->gpu->lock)); diff --git a/drivers/gpu/drm/msm/msm_gpu.h b/drivers/gpu/drm/msm/msm_gpu.h index 5bf7cd985b9c..937b7cdddadd 100644 --- a/drivers/gpu/drm/msm/msm_gpu.h +++ b/drivers/gpu/drm/msm/msm_gpu.h @@ -22,7 +22,7 @@ struct msm_gem_submit; struct msm_gpu_perfcntr; struct msm_gpu_state; -struct msm_file_private; +struct msm_context; =20 struct msm_gpu_config { const char *ioname; @@ -44,9 +44,9 @@ struct msm_gpu_config { * + z180_gpu */ struct msm_gpu_funcs { - int (*get_param)(struct msm_gpu *gpu, struct msm_file_private *ctx, + int (*get_param)(struct msm_gpu *gpu, struct msm_context *ctx, uint32_t param, uint64_t *value, uint32_t *len); - int (*set_param)(struct msm_gpu *gpu, struct msm_file_private *ctx, + int (*set_param)(struct msm_gpu *gpu, struct msm_context *ctx, uint32_t param, uint64_t value, uint32_t len); int (*hw_init)(struct msm_gpu *gpu); =20 @@ -341,7 +341,7 @@ struct msm_gpu_perfcntr { #define NR_SCHED_PRIORITIES (1 + DRM_SCHED_PRIORITY_LOW - DRM_SCHED_PRIORI= TY_HIGH) =20 /** - * struct msm_file_private - per-drm_file context + * struct msm_context - per-drm_file context * * @queuelock: synchronizes access to submitqueues list * @submitqueues: list of &msm_gpu_submitqueue created by userspace @@ -351,7 +351,7 @@ struct msm_gpu_perfcntr { * @ref: reference count * @seqno: unique per process seqno */ -struct msm_file_private { +struct msm_context { rwlock_t queuelock; struct list_head submitqueues; int queueid; @@ -506,7 +506,7 @@ struct msm_gpu_submitqueue { u32 ring_nr; int faults; uint32_t last_fence; - struct msm_file_private *ctx; + struct msm_context *ctx; struct list_head node; struct idr fence_idr; struct spinlock idr_lock; @@ -602,33 +602,32 @@ static inline void gpu_write64(struct msm_gpu *gpu, u= 32 reg, u64 val) int msm_gpu_pm_suspend(struct msm_gpu *gpu); int msm_gpu_pm_resume(struct msm_gpu *gpu); =20 -void msm_gpu_show_fdinfo(struct msm_gpu *gpu, struct msm_file_private *ctx, +void msm_gpu_show_fdinfo(struct msm_gpu *gpu, struct msm_context *ctx, struct drm_printer *p); =20 -int msm_submitqueue_init(struct drm_device *drm, struct msm_file_private *= ctx); -struct msm_gpu_submitqueue *msm_submitqueue_get(struct msm_file_private *c= tx, +int msm_submitqueue_init(struct drm_device *drm, struct msm_context *ctx); +struct msm_gpu_submitqueue *msm_submitqueue_get(struct msm_context *ctx, u32 id); int msm_submitqueue_create(struct drm_device *drm, - struct msm_file_private *ctx, + struct msm_context *ctx, u32 prio, u32 flags, u32 *id); -int msm_submitqueue_query(struct drm_device *drm, struct msm_file_private = *ctx, +int msm_submitqueue_query(struct drm_device *drm, struct msm_context *ctx, struct drm_msm_submitqueue_query *args); -int msm_submitqueue_remove(struct msm_file_private *ctx, u32 id); -void msm_submitqueue_close(struct msm_file_private *ctx); +int msm_submitqueue_remove(struct msm_context *ctx, u32 id); +void msm_submitqueue_close(struct msm_context *ctx); =20 void msm_submitqueue_destroy(struct kref *kref); =20 -int msm_file_private_set_sysprof(struct msm_file_private *ctx, - struct msm_gpu *gpu, int sysprof); -void __msm_file_private_destroy(struct kref *kref); +int msm_context_set_sysprof(struct msm_context *ctx, struct msm_gpu *gpu, = int sysprof); +void __msm_context_destroy(struct kref *kref); =20 -static inline void msm_file_private_put(struct msm_file_private *ctx) +static inline void msm_context_put(struct msm_context *ctx) { - kref_put(&ctx->ref, __msm_file_private_destroy); + kref_put(&ctx->ref, __msm_context_destroy); } =20 -static inline struct msm_file_private *msm_file_private_get( - struct msm_file_private *ctx) +static inline struct msm_context *msm_context_get( + struct msm_context *ctx) { kref_get(&ctx->ref); return ctx; diff --git a/drivers/gpu/drm/msm/msm_submitqueue.c b/drivers/gpu/drm/msm/ms= m_submitqueue.c index 7fed1de63b5d..1acc0fe36353 100644 --- a/drivers/gpu/drm/msm/msm_submitqueue.c +++ b/drivers/gpu/drm/msm/msm_submitqueue.c @@ -7,8 +7,7 @@ =20 #include "msm_gpu.h" =20 -int msm_file_private_set_sysprof(struct msm_file_private *ctx, - struct msm_gpu *gpu, int sysprof) +int msm_context_set_sysprof(struct msm_context *ctx, struct msm_gpu *gpu, = int sysprof) { /* * Since pm_runtime and sysprof_active are both refcounts, we @@ -46,10 +45,10 @@ int msm_file_private_set_sysprof(struct msm_file_privat= e *ctx, return 0; } =20 -void __msm_file_private_destroy(struct kref *kref) +void __msm_context_destroy(struct kref *kref) { - struct msm_file_private *ctx =3D container_of(kref, - struct msm_file_private, ref); + struct msm_context *ctx =3D container_of(kref, + struct msm_context, ref); int i; =20 for (i =3D 0; i < ARRAY_SIZE(ctx->entities); i++) { @@ -73,12 +72,12 @@ void msm_submitqueue_destroy(struct kref *kref) =20 idr_destroy(&queue->fence_idr); =20 - msm_file_private_put(queue->ctx); + msm_context_put(queue->ctx); =20 kfree(queue); } =20 -struct msm_gpu_submitqueue *msm_submitqueue_get(struct msm_file_private *c= tx, +struct msm_gpu_submitqueue *msm_submitqueue_get(struct msm_context *ctx, u32 id) { struct msm_gpu_submitqueue *entry; @@ -101,7 +100,7 @@ struct msm_gpu_submitqueue *msm_submitqueue_get(struct = msm_file_private *ctx, return NULL; } =20 -void msm_submitqueue_close(struct msm_file_private *ctx) +void msm_submitqueue_close(struct msm_context *ctx) { struct msm_gpu_submitqueue *entry, *tmp; =20 @@ -119,7 +118,7 @@ void msm_submitqueue_close(struct msm_file_private *ctx) } =20 static struct drm_sched_entity * -get_sched_entity(struct msm_file_private *ctx, struct msm_ringbuffer *ring, +get_sched_entity(struct msm_context *ctx, struct msm_ringbuffer *ring, unsigned ring_nr, enum drm_sched_priority sched_prio) { static DEFINE_MUTEX(entity_lock); @@ -155,7 +154,7 @@ get_sched_entity(struct msm_file_private *ctx, struct m= sm_ringbuffer *ring, return ctx->entities[idx]; } =20 -int msm_submitqueue_create(struct drm_device *drm, struct msm_file_private= *ctx, +int msm_submitqueue_create(struct drm_device *drm, struct msm_context *ctx, u32 prio, u32 flags, u32 *id) { struct msm_drm_private *priv =3D drm->dev_private; @@ -200,7 +199,7 @@ int msm_submitqueue_create(struct drm_device *drm, stru= ct msm_file_private *ctx, =20 write_lock(&ctx->queuelock); =20 - queue->ctx =3D msm_file_private_get(ctx); + queue->ctx =3D msm_context_get(ctx); queue->id =3D ctx->queueid++; =20 if (id) @@ -221,7 +220,7 @@ int msm_submitqueue_create(struct drm_device *drm, stru= ct msm_file_private *ctx, * Create the default submit-queue (id=3D=3D0), used for backwards compati= bility * for userspace that pre-dates the introduction of submitqueues. */ -int msm_submitqueue_init(struct drm_device *drm, struct msm_file_private *= ctx) +int msm_submitqueue_init(struct drm_device *drm, struct msm_context *ctx) { struct msm_drm_private *priv =3D drm->dev_private; int default_prio, max_priority; @@ -261,7 +260,7 @@ static int msm_submitqueue_query_faults(struct msm_gpu_= submitqueue *queue, return ret ? -EFAULT : 0; } =20 -int msm_submitqueue_query(struct drm_device *drm, struct msm_file_private = *ctx, +int msm_submitqueue_query(struct drm_device *drm, struct msm_context *ctx, struct drm_msm_submitqueue_query *args) { struct msm_gpu_submitqueue *queue; @@ -282,7 +281,7 @@ int msm_submitqueue_query(struct drm_device *drm, struc= t msm_file_private *ctx, return ret; } =20 -int msm_submitqueue_remove(struct msm_file_private *ctx, u32 id) +int msm_submitqueue_remove(struct msm_context *ctx, u32 id) { struct msm_gpu_submitqueue *entry; =20 --=20 2.50.0 From nobody Wed Oct 8 10:58:50 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 20A2B22652E for ; Sun, 29 Jun 2025 14:07:08 +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=1751206030; cv=none; b=tx0tyLCFH9cryra/WndAoH9ohHoJhlSMhXyMZ9IXtTbfeh0OXwi3l9kA0/s8Wgoawb6HjiPkYaT2qdB19eowNNQK/eBA3Zk7eD+aU+m5dgPRPdOOxSMpTayu+b7wcNoOdNSvZW8WQlXSbsmIWz/SfIluNknBQGPtvzIXnEq3jUk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751206030; c=relaxed/simple; bh=IKliov0J2pa5trVjg7A0Pz5LzH/hN/LQHJAojZPCWiI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=uGZuBuqAflTLZTALZ/cZcULuEuGgukfDM5oRI6XOsUGvn/a3cJv0KZsMMfiRDEjrvcYr7dbN5cXG6IdnMZLAbx/mH6lsCfdWHL+HA4xPTE7dLJiblGHkDU7SrxkwXo1DUPnNG5mD3lDEXML8HO8N9JZ8LTn7Lz+3VDHbLOXAML0= 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=NaEk47AB; 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="NaEk47AB" Received: from pps.filterd (m0279870.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 55T4U2AJ004168 for ; Sun, 29 Jun 2025 14:07:08 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=Eq5kxLTTzjq j4KYoKYMeeMDOnDpMwOj1SboVzjrNiGw=; b=NaEk47ABuRzh6W5uqQPjv9TLdxf 1PWwpI+Y+sqgKLCgOLoTOydS2tRKxmDgP804/pnd5VpgFzDKLHA3cy6BlXYPIQBv BsuXKWtP80gY6HkSxV+ze+Q58fD4ndag/1O4NK1894Kla8jD6GKZGUS+BGmfYBzd S1GCuS1Ps8LNGfHPEDWf/ysDhCcFZMK+FZebQUmlSso7DPNw7SYq3xkw7nDDrJs0 bUyuupBqg3yC/C5OPfaahQY3YkVtb9bGQyy7+qrCiYTSJHIGONXRp/gG/gTNTzlt dlne/8NTDRTazDYqEnsppUpO+m9b9pcDxfTcGXeF1FKC6OCi2P77UPyZcxg== Received: from mail-pf1-f200.google.com (mail-pf1-f200.google.com [209.85.210.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 47j8fxa8b7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Sun, 29 Jun 2025 14:07:07 +0000 (GMT) Received: by mail-pf1-f200.google.com with SMTP id d2e1a72fcca58-747dd44048cso4186090b3a.3 for ; Sun, 29 Jun 2025 07:07:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751206026; x=1751810826; 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=Eq5kxLTTzjqj4KYoKYMeeMDOnDpMwOj1SboVzjrNiGw=; b=Zv7Ud6biRKIMakpOkiKU/UbKAe2yB8rGR65tWNdrSuOkQk086rJ5xLMhReVGZXUHqb Auw9ZL4YAaNsOCy4IALKomLOFfk5tf8Hvbq5L8uo8NTHkFK0SBXRSnjctlukUHaiVo0j Fj5qRZpgALI65HSHo5IDqzn/WB4G2gmFtPvtZA71nE7Fe/W5W5J9GrhZvIF2RPZpgiGj OWGqrmvDur1w8QlERakACb/IFwUwmRegHjMhIObYAtZXBoRMRDjExcztgFOMCUv7nHeQ NU0sen/DVQX/YnmouIBL3wnjadT1bJu3DQbwRUQsQ5QZXBcPgWAaMIpSEFpQL5GcgsHX dPrg== X-Forwarded-Encrypted: i=1; AJvYcCVyF2nIkyWZ/aqWOZT9qhKuon5zUQxi+IpWF+OF40jeeYzup/AONTsRuhHzY9QceJJZasA31uat7kCra14=@vger.kernel.org X-Gm-Message-State: AOJu0YwQVNlix3aqcftzyjKhEXTcEAHXlsl9MXfCmk41l9LP7+bU7ckY jgrKMUarkXD75tMZXbZxTIocdMhca8w0zPKwpm6SUGI6CrfcDOgF1eo3aLuqZUBVq7jZ8xAHuvS h7B5SRd7Dk5QzdekfUNlXVpLlh8d3UYWbpP5ez6w20451w+JCY6+WUlchOY1SVzxOpKrXtfhh3W 4= X-Gm-Gg: ASbGncsCaxDnE61sbp0W2RHkq3Fj7QG4S6Z21x0+heb8TqFE9+dsZW46oEkEKvlyg6u dNOyHkvLpRadZe+lX7OEm6e/HpIB5OlRA+5LCbMvBkuyA+L0sMGQxOJOmdZnjsSDHhMdbeXKNef IhKKv5vp/OfKG/ruab0eCFG9IKrT9pHP+it4p0o6xNA0qijaRm4BvB0/mHaaLCUTmDVFHqXZo/g KyXY1UbxMSFAgyEbtgUAQzeKWDSvbXyhMtS2RUQvR3SqvgDGoe+nhDvNnmAAqfkRhqRqxS7aD8Q 8MIx79DBxLB34kjHaAim1RTlIEZAVPlC X-Received: by 2002:a05:6a00:190b:b0:746:27fc:fea9 with SMTP id d2e1a72fcca58-74af6f081bemr13138734b3a.11.1751206026233; Sun, 29 Jun 2025 07:07:06 -0700 (PDT) X-Google-Smtp-Source: AGHT+IESIXYyPL2Cjmw2iox/a/szKCrDIPjBJFXEGszT8sAnkZ3Ckn55G7xC/dDATm2HWxiGpLH3gg== X-Received: by 2002:a05:6a00:190b:b0:746:27fc:fea9 with SMTP id d2e1a72fcca58-74af6f081bemr13138702b3a.11.1751206025796; Sun, 29 Jun 2025 07:07:05 -0700 (PDT) Received: from localhost ([2601:1c0:5000:d5c:5b3e:de60:4fda:e7b1]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-b34e31da944sm5863172a12.60.2025.06.29.07.07.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Jun 2025 07:07:05 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, Connor Abbott , Antonino Maniscalco , Danilo Krummrich , Rob Clark , Dmitry Baryshkov , Rob Clark , Sean Paul , Konrad Dybcio , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Marijn Suijten , David Airlie , Simona Vetter , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v8 05/42] drm/msm: Improve msm_context comments Date: Sun, 29 Jun 2025 07:03:08 -0700 Message-ID: <20250629140537.30850-6-robin.clark@oss.qualcomm.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250629140537.30850-1-robin.clark@oss.qualcomm.com> References: <20250629140537.30850-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: AW1haW4tMjUwNjI5MDExOSBTYWx0ZWRfX5EQTq5uZygOE TCPI8Q+r7+8jkbhYd7zx4wPKwKgAIF5oTw52y8pt8/BXmCVWS57NXIJ0KVY0IuxwkQnXYV+233+ T3mvayLNj8+qQMmzFJRJDF1CJJCxyYVhZWVw2U73iNh1aBuvqqWIv02Nlqm2Xts3K7UrdnFnORb LSN2A6aKWBO7FZ5m+ubPeM7K5bmmZgBxRydHEnE4Owv+X6b2oXk1fBQxSaxPsFBdmaQbO1pYvXl qZXWQPT88PXtVhfT328kRT3kZCVy/NHjZ3uWg2+bjG/CL78Vsqf+KxXjoTyWcR/YkcEOY4V+okb cO8owtCsNJGlFptbCbSknlvQb32n0fvO/3VwcEfGFvuVY40Qi+gi8a4Gt8cUAcjvK3fjuX/FIki 5aAUxL3856o6CRApcGQho5nVvqaI+8jZgQbjTZEvWp3D5XimhUxYXDBSW1VOxn+5VtGEjJyu X-Proofpoint-GUID: Bso01uWaXME-gXqgYcKEA7rWryF7BvxY X-Proofpoint-ORIG-GUID: Bso01uWaXME-gXqgYcKEA7rWryF7BvxY X-Authority-Analysis: v=2.4 cv=TqPmhCXh c=1 sm=1 tr=0 ts=6861488b cx=c_pps a=mDZGXZTwRPZaeRUbqKGCBw==:117 a=xqWC_Br6kY4A:10 a=6IFa9wvqVegA:10 a=cm27Pg_UAAAA:8 a=EUspDBNiAAAA:8 a=pGLkceISAAAA:8 a=WI1w4SIrP7wptn5q9fwA:9 a=zc0IvFSfCIW2DFIPzwfm: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-27_05,2025-06-27_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 bulkscore=0 mlxlogscore=999 suspectscore=0 adultscore=0 phishscore=0 malwarescore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 spamscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2506290119 Content-Type: text/plain; charset="utf-8" From: Rob Clark Just some tidying up. Signed-off-by: Rob Clark Reviewed-by: Dmitry Baryshkov Signed-off-by: Rob Clark Tested-by: Antonino Maniscalco Reviewed-by: Antonino Maniscalco --- drivers/gpu/drm/msm/msm_gpu.h | 44 +++++++++++++++++++++++------------ 1 file changed, 29 insertions(+), 15 deletions(-) diff --git a/drivers/gpu/drm/msm/msm_gpu.h b/drivers/gpu/drm/msm/msm_gpu.h index 937b7cdddadd..d30a1eedfda6 100644 --- a/drivers/gpu/drm/msm/msm_gpu.h +++ b/drivers/gpu/drm/msm/msm_gpu.h @@ -342,25 +342,39 @@ struct msm_gpu_perfcntr { =20 /** * struct msm_context - per-drm_file context - * - * @queuelock: synchronizes access to submitqueues list - * @submitqueues: list of &msm_gpu_submitqueue created by userspace - * @queueid: counter incremented each time a submitqueue is created, - * used to assign &msm_gpu_submitqueue.id - * @aspace: the per-process GPU address-space - * @ref: reference count - * @seqno: unique per process seqno */ struct msm_context { + /** @queuelock: synchronizes access to submitqueues list */ rwlock_t queuelock; + + /** @submitqueues: list of &msm_gpu_submitqueue created by userspace */ struct list_head submitqueues; + + /** + * @queueid: + * + * Counter incremented each time a submitqueue is created, used to + * assign &msm_gpu_submitqueue.id + */ int queueid; + + /** @aspace: the per-process GPU address-space */ struct msm_gem_address_space *aspace; + + /** @kref: the reference count */ struct kref ref; + + /** + * @seqno: + * + * A unique per-process sequence number. Used to detect context + * switches, without relying on keeping a, potentially dangling, + * pointer to the previous context. + */ int seqno; =20 /** - * sysprof: + * @sysprof: * * The value of MSM_PARAM_SYSPROF set by userspace. This is * intended to be used by system profiling tools like Mesa's @@ -378,21 +392,21 @@ struct msm_context { int sysprof; =20 /** - * comm: Overridden task comm, see MSM_PARAM_COMM + * @comm: Overridden task comm, see MSM_PARAM_COMM * * Accessed under msm_gpu::lock */ char *comm; =20 /** - * cmdline: Overridden task cmdline, see MSM_PARAM_CMDLINE + * @cmdline: Overridden task cmdline, see MSM_PARAM_CMDLINE * * Accessed under msm_gpu::lock */ char *cmdline; =20 /** - * elapsed: + * @elapsed: * * The total (cumulative) elapsed time GPU was busy with rendering * from this context in ns. @@ -400,7 +414,7 @@ struct msm_context { uint64_t elapsed_ns; =20 /** - * cycles: + * @cycles: * * The total (cumulative) GPU cycles elapsed attributed to this * context. @@ -408,7 +422,7 @@ struct msm_context { uint64_t cycles; =20 /** - * entities: + * @entities: * * Table of per-priority-level sched entities used by submitqueues * associated with this &drm_file. Because some userspace apps @@ -421,7 +435,7 @@ struct msm_context { struct drm_sched_entity *entities[NR_SCHED_PRIORITIES * MSM_GPU_MAX_RINGS= ]; =20 /** - * ctx_mem: + * @ctx_mem: * * Total amount of memory of GEM buffers with handles attached for * this context. --=20 2.50.0 From nobody Wed Oct 8 10:58:50 2025 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 04E6C225403 for ; Sun, 29 Jun 2025 14:07:23 +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=1751206048; cv=none; b=YZ5cu0WCgL+UfSoyLmbdbFDxclY7ZMBDLgrXnDm3GG8wRCNXcsSGa6dvYLNPKPPZUmHY7QP4C+V4gKvS2EdWWzFnU4rmrA+69DWXfTRyXqdS1/K5nBXg0M+qVQzIR8L2sdel5mTjNCprLD87V1+nIzM1To6NL+mLDuWzHpaGkUU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751206048; c=relaxed/simple; bh=XR9vPQGrieR6Ug/EEy85SB4DweE/pIFG2CwokzanSSE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZOXpCvFxycw2sY6b0p1UIjcljgMQLkEbFOE+O2dDEsCzkBcRnUAtl5MPE6Yv0hmmXqvFGHwsV+2ZK9AODWi8j/KHEs8C0Lht+JVroSC44lLM7TX63ZvD6dDuD/asHmo2k7mvBwToSwljb0gr48Q2bS3NQ/9LNxbz6tsQJDz1J/M= 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=SqnauyrR; 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="SqnauyrR" Received: from pps.filterd (m0279865.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 55TDqW5R026426 for ; Sun, 29 Jun 2025 14:07:23 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=dsIULYxwynH kgYr1fPCvCIhbfI+13wgLq4NAYLMpehg=; b=SqnauyrRv6f6YuEVySzv2BLdA9j tqbzsLZPHYucuYojSxIzC+uRbAPF1//7Tkn+bwZBAiI1J7Qt7xdRr7S9IhaF0rzR T6rul43xxaJeqc0u+Y8bNuo7bUzEw+r90FFF1juV3k3AOZi5Bylrlsdm6Dj6169W wDacYJJ9/yNRRA2TqNoa33+ZQdjoAB2jk8dyhl75UcLRFT4pfjd+YtP09wOflQMM MU3dK/7clKszeaUz8rjm95Z1Ly12mMn/pW9QjkTTzLAngLl7vxbFlIwOQUx6oPgr B5YVuXgrHbmiTSl+yhm/RIBRaOsxH+cBqXIC5M2lhlPj4r3/Tnn4a5zo0Eg== Received: from mail-pf1-f199.google.com (mail-pf1-f199.google.com [209.85.210.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 47j7bvj9px-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Sun, 29 Jun 2025 14:07:22 +0000 (GMT) Received: by mail-pf1-f199.google.com with SMTP id d2e1a72fcca58-7425efba1a3so4041584b3a.0 for ; Sun, 29 Jun 2025 07:07:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751206042; x=1751810842; 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=dsIULYxwynHkgYr1fPCvCIhbfI+13wgLq4NAYLMpehg=; b=IxHfb6fcZcS554hYD3HKfSfSOa+DDJzCPzYIYmP2HnVDERdg6BggdpGf1FBV1c4RtD AC2yzzDd4QpcXmx9OaE51HEduThnyZJSG/80/3fFH1K6l0ed2a2UCrU980tCnwy/ym1f LZJ24bnsOOZrrp2lQ2QDs46fvTSORDtFmj//roN1/wZdjCsZy3cCuVJ66Zhq97ztJR1g dB0UkigMynfHe8b06F3LS1XLAKAt9/kGbq915Ph251WPKpvpVTMzDfIybNkw40jVP87v FT2WK/HXdzwe3fCh0j1kCMYMl8jvfXKwTIhfQuNB3dx80E2R6UzztLHiUEiYQsb/d3k9 ZEAw== X-Forwarded-Encrypted: i=1; AJvYcCUPWiJcyYeiKhpWXwey6UPfFszVeXcTye4WVHZlXoaXzBdhsdHZ980SoahY13dzFXtl32HJuNLon+MT864=@vger.kernel.org X-Gm-Message-State: AOJu0YxLAcIKkI1wqlLU0r903y+8wswagN+v5QpBhm3g9RPfJODOKVOw 1pomkJHERvpKd5T+AQdJPwO6fUtB/LIE4zGQb6K9+z12kvJeZTelVeIMciEpsojdTbVrCLRpStn grEbIaWG2odjap1IU6lJ+hStPQTVasfSWjOoH2jp+ea74X2tm3GfKRxiWZmOoatpSr6k= X-Gm-Gg: ASbGnctwjFVe1qUfDd+MkUDnnMsnHLBqp3aVCnel9BswIH6VZgo3gRZgTt/LlE8HPmh e0LyR/dDX5O8Tgt99jGRUX6JJT7ZWBD/2kbs51tB0l5GdVDcjihoamrQJGqs8U1wS5IoezVxCJH dcOkXRQJ/dwBumL2+Ao+pxaE0auGHxPxcUxrxdOu+GztWQ5dwwIHm3GR5zmuGzB8bvcONiXJh2r sQVuOM9qit9BBh11/GlDt1jg+fdrL3I0esYRNoZDWOepjcCm+5BvaSw/1dF39VM23LSgem3Sdzr G0ID6iE8+7GaUWEyjJgLC4HrPzFu6Rt2 X-Received: by 2002:aa7:8882:0:b0:744:a240:fb1b with SMTP id d2e1a72fcca58-74af78d5d3fmr13214070b3a.5.1751206040529; Sun, 29 Jun 2025 07:07:20 -0700 (PDT) X-Google-Smtp-Source: AGHT+IElqngczGJVeMkDYqqEFXu8QBGBZX9pHNIDu13XHqwiBDe4vY+UbfG04ulcqtyC9Tue3YxOEA== X-Received: by 2002:aa7:8882:0:b0:744:a240:fb1b with SMTP id d2e1a72fcca58-74af78d5d3fmr13214003b3a.5.1751206039464; Sun, 29 Jun 2025 07:07:19 -0700 (PDT) Received: from localhost ([2601:1c0:5000:d5c:5b3e:de60:4fda:e7b1]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-74af55722f2sm7161900b3a.96.2025.06.29.07.07.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Jun 2025 07:07:18 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, Connor Abbott , Antonino Maniscalco , Danilo Krummrich , Rob Clark , Dmitry Baryshkov , Rob Clark , Sean Paul , Konrad Dybcio , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Marijn Suijten , David Airlie , Simona Vetter , Arnd Bergmann , Jun Nie , Krzysztof Kozlowski , Eugene Lepshy , Haoxiang Li , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v8 06/42] drm/msm: Rename msm_gem_address_space -> msm_gem_vm Date: Sun, 29 Jun 2025 07:03:09 -0700 Message-ID: <20250629140537.30850-7-robin.clark@oss.qualcomm.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250629140537.30850-1-robin.clark@oss.qualcomm.com> References: <20250629140537.30850-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-GUID: XjXpt8RZCRf1pr9Y4FLhN1OkdE4aw5ns X-Authority-Analysis: v=2.4 cv=RJCzH5i+ c=1 sm=1 tr=0 ts=6861489a cx=c_pps a=WW5sKcV1LcKqjgzy2JUPuA==:117 a=xqWC_Br6kY4A:10 a=6IFa9wvqVegA:10 a=cm27Pg_UAAAA:8 a=EUspDBNiAAAA:8 a=pGLkceISAAAA:8 a=kLMotZ-wiLr96KG7Bc8A:9 a=OpyuDcXvxspvyRM73sMx:22 X-Proofpoint-ORIG-GUID: XjXpt8RZCRf1pr9Y4FLhN1OkdE4aw5ns X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjI5MDExOSBTYWx0ZWRfXweaf1RiSqDXd dIB8giXCn7qbTeYQhYHLU7KfT0azYX9bX0XDSU/Bii/wo9fFs4U4vmNCQdgDVwatUYRzewM+zIW 6cAwodxlX+3zNBgdyoLuAMKVm8vTbJ1dmyA2xXw3f8e+CTG4uyvpkM0gF1ys7CYK+vHq8GIP15o kWETM8E8APlSAJNExNQWzE5OkXnHzyB5FH9NXlm8Z+a+U23U93mfe0dgHEWPAkd8O1q6vwqWYMG 3eNquMLxaKg9Ec/Y7CyHEx3bBiM7qnzlfGfFnk0lAOW7okUZx1HMYc4IGAq0r7S7aqmhOLQebqU nlVsHfaBCowZtVF13Ql4k+YKDBikaaiCr28L+s2x82XcVqTaclK1n6NGJkv6kABXdZ5n1jzQvE3 LopNsh5Zb7g9fLS+L0E/yjvB0S4znX47lE3PfGbdr2Vsy8atB3goyXFNUtTVUhAKz/DzS/0r 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-27_05,2025-06-27_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 impostorscore=0 priorityscore=1501 mlxlogscore=999 adultscore=0 malwarescore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 phishscore=0 bulkscore=0 suspectscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2506290119 Content-Type: text/plain; charset="utf-8" From: Rob Clark Re-aligning naming to better match drm_gpuvm terminology will make things less confusing at the end of the drm_gpuvm conversion. This is just rename churn, no functional change. Signed-off-by: Rob Clark Reviewed-by: Dmitry Baryshkov Signed-off-by: Rob Clark Tested-by: Antonino Maniscalco Reviewed-by: Antonino Maniscalco --- drivers/gpu/drm/msm/adreno/a2xx_gpu.c | 18 ++-- drivers/gpu/drm/msm/adreno/a3xx_gpu.c | 4 +- drivers/gpu/drm/msm/adreno/a4xx_gpu.c | 4 +- drivers/gpu/drm/msm/adreno/a5xx_debugfs.c | 4 +- drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 22 ++--- drivers/gpu/drm/msm/adreno/a5xx_power.c | 2 +- drivers/gpu/drm/msm/adreno/a5xx_preempt.c | 10 +- drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 26 +++--- drivers/gpu/drm/msm/adreno/a6xx_gmu.h | 2 +- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 45 +++++---- drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c | 6 +- drivers/gpu/drm/msm/adreno/a6xx_preempt.c | 10 +- drivers/gpu/drm/msm/adreno/adreno_gpu.c | 46 ++++----- drivers/gpu/drm/msm/adreno/adreno_gpu.h | 18 ++-- .../drm/msm/disp/dpu1/dpu_encoder_phys_wb.c | 14 +-- drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c | 18 ++-- drivers/gpu/drm/msm/disp/dpu1/dpu_formats.h | 2 +- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 18 ++-- drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 14 +-- drivers/gpu/drm/msm/disp/dpu1/dpu_plane.h | 4 +- drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c | 6 +- drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | 24 ++--- drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c | 12 +-- drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 4 +- drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 18 ++-- drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c | 12 +-- drivers/gpu/drm/msm/dsi/dsi_host.c | 14 +-- drivers/gpu/drm/msm/msm_drv.c | 8 +- drivers/gpu/drm/msm/msm_drv.h | 10 +- drivers/gpu/drm/msm/msm_fb.c | 10 +- drivers/gpu/drm/msm/msm_fbdev.c | 2 +- drivers/gpu/drm/msm/msm_gem.c | 74 +++++++-------- drivers/gpu/drm/msm/msm_gem.h | 34 +++---- drivers/gpu/drm/msm/msm_gem_submit.c | 6 +- drivers/gpu/drm/msm/msm_gem_vma.c | 93 +++++++++---------- drivers/gpu/drm/msm/msm_gpu.c | 46 ++++----- drivers/gpu/drm/msm/msm_gpu.h | 16 ++-- drivers/gpu/drm/msm/msm_kms.c | 16 ++-- drivers/gpu/drm/msm/msm_kms.h | 2 +- drivers/gpu/drm/msm/msm_ringbuffer.c | 4 +- drivers/gpu/drm/msm/msm_submitqueue.c | 2 +- 41 files changed, 348 insertions(+), 352 deletions(-) diff --git a/drivers/gpu/drm/msm/adreno/a2xx_gpu.c b/drivers/gpu/drm/msm/ad= reno/a2xx_gpu.c index 379a3d346c30..5eb063ed0b46 100644 --- a/drivers/gpu/drm/msm/adreno/a2xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a2xx_gpu.c @@ -113,7 +113,7 @@ static int a2xx_hw_init(struct msm_gpu *gpu) uint32_t *ptr, len; int i, ret; =20 - a2xx_gpummu_params(gpu->aspace->mmu, &pt_base, &tran_error); + a2xx_gpummu_params(gpu->vm->mmu, &pt_base, &tran_error); =20 DBG("%s", gpu->name); =20 @@ -466,19 +466,19 @@ static struct msm_gpu_state *a2xx_gpu_state_get(struc= t msm_gpu *gpu) return state; } =20 -static struct msm_gem_address_space * -a2xx_create_address_space(struct msm_gpu *gpu, struct platform_device *pde= v) +static struct msm_gem_vm * +a2xx_create_vm(struct msm_gpu *gpu, struct platform_device *pdev) { struct msm_mmu *mmu =3D a2xx_gpummu_new(&pdev->dev, gpu); - struct msm_gem_address_space *aspace; + struct msm_gem_vm *vm; =20 - aspace =3D msm_gem_address_space_create(mmu, "gpu", SZ_16M, + vm =3D msm_gem_vm_create(mmu, "gpu", SZ_16M, 0xfff * SZ_64K); =20 - if (IS_ERR(aspace) && !IS_ERR(mmu)) + if (IS_ERR(vm) && !IS_ERR(mmu)) mmu->funcs->destroy(mmu); =20 - return aspace; + return vm; } =20 static u32 a2xx_get_rptr(struct msm_gpu *gpu, struct msm_ringbuffer *ring) @@ -504,7 +504,7 @@ static const struct adreno_gpu_funcs funcs =3D { #endif .gpu_state_get =3D a2xx_gpu_state_get, .gpu_state_put =3D adreno_gpu_state_put, - .create_address_space =3D a2xx_create_address_space, + .create_vm =3D a2xx_create_vm, .get_rptr =3D a2xx_get_rptr, }, }; @@ -551,7 +551,7 @@ struct msm_gpu *a2xx_gpu_init(struct drm_device *dev) else adreno_gpu->registers =3D a220_registers; =20 - if (!gpu->aspace) { + if (!gpu->vm) { dev_err(dev->dev, "No memory protection without MMU\n"); if (!allow_vram_carveout) { ret =3D -ENXIO; diff --git a/drivers/gpu/drm/msm/adreno/a3xx_gpu.c b/drivers/gpu/drm/msm/ad= reno/a3xx_gpu.c index b6df115bb567..434e6ededf83 100644 --- a/drivers/gpu/drm/msm/adreno/a3xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a3xx_gpu.c @@ -526,7 +526,7 @@ static const struct adreno_gpu_funcs funcs =3D { .gpu_busy =3D a3xx_gpu_busy, .gpu_state_get =3D a3xx_gpu_state_get, .gpu_state_put =3D adreno_gpu_state_put, - .create_address_space =3D adreno_create_address_space, + .create_vm =3D adreno_create_vm, .get_rptr =3D a3xx_get_rptr, }, }; @@ -581,7 +581,7 @@ struct msm_gpu *a3xx_gpu_init(struct drm_device *dev) goto fail; } =20 - if (!gpu->aspace) { + if (!gpu->vm) { /* TODO we think it is possible to configure the GPU to * restrict access to VRAM carveout. But the required * registers are unknown. For now just bail out and diff --git a/drivers/gpu/drm/msm/adreno/a4xx_gpu.c b/drivers/gpu/drm/msm/ad= reno/a4xx_gpu.c index f1b18a6663f7..2c75debcfd84 100644 --- a/drivers/gpu/drm/msm/adreno/a4xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a4xx_gpu.c @@ -645,7 +645,7 @@ static const struct adreno_gpu_funcs funcs =3D { .gpu_busy =3D a4xx_gpu_busy, .gpu_state_get =3D a4xx_gpu_state_get, .gpu_state_put =3D adreno_gpu_state_put, - .create_address_space =3D adreno_create_address_space, + .create_vm =3D adreno_create_vm, .get_rptr =3D a4xx_get_rptr, }, .get_timestamp =3D a4xx_get_timestamp, @@ -695,7 +695,7 @@ struct msm_gpu *a4xx_gpu_init(struct drm_device *dev) =20 adreno_gpu->uche_trap_base =3D 0xffff0000ffff0000ull; =20 - if (!gpu->aspace) { + if (!gpu->vm) { /* TODO we think it is possible to configure the GPU to * restrict access to VRAM carveout. But the required * registers are unknown. For now just bail out and diff --git a/drivers/gpu/drm/msm/adreno/a5xx_debugfs.c b/drivers/gpu/drm/ms= m/adreno/a5xx_debugfs.c index 169b8fe688f8..625a4e787d8f 100644 --- a/drivers/gpu/drm/msm/adreno/a5xx_debugfs.c +++ b/drivers/gpu/drm/msm/adreno/a5xx_debugfs.c @@ -116,13 +116,13 @@ reset_set(void *data, u64 val) adreno_gpu->fw[ADRENO_FW_PFP] =3D NULL; =20 if (a5xx_gpu->pm4_bo) { - msm_gem_unpin_iova(a5xx_gpu->pm4_bo, gpu->aspace); + msm_gem_unpin_iova(a5xx_gpu->pm4_bo, gpu->vm); drm_gem_object_put(a5xx_gpu->pm4_bo); a5xx_gpu->pm4_bo =3D NULL; } =20 if (a5xx_gpu->pfp_bo) { - msm_gem_unpin_iova(a5xx_gpu->pfp_bo, gpu->aspace); + msm_gem_unpin_iova(a5xx_gpu->pfp_bo, gpu->vm); drm_gem_object_put(a5xx_gpu->pfp_bo); a5xx_gpu->pfp_bo =3D NULL; } diff --git a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c b/drivers/gpu/drm/msm/ad= reno/a5xx_gpu.c index 60aef0796236..dc31bc0afca4 100644 --- a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c @@ -622,7 +622,7 @@ static int a5xx_ucode_load(struct msm_gpu *gpu) a5xx_gpu->shadow =3D msm_gem_kernel_new(gpu->dev, sizeof(u32) * gpu->nr_rings, MSM_BO_WC | MSM_BO_MAP_PRIV, - gpu->aspace, &a5xx_gpu->shadow_bo, + gpu->vm, &a5xx_gpu->shadow_bo, &a5xx_gpu->shadow_iova); =20 if (IS_ERR(a5xx_gpu->shadow)) @@ -1042,22 +1042,22 @@ static void a5xx_destroy(struct msm_gpu *gpu) a5xx_preempt_fini(gpu); =20 if (a5xx_gpu->pm4_bo) { - msm_gem_unpin_iova(a5xx_gpu->pm4_bo, gpu->aspace); + msm_gem_unpin_iova(a5xx_gpu->pm4_bo, gpu->vm); drm_gem_object_put(a5xx_gpu->pm4_bo); } =20 if (a5xx_gpu->pfp_bo) { - msm_gem_unpin_iova(a5xx_gpu->pfp_bo, gpu->aspace); + msm_gem_unpin_iova(a5xx_gpu->pfp_bo, gpu->vm); drm_gem_object_put(a5xx_gpu->pfp_bo); } =20 if (a5xx_gpu->gpmu_bo) { - msm_gem_unpin_iova(a5xx_gpu->gpmu_bo, gpu->aspace); + msm_gem_unpin_iova(a5xx_gpu->gpmu_bo, gpu->vm); drm_gem_object_put(a5xx_gpu->gpmu_bo); } =20 if (a5xx_gpu->shadow_bo) { - msm_gem_unpin_iova(a5xx_gpu->shadow_bo, gpu->aspace); + msm_gem_unpin_iova(a5xx_gpu->shadow_bo, gpu->vm); drm_gem_object_put(a5xx_gpu->shadow_bo); } =20 @@ -1457,7 +1457,7 @@ static int a5xx_crashdumper_init(struct msm_gpu *gpu, struct a5xx_crashdumper *dumper) { dumper->ptr =3D msm_gem_kernel_new(gpu->dev, - SZ_1M, MSM_BO_WC, gpu->aspace, + SZ_1M, MSM_BO_WC, gpu->vm, &dumper->bo, &dumper->iova); =20 if (!IS_ERR(dumper->ptr)) @@ -1557,7 +1557,7 @@ static void a5xx_gpu_state_get_hlsq_regs(struct msm_g= pu *gpu, =20 if (a5xx_crashdumper_run(gpu, &dumper)) { kfree(a5xx_state->hlsqregs); - msm_gem_kernel_put(dumper.bo, gpu->aspace); + msm_gem_kernel_put(dumper.bo, gpu->vm); return; } =20 @@ -1565,7 +1565,7 @@ static void a5xx_gpu_state_get_hlsq_regs(struct msm_g= pu *gpu, memcpy(a5xx_state->hlsqregs, dumper.ptr + (256 * SZ_1K), count * sizeof(u32)); =20 - msm_gem_kernel_put(dumper.bo, gpu->aspace); + msm_gem_kernel_put(dumper.bo, gpu->vm); } =20 static struct msm_gpu_state *a5xx_gpu_state_get(struct msm_gpu *gpu) @@ -1713,7 +1713,7 @@ static const struct adreno_gpu_funcs funcs =3D { .gpu_busy =3D a5xx_gpu_busy, .gpu_state_get =3D a5xx_gpu_state_get, .gpu_state_put =3D a5xx_gpu_state_put, - .create_address_space =3D adreno_create_address_space, + .create_vm =3D adreno_create_vm, .get_rptr =3D a5xx_get_rptr, }, .get_timestamp =3D a5xx_get_timestamp, @@ -1786,8 +1786,8 @@ struct msm_gpu *a5xx_gpu_init(struct drm_device *dev) return ERR_PTR(ret); } =20 - if (gpu->aspace) - msm_mmu_set_fault_handler(gpu->aspace->mmu, gpu, a5xx_fault_handler); + if (gpu->vm) + msm_mmu_set_fault_handler(gpu->vm->mmu, gpu, a5xx_fault_handler); =20 /* Set up the preemption specific bits and pieces for each ringbuffer */ a5xx_preempt_init(gpu); diff --git a/drivers/gpu/drm/msm/adreno/a5xx_power.c b/drivers/gpu/drm/msm/= adreno/a5xx_power.c index 6b91e0bd1514..d6da7351cfbb 100644 --- a/drivers/gpu/drm/msm/adreno/a5xx_power.c +++ b/drivers/gpu/drm/msm/adreno/a5xx_power.c @@ -363,7 +363,7 @@ void a5xx_gpmu_ucode_init(struct msm_gpu *gpu) bosize =3D (cmds_size + (cmds_size / TYPE4_MAX_PAYLOAD) + 1) << 2; =20 ptr =3D msm_gem_kernel_new(drm, bosize, - MSM_BO_WC | MSM_BO_GPU_READONLY, gpu->aspace, + MSM_BO_WC | MSM_BO_GPU_READONLY, gpu->vm, &a5xx_gpu->gpmu_bo, &a5xx_gpu->gpmu_iova); if (IS_ERR(ptr)) return; diff --git a/drivers/gpu/drm/msm/adreno/a5xx_preempt.c b/drivers/gpu/drm/ms= m/adreno/a5xx_preempt.c index b5f9d40687d5..e4924b5e1c48 100644 --- a/drivers/gpu/drm/msm/adreno/a5xx_preempt.c +++ b/drivers/gpu/drm/msm/adreno/a5xx_preempt.c @@ -255,7 +255,7 @@ static int preempt_init_ring(struct a5xx_gpu *a5xx_gpu, =20 ptr =3D msm_gem_kernel_new(gpu->dev, A5XX_PREEMPT_RECORD_SIZE + A5XX_PREEMPT_COUNTER_SIZE, - MSM_BO_WC | MSM_BO_MAP_PRIV, gpu->aspace, &bo, &iova); + MSM_BO_WC | MSM_BO_MAP_PRIV, gpu->vm, &bo, &iova); =20 if (IS_ERR(ptr)) return PTR_ERR(ptr); @@ -263,9 +263,9 @@ static int preempt_init_ring(struct a5xx_gpu *a5xx_gpu, /* The buffer to store counters needs to be unprivileged */ counters =3D msm_gem_kernel_new(gpu->dev, A5XX_PREEMPT_COUNTER_SIZE, - MSM_BO_WC, gpu->aspace, &counters_bo, &counters_iova); + MSM_BO_WC, gpu->vm, &counters_bo, &counters_iova); if (IS_ERR(counters)) { - msm_gem_kernel_put(bo, gpu->aspace); + msm_gem_kernel_put(bo, gpu->vm); return PTR_ERR(counters); } =20 @@ -296,8 +296,8 @@ void a5xx_preempt_fini(struct msm_gpu *gpu) int i; =20 for (i =3D 0; i < gpu->nr_rings; i++) { - msm_gem_kernel_put(a5xx_gpu->preempt_bo[i], gpu->aspace); - msm_gem_kernel_put(a5xx_gpu->preempt_counters_bo[i], gpu->aspace); + msm_gem_kernel_put(a5xx_gpu->preempt_bo[i], gpu->vm); + msm_gem_kernel_put(a5xx_gpu->preempt_counters_bo[i], gpu->vm); } } =20 diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c b/drivers/gpu/drm/msm/ad= reno/a6xx_gmu.c index 38c0f8ef85c3..848acc382b7d 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c @@ -1259,15 +1259,15 @@ int a6xx_gmu_stop(struct a6xx_gpu *a6xx_gpu) =20 static void a6xx_gmu_memory_free(struct a6xx_gmu *gmu) { - msm_gem_kernel_put(gmu->hfi.obj, gmu->aspace); - msm_gem_kernel_put(gmu->debug.obj, gmu->aspace); - msm_gem_kernel_put(gmu->icache.obj, gmu->aspace); - msm_gem_kernel_put(gmu->dcache.obj, gmu->aspace); - msm_gem_kernel_put(gmu->dummy.obj, gmu->aspace); - msm_gem_kernel_put(gmu->log.obj, gmu->aspace); - - gmu->aspace->mmu->funcs->detach(gmu->aspace->mmu); - msm_gem_address_space_put(gmu->aspace); + msm_gem_kernel_put(gmu->hfi.obj, gmu->vm); + msm_gem_kernel_put(gmu->debug.obj, gmu->vm); + msm_gem_kernel_put(gmu->icache.obj, gmu->vm); + msm_gem_kernel_put(gmu->dcache.obj, gmu->vm); + msm_gem_kernel_put(gmu->dummy.obj, gmu->vm); + msm_gem_kernel_put(gmu->log.obj, gmu->vm); + + gmu->vm->mmu->funcs->detach(gmu->vm->mmu); + msm_gem_vm_put(gmu->vm); } =20 static int a6xx_gmu_memory_alloc(struct a6xx_gmu *gmu, struct a6xx_gmu_bo = *bo, @@ -1296,7 +1296,7 @@ static int a6xx_gmu_memory_alloc(struct a6xx_gmu *gmu= , struct a6xx_gmu_bo *bo, if (IS_ERR(bo->obj)) return PTR_ERR(bo->obj); =20 - ret =3D msm_gem_get_and_pin_iova_range(bo->obj, gmu->aspace, &bo->iova, + ret =3D msm_gem_get_and_pin_iova_range(bo->obj, gmu->vm, &bo->iova, range_start, range_end); if (ret) { drm_gem_object_put(bo->obj); @@ -1321,9 +1321,9 @@ static int a6xx_gmu_memory_probe(struct a6xx_gmu *gmu) if (IS_ERR(mmu)) return PTR_ERR(mmu); =20 - gmu->aspace =3D msm_gem_address_space_create(mmu, "gmu", 0x0, 0x80000000); - if (IS_ERR(gmu->aspace)) - return PTR_ERR(gmu->aspace); + gmu->vm =3D msm_gem_vm_create(mmu, "gmu", 0x0, 0x80000000); + if (IS_ERR(gmu->vm)) + return PTR_ERR(gmu->vm); =20 return 0; } diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gmu.h b/drivers/gpu/drm/msm/ad= reno/a6xx_gmu.h index b2d4489b4024..fc288dfe889f 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gmu.h +++ b/drivers/gpu/drm/msm/adreno/a6xx_gmu.h @@ -62,7 +62,7 @@ struct a6xx_gmu { /* For serializing communication with the GMU: */ struct mutex lock; =20 - struct msm_gem_address_space *aspace; + struct msm_gem_vm *vm; =20 void __iomem *mmio; void __iomem *rscc; diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c b/drivers/gpu/drm/msm/ad= reno/a6xx_gpu.c index a8e6f62b6873..5078152eb8d3 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c @@ -120,7 +120,7 @@ static void a6xx_set_pagetable(struct a6xx_gpu *a6xx_gp= u, if (ctx->seqno =3D=3D ring->cur_ctx_seqno) return; =20 - if (msm_iommu_pagetable_params(ctx->aspace->mmu, &ttbr, &asid)) + if (msm_iommu_pagetable_params(ctx->vm->mmu, &ttbr, &asid)) return; =20 if (adreno_gpu->info->family >=3D ADRENO_7XX_GEN1) { @@ -970,7 +970,7 @@ static int a6xx_ucode_load(struct msm_gpu *gpu) =20 msm_gem_object_set_name(a6xx_gpu->sqe_bo, "sqefw"); if (!a6xx_ucode_check_version(a6xx_gpu, a6xx_gpu->sqe_bo)) { - msm_gem_unpin_iova(a6xx_gpu->sqe_bo, gpu->aspace); + msm_gem_unpin_iova(a6xx_gpu->sqe_bo, gpu->vm); drm_gem_object_put(a6xx_gpu->sqe_bo); =20 a6xx_gpu->sqe_bo =3D NULL; @@ -987,7 +987,7 @@ static int a6xx_ucode_load(struct msm_gpu *gpu) a6xx_gpu->shadow =3D msm_gem_kernel_new(gpu->dev, sizeof(u32) * gpu->nr_rings, MSM_BO_WC | MSM_BO_MAP_PRIV, - gpu->aspace, &a6xx_gpu->shadow_bo, + gpu->vm, &a6xx_gpu->shadow_bo, &a6xx_gpu->shadow_iova); =20 if (IS_ERR(a6xx_gpu->shadow)) @@ -998,7 +998,7 @@ static int a6xx_ucode_load(struct msm_gpu *gpu) =20 a6xx_gpu->pwrup_reglist_ptr =3D msm_gem_kernel_new(gpu->dev, PAGE_SIZE, MSM_BO_WC | MSM_BO_MAP_PRIV, - gpu->aspace, &a6xx_gpu->pwrup_reglist_bo, + gpu->vm, &a6xx_gpu->pwrup_reglist_bo, &a6xx_gpu->pwrup_reglist_iova); =20 if (IS_ERR(a6xx_gpu->pwrup_reglist_ptr)) @@ -2211,12 +2211,12 @@ static void a6xx_destroy(struct msm_gpu *gpu) struct a6xx_gpu *a6xx_gpu =3D to_a6xx_gpu(adreno_gpu); =20 if (a6xx_gpu->sqe_bo) { - msm_gem_unpin_iova(a6xx_gpu->sqe_bo, gpu->aspace); + msm_gem_unpin_iova(a6xx_gpu->sqe_bo, gpu->vm); drm_gem_object_put(a6xx_gpu->sqe_bo); } =20 if (a6xx_gpu->shadow_bo) { - msm_gem_unpin_iova(a6xx_gpu->shadow_bo, gpu->aspace); + msm_gem_unpin_iova(a6xx_gpu->shadow_bo, gpu->vm); drm_gem_object_put(a6xx_gpu->shadow_bo); } =20 @@ -2256,8 +2256,8 @@ static void a6xx_gpu_set_freq(struct msm_gpu *gpu, st= ruct dev_pm_opp *opp, mutex_unlock(&a6xx_gpu->gmu.lock); } =20 -static struct msm_gem_address_space * -a6xx_create_address_space(struct msm_gpu *gpu, struct platform_device *pde= v) +static struct msm_gem_vm * +a6xx_create_vm(struct msm_gpu *gpu, struct platform_device *pdev) { struct adreno_gpu *adreno_gpu =3D to_adreno_gpu(gpu); struct a6xx_gpu *a6xx_gpu =3D to_a6xx_gpu(adreno_gpu); @@ -2271,22 +2271,22 @@ a6xx_create_address_space(struct msm_gpu *gpu, stru= ct platform_device *pdev) !device_iommu_capable(&pdev->dev, IOMMU_CAP_CACHE_COHERENCY)) quirks |=3D IO_PGTABLE_QUIRK_ARM_OUTER_WBWA; =20 - return adreno_iommu_create_address_space(gpu, pdev, quirks); + return adreno_iommu_create_vm(gpu, pdev, quirks); } =20 -static struct msm_gem_address_space * -a6xx_create_private_address_space(struct msm_gpu *gpu) +static struct msm_gem_vm * +a6xx_create_private_vm(struct msm_gpu *gpu) { struct msm_mmu *mmu; =20 - mmu =3D msm_iommu_pagetable_create(gpu->aspace->mmu); + mmu =3D msm_iommu_pagetable_create(gpu->vm->mmu); =20 if (IS_ERR(mmu)) return ERR_CAST(mmu); =20 - return msm_gem_address_space_create(mmu, + return msm_gem_vm_create(mmu, "gpu", ADRENO_VM_START, - adreno_private_address_space_size(gpu)); + adreno_private_vm_size(gpu)); } =20 static uint32_t a6xx_get_rptr(struct msm_gpu *gpu, struct msm_ringbuffer *= ring) @@ -2403,8 +2403,8 @@ static const struct adreno_gpu_funcs funcs =3D { .gpu_state_get =3D a6xx_gpu_state_get, .gpu_state_put =3D a6xx_gpu_state_put, #endif - .create_address_space =3D a6xx_create_address_space, - .create_private_address_space =3D a6xx_create_private_address_space, + .create_vm =3D a6xx_create_vm, + .create_private_vm =3D a6xx_create_private_vm, .get_rptr =3D a6xx_get_rptr, .progress =3D a6xx_progress, }, @@ -2432,8 +2432,8 @@ static const struct adreno_gpu_funcs funcs_gmuwrapper= =3D { .gpu_state_get =3D a6xx_gpu_state_get, .gpu_state_put =3D a6xx_gpu_state_put, #endif - .create_address_space =3D a6xx_create_address_space, - .create_private_address_space =3D a6xx_create_private_address_space, + .create_vm =3D a6xx_create_vm, + .create_private_vm =3D a6xx_create_private_vm, .get_rptr =3D a6xx_get_rptr, .progress =3D a6xx_progress, }, @@ -2463,8 +2463,8 @@ static const struct adreno_gpu_funcs funcs_a7xx =3D { .gpu_state_get =3D a6xx_gpu_state_get, .gpu_state_put =3D a6xx_gpu_state_put, #endif - .create_address_space =3D a6xx_create_address_space, - .create_private_address_space =3D a6xx_create_private_address_space, + .create_vm =3D a6xx_create_vm, + .create_private_vm =3D a6xx_create_private_vm, .get_rptr =3D a6xx_get_rptr, .progress =3D a6xx_progress, }, @@ -2560,9 +2560,8 @@ struct msm_gpu *a6xx_gpu_init(struct drm_device *dev) =20 adreno_gpu->uche_trap_base =3D 0x1fffffffff000ull; =20 - if (gpu->aspace) - msm_mmu_set_fault_handler(gpu->aspace->mmu, gpu, - a6xx_fault_handler); + if (gpu->vm) + msm_mmu_set_fault_handler(gpu->vm->mmu, gpu, a6xx_fault_handler); =20 a6xx_calc_ubwc_config(adreno_gpu); /* Set up the preemption specific bits and pieces for each ringbuffer */ diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c b/drivers/gpu/drm/= msm/adreno/a6xx_gpu_state.c index 341a72a67401..ff06bb75b76d 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c @@ -132,7 +132,7 @@ static int a6xx_crashdumper_init(struct msm_gpu *gpu, struct a6xx_crashdumper *dumper) { dumper->ptr =3D msm_gem_kernel_new(gpu->dev, - SZ_1M, MSM_BO_WC, gpu->aspace, + SZ_1M, MSM_BO_WC, gpu->vm, &dumper->bo, &dumper->iova); =20 if (!IS_ERR(dumper->ptr)) @@ -1619,7 +1619,7 @@ struct msm_gpu_state *a6xx_gpu_state_get(struct msm_g= pu *gpu) a7xx_get_clusters(gpu, a6xx_state, dumper); a7xx_get_dbgahb_clusters(gpu, a6xx_state, dumper); =20 - msm_gem_kernel_put(dumper->bo, gpu->aspace); + msm_gem_kernel_put(dumper->bo, gpu->vm); } =20 a7xx_get_post_crashdumper_registers(gpu, a6xx_state); @@ -1631,7 +1631,7 @@ struct msm_gpu_state *a6xx_gpu_state_get(struct msm_g= pu *gpu) a6xx_get_clusters(gpu, a6xx_state, dumper); a6xx_get_dbgahb_clusters(gpu, a6xx_state, dumper); =20 - msm_gem_kernel_put(dumper->bo, gpu->aspace); + msm_gem_kernel_put(dumper->bo, gpu->vm); } } =20 diff --git a/drivers/gpu/drm/msm/adreno/a6xx_preempt.c b/drivers/gpu/drm/ms= m/adreno/a6xx_preempt.c index 3b17fd2dba89..f6194a57f794 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_preempt.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_preempt.c @@ -344,7 +344,7 @@ static int preempt_init_ring(struct a6xx_gpu *a6xx_gpu, =20 ptr =3D msm_gem_kernel_new(gpu->dev, PREEMPT_RECORD_SIZE(adreno_gpu), - MSM_BO_WC | MSM_BO_MAP_PRIV, gpu->aspace, &bo, &iova); + MSM_BO_WC | MSM_BO_MAP_PRIV, gpu->vm, &bo, &iova); =20 if (IS_ERR(ptr)) return PTR_ERR(ptr); @@ -362,7 +362,7 @@ static int preempt_init_ring(struct a6xx_gpu *a6xx_gpu, ptr =3D msm_gem_kernel_new(gpu->dev, PREEMPT_SMMU_INFO_SIZE, MSM_BO_WC | MSM_BO_MAP_PRIV | MSM_BO_GPU_READONLY, - gpu->aspace, &bo, &iova); + gpu->vm, &bo, &iova); =20 if (IS_ERR(ptr)) return PTR_ERR(ptr); @@ -377,7 +377,7 @@ static int preempt_init_ring(struct a6xx_gpu *a6xx_gpu, =20 struct a7xx_cp_smmu_info *smmu_info_ptr =3D ptr; =20 - msm_iommu_pagetable_params(gpu->aspace->mmu, &ttbr, &asid); + msm_iommu_pagetable_params(gpu->vm->mmu, &ttbr, &asid); =20 smmu_info_ptr->magic =3D GEN7_CP_SMMU_INFO_MAGIC; smmu_info_ptr->ttbr0 =3D ttbr; @@ -405,7 +405,7 @@ void a6xx_preempt_fini(struct msm_gpu *gpu) int i; =20 for (i =3D 0; i < gpu->nr_rings; i++) - msm_gem_kernel_put(a6xx_gpu->preempt_bo[i], gpu->aspace); + msm_gem_kernel_put(a6xx_gpu->preempt_bo[i], gpu->vm); } =20 void a6xx_preempt_init(struct msm_gpu *gpu) @@ -431,7 +431,7 @@ void a6xx_preempt_init(struct msm_gpu *gpu) a6xx_gpu->preempt_postamble_ptr =3D msm_gem_kernel_new(gpu->dev, PAGE_SIZE, MSM_BO_WC | MSM_BO_MAP_PRIV | MSM_BO_GPU_READONLY, - gpu->aspace, &a6xx_gpu->preempt_postamble_bo, + gpu->vm, &a6xx_gpu->preempt_postamble_bo, &a6xx_gpu->preempt_postamble_iova); =20 preempt_prepare_postamble(a6xx_gpu); diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/= adreno/adreno_gpu.c index 5f4de4c25b97..be723fe4de2b 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c @@ -191,21 +191,21 @@ int adreno_zap_shader_load(struct msm_gpu *gpu, u32 p= asid) return zap_shader_load_mdt(gpu, adreno_gpu->info->zapfw, pasid); } =20 -struct msm_gem_address_space * -adreno_create_address_space(struct msm_gpu *gpu, - struct platform_device *pdev) +struct msm_gem_vm * +adreno_create_vm(struct msm_gpu *gpu, + struct platform_device *pdev) { - return adreno_iommu_create_address_space(gpu, pdev, 0); + return adreno_iommu_create_vm(gpu, pdev, 0); } =20 -struct msm_gem_address_space * -adreno_iommu_create_address_space(struct msm_gpu *gpu, - struct platform_device *pdev, - unsigned long quirks) +struct msm_gem_vm * +adreno_iommu_create_vm(struct msm_gpu *gpu, + struct platform_device *pdev, + unsigned long quirks) { struct iommu_domain_geometry *geometry; struct msm_mmu *mmu; - struct msm_gem_address_space *aspace; + struct msm_gem_vm *vm; u64 start, size; =20 mmu =3D msm_iommu_gpu_new(&pdev->dev, gpu, quirks); @@ -224,16 +224,15 @@ adreno_iommu_create_address_space(struct msm_gpu *gpu, start =3D max_t(u64, SZ_16M, geometry->aperture_start); size =3D geometry->aperture_end - start + 1; =20 - aspace =3D msm_gem_address_space_create(mmu, "gpu", - start & GENMASK_ULL(48, 0), size); + vm =3D msm_gem_vm_create(mmu, "gpu", start & GENMASK_ULL(48, 0), size); =20 - if (IS_ERR(aspace) && !IS_ERR(mmu)) + if (IS_ERR(vm) && !IS_ERR(mmu)) mmu->funcs->destroy(mmu); =20 - return aspace; + return vm; } =20 -u64 adreno_private_address_space_size(struct msm_gpu *gpu) +u64 adreno_private_vm_size(struct msm_gpu *gpu) { struct adreno_gpu *adreno_gpu =3D to_adreno_gpu(gpu); struct adreno_smmu_priv *adreno_smmu =3D dev_get_drvdata(&gpu->pdev->dev); @@ -275,7 +274,7 @@ void adreno_check_and_reenable_stall(struct adreno_gpu = *adreno_gpu) !READ_ONCE(gpu->crashstate)) { priv->stall_enabled =3D true; =20 - gpu->aspace->mmu->funcs->set_stall(gpu->aspace->mmu, true); + gpu->vm->mmu->funcs->set_stall(gpu->vm->mmu, true); } spin_unlock_irqrestore(&priv->fault_stall_lock, flags); } @@ -303,8 +302,9 @@ int adreno_fault_handler(struct msm_gpu *gpu, unsigned = long iova, int flags, if (priv->stall_enabled) { priv->stall_enabled =3D false; =20 - gpu->aspace->mmu->funcs->set_stall(gpu->aspace->mmu, false); + gpu->vm->mmu->funcs->set_stall(gpu->vm->mmu, false); } + priv->stall_reenable_time =3D ktime_add_ms(ktime_get(), 500); spin_unlock_irqrestore(&priv->fault_stall_lock, irq_flags); =20 @@ -401,8 +401,8 @@ int adreno_get_param(struct msm_gpu *gpu, struct msm_co= ntext *ctx, *value =3D 0; return 0; case MSM_PARAM_FAULTS: - if (ctx->aspace) - *value =3D gpu->global_faults + ctx->aspace->faults; + if (ctx->vm) + *value =3D gpu->global_faults + ctx->vm->faults; else *value =3D gpu->global_faults; return 0; @@ -410,14 +410,14 @@ int adreno_get_param(struct msm_gpu *gpu, struct msm_= context *ctx, *value =3D gpu->suspend_count; return 0; case MSM_PARAM_VA_START: - if (ctx->aspace =3D=3D gpu->aspace) + if (ctx->vm =3D=3D gpu->vm) return UERR(EINVAL, drm, "requires per-process pgtables"); - *value =3D ctx->aspace->va_start; + *value =3D ctx->vm->va_start; return 0; case MSM_PARAM_VA_SIZE: - if (ctx->aspace =3D=3D gpu->aspace) + if (ctx->vm =3D=3D gpu->vm) return UERR(EINVAL, drm, "requires per-process pgtables"); - *value =3D ctx->aspace->va_size; + *value =3D ctx->vm->va_size; return 0; case MSM_PARAM_HIGHEST_BANK_BIT: *value =3D adreno_gpu->ubwc_config.highest_bank_bit; @@ -607,7 +607,7 @@ struct drm_gem_object *adreno_fw_create_bo(struct msm_g= pu *gpu, void *ptr; =20 ptr =3D msm_gem_kernel_new(gpu->dev, fw->size - 4, - MSM_BO_WC | MSM_BO_GPU_READONLY, gpu->aspace, &bo, iova); + MSM_BO_WC | MSM_BO_GPU_READONLY, gpu->vm, &bo, iova); =20 if (IS_ERR(ptr)) return ERR_CAST(ptr); diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.h b/drivers/gpu/drm/msm/= adreno/adreno_gpu.h index a4abafca7782..4fa4b11442ba 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.h +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.h @@ -580,7 +580,7 @@ static inline int adreno_is_a7xx(struct adreno_gpu *gpu) =20 /* Put vm_start above 32b to catch issues with not setting xyz_BASE_HI */ #define ADRENO_VM_START 0x100000000ULL -u64 adreno_private_address_space_size(struct msm_gpu *gpu); +u64 adreno_private_vm_size(struct msm_gpu *gpu); int adreno_get_param(struct msm_gpu *gpu, struct msm_context *ctx, uint32_t param, uint64_t *value, uint32_t *len); int adreno_set_param(struct msm_gpu *gpu, struct msm_context *ctx, @@ -623,14 +623,14 @@ void adreno_show_object(struct drm_printer *p, void *= *ptr, int len, * Common helper function to initialize the default address space for arm-= smmu * attached targets */ -struct msm_gem_address_space * -adreno_create_address_space(struct msm_gpu *gpu, - struct platform_device *pdev); - -struct msm_gem_address_space * -adreno_iommu_create_address_space(struct msm_gpu *gpu, - struct platform_device *pdev, - unsigned long quirks); +struct msm_gem_vm * +adreno_create_vm(struct msm_gpu *gpu, + struct platform_device *pdev); + +struct msm_gem_vm * +adreno_iommu_create_vm(struct msm_gpu *gpu, + struct platform_device *pdev, + unsigned long quirks); =20 int adreno_fault_handler(struct msm_gpu *gpu, unsigned long iova, int flag= s, struct adreno_smmu_fault_info *info, const char *block, diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c b/drivers/= gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c index 849fea580a4c..32e208ee946d 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c @@ -566,7 +566,7 @@ static void dpu_encoder_phys_wb_prepare_wb_job(struct d= pu_encoder_phys *phys_enc struct drm_writeback_job *job) { const struct msm_format *format; - struct msm_gem_address_space *aspace; + struct msm_gem_vm *vm; struct dpu_hw_wb_cfg *wb_cfg; int ret; struct dpu_encoder_phys_wb *wb_enc =3D to_dpu_encoder_phys_wb(phys_enc); @@ -576,13 +576,13 @@ static void dpu_encoder_phys_wb_prepare_wb_job(struct= dpu_encoder_phys *phys_enc =20 wb_enc->wb_job =3D job; wb_enc->wb_conn =3D job->connector; - aspace =3D phys_enc->dpu_kms->base.aspace; + vm =3D phys_enc->dpu_kms->base.vm; =20 wb_cfg =3D &wb_enc->wb_cfg; =20 memset(wb_cfg, 0, sizeof(struct dpu_hw_wb_cfg)); =20 - ret =3D msm_framebuffer_prepare(job->fb, aspace, false); + ret =3D msm_framebuffer_prepare(job->fb, vm, false); if (ret) { DPU_ERROR("prep fb failed, %d\n", ret); return; @@ -596,7 +596,7 @@ static void dpu_encoder_phys_wb_prepare_wb_job(struct d= pu_encoder_phys *phys_enc return; } =20 - dpu_format_populate_addrs(aspace, job->fb, &wb_cfg->dest); + dpu_format_populate_addrs(vm, job->fb, &wb_cfg->dest); =20 wb_cfg->dest.width =3D job->fb->width; wb_cfg->dest.height =3D job->fb->height; @@ -619,14 +619,14 @@ static void dpu_encoder_phys_wb_cleanup_wb_job(struct= dpu_encoder_phys *phys_enc struct drm_writeback_job *job) { struct dpu_encoder_phys_wb *wb_enc =3D to_dpu_encoder_phys_wb(phys_enc); - struct msm_gem_address_space *aspace; + struct msm_gem_vm *vm; =20 if (!job->fb) return; =20 - aspace =3D phys_enc->dpu_kms->base.aspace; + vm =3D phys_enc->dpu_kms->base.vm; =20 - msm_framebuffer_cleanup(job->fb, aspace, false); + msm_framebuffer_cleanup(job->fb, vm, false); wb_enc->wb_job =3D NULL; wb_enc->wb_conn =3D NULL; } diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c b/drivers/gpu/drm/= msm/disp/dpu1/dpu_formats.c index 59c9427da7dd..d115b79af771 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c @@ -274,7 +274,7 @@ int dpu_format_populate_plane_sizes( return _dpu_format_populate_plane_sizes_linear(fmt, fb, layout); } =20 -static void _dpu_format_populate_addrs_ubwc(struct msm_gem_address_space *= aspace, +static void _dpu_format_populate_addrs_ubwc(struct msm_gem_vm *vm, struct drm_framebuffer *fb, struct dpu_hw_fmt_layout *layout) { @@ -282,7 +282,7 @@ static void _dpu_format_populate_addrs_ubwc(struct msm_= gem_address_space *aspace uint32_t base_addr =3D 0; bool meta; =20 - base_addr =3D msm_framebuffer_iova(fb, aspace, 0); + base_addr =3D msm_framebuffer_iova(fb, vm, 0); =20 fmt =3D msm_framebuffer_format(fb); meta =3D MSM_FORMAT_IS_UBWC(fmt); @@ -355,7 +355,7 @@ static void _dpu_format_populate_addrs_ubwc(struct msm_= gem_address_space *aspace } } =20 -static void _dpu_format_populate_addrs_linear(struct msm_gem_address_space= *aspace, +static void _dpu_format_populate_addrs_linear(struct msm_gem_vm *vm, struct drm_framebuffer *fb, struct dpu_hw_fmt_layout *layout) { @@ -363,17 +363,17 @@ static void _dpu_format_populate_addrs_linear(struct = msm_gem_address_space *aspa =20 /* Populate addresses for simple formats here */ for (i =3D 0; i < layout->num_planes; ++i) - layout->plane_addr[i] =3D msm_framebuffer_iova(fb, aspace, i); -} + layout->plane_addr[i] =3D msm_framebuffer_iova(fb, vm, i); + } =20 /** * dpu_format_populate_addrs - populate buffer addresses based on * mmu, fb, and format found in the fb - * @aspace: address space pointer + * @vm: address space pointer * @fb: framebuffer pointer * @layout: format layout structure to populate */ -void dpu_format_populate_addrs(struct msm_gem_address_space *aspace, +void dpu_format_populate_addrs(struct msm_gem_vm *vm, struct drm_framebuffer *fb, struct dpu_hw_fmt_layout *layout) { @@ -384,7 +384,7 @@ void dpu_format_populate_addrs(struct msm_gem_address_s= pace *aspace, /* Populate the addresses given the fb */ if (MSM_FORMAT_IS_UBWC(fmt) || MSM_FORMAT_IS_TILE(fmt)) - _dpu_format_populate_addrs_ubwc(aspace, fb, layout); + _dpu_format_populate_addrs_ubwc(vm, fb, layout); else - _dpu_format_populate_addrs_linear(aspace, fb, layout); + _dpu_format_populate_addrs_linear(vm, fb, layout); } diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_formats.h b/drivers/gpu/drm/= msm/disp/dpu1/dpu_formats.h index c6145d43aa3f..989f3e13c497 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_formats.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_formats.h @@ -31,7 +31,7 @@ static inline bool dpu_find_format(u32 format, const u32 = *supported_formats, return false; } =20 -void dpu_format_populate_addrs(struct msm_gem_address_space *aspace, +void dpu_format_populate_addrs(struct msm_gem_vm *vm, struct drm_framebuffer *fb, struct dpu_hw_fmt_layout *layout); =20 diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/= disp/dpu1/dpu_kms.c index 1fd82b6747e9..2c5687a188b6 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c @@ -1095,26 +1095,26 @@ static void _dpu_kms_mmu_destroy(struct dpu_kms *dp= u_kms) { struct msm_mmu *mmu; =20 - if (!dpu_kms->base.aspace) + if (!dpu_kms->base.vm) return; =20 - mmu =3D dpu_kms->base.aspace->mmu; + mmu =3D dpu_kms->base.vm->mmu; =20 mmu->funcs->detach(mmu); - msm_gem_address_space_put(dpu_kms->base.aspace); + msm_gem_vm_put(dpu_kms->base.vm); =20 - dpu_kms->base.aspace =3D NULL; + dpu_kms->base.vm =3D NULL; } =20 static int _dpu_kms_mmu_init(struct dpu_kms *dpu_kms) { - struct msm_gem_address_space *aspace; + struct msm_gem_vm *vm; =20 - aspace =3D msm_kms_init_aspace(dpu_kms->dev); - if (IS_ERR(aspace)) - return PTR_ERR(aspace); + vm =3D msm_kms_init_vm(dpu_kms->dev); + if (IS_ERR(vm)) + return PTR_ERR(vm); =20 - dpu_kms->base.aspace =3D aspace; + dpu_kms->base.vm =3D vm; =20 return 0; } diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c b/drivers/gpu/drm/ms= m/disp/dpu1/dpu_plane.c index 421138bc3cb7..6d47f43f52f7 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c @@ -71,7 +71,7 @@ static const uint32_t qcom_compressed_supported_formats[]= =3D { =20 /* * struct dpu_plane - local dpu plane structure - * @aspace: address space pointer + * @vm: address space pointer * @csc_ptr: Points to dpu_csc_cfg structure to use for current * @catalog: Points to dpu catalog structure * @revalidate: force revalidation of all the plane properties @@ -654,8 +654,8 @@ static int dpu_plane_prepare_fb(struct drm_plane *plane, =20 DPU_DEBUG_PLANE(pdpu, "FB[%u]\n", fb->base.id); =20 - /* cache aspace */ - pstate->aspace =3D kms->base.aspace; + /* cache vm */ + pstate->vm =3D kms->base.vm; =20 /* * TODO: Need to sort out the msm_framebuffer_prepare() call below so @@ -664,9 +664,9 @@ static int dpu_plane_prepare_fb(struct drm_plane *plane, */ drm_gem_plane_helper_prepare_fb(plane, new_state); =20 - if (pstate->aspace) { + if (pstate->vm) { ret =3D msm_framebuffer_prepare(new_state->fb, - pstate->aspace, pstate->needs_dirtyfb); + pstate->vm, pstate->needs_dirtyfb); if (ret) { DPU_ERROR("failed to prepare framebuffer\n"); return ret; @@ -689,7 +689,7 @@ static void dpu_plane_cleanup_fb(struct drm_plane *plan= e, =20 DPU_DEBUG_PLANE(pdpu, "FB[%u]\n", old_state->fb->base.id); =20 - msm_framebuffer_cleanup(old_state->fb, old_pstate->aspace, + msm_framebuffer_cleanup(old_state->fb, old_pstate->vm, old_pstate->needs_dirtyfb); } =20 @@ -1457,7 +1457,7 @@ static void dpu_plane_sspp_atomic_update(struct drm_p= lane *plane, pstate->needs_qos_remap |=3D (is_rt_pipe !=3D pdpu->is_rt_pipe); pdpu->is_rt_pipe =3D is_rt_pipe; =20 - dpu_format_populate_addrs(pstate->aspace, new_state->fb, &pstate->layout); + dpu_format_populate_addrs(pstate->vm, new_state->fb, &pstate->layout); =20 DPU_DEBUG_PLANE(pdpu, "FB[%u] " DRM_RECT_FP_FMT "->crtc%u " DRM_RECT_FMT ", %p4cc ubwc %d\n", fb->base.id, DRM_RECT_FP_ARG(&state->src), diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.h b/drivers/gpu/drm/ms= m/disp/dpu1/dpu_plane.h index acd5725175cd..3578f52048a5 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.h @@ -17,7 +17,7 @@ /** * struct dpu_plane_state: Define dpu extension of drm plane state object * @base: base drm plane state object - * @aspace: pointer to address space for input/output buffers + * @vm: pointer to address space for input/output buffers * @pipe: software pipe description * @r_pipe: software pipe description of the second pipe * @pipe_cfg: software pipe configuration @@ -34,7 +34,7 @@ */ struct dpu_plane_state { struct drm_plane_state base; - struct msm_gem_address_space *aspace; + struct msm_gem_vm *vm; struct dpu_sw_pipe pipe; struct dpu_sw_pipe r_pipe; struct dpu_sw_pipe_cfg pipe_cfg; diff --git a/drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c b/drivers/gpu/drm/ms= m/disp/mdp4/mdp4_crtc.c index b8610aa806ea..0133c0c01a0b 100644 --- a/drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c +++ b/drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c @@ -120,7 +120,7 @@ static void unref_cursor_worker(struct drm_flip_work *w= ork, void *val) struct mdp4_kms *mdp4_kms =3D get_kms(&mdp4_crtc->base); struct msm_kms *kms =3D &mdp4_kms->base.base; =20 - msm_gem_unpin_iova(val, kms->aspace); + msm_gem_unpin_iova(val, kms->vm); drm_gem_object_put(val); } =20 @@ -369,7 +369,7 @@ static void update_cursor(struct drm_crtc *crtc) if (next_bo) { /* take a obj ref + iova ref when we start scanning out: */ drm_gem_object_get(next_bo); - msm_gem_get_and_pin_iova(next_bo, kms->aspace, &iova); + msm_gem_get_and_pin_iova(next_bo, kms->vm, &iova); =20 /* enable cursor: */ mdp4_write(mdp4_kms, REG_MDP4_DMA_CURSOR_SIZE(dma), @@ -427,7 +427,7 @@ static int mdp4_crtc_cursor_set(struct drm_crtc *crtc, } =20 if (cursor_bo) { - ret =3D msm_gem_get_and_pin_iova(cursor_bo, kms->aspace, &iova); + ret =3D msm_gem_get_and_pin_iova(cursor_bo, kms->vm, &iova); if (ret) goto fail; } else { diff --git a/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c b/drivers/gpu/drm/msm= /disp/mdp4/mdp4_kms.c index 7e942c1337b3..5cb4a4bae2a6 100644 --- a/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c +++ b/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c @@ -122,15 +122,15 @@ static void mdp4_destroy(struct msm_kms *kms) { struct mdp4_kms *mdp4_kms =3D to_mdp4_kms(to_mdp_kms(kms)); struct device *dev =3D mdp4_kms->dev->dev; - struct msm_gem_address_space *aspace =3D kms->aspace; + struct msm_gem_vm *vm =3D kms->vm; =20 if (mdp4_kms->blank_cursor_iova) - msm_gem_unpin_iova(mdp4_kms->blank_cursor_bo, kms->aspace); + msm_gem_unpin_iova(mdp4_kms->blank_cursor_bo, kms->vm); drm_gem_object_put(mdp4_kms->blank_cursor_bo); =20 - if (aspace) { - aspace->mmu->funcs->detach(aspace->mmu); - msm_gem_address_space_put(aspace); + if (vm) { + vm->mmu->funcs->detach(vm->mmu); + msm_gem_vm_put(vm); } =20 if (mdp4_kms->rpm_enabled) @@ -398,7 +398,7 @@ static int mdp4_kms_init(struct drm_device *dev) struct mdp4_kms *mdp4_kms =3D to_mdp4_kms(to_mdp_kms(priv->kms)); struct msm_kms *kms =3D NULL; struct msm_mmu *mmu; - struct msm_gem_address_space *aspace; + struct msm_gem_vm *vm; int ret; u32 major, minor; unsigned long max_clk; @@ -467,19 +467,19 @@ static int mdp4_kms_init(struct drm_device *dev) } else if (!mmu) { DRM_DEV_INFO(dev->dev, "no iommu, fallback to phys " "contig buffers for scanout\n"); - aspace =3D NULL; + vm =3D NULL; } else { - aspace =3D msm_gem_address_space_create(mmu, + vm =3D msm_gem_vm_create(mmu, "mdp4", 0x1000, 0x100000000 - 0x1000); =20 - if (IS_ERR(aspace)) { + if (IS_ERR(vm)) { if (!IS_ERR(mmu)) mmu->funcs->destroy(mmu); - ret =3D PTR_ERR(aspace); + ret =3D PTR_ERR(vm); goto fail; } =20 - kms->aspace =3D aspace; + kms->vm =3D vm; } =20 ret =3D modeset_init(mdp4_kms); @@ -496,7 +496,7 @@ static int mdp4_kms_init(struct drm_device *dev) goto fail; } =20 - ret =3D msm_gem_get_and_pin_iova(mdp4_kms->blank_cursor_bo, kms->aspace, + ret =3D msm_gem_get_and_pin_iova(mdp4_kms->blank_cursor_bo, kms->vm, &mdp4_kms->blank_cursor_iova); if (ret) { DRM_DEV_ERROR(dev->dev, "could not pin blank-cursor bo: %d\n", ret); diff --git a/drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c b/drivers/gpu/drm/m= sm/disp/mdp4/mdp4_plane.c index 3fefb2088008..7743be6167f8 100644 --- a/drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c +++ b/drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c @@ -87,7 +87,7 @@ static int mdp4_plane_prepare_fb(struct drm_plane *plane, =20 drm_gem_plane_helper_prepare_fb(plane, new_state); =20 - return msm_framebuffer_prepare(new_state->fb, kms->aspace, false); + return msm_framebuffer_prepare(new_state->fb, kms->vm, false); } =20 static void mdp4_plane_cleanup_fb(struct drm_plane *plane, @@ -102,7 +102,7 @@ static void mdp4_plane_cleanup_fb(struct drm_plane *pla= ne, return; =20 DBG("%s: cleanup: FB[%u]", mdp4_plane->name, fb->base.id); - msm_framebuffer_cleanup(fb, kms->aspace, false); + msm_framebuffer_cleanup(fb, kms->vm, false); } =20 =20 @@ -153,13 +153,13 @@ static void mdp4_plane_set_scanout(struct drm_plane *= plane, MDP4_PIPE_SRC_STRIDE_B_P3(fb->pitches[3])); =20 mdp4_write(mdp4_kms, REG_MDP4_PIPE_SRCP0_BASE(pipe), - msm_framebuffer_iova(fb, kms->aspace, 0)); + msm_framebuffer_iova(fb, kms->vm, 0)); mdp4_write(mdp4_kms, REG_MDP4_PIPE_SRCP1_BASE(pipe), - msm_framebuffer_iova(fb, kms->aspace, 1)); + msm_framebuffer_iova(fb, kms->vm, 1)); mdp4_write(mdp4_kms, REG_MDP4_PIPE_SRCP2_BASE(pipe), - msm_framebuffer_iova(fb, kms->aspace, 2)); + msm_framebuffer_iova(fb, kms->vm, 2)); mdp4_write(mdp4_kms, REG_MDP4_PIPE_SRCP3_BASE(pipe), - msm_framebuffer_iova(fb, kms->aspace, 3)); + msm_framebuffer_iova(fb, kms->vm, 3)); } =20 static void mdp4_write_csc_config(struct mdp4_kms *mdp4_kms, diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c b/drivers/gpu/drm/ms= m/disp/mdp5/mdp5_crtc.c index 0f653e62b4a0..298861f373b0 100644 --- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c +++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c @@ -169,7 +169,7 @@ static void unref_cursor_worker(struct drm_flip_work *w= ork, void *val) struct mdp5_kms *mdp5_kms =3D get_kms(&mdp5_crtc->base); struct msm_kms *kms =3D &mdp5_kms->base.base; =20 - msm_gem_unpin_iova(val, kms->aspace); + msm_gem_unpin_iova(val, kms->vm); drm_gem_object_put(val); } =20 @@ -993,7 +993,7 @@ static int mdp5_crtc_cursor_set(struct drm_crtc *crtc, if (!cursor_bo) return -ENOENT; =20 - ret =3D msm_gem_get_and_pin_iova(cursor_bo, kms->aspace, + ret =3D msm_gem_get_and_pin_iova(cursor_bo, kms->vm, &mdp5_crtc->cursor.iova); if (ret) { drm_gem_object_put(cursor_bo); diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c b/drivers/gpu/drm/msm= /disp/mdp5/mdp5_kms.c index 3fcca7a3d82e..9dca0385a42d 100644 --- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c +++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c @@ -198,11 +198,11 @@ static void mdp5_destroy(struct mdp5_kms *mdp5_kms); static void mdp5_kms_destroy(struct msm_kms *kms) { struct mdp5_kms *mdp5_kms =3D to_mdp5_kms(to_mdp_kms(kms)); - struct msm_gem_address_space *aspace =3D kms->aspace; + struct msm_gem_vm *vm =3D kms->vm; =20 - if (aspace) { - aspace->mmu->funcs->detach(aspace->mmu); - msm_gem_address_space_put(aspace); + if (vm) { + vm->mmu->funcs->detach(vm->mmu); + msm_gem_vm_put(vm); } =20 mdp_kms_destroy(&mdp5_kms->base); @@ -500,7 +500,7 @@ static int mdp5_kms_init(struct drm_device *dev) struct mdp5_kms *mdp5_kms; struct mdp5_cfg *config; struct msm_kms *kms =3D priv->kms; - struct msm_gem_address_space *aspace; + struct msm_gem_vm *vm; int i, ret; =20 ret =3D mdp5_init(to_platform_device(dev->dev), dev); @@ -534,13 +534,13 @@ static int mdp5_kms_init(struct drm_device *dev) } mdelay(16); =20 - aspace =3D msm_kms_init_aspace(mdp5_kms->dev); - if (IS_ERR(aspace)) { - ret =3D PTR_ERR(aspace); + vm =3D msm_kms_init_vm(mdp5_kms->dev); + if (IS_ERR(vm)) { + ret =3D PTR_ERR(vm); goto fail; } =20 - kms->aspace =3D aspace; + kms->vm =3D vm; =20 pm_runtime_put_sync(&pdev->dev); =20 diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c b/drivers/gpu/drm/m= sm/disp/mdp5/mdp5_plane.c index bb1601921938..9f68a4747203 100644 --- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c +++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c @@ -144,7 +144,7 @@ static int mdp5_plane_prepare_fb(struct drm_plane *plan= e, =20 drm_gem_plane_helper_prepare_fb(plane, new_state); =20 - return msm_framebuffer_prepare(new_state->fb, kms->aspace, needs_dirtyfb); + return msm_framebuffer_prepare(new_state->fb, kms->vm, needs_dirtyfb); } =20 static void mdp5_plane_cleanup_fb(struct drm_plane *plane, @@ -159,7 +159,7 @@ static void mdp5_plane_cleanup_fb(struct drm_plane *pla= ne, return; =20 DBG("%s: cleanup: FB[%u]", plane->name, fb->base.id); - msm_framebuffer_cleanup(fb, kms->aspace, needed_dirtyfb); + msm_framebuffer_cleanup(fb, kms->vm, needed_dirtyfb); } =20 static int mdp5_plane_atomic_check_with_state(struct drm_crtc_state *crtc_= state, @@ -478,13 +478,13 @@ static void set_scanout_locked(struct mdp5_kms *mdp5_= kms, MDP5_PIPE_SRC_STRIDE_B_P3(fb->pitches[3])); =20 mdp5_write(mdp5_kms, REG_MDP5_PIPE_SRC0_ADDR(pipe), - msm_framebuffer_iova(fb, kms->aspace, 0)); + msm_framebuffer_iova(fb, kms->vm, 0)); mdp5_write(mdp5_kms, REG_MDP5_PIPE_SRC1_ADDR(pipe), - msm_framebuffer_iova(fb, kms->aspace, 1)); + msm_framebuffer_iova(fb, kms->vm, 1)); mdp5_write(mdp5_kms, REG_MDP5_PIPE_SRC2_ADDR(pipe), - msm_framebuffer_iova(fb, kms->aspace, 2)); + msm_framebuffer_iova(fb, kms->vm, 2)); mdp5_write(mdp5_kms, REG_MDP5_PIPE_SRC3_ADDR(pipe), - msm_framebuffer_iova(fb, kms->aspace, 3)); + msm_framebuffer_iova(fb, kms->vm, 3)); } =20 /* Note: mdp5_plane->pipe_lock must be locked */ diff --git a/drivers/gpu/drm/msm/dsi/dsi_host.c b/drivers/gpu/drm/msm/dsi/d= si_host.c index 4d75529c0e85..16335ebd21e4 100644 --- a/drivers/gpu/drm/msm/dsi/dsi_host.c +++ b/drivers/gpu/drm/msm/dsi/dsi_host.c @@ -143,7 +143,7 @@ struct msm_dsi_host { =20 /* DSI 6G TX buffer*/ struct drm_gem_object *tx_gem_obj; - struct msm_gem_address_space *aspace; + struct msm_gem_vm *vm; =20 /* DSI v2 TX buffer */ void *tx_buf; @@ -1146,10 +1146,10 @@ int dsi_tx_buf_alloc_6g(struct msm_dsi_host *msm_ho= st, int size) uint64_t iova; u8 *data; =20 - msm_host->aspace =3D msm_gem_address_space_get(priv->kms->aspace); + msm_host->vm =3D msm_gem_vm_get(priv->kms->vm); =20 data =3D msm_gem_kernel_new(dev, size, MSM_BO_WC, - msm_host->aspace, + msm_host->vm, &msm_host->tx_gem_obj, &iova); =20 if (IS_ERR(data)) { @@ -1193,10 +1193,10 @@ void msm_dsi_tx_buf_free(struct mipi_dsi_host *host) return; =20 if (msm_host->tx_gem_obj) { - msm_gem_kernel_put(msm_host->tx_gem_obj, msm_host->aspace); - msm_gem_address_space_put(msm_host->aspace); + msm_gem_kernel_put(msm_host->tx_gem_obj, msm_host->vm); + msm_gem_vm_put(msm_host->vm); msm_host->tx_gem_obj =3D NULL; - msm_host->aspace =3D NULL; + msm_host->vm =3D NULL; } =20 if (msm_host->tx_buf) @@ -1327,7 +1327,7 @@ int dsi_dma_base_get_6g(struct msm_dsi_host *msm_host= , uint64_t *dma_base) return -EINVAL; =20 return msm_gem_get_and_pin_iova(msm_host->tx_gem_obj, - priv->kms->aspace, dma_base); + priv->kms->vm, dma_base); } =20 int dsi_dma_base_get_v2(struct msm_dsi_host *msm_host, uint64_t *dma_base) diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c index 324ee2089b34..49c868e33d70 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -349,7 +349,7 @@ static int context_init(struct drm_device *dev, struct = drm_file *file) kref_init(&ctx->ref); msm_submitqueue_init(dev, ctx); =20 - ctx->aspace =3D msm_gpu_create_private_address_space(priv->gpu, current); + ctx->vm =3D msm_gpu_create_private_vm(priv->gpu, current); file->driver_priv =3D ctx; =20 ctx->seqno =3D atomic_inc_return(&ident); @@ -527,7 +527,7 @@ static int msm_ioctl_gem_info_iova(struct drm_device *d= ev, * Don't pin the memory here - just get an address so that userspace can * be productive */ - return msm_gem_get_iova(obj, ctx->aspace, iova); + return msm_gem_get_iova(obj, ctx->vm, iova); } =20 static int msm_ioctl_gem_info_set_iova(struct drm_device *dev, @@ -541,13 +541,13 @@ static int msm_ioctl_gem_info_set_iova(struct drm_dev= ice *dev, return -EINVAL; =20 /* Only supported if per-process address space is supported: */ - if (priv->gpu->aspace =3D=3D ctx->aspace) + if (priv->gpu->vm =3D=3D ctx->vm) return UERR(EOPNOTSUPP, dev, "requires per-process pgtables"); =20 if (should_fail(&fail_gem_iova, obj->size)) return -ENOMEM; =20 - return msm_gem_set_iova(obj, ctx->aspace, iova); + return msm_gem_set_iova(obj, ctx->vm, iova); } =20 static int msm_ioctl_gem_info_set_metadata(struct drm_gem_object *obj, diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h index c8afb1ea6040..8aa3412c6e36 100644 --- a/drivers/gpu/drm/msm/msm_drv.h +++ b/drivers/gpu/drm/msm/msm_drv.h @@ -48,7 +48,7 @@ struct msm_rd_state; struct msm_perf_state; struct msm_gem_submit; struct msm_fence_context; -struct msm_gem_address_space; +struct msm_gem_vm; struct msm_gem_vma; struct msm_disp_state; =20 @@ -264,7 +264,7 @@ void msm_crtc_disable_vblank(struct drm_crtc *crtc); int msm_register_mmu(struct drm_device *dev, struct msm_mmu *mmu); void msm_unregister_mmu(struct drm_device *dev, struct msm_mmu *mmu); =20 -struct msm_gem_address_space *msm_kms_init_aspace(struct drm_device *dev); +struct msm_gem_vm *msm_kms_init_vm(struct drm_device *dev); bool msm_use_mmu(struct drm_device *dev); =20 int msm_ioctl_gem_submit(struct drm_device *dev, void *data, @@ -286,11 +286,11 @@ int msm_gem_prime_pin(struct drm_gem_object *obj); void msm_gem_prime_unpin(struct drm_gem_object *obj); =20 int msm_framebuffer_prepare(struct drm_framebuffer *fb, - struct msm_gem_address_space *aspace, bool needs_dirtyfb); + struct msm_gem_vm *vm, bool needs_dirtyfb); void msm_framebuffer_cleanup(struct drm_framebuffer *fb, - struct msm_gem_address_space *aspace, bool needed_dirtyfb); + struct msm_gem_vm *vm, bool needed_dirtyfb); uint32_t msm_framebuffer_iova(struct drm_framebuffer *fb, - struct msm_gem_address_space *aspace, int plane); + struct msm_gem_vm *vm, int plane); struct drm_gem_object *msm_framebuffer_bo(struct drm_framebuffer *fb, int = plane); const struct msm_format *msm_framebuffer_format(struct drm_framebuffer *fb= ); struct drm_framebuffer *msm_framebuffer_create(struct drm_device *dev, diff --git a/drivers/gpu/drm/msm/msm_fb.c b/drivers/gpu/drm/msm/msm_fb.c index 09268e416843..6df318b73534 100644 --- a/drivers/gpu/drm/msm/msm_fb.c +++ b/drivers/gpu/drm/msm/msm_fb.c @@ -76,7 +76,7 @@ void msm_framebuffer_describe(struct drm_framebuffer *fb,= struct seq_file *m) /* prepare/pin all the fb's bo's for scanout. */ int msm_framebuffer_prepare(struct drm_framebuffer *fb, - struct msm_gem_address_space *aspace, + struct msm_gem_vm *vm, bool needs_dirtyfb) { struct msm_framebuffer *msm_fb =3D to_msm_framebuffer(fb); @@ -88,7 +88,7 @@ int msm_framebuffer_prepare(struct drm_framebuffer *fb, atomic_inc(&msm_fb->prepare_count); =20 for (i =3D 0; i < n; i++) { - ret =3D msm_gem_get_and_pin_iova(fb->obj[i], aspace, &msm_fb->iova[i]); + ret =3D msm_gem_get_and_pin_iova(fb->obj[i], vm, &msm_fb->iova[i]); drm_dbg_state(fb->dev, "FB[%u]: iova[%d]: %08llx (%d)\n", fb->base.id, i, msm_fb->iova[i], ret); if (ret) @@ -99,7 +99,7 @@ int msm_framebuffer_prepare(struct drm_framebuffer *fb, } =20 void msm_framebuffer_cleanup(struct drm_framebuffer *fb, - struct msm_gem_address_space *aspace, + struct msm_gem_vm *vm, bool needed_dirtyfb) { struct msm_framebuffer *msm_fb =3D to_msm_framebuffer(fb); @@ -109,14 +109,14 @@ void msm_framebuffer_cleanup(struct drm_framebuffer *= fb, refcount_dec(&msm_fb->dirtyfb); =20 for (i =3D 0; i < n; i++) - msm_gem_unpin_iova(fb->obj[i], aspace); + msm_gem_unpin_iova(fb->obj[i], vm); =20 if (!atomic_dec_return(&msm_fb->prepare_count)) memset(msm_fb->iova, 0, sizeof(msm_fb->iova)); } =20 uint32_t msm_framebuffer_iova(struct drm_framebuffer *fb, - struct msm_gem_address_space *aspace, int plane) + struct msm_gem_vm *vm, int plane) { struct msm_framebuffer *msm_fb =3D to_msm_framebuffer(fb); return msm_fb->iova[plane] + fb->offsets[plane]; diff --git a/drivers/gpu/drm/msm/msm_fbdev.c b/drivers/gpu/drm/msm/msm_fbde= v.c index c62249b1ab3d..b5969374d53f 100644 --- a/drivers/gpu/drm/msm/msm_fbdev.c +++ b/drivers/gpu/drm/msm/msm_fbdev.c @@ -122,7 +122,7 @@ int msm_fbdev_driver_fbdev_probe(struct drm_fb_helper *= helper, * in panic (ie. lock-safe, etc) we could avoid pinning the * buffer now: */ - ret =3D msm_gem_get_and_pin_iova(bo, priv->kms->aspace, &paddr); + ret =3D msm_gem_get_and_pin_iova(bo, priv->kms->vm, &paddr); if (ret) { DRM_DEV_ERROR(dev->dev, "failed to get buffer obj iova: %d\n", ret); goto fail; diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c index 259919b0e887..5e6c88b85fd3 100644 --- a/drivers/gpu/drm/msm/msm_gem.c +++ b/drivers/gpu/drm/msm/msm_gem.c @@ -398,14 +398,14 @@ uint64_t msm_gem_mmap_offset(struct drm_gem_object *o= bj) } =20 static struct msm_gem_vma *add_vma(struct drm_gem_object *obj, - struct msm_gem_address_space *aspace) + struct msm_gem_vm *vm) { struct msm_gem_object *msm_obj =3D to_msm_bo(obj); struct msm_gem_vma *vma; =20 msm_gem_assert_locked(obj); =20 - vma =3D msm_gem_vma_new(aspace); + vma =3D msm_gem_vma_new(vm); if (!vma) return ERR_PTR(-ENOMEM); =20 @@ -415,7 +415,7 @@ static struct msm_gem_vma *add_vma(struct drm_gem_objec= t *obj, } =20 static struct msm_gem_vma *lookup_vma(struct drm_gem_object *obj, - struct msm_gem_address_space *aspace) + struct msm_gem_vm *vm) { struct msm_gem_object *msm_obj =3D to_msm_bo(obj); struct msm_gem_vma *vma; @@ -423,7 +423,7 @@ static struct msm_gem_vma *lookup_vma(struct drm_gem_ob= ject *obj, msm_gem_assert_locked(obj); =20 list_for_each_entry(vma, &msm_obj->vmas, list) { - if (vma->aspace =3D=3D aspace) + if (vma->vm =3D=3D vm) return vma; } =20 @@ -454,7 +454,7 @@ put_iova_spaces(struct drm_gem_object *obj, bool close) msm_gem_assert_locked(obj); =20 list_for_each_entry(vma, &msm_obj->vmas, list) { - if (vma->aspace) { + if (vma->vm) { msm_gem_vma_purge(vma); if (close) msm_gem_vma_close(vma); @@ -477,19 +477,19 @@ put_iova_vmas(struct drm_gem_object *obj) } =20 static struct msm_gem_vma *get_vma_locked(struct drm_gem_object *obj, - struct msm_gem_address_space *aspace, + struct msm_gem_vm *vm, u64 range_start, u64 range_end) { struct msm_gem_vma *vma; =20 msm_gem_assert_locked(obj); =20 - vma =3D lookup_vma(obj, aspace); + vma =3D lookup_vma(obj, vm); =20 if (!vma) { int ret; =20 - vma =3D add_vma(obj, aspace); + vma =3D add_vma(obj, vm); if (IS_ERR(vma)) return vma; =20 @@ -561,13 +561,13 @@ void msm_gem_unpin_active(struct drm_gem_object *obj) } =20 struct msm_gem_vma *msm_gem_get_vma_locked(struct drm_gem_object *obj, - struct msm_gem_address_space *aspace) + struct msm_gem_vm *vm) { - return get_vma_locked(obj, aspace, 0, U64_MAX); + return get_vma_locked(obj, vm, 0, U64_MAX); } =20 static int get_and_pin_iova_range_locked(struct drm_gem_object *obj, - struct msm_gem_address_space *aspace, uint64_t *iova, + struct msm_gem_vm *vm, uint64_t *iova, u64 range_start, u64 range_end) { struct msm_gem_vma *vma; @@ -575,7 +575,7 @@ static int get_and_pin_iova_range_locked(struct drm_gem= _object *obj, =20 msm_gem_assert_locked(obj); =20 - vma =3D get_vma_locked(obj, aspace, range_start, range_end); + vma =3D get_vma_locked(obj, vm, range_start, range_end); if (IS_ERR(vma)) return PTR_ERR(vma); =20 @@ -593,13 +593,13 @@ static int get_and_pin_iova_range_locked(struct drm_g= em_object *obj, * limits iova to specified range (in pages) */ int msm_gem_get_and_pin_iova_range(struct drm_gem_object *obj, - struct msm_gem_address_space *aspace, uint64_t *iova, + struct msm_gem_vm *vm, uint64_t *iova, u64 range_start, u64 range_end) { int ret; =20 msm_gem_lock(obj); - ret =3D get_and_pin_iova_range_locked(obj, aspace, iova, range_start, ran= ge_end); + ret =3D get_and_pin_iova_range_locked(obj, vm, iova, range_start, range_e= nd); msm_gem_unlock(obj); =20 return ret; @@ -607,9 +607,9 @@ int msm_gem_get_and_pin_iova_range(struct drm_gem_objec= t *obj, =20 /* get iova and pin it. Should have a matching put */ int msm_gem_get_and_pin_iova(struct drm_gem_object *obj, - struct msm_gem_address_space *aspace, uint64_t *iova) + struct msm_gem_vm *vm, uint64_t *iova) { - return msm_gem_get_and_pin_iova_range(obj, aspace, iova, 0, U64_MAX); + return msm_gem_get_and_pin_iova_range(obj, vm, iova, 0, U64_MAX); } =20 /* @@ -617,13 +617,13 @@ int msm_gem_get_and_pin_iova(struct drm_gem_object *o= bj, * valid for the life of the object */ int msm_gem_get_iova(struct drm_gem_object *obj, - struct msm_gem_address_space *aspace, uint64_t *iova) + struct msm_gem_vm *vm, uint64_t *iova) { struct msm_gem_vma *vma; int ret =3D 0; =20 msm_gem_lock(obj); - vma =3D get_vma_locked(obj, aspace, 0, U64_MAX); + vma =3D get_vma_locked(obj, vm, 0, U64_MAX); if (IS_ERR(vma)) { ret =3D PTR_ERR(vma); } else { @@ -635,9 +635,9 @@ int msm_gem_get_iova(struct drm_gem_object *obj, } =20 static int clear_iova(struct drm_gem_object *obj, - struct msm_gem_address_space *aspace) + struct msm_gem_vm *vm) { - struct msm_gem_vma *vma =3D lookup_vma(obj, aspace); + struct msm_gem_vma *vma =3D lookup_vma(obj, vm); =20 if (!vma) return 0; @@ -657,20 +657,20 @@ static int clear_iova(struct drm_gem_object *obj, * Setting an iova of zero will clear the vma. */ int msm_gem_set_iova(struct drm_gem_object *obj, - struct msm_gem_address_space *aspace, uint64_t iova) + struct msm_gem_vm *vm, uint64_t iova) { int ret =3D 0; =20 msm_gem_lock(obj); if (!iova) { - ret =3D clear_iova(obj, aspace); + ret =3D clear_iova(obj, vm); } else { struct msm_gem_vma *vma; - vma =3D get_vma_locked(obj, aspace, iova, iova + obj->size); + vma =3D get_vma_locked(obj, vm, iova, iova + obj->size); if (IS_ERR(vma)) { ret =3D PTR_ERR(vma); } else if (GEM_WARN_ON(vma->iova !=3D iova)) { - clear_iova(obj, aspace); + clear_iova(obj, vm); ret =3D -EBUSY; } } @@ -685,12 +685,12 @@ int msm_gem_set_iova(struct drm_gem_object *obj, * to get rid of it */ void msm_gem_unpin_iova(struct drm_gem_object *obj, - struct msm_gem_address_space *aspace) + struct msm_gem_vm *vm) { struct msm_gem_vma *vma; =20 msm_gem_lock(obj); - vma =3D lookup_vma(obj, aspace); + vma =3D lookup_vma(obj, vm); if (!GEM_WARN_ON(!vma)) { msm_gem_unpin_locked(obj); } @@ -1008,23 +1008,23 @@ void msm_gem_describe(struct drm_gem_object *obj, s= truct seq_file *m, =20 list_for_each_entry(vma, &msm_obj->vmas, list) { const char *name, *comm; - if (vma->aspace) { - struct msm_gem_address_space *aspace =3D vma->aspace; + if (vma->vm) { + struct msm_gem_vm *vm =3D vma->vm; struct task_struct *task =3D - get_pid_task(aspace->pid, PIDTYPE_PID); + get_pid_task(vm->pid, PIDTYPE_PID); if (task) { comm =3D kstrdup(task->comm, GFP_KERNEL); put_task_struct(task); } else { comm =3D NULL; } - name =3D aspace->name; + name =3D vm->name; } else { name =3D comm =3D NULL; } - seq_printf(m, " [%s%s%s: aspace=3D%p, %08llx,%s]", + seq_printf(m, " [%s%s%s: vm=3D%p, %08llx,%s]", name, comm ? ":" : "", comm ? comm : "", - vma->aspace, vma->iova, + vma->vm, vma->iova, vma->mapped ? "mapped" : "unmapped"); kfree(comm); } @@ -1349,7 +1349,7 @@ struct drm_gem_object *msm_gem_import(struct drm_devi= ce *dev, } =20 void *msm_gem_kernel_new(struct drm_device *dev, uint32_t size, - uint32_t flags, struct msm_gem_address_space *aspace, + uint32_t flags, struct msm_gem_vm *vm, struct drm_gem_object **bo, uint64_t *iova) { void *vaddr; @@ -1360,14 +1360,14 @@ void *msm_gem_kernel_new(struct drm_device *dev, ui= nt32_t size, return ERR_CAST(obj); =20 if (iova) { - ret =3D msm_gem_get_and_pin_iova(obj, aspace, iova); + ret =3D msm_gem_get_and_pin_iova(obj, vm, iova); if (ret) goto err; } =20 vaddr =3D msm_gem_get_vaddr(obj); if (IS_ERR(vaddr)) { - msm_gem_unpin_iova(obj, aspace); + msm_gem_unpin_iova(obj, vm); ret =3D PTR_ERR(vaddr); goto err; } @@ -1384,13 +1384,13 @@ void *msm_gem_kernel_new(struct drm_device *dev, ui= nt32_t size, } =20 void msm_gem_kernel_put(struct drm_gem_object *bo, - struct msm_gem_address_space *aspace) + struct msm_gem_vm *vm) { if (IS_ERR_OR_NULL(bo)) return; =20 msm_gem_put_vaddr(bo); - msm_gem_unpin_iova(bo, aspace); + msm_gem_unpin_iova(bo, vm); drm_gem_object_put(bo); } =20 diff --git a/drivers/gpu/drm/msm/msm_gem.h b/drivers/gpu/drm/msm/msm_gem.h index ba5c4ff76292..64ea3ed213c1 100644 --- a/drivers/gpu/drm/msm/msm_gem.h +++ b/drivers/gpu/drm/msm/msm_gem.h @@ -22,7 +22,7 @@ #define MSM_BO_STOLEN 0x10000000 /* try to use stolen/splash mem= ory */ #define MSM_BO_MAP_PRIV 0x20000000 /* use IOMMU_PRIV when mapping = */ =20 -struct msm_gem_address_space { +struct msm_gem_vm { const char *name; /* NOTE: mm managed at the page level, size is in # of pages * and position mm_node->start is in # of pages: @@ -47,13 +47,13 @@ struct msm_gem_address_space { uint64_t va_size; }; =20 -struct msm_gem_address_space * -msm_gem_address_space_get(struct msm_gem_address_space *aspace); +struct msm_gem_vm * +msm_gem_vm_get(struct msm_gem_vm *vm); =20 -void msm_gem_address_space_put(struct msm_gem_address_space *aspace); +void msm_gem_vm_put(struct msm_gem_vm *vm); =20 -struct msm_gem_address_space * -msm_gem_address_space_create(struct msm_mmu *mmu, const char *name, +struct msm_gem_vm * +msm_gem_vm_create(struct msm_mmu *mmu, const char *name, u64 va_start, u64 size); =20 struct msm_fence_context; @@ -61,12 +61,12 @@ struct msm_fence_context; struct msm_gem_vma { struct drm_mm_node node; uint64_t iova; - struct msm_gem_address_space *aspace; + struct msm_gem_vm *vm; struct list_head list; /* node in msm_gem_object::vmas */ bool mapped; }; =20 -struct msm_gem_vma *msm_gem_vma_new(struct msm_gem_address_space *aspace); +struct msm_gem_vma *msm_gem_vma_new(struct msm_gem_vm *vm); int msm_gem_vma_init(struct msm_gem_vma *vma, int size, u64 range_start, u64 range_end); void msm_gem_vma_purge(struct msm_gem_vma *vma); @@ -127,18 +127,18 @@ int msm_gem_pin_vma_locked(struct drm_gem_object *obj= , struct msm_gem_vma *vma); void msm_gem_unpin_locked(struct drm_gem_object *obj); void msm_gem_unpin_active(struct drm_gem_object *obj); struct msm_gem_vma *msm_gem_get_vma_locked(struct drm_gem_object *obj, - struct msm_gem_address_space *aspace); + struct msm_gem_vm *vm); int msm_gem_get_iova(struct drm_gem_object *obj, - struct msm_gem_address_space *aspace, uint64_t *iova); + struct msm_gem_vm *vm, uint64_t *iova); int msm_gem_set_iova(struct drm_gem_object *obj, - struct msm_gem_address_space *aspace, uint64_t iova); + struct msm_gem_vm *vm, uint64_t iova); int msm_gem_get_and_pin_iova_range(struct drm_gem_object *obj, - struct msm_gem_address_space *aspace, uint64_t *iova, + struct msm_gem_vm *vm, uint64_t *iova, u64 range_start, u64 range_end); int msm_gem_get_and_pin_iova(struct drm_gem_object *obj, - struct msm_gem_address_space *aspace, uint64_t *iova); + struct msm_gem_vm *vm, uint64_t *iova); void msm_gem_unpin_iova(struct drm_gem_object *obj, - struct msm_gem_address_space *aspace); + struct msm_gem_vm *vm); void msm_gem_pin_obj_locked(struct drm_gem_object *obj); struct page **msm_gem_pin_pages_locked(struct drm_gem_object *obj); void msm_gem_unpin_pages_locked(struct drm_gem_object *obj); @@ -160,10 +160,10 @@ int msm_gem_new_handle(struct drm_device *dev, struct= drm_file *file, struct drm_gem_object *msm_gem_new(struct drm_device *dev, uint32_t size, uint32_t flags); void *msm_gem_kernel_new(struct drm_device *dev, uint32_t size, - uint32_t flags, struct msm_gem_address_space *aspace, + uint32_t flags, struct msm_gem_vm *vm, struct drm_gem_object **bo, uint64_t *iova); void msm_gem_kernel_put(struct drm_gem_object *bo, - struct msm_gem_address_space *aspace); + struct msm_gem_vm *vm); struct drm_gem_object *msm_gem_import(struct drm_device *dev, struct dma_buf *dmabuf, struct sg_table *sgt); __printf(2, 3) @@ -257,7 +257,7 @@ struct msm_gem_submit { struct kref ref; struct drm_device *dev; struct msm_gpu *gpu; - struct msm_gem_address_space *aspace; + struct msm_gem_vm *vm; struct list_head node; /* node in ring submit list */ struct drm_exec exec; uint32_t seqno; /* Sequence number of the submit on the ring */ diff --git a/drivers/gpu/drm/msm/msm_gem_submit.c b/drivers/gpu/drm/msm/msm= _gem_submit.c index 3aabf7f1da6d..a59816b6b6de 100644 --- a/drivers/gpu/drm/msm/msm_gem_submit.c +++ b/drivers/gpu/drm/msm/msm_gem_submit.c @@ -63,7 +63,7 @@ static struct msm_gem_submit *submit_create(struct drm_de= vice *dev, =20 kref_init(&submit->ref); submit->dev =3D dev; - submit->aspace =3D queue->ctx->aspace; + submit->vm =3D queue->ctx->vm; submit->gpu =3D gpu; submit->cmd =3D (void *)&submit->bos[nr_bos]; submit->queue =3D queue; @@ -311,7 +311,7 @@ static int submit_pin_objects(struct msm_gem_submit *su= bmit) struct msm_gem_vma *vma; =20 /* if locking succeeded, pin bo: */ - vma =3D msm_gem_get_vma_locked(obj, submit->aspace); + vma =3D msm_gem_get_vma_locked(obj, submit->vm); if (IS_ERR(vma)) { ret =3D PTR_ERR(vma); break; @@ -669,7 +669,7 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void *= data, if (args->pad) return -EINVAL; =20 - if (unlikely(!ctx->aspace) && !capable(CAP_SYS_RAWIO)) { + if (unlikely(!ctx->vm) && !capable(CAP_SYS_RAWIO)) { DRM_ERROR_RATELIMITED("IOMMU support or CAP_SYS_RAWIO required!\n"); return -EPERM; } diff --git a/drivers/gpu/drm/msm/msm_gem_vma.c b/drivers/gpu/drm/msm/msm_ge= m_vma.c index 11e842dda73c..9419692f0cc8 100644 --- a/drivers/gpu/drm/msm/msm_gem_vma.c +++ b/drivers/gpu/drm/msm/msm_gem_vma.c @@ -10,45 +10,44 @@ #include "msm_mmu.h" =20 static void -msm_gem_address_space_destroy(struct kref *kref) +msm_gem_vm_destroy(struct kref *kref) { - struct msm_gem_address_space *aspace =3D container_of(kref, - struct msm_gem_address_space, kref); - - drm_mm_takedown(&aspace->mm); - if (aspace->mmu) - aspace->mmu->funcs->destroy(aspace->mmu); - put_pid(aspace->pid); - kfree(aspace); + struct msm_gem_vm *vm =3D container_of(kref, struct msm_gem_vm, kref); + + drm_mm_takedown(&vm->mm); + if (vm->mmu) + vm->mmu->funcs->destroy(vm->mmu); + put_pid(vm->pid); + kfree(vm); } =20 =20 -void msm_gem_address_space_put(struct msm_gem_address_space *aspace) +void msm_gem_vm_put(struct msm_gem_vm *vm) { - if (aspace) - kref_put(&aspace->kref, msm_gem_address_space_destroy); + if (vm) + kref_put(&vm->kref, msm_gem_vm_destroy); } =20 -struct msm_gem_address_space * -msm_gem_address_space_get(struct msm_gem_address_space *aspace) +struct msm_gem_vm * +msm_gem_vm_get(struct msm_gem_vm *vm) { - if (!IS_ERR_OR_NULL(aspace)) - kref_get(&aspace->kref); + if (!IS_ERR_OR_NULL(vm)) + kref_get(&vm->kref); =20 - return aspace; + return vm; } =20 /* Actually unmap memory for the vma */ void msm_gem_vma_purge(struct msm_gem_vma *vma) { - struct msm_gem_address_space *aspace =3D vma->aspace; + struct msm_gem_vm *vm =3D vma->vm; unsigned size =3D vma->node.size; =20 /* Don't do anything if the memory isn't mapped */ if (!vma->mapped) return; =20 - aspace->mmu->funcs->unmap(aspace->mmu, vma->iova, size); + vm->mmu->funcs->unmap(vm->mmu, vma->iova, size); =20 vma->mapped =3D false; } @@ -58,7 +57,7 @@ int msm_gem_vma_map(struct msm_gem_vma *vma, int prot, struct sg_table *sgt, int size) { - struct msm_gem_address_space *aspace =3D vma->aspace; + struct msm_gem_vm *vm =3D vma->vm; int ret; =20 if (GEM_WARN_ON(!vma->iova)) @@ -69,7 +68,7 @@ msm_gem_vma_map(struct msm_gem_vma *vma, int prot, =20 vma->mapped =3D true; =20 - if (!aspace) + if (!vm) return 0; =20 /* @@ -81,7 +80,7 @@ msm_gem_vma_map(struct msm_gem_vma *vma, int prot, * Revisit this if we can come up with a scheme to pre-alloc pages * for the pgtable in map/unmap ops. */ - ret =3D aspace->mmu->funcs->map(aspace->mmu, vma->iova, sgt, size, prot); + ret =3D vm->mmu->funcs->map(vm->mmu, vma->iova, sgt, size, prot); =20 if (ret) { vma->mapped =3D false; @@ -93,21 +92,21 @@ msm_gem_vma_map(struct msm_gem_vma *vma, int prot, /* Close an iova. Warn if it is still in use */ void msm_gem_vma_close(struct msm_gem_vma *vma) { - struct msm_gem_address_space *aspace =3D vma->aspace; + struct msm_gem_vm *vm =3D vma->vm; =20 GEM_WARN_ON(vma->mapped); =20 - spin_lock(&aspace->lock); + spin_lock(&vm->lock); if (vma->iova) drm_mm_remove_node(&vma->node); - spin_unlock(&aspace->lock); + spin_unlock(&vm->lock); =20 vma->iova =3D 0; =20 - msm_gem_address_space_put(aspace); + msm_gem_vm_put(vm); } =20 -struct msm_gem_vma *msm_gem_vma_new(struct msm_gem_address_space *aspace) +struct msm_gem_vma *msm_gem_vma_new(struct msm_gem_vm *vm) { struct msm_gem_vma *vma; =20 @@ -115,7 +114,7 @@ struct msm_gem_vma *msm_gem_vma_new(struct msm_gem_addr= ess_space *aspace) if (!vma) return NULL; =20 - vma->aspace =3D aspace; + vma->vm =3D vm; =20 return vma; } @@ -124,20 +123,20 @@ struct msm_gem_vma *msm_gem_vma_new(struct msm_gem_ad= dress_space *aspace) int msm_gem_vma_init(struct msm_gem_vma *vma, int size, u64 range_start, u64 range_end) { - struct msm_gem_address_space *aspace =3D vma->aspace; + struct msm_gem_vm *vm =3D vma->vm; int ret; =20 - if (GEM_WARN_ON(!aspace)) + if (GEM_WARN_ON(!vm)) return -EINVAL; =20 if (GEM_WARN_ON(vma->iova)) return -EBUSY; =20 - spin_lock(&aspace->lock); - ret =3D drm_mm_insert_node_in_range(&aspace->mm, &vma->node, + spin_lock(&vm->lock); + ret =3D drm_mm_insert_node_in_range(&vm->mm, &vma->node, size, PAGE_SIZE, 0, range_start, range_end, 0); - spin_unlock(&aspace->lock); + spin_unlock(&vm->lock); =20 if (ret) return ret; @@ -145,33 +144,33 @@ int msm_gem_vma_init(struct msm_gem_vma *vma, int siz= e, vma->iova =3D vma->node.start; vma->mapped =3D false; =20 - kref_get(&aspace->kref); + kref_get(&vm->kref); =20 return 0; } =20 -struct msm_gem_address_space * -msm_gem_address_space_create(struct msm_mmu *mmu, const char *name, +struct msm_gem_vm * +msm_gem_vm_create(struct msm_mmu *mmu, const char *name, u64 va_start, u64 size) { - struct msm_gem_address_space *aspace; + struct msm_gem_vm *vm; =20 if (IS_ERR(mmu)) return ERR_CAST(mmu); =20 - aspace =3D kzalloc(sizeof(*aspace), GFP_KERNEL); - if (!aspace) + vm =3D kzalloc(sizeof(*vm), GFP_KERNEL); + if (!vm) return ERR_PTR(-ENOMEM); =20 - spin_lock_init(&aspace->lock); - aspace->name =3D name; - aspace->mmu =3D mmu; - aspace->va_start =3D va_start; - aspace->va_size =3D size; + spin_lock_init(&vm->lock); + vm->name =3D name; + vm->mmu =3D mmu; + vm->va_start =3D va_start; + vm->va_size =3D size; =20 - drm_mm_init(&aspace->mm, va_start, size); + drm_mm_init(&vm->mm, va_start, size); =20 - kref_init(&aspace->kref); + kref_init(&vm->kref); =20 - return aspace; + return vm; } diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c index a8280b579832..3400a6ca8fd8 100644 --- a/drivers/gpu/drm/msm/msm_gpu.c +++ b/drivers/gpu/drm/msm/msm_gpu.c @@ -285,7 +285,7 @@ static void msm_gpu_crashstate_capture(struct msm_gpu *= gpu, =20 if (state->fault_info.ttbr0) { struct msm_gpu_fault_info *info =3D &state->fault_info; - struct msm_mmu *mmu =3D submit->aspace->mmu; + struct msm_mmu *mmu =3D submit->vm->mmu; =20 msm_iommu_pagetable_params(mmu, &info->pgtbl_ttbr0, &info->asid); @@ -389,8 +389,8 @@ static void recover_worker(struct kthread_work *work) =20 /* Increment the fault counts */ submit->queue->faults++; - if (submit->aspace) - submit->aspace->faults++; + if (submit->vm) + submit->vm->faults++; =20 get_comm_cmdline(submit, &comm, &cmd); =20 @@ -828,10 +828,10 @@ static int get_clocks(struct platform_device *pdev, s= truct msm_gpu *gpu) } =20 /* Return a new address space for a msm_drm_private instance */ -struct msm_gem_address_space * -msm_gpu_create_private_address_space(struct msm_gpu *gpu, struct task_stru= ct *task) +struct msm_gem_vm * +msm_gpu_create_private_vm(struct msm_gpu *gpu, struct task_struct *task) { - struct msm_gem_address_space *aspace =3D NULL; + struct msm_gem_vm *vm =3D NULL; if (!gpu) return NULL; =20 @@ -839,16 +839,16 @@ msm_gpu_create_private_address_space(struct msm_gpu *= gpu, struct task_struct *ta * If the target doesn't support private address spaces then return * the global one */ - if (gpu->funcs->create_private_address_space) { - aspace =3D gpu->funcs->create_private_address_space(gpu); - if (!IS_ERR(aspace)) - aspace->pid =3D get_pid(task_pid(task)); + if (gpu->funcs->create_private_vm) { + vm =3D gpu->funcs->create_private_vm(gpu); + if (!IS_ERR(vm)) + vm->pid =3D get_pid(task_pid(task)); } =20 - if (IS_ERR_OR_NULL(aspace)) - aspace =3D msm_gem_address_space_get(gpu->aspace); + if (IS_ERR_OR_NULL(vm)) + vm =3D msm_gem_vm_get(gpu->vm); =20 - return aspace; + return vm; } =20 int msm_gpu_init(struct drm_device *drm, struct platform_device *pdev, @@ -943,18 +943,18 @@ int msm_gpu_init(struct drm_device *drm, struct platf= orm_device *pdev, msm_devfreq_init(gpu); =20 =20 - gpu->aspace =3D gpu->funcs->create_address_space(gpu, pdev); + gpu->vm =3D gpu->funcs->create_vm(gpu, pdev); =20 - if (gpu->aspace =3D=3D NULL) + if (gpu->vm =3D=3D NULL) DRM_DEV_INFO(drm->dev, "%s: no IOMMU, fallback to VRAM carveout!\n", nam= e); - else if (IS_ERR(gpu->aspace)) { - ret =3D PTR_ERR(gpu->aspace); + else if (IS_ERR(gpu->vm)) { + ret =3D PTR_ERR(gpu->vm); goto fail; } =20 memptrs =3D msm_gem_kernel_new(drm, sizeof(struct msm_rbmemptrs) * nr_rings, - check_apriv(gpu, MSM_BO_WC), gpu->aspace, &gpu->memptrs_bo, + check_apriv(gpu, MSM_BO_WC), gpu->vm, &gpu->memptrs_bo, &memptrs_iova); =20 if (IS_ERR(memptrs)) { @@ -998,7 +998,7 @@ int msm_gpu_init(struct drm_device *drm, struct platfor= m_device *pdev, gpu->rb[i] =3D NULL; } =20 - msm_gem_kernel_put(gpu->memptrs_bo, gpu->aspace); + msm_gem_kernel_put(gpu->memptrs_bo, gpu->vm); =20 platform_set_drvdata(pdev, NULL); return ret; @@ -1015,11 +1015,11 @@ void msm_gpu_cleanup(struct msm_gpu *gpu) gpu->rb[i] =3D NULL; } =20 - msm_gem_kernel_put(gpu->memptrs_bo, gpu->aspace); + msm_gem_kernel_put(gpu->memptrs_bo, gpu->vm); =20 - if (!IS_ERR_OR_NULL(gpu->aspace)) { - gpu->aspace->mmu->funcs->detach(gpu->aspace->mmu); - msm_gem_address_space_put(gpu->aspace); + if (!IS_ERR_OR_NULL(gpu->vm)) { + gpu->vm->mmu->funcs->detach(gpu->vm->mmu); + msm_gem_vm_put(gpu->vm); } =20 if (gpu->worker) { diff --git a/drivers/gpu/drm/msm/msm_gpu.h b/drivers/gpu/drm/msm/msm_gpu.h index d30a1eedfda6..9d69dcad6612 100644 --- a/drivers/gpu/drm/msm/msm_gpu.h +++ b/drivers/gpu/drm/msm/msm_gpu.h @@ -78,10 +78,8 @@ struct msm_gpu_funcs { /* note: gpu_set_freq() can assume that we have been pm_resumed */ void (*gpu_set_freq)(struct msm_gpu *gpu, struct dev_pm_opp *opp, bool suspended); - struct msm_gem_address_space *(*create_address_space) - (struct msm_gpu *gpu, struct platform_device *pdev); - struct msm_gem_address_space *(*create_private_address_space) - (struct msm_gpu *gpu); + struct msm_gem_vm *(*create_vm)(struct msm_gpu *gpu, struct platform_devi= ce *pdev); + struct msm_gem_vm *(*create_private_vm)(struct msm_gpu *gpu); uint32_t (*get_rptr)(struct msm_gpu *gpu, struct msm_ringbuffer *ring); =20 /** @@ -236,7 +234,7 @@ struct msm_gpu { void __iomem *mmio; int irq; =20 - struct msm_gem_address_space *aspace; + struct msm_gem_vm *vm; =20 /* Power Control: */ struct regulator *gpu_reg, *gpu_cx; @@ -358,8 +356,8 @@ struct msm_context { */ int queueid; =20 - /** @aspace: the per-process GPU address-space */ - struct msm_gem_address_space *aspace; + /** @vm: the per-process GPU address-space */ + struct msm_gem_vm *vm; =20 /** @kref: the reference count */ struct kref ref; @@ -669,8 +667,8 @@ int msm_gpu_init(struct drm_device *drm, struct platfor= m_device *pdev, struct msm_gpu *gpu, const struct msm_gpu_funcs *funcs, const char *name, struct msm_gpu_config *config); =20 -struct msm_gem_address_space * -msm_gpu_create_private_address_space(struct msm_gpu *gpu, struct task_stru= ct *task); +struct msm_gem_vm * +msm_gpu_create_private_vm(struct msm_gpu *gpu, struct task_struct *task); =20 void msm_gpu_cleanup(struct msm_gpu *gpu); =20 diff --git a/drivers/gpu/drm/msm/msm_kms.c b/drivers/gpu/drm/msm/msm_kms.c index 35d5397e73b4..88504c4b842f 100644 --- a/drivers/gpu/drm/msm/msm_kms.c +++ b/drivers/gpu/drm/msm/msm_kms.c @@ -176,9 +176,9 @@ static int msm_kms_fault_handler(void *arg, unsigned lo= ng iova, int flags, void return -ENOSYS; } =20 -struct msm_gem_address_space *msm_kms_init_aspace(struct drm_device *dev) +struct msm_gem_vm *msm_kms_init_vm(struct drm_device *dev) { - struct msm_gem_address_space *aspace; + struct msm_gem_vm *vm; struct msm_mmu *mmu; struct device *mdp_dev =3D dev->dev; struct device *mdss_dev =3D mdp_dev->parent; @@ -204,17 +204,17 @@ struct msm_gem_address_space *msm_kms_init_aspace(str= uct drm_device *dev) return NULL; } =20 - aspace =3D msm_gem_address_space_create(mmu, "mdp_kms", + vm =3D msm_gem_vm_create(mmu, "mdp_kms", 0x1000, 0x100000000 - 0x1000); - if (IS_ERR(aspace)) { - dev_err(mdp_dev, "aspace create, error %pe\n", aspace); + if (IS_ERR(vm)) { + dev_err(mdp_dev, "vm create, error %pe\n", vm); mmu->funcs->destroy(mmu); - return aspace; + return vm; } =20 - msm_mmu_set_fault_handler(aspace->mmu, kms, msm_kms_fault_handler); + msm_mmu_set_fault_handler(vm->mmu, kms, msm_kms_fault_handler); =20 - return aspace; + return vm; } =20 void msm_drm_kms_uninit(struct device *dev) diff --git a/drivers/gpu/drm/msm/msm_kms.h b/drivers/gpu/drm/msm/msm_kms.h index 43b58d052ee6..f45996a03e15 100644 --- a/drivers/gpu/drm/msm/msm_kms.h +++ b/drivers/gpu/drm/msm/msm_kms.h @@ -139,7 +139,7 @@ struct msm_kms { atomic_t fault_snapshot_capture; =20 /* mapper-id used to request GEM buffer mapped for scanout: */ - struct msm_gem_address_space *aspace; + struct msm_gem_vm *vm; =20 /* disp snapshot support */ struct kthread_worker *dump_worker; diff --git a/drivers/gpu/drm/msm/msm_ringbuffer.c b/drivers/gpu/drm/msm/msm= _ringbuffer.c index 89dce15eed3b..552b8da9e5f7 100644 --- a/drivers/gpu/drm/msm/msm_ringbuffer.c +++ b/drivers/gpu/drm/msm/msm_ringbuffer.c @@ -84,7 +84,7 @@ struct msm_ringbuffer *msm_ringbuffer_new(struct msm_gpu = *gpu, int id, =20 ring->start =3D msm_gem_kernel_new(gpu->dev, MSM_GPU_RINGBUFFER_SZ, check_apriv(gpu, MSM_BO_WC | MSM_BO_GPU_READONLY), - gpu->aspace, &ring->bo, &ring->iova); + gpu->vm, &ring->bo, &ring->iova); =20 if (IS_ERR(ring->start)) { ret =3D PTR_ERR(ring->start); @@ -131,7 +131,7 @@ void msm_ringbuffer_destroy(struct msm_ringbuffer *ring) =20 msm_fence_context_free(ring->fctx); =20 - msm_gem_kernel_put(ring->bo, ring->gpu->aspace); + msm_gem_kernel_put(ring->bo, ring->gpu->vm); =20 kfree(ring); } diff --git a/drivers/gpu/drm/msm/msm_submitqueue.c b/drivers/gpu/drm/msm/ms= m_submitqueue.c index 1acc0fe36353..6298233c3568 100644 --- a/drivers/gpu/drm/msm/msm_submitqueue.c +++ b/drivers/gpu/drm/msm/msm_submitqueue.c @@ -59,7 +59,7 @@ void __msm_context_destroy(struct kref *kref) kfree(ctx->entities[i]); } =20 - msm_gem_address_space_put(ctx->aspace); + msm_gem_vm_put(ctx->vm); kfree(ctx->comm); kfree(ctx->cmdline); kfree(ctx); --=20 2.50.0 From nobody Wed Oct 8 10:58:50 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 CD978225408 for ; Sun, 29 Jun 2025 14:07:24 +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=1751206047; cv=none; b=dZbKrcRGG1Bh9cJvs+u8/IhEB2O7dr2bVEPqbL6MudLoDIp3Wxm/qrcBTdpMg38TEMj3Yv2vGqgfU6bFw0Hh45ddxW3F1rO7T64NlyeLMtGPvHqwtdensVzw1eupgNjNQXYo91+vpNfM1rNekMRfyZSj9+Lz/g8P25oTZtfIXQs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751206047; c=relaxed/simple; bh=b5tuGWPYE6QnDeDqiAEIvFXMk2X3Ub5gGngeK/IcH8c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IoJWUA1SxctN78LRi6ESJK9E25LYkCBMJgbt367S+8RpLkc4lneGbdAKX7P11cPz0ndzhlfUAseEzJfHUhKpUySd8lYEh7Pin9BP0LAti2qFeFLma06Wo3bky+04uTNqcZPmt+dSjwA6GVMIDzIlB6tk7vOOGEiB3SMTvAxe1VE= 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=pEV022w+; 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="pEV022w+" Received: from pps.filterd (m0279872.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 55TB0JlB010328 for ; Sun, 29 Jun 2025 14:07:23 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=jQkMQAyUbCC WgV1hQTgPBMjaOTBgABotCahc1KmlBHk=; b=pEV022w+AtC2VhYydCh5wY5biDp TIlkQzMZr7TmtIprWr5dBmL+z1WcTemWwOzZW9B1r1qDXzJZlLcWRObg5rv3qjGf O0U/BozhMwR5d0RIarc//TeabB//87PpRe8EsSt8/O4S+bNdqJPq+gKt7SaLDpae QCn/3u+cJysNnDf2WsvZzMi6lrxJ58B1SnrRDjCYXpeoqk9y8vMCNIiuXoDpClAB hOefEaMJG1vGcSOmXAEEknbPPb8OuSTJ8zSW5oTdogxV2BEwbxCailO5VbGTqcpw RHrBPDU+zG3PjG2Bvh1AqH3DFxHh9klq4t82UxNc/NxPBRwcU8mAaw+dWjA== Received: from mail-pg1-f199.google.com (mail-pg1-f199.google.com [209.85.215.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 47j8s9a5w7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Sun, 29 Jun 2025 14:07:23 +0000 (GMT) Received: by mail-pg1-f199.google.com with SMTP id 41be03b00d2f7-b3184712fd8so959371a12.3 for ; Sun, 29 Jun 2025 07:07:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751206042; x=1751810842; 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=jQkMQAyUbCCWgV1hQTgPBMjaOTBgABotCahc1KmlBHk=; b=rACxZdcqjDzDIpCrc8Nq1CushDBaYeJbGldTtOqU+ux7pSuNnCnieGA5qQy2MNsxrk QT/wcaU28petulIBz0zyeDY5dQHyKQO1f6MHs3qjCiau/pXRBT0na8pJt5uPgzuXsMcF 5FjIoiJQFLwpovl0NwuDe3rHhWQZyEoiDfc0CZSQhrY7PSDKC1bZkmf+aUIcSoGEB+01 pGN6KxwOAeZPVE5/tpR6Z1taQ+5kkZ7FWwf0kElfBJUV8OopMCbJsA3F2nSgRwP+EHeS VDQ3DMkKbCzbxXgMChS+UiuFX3+GkKIujjqepK6A9qjAkYdlVorhhPbPqHXG/NGQYAxb lOXQ== X-Forwarded-Encrypted: i=1; AJvYcCUdjoO8Bdu2lvHtC8rCC3z0q5+VOq0gAU+HJaYuZRrbKaoFbdsMKd6jCujHgFswVJSRl8lT/fpYmb7SUi4=@vger.kernel.org X-Gm-Message-State: AOJu0Yz/13SIIKPoI32KSofTi5cWqSAZ9PfYHPEfRzrht98JNjbH4K6V v6W1FhcSfa9qnuWMo3XBcs/512dt05fRb6CF6hJzjuuMYA+yH65urjfdB+S/oSwZ0RMmGPYblCp s6pEgx5aPSv/C4HiAOHSs4hJzHk71e0OP9HoUUbNn4gUz2NTPgVFBYviGo3Yf0JmjKtU= X-Gm-Gg: ASbGncu5z2ocJDWJt6V/zl5gEOb4MVeqzCJWS6CV0wvv+mRu+ffADi76dGx2a8a9EKz FNhNdC8hMjONpLWyQchkQSdndPC2e3g8+8TK4TDetZC0eBsTTBu/BLi2Blc5A9Yi/gD2vNzIk/P LKoeoAnWoQAtEzZWEF5DtQJho9gYEWbePH6CxX8Sci0KNxsARfevIGs9hvmQWRnT92CZYQo64KY 9Xg4rErxxngWMKF/CDWRvMJpFv55vUwq8BtBRzqHIwntZ5aYDEuFJRl+botU++NEw50ZDeLMywr Q4yLdLzG1CoenHSclwK/Tqs15xBaKuiD X-Received: by 2002:a17:902:ebc4:b0:234:a139:1203 with SMTP id d9443c01a7336-23ac460552emr142074925ad.32.1751206042012; Sun, 29 Jun 2025 07:07:22 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHaYFFgqBYd8pF8b310jIcBaKWvtkU/YjbVaAQpe6J3fwTKA3mPBl+nUDpKd/7vTkTHAtk0dw== X-Received: by 2002:a17:902:ebc4:b0:234:a139:1203 with SMTP id d9443c01a7336-23ac460552emr142074345ad.32.1751206041442; Sun, 29 Jun 2025 07:07:21 -0700 (PDT) Received: from localhost ([2601:1c0:5000:d5c:5b3e:de60:4fda:e7b1]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-23acb3bbf9esm59451245ad.191.2025.06.29.07.07.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Jun 2025 07:07:21 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, Connor Abbott , Antonino Maniscalco , Danilo Krummrich , Rob Clark , Rob Clark , Sean Paul , Konrad Dybcio , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Marijn Suijten , David Airlie , Simona Vetter , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v8 07/42] drm/msm: Remove vram carveout support Date: Sun, 29 Jun 2025 07:03:10 -0700 Message-ID: <20250629140537.30850-8-robin.clark@oss.qualcomm.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250629140537.30850-1-robin.clark@oss.qualcomm.com> References: <20250629140537.30850-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-Authority-Analysis: v=2.4 cv=H/Pbw/Yi c=1 sm=1 tr=0 ts=6861489b cx=c_pps a=Oh5Dbbf/trHjhBongsHeRQ==:117 a=xqWC_Br6kY4A:10 a=6IFa9wvqVegA:10 a=cm27Pg_UAAAA:8 a=EUspDBNiAAAA:8 a=pGLkceISAAAA:8 a=2B-FfE5MDWLa5Dp4eRYA:9 a=_Vgx9l1VpLgwpw_dHYaR:22 X-Proofpoint-ORIG-GUID: mJkV1YvNXBRlW5PfR7uppgsiDtTThjZk X-Proofpoint-GUID: mJkV1YvNXBRlW5PfR7uppgsiDtTThjZk X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjI5MDExOCBTYWx0ZWRfX+PB1vaNO4H9m DYmo9cMR+N7XLUm/2JeQqYrJM2vZZipmZi6jGbxw29Ukascp+NRLAxBpi5rC9J+RYikuPC4GXt0 actXHgEY6ON+T5RvVzZUU20uHZtcQA+inlMlZk+D1QTBuSGwtsTcoo6OJMU8KQZecaCgrEPf/St OPmsPzMAqEBU59vrvBqkp1dkCnhD+82EqQYqtpJn97z2aI+DmFD755NU4xr2i9J8bPOHi366lR2 FRVzErSDWV9nDxDs8rwooatH8EwHeBS3kVkPTTrgR6x+VllcMMhBgZYp0MQOe2M+1sgcjH1TBIm f6oURw5b1HRWzBUMlOJRKus89QVXK6bbgNxeOOTKikYrGX90QZv1C9lubUwV461fV5r/WCCsUrn NIUlE9IIM3us7fyJobvHthUhfqhL9Bbqr4NZHEBexqIdD5ix/oH98ca4f0lXjbetcwCgA/oI 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-27_05,2025-06-27_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 malwarescore=0 suspectscore=0 mlxlogscore=999 priorityscore=1501 clxscore=1015 mlxscore=0 lowpriorityscore=0 spamscore=0 adultscore=0 bulkscore=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-2506290118 Content-Type: text/plain; charset="utf-8" From: Rob Clark It is standing in the way of drm_gpuvm / VM_BIND support. Not to mention frequently broken and rarely tested. And I think only needed for a 10yr old not quite upstream SoC (msm8974). Maybe we can add support back in later, but I'm doubtful. Signed-off-by: Rob Clark Signed-off-by: Rob Clark Tested-by: Antonino Maniscalco Reviewed-by: Antonino Maniscalco --- drivers/gpu/drm/msm/adreno/a2xx_gpu.c | 8 -- drivers/gpu/drm/msm/adreno/a3xx_gpu.c | 15 --- drivers/gpu/drm/msm/adreno/a4xx_gpu.c | 15 --- drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 3 +- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 3 +- drivers/gpu/drm/msm/adreno/adreno_device.c | 4 - drivers/gpu/drm/msm/adreno/adreno_gpu.c | 4 +- drivers/gpu/drm/msm/adreno/adreno_gpu.h | 1 - drivers/gpu/drm/msm/msm_drv.c | 117 +----------------- drivers/gpu/drm/msm/msm_drv.h | 11 -- drivers/gpu/drm/msm/msm_gem.c | 131 ++------------------- drivers/gpu/drm/msm/msm_gem.h | 5 - drivers/gpu/drm/msm/msm_gem_submit.c | 5 - drivers/gpu/drm/msm/msm_gpu.c | 6 +- 14 files changed, 19 insertions(+), 309 deletions(-) diff --git a/drivers/gpu/drm/msm/adreno/a2xx_gpu.c b/drivers/gpu/drm/msm/ad= reno/a2xx_gpu.c index 5eb063ed0b46..095bae92e3e8 100644 --- a/drivers/gpu/drm/msm/adreno/a2xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a2xx_gpu.c @@ -551,14 +551,6 @@ struct msm_gpu *a2xx_gpu_init(struct drm_device *dev) else adreno_gpu->registers =3D a220_registers; =20 - if (!gpu->vm) { - dev_err(dev->dev, "No memory protection without MMU\n"); - if (!allow_vram_carveout) { - ret =3D -ENXIO; - goto fail; - } - } - return gpu; =20 fail: diff --git a/drivers/gpu/drm/msm/adreno/a3xx_gpu.c b/drivers/gpu/drm/msm/ad= reno/a3xx_gpu.c index 434e6ededf83..a956cd79195e 100644 --- a/drivers/gpu/drm/msm/adreno/a3xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a3xx_gpu.c @@ -581,21 +581,6 @@ struct msm_gpu *a3xx_gpu_init(struct drm_device *dev) goto fail; } =20 - if (!gpu->vm) { - /* TODO we think it is possible to configure the GPU to - * restrict access to VRAM carveout. But the required - * registers are unknown. For now just bail out and - * limp along with just modesetting. If it turns out - * to not be possible to restrict access, then we must - * implement a cmdstream validator. - */ - DRM_DEV_ERROR(dev->dev, "No memory protection without IOMMU\n"); - if (!allow_vram_carveout) { - ret =3D -ENXIO; - goto fail; - } - } - icc_path =3D devm_of_icc_get(&pdev->dev, "gfx-mem"); if (IS_ERR(icc_path)) { ret =3D PTR_ERR(icc_path); diff --git a/drivers/gpu/drm/msm/adreno/a4xx_gpu.c b/drivers/gpu/drm/msm/ad= reno/a4xx_gpu.c index 2c75debcfd84..83f6329accba 100644 --- a/drivers/gpu/drm/msm/adreno/a4xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a4xx_gpu.c @@ -695,21 +695,6 @@ struct msm_gpu *a4xx_gpu_init(struct drm_device *dev) =20 adreno_gpu->uche_trap_base =3D 0xffff0000ffff0000ull; =20 - if (!gpu->vm) { - /* TODO we think it is possible to configure the GPU to - * restrict access to VRAM carveout. But the required - * registers are unknown. For now just bail out and - * limp along with just modesetting. If it turns out - * to not be possible to restrict access, then we must - * implement a cmdstream validator. - */ - DRM_DEV_ERROR(dev->dev, "No memory protection without IOMMU\n"); - if (!allow_vram_carveout) { - ret =3D -ENXIO; - goto fail; - } - } - icc_path =3D devm_of_icc_get(&pdev->dev, "gfx-mem"); if (IS_ERR(icc_path)) { ret =3D PTR_ERR(icc_path); diff --git a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c b/drivers/gpu/drm/msm/ad= reno/a5xx_gpu.c index dc31bc0afca4..04138a06724b 100644 --- a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c @@ -1786,8 +1786,7 @@ struct msm_gpu *a5xx_gpu_init(struct drm_device *dev) return ERR_PTR(ret); } =20 - if (gpu->vm) - msm_mmu_set_fault_handler(gpu->vm->mmu, gpu, a5xx_fault_handler); + msm_mmu_set_fault_handler(gpu->vm->mmu, gpu, a5xx_fault_handler); =20 /* Set up the preemption specific bits and pieces for each ringbuffer */ a5xx_preempt_init(gpu); diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c b/drivers/gpu/drm/msm/ad= reno/a6xx_gpu.c index 5078152eb8d3..7b3be2b46cc4 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c @@ -2560,8 +2560,7 @@ struct msm_gpu *a6xx_gpu_init(struct drm_device *dev) =20 adreno_gpu->uche_trap_base =3D 0x1fffffffff000ull; =20 - if (gpu->vm) - msm_mmu_set_fault_handler(gpu->vm->mmu, gpu, a6xx_fault_handler); + msm_mmu_set_fault_handler(gpu->vm->mmu, gpu, a6xx_fault_handler); =20 a6xx_calc_ubwc_config(adreno_gpu); /* Set up the preemption specific bits and pieces for each ringbuffer */ diff --git a/drivers/gpu/drm/msm/adreno/adreno_device.c b/drivers/gpu/drm/m= sm/adreno/adreno_device.c index 16e7ac444efd..27dbbb302081 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_device.c +++ b/drivers/gpu/drm/msm/adreno/adreno_device.c @@ -16,10 +16,6 @@ bool snapshot_debugbus =3D false; MODULE_PARM_DESC(snapshot_debugbus, "Include debugbus sections in GPU devc= oredump (if not fused off)"); module_param_named(snapshot_debugbus, snapshot_debugbus, bool, 0600); =20 -bool allow_vram_carveout =3D false; -MODULE_PARM_DESC(allow_vram_carveout, "Allow using VRAM Carveout, in place= of IOMMU"); -module_param_named(allow_vram_carveout, allow_vram_carveout, bool, 0600); - int enable_preemption =3D -1; MODULE_PARM_DESC(enable_preemption, "Enable preemption (A7xx only) (1=3Don= , 0=3Ddisable, -1=3Dauto (default))"); module_param(enable_preemption, int, 0600); diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/= adreno/adreno_gpu.c index be723fe4de2b..0f71c39696a5 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c @@ -209,7 +209,9 @@ adreno_iommu_create_vm(struct msm_gpu *gpu, u64 start, size; =20 mmu =3D msm_iommu_gpu_new(&pdev->dev, gpu, quirks); - if (IS_ERR_OR_NULL(mmu)) + if (!mmu) + return ERR_PTR(-ENODEV); + else if (IS_ERR_OR_NULL(mmu)) return ERR_CAST(mmu); =20 geometry =3D msm_iommu_get_geometry(mmu); diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.h b/drivers/gpu/drm/msm/= adreno/adreno_gpu.h index 4fa4b11442ba..b1761f990aa1 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.h +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.h @@ -18,7 +18,6 @@ #include "adreno_pm4.xml.h" =20 extern bool snapshot_debugbus; -extern bool allow_vram_carveout; =20 enum { ADRENO_FW_PM4 =3D 0, diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c index 49c868e33d70..c314fd470d69 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -46,12 +46,6 @@ #define MSM_VERSION_MINOR 12 #define MSM_VERSION_PATCHLEVEL 0 =20 -static void msm_deinit_vram(struct drm_device *ddev); - -static char *vram =3D "16m"; -MODULE_PARM_DESC(vram, "Configure VRAM size (for devices without IOMMU/GPU= MMU)"); -module_param(vram, charp, 0); - bool dumpstate; MODULE_PARM_DESC(dumpstate, "Dump KMS state on errors"); module_param(dumpstate, bool, 0600); @@ -97,8 +91,6 @@ static int msm_drm_uninit(struct device *dev) if (priv->kms) msm_drm_kms_uninit(dev); =20 - msm_deinit_vram(ddev); - component_unbind_all(dev, ddev); =20 ddev->dev_private =3D NULL; @@ -109,107 +101,6 @@ static int msm_drm_uninit(struct device *dev) return 0; } =20 -bool msm_use_mmu(struct drm_device *dev) -{ - struct msm_drm_private *priv =3D dev->dev_private; - - /* - * a2xx comes with its own MMU - * On other platforms IOMMU can be declared specified either for the - * MDP/DPU device or for its parent, MDSS device. - */ - return priv->is_a2xx || - device_iommu_mapped(dev->dev) || - device_iommu_mapped(dev->dev->parent); -} - -static int msm_init_vram(struct drm_device *dev) -{ - struct msm_drm_private *priv =3D dev->dev_private; - struct device_node *node; - unsigned long size =3D 0; - int ret =3D 0; - - /* In the device-tree world, we could have a 'memory-region' - * phandle, which gives us a link to our "vram". Allocating - * is all nicely abstracted behind the dma api, but we need - * to know the entire size to allocate it all in one go. There - * are two cases: - * 1) device with no IOMMU, in which case we need exclusive - * access to a VRAM carveout big enough for all gpu - * buffers - * 2) device with IOMMU, but where the bootloader puts up - * a splash screen. In this case, the VRAM carveout - * need only be large enough for fbdev fb. But we need - * exclusive access to the buffer to avoid the kernel - * using those pages for other purposes (which appears - * as corruption on screen before we have a chance to - * load and do initial modeset) - */ - - node =3D of_parse_phandle(dev->dev->of_node, "memory-region", 0); - if (node) { - struct resource r; - ret =3D of_address_to_resource(node, 0, &r); - of_node_put(node); - if (ret) - return ret; - size =3D r.end - r.start + 1; - DRM_INFO("using VRAM carveout: %lx@%pa\n", size, &r.start); - - /* if we have no IOMMU, then we need to use carveout allocator. - * Grab the entire DMA chunk carved out in early startup in - * mach-msm: - */ - } else if (!msm_use_mmu(dev)) { - DRM_INFO("using %s VRAM carveout\n", vram); - size =3D memparse(vram, NULL); - } - - if (size) { - unsigned long attrs =3D 0; - void *p; - - priv->vram.size =3D size; - - drm_mm_init(&priv->vram.mm, 0, (size >> PAGE_SHIFT) - 1); - spin_lock_init(&priv->vram.lock); - - attrs |=3D DMA_ATTR_NO_KERNEL_MAPPING; - attrs |=3D DMA_ATTR_WRITE_COMBINE; - - /* note that for no-kernel-mapping, the vaddr returned - * is bogus, but non-null if allocation succeeded: - */ - p =3D dma_alloc_attrs(dev->dev, size, - &priv->vram.paddr, GFP_KERNEL, attrs); - if (!p) { - DRM_DEV_ERROR(dev->dev, "failed to allocate VRAM\n"); - priv->vram.paddr =3D 0; - return -ENOMEM; - } - - DRM_DEV_INFO(dev->dev, "VRAM: %08x->%08x\n", - (uint32_t)priv->vram.paddr, - (uint32_t)(priv->vram.paddr + size)); - } - - return ret; -} - -static void msm_deinit_vram(struct drm_device *ddev) -{ - struct msm_drm_private *priv =3D ddev->dev_private; - unsigned long attrs =3D DMA_ATTR_NO_KERNEL_MAPPING; - - if (!priv->vram.paddr) - return; - - drm_mm_takedown(&priv->vram.mm); - dma_free_attrs(ddev->dev, priv->vram.size, NULL, priv->vram.paddr, - attrs); -} - static int msm_drm_init(struct device *dev, const struct drm_driver *drv) { struct msm_drm_private *priv =3D dev_get_drvdata(dev); @@ -260,16 +151,12 @@ static int msm_drm_init(struct device *dev, const str= uct drm_driver *drv) goto err_destroy_wq; } =20 - ret =3D msm_init_vram(ddev); - if (ret) - goto err_destroy_wq; - dma_set_max_seg_size(dev, UINT_MAX); =20 /* Bind all our sub-components: */ ret =3D component_bind_all(dev, ddev); if (ret) - goto err_deinit_vram; + goto err_destroy_wq; =20 ret =3D msm_gem_shrinker_init(ddev); if (ret) @@ -306,8 +193,6 @@ static int msm_drm_init(struct device *dev, const struc= t drm_driver *drv) =20 return ret; =20 -err_deinit_vram: - msm_deinit_vram(ddev); err_destroy_wq: destroy_workqueue(priv->wq); err_put_dev: diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h index 8aa3412c6e36..761e7e221ad9 100644 --- a/drivers/gpu/drm/msm/msm_drv.h +++ b/drivers/gpu/drm/msm/msm_drv.h @@ -183,17 +183,6 @@ struct msm_drm_private { =20 struct msm_drm_thread event_thread[MAX_CRTCS]; =20 - /* VRAM carveout, used when no IOMMU: */ - struct { - unsigned long size; - dma_addr_t paddr; - /* NOTE: mm managed at the page level, size is in # of pages - * and position mm_node->start is in # of pages: - */ - struct drm_mm mm; - spinlock_t lock; /* Protects drm_mm node allocation/removal */ - } vram; - struct notifier_block vmap_notifier; struct shrinker *shrinker; =20 diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c index 5e6c88b85fd3..b83790cc08df 100644 --- a/drivers/gpu/drm/msm/msm_gem.c +++ b/drivers/gpu/drm/msm/msm_gem.c @@ -17,24 +17,8 @@ #include =20 #include "msm_drv.h" -#include "msm_fence.h" #include "msm_gem.h" #include "msm_gpu.h" -#include "msm_mmu.h" - -static dma_addr_t physaddr(struct drm_gem_object *obj) -{ - struct msm_gem_object *msm_obj =3D to_msm_bo(obj); - struct msm_drm_private *priv =3D obj->dev->dev_private; - return (((dma_addr_t)msm_obj->vram_node->start) << PAGE_SHIFT) + - priv->vram.paddr; -} - -static bool use_pages(struct drm_gem_object *obj) -{ - struct msm_gem_object *msm_obj =3D to_msm_bo(obj); - return !msm_obj->vram_node; -} =20 static void update_device_mem(struct msm_drm_private *priv, ssize_t size) { @@ -135,36 +119,6 @@ static void update_lru(struct drm_gem_object *obj) mutex_unlock(&priv->lru.lock); } =20 -/* allocate pages from VRAM carveout, used when no IOMMU: */ -static struct page **get_pages_vram(struct drm_gem_object *obj, int npages) -{ - struct msm_gem_object *msm_obj =3D to_msm_bo(obj); - struct msm_drm_private *priv =3D obj->dev->dev_private; - dma_addr_t paddr; - struct page **p; - int ret, i; - - p =3D kvmalloc_array(npages, sizeof(struct page *), GFP_KERNEL); - if (!p) - return ERR_PTR(-ENOMEM); - - spin_lock(&priv->vram.lock); - ret =3D drm_mm_insert_node(&priv->vram.mm, msm_obj->vram_node, npages); - spin_unlock(&priv->vram.lock); - if (ret) { - kvfree(p); - return ERR_PTR(ret); - } - - paddr =3D physaddr(obj); - for (i =3D 0; i < npages; i++) { - p[i] =3D pfn_to_page(__phys_to_pfn(paddr)); - paddr +=3D PAGE_SIZE; - } - - return p; -} - static struct page **get_pages(struct drm_gem_object *obj) { struct msm_gem_object *msm_obj =3D to_msm_bo(obj); @@ -176,10 +130,7 @@ static struct page **get_pages(struct drm_gem_object *= obj) struct page **p; int npages =3D obj->size >> PAGE_SHIFT; =20 - if (use_pages(obj)) - p =3D drm_gem_get_pages(obj); - else - p =3D get_pages_vram(obj, npages); + p =3D drm_gem_get_pages(obj); =20 if (IS_ERR(p)) { DRM_DEV_ERROR(dev->dev, "could not get pages: %ld\n", @@ -212,18 +163,6 @@ static struct page **get_pages(struct drm_gem_object *= obj) return msm_obj->pages; } =20 -static void put_pages_vram(struct drm_gem_object *obj) -{ - struct msm_gem_object *msm_obj =3D to_msm_bo(obj); - struct msm_drm_private *priv =3D obj->dev->dev_private; - - spin_lock(&priv->vram.lock); - drm_mm_remove_node(msm_obj->vram_node); - spin_unlock(&priv->vram.lock); - - kvfree(msm_obj->pages); -} - static void put_pages(struct drm_gem_object *obj) { struct msm_gem_object *msm_obj =3D to_msm_bo(obj); @@ -244,10 +183,7 @@ static void put_pages(struct drm_gem_object *obj) =20 update_device_mem(obj->dev->dev_private, -obj->size); =20 - if (use_pages(obj)) - drm_gem_put_pages(obj, msm_obj->pages, true, false); - else - put_pages_vram(obj); + drm_gem_put_pages(obj, msm_obj->pages, true, false); =20 msm_obj->pages =3D NULL; update_lru(obj); @@ -1207,19 +1143,10 @@ struct drm_gem_object *msm_gem_new(struct drm_devic= e *dev, uint32_t size, uint32 struct msm_drm_private *priv =3D dev->dev_private; struct msm_gem_object *msm_obj; struct drm_gem_object *obj =3D NULL; - bool use_vram =3D false; int ret; =20 size =3D PAGE_ALIGN(size); =20 - if (!msm_use_mmu(dev)) - use_vram =3D true; - else if ((flags & (MSM_BO_STOLEN | MSM_BO_SCANOUT)) && priv->vram.size) - use_vram =3D true; - - if (GEM_WARN_ON(use_vram && !priv->vram.size)) - return ERR_PTR(-EINVAL); - /* Disallow zero sized objects as they make the underlying * infrastructure grumpy */ @@ -1232,44 +1159,16 @@ struct drm_gem_object *msm_gem_new(struct drm_devic= e *dev, uint32_t size, uint32 =20 msm_obj =3D to_msm_bo(obj); =20 - if (use_vram) { - struct msm_gem_vma *vma; - struct page **pages; - - drm_gem_private_object_init(dev, obj, size); - - msm_gem_lock(obj); - - vma =3D add_vma(obj, NULL); - msm_gem_unlock(obj); - if (IS_ERR(vma)) { - ret =3D PTR_ERR(vma); - goto fail; - } - - to_msm_bo(obj)->vram_node =3D &vma->node; - - msm_gem_lock(obj); - pages =3D get_pages(obj); - msm_gem_unlock(obj); - if (IS_ERR(pages)) { - ret =3D PTR_ERR(pages); - goto fail; - } - - vma->iova =3D physaddr(obj); - } else { - ret =3D drm_gem_object_init(dev, obj, size); - if (ret) - goto fail; - /* - * Our buffers are kept pinned, so allocating them from the - * MOVABLE zone is a really bad idea, and conflicts with CMA. - * See comments above new_inode() why this is required _and_ - * expected if you're going to pin these pages. - */ - mapping_set_gfp_mask(obj->filp->f_mapping, GFP_HIGHUSER); - } + ret =3D drm_gem_object_init(dev, obj, size); + if (ret) + goto fail; + /* + * Our buffers are kept pinned, so allocating them from the + * MOVABLE zone is a really bad idea, and conflicts with CMA. + * See comments above new_inode() why this is required _and_ + * expected if you're going to pin these pages. + */ + mapping_set_gfp_mask(obj->filp->f_mapping, GFP_HIGHUSER); =20 drm_gem_lru_move_tail(&priv->lru.unbacked, obj); =20 @@ -1297,12 +1196,6 @@ struct drm_gem_object *msm_gem_import(struct drm_dev= ice *dev, uint32_t size; int ret, npages; =20 - /* if we don't have IOMMU, don't bother pretending we can import: */ - if (!msm_use_mmu(dev)) { - DRM_DEV_ERROR(dev->dev, "cannot import without IOMMU\n"); - return ERR_PTR(-EINVAL); - } - size =3D PAGE_ALIGN(dmabuf->size); =20 ret =3D msm_gem_new_impl(dev, size, MSM_BO_WC, &obj); diff --git a/drivers/gpu/drm/msm/msm_gem.h b/drivers/gpu/drm/msm/msm_gem.h index 64ea3ed213c1..e47e187ecd00 100644 --- a/drivers/gpu/drm/msm/msm_gem.h +++ b/drivers/gpu/drm/msm/msm_gem.h @@ -102,11 +102,6 @@ struct msm_gem_object { =20 struct list_head vmas; /* list of msm_gem_vma */ =20 - /* For physically contiguous buffers. Used when we don't have - * an IOMMU. Also used for stolen/splashscreen buffer. - */ - struct drm_mm_node *vram_node; - char name[32]; /* Identifier to print for the debugfs files */ =20 /* userspace metadata backchannel */ diff --git a/drivers/gpu/drm/msm/msm_gem_submit.c b/drivers/gpu/drm/msm/msm= _gem_submit.c index a59816b6b6de..c184b1a1f522 100644 --- a/drivers/gpu/drm/msm/msm_gem_submit.c +++ b/drivers/gpu/drm/msm/msm_gem_submit.c @@ -669,11 +669,6 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void = *data, if (args->pad) return -EINVAL; =20 - if (unlikely(!ctx->vm) && !capable(CAP_SYS_RAWIO)) { - DRM_ERROR_RATELIMITED("IOMMU support or CAP_SYS_RAWIO required!\n"); - return -EPERM; - } - /* for now, we just have 3d pipe.. eventually this would need to * be more clever to dispatch to appropriate gpu module: */ diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c index 3400a6ca8fd8..47268aae7d54 100644 --- a/drivers/gpu/drm/msm/msm_gpu.c +++ b/drivers/gpu/drm/msm/msm_gpu.c @@ -942,12 +942,8 @@ int msm_gpu_init(struct drm_device *drm, struct platfo= rm_device *pdev, =20 msm_devfreq_init(gpu); =20 - gpu->vm =3D gpu->funcs->create_vm(gpu, pdev); - - if (gpu->vm =3D=3D NULL) - DRM_DEV_INFO(drm->dev, "%s: no IOMMU, fallback to VRAM carveout!\n", nam= e); - else if (IS_ERR(gpu->vm)) { + if (IS_ERR(gpu->vm)) { ret =3D PTR_ERR(gpu->vm); goto fail; } --=20 2.50.0 From nobody Wed Oct 8 10:58:50 2025 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 DE40F22540A for ; Sun, 29 Jun 2025 14:07:24 +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=1751206047; cv=none; b=K3J/Ncsvus1WbcT4/KDA4VXvTAEvNfe3dSvzH9zhmpgd0j7+2RQRqgpj92ejGrv+YxR5RLZdPfW6B4zzN+6tnNfw1zq5Jj6vVUMgmM/f7b5Ipq9OUyOOUswmASotla68ZEj1btf3abzNyPUfQXEvBdvnyyLiTh4SwGdKabamjGk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751206047; c=relaxed/simple; bh=Gm6UhJ7UKI9DiYCOXoBXcpqw8slOxn54iQtmUjp8vaI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PEzAmux62fwduwNozT4K9FzJ/Xlim9/rAMqpEOowee2wAbB/JOYnL6WqzuAbFywgu7nQc18K4WCqVAE0z0hf3C08oOViAkbZBl+YLflIesHENaL2HcILPhMZ2sDmNtBZHz3GiXMLEwdH4B+p7NDOY47eDKV58t9H/dp6MPG6ZPw= 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=IYJ5D3su; 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="IYJ5D3su" Received: from pps.filterd (m0279863.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 55TDTgi7007811 for ; Sun, 29 Jun 2025 14:07:24 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=sVxQxqcInWG kGdZkfQeRJ3wtUjNtIfv/ihKTiUvsmA8=; b=IYJ5D3suc16HbIFda1q/42LjJ9/ nRxIYwMK489S0+PWp2k66r1P7SCrITojE6k4gPRhDmHLr7IzTrtPI6TxbtIPaRpa eO5iH6jwNuhSgIHNChOOcpRIhOlHlKwP+mAuwycPfyHNQM1AaeJNAA/cv5xNyNYQ YV/LioaElYtpIy31HOp6WYumtRapq4GfMMW5bWa0h22J5iVN6iJD47zL+82Wflpm McgsH+tkuwbXS8F3kR/Iim+NnNEfirg74F+XjekluNGuiDCMv2Pw0zNlFAVKSK4Q cfmkhkczRIHIxbodyXiZBDVeKzOVMw13BcbHFae8awk9ZYZj6OWIlrwNTnQ== Received: from mail-pl1-f200.google.com (mail-pl1-f200.google.com [209.85.214.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 47j8m627bp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Sun, 29 Jun 2025 14:07:24 +0000 (GMT) Received: by mail-pl1-f200.google.com with SMTP id d9443c01a7336-23536f7c2d7so19740045ad.2 for ; Sun, 29 Jun 2025 07:07:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751206043; x=1751810843; 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=sVxQxqcInWGkGdZkfQeRJ3wtUjNtIfv/ihKTiUvsmA8=; b=RKyKGRe04UBTHDfLmcLuJSgPjAxqxraqlCHnPbWcH9YAqlxPjHlT0vLI9Ix7Po4Itd AU/ZmhbwdIo/f5sLRCG8snJql3NFrnuLExgpAJngbc78PZyrhmECJ0q7AUCq8+7sy/38 7ocwJ8zBY5TMgjDImENz1RrEFEppxubF0ltzwvdSXJImtq3ZEY/jqIXKzGt5hPrr1I1M XUtYDDfu0QfydBgvKIj8vCBn62ypkzJS9eq+W1ihxVDk9s+4D3ebzQDBEJ63HnFnkh2f 4YNz7smmrB6rfrZ4DTb1G7QOEhK7ggyGTuntAp1MMEKd48u1leXTp29jwM80mXT2Jw1V X98A== X-Forwarded-Encrypted: i=1; AJvYcCVYYaux/60PC7lCl1eSRDArsR2x/YF7CFrsQL74rlmXcMa/Vonu6iajAg26lRZosWUr7U4xeAD30fIwBAg=@vger.kernel.org X-Gm-Message-State: AOJu0Yw0kZt6fZsuWQ+UvPChLaelRcFhQisPTx0v8ndscRoVDIZ4QEwE lNGQHG2/TmewupndLEyGCa2S7McosNqFDGXWKPKO/7xFZGNzir9SaVbLqHVGoLLyw5044CS96uH ctpv9q0SNbccyDklYh7fsJXBk+adQ0T7VKxDbsNuNjLAOP1PROwb0QehRxVu61K+6qHs= X-Gm-Gg: ASbGnctcNkL5uxDYS5zqMG3KAjZQjDkaWMZhx48asoYCSb6qcVgo+A9VxT6HKFEgwiK SenlLq9ChxAu62O5o40XQkkxq0Spdnzun9NuRjI4cf2MZjIg57GWj41O1IZIy7QcJTBYb5WSkIi MDu1NBCFnn9TsCrOBLu4nWA3o8YvOWvujTZFkpvGKMjbc+cpEX+DGhA+XsEPYcUfgSsOJBobH13 LtNu9R0TH9uHccrJEeUDyAUh/eExEAyZYe227cjEQYetk7m3gX5ZwU8JneH3c5GOUbFOQzAHwRL jvCzPmxCdD3/aGkSqtuT7QtBfrAWn7X1 X-Received: by 2002:a17:902:ec89:b0:234:be9b:539a with SMTP id d9443c01a7336-23ac4669445mr164026105ad.40.1751206043218; Sun, 29 Jun 2025 07:07:23 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGjlNaS4GuuR0AQMQjI+3+VSvt4lcAZtZqKTQqSco/bWPE6Q8TkSQrt0HwBQMPhpYXjAE5Ueg== X-Received: by 2002:a17:902:ec89:b0:234:be9b:539a with SMTP id d9443c01a7336-23ac4669445mr164025665ad.40.1751206042803; Sun, 29 Jun 2025 07:07:22 -0700 (PDT) Received: from localhost ([2601:1c0:5000:d5c:5b3e:de60:4fda:e7b1]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-315edcfd75dsm3079464a91.1.2025.06.29.07.07.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Jun 2025 07:07:22 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, Connor Abbott , Antonino Maniscalco , Danilo Krummrich , Rob Clark , Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v8 08/42] drm/msm: Collapse vma allocation and initialization Date: Sun, 29 Jun 2025 07:03:11 -0700 Message-ID: <20250629140537.30850-9-robin.clark@oss.qualcomm.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250629140537.30850-1-robin.clark@oss.qualcomm.com> References: <20250629140537.30850-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: AW1haW4tMjUwNjI5MDExOSBTYWx0ZWRfXzPW9/dYR54lu zHNZx8X4wlLtWtnbJQSDJmJEElscUIYwSIiflVbF5SasNrXtjLsgI7bbzw4NbEEIKZn4ABy5rLZ 6a2qDrw59LVd1JvKJiKRgzB/x+vxOr4r6+gGgoG6AmSMnpWCUp2e6ZTmt8iNCwPxlcTRDGO6h6v N//MHD8lF+p1as/McqY+KM6yWwB3o479G7lFfCv762btL9gHc/KvA/I+5OjJCVpXsPIMXgnr0KX 0UeSglxAkgC2tnSnaJsmQRFxhYmMbl8VjHgidor15MOXxHIjRQ+xXO9gGmgLDjVsKJzW/osUpRW iIGl05Tvi4Y/+bHnryCNR74QmjYjIP2LJuro12DBxgQ9wcKpvlCHbw1oY1JJSG1u5UBmSu1h9h5 /TuRsqRZM1zmC5y2Q+g/Jo4BWeFtchfIn7vRLKrzW03w/tvX8f8BKzlh8f4y3zFa1RFT20mk X-Authority-Analysis: v=2.4 cv=Fq0F/3rq c=1 sm=1 tr=0 ts=6861489c cx=c_pps a=IZJwPbhc+fLeJZngyXXI0A==:117 a=xqWC_Br6kY4A:10 a=6IFa9wvqVegA:10 a=cm27Pg_UAAAA:8 a=EUspDBNiAAAA:8 a=pGLkceISAAAA:8 a=amM6-9Z1s-9IjK5NNPIA:9 a=uG9DUKGECoFWVXl0Dc02:22 X-Proofpoint-GUID: qYQREj9cEcBqa8n9zU7Ig534bRpOizEH X-Proofpoint-ORIG-GUID: qYQREj9cEcBqa8n9zU7Ig534bRpOizEH 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-27_05,2025-06-27_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 mlxscore=0 suspectscore=0 adultscore=0 clxscore=1015 mlxlogscore=999 impostorscore=0 bulkscore=0 malwarescore=0 spamscore=0 priorityscore=1501 lowpriorityscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2506290119 Content-Type: text/plain; charset="utf-8" From: Rob Clark Now that we've dropped vram carveout support, we can collapse vma allocation and initialization. This better matches how things work with drm_gpuvm. Signed-off-by: Rob Clark Signed-off-by: Rob Clark Tested-by: Antonino Maniscalco Reviewed-by: Antonino Maniscalco --- drivers/gpu/drm/msm/msm_gem.c | 30 +++----------------------- drivers/gpu/drm/msm/msm_gem.h | 4 ++-- drivers/gpu/drm/msm/msm_gem_vma.c | 36 +++++++++++++------------------ 3 files changed, 20 insertions(+), 50 deletions(-) diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c index b83790cc08df..9fa830209b1e 100644 --- a/drivers/gpu/drm/msm/msm_gem.c +++ b/drivers/gpu/drm/msm/msm_gem.c @@ -333,23 +333,6 @@ uint64_t msm_gem_mmap_offset(struct drm_gem_object *ob= j) return offset; } =20 -static struct msm_gem_vma *add_vma(struct drm_gem_object *obj, - struct msm_gem_vm *vm) -{ - struct msm_gem_object *msm_obj =3D to_msm_bo(obj); - struct msm_gem_vma *vma; - - msm_gem_assert_locked(obj); - - vma =3D msm_gem_vma_new(vm); - if (!vma) - return ERR_PTR(-ENOMEM); - - list_add_tail(&vma->list, &msm_obj->vmas); - - return vma; -} - static struct msm_gem_vma *lookup_vma(struct drm_gem_object *obj, struct msm_gem_vm *vm) { @@ -416,6 +399,7 @@ static struct msm_gem_vma *get_vma_locked(struct drm_ge= m_object *obj, struct msm_gem_vm *vm, u64 range_start, u64 range_end) { + struct msm_gem_object *msm_obj =3D to_msm_bo(obj); struct msm_gem_vma *vma; =20 msm_gem_assert_locked(obj); @@ -423,18 +407,10 @@ static struct msm_gem_vma *get_vma_locked(struct drm_= gem_object *obj, vma =3D lookup_vma(obj, vm); =20 if (!vma) { - int ret; - - vma =3D add_vma(obj, vm); + vma =3D msm_gem_vma_new(vm, obj, range_start, range_end); if (IS_ERR(vma)) return vma; - - ret =3D msm_gem_vma_init(vma, obj->size, - range_start, range_end); - if (ret) { - del_vma(vma); - return ERR_PTR(ret); - } + list_add_tail(&vma->list, &msm_obj->vmas); } else { GEM_WARN_ON(vma->iova < range_start); GEM_WARN_ON((vma->iova + obj->size) > range_end); diff --git a/drivers/gpu/drm/msm/msm_gem.h b/drivers/gpu/drm/msm/msm_gem.h index e47e187ecd00..cf1e86252219 100644 --- a/drivers/gpu/drm/msm/msm_gem.h +++ b/drivers/gpu/drm/msm/msm_gem.h @@ -66,8 +66,8 @@ struct msm_gem_vma { bool mapped; }; =20 -struct msm_gem_vma *msm_gem_vma_new(struct msm_gem_vm *vm); -int msm_gem_vma_init(struct msm_gem_vma *vma, int size, +struct msm_gem_vma * +msm_gem_vma_new(struct msm_gem_vm *vm, struct drm_gem_object *obj, u64 range_start, u64 range_end); void msm_gem_vma_purge(struct msm_gem_vma *vma); int msm_gem_vma_map(struct msm_gem_vma *vma, int prot, struct sg_table *sg= t, int size); diff --git a/drivers/gpu/drm/msm/msm_gem_vma.c b/drivers/gpu/drm/msm/msm_ge= m_vma.c index 9419692f0cc8..6d18364f321c 100644 --- a/drivers/gpu/drm/msm/msm_gem_vma.c +++ b/drivers/gpu/drm/msm/msm_gem_vma.c @@ -106,47 +106,41 @@ void msm_gem_vma_close(struct msm_gem_vma *vma) msm_gem_vm_put(vm); } =20 -struct msm_gem_vma *msm_gem_vma_new(struct msm_gem_vm *vm) +/* Create a new vma and allocate an iova for it */ +struct msm_gem_vma * +msm_gem_vma_new(struct msm_gem_vm *vm, struct drm_gem_object *obj, + u64 range_start, u64 range_end) { struct msm_gem_vma *vma; + int ret; =20 vma =3D kzalloc(sizeof(*vma), GFP_KERNEL); if (!vma) - return NULL; + return ERR_PTR(-ENOMEM); =20 vma->vm =3D vm; =20 - return vma; -} - -/* Initialize a new vma and allocate an iova for it */ -int msm_gem_vma_init(struct msm_gem_vma *vma, int size, - u64 range_start, u64 range_end) -{ - struct msm_gem_vm *vm =3D vma->vm; - int ret; - - if (GEM_WARN_ON(!vm)) - return -EINVAL; - - if (GEM_WARN_ON(vma->iova)) - return -EBUSY; - spin_lock(&vm->lock); ret =3D drm_mm_insert_node_in_range(&vm->mm, &vma->node, - size, PAGE_SIZE, 0, + obj->size, PAGE_SIZE, 0, range_start, range_end, 0); spin_unlock(&vm->lock); =20 if (ret) - return ret; + goto err_free_vma; =20 vma->iova =3D vma->node.start; vma->mapped =3D false; =20 + INIT_LIST_HEAD(&vma->list); + kref_get(&vm->kref); =20 - return 0; + return vma; + +err_free_vma: + kfree(vma); + return ERR_PTR(ret); } =20 struct msm_gem_vm * --=20 2.50.0 From nobody Wed Oct 8 10:58:50 2025 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 20E59225414 for ; Sun, 29 Jun 2025 14:07:25 +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=1751206047; cv=none; b=CMiCQks3bo5XkwyxMTMznGgAO71dRGnjFh96yFRcTdFgniG15tFKd0b1+lecuSXMOoHltDeOoH9OFfObAB1aQjp1zeF5wkiziv5l5+7BmMvfV5/DXEAC14lYCBFYjklANESrukorKW4pYyQvIMpewhxPAjW+/eB5FHb4I4SSWGM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751206047; c=relaxed/simple; bh=au593a8+7mGZ4QlvT4X7cpF6yg7CCF/F42yjIFbyfCA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jcVQfUfY8IWuIAuE7jTwDAQ68ZaldJgiPLL6bR9rE0uHLZ9IYhXIfjVyl+DAhgrQZOLETkO8wNUBLhkO9vlunduGBJfGzljIBPMFKCgGG+1mHO4U2bqRSXJgoGGF2NSnjOthM+7uE1gMbyWSCWxq9LFVLHx5+sr+x2cCfNT2J7Q= 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=MOZOc4dD; 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="MOZOc4dD" Received: from pps.filterd (m0279862.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 55TAVm8F030350 for ; Sun, 29 Jun 2025 14:07:25 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=eRArZHg5kja 6OQg/YP1uRgtCqLo62Lhjfwd+5rkVLKM=; b=MOZOc4dDi1ck9L+QRSsR4vZJwBN 66eV4YkdpLb9pYkCICHe++0gI4JQ3qi17ivoNbzlGqQmEq0KZtVhP/qPSAI230+N g7I9mBAWanm13+hoPbJcgMEQ/7YbZQNoTbQ8OXftnNproAOLI2vBTNGhX0tEpAWm WWdQ7ojNKt7IqYLGfxZdoalrUMTNEkKUH/ysVIOI6zA4LO5zvimkfl0smBD2vfhR cNWasV/YbqBqdohcaeJZNvsitE7Z11iw+kG/JqR2DCy1fRM8bSsgXVFZK/+TvpDG b231lke2FfeELS6npd506UWJFulJ004DvoG4D6bSLL5fFD+89CcJ8y71RaA== Received: from mail-pf1-f199.google.com (mail-pf1-f199.google.com [209.85.210.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 47j95ht65p-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Sun, 29 Jun 2025 14:07:25 +0000 (GMT) Received: by mail-pf1-f199.google.com with SMTP id d2e1a72fcca58-748e4637739so2577202b3a.1 for ; Sun, 29 Jun 2025 07:07:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751206044; x=1751810844; 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=eRArZHg5kja6OQg/YP1uRgtCqLo62Lhjfwd+5rkVLKM=; b=Wdtw+hDYBWJ5uXs8vfji8YbngAoyJcyInOOszSIgsT0YCzHgxlCqcSHRuAhlEG7krX HWA5WKTaRS08b6LJwrS2osaCBU+0QOXY4j3pFT89lDRugRi4+oTkMFav+DXKQ2EVTRJg QUqlt5+TRRjRD3gK6nBAqTq2EwdH7ARxUJ2pvKYxLnufAO+RzPRv1BAgQnuIEg0CNziE AZp5/U15jc57Cx5uxjDQFIHCK3xb8KLnljRoeZsHbqR3boOy5HsdrQ0Yais/mYgQ1h7E Ik4MUY/wIA1P5iIL9QIxTGw84WOqhwhQl9n+yyjbtMsK5hVpwSCx7oWh8E9B+/ZLjh7y OjRA== X-Forwarded-Encrypted: i=1; AJvYcCV9YzABfLDweXqekyGWInrDSCr8SJFyafWmk1w7DMmJCFqLWqVRPRZwR2cY9iBLTJ2qdQXG0fJMxRGN0mE=@vger.kernel.org X-Gm-Message-State: AOJu0Yx1tj+/bFCK2g9/gRAxRTPp3KPGBFDFMlWsyPrMO5Au/3jmr2p9 1dEnyrTvDNluPO3hErcSOBaoktzR/UiqpH+CFPQB9d8KoUL2Xc82wOZlfBhVOP0haFpMtyzFOlQ WKlulZ8TJ0TXc7n7Lm3E5n8Jmb+27d7KcIQgrAwGnipjw2gMMVMRW5WdoGZGxfHIDEmQ= X-Gm-Gg: ASbGncsC4q6t6tYtVwzh1v61P9DNXM2hfMV7xDh6n4lNLS+NzTbk/FVcDJLwiKK8ffq 1jjY7BHVMkINAd9hasFfYADZHEdLXGssTz3wLMJnsN0m+AcsOfAu0ZILiUTf/BAIUpkgSO19Rb0 mAxmM1aBciUlootxst0j46VLasWMCeUtVywJVl1a4Bc/IBgCh+BAaecEH+HMPbAJ3x7fHceVTpY xaTl0T93118thEIhx0tWrDm/OFIwFswciEVXDxK2bXeBtmPgESsRHEn58x2cN34rgEJSHgRmktv 12H4QdQLY/9hkY8wQ62E4ATJ/MLSvspI X-Received: by 2002:a05:6a00:8c8a:b0:742:aed4:3e1 with SMTP id d2e1a72fcca58-74ae3e79e9emr15110878b3a.2.1751206044392; Sun, 29 Jun 2025 07:07:24 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFzFoHhs30uufRxyXEDa8GNhAGcI0a2y/Q4jf783ZXcR3TPwpNn70ssWWhJXCFQV5WbzR2gNQ== X-Received: by 2002:a05:6a00:8c8a:b0:742:aed4:3e1 with SMTP id d2e1a72fcca58-74ae3e79e9emr15110847b3a.2.1751206043958; Sun, 29 Jun 2025 07:07:23 -0700 (PDT) Received: from localhost ([2601:1c0:5000:d5c:5b3e:de60:4fda:e7b1]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-74af541bb6csm6705036b3a.41.2025.06.29.07.07.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Jun 2025 07:07:23 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, Connor Abbott , Antonino Maniscalco , Danilo Krummrich , Rob Clark , Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v8 09/42] drm/msm: Collapse vma close and delete Date: Sun, 29 Jun 2025 07:03:12 -0700 Message-ID: <20250629140537.30850-10-robin.clark@oss.qualcomm.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250629140537.30850-1-robin.clark@oss.qualcomm.com> References: <20250629140537.30850-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: AW1haW4tMjUwNjI5MDExOSBTYWx0ZWRfXyZr44jPMIRI2 uBdSadm0yrOl5UbM7ElMAkkqG2K6GEWfnGUYHhf+tOgPZMH0PUJzOiMUhd9pubX0MEIs1DM47Kf 1QAJKRYzv8p4UTCW2NFMJGgv8F7IMd8RaM3J/5hwnWEg7ayGXyU1vs1SkMw/gBNWPH3adEKQHkl aHd6X64hV4zTDZMAaDqOp0WHscfINKyri2I81lnNE0Xxa38QNRDmbH0QiD2cpPcXUZYlwcK3lNx 4IEX9Tj2PBkEE7QnnNhdICD7KURt8Yw8P84MPMmKEbKFr4gV8vWKSPsb4GcEBijmPasm3SnH/Tz v1GIWJkCxMSNsx8iiT91nQiHiwV7YT6QHgbvdztqdM2I2pa3xFf1MJt6GgLW1/iL9J6/H0Gjpkn UY9PnUBoaz2ymo2DYeyMc2uXaCi/3ilNRtx/IADIHqv5p3egs2LfiJwwvz1H12F/DOqTMVZj X-Proofpoint-ORIG-GUID: d4GsLexDt5gL3J_16uoRNC6diixU9bQL X-Authority-Analysis: v=2.4 cv=EuHSrTcA c=1 sm=1 tr=0 ts=6861489d cx=c_pps a=WW5sKcV1LcKqjgzy2JUPuA==:117 a=xqWC_Br6kY4A:10 a=6IFa9wvqVegA:10 a=cm27Pg_UAAAA:8 a=EUspDBNiAAAA:8 a=pGLkceISAAAA:8 a=RIvuzEnNBJp2qadMtJ0A:9 a=OpyuDcXvxspvyRM73sMx:22 X-Proofpoint-GUID: d4GsLexDt5gL3J_16uoRNC6diixU9bQL 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-27_05,2025-06-27_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 mlxlogscore=999 malwarescore=0 mlxscore=0 phishscore=0 spamscore=0 adultscore=0 suspectscore=0 lowpriorityscore=0 priorityscore=1501 impostorscore=0 bulkscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2506290119 Content-Type: text/plain; charset="utf-8" From: Rob Clark This fits better drm_gpuvm/drm_gpuva. Signed-off-by: Rob Clark Signed-off-by: Rob Clark Tested-by: Antonino Maniscalco Reviewed-by: Antonino Maniscalco --- drivers/gpu/drm/msm/msm_gem.c | 16 +++------------- drivers/gpu/drm/msm/msm_gem_vma.c | 2 ++ 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c index 9fa830209b1e..7b0430628834 100644 --- a/drivers/gpu/drm/msm/msm_gem.c +++ b/drivers/gpu/drm/msm/msm_gem.c @@ -349,15 +349,6 @@ static struct msm_gem_vma *lookup_vma(struct drm_gem_o= bject *obj, return NULL; } =20 -static void del_vma(struct msm_gem_vma *vma) -{ - if (!vma) - return; - - list_del(&vma->list); - kfree(vma); -} - /* * If close is true, this also closes the VMA (releasing the allocated * iova range) in addition to removing the iommu mapping. In the eviction @@ -368,11 +359,11 @@ static void put_iova_spaces(struct drm_gem_object *obj, bool close) { struct msm_gem_object *msm_obj =3D to_msm_bo(obj); - struct msm_gem_vma *vma; + struct msm_gem_vma *vma, *tmp; =20 msm_gem_assert_locked(obj); =20 - list_for_each_entry(vma, &msm_obj->vmas, list) { + list_for_each_entry_safe(vma, tmp, &msm_obj->vmas, list) { if (vma->vm) { msm_gem_vma_purge(vma); if (close) @@ -391,7 +382,7 @@ put_iova_vmas(struct drm_gem_object *obj) msm_gem_assert_locked(obj); =20 list_for_each_entry_safe(vma, tmp, &msm_obj->vmas, list) { - del_vma(vma); + msm_gem_vma_close(vma); } } =20 @@ -556,7 +547,6 @@ static int clear_iova(struct drm_gem_object *obj, =20 msm_gem_vma_purge(vma); msm_gem_vma_close(vma); - del_vma(vma); =20 return 0; } diff --git a/drivers/gpu/drm/msm/msm_gem_vma.c b/drivers/gpu/drm/msm/msm_ge= m_vma.c index 6d18364f321c..ca29e81d79d2 100644 --- a/drivers/gpu/drm/msm/msm_gem_vma.c +++ b/drivers/gpu/drm/msm/msm_gem_vma.c @@ -102,8 +102,10 @@ void msm_gem_vma_close(struct msm_gem_vma *vma) spin_unlock(&vm->lock); =20 vma->iova =3D 0; + list_del(&vma->list); =20 msm_gem_vm_put(vm); + kfree(vma); } =20 /* Create a new vma and allocate an iova for it */ --=20 2.50.0 From nobody Wed Oct 8 10:58:50 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 0A9B822CBE6 for ; Sun, 29 Jun 2025 14:07:27 +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=1751206049; cv=none; b=iUWgRL2GXWlxgLo/qvFP0JE9xP9Vl5vYS0j4PUEgNfw2BMAuxxEN3uEO1PAshP+jMOtH/fvLajBRo43JEY6KhGt1PpMgvUho1wp5hwb6rry5zVOwTVl9sZRUtlpW5kGfJcXeO2jYl0JAbdmCA47AHbeOuGmptW56imTMiy6tvSY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751206049; c=relaxed/simple; bh=iDEV2orWmuIXKriA3mh+ffbHZMX8dfi8nDJuhBaCic0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FhBR8zgo/quOI0Sh5YDA3bQ3LF7NY2k+JP4C7B8OriFQ/O9GkQclfkx2G0hMIRudy1yMCj3TOyNei0cplzCgpsUB0TJwfcNIeV8kjRR6PAFBWnUb7mMOSAraC+eIh22l5m6/+XxNOij45ZWuQpYy+IOv+7bNJkO73k4TEvVkz4g= 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=MH7bbc1D; 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="MH7bbc1D" Received: from pps.filterd (m0279872.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 55T9ZHbf021635 for ; Sun, 29 Jun 2025 14:07:27 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=/ZGyoxYE2vw gSzvJVWN2YN0dI0s8P9cmHBqgH65Sao8=; b=MH7bbc1DFoAnrrAiKzlxAKNKmNT eQ+QgTpAXkqU+HtEK4xFOsAXH+cag2pGJoQ61dMBgwxSz7vnu75G2ZvFw2P1vtp3 e0gi7JUhhRO5MnbKPl+ftIGngduKQzriFLRWkCpRNoPT+Ty5+f2R7Fnb/zNm7QtS uR6Uj48qzdphwtx4aowL3etKe+n9tHEjQec3EVQG7uAe+t9vxn5EhMM3MCfE9Stb sonNhV/HPb9f5au9y3+d+xEh6Y14iMMZllfJQxSC2hljGQ7dcrrRB1S7JBRkFU1k cqtbboiLHTI6HU3ugLv4i46GXH5Rg02nmIltsvZgrgFS0EkSUjEma5BwLpA== Received: from mail-pf1-f198.google.com (mail-pf1-f198.google.com [209.85.210.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 47j8s9a5wn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Sun, 29 Jun 2025 14:07:26 +0000 (GMT) Received: by mail-pf1-f198.google.com with SMTP id d2e1a72fcca58-748a4f5e735so1209050b3a.3 for ; Sun, 29 Jun 2025 07:07:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751206045; x=1751810845; 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=/ZGyoxYE2vwgSzvJVWN2YN0dI0s8P9cmHBqgH65Sao8=; b=Q4IYdAqON7nIY+fXbc1vHl8tL4ECCQV9OULGkl7S/sPFRPWjv6r6mE6HUeXn9Y7bDo LjPcLPsBAxz04OG8BmPVRfXWS6wG7id0SwoefPSyI5KarkLTky1wz88nJoizeqZ5HAfF Xi1j4xr5kOqHFb7oglgYEvASUKIk6VjHZB3frISyx6qexFBL4Lee3TSEJOvNn87ALFg2 F6/r4RG1kIxC9Ff3JPgXL1nBIt6rGEvprVwPJ3TExzxtu/NZcsjl8pvSLV5vXef+VhEV YUreYeGE7XDKleXAfvxAbx7OZRZj6XTwvepMhc60UwflX75rhROXUKbxKZKF7JXQX4dp 7fVg== X-Forwarded-Encrypted: i=1; AJvYcCUL+9tmN6kxYMv55Bc5W0QHPZNIFbASJRqaJpHqDQ5e2E5ps/QFW5Spr3i3LsSc8dglvwoZpW9TvfDq62A=@vger.kernel.org X-Gm-Message-State: AOJu0YxseLrsauzvEPWZhPQGzQg16JL9377pOfj11F/gx090240iZD8+ kGLP+33isoiWuvuZjhezxwLfAzns6LzJkqaYQaWOB74rLBkRuyTIpmGu7U0JtzmfL0W/kTulLeC 4DA6bsEfdeAzrjUv3knhS0w9Kg9CBBsyQwNf38KAvGNsEPhkXbuyDzkQTEV8SMxdYtJo= X-Gm-Gg: ASbGnct/3YFK8J7LzQjxAXwAt8QCRTPS6Ed80DIs2UG7PXwcu8V0PwlcCRcbgQkOZvs DfBwJ3zhSodkKZmJKJfhc7eQFrzAnTtIpWBPBwN9zAsuQlbL55xXTHLTQpcyjvXvo/KIpianjfm dXgYClJ6d1+v31GkX+bvNDYD6B7vvBbQTc6wxsrsH6Mah8sYuz0cDOa4/f1SlOGugT/Z8tSHr/f gBx342hasdBTtiz31uH37QRk6fG+eeb5ioqIncHM1i3OnqHX2Mxs7Zev7zKPhLViOWZWr3qC8Q6 8IhS6aclEdQeAbhwxKvVgbPhwOffjXON X-Received: by 2002:a05:6a00:a8c:b0:748:e1e4:71de with SMTP id d2e1a72fcca58-74af6f75b9dmr12651634b3a.14.1751206045585; Sun, 29 Jun 2025 07:07:25 -0700 (PDT) X-Google-Smtp-Source: AGHT+IENZJtEa8Zo6YKK1VC7UhfnqyS3PG4LqHA7jxkHsRhyjRhGBPSmWMeaac3G6wvZ2uQ+OkNChw== X-Received: by 2002:a05:6a00:a8c:b0:748:e1e4:71de with SMTP id d2e1a72fcca58-74af6f75b9dmr12651605b3a.14.1751206045178; Sun, 29 Jun 2025 07:07:25 -0700 (PDT) Received: from localhost ([2601:1c0:5000:d5c:5b3e:de60:4fda:e7b1]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-74af57f1ef1sm6773669b3a.164.2025.06.29.07.07.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Jun 2025 07:07:24 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, Connor Abbott , Antonino Maniscalco , Danilo Krummrich , Rob Clark , Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v8 10/42] drm/msm: Don't close VMAs on purge Date: Sun, 29 Jun 2025 07:03:13 -0700 Message-ID: <20250629140537.30850-11-robin.clark@oss.qualcomm.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250629140537.30850-1-robin.clark@oss.qualcomm.com> References: <20250629140537.30850-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-Authority-Analysis: v=2.4 cv=H/Pbw/Yi c=1 sm=1 tr=0 ts=6861489e cx=c_pps a=m5Vt/hrsBiPMCU0y4gIsQw==:117 a=xqWC_Br6kY4A:10 a=6IFa9wvqVegA:10 a=cm27Pg_UAAAA:8 a=EUspDBNiAAAA:8 a=pGLkceISAAAA:8 a=nDn0RKeFDUDCjqZoaxcA:9 a=IoOABgeZipijB_acs4fv:22 X-Proofpoint-ORIG-GUID: 6yVDGoGTQbj8cgD__uBe-uhUxnQDZgNe X-Proofpoint-GUID: 6yVDGoGTQbj8cgD__uBe-uhUxnQDZgNe X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjI5MDExOCBTYWx0ZWRfXxHgh9dEAETCf ZX3/UCwtivHhwyLrbjiwWAOA1Fbtay0meFS0kCfFH3VhjZdg3ts1J84yFYdA8Q0dziaOC/4/lWn b5Bh/108Mx7OdjE6vuMpXnvkLs6CCBKzFK6LC9Jv9xK5mCZXTPun6acNRtLwoIGuDbaGnj+AUf8 qZ3HAeaSXp32uLoM1z+GerxljSLfioLh8UJLN1+YLC+QrHZMBr2lCftcWQYT2O7v4yHYQ/ikKQg lzKCxnp+s4IfNRAeArFXymskLah0IStamVJPL9no5Ldx0r1OHjCyhu9u6RSumnCfTKDde4ZPcP4 ci7s4Z+1maCDpX7ATlcUVjC0V/CMt+Yqqb6RZpMFNYSM/c7CmGuXxmA5Ran04rrdybdaClIfv+Y EJNOJtpfv5ZYFdcFdQ9q4QwtaExyKIShPbfLI7wagnjKzL0sjk+NkvbeBTR/CQeDuG5VQwXB 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-27_05,2025-06-27_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 malwarescore=0 suspectscore=0 mlxlogscore=999 priorityscore=1501 clxscore=1015 mlxscore=0 lowpriorityscore=0 spamscore=0 adultscore=0 bulkscore=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-2506290118 Content-Type: text/plain; charset="utf-8" From: Rob Clark Previously we'd also tear down the VMA, making the address space available again. But with drm_gpuvm conversion, this would require holding the locks of all VMs the GEM object is mapped in. Which is problematic for the shrinker. Instead just let the VMA hang around until the GEM object is freed. Signed-off-by: Rob Clark Signed-off-by: Rob Clark Tested-by: Antonino Maniscalco Reviewed-by: Antonino Maniscalco --- drivers/gpu/drm/msm/msm_gem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c index 7b0430628834..a20ae783f244 100644 --- a/drivers/gpu/drm/msm/msm_gem.c +++ b/drivers/gpu/drm/msm/msm_gem.c @@ -755,7 +755,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, true); + put_iova_spaces(obj, false); =20 msm_gem_vunmap(obj); =20 --=20 2.50.0 From nobody Wed Oct 8 10:58:50 2025 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 8DD4522256C for ; Sun, 29 Jun 2025 14:07:34 +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=1751206056; cv=none; b=kjvHHTExF5mMPKdut8s/u0Pn9B60aeWpXJlc7ewGZM4yHPmbnxBxBymycd2QqQ2WHLTExSOuWUwsXT2acxAVgFdABGx84guvmVqNZR0OzSM77mUdjTZbGaBBE3Y7c6BZXsEZHsJ+8ssA/mSqOOhZ1ZgWezamUBGq7zn//eD/N+0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751206056; c=relaxed/simple; bh=yPGRVEN5atAh6PvikGlnpquu59gk3d9csrYniAxJMwU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sF7kRenWCJb2peTIdvFY+eHWO7/7EOzQNmzAqKCMWPn8c7cpbqgd/cl+nt5vAYYGFBP7q1tDIMPgdvKulfIY4iHBcwcItWbhWq+7sxYrKtCmbgkQbxkMj8EOiXHoPAsgb78WZQzalZ+XGrWzQeDDEbaMOMQzsgPvXP+zrMqchmg= 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=MfE7YHL6; 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="MfE7YHL6" Received: from pps.filterd (m0279867.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 55TCbNge030601 for ; Sun, 29 Jun 2025 14:07:34 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=ffNCZ5XDzp7 SJXui2zRh3gHkvyLV2Hk4elpuiMMFAxg=; b=MfE7YHL6LDzHrK275gfSJfwhins r1WnnLYu7XrWPaFbV+SFdbTm5TPtoGmCjLKKpJPj37CT0c6S++A+MkkKr9Nmun27 ItusTW90LAzaNmGf5HWZG0qHwKe68nEoYYHTimeSVKXaep7oDaQowANyFkj+K5Sk kHvz7RhRb1ESU7WGH2BsVkeFwWx3bMS+HhizXJ+QwQIM+ROwoAsBp0JxZyWfvOzI GCYORBJLqlXkoZmIlh2ZXy3A6+AZz1pCVcKdSf9FLDtz8Sba7ZRcsIizut0fmuNw LFxC20+ffa2M60AN7bDMX3J2EI5JujBubBSoqLDTP/Y8rO7qna6NomUrkAQ== Received: from mail-pf1-f198.google.com (mail-pf1-f198.google.com [209.85.210.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 47j63k2e0w-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Sun, 29 Jun 2025 14:07:33 +0000 (GMT) Received: by mail-pf1-f198.google.com with SMTP id d2e1a72fcca58-7489d1f5e9fso5473175b3a.0 for ; Sun, 29 Jun 2025 07:07:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751206053; x=1751810853; 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=ffNCZ5XDzp7SJXui2zRh3gHkvyLV2Hk4elpuiMMFAxg=; b=Jrf47p6Uc0I+bDnTCvvTgKaYarGjWhgiJfNbl8dMWc1zv7AD7uNFcrkqqi5jKIZ5Vp ZNOiYzbyyYtSMWOuQzGCGviYOiJUvuBq/qMESaWkEv3+wgCU7Zpi4XUGy2L4ZJCo/3GH fmGclAmnfQMV/vc0lM99KSaFit7SHb6EDZFomj218bvLUelwnmTeiv89qHBruQkOksg/ yYVuZ78NQTp2VSxX/SwOvRSbOifvu2Hx6eJvZmrbceVCPtGC95Mi7g+kPYpIWUb+0ZXy Zwv+Xh5DJBB7rW/mtWPoWlqmSMP8F/afJw/EeM1jPjSrkTzHQxExFF0kFv7+cMtt1km1 FGvw== X-Forwarded-Encrypted: i=1; AJvYcCXPGIwz+CsJ18RZYD+0Wp9FvRS4SXqaXWyP6x56k+QtMVYKorLu97ItUpUMxi21XcWfrlJwB1JOxtqLSLU=@vger.kernel.org X-Gm-Message-State: AOJu0YwcpAvscMGTZaFrg2WP3b5WfT1V4cHub13/fZa28qUqZg4RIIoE LCOCUQZF4OFnh9JeA0oF5HZcCUM5z2cS1NKdPF6tryLNpmdxW3IKDUffayFbqlBsllb6CwZERqP gTyAZAkZIkt2cNVC6lCT1XDg0tUqe2I/LV1xThwvbqfW6IOXuiVWYP2NhU2Me9BIu7vc= X-Gm-Gg: ASbGncsgS6lyVE+N0h6W3jnbsbzJQ5j/Rwqc8gl+5tpTOzEObhmYOLj2I4xCp4mYQU4 PtbLxpF38C2Fz/qeQHfFuwJwIB2WjqQBtFXJ637LQ/OCNi4BVTSq5YKkPePrwgZdmQfMqiyGJ96 F3BjxFPpDUWO00Otsz0n/irJAxEMNM5dx6UcGMfUFhuCgfST+51Uqu2iHyL0gEE9vuRjk3XRK9t CsT801jlpo551f8rHQnfGWyhijLZDMdTGGzRcH93WHczYx3dKKqd1YTrJ6IShIh1p/kAXH1oAZs O65Qg8ECEZBsQMpLO9CPiiBrm1JbD4WX X-Received: by 2002:a05:6a00:2394:b0:748:34a4:ab13 with SMTP id d2e1a72fcca58-74af6e84446mr13409256b3a.6.1751206052823; Sun, 29 Jun 2025 07:07:32 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGHN7/oAX1bKEZkUB9J9E/WCSm3m6XndJknPbgZIAkf0AL3r85pHbTnXOpyzeMzvorKiXxPxw== X-Received: by 2002:a05:6a00:2394:b0:748:34a4:ab13 with SMTP id d2e1a72fcca58-74af6e84446mr13409225b3a.6.1751206052319; Sun, 29 Jun 2025 07:07:32 -0700 (PDT) Received: from localhost ([2601:1c0:5000:d5c:5b3e:de60:4fda:e7b1]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-74af541bec8sm6594388b3a.39.2025.06.29.07.07.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Jun 2025 07:07:31 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, Connor Abbott , Antonino Maniscalco , Danilo Krummrich , Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Jun Nie , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v8 11/42] drm/msm: Stop passing vm to msm_framebuffer Date: Sun, 29 Jun 2025 07:03:14 -0700 Message-ID: <20250629140537.30850-12-robin.clark@oss.qualcomm.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250629140537.30850-1-robin.clark@oss.qualcomm.com> References: <20250629140537.30850-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-Authority-Analysis: v=2.4 cv=ZKfXmW7b c=1 sm=1 tr=0 ts=686148a5 cx=c_pps a=m5Vt/hrsBiPMCU0y4gIsQw==:117 a=xqWC_Br6kY4A:10 a=6IFa9wvqVegA:10 a=EUspDBNiAAAA:8 a=pGLkceISAAAA:8 a=HL1_eh3RQQ0Sznupcm4A:9 a=IoOABgeZipijB_acs4fv:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjI5MDExOSBTYWx0ZWRfX4lJNNjKqeZUU qAhdLtudgVLunxEjYRo2WPO1hAO+IhWaYyvLKn2XnnERiHEoDB+J/dPtOyF1FAS6JntvYXc7AFc BzJL9s7LYvcmvlVmAO6VfeHPhiniifb1pLJmUMqO3HljY7LxnPfshR1RrjG7Q8uXgz89JjlNJBG 448E0kTRqZ+W4thtN1m+9LxdGUPFq7DOUMC+zia1s07ESuwhJuKSQ/r8xujuKS2DO131hVWBfXZ 50AYpKTku6nEO09MCLnWNrz0Ce/yDaeJw/2VuQKwA1krNkCzDQzl4hyLxlHb3lEhZPxawf1/Dk6 Nxulqeec/eMd4onGPWZBV2qgeliSsRcbQD6A3AaERRRPPSijosi4bRYCRu+D8j1YS7QVokjJR05 UfR/SUCZTu3cRG2DsIxs58m17Nl62QGWINSLc+4sZxYnOvMIhfO61aVSGgta/kIIH3vURm/E X-Proofpoint-ORIG-GUID: PheKgrWLqQcVlUg329cbSNfEvAV8Au_E X-Proofpoint-GUID: PheKgrWLqQcVlUg329cbSNfEvAV8Au_E 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-27_05,2025-06-27_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 mlxscore=0 mlxlogscore=999 spamscore=0 suspectscore=0 bulkscore=0 priorityscore=1501 lowpriorityscore=0 phishscore=0 impostorscore=0 malwarescore=0 clxscore=1015 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2506290119 Content-Type: text/plain; charset="utf-8" The fb only deals with kms->vm, so make that explicit. This will start letting us refcount the # of times the fb is pinned, so we can only unpin the vma after last user of the fb is done. Having a single reference count really only works if there is only a single vm. Signed-off-by: Rob Clark Tested-by: Antonino Maniscalco Reviewed-by: Antonino Maniscalco --- .../drm/msm/disp/dpu1/dpu_encoder_phys_wb.c | 11 +++------- drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c | 18 +++++++---------- drivers/gpu/drm/msm/disp/dpu1/dpu_formats.h | 3 +-- drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 20 ++++++------------- drivers/gpu/drm/msm/disp/dpu1/dpu_plane.h | 2 -- drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c | 18 ++++++----------- drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c | 18 ++++++----------- drivers/gpu/drm/msm/msm_drv.h | 9 +++------ drivers/gpu/drm/msm/msm_fb.c | 15 +++++++------- 9 files changed, 39 insertions(+), 75 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c b/drivers/= gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c index 32e208ee946d..9a54da1c9e3c 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c @@ -566,7 +566,6 @@ static void dpu_encoder_phys_wb_prepare_wb_job(struct d= pu_encoder_phys *phys_enc struct drm_writeback_job *job) { const struct msm_format *format; - struct msm_gem_vm *vm; struct dpu_hw_wb_cfg *wb_cfg; int ret; struct dpu_encoder_phys_wb *wb_enc =3D to_dpu_encoder_phys_wb(phys_enc); @@ -576,13 +575,12 @@ static void dpu_encoder_phys_wb_prepare_wb_job(struct= dpu_encoder_phys *phys_enc =20 wb_enc->wb_job =3D job; wb_enc->wb_conn =3D job->connector; - vm =3D phys_enc->dpu_kms->base.vm; =20 wb_cfg =3D &wb_enc->wb_cfg; =20 memset(wb_cfg, 0, sizeof(struct dpu_hw_wb_cfg)); =20 - ret =3D msm_framebuffer_prepare(job->fb, vm, false); + ret =3D msm_framebuffer_prepare(job->fb, false); if (ret) { DPU_ERROR("prep fb failed, %d\n", ret); return; @@ -596,7 +594,7 @@ static void dpu_encoder_phys_wb_prepare_wb_job(struct d= pu_encoder_phys *phys_enc return; } =20 - dpu_format_populate_addrs(vm, job->fb, &wb_cfg->dest); + dpu_format_populate_addrs(job->fb, &wb_cfg->dest); =20 wb_cfg->dest.width =3D job->fb->width; wb_cfg->dest.height =3D job->fb->height; @@ -619,14 +617,11 @@ static void dpu_encoder_phys_wb_cleanup_wb_job(struct= dpu_encoder_phys *phys_enc struct drm_writeback_job *job) { struct dpu_encoder_phys_wb *wb_enc =3D to_dpu_encoder_phys_wb(phys_enc); - struct msm_gem_vm *vm; =20 if (!job->fb) return; =20 - vm =3D phys_enc->dpu_kms->base.vm; - - msm_framebuffer_cleanup(job->fb, vm, false); + msm_framebuffer_cleanup(job->fb, false); wb_enc->wb_job =3D NULL; wb_enc->wb_conn =3D NULL; } diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c b/drivers/gpu/drm/= msm/disp/dpu1/dpu_formats.c index d115b79af771..b0d585c5315c 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c @@ -274,15 +274,14 @@ int dpu_format_populate_plane_sizes( return _dpu_format_populate_plane_sizes_linear(fmt, fb, layout); } =20 -static void _dpu_format_populate_addrs_ubwc(struct msm_gem_vm *vm, - struct drm_framebuffer *fb, +static void _dpu_format_populate_addrs_ubwc(struct drm_framebuffer *fb, struct dpu_hw_fmt_layout *layout) { const struct msm_format *fmt; uint32_t base_addr =3D 0; bool meta; =20 - base_addr =3D msm_framebuffer_iova(fb, vm, 0); + base_addr =3D msm_framebuffer_iova(fb, 0); =20 fmt =3D msm_framebuffer_format(fb); meta =3D MSM_FORMAT_IS_UBWC(fmt); @@ -355,26 +354,23 @@ static void _dpu_format_populate_addrs_ubwc(struct ms= m_gem_vm *vm, } } =20 -static void _dpu_format_populate_addrs_linear(struct msm_gem_vm *vm, - struct drm_framebuffer *fb, +static void _dpu_format_populate_addrs_linear(struct drm_framebuffer *fb, struct dpu_hw_fmt_layout *layout) { unsigned int i; =20 /* Populate addresses for simple formats here */ for (i =3D 0; i < layout->num_planes; ++i) - layout->plane_addr[i] =3D msm_framebuffer_iova(fb, vm, i); + layout->plane_addr[i] =3D msm_framebuffer_iova(fb, i); } =20 /** * dpu_format_populate_addrs - populate buffer addresses based on * mmu, fb, and format found in the fb - * @vm: address space pointer * @fb: framebuffer pointer * @layout: format layout structure to populate */ -void dpu_format_populate_addrs(struct msm_gem_vm *vm, - struct drm_framebuffer *fb, +void dpu_format_populate_addrs(struct drm_framebuffer *fb, struct dpu_hw_fmt_layout *layout) { const struct msm_format *fmt; @@ -384,7 +380,7 @@ void dpu_format_populate_addrs(struct msm_gem_vm *vm, /* Populate the addresses given the fb */ if (MSM_FORMAT_IS_UBWC(fmt) || MSM_FORMAT_IS_TILE(fmt)) - _dpu_format_populate_addrs_ubwc(vm, fb, layout); + _dpu_format_populate_addrs_ubwc(fb, layout); else - _dpu_format_populate_addrs_linear(vm, fb, layout); + _dpu_format_populate_addrs_linear(fb, layout); } diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_formats.h b/drivers/gpu/drm/= msm/disp/dpu1/dpu_formats.h index 989f3e13c497..dc03f522e616 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_formats.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_formats.h @@ -31,8 +31,7 @@ static inline bool dpu_find_format(u32 format, const u32 = *supported_formats, return false; } =20 -void dpu_format_populate_addrs(struct msm_gem_vm *vm, - struct drm_framebuffer *fb, +void dpu_format_populate_addrs(struct drm_framebuffer *fb, struct dpu_hw_fmt_layout *layout); =20 int dpu_format_populate_plane_sizes( diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c b/drivers/gpu/drm/ms= m/disp/dpu1/dpu_plane.c index 6d47f43f52f7..07f0461223c3 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c @@ -646,7 +646,6 @@ static int dpu_plane_prepare_fb(struct drm_plane *plane, struct drm_framebuffer *fb =3D new_state->fb; struct dpu_plane *pdpu =3D to_dpu_plane(plane); struct dpu_plane_state *pstate =3D to_dpu_plane_state(new_state); - struct dpu_kms *kms =3D _dpu_plane_get_kms(&pdpu->base); int ret; =20 if (!new_state->fb) @@ -654,9 +653,6 @@ static int dpu_plane_prepare_fb(struct drm_plane *plane, =20 DPU_DEBUG_PLANE(pdpu, "FB[%u]\n", fb->base.id); =20 - /* cache vm */ - pstate->vm =3D kms->base.vm; - /* * TODO: Need to sort out the msm_framebuffer_prepare() call below so * we can use msm_atomic_prepare_fb() instead of doing the @@ -664,13 +660,10 @@ static int dpu_plane_prepare_fb(struct drm_plane *pla= ne, */ drm_gem_plane_helper_prepare_fb(plane, new_state); =20 - if (pstate->vm) { - ret =3D msm_framebuffer_prepare(new_state->fb, - pstate->vm, pstate->needs_dirtyfb); - if (ret) { - DPU_ERROR("failed to prepare framebuffer\n"); - return ret; - } + ret =3D msm_framebuffer_prepare(new_state->fb, pstate->needs_dirtyfb); + if (ret) { + DPU_ERROR("failed to prepare framebuffer\n"); + return ret; } =20 return 0; @@ -689,8 +682,7 @@ static void dpu_plane_cleanup_fb(struct drm_plane *plan= e, =20 DPU_DEBUG_PLANE(pdpu, "FB[%u]\n", old_state->fb->base.id); =20 - msm_framebuffer_cleanup(old_state->fb, old_pstate->vm, - old_pstate->needs_dirtyfb); + msm_framebuffer_cleanup(old_state->fb, old_pstate->needs_dirtyfb); } =20 static int dpu_plane_check_inline_rotation(struct dpu_plane *pdpu, @@ -1457,7 +1449,7 @@ static void dpu_plane_sspp_atomic_update(struct drm_p= lane *plane, pstate->needs_qos_remap |=3D (is_rt_pipe !=3D pdpu->is_rt_pipe); pdpu->is_rt_pipe =3D is_rt_pipe; =20 - dpu_format_populate_addrs(pstate->vm, new_state->fb, &pstate->layout); + dpu_format_populate_addrs(new_state->fb, &pstate->layout); =20 DPU_DEBUG_PLANE(pdpu, "FB[%u] " DRM_RECT_FP_FMT "->crtc%u " DRM_RECT_FMT ", %p4cc ubwc %d\n", fb->base.id, DRM_RECT_FP_ARG(&state->src), diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.h b/drivers/gpu/drm/ms= m/disp/dpu1/dpu_plane.h index 3578f52048a5..a3a6e9028333 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.h @@ -17,7 +17,6 @@ /** * struct dpu_plane_state: Define dpu extension of drm plane state object * @base: base drm plane state object - * @vm: pointer to address space for input/output buffers * @pipe: software pipe description * @r_pipe: software pipe description of the second pipe * @pipe_cfg: software pipe configuration @@ -34,7 +33,6 @@ */ struct dpu_plane_state { struct drm_plane_state base; - struct msm_gem_vm *vm; struct dpu_sw_pipe pipe; struct dpu_sw_pipe r_pipe; struct dpu_sw_pipe_cfg pipe_cfg; diff --git a/drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c b/drivers/gpu/drm/m= sm/disp/mdp4/mdp4_plane.c index 7743be6167f8..098c3b5ff2b2 100644 --- a/drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c +++ b/drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c @@ -79,30 +79,25 @@ static const struct drm_plane_funcs mdp4_plane_funcs = =3D { static int mdp4_plane_prepare_fb(struct drm_plane *plane, struct drm_plane_state *new_state) { - struct msm_drm_private *priv =3D plane->dev->dev_private; - struct msm_kms *kms =3D priv->kms; - if (!new_state->fb) return 0; =20 drm_gem_plane_helper_prepare_fb(plane, new_state); =20 - return msm_framebuffer_prepare(new_state->fb, kms->vm, false); + return msm_framebuffer_prepare(new_state->fb, false); } =20 static void mdp4_plane_cleanup_fb(struct drm_plane *plane, struct drm_plane_state *old_state) { struct mdp4_plane *mdp4_plane =3D to_mdp4_plane(plane); - struct mdp4_kms *mdp4_kms =3D get_kms(plane); - struct msm_kms *kms =3D &mdp4_kms->base.base; struct drm_framebuffer *fb =3D old_state->fb; =20 if (!fb) return; =20 DBG("%s: cleanup: FB[%u]", mdp4_plane->name, fb->base.id); - msm_framebuffer_cleanup(fb, kms->vm, false); + msm_framebuffer_cleanup(fb, false); } =20 =20 @@ -141,7 +136,6 @@ static void mdp4_plane_set_scanout(struct drm_plane *pl= ane, { struct mdp4_plane *mdp4_plane =3D to_mdp4_plane(plane); struct mdp4_kms *mdp4_kms =3D get_kms(plane); - struct msm_kms *kms =3D &mdp4_kms->base.base; enum mdp4_pipe pipe =3D mdp4_plane->pipe; =20 mdp4_write(mdp4_kms, REG_MDP4_PIPE_SRC_STRIDE_A(pipe), @@ -153,13 +147,13 @@ static void mdp4_plane_set_scanout(struct drm_plane *= plane, MDP4_PIPE_SRC_STRIDE_B_P3(fb->pitches[3])); =20 mdp4_write(mdp4_kms, REG_MDP4_PIPE_SRCP0_BASE(pipe), - msm_framebuffer_iova(fb, kms->vm, 0)); + msm_framebuffer_iova(fb, 0)); mdp4_write(mdp4_kms, REG_MDP4_PIPE_SRCP1_BASE(pipe), - msm_framebuffer_iova(fb, kms->vm, 1)); + msm_framebuffer_iova(fb, 1)); mdp4_write(mdp4_kms, REG_MDP4_PIPE_SRCP2_BASE(pipe), - msm_framebuffer_iova(fb, kms->vm, 2)); + msm_framebuffer_iova(fb, 2)); mdp4_write(mdp4_kms, REG_MDP4_PIPE_SRCP3_BASE(pipe), - msm_framebuffer_iova(fb, kms->vm, 3)); + msm_framebuffer_iova(fb, 3)); } =20 static void mdp4_write_csc_config(struct mdp4_kms *mdp4_kms, diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c b/drivers/gpu/drm/m= sm/disp/mdp5/mdp5_plane.c index 9f68a4747203..7c790406d533 100644 --- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c +++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c @@ -135,8 +135,6 @@ static const struct drm_plane_funcs mdp5_plane_funcs = =3D { static int mdp5_plane_prepare_fb(struct drm_plane *plane, struct drm_plane_state *new_state) { - struct msm_drm_private *priv =3D plane->dev->dev_private; - struct msm_kms *kms =3D priv->kms; bool needs_dirtyfb =3D to_mdp5_plane_state(new_state)->needs_dirtyfb; =20 if (!new_state->fb) @@ -144,14 +142,12 @@ static int mdp5_plane_prepare_fb(struct drm_plane *pl= ane, =20 drm_gem_plane_helper_prepare_fb(plane, new_state); =20 - return msm_framebuffer_prepare(new_state->fb, kms->vm, needs_dirtyfb); + return msm_framebuffer_prepare(new_state->fb, needs_dirtyfb); } =20 static void mdp5_plane_cleanup_fb(struct drm_plane *plane, struct drm_plane_state *old_state) { - struct mdp5_kms *mdp5_kms =3D get_kms(plane); - struct msm_kms *kms =3D &mdp5_kms->base.base; struct drm_framebuffer *fb =3D old_state->fb; bool needed_dirtyfb =3D to_mdp5_plane_state(old_state)->needs_dirtyfb; =20 @@ -159,7 +155,7 @@ static void mdp5_plane_cleanup_fb(struct drm_plane *pla= ne, return; =20 DBG("%s: cleanup: FB[%u]", plane->name, fb->base.id); - msm_framebuffer_cleanup(fb, kms->vm, needed_dirtyfb); + msm_framebuffer_cleanup(fb, needed_dirtyfb); } =20 static int mdp5_plane_atomic_check_with_state(struct drm_crtc_state *crtc_= state, @@ -467,8 +463,6 @@ static void set_scanout_locked(struct mdp5_kms *mdp5_km= s, enum mdp5_pipe pipe, struct drm_framebuffer *fb) { - struct msm_kms *kms =3D &mdp5_kms->base.base; - mdp5_write(mdp5_kms, REG_MDP5_PIPE_SRC_STRIDE_A(pipe), MDP5_PIPE_SRC_STRIDE_A_P0(fb->pitches[0]) | MDP5_PIPE_SRC_STRIDE_A_P1(fb->pitches[1])); @@ -478,13 +472,13 @@ static void set_scanout_locked(struct mdp5_kms *mdp5_= kms, MDP5_PIPE_SRC_STRIDE_B_P3(fb->pitches[3])); =20 mdp5_write(mdp5_kms, REG_MDP5_PIPE_SRC0_ADDR(pipe), - msm_framebuffer_iova(fb, kms->vm, 0)); + msm_framebuffer_iova(fb, 0)); mdp5_write(mdp5_kms, REG_MDP5_PIPE_SRC1_ADDR(pipe), - msm_framebuffer_iova(fb, kms->vm, 1)); + msm_framebuffer_iova(fb, 1)); mdp5_write(mdp5_kms, REG_MDP5_PIPE_SRC2_ADDR(pipe), - msm_framebuffer_iova(fb, kms->vm, 2)); + msm_framebuffer_iova(fb, 2)); mdp5_write(mdp5_kms, REG_MDP5_PIPE_SRC3_ADDR(pipe), - msm_framebuffer_iova(fb, kms->vm, 3)); + msm_framebuffer_iova(fb, 3)); } =20 /* Note: mdp5_plane->pipe_lock must be locked */ diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h index 761e7e221ad9..eb009bd193e3 100644 --- a/drivers/gpu/drm/msm/msm_drv.h +++ b/drivers/gpu/drm/msm/msm_drv.h @@ -274,12 +274,9 @@ struct drm_gem_object *msm_gem_prime_import_sg_table(s= truct drm_device *dev, int msm_gem_prime_pin(struct drm_gem_object *obj); void msm_gem_prime_unpin(struct drm_gem_object *obj); =20 -int msm_framebuffer_prepare(struct drm_framebuffer *fb, - struct msm_gem_vm *vm, bool needs_dirtyfb); -void msm_framebuffer_cleanup(struct drm_framebuffer *fb, - struct msm_gem_vm *vm, bool needed_dirtyfb); -uint32_t msm_framebuffer_iova(struct drm_framebuffer *fb, - struct msm_gem_vm *vm, int plane); +int msm_framebuffer_prepare(struct drm_framebuffer *fb, bool needs_dirtyfb= ); +void msm_framebuffer_cleanup(struct drm_framebuffer *fb, bool needed_dirty= fb); +uint32_t msm_framebuffer_iova(struct drm_framebuffer *fb, int plane); struct drm_gem_object *msm_framebuffer_bo(struct drm_framebuffer *fb, int = plane); const struct msm_format *msm_framebuffer_format(struct drm_framebuffer *fb= ); struct drm_framebuffer *msm_framebuffer_create(struct drm_device *dev, diff --git a/drivers/gpu/drm/msm/msm_fb.c b/drivers/gpu/drm/msm/msm_fb.c index 6df318b73534..8a3b88130f4d 100644 --- a/drivers/gpu/drm/msm/msm_fb.c +++ b/drivers/gpu/drm/msm/msm_fb.c @@ -75,10 +75,10 @@ void msm_framebuffer_describe(struct drm_framebuffer *f= b, struct seq_file *m) =20 /* prepare/pin all the fb's bo's for scanout. */ -int msm_framebuffer_prepare(struct drm_framebuffer *fb, - struct msm_gem_vm *vm, - bool needs_dirtyfb) +int msm_framebuffer_prepare(struct drm_framebuffer *fb, bool needs_dirtyfb) { + struct msm_drm_private *priv =3D fb->dev->dev_private; + struct msm_gem_vm *vm =3D priv->kms->vm; struct msm_framebuffer *msm_fb =3D to_msm_framebuffer(fb); int ret, i, n =3D fb->format->num_planes; =20 @@ -98,10 +98,10 @@ int msm_framebuffer_prepare(struct drm_framebuffer *fb, return 0; } =20 -void msm_framebuffer_cleanup(struct drm_framebuffer *fb, - struct msm_gem_vm *vm, - bool needed_dirtyfb) +void msm_framebuffer_cleanup(struct drm_framebuffer *fb, bool needed_dirty= fb) { + struct msm_drm_private *priv =3D fb->dev->dev_private; + struct msm_gem_vm *vm =3D priv->kms->vm; struct msm_framebuffer *msm_fb =3D to_msm_framebuffer(fb); int i, n =3D fb->format->num_planes; =20 @@ -115,8 +115,7 @@ void msm_framebuffer_cleanup(struct drm_framebuffer *fb, memset(msm_fb->iova, 0, sizeof(msm_fb->iova)); } =20 -uint32_t msm_framebuffer_iova(struct drm_framebuffer *fb, - struct msm_gem_vm *vm, int plane) +uint32_t msm_framebuffer_iova(struct drm_framebuffer *fb, int plane) { struct msm_framebuffer *msm_fb =3D to_msm_framebuffer(fb); return msm_fb->iova[plane] + fb->offsets[plane]; --=20 2.50.0 From nobody Wed Oct 8 10:58:50 2025 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 85AEE226556 for ; Sun, 29 Jun 2025 14:07:35 +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=1751206056; cv=none; b=BXcZZeACHB1iTMRAG9Tyte4XRK6DgaIqtLppc779HPs6tReISTNK5ryVIT7Ud5VkBAYiobZq50km4/RDF3oFu7LemSwQOa/G01HXJNXGsJ0O8gvLteqRPvro/tq28abUVWYOT/UuhUE2Wvkwe0mFyUSwQ058UgumBJh9cWW+WO8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751206056; c=relaxed/simple; bh=LF3WmOXEduF0Yox49Tqnc+p3MIWedMqeUKG9yrG7bm4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=id7npSiF4jBMBHcMEQNaLw5p9INucvS9AVes00BuXyRfcddOBX2BjgXAy8cq+Rpd9P1pL5AxgnHr71xoUKsg7EuftmW18BfZPveQmCwQKcQG2UoOZu/hWgKIOHQbuX2J1R6tY+fH1iOS7ISXYIG5LkSB5vUDb5y1jVvbVD9mHxg= 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=EJLTgvGv; 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="EJLTgvGv" 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 55TBfOX2026498 for ; Sun, 29 Jun 2025 14:07:34 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=gBDfAmEkonF ZxrTQANE1o507a0jHlpQ+o9S1Q9lveGU=; b=EJLTgvGv7cM4pboAKIJUs/p0bC4 u2ueRvFtICLimKNsS1h/VIeJUofb1d6od40yXmuGaEkw9HhzltPfGUbz6+qrncCv MiszvmyK/rZ5XIGyEU0XXxqNRXbUvyd+s9SjSV8MC7QQUipnzfLrBHm0rNZ6tfOO xT5z9oH2sFLbvpauyBPLWnvOSigzOT9YwA385m1jRebwmExy7S0NT/giJ0ZdF5JE DWctCccqYpzUNB2LK5fXsClVcbFNzuWlSiKqEQDqSpINBxTDB1k5pkFR4UiFytIL PXP9rCvvabH8QKuyaqoyei5woBqhITCbonti3xvNHvbJF2fny29dW2RwqvQ== Received: from mail-pg1-f197.google.com (mail-pg1-f197.google.com [209.85.215.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 47j9jpt4gp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Sun, 29 Jun 2025 14:07:34 +0000 (GMT) Received: by mail-pg1-f197.google.com with SMTP id 41be03b00d2f7-b2fdba7f818so1868584a12.2 for ; Sun, 29 Jun 2025 07:07:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751206054; x=1751810854; 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=gBDfAmEkonFZxrTQANE1o507a0jHlpQ+o9S1Q9lveGU=; b=ujW0+6KxCdINiQrMqNTrSkBnwu+EVlXWxkqJen0gNJdFMkWs3CceSr7ZyuX5PbdCqC Oq48jiarH1kjVsdkiVNut0jUveEU4TTCPFhO7/9sqZ6Ig6EElsSW/QrsyFno1anFfQJu JCPBFnYaFBf9YpRurB7zBK4moZfv1WPcqDVFkvf0xr8uhjdXqWLI5XU98NEcQSN6fSgE MOhjcTa7mxWw3VSTf685GVgCQIyMOYdETFlO1hM9KLn2ZSrprrp39E8oyYaWhiBUXhmu fR3q8pySY8Wcuajw/ms5W527k9EbqdAZIK+T+qIUssYbRVXAIIFV1FxA4oQ1uAakUyO1 OpfA== X-Forwarded-Encrypted: i=1; AJvYcCWhOMjWxWTaP0OxZjJY0Grwwl/iLvrNQ7WNzo2d44Wmee6ct4P3nucMJRB7Klpfxb4AmQCDxCB6q4w63uI=@vger.kernel.org X-Gm-Message-State: AOJu0YxkKPMwh9wT7sLCxdWXagisMLOnzYqMDoDdHCvwgnuzUyOUjzEz z4o7yIIvXsN0uKLWmxGStpCd+nKq0/VQ6pMp772+RBrgjeC/wELO6zz39ppXYg12PUfsYHtuLal XlNkxIaB6o3o75tUkJSDFTSqfR6IrAUWu5tReATKJ9Tj2G8ncAVQTyWlNqLpISknUqCY= X-Gm-Gg: ASbGnctZLw7pHtB0OBj0VgpNk4kT9+LekOx2cBz0AWqqJWtIdGSkIOVoB6uXBhLN9Q1 +qjYCMZtEeUYLZXKpAJbuYhiFSNuI+XgsVDsAgALD6asoU3SVX/tDuL5jLj7B/QmTVizNMaCBBy QFuRAjcoA6S/NEaoHEKpGvkeiL8dBjqtd9wOwOuCjCw0ft3+06sqLRqrWdPTncVRz7NUEXtt+3x reZ78CdOBPmVIXHz1vV6gozrZiJxUWVvh7iPvPU+PPYMbCv6JRdV6AblomgprOMkPOr6ckkp9Mx 8QzIhYy/onL72v2R3I7XfXmuIJjWIhzs X-Received: by 2002:a05:6a20:a11c:b0:218:59b:b2f4 with SMTP id adf61e73a8af0-220a17f7369mr13582071637.42.1751206053804; Sun, 29 Jun 2025 07:07:33 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHU+uDb51M4Be0+7RJfEMhzdKWdXH2VX5GhX5PZfc1zJAcJo7bdy/zfcmW3N5NdF26UuMWOGw== X-Received: by 2002:a05:6a20:a11c:b0:218:59b:b2f4 with SMTP id adf61e73a8af0-220a17f7369mr13582043637.42.1751206053451; Sun, 29 Jun 2025 07:07:33 -0700 (PDT) Received: from localhost ([2601:1c0:5000:d5c:5b3e:de60:4fda:e7b1]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-74af54098b9sm6581953b3a.33.2025.06.29.07.07.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Jun 2025 07:07:33 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, Connor Abbott , Antonino Maniscalco , Danilo Krummrich , Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v8 12/42] drm/msm: Refcount framebuffer pins Date: Sun, 29 Jun 2025 07:03:15 -0700 Message-ID: <20250629140537.30850-13-robin.clark@oss.qualcomm.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250629140537.30850-1-robin.clark@oss.qualcomm.com> References: <20250629140537.30850-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: AW1haW4tMjUwNjI5MDExOSBTYWx0ZWRfX9SW1c6iPET5w e+NWFNtIH9sX7OTtZDT/3L0pGMrehp3vLaaFkdT41tnvQ9SUMiXwp0EEPjHWK1CbJoOCwXvQzog Eodjc+kMngobjDAoLJV5Ac4SMkxnIu1fSWRBEPFVKUtBV8OmoNHPCpa8FA+T/GxPkkQfTIDSW3H BJIf11mCZ00jAgUTg5D3F4t1SmOjPX7v7VzV360+nA+Y+matEr8p5kI7dhne7ZbUqarzZmH5xDH 2BWevHsPpOKfawkdavGBtYxk2KoTjvYBgUZ0NxS255aFTlpnlMHxgTQD0h4toqGfYs6bwe2EAFA fPtosEenGyBqHtwW44wDnQa3pkS+mlmmOvPoeverawgWkexSM+xEXFvN4cMu0zER93OCWLFXS5m 7bZjiVIQJkOy9j/uTrYropTUwVFJr+5JFn9HOSUmdw/oeYGNaNfHpAuh9lCjj8DF8ing2C5I X-Proofpoint-ORIG-GUID: 8y904g9WnJ_3yb8_mij30HjP-FxWJqIk X-Authority-Analysis: v=2.4 cv=Tq7mhCXh c=1 sm=1 tr=0 ts=686148a6 cx=c_pps a=rz3CxIlbcmazkYymdCej/Q==:117 a=xqWC_Br6kY4A:10 a=6IFa9wvqVegA:10 a=EUspDBNiAAAA:8 a=pGLkceISAAAA:8 a=MhmIxDhvR8qEtQvFyXAA:9 a=bFCP_H2QrGi7Okbo017w:22 X-Proofpoint-GUID: 8y904g9WnJ_3yb8_mij30HjP-FxWJqIk 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-27_05,2025-06-27_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 lowpriorityscore=0 adultscore=0 priorityscore=1501 impostorscore=0 phishscore=0 mlxscore=0 spamscore=0 bulkscore=0 suspectscore=0 malwarescore=0 mlxlogscore=999 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2506290119 Content-Type: text/plain; charset="utf-8" We were already keeping a refcount of # of prepares (pins), to clear the iova array. Use that to avoid unpinning the iova until the last cleanup (unpin). This way, when msm_gem_unpin_iova() actually tears down the mapping, we won't have problems if the fb is being scanned out on another display (for example). Signed-off-by: Rob Clark Tested-by: Antonino Maniscalco Reviewed-by: Antonino Maniscalco --- drivers/gpu/drm/msm/msm_fb.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/msm/msm_fb.c b/drivers/gpu/drm/msm/msm_fb.c index 8a3b88130f4d..3b17d83f6673 100644 --- a/drivers/gpu/drm/msm/msm_fb.c +++ b/drivers/gpu/drm/msm/msm_fb.c @@ -85,7 +85,8 @@ int msm_framebuffer_prepare(struct drm_framebuffer *fb, b= ool needs_dirtyfb) if (needs_dirtyfb) refcount_inc(&msm_fb->dirtyfb); =20 - atomic_inc(&msm_fb->prepare_count); + if (atomic_inc_return(&msm_fb->prepare_count) > 1) + return 0; =20 for (i =3D 0; i < n; i++) { ret =3D msm_gem_get_and_pin_iova(fb->obj[i], vm, &msm_fb->iova[i]); @@ -108,11 +109,13 @@ void msm_framebuffer_cleanup(struct drm_framebuffer *= fb, bool needed_dirtyfb) if (needed_dirtyfb) refcount_dec(&msm_fb->dirtyfb); =20 + if (atomic_dec_return(&msm_fb->prepare_count)) + return; + + memset(msm_fb->iova, 0, sizeof(msm_fb->iova)); + for (i =3D 0; i < n; i++) msm_gem_unpin_iova(fb->obj[i], vm); - - if (!atomic_dec_return(&msm_fb->prepare_count)) - memset(msm_fb->iova, 0, sizeof(msm_fb->iova)); } =20 uint32_t msm_framebuffer_iova(struct drm_framebuffer *fb, int plane) --=20 2.50.0 From nobody Wed Oct 8 10:58:50 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 CCC622206A8 for ; Sun, 29 Jun 2025 14:07:39 +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=1751206062; cv=none; b=ItniM3JuFYEg0KE8IeHdeAbPxECbJu+nO/Q9njlopU9K843FOj92446X5aqKdhUf9Gxm6pZx4Sq0Z5mjBogqKWZDC1HcLKCUzJNYpI3opH/NsUAip06FzDfT7ou09zHUYrYu+Tl9DIoz0WpzBMGqmThAF8ictasvD4qNo1lNxaY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751206062; c=relaxed/simple; bh=Nv78ArpK7CU+mbti5Ijt6tW7PK+v8aiEO0+p4szLN9c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=n2MrZuj3NQ1F1WzNWG8CazQCDDQAD1VU7Pm0VbyjFnb2nbwhJCSQdwA3d+O00cjfctKSC7GFUZZe91YnclD6ethgLnIKl6+UegFKvknYS10sgG0lTA5nkDNoYd72MtihxfldrdFqcoUFzNaT3JK9jb2dfdzo57fPJtLPmCVGfFA= 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=ifdxPPtV; 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="ifdxPPtV" Received: from pps.filterd (m0279870.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 55TAnNCO021123 for ; Sun, 29 Jun 2025 14:07:39 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=HXWQlBzwRs/ YFZcQ0J8q0tRYFCQz7L7Uc+xvyU8KUAI=; b=ifdxPPtVk/5FUHJTth4Im+NZjLC w9jLd3pbu4DK9VQwxIOlZpehpQQerXI1yhWxslQT9j0SQRF795vSvUL9o92TX/ew nyYZ7TIjVAwD5t9JoafadLzxhQIzBejNmh4adQZoIX5lbIAM1gM3UCrQvG8H3RWa B/LoDc4+WcVR0UGfveKOjFSFlpgoo94CgRE8EUNwzQSJwPScJE2oYxTcN3ZayyJN MudNZkCb2j8CrMr0dBzrCV+k4qNwJb0rLgGikACmpoVY0XAMejRms3DcnTdviCqh r762ZDf1MxdarOlf4LLJBf+klZ0LTxAU8M1Bz51Vm4PP21gez/gu8Gunvng== Received: from mail-pl1-f200.google.com (mail-pl1-f200.google.com [209.85.214.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 47j8fxa8df-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Sun, 29 Jun 2025 14:07:38 +0000 (GMT) Received: by mail-pl1-f200.google.com with SMTP id d9443c01a7336-237e6963f70so51529685ad.2 for ; Sun, 29 Jun 2025 07:07:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751206057; x=1751810857; 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=HXWQlBzwRs/YFZcQ0J8q0tRYFCQz7L7Uc+xvyU8KUAI=; b=V+hvEo6lXw9TBbnWAoreOaqHvM79V6ca1B9oAH8QXIIfAeW/NJV4PhnYc9Ye+zzSj3 CKh2SYxFbV09eN7v4F8kWwpu3cu8LhE7tSz4qN5HqRwel+/9rsmL0V+iUyGJUxUKe09P ztOGg0MywsZ7e3RekVsngAeyoXKRBOtuCEU4NKP5jpLDk8EG8MuvfH5Kss1QHFKs76in hpIM55j09KCD7/SO5o9fhKOAn9NlHBPQeKqfaTJo2X7FyN7jX4ok9GUHhG4TYcy8TWfp 5mgyI3pEicYS+bt3aWpH3QYGee/t8iqNiqccqdLDcxhDNRv1KJATRUHA6h83uA4vl99O HZ8w== X-Forwarded-Encrypted: i=1; AJvYcCU0D1Duz5rxOPZBdwCFKemezL/IITSMqWgg29rACEiEt015QN/UhzLWMJbNaYv4GDVl/e1TpPVe1ZSgZDY=@vger.kernel.org X-Gm-Message-State: AOJu0YyUmHC8J+8RrMoJyXnOMcwFUP4ijAGP9JvF8ixcXyuu2vQeNWw8 Nk47+ikZiSkCkOgS+lEobXf8kfaazqHsX3jcPdP5Sc4DlkA/E7Rbw7vfTPpvgF5yhz/nMY57xlx DV+LW8ktR3uR6WPIwFCxRJnawxPhfw/UBOIzCDqendUgrrmlueEX3t4704kTi6JwGaoE= X-Gm-Gg: ASbGncs9Pv7zX5d1IuuA17eYjLMioinsQngMfQXNGb+BBrdYyLbV2tf84LWSKyFAWJc GYGiC6X4XWW75JbRtGMA7k08AxujsU8LH3BeX6kJfUIo5lp8nFkyxZK3Xu5aNhhZVXM7OxB/1x0 5o9qCwAdWRCd28zNkuY1xMUii8KmTf0pG+D1+XIzko0pgZFuN/ZJbSY/ga4CKKhbqHqR0JjzasO mEVecy8XPVHzuiGLQy88yqN4cmxB/Qz2mlr9Z/SQaipH5Uf+RrvTm2UZr8RHVJTnyDeq8+Nv+/M ygVtvEdPhbaP4VolAfDmz76JK7jhrKrQ X-Received: by 2002:a17:903:22d2:b0:234:8f5d:e3b6 with SMTP id d9443c01a7336-23ac3bffd40mr115983565ad.3.1751206056808; Sun, 29 Jun 2025 07:07:36 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHoNzHfTeuswz0hp5CcgK1AYJzMRSmwRHfq14oDd9c6fN/vlwihFVDpPu+RTwLC10Fg5y2UrA== X-Received: by 2002:a17:903:22d2:b0:234:8f5d:e3b6 with SMTP id d9443c01a7336-23ac3bffd40mr115983235ad.3.1751206056165; Sun, 29 Jun 2025 07:07:36 -0700 (PDT) Received: from localhost ([2601:1c0:5000:d5c:5b3e:de60:4fda:e7b1]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-23acb2e1b03sm61997305ad.10.2025.06.29.07.07.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Jun 2025 07:07:35 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, Connor Abbott , Antonino Maniscalco , Danilo Krummrich , Rob Clark , Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Konrad Dybcio , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v8 13/42] drm/msm: drm_gpuvm conversion Date: Sun, 29 Jun 2025 07:03:16 -0700 Message-ID: <20250629140537.30850-14-robin.clark@oss.qualcomm.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250629140537.30850-1-robin.clark@oss.qualcomm.com> References: <20250629140537.30850-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: AW1haW4tMjUwNjI5MDExOSBTYWx0ZWRfX1Jm/fKCOnXNO hRcjxEMGvMqxtPojHOTsAGl5nPpVRXtc3o9QTkMhxGfj+6LWQbt9mnmvXD3bF/IAM5YoHKpOtcF WhIfcGtbX2cuoX0JfJ894qPiwEAR+puxE9vLHuBZ/y59q9AJK9lr7kYBXC67H+MTb18n5bl/oXi zZk7wCK81f9WEaxNJV44SIQuuSJXZ1TTvuZcXuxDfZa1LKqR8Z4PwJ9gm4cJIYqpkBHMlAgHj3J RKtFYA79aglwsn6YK+aJUKDfJqTwoSJ2UbVXYRury2AQYPXQYUyklCbp/yrydrazKLyDmYeN4mn myhxzORuwQZzTr8IfA6HtoNtgcW6Ou4KX39DEEnvBlQxEVLPXC/45pqcDKln4ZFkwx1H7HRpORP 5UTS7uSxNlm8Tw9+BqauKVA3fLXCTaN2K7WcKPz0BRmwKvpevy7cQJ3YMtLwZaUsloDPfKYz X-Proofpoint-GUID: CV8VLOmGi1TX3tx5uJdSA4CMLqNMyN-Q X-Proofpoint-ORIG-GUID: CV8VLOmGi1TX3tx5uJdSA4CMLqNMyN-Q X-Authority-Analysis: v=2.4 cv=TqPmhCXh c=1 sm=1 tr=0 ts=686148aa cx=c_pps a=IZJwPbhc+fLeJZngyXXI0A==:117 a=xqWC_Br6kY4A:10 a=6IFa9wvqVegA:10 a=cm27Pg_UAAAA:8 a=EUspDBNiAAAA:8 a=pGLkceISAAAA:8 a=DWwiU9S3deBeNsXQ0cYA:9 a=hD0YvAvVATwCeCSz:21 a=uG9DUKGECoFWVXl0Dc02: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-27_05,2025-06-27_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 bulkscore=0 mlxlogscore=999 suspectscore=0 adultscore=0 phishscore=0 malwarescore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 spamscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2506290119 Content-Type: text/plain; charset="utf-8" From: Rob Clark Now that we've realigned deletion and allocation, switch over to using drm_gpuvm/drm_gpuva. This allows us to support multiple VMAs per BO per VM, to allow mapping different parts of a single BO at different virtual addresses, which is a key requirement for sparse/VM_BIND. This prepares us for using drm_gpuvm to translate a batch of MAP/ MAP_NULL/UNMAP operations from userspace into a sequence of map/remap/ unmap steps for updating the page tables. Since, unlike our prior vm/vma setup, with drm_gpuvm the vm_bo holds a reference to the GEM object. To prevent reference loops causing us to leak all GEM objects, we implicitly tear down the mapping when the GEM handle is close or when the obj is unpinned. Which means the submit needs to also hold a reference to the vm_bo, to prevent the VMA from being torn down while the submit is in-flight. Signed-off-by: Rob Clark Signed-off-by: Rob Clark Tested-by: Antonino Maniscalco Reviewed-by: Antonino Maniscalco --- drivers/gpu/drm/msm/Kconfig | 1 + drivers/gpu/drm/msm/adreno/a2xx_gpu.c | 3 +- drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 6 +- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 5 +- drivers/gpu/drm/msm/adreno/adreno_gpu.c | 7 +- drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | 5 +- drivers/gpu/drm/msm/msm_drv.c | 1 + drivers/gpu/drm/msm/msm_gem.c | 166 +++++++++++++++-------- drivers/gpu/drm/msm/msm_gem.h | 90 +++++++++--- drivers/gpu/drm/msm/msm_gem_submit.c | 7 +- drivers/gpu/drm/msm/msm_gem_vma.c | 140 +++++++++++++------ drivers/gpu/drm/msm/msm_kms.c | 4 +- 12 files changed, 300 insertions(+), 135 deletions(-) diff --git a/drivers/gpu/drm/msm/Kconfig b/drivers/gpu/drm/msm/Kconfig index 7f127e2ae442..1523bc3e9540 100644 --- a/drivers/gpu/drm/msm/Kconfig +++ b/drivers/gpu/drm/msm/Kconfig @@ -21,6 +21,7 @@ config DRM_MSM select DRM_DISPLAY_HELPER select DRM_BRIDGE_CONNECTOR select DRM_EXEC + select DRM_GPUVM select DRM_KMS_HELPER select DRM_PANEL select DRM_BRIDGE diff --git a/drivers/gpu/drm/msm/adreno/a2xx_gpu.c b/drivers/gpu/drm/msm/ad= reno/a2xx_gpu.c index 095bae92e3e8..889480aa13ba 100644 --- a/drivers/gpu/drm/msm/adreno/a2xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a2xx_gpu.c @@ -472,8 +472,7 @@ a2xx_create_vm(struct msm_gpu *gpu, struct platform_dev= ice *pdev) struct msm_mmu *mmu =3D a2xx_gpummu_new(&pdev->dev, gpu); struct msm_gem_vm *vm; =20 - vm =3D msm_gem_vm_create(mmu, "gpu", SZ_16M, - 0xfff * SZ_64K); + vm =3D msm_gem_vm_create(gpu->dev, mmu, "gpu", SZ_16M, 0xfff * SZ_64K, tr= ue); =20 if (IS_ERR(vm) && !IS_ERR(mmu)) mmu->funcs->destroy(mmu); diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c b/drivers/gpu/drm/msm/ad= reno/a6xx_gmu.c index 848acc382b7d..77d9ff9632d1 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c @@ -1311,7 +1311,7 @@ static int a6xx_gmu_memory_alloc(struct a6xx_gmu *gmu= , struct a6xx_gmu_bo *bo, return 0; } =20 -static int a6xx_gmu_memory_probe(struct a6xx_gmu *gmu) +static int a6xx_gmu_memory_probe(struct drm_device *drm, struct a6xx_gmu *= gmu) { struct msm_mmu *mmu; =20 @@ -1321,7 +1321,7 @@ static int a6xx_gmu_memory_probe(struct a6xx_gmu *gmu) if (IS_ERR(mmu)) return PTR_ERR(mmu); =20 - gmu->vm =3D msm_gem_vm_create(mmu, "gmu", 0x0, 0x80000000); + gmu->vm =3D msm_gem_vm_create(drm, mmu, "gmu", 0x0, 0x80000000, true); if (IS_ERR(gmu->vm)) return PTR_ERR(gmu->vm); =20 @@ -1940,7 +1940,7 @@ int a6xx_gmu_init(struct a6xx_gpu *a6xx_gpu, struct d= evice_node *node) if (ret) goto err_put_device; =20 - ret =3D a6xx_gmu_memory_probe(gmu); + ret =3D a6xx_gmu_memory_probe(adreno_gpu->base.dev, gmu); if (ret) goto err_put_device; =20 diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c b/drivers/gpu/drm/msm/ad= reno/a6xx_gpu.c index 7b3be2b46cc4..262129cb4415 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c @@ -2284,9 +2284,8 @@ a6xx_create_private_vm(struct msm_gpu *gpu) if (IS_ERR(mmu)) return ERR_CAST(mmu); =20 - return msm_gem_vm_create(mmu, - "gpu", ADRENO_VM_START, - adreno_private_vm_size(gpu)); + return msm_gem_vm_create(gpu->dev, mmu, "gpu", ADRENO_VM_START, + adreno_private_vm_size(gpu), true); } =20 static uint32_t a6xx_get_rptr(struct msm_gpu *gpu, struct msm_ringbuffer *= ring) diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/= adreno/adreno_gpu.c index 0f71c39696a5..46199a6d0e41 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c @@ -226,7 +226,8 @@ adreno_iommu_create_vm(struct msm_gpu *gpu, start =3D max_t(u64, SZ_16M, geometry->aperture_start); size =3D geometry->aperture_end - start + 1; =20 - vm =3D msm_gem_vm_create(mmu, "gpu", start & GENMASK_ULL(48, 0), size); + vm =3D msm_gem_vm_create(gpu->dev, mmu, "gpu", start & GENMASK_ULL(48, 0), + size, true); =20 if (IS_ERR(vm) && !IS_ERR(mmu)) mmu->funcs->destroy(mmu); @@ -414,12 +415,12 @@ int adreno_get_param(struct msm_gpu *gpu, struct msm_= context *ctx, case MSM_PARAM_VA_START: if (ctx->vm =3D=3D gpu->vm) return UERR(EINVAL, drm, "requires per-process pgtables"); - *value =3D ctx->vm->va_start; + *value =3D ctx->vm->base.mm_start; return 0; case MSM_PARAM_VA_SIZE: if (ctx->vm =3D=3D gpu->vm) return UERR(EINVAL, drm, "requires per-process pgtables"); - *value =3D ctx->vm->va_size; + *value =3D ctx->vm->base.mm_range; return 0; case MSM_PARAM_HIGHEST_BANK_BIT: *value =3D adreno_gpu->ubwc_config.highest_bank_bit; diff --git a/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c b/drivers/gpu/drm/msm= /disp/mdp4/mdp4_kms.c index 5cb4a4bae2a6..a867c684c6d6 100644 --- a/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c +++ b/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c @@ -469,8 +469,9 @@ static int mdp4_kms_init(struct drm_device *dev) "contig buffers for scanout\n"); vm =3D NULL; } else { - vm =3D msm_gem_vm_create(mmu, - "mdp4", 0x1000, 0x100000000 - 0x1000); + vm =3D msm_gem_vm_create(dev, mmu, "mdp4", + 0x1000, 0x100000000 - 0x1000, + true); =20 if (IS_ERR(vm)) { if (!IS_ERR(mmu)) diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c index c314fd470d69..488fdf02aee9 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -780,6 +780,7 @@ static const struct file_operations fops =3D { =20 static const struct drm_driver msm_driver =3D { .driver_features =3D DRIVER_GEM | + DRIVER_GEM_GPUVA | DRIVER_RENDER | DRIVER_ATOMIC | DRIVER_MODESET | diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c index a20ae783f244..664fb801c221 100644 --- a/drivers/gpu/drm/msm/msm_gem.c +++ b/drivers/gpu/drm/msm/msm_gem.c @@ -43,9 +43,53 @@ static int msm_gem_open(struct drm_gem_object *obj, stru= ct drm_file *file) return 0; } =20 +static void put_iova_spaces(struct drm_gem_object *obj, struct drm_gpuvm *= vm, bool close); + +static void detach_vm(struct drm_gem_object *obj, struct msm_gem_vm *vm) +{ + msm_gem_assert_locked(obj); + + struct drm_gpuvm_bo *vm_bo =3D drm_gpuvm_bo_find(&vm->base, obj); + if (vm_bo) { + struct drm_gpuva *vma; + + drm_gpuvm_bo_for_each_va (vma, vm_bo) { + if (vma->vm !=3D &vm->base) + continue; + msm_gem_vma_purge(to_msm_vma(vma)); + msm_gem_vma_close(to_msm_vma(vma)); + break; + } + + drm_gpuvm_bo_put(vm_bo); + } +} + static void msm_gem_close(struct drm_gem_object *obj, struct drm_file *fil= e) { + struct msm_context *ctx =3D file->driver_priv; + update_ctx_mem(file, -obj->size); + + /* + * If VM isn't created yet, nothing to cleanup. And in fact calling + * put_iova_spaces() with vm=3DNULL would be bad, in that it will tear- + * down the mappings of shared buffers in other contexts. + */ + if (!ctx->vm) + return; + + /* + * TODO we might need to kick this to a queue to avoid blocking + * in CLOSE ioctl + */ + dma_resv_wait_timeout(obj->resv, DMA_RESV_USAGE_READ, false, + msecs_to_jiffies(1000)); + + msm_gem_lock(obj); + put_iova_spaces(obj, &ctx->vm->base, true); + detach_vm(obj, ctx->vm); + msm_gem_unlock(obj); } =20 /* @@ -167,6 +211,13 @@ static void put_pages(struct drm_gem_object *obj) { struct msm_gem_object *msm_obj =3D to_msm_bo(obj); =20 + /* + * Skip gpuvm in the object free path to avoid a WARN_ON() splat. + * See explaination in msm_gem_assert_locked() + */ + if (kref_read(&obj->refcount)) + drm_gpuvm_bo_gem_evict(obj, true); + if (msm_obj->pages) { if (msm_obj->sgt) { /* For non-cached buffers, ensure the new @@ -334,16 +385,25 @@ uint64_t msm_gem_mmap_offset(struct drm_gem_object *o= bj) } =20 static struct msm_gem_vma *lookup_vma(struct drm_gem_object *obj, - struct msm_gem_vm *vm) + struct msm_gem_vm *vm) { - struct msm_gem_object *msm_obj =3D to_msm_bo(obj); - struct msm_gem_vma *vma; + struct drm_gpuvm_bo *vm_bo; =20 msm_gem_assert_locked(obj); =20 - list_for_each_entry(vma, &msm_obj->vmas, list) { - if (vma->vm =3D=3D vm) - return vma; + drm_gem_for_each_gpuvm_bo (vm_bo, obj) { + struct drm_gpuva *vma; + + drm_gpuvm_bo_for_each_va (vma, vm_bo) { + if (vma->vm =3D=3D &vm->base) { + /* lookup_vma() should only be used in paths + * with at most one vma per vm + */ + GEM_WARN_ON(!list_is_singular(&vm_bo->list.gpuva)); + + return to_msm_vma(vma); + } + } } =20 return NULL; @@ -356,33 +416,29 @@ static struct msm_gem_vma *lookup_vma(struct drm_gem_= object *obj, * mapping. */ static void -put_iova_spaces(struct drm_gem_object *obj, bool close) +put_iova_spaces(struct drm_gem_object *obj, struct drm_gpuvm *vm, bool clo= se) { - struct msm_gem_object *msm_obj =3D to_msm_bo(obj); - struct msm_gem_vma *vma, *tmp; + struct drm_gpuvm_bo *vm_bo, *tmp; =20 msm_gem_assert_locked(obj); =20 - list_for_each_entry_safe(vma, tmp, &msm_obj->vmas, list) { - if (vma->vm) { - msm_gem_vma_purge(vma); - if (close) - msm_gem_vma_close(vma); - } - } -} + drm_gem_for_each_gpuvm_bo_safe (vm_bo, tmp, obj) { + struct drm_gpuva *vma, *vmatmp; =20 -/* Called with msm_obj locked */ -static void -put_iova_vmas(struct drm_gem_object *obj) -{ - struct msm_gem_object *msm_obj =3D to_msm_bo(obj); - struct msm_gem_vma *vma, *tmp; + if (vm && vm_bo->vm !=3D vm) + continue; =20 - msm_gem_assert_locked(obj); + drm_gpuvm_bo_get(vm_bo); + + drm_gpuvm_bo_for_each_va_safe (vma, vmatmp, vm_bo) { + struct msm_gem_vma *msm_vma =3D to_msm_vma(vma); + + msm_gem_vma_purge(msm_vma); + if (close) + msm_gem_vma_close(msm_vma); + } =20 - list_for_each_entry_safe(vma, tmp, &msm_obj->vmas, list) { - msm_gem_vma_close(vma); + drm_gpuvm_bo_put(vm_bo); } } =20 @@ -390,7 +446,6 @@ static struct msm_gem_vma *get_vma_locked(struct drm_ge= m_object *obj, struct msm_gem_vm *vm, u64 range_start, u64 range_end) { - struct msm_gem_object *msm_obj =3D to_msm_bo(obj); struct msm_gem_vma *vma; =20 msm_gem_assert_locked(obj); @@ -399,12 +454,9 @@ static struct msm_gem_vma *get_vma_locked(struct drm_g= em_object *obj, =20 if (!vma) { vma =3D msm_gem_vma_new(vm, obj, range_start, range_end); - if (IS_ERR(vma)) - return vma; - list_add_tail(&vma->list, &msm_obj->vmas); } else { - GEM_WARN_ON(vma->iova < range_start); - GEM_WARN_ON((vma->iova + obj->size) > range_end); + GEM_WARN_ON(vma->base.va.addr < range_start); + GEM_WARN_ON((vma->base.va.addr + obj->size) > range_end); } =20 return vma; @@ -484,7 +536,7 @@ static int get_and_pin_iova_range_locked(struct drm_gem= _object *obj, =20 ret =3D msm_gem_pin_vma_locked(obj, vma); if (!ret) { - *iova =3D vma->iova; + *iova =3D vma->base.va.addr; pin_obj_locked(obj); } =20 @@ -530,7 +582,7 @@ int msm_gem_get_iova(struct drm_gem_object *obj, if (IS_ERR(vma)) { ret =3D PTR_ERR(vma); } else { - *iova =3D vma->iova; + *iova =3D vma->base.va.addr; } msm_gem_unlock(obj); =20 @@ -571,7 +623,7 @@ int msm_gem_set_iova(struct drm_gem_object *obj, vma =3D get_vma_locked(obj, vm, iova, iova + obj->size); if (IS_ERR(vma)) { ret =3D PTR_ERR(vma); - } else if (GEM_WARN_ON(vma->iova !=3D iova)) { + } else if (GEM_WARN_ON(vma->base.va.addr !=3D iova)) { clear_iova(obj, vm); ret =3D -EBUSY; } @@ -593,9 +645,10 @@ void msm_gem_unpin_iova(struct drm_gem_object *obj, =20 msm_gem_lock(obj); vma =3D lookup_vma(obj, vm); - if (!GEM_WARN_ON(!vma)) { + if (vma) { msm_gem_unpin_locked(obj); } + detach_vm(obj, vm); msm_gem_unlock(obj); } =20 @@ -755,7 +808,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, false); + put_iova_spaces(obj, NULL, false); =20 msm_gem_vunmap(obj); =20 @@ -763,8 +816,6 @@ void msm_gem_purge(struct drm_gem_object *obj) =20 put_pages(obj); =20 - put_iova_vmas(obj); - mutex_lock(&priv->lru.lock); /* A one-way transition: */ msm_obj->madv =3D __MSM_MADV_PURGED; @@ -795,7 +846,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, false); + put_iova_spaces(obj, NULL, false); =20 drm_vma_node_unmap(&obj->vma_node, dev->anon_inode->i_mapping); =20 @@ -861,7 +912,6 @@ void msm_gem_describe(struct drm_gem_object *obj, struc= t seq_file *m, { struct msm_gem_object *msm_obj =3D to_msm_bo(obj); struct dma_resv *robj =3D obj->resv; - struct msm_gem_vma *vma; uint64_t off =3D drm_vma_node_start(&obj->vma_node); const char *madv; =20 @@ -904,14 +954,17 @@ void msm_gem_describe(struct drm_gem_object *obj, str= uct seq_file *m, =20 seq_printf(m, " %08zu %9s %-32s\n", obj->size, madv, msm_obj->name); =20 - if (!list_empty(&msm_obj->vmas)) { + if (!list_empty(&obj->gpuva.list)) { + struct drm_gpuvm_bo *vm_bo; =20 seq_puts(m, " vmas:"); =20 - list_for_each_entry(vma, &msm_obj->vmas, list) { - const char *name, *comm; - if (vma->vm) { - struct msm_gem_vm *vm =3D vma->vm; + drm_gem_for_each_gpuvm_bo (vm_bo, obj) { + struct drm_gpuva *vma; + + drm_gpuvm_bo_for_each_va (vma, vm_bo) { + const char *name, *comm; + struct msm_gem_vm *vm =3D to_msm_vm(vma->vm); struct task_struct *task =3D get_pid_task(vm->pid, PIDTYPE_PID); if (task) { @@ -920,15 +973,14 @@ void msm_gem_describe(struct drm_gem_object *obj, str= uct seq_file *m, } else { comm =3D NULL; } - name =3D vm->name; - } else { - name =3D comm =3D NULL; + name =3D vm->base.name; + + seq_printf(m, " [%s%s%s: vm=3D%p, %08llx, %smapped]", + name, comm ? ":" : "", comm ? comm : "", + vma->vm, vma->va.addr, + to_msm_vma(vma)->mapped ? "" : "un"); + kfree(comm); } - seq_printf(m, " [%s%s%s: vm=3D%p, %08llx,%s]", - name, comm ? ":" : "", comm ? comm : "", - vma->vm, vma->iova, - vma->mapped ? "mapped" : "unmapped"); - kfree(comm); } =20 seq_puts(m, "\n"); @@ -974,7 +1026,7 @@ static void msm_gem_free_object(struct drm_gem_object = *obj) list_del(&msm_obj->node); mutex_unlock(&priv->obj_lock); =20 - put_iova_spaces(obj, true); + put_iova_spaces(obj, NULL, true); =20 if (drm_gem_is_imported(obj)) { GEM_WARN_ON(msm_obj->vaddr); @@ -984,13 +1036,10 @@ static void msm_gem_free_object(struct drm_gem_objec= t *obj) */ kvfree(msm_obj->pages); =20 - put_iova_vmas(obj); - drm_prime_gem_destroy(obj, msm_obj->sgt); } else { msm_gem_vunmap(obj); put_pages(obj); - put_iova_vmas(obj); } =20 drm_gem_object_release(obj); @@ -1096,7 +1145,6 @@ static int msm_gem_new_impl(struct drm_device *dev, msm_obj->madv =3D MSM_MADV_WILLNEED; =20 INIT_LIST_HEAD(&msm_obj->node); - INIT_LIST_HEAD(&msm_obj->vmas); =20 *obj =3D &msm_obj->base; (*obj)->funcs =3D &msm_gem_object_funcs; diff --git a/drivers/gpu/drm/msm/msm_gem.h b/drivers/gpu/drm/msm/msm_gem.h index cf1e86252219..4112370baf34 100644 --- a/drivers/gpu/drm/msm/msm_gem.h +++ b/drivers/gpu/drm/msm/msm_gem.h @@ -10,6 +10,7 @@ #include #include #include "drm/drm_exec.h" +#include "drm/drm_gpuvm.h" #include "drm/gpu_scheduler.h" #include "msm_drv.h" =20 @@ -22,30 +23,67 @@ #define MSM_BO_STOLEN 0x10000000 /* try to use stolen/splash mem= ory */ #define MSM_BO_MAP_PRIV 0x20000000 /* use IOMMU_PRIV when mapping = */ =20 +/** + * struct msm_gem_vm - VM object + * + * A VM object representing a GPU (or display or GMU or ...) virtual addre= ss + * space. + * + * In the case of GPU, if per-process address spaces are supported, the ad= dress + * space is split into two VMs, which map to TTBR0 and TTBR1 in the SMMU. = TTBR0 + * is used for userspace objects, and is unique per msm_context/drm_file, = while + * TTBR1 is the same for all processes. (The kernel controlled ringbuffer= and + * a few other kernel controlled buffers live in TTBR1.) + * + * The GPU TTBR0 vm can be managed by userspace or by the kernel, dependin= g on + * whether userspace supports VM_BIND. All other vm's are managed by the = kernel. + * (Managed by kernel means the kernel is responsible for VA allocation.) + * + * Note that because VM_BIND allows a given BO to be mapped multiple times= in + * a VM, and therefore have multiple VMA's in a VM, there is an extra obje= ct + * provided by drm_gpuvm infrastructure.. the drm_gpuvm_bo, which is not + * embedded in any larger driver structure. The GEM object holds a list of + * drm_gpuvm_bo, which in turn holds a list of msm_gem_vma. A linked vma + * holds a reference to the vm_bo, and drops it when the vma is unlinked. + * So we just need to call drm_gpuvm_bo_obtain() to return a ref to an + * existing vm_bo, or create a new one. Once the vma is linked, the ref + * to the vm_bo can be dropped (since the vma is holding one). + */ struct msm_gem_vm { - const char *name; - /* NOTE: mm managed at the page level, size is in # of pages - * and position mm_node->start is in # of pages: + /** @base: Inherit from drm_gpuvm. */ + struct drm_gpuvm base; + + /** + * @mm: Memory management for kernel managed VA allocations + * + * Only used for kernel managed VMs, unused for user managed VMs. + * + * Protected by @mm_lock. */ struct drm_mm mm; - spinlock_t lock; /* Protects drm_mm node allocation/removal */ + + /** @mm_lock: protects @mm node allocation/removal */ + struct spinlock mm_lock; + + /** @vm_lock: protects gpuvm insert/remove/traverse */ + struct mutex vm_lock; + + /** @mmu: The mmu object which manages the pgtables */ struct msm_mmu *mmu; - struct kref kref; =20 - /* For address spaces associated with a specific process, this + /** + * @pid: For address spaces associated with a specific process, this * will be non-NULL: */ struct pid *pid; =20 - /* @faults: the number of GPU hangs associated with this address space */ + /** @faults: the number of GPU hangs associated with this address space */ int faults; =20 - /** @va_start: lowest possible address to allocate */ - uint64_t va_start; - - /** @va_size: the size of the address space (in bytes) */ - uint64_t va_size; + /** @managed: is this a kernel managed VM? */ + bool managed; }; +#define to_msm_vm(x) container_of(x, struct msm_gem_vm, base) =20 struct msm_gem_vm * msm_gem_vm_get(struct msm_gem_vm *vm); @@ -53,18 +91,33 @@ msm_gem_vm_get(struct msm_gem_vm *vm); void msm_gem_vm_put(struct msm_gem_vm *vm); =20 struct msm_gem_vm * -msm_gem_vm_create(struct msm_mmu *mmu, const char *name, - u64 va_start, u64 size); +msm_gem_vm_create(struct drm_device *drm, struct msm_mmu *mmu, const char = *name, + u64 va_start, u64 va_size, bool managed); =20 struct msm_fence_context; =20 +#define MSM_VMA_DUMP (DRM_GPUVA_USERBITS << 0) + +/** + * struct msm_gem_vma - a VMA mapping + * + * Represents a combination of a GEM object plus a VM. + */ struct msm_gem_vma { + /** @base: inherit from drm_gpuva */ + struct drm_gpuva base; + + /** + * @node: mm node for VA allocation + * + * Only used by kernel managed VMs + */ struct drm_mm_node node; - uint64_t iova; - struct msm_gem_vm *vm; - struct list_head list; /* node in msm_gem_object::vmas */ + + /** @mapped: Is this VMA mapped? */ bool mapped; }; +#define to_msm_vma(x) container_of(x, struct msm_gem_vma, base) =20 struct msm_gem_vma * msm_gem_vma_new(struct msm_gem_vm *vm, struct drm_gem_object *obj, @@ -100,8 +153,6 @@ struct msm_gem_object { struct sg_table *sgt; void *vaddr; =20 - struct list_head vmas; /* list of msm_gem_vma */ - char name[32]; /* Identifier to print for the debugfs files */ =20 /* userspace metadata backchannel */ @@ -292,6 +343,7 @@ struct msm_gem_submit { struct drm_gem_object *obj; uint32_t handle; }; + struct drm_gpuvm_bo *vm_bo; uint64_t iova; } bos[]; }; diff --git a/drivers/gpu/drm/msm/msm_gem_submit.c b/drivers/gpu/drm/msm/msm= _gem_submit.c index c184b1a1f522..2de5a07392eb 100644 --- a/drivers/gpu/drm/msm/msm_gem_submit.c +++ b/drivers/gpu/drm/msm/msm_gem_submit.c @@ -321,7 +321,8 @@ static int submit_pin_objects(struct msm_gem_submit *su= bmit) if (ret) break; =20 - submit->bos[i].iova =3D vma->iova; + submit->bos[i].vm_bo =3D drm_gpuvm_bo_get(vma->base.vm_bo); + submit->bos[i].iova =3D vma->base.va.addr; } =20 /* @@ -474,7 +475,11 @@ void msm_submit_retire(struct msm_gem_submit *submit) =20 for (i =3D 0; i < submit->nr_bos; i++) { struct drm_gem_object *obj =3D submit->bos[i].obj; + struct drm_gpuvm_bo *vm_bo =3D submit->bos[i].vm_bo; =20 + msm_gem_lock(obj); + drm_gpuvm_bo_put(vm_bo); + msm_gem_unlock(obj); drm_gem_object_put(obj); } } diff --git a/drivers/gpu/drm/msm/msm_gem_vma.c b/drivers/gpu/drm/msm/msm_ge= m_vma.c index ca29e81d79d2..1f4c9b5c2e8f 100644 --- a/drivers/gpu/drm/msm/msm_gem_vma.c +++ b/drivers/gpu/drm/msm/msm_gem_vma.c @@ -5,14 +5,13 @@ */ =20 #include "msm_drv.h" -#include "msm_fence.h" #include "msm_gem.h" #include "msm_mmu.h" =20 static void -msm_gem_vm_destroy(struct kref *kref) +msm_gem_vm_free(struct drm_gpuvm *gpuvm) { - struct msm_gem_vm *vm =3D container_of(kref, struct msm_gem_vm, kref); + struct msm_gem_vm *vm =3D container_of(gpuvm, struct msm_gem_vm, base); =20 drm_mm_takedown(&vm->mm); if (vm->mmu) @@ -25,14 +24,14 @@ msm_gem_vm_destroy(struct kref *kref) void msm_gem_vm_put(struct msm_gem_vm *vm) { if (vm) - kref_put(&vm->kref, msm_gem_vm_destroy); + drm_gpuvm_put(&vm->base); } =20 struct msm_gem_vm * msm_gem_vm_get(struct msm_gem_vm *vm) { if (!IS_ERR_OR_NULL(vm)) - kref_get(&vm->kref); + drm_gpuvm_get(&vm->base); =20 return vm; } @@ -40,14 +39,14 @@ msm_gem_vm_get(struct msm_gem_vm *vm) /* Actually unmap memory for the vma */ void msm_gem_vma_purge(struct msm_gem_vma *vma) { - struct msm_gem_vm *vm =3D vma->vm; - unsigned size =3D vma->node.size; + struct msm_gem_vm *vm =3D to_msm_vm(vma->base.vm); + unsigned size =3D vma->base.va.range; =20 /* Don't do anything if the memory isn't mapped */ if (!vma->mapped) return; =20 - vm->mmu->funcs->unmap(vm->mmu, vma->iova, size); + vm->mmu->funcs->unmap(vm->mmu, vma->base.va.addr, size); =20 vma->mapped =3D false; } @@ -57,10 +56,10 @@ int msm_gem_vma_map(struct msm_gem_vma *vma, int prot, struct sg_table *sgt, int size) { - struct msm_gem_vm *vm =3D vma->vm; + struct msm_gem_vm *vm =3D to_msm_vm(vma->base.vm); int ret; =20 - if (GEM_WARN_ON(!vma->iova)) + if (GEM_WARN_ON(!vma->base.va.addr)) return -EINVAL; =20 if (vma->mapped) @@ -68,9 +67,6 @@ msm_gem_vma_map(struct msm_gem_vma *vma, int prot, =20 vma->mapped =3D true; =20 - if (!vm) - return 0; - /* * NOTE: iommu/io-pgtable can allocate pages, so we cannot hold * a lock across map/unmap which is also used in the job_run() @@ -80,7 +76,7 @@ msm_gem_vma_map(struct msm_gem_vma *vma, int prot, * Revisit this if we can come up with a scheme to pre-alloc pages * for the pgtable in map/unmap ops. */ - ret =3D vm->mmu->funcs->map(vm->mmu, vma->iova, sgt, size, prot); + ret =3D vm->mmu->funcs->map(vm->mmu, vma->base.va.addr, sgt, size, prot); =20 if (ret) { vma->mapped =3D false; @@ -92,19 +88,20 @@ msm_gem_vma_map(struct msm_gem_vma *vma, int prot, /* Close an iova. Warn if it is still in use */ void msm_gem_vma_close(struct msm_gem_vma *vma) { - struct msm_gem_vm *vm =3D vma->vm; + struct msm_gem_vm *vm =3D to_msm_vm(vma->base.vm); =20 GEM_WARN_ON(vma->mapped); =20 - spin_lock(&vm->lock); - if (vma->iova) + spin_lock(&vm->mm_lock); + if (vma->base.va.addr) drm_mm_remove_node(&vma->node); - spin_unlock(&vm->lock); + spin_unlock(&vm->mm_lock); =20 - vma->iova =3D 0; - list_del(&vma->list); + mutex_lock(&vm->vm_lock); + drm_gpuva_remove(&vma->base); + drm_gpuva_unlink(&vma->base); + mutex_unlock(&vm->vm_lock); =20 - msm_gem_vm_put(vm); kfree(vma); } =20 @@ -113,6 +110,7 @@ struct msm_gem_vma * msm_gem_vma_new(struct msm_gem_vm *vm, struct drm_gem_object *obj, u64 range_start, u64 range_end) { + struct drm_gpuvm_bo *vm_bo; struct msm_gem_vma *vma; int ret; =20 @@ -120,36 +118,83 @@ msm_gem_vma_new(struct msm_gem_vm *vm, struct drm_gem= _object *obj, if (!vma) return ERR_PTR(-ENOMEM); =20 - vma->vm =3D vm; + if (vm->managed) { + spin_lock(&vm->mm_lock); + ret =3D drm_mm_insert_node_in_range(&vm->mm, &vma->node, + obj->size, PAGE_SIZE, 0, + range_start, range_end, 0); + spin_unlock(&vm->mm_lock); =20 - spin_lock(&vm->lock); - ret =3D drm_mm_insert_node_in_range(&vm->mm, &vma->node, - obj->size, PAGE_SIZE, 0, - range_start, range_end, 0); - spin_unlock(&vm->lock); + if (ret) + goto err_free_vma; =20 - if (ret) - goto err_free_vma; + range_start =3D vma->node.start; + range_end =3D range_start + obj->size; + } =20 - vma->iova =3D vma->node.start; + GEM_WARN_ON((range_end - range_start) > obj->size); + + drm_gpuva_init(&vma->base, range_start, range_end - range_start, obj, 0); vma->mapped =3D false; =20 - INIT_LIST_HEAD(&vma->list); + mutex_lock(&vm->vm_lock); + ret =3D drm_gpuva_insert(&vm->base, &vma->base); + mutex_unlock(&vm->vm_lock); + if (ret) + goto err_free_range; =20 - kref_get(&vm->kref); + vm_bo =3D drm_gpuvm_bo_obtain(&vm->base, obj); + if (IS_ERR(vm_bo)) { + ret =3D PTR_ERR(vm_bo); + goto err_va_remove; + } + + mutex_lock(&vm->vm_lock); + drm_gpuvm_bo_extobj_add(vm_bo); + drm_gpuva_link(&vma->base, vm_bo); + mutex_unlock(&vm->vm_lock); + GEM_WARN_ON(drm_gpuvm_bo_put(vm_bo)); =20 return vma; =20 +err_va_remove: + mutex_lock(&vm->vm_lock); + drm_gpuva_remove(&vma->base); + mutex_unlock(&vm->vm_lock); +err_free_range: + if (vm->managed) + drm_mm_remove_node(&vma->node); err_free_vma: kfree(vma); return ERR_PTR(ret); } =20 +static const struct drm_gpuvm_ops msm_gpuvm_ops =3D { + .vm_free =3D msm_gem_vm_free, +}; + +/** + * msm_gem_vm_create() - Create and initialize a &msm_gem_vm + * @drm: the drm device + * @mmu: the backing MMU objects handling mapping/unmapping + * @name: the name of the VM + * @va_start: the start offset of the VA space + * @va_size: the size of the VA space + * @managed: is it a kernel managed VM? + * + * In a kernel managed VM, the kernel handles address allocation, and only + * synchronous operations are supported. In a user managed VM, userspace + * handles virtual address allocation, and both async and sync operations + * are supported. + */ struct msm_gem_vm * -msm_gem_vm_create(struct msm_mmu *mmu, const char *name, - u64 va_start, u64 size) +msm_gem_vm_create(struct drm_device *drm, struct msm_mmu *mmu, const char = *name, + u64 va_start, u64 va_size, bool managed) { + enum drm_gpuvm_flags flags =3D 0; struct msm_gem_vm *vm; + struct drm_gem_object *dummy_gem; + int ret =3D 0; =20 if (IS_ERR(mmu)) return ERR_CAST(mmu); @@ -158,15 +203,28 @@ msm_gem_vm_create(struct msm_mmu *mmu, const char *na= me, if (!vm) return ERR_PTR(-ENOMEM); =20 - spin_lock_init(&vm->lock); - vm->name =3D name; - vm->mmu =3D mmu; - vm->va_start =3D va_start; - vm->va_size =3D size; + dummy_gem =3D drm_gpuvm_resv_object_alloc(drm); + if (!dummy_gem) { + ret =3D -ENOMEM; + goto err_free_vm; + } + + drm_gpuvm_init(&vm->base, name, flags, drm, dummy_gem, + va_start, va_size, 0, 0, &msm_gpuvm_ops); + drm_gem_object_put(dummy_gem); + + spin_lock_init(&vm->mm_lock); + mutex_init(&vm->vm_lock); =20 - drm_mm_init(&vm->mm, va_start, size); + vm->mmu =3D mmu; + vm->managed =3D managed; =20 - kref_init(&vm->kref); + drm_mm_init(&vm->mm, va_start, va_size); =20 return vm; + +err_free_vm: + kfree(vm); + return ERR_PTR(ret); + } diff --git a/drivers/gpu/drm/msm/msm_kms.c b/drivers/gpu/drm/msm/msm_kms.c index 88504c4b842f..6458bd82a0cd 100644 --- a/drivers/gpu/drm/msm/msm_kms.c +++ b/drivers/gpu/drm/msm/msm_kms.c @@ -204,8 +204,8 @@ struct msm_gem_vm *msm_kms_init_vm(struct drm_device *d= ev) return NULL; } =20 - vm =3D msm_gem_vm_create(mmu, "mdp_kms", - 0x1000, 0x100000000 - 0x1000); + vm =3D msm_gem_vm_create(dev, mmu, "mdp_kms", + 0x1000, 0x100000000 - 0x1000, true); if (IS_ERR(vm)) { dev_err(mdp_dev, "vm create, error %pe\n", vm); mmu->funcs->destroy(mmu); --=20 2.50.0 From nobody Wed Oct 8 10:58:50 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 EF36D226D0B for ; Sun, 29 Jun 2025 14:07:40 +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=1751206063; cv=none; b=EYIoYLri5cA6TXJaZqd06LhttmXahlEbWX1DPSB+VncmKFCWuUmhyVKzC4hZZnS+gyVJ0j4R2qLAF9lqwYXTz7trRghlpJNQInoGNT9V3oFYru5k+0WHZF15eDwXjc5hwVxnzSUekBu9F/ruKHjKrmGV7F894Ryl8dTv1Guz1wc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751206063; c=relaxed/simple; bh=IQIepr+3BXC4bz/2Itj+gYOSxVibtVXlxV/RLH8W7Hc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZMXHPrEAu7OPprXs0BnA8Yds4QvKg0SAFuXNUn8/muDy+V1WBExqh2Jfg8uaynjEBG3+Nd1OreXywNkdbjZBoKUqUHMeHcNJ2q/Wi8tGJO8mzL1xbZ7RsPKY2tCW9w/NfqED46ir5F40eZ9gnjCh+xPcIy4HstUaYvt/Csk7VNM= 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=SRyjiezf; 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="SRyjiezf" Received: from pps.filterd (m0279869.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 55TADXsI028542 for ; Sun, 29 Jun 2025 14:07:40 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=rew9/IzVuWZ 58MgfUMBVonrci/Um8bB8O/66NNJAsB0=; b=SRyjiezfc1aEyawoW2Gfi/MA9tw 6QDoh8spjnezKUpjZ38HVXeMH1OZT38dnga0Gwfm1d4ltJ/Gf9IAEnYgUhFSiSa8 +eza1mzf6k9b0LCd7yQ7ZOmRiwr/GVCMmR5zB+h+BoEQoAlPD+PQfTtTs2sMVm4X dRnKqLQbmd2EC16jXLOLGgXgIZJhGPo/+YERJDnnCckzxzijN/lhzud+zzP5facq fBA6TqBno+O+Dql7ZbtzGy2XVHPmEiGdvA9lC0piO7P+RolyNRdB9cBA/rzZW0dp x5KWax5accK3pqYUfigCkAlu16BKdgMDqZq0Adm+w0HQSCimAmP4d6G/vKg== Received: from mail-pl1-f199.google.com (mail-pl1-f199.google.com [209.85.214.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 47j7d9t9cr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Sun, 29 Jun 2025 14:07:39 +0000 (GMT) Received: by mail-pl1-f199.google.com with SMTP id d9443c01a7336-23692793178so28917645ad.0 for ; Sun, 29 Jun 2025 07:07:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751206058; x=1751810858; 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=rew9/IzVuWZ58MgfUMBVonrci/Um8bB8O/66NNJAsB0=; b=p2yXRbocFDa7d2l9u2s6Yg+jFFcSJybo/spZNkZjXkrf1jJmQoqkVhAKRCSVtTMlPj myUozW2LnIP7vM9JmHNfx6pVZ2ryLmszyKJ1RHh+aI/WOnAibNppqPVahMb0nBIcHMI9 4hhBPmXQp3eksiNJjOyhR4+WYJV4+PvYQe9mbMAiCCWSQlJH6t1lNaxH7bj5zv5kH1an HYWgYTPn1bpSduwmt4bYFHkSTopTioS+W5TeYA/GKHqk2VJS+iKe3B+ijJiYZ7F7RKeF GRfrzbphlSUHUTzlmdmcr1CBfoYEAPoMxgAyEm3SWCHlfjAt+tTRR59iifG3GTjYg4uq YaHw== X-Forwarded-Encrypted: i=1; AJvYcCUDquVv9+dS42F0bYVtQcO5m65F4CCMvWyzJb6Ihhre1kpJwdFP6lHDrKipKAr2mIf05xSBpx/ZEVDkRLo=@vger.kernel.org X-Gm-Message-State: AOJu0YyaAJ6rf+azjSLx6HsLGO2kUZ50I/vUZ3X5KyHGIr6IGQnOdo6L ziRRCztJ4iVLXNJl1sTk/nWOkBvdQHIf9rfkHlhRMOE4fVCilrgasEXJDebrqc/4Vo0YHPbhYPR hwUR6ySirG0UdYLheX1qxo+b///LlCac7FOgKNCVjK4x6aiYc335TxvwHJdon/s+1VD0= X-Gm-Gg: ASbGncvPkj5AICxfoSHDTs3THEHuyv7zNPKNYicPuFpopGlmrH7KrIh9sm3dW5lpVyd NttgmfN9GZt68xYeFfLc6cYhFp+GdfWdHme5M9TNAZas1dMTs51M1Nth5Obi9fSSqsQ0dmNJsin op3pcOkrRFmdZX/tQTGEZTuRqK8kPs5rW0zF4VrnV9herO7v90qyMzqD1CMSLmprbUNCi9EbQlX qq4NDfitxeuJyNu43H6Z9utgxU11adJo+kufX3ohmMX87jvEkReDHTXXmdlOut2nUemIpSrl/VC qWblG9TNL8bJRr3t/v2ycxzJkm9psNLN X-Received: by 2002:a17:902:ce81:b0:234:f6ba:e68a with SMTP id d9443c01a7336-23ac48b493emr140953965ad.45.1751206058300; Sun, 29 Jun 2025 07:07:38 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEln3KZC96Bl9UQ1Llwn2SAAoEMXpWTe2DCPd/DPm+a5d8vhXsT9aMZVvCfnJyhWhnKf+/xCw== X-Received: by 2002:a17:902:ce81:b0:234:f6ba:e68a with SMTP id d9443c01a7336-23ac48b493emr140953425ad.45.1751206057626; Sun, 29 Jun 2025 07:07:37 -0700 (PDT) Received: from localhost ([2601:1c0:5000:d5c:5b3e:de60:4fda:e7b1]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-23acb39ba6bsm58535135ad.104.2025.06.29.07.07.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Jun 2025 07:07:37 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, Connor Abbott , Antonino Maniscalco , Danilo Krummrich , Rob Clark , Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Sumit Semwal , =?UTF-8?q?Christian=20K=C3=B6nig?= , linux-kernel@vger.kernel.org (open list), linux-media@vger.kernel.org (open list:DMA BUFFER SHARING FRAMEWORK:Keyword:\bdma_(?:buf|fence|resv)\b), linaro-mm-sig@lists.linaro.org (moderated list:DMA BUFFER SHARING FRAMEWORK:Keyword:\bdma_(?:buf|fence|resv)\b) Subject: [PATCH v8 14/42] drm/msm: Convert vm locking Date: Sun, 29 Jun 2025 07:03:17 -0700 Message-ID: <20250629140537.30850-15-robin.clark@oss.qualcomm.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250629140537.30850-1-robin.clark@oss.qualcomm.com> References: <20250629140537.30850-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: AW1haW4tMjUwNjI5MDExOSBTYWx0ZWRfX556p8MswsPMd DgOB+NPpvCSpQ6OOsAeVypDdrRt6a9s0vCKCUmjisoCyMtSx9w5c8JywANhoJxwcbWZ8jvWhCsf 5Vscnl1naAzblrKMsOTiZEpPs7oXC4WG4MPqOFcDsbvCzIfwDAoXnXgG9Z1u+4gjRhAQkvtYKxT 4VurCo7qxO4Tb7P9JpThXzqyeVP+42L5oQ8vqhSXvLao8fCnPjHhdyxLmMH3TcVybmTmk6HJyg2 lLgWX996jWI6OhXe9dOmX92cf2VPBPnGiUcmAMxKIFPdYRz1PuIc41FbXENqqs7a3qUexglS27A t+YO4/rWz5aTTd6OSe8p2vXGghh3+xsev9hY3UbRSNIAl5ncbniXEQ8yLOXJ4f3Mpkb3g8/nGq/ ubGalpRDvElByT6l1K8fK4Q4YIB425FaKpcmRovD0GeonWjSHbeyHhMMbOwlMzUIhyxr/P2x X-Proofpoint-GUID: 43sEAP1_wI-TxhBC1RopxRAJBsez2Epr X-Authority-Analysis: v=2.4 cv=RrbFLDmK c=1 sm=1 tr=0 ts=686148ab cx=c_pps a=JL+w9abYAAE89/QcEU+0QA==:117 a=xqWC_Br6kY4A:10 a=6IFa9wvqVegA:10 a=cm27Pg_UAAAA:8 a=EUspDBNiAAAA:8 a=pGLkceISAAAA:8 a=1nDRvngas_nmfiIOXgsA:9 a=324X-CrmTo6CU4MGRt3R:22 X-Proofpoint-ORIG-GUID: 43sEAP1_wI-TxhBC1RopxRAJBsez2Epr 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-27_05,2025-06-27_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 mlxlogscore=999 adultscore=0 clxscore=1015 suspectscore=0 phishscore=0 bulkscore=0 malwarescore=0 spamscore=0 mlxscore=0 priorityscore=1501 lowpriorityscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2506290119 Content-Type: text/plain; charset="utf-8" From: Rob Clark Convert to using the gpuvm's r_obj for serializing access to the VM. This way we can use the drm_exec helper for dealing with deadlock detection and backoff. This will let us deal with upcoming locking order conflicts with the VM_BIND implmentation (ie. in some scenarious we need to acquire the obj lock first, for ex. to iterate all the VMs an obj is bound in, and in other scenarious we need to acquire the VM lock first). Signed-off-by: Rob Clark Signed-off-by: Rob Clark Tested-by: Antonino Maniscalco Reviewed-by: Antonino Maniscalco --- drivers/gpu/drm/msm/msm_gem.c | 41 +++++++++---- drivers/gpu/drm/msm/msm_gem.h | 37 ++++++++++-- drivers/gpu/drm/msm/msm_gem_shrinker.c | 80 +++++++++++++++++++++++--- drivers/gpu/drm/msm/msm_gem_submit.c | 9 ++- drivers/gpu/drm/msm/msm_gem_vma.c | 24 +++----- 5 files changed, 152 insertions(+), 39 deletions(-) diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c index 664fb801c221..82293806219a 100644 --- a/drivers/gpu/drm/msm/msm_gem.c +++ b/drivers/gpu/drm/msm/msm_gem.c @@ -48,6 +48,7 @@ static void put_iova_spaces(struct drm_gem_object *obj, s= truct drm_gpuvm *vm, bo static void detach_vm(struct drm_gem_object *obj, struct msm_gem_vm *vm) { msm_gem_assert_locked(obj); + drm_gpuvm_resv_assert_held(&vm->base); =20 struct drm_gpuvm_bo *vm_bo =3D drm_gpuvm_bo_find(&vm->base, obj); if (vm_bo) { @@ -68,6 +69,7 @@ static void detach_vm(struct drm_gem_object *obj, struct = msm_gem_vm *vm) static void msm_gem_close(struct drm_gem_object *obj, struct drm_file *fil= e) { struct msm_context *ctx =3D file->driver_priv; + struct drm_exec exec; =20 update_ctx_mem(file, -obj->size); =20 @@ -86,10 +88,10 @@ static void msm_gem_close(struct drm_gem_object *obj, s= truct drm_file *file) dma_resv_wait_timeout(obj->resv, DMA_RESV_USAGE_READ, false, msecs_to_jiffies(1000)); =20 - msm_gem_lock(obj); + msm_gem_lock_vm_and_obj(&exec, obj, ctx->vm); put_iova_spaces(obj, &ctx->vm->base, true); detach_vm(obj, ctx->vm); - msm_gem_unlock(obj); + drm_exec_fini(&exec); /* drop locks */ } =20 /* @@ -551,11 +553,12 @@ int msm_gem_get_and_pin_iova_range(struct drm_gem_obj= ect *obj, struct msm_gem_vm *vm, uint64_t *iova, u64 range_start, u64 range_end) { + struct drm_exec exec; int ret; =20 - msm_gem_lock(obj); + msm_gem_lock_vm_and_obj(&exec, obj, vm); ret =3D get_and_pin_iova_range_locked(obj, vm, iova, range_start, range_e= nd); - msm_gem_unlock(obj); + drm_exec_fini(&exec); /* drop locks */ =20 return ret; } @@ -575,16 +578,17 @@ int msm_gem_get_iova(struct drm_gem_object *obj, struct msm_gem_vm *vm, uint64_t *iova) { struct msm_gem_vma *vma; + struct drm_exec exec; int ret =3D 0; =20 - msm_gem_lock(obj); + msm_gem_lock_vm_and_obj(&exec, obj, vm); vma =3D get_vma_locked(obj, vm, 0, U64_MAX); if (IS_ERR(vma)) { ret =3D PTR_ERR(vma); } else { *iova =3D vma->base.va.addr; } - msm_gem_unlock(obj); + drm_exec_fini(&exec); /* drop locks */ =20 return ret; } @@ -613,9 +617,10 @@ static int clear_iova(struct drm_gem_object *obj, int msm_gem_set_iova(struct drm_gem_object *obj, struct msm_gem_vm *vm, uint64_t iova) { + struct drm_exec exec; int ret =3D 0; =20 - msm_gem_lock(obj); + msm_gem_lock_vm_and_obj(&exec, obj, vm); if (!iova) { ret =3D clear_iova(obj, vm); } else { @@ -628,7 +633,7 @@ int msm_gem_set_iova(struct drm_gem_object *obj, ret =3D -EBUSY; } } - msm_gem_unlock(obj); + drm_exec_fini(&exec); /* drop locks */ =20 return ret; } @@ -642,14 +647,15 @@ void msm_gem_unpin_iova(struct drm_gem_object *obj, struct msm_gem_vm *vm) { struct msm_gem_vma *vma; + struct drm_exec exec; =20 - msm_gem_lock(obj); + msm_gem_lock_vm_and_obj(&exec, obj, vm); vma =3D lookup_vma(obj, vm); if (vma) { msm_gem_unpin_locked(obj); } detach_vm(obj, vm); - msm_gem_unlock(obj); + drm_exec_fini(&exec); /* drop locks */ } =20 int msm_gem_dumb_create(struct drm_file *file, struct drm_device *dev, @@ -1021,12 +1027,27 @@ static void msm_gem_free_object(struct drm_gem_obje= ct *obj) struct msm_gem_object *msm_obj =3D to_msm_bo(obj); struct drm_device *dev =3D obj->dev; struct msm_drm_private *priv =3D dev->dev_private; + struct drm_exec exec; =20 mutex_lock(&priv->obj_lock); list_del(&msm_obj->node); mutex_unlock(&priv->obj_lock); =20 + /* + * We need to lock any VMs the object is still attached to, but not + * the object itself (see explaination in msm_gem_assert_locked()), + * so just open-code this special case: + */ + drm_exec_init(&exec, 0, 0); + drm_exec_until_all_locked (&exec) { + struct drm_gpuvm_bo *vm_bo; + drm_gem_for_each_gpuvm_bo (vm_bo, obj) { + drm_exec_lock_obj(&exec, drm_gpuvm_resv_obj(vm_bo->vm)); + drm_exec_retry_on_contention(&exec); + } + } put_iova_spaces(obj, NULL, true); + drm_exec_fini(&exec); /* drop locks */ =20 if (drm_gem_is_imported(obj)) { GEM_WARN_ON(msm_obj->vaddr); diff --git a/drivers/gpu/drm/msm/msm_gem.h b/drivers/gpu/drm/msm/msm_gem.h index 4112370baf34..33885a08cdd7 100644 --- a/drivers/gpu/drm/msm/msm_gem.h +++ b/drivers/gpu/drm/msm/msm_gem.h @@ -62,12 +62,6 @@ struct msm_gem_vm { */ struct drm_mm mm; =20 - /** @mm_lock: protects @mm node allocation/removal */ - struct spinlock mm_lock; - - /** @vm_lock: protects gpuvm insert/remove/traverse */ - struct mutex vm_lock; - /** @mmu: The mmu object which manages the pgtables */ struct msm_mmu *mmu; =20 @@ -246,6 +240,37 @@ msm_gem_unlock(struct drm_gem_object *obj) dma_resv_unlock(obj->resv); } =20 +/** + * msm_gem_lock_vm_and_obj() - Helper to lock an obj + VM + * @exec: the exec context helper which will be initalized + * @obj: the GEM object to lock + * @vm: the VM to lock + * + * Operations which modify a VM frequently need to lock both the VM and + * the object being mapped/unmapped/etc. This helper uses drm_exec to + * acquire both locks, dealing with potential deadlock/backoff scenarios + * which arise when multiple locks are involved. + */ +static inline int +msm_gem_lock_vm_and_obj(struct drm_exec *exec, + struct drm_gem_object *obj, + struct msm_gem_vm *vm) +{ + int ret =3D 0; + + drm_exec_init(exec, 0, 2); + drm_exec_until_all_locked (exec) { + ret =3D drm_exec_lock_obj(exec, drm_gpuvm_resv_obj(&vm->base)); + if (!ret && (obj->resv !=3D drm_gpuvm_resv(&vm->base))) + ret =3D drm_exec_lock_obj(exec, obj); + drm_exec_retry_on_contention(exec); + if (GEM_WARN_ON(ret)) + break; + } + + return ret; +} + static inline void msm_gem_assert_locked(struct drm_gem_object *obj) { diff --git a/drivers/gpu/drm/msm/msm_gem_shrinker.c b/drivers/gpu/drm/msm/m= sm_gem_shrinker.c index de185fc34084..5faf6227584a 100644 --- a/drivers/gpu/drm/msm/msm_gem_shrinker.c +++ b/drivers/gpu/drm/msm/msm_gem_shrinker.c @@ -43,6 +43,75 @@ msm_gem_shrinker_count(struct shrinker *shrinker, struct= shrink_control *sc) return count; } =20 +static bool +with_vm_locks(struct ww_acquire_ctx *ticket, + void (*fn)(struct drm_gem_object *obj), + struct drm_gem_object *obj) +{ + /* + * Track last locked entry for for unwinding locks in error and + * success paths + */ + struct drm_gpuvm_bo *vm_bo, *last_locked =3D NULL; + int ret =3D 0; + + drm_gem_for_each_gpuvm_bo (vm_bo, obj) { + struct dma_resv *resv =3D drm_gpuvm_resv(vm_bo->vm); + + if (resv =3D=3D obj->resv) + continue; + + ret =3D dma_resv_lock(resv, ticket); + + /* + * Since we already skip the case when the VM and obj + * share a resv (ie. _NO_SHARE objs), we don't expect + * to hit a double-locking scenario... which the lock + * unwinding cannot really cope with. + */ + WARN_ON(ret =3D=3D -EALREADY); + + /* + * Don't bother with slow-lock / backoff / retry sequence, + * if we can't get the lock just give up and move on to + * the next object. + */ + if (ret) + goto out_unlock; + + /* + * Hold a ref to prevent the vm_bo from being freed + * and removed from the obj's gpuva list, as that would + * would result in missing the unlock below + */ + drm_gpuvm_bo_get(vm_bo); + + last_locked =3D vm_bo; + } + + fn(obj); + +out_unlock: + if (last_locked) { + drm_gem_for_each_gpuvm_bo (vm_bo, obj) { + struct dma_resv *resv =3D drm_gpuvm_resv(vm_bo->vm); + + if (resv =3D=3D obj->resv) + continue; + + dma_resv_unlock(resv); + + /* Drop the ref taken while locking: */ + drm_gpuvm_bo_put(vm_bo); + + if (last_locked =3D=3D vm_bo) + break; + } + } + + return ret =3D=3D 0; +} + static bool purge(struct drm_gem_object *obj, struct ww_acquire_ctx *ticket) { @@ -52,9 +121,7 @@ purge(struct drm_gem_object *obj, struct ww_acquire_ctx = *ticket) if (msm_gem_active(obj)) return false; =20 - msm_gem_purge(obj); - - return true; + return with_vm_locks(ticket, msm_gem_purge, obj); } =20 static bool @@ -66,9 +133,7 @@ evict(struct drm_gem_object *obj, struct ww_acquire_ctx = *ticket) if (msm_gem_active(obj)) return false; =20 - msm_gem_evict(obj); - - return true; + return with_vm_locks(ticket, msm_gem_evict, obj); } =20 static bool @@ -100,6 +165,7 @@ static unsigned long msm_gem_shrinker_scan(struct shrinker *shrinker, struct shrink_control *sc) { struct msm_drm_private *priv =3D shrinker->private_data; + struct ww_acquire_ctx ticket; struct { struct drm_gem_lru *lru; bool (*shrink)(struct drm_gem_object *obj, struct ww_acquire_ctx *ticket= ); @@ -124,7 +190,7 @@ msm_gem_shrinker_scan(struct shrinker *shrinker, struct= shrink_control *sc) drm_gem_lru_scan(stages[i].lru, nr, &stages[i].remaining, stages[i].shrink, - NULL); + &ticket); nr -=3D stages[i].freed; freed +=3D stages[i].freed; remaining +=3D stages[i].remaining; diff --git a/drivers/gpu/drm/msm/msm_gem_submit.c b/drivers/gpu/drm/msm/msm= _gem_submit.c index 2de5a07392eb..bd8e465e8049 100644 --- a/drivers/gpu/drm/msm/msm_gem_submit.c +++ b/drivers/gpu/drm/msm/msm_gem_submit.c @@ -256,11 +256,18 @@ static int submit_lookup_cmds(struct msm_gem_submit *= submit, /* This is where we make sure all the bo's are reserved and pin'd: */ static int submit_lock_objects(struct msm_gem_submit *submit) { + unsigned flags =3D DRM_EXEC_IGNORE_DUPLICATES | DRM_EXEC_INTERRUPTIBLE_WA= IT; int ret; =20 - drm_exec_init(&submit->exec, DRM_EXEC_INTERRUPTIBLE_WAIT, submit->nr_bos); +// TODO need to add vm_bind path which locks vm resv + external objs + drm_exec_init(&submit->exec, flags, submit->nr_bos); =20 drm_exec_until_all_locked (&submit->exec) { + ret =3D drm_exec_lock_obj(&submit->exec, + drm_gpuvm_resv_obj(&submit->vm->base)); + drm_exec_retry_on_contention(&submit->exec); + if (ret) + goto error; for (unsigned i =3D 0; i < submit->nr_bos; i++) { struct drm_gem_object *obj =3D submit->bos[i].obj; ret =3D drm_exec_prepare_obj(&submit->exec, obj, 1); diff --git a/drivers/gpu/drm/msm/msm_gem_vma.c b/drivers/gpu/drm/msm/msm_ge= m_vma.c index 1f4c9b5c2e8f..ccb20897a2b0 100644 --- a/drivers/gpu/drm/msm/msm_gem_vma.c +++ b/drivers/gpu/drm/msm/msm_gem_vma.c @@ -92,15 +92,13 @@ void msm_gem_vma_close(struct msm_gem_vma *vma) =20 GEM_WARN_ON(vma->mapped); =20 - spin_lock(&vm->mm_lock); + drm_gpuvm_resv_assert_held(&vm->base); + if (vma->base.va.addr) drm_mm_remove_node(&vma->node); - spin_unlock(&vm->mm_lock); =20 - mutex_lock(&vm->vm_lock); drm_gpuva_remove(&vma->base); drm_gpuva_unlink(&vma->base); - mutex_unlock(&vm->vm_lock); =20 kfree(vma); } @@ -114,16 +112,16 @@ msm_gem_vma_new(struct msm_gem_vm *vm, struct drm_gem= _object *obj, struct msm_gem_vma *vma; int ret; =20 + drm_gpuvm_resv_assert_held(&vm->base); + vma =3D kzalloc(sizeof(*vma), GFP_KERNEL); if (!vma) return ERR_PTR(-ENOMEM); =20 if (vm->managed) { - spin_lock(&vm->mm_lock); ret =3D drm_mm_insert_node_in_range(&vm->mm, &vma->node, obj->size, PAGE_SIZE, 0, range_start, range_end, 0); - spin_unlock(&vm->mm_lock); =20 if (ret) goto err_free_vma; @@ -137,9 +135,7 @@ msm_gem_vma_new(struct msm_gem_vm *vm, struct drm_gem_o= bject *obj, drm_gpuva_init(&vma->base, range_start, range_end - range_start, obj, 0); vma->mapped =3D false; =20 - mutex_lock(&vm->vm_lock); ret =3D drm_gpuva_insert(&vm->base, &vma->base); - mutex_unlock(&vm->vm_lock); if (ret) goto err_free_range; =20 @@ -149,18 +145,14 @@ msm_gem_vma_new(struct msm_gem_vm *vm, struct drm_gem= _object *obj, goto err_va_remove; } =20 - mutex_lock(&vm->vm_lock); drm_gpuvm_bo_extobj_add(vm_bo); drm_gpuva_link(&vma->base, vm_bo); - mutex_unlock(&vm->vm_lock); GEM_WARN_ON(drm_gpuvm_bo_put(vm_bo)); =20 return vma; =20 err_va_remove: - mutex_lock(&vm->vm_lock); drm_gpuva_remove(&vma->base); - mutex_unlock(&vm->vm_lock); err_free_range: if (vm->managed) drm_mm_remove_node(&vma->node); @@ -191,6 +183,11 @@ struct msm_gem_vm * msm_gem_vm_create(struct drm_device *drm, struct msm_mmu *mmu, const char = *name, u64 va_start, u64 va_size, bool managed) { + /* + * We mostly want to use DRM_GPUVM_RESV_PROTECTED, except that + * makes drm_gpuvm_bo_evict() a no-op for extobjs (ie. we loose + * tracking that an extobj is evicted) :facepalm: + */ enum drm_gpuvm_flags flags =3D 0; struct msm_gem_vm *vm; struct drm_gem_object *dummy_gem; @@ -213,9 +210,6 @@ msm_gem_vm_create(struct drm_device *drm, struct msm_mm= u *mmu, const char *name, va_start, va_size, 0, 0, &msm_gpuvm_ops); drm_gem_object_put(dummy_gem); =20 - spin_lock_init(&vm->mm_lock); - mutex_init(&vm->vm_lock); - vm->mmu =3D mmu; vm->managed =3D managed; =20 --=20 2.50.0 From nobody Wed Oct 8 10:58:50 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 5333A2367D9 for ; Sun, 29 Jun 2025 14:07:47 +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=1751206070; cv=none; b=fyLgNY5tXKVNFgeaQmFjC5iNQz2a4JndTo7QYdvnhsOZv4zm8b2DmxeeqAuqwl+Gc2JOuVWSjcFs9NHszz2LxZDNnElTx8tSs2imUjSo7E+jpGTD7zvP3j1/3FtukkIYbUgHNnBDW1sMxd03WLzguwaE8KmO/AtYwj5YhNJUOnI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751206070; c=relaxed/simple; bh=utD+EU1joHyPgdhBukUZWz5oj3sIgA6oZ09bBZk3Zt0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JpX4H3qlr11+ANIsvsM92iOgM3DeLu1F8s1Q8AdmMgGltiCsVXWszG08GZuL4C5AinXeIcyN8aRFujwgdf2XoqCNObTg6QOhVsfPU9Ia298lrMiX1S6McyF5j+jcIOGZxGyZnGs299uW2kWdEKCAO+oxRohq1QVE/loH8UeIp9Q= 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=UOttiT1I; 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="UOttiT1I" Received: from pps.filterd (m0279871.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 55TAh20S010025 for ; Sun, 29 Jun 2025 14:07:46 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=e9N226TKmG8 dr6P8X0n3BrfaNxHloLnA/9DS1innPPM=; b=UOttiT1IV26c+M5j/dG0JJZShQF rAYlm2iEm3XMazv6q5Jl+oNkQAllbqaf5Vokg9CijbvkS92uMEKCM3a34OCH9mCc MMIxBUr0w/Zmu4F+FNtL5jdb0IbKyomTPyIcGDd5nzqkHmqupG2F/jgx6Xnl7crW fAhcUjpBHakYgT3MZZrCRS57NpLjrSUpZ0rtKEVc6m60m4i98QVxye4whmJQ1lQA D7lv06HoT8+fTXXOIS94O8Jpd7M67W3lETtvhXE+x25lPfI2EcuTTCupv2XbHVzc vj8YeTzxGATXw08psmkp4/opwj+U/UYLP3XY2Tslu0LrkTX7pLlSeG1wgtg== Received: from mail-pj1-f69.google.com (mail-pj1-f69.google.com [209.85.216.69]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 47j801t7qy-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Sun, 29 Jun 2025 14:07:45 +0000 (GMT) Received: by mail-pj1-f69.google.com with SMTP id 98e67ed59e1d1-31315427249so3083560a91.1 for ; Sun, 29 Jun 2025 07:07:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751206065; x=1751810865; 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=e9N226TKmG8dr6P8X0n3BrfaNxHloLnA/9DS1innPPM=; b=Sc/8SOVfX023Fazn7UB2XLJA6OO/zkIAYpUZP1tiLDfdxEruBKvW2/OOEcyNhE0Rex RDaeoQm6EfN9/l7/ShluxWNWVY0dY8aYdi1UBiOSFCY5v2Zfvp0kNNdYMD35w0fsBtJG XccEXl0PK1jCP1yfrv/WIzVtgZBYnMvdraxOukCzuV1mI8WZLfr96+qNY++w0VrRnCQ5 5k9mFg5nyhu38NONe5TtK2k+CkjHgkQhZSIgGcxvPtuS0Bn3wP7+YpEwNTSOki0s2IHb znrt+Nsivt0a3FAZRldvDGrr4ntpyji2GRpk4OBUrwYWHGV6xib3G4h1beSufNPl2es7 wjWg== X-Forwarded-Encrypted: i=1; AJvYcCWUqW3hDpJIAWsb0t/SM0v+jEbESzSa/o/KzMsjB+//nsZWHmqu1goNnfUU98zFlT1JPhqCpz2Ew2+AYC8=@vger.kernel.org X-Gm-Message-State: AOJu0YyP8wAGAElZFXjqXLzJ5kKaEla+8ymjVZa5qguL7UgR/MHATT9+ nxpvoymh3yL/wTzILiWneO8g/+WnMmEfipFlbDXxj3od3eU9FSYaMZWZlQDRMZuTzDuxCTOKIAN eKn/3NgQ3WHdh7C/BAlEMRdLLSQr5QDDPkL78SMyOlVGU+TDV5GquLcjvjWLanNO+mvw= X-Gm-Gg: ASbGncv/X6r2IqD17O0tGinv6e8CEy1M8uUrMezQpjL9O0qcGGbQlUhtUHQx5rXVqpb QZ0CEyiLe6QJOZB/9UEHyCPcHeVIqUBq9OeIWPxt8oHj3j71dc+HhoGcyauPw1Di5ntP8THhPla OvwwqzNndVrjJuPAZ8TqJ6BrQhuLK0BkSykICx2K8xvH91pRATHq4sk8amUUpyuroYOYx3pCG4T td17DIuDqsGzIzQiEDXJAWSjaEL5Xl6Y4MjrKVWDR9niXPH5OBJRGQq1+Q2TIwu9aVq43ptWCfF f6XA0du9P/bHHXW44tj0tEmaMkcJqP71 X-Received: by 2002:a17:90b:2247:b0:311:c93b:3ca2 with SMTP id 98e67ed59e1d1-318c8eb9988mr13958452a91.6.1751206064113; Sun, 29 Jun 2025 07:07:44 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGTzJyNnEA8T/IBTB/O2ITD5oDC5e4Pi5U4u9lzsd3gThJjH7kGJbjmMKwuE8ZaYXjo1X7CCg== X-Received: by 2002:a17:90b:2247:b0:311:c93b:3ca2 with SMTP id 98e67ed59e1d1-318c8eb9988mr13958388a91.6.1751206063358; Sun, 29 Jun 2025 07:07:43 -0700 (PDT) Received: from localhost ([2601:1c0:5000:d5c:5b3e:de60:4fda:e7b1]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-315f53879bbsm11733015a91.9.2025.06.29.07.07.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Jun 2025 07:07:42 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, Connor Abbott , Antonino Maniscalco , Danilo Krummrich , Rob Clark , Rob Clark , Sean Paul , Konrad Dybcio , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Marijn Suijten , David Airlie , Simona Vetter , Arnd Bergmann , Krzysztof Kozlowski , Eugene Lepshy , Haoxiang Li , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v8 15/42] drm/msm: Use drm_gpuvm types more Date: Sun, 29 Jun 2025 07:03:18 -0700 Message-ID: <20250629140537.30850-16-robin.clark@oss.qualcomm.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250629140537.30850-1-robin.clark@oss.qualcomm.com> References: <20250629140537.30850-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-GUID: FfOp64cB0BEOteC88466nYCI0meUs3Hb X-Authority-Analysis: v=2.4 cv=YPWfyQGx c=1 sm=1 tr=0 ts=686148b2 cx=c_pps a=vVfyC5vLCtgYJKYeQD43oA==:117 a=xqWC_Br6kY4A:10 a=6IFa9wvqVegA:10 a=cm27Pg_UAAAA:8 a=EUspDBNiAAAA:8 a=pGLkceISAAAA:8 a=WETlIjWukoXTtCS2clAA:9 a=rl5im9kqc5Lf4LNbBjHf:22 X-Proofpoint-ORIG-GUID: FfOp64cB0BEOteC88466nYCI0meUs3Hb X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjI5MDExOSBTYWx0ZWRfXzk0HeoZqgjTv GkFRYbdqu/4F3FxqYplKuETNbsAfnvz7R7YL9riKbM8Gu2URhlgCKFMQHHKX9JLos4z7jh2+/D3 QuSrj0oByZSONP94Mq+/oqD1AOZuvbyQBuQR8y+5Re4WtH9Iim8jVh4jHF72ClbZT/CgY1PjoDg Vv3isS2qzqwLpm/mfP23wUNhL492YKJjtpI7yvPFB7tRjOTgdzOlmiMoFDpJGGNy1Kq7n2kgIBZ CffmkQb5MLzSvSKxsb/5nKq2IFhudrVjd3topRfnWPlMxRBsFQvg6o0l0UWfMviAq1kSJL3Axnw aTeU+u7ZRaONXvBQ7pkKnl3IS105ZrHtzSb5mGx2I7SlOWrYoTGtUQTspa3dyqQDMWWyXfFNItf SwgaZEfFFOAeKQsIjrDzTXfgMZx7QsMi7Q32fnnbNJqaz+2/fCsn+VUugKxQG8/eTV0iK6XU 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-27_05,2025-06-27_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 mlxlogscore=999 mlxscore=0 malwarescore=0 suspectscore=0 lowpriorityscore=0 clxscore=1015 impostorscore=0 adultscore=0 priorityscore=1501 bulkscore=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-2506290119 Content-Type: text/plain; charset="utf-8" From: Rob Clark Most of the driver code doesn't need to reach in to msm specific fields, so just use the drm_gpuvm/drm_gpuva types directly. This should hopefully improve commonality with other drivers and make the code easier to understand. Signed-off-by: Rob Clark Signed-off-by: Rob Clark Tested-by: Antonino Maniscalco Reviewed-by: Antonino Maniscalco --- drivers/gpu/drm/msm/adreno/a2xx_gpu.c | 6 +- drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 3 +- drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 6 +- drivers/gpu/drm/msm/adreno/a6xx_gmu.h | 2 +- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 11 +-- drivers/gpu/drm/msm/adreno/a6xx_preempt.c | 2 +- drivers/gpu/drm/msm/adreno/adreno_gpu.c | 19 +++-- drivers/gpu/drm/msm/adreno/adreno_gpu.h | 4 +- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 6 +- drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | 11 +-- drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 11 +-- drivers/gpu/drm/msm/dsi/dsi_host.c | 6 +- drivers/gpu/drm/msm/msm_drv.h | 4 +- drivers/gpu/drm/msm/msm_fb.c | 4 +- drivers/gpu/drm/msm/msm_gem.c | 94 +++++++++++------------ drivers/gpu/drm/msm/msm_gem.h | 59 +++++++------- drivers/gpu/drm/msm/msm_gem_submit.c | 8 +- drivers/gpu/drm/msm/msm_gem_vma.c | 70 +++++++---------- drivers/gpu/drm/msm/msm_gpu.c | 18 +++-- drivers/gpu/drm/msm/msm_gpu.h | 10 +-- drivers/gpu/drm/msm/msm_kms.c | 6 +- drivers/gpu/drm/msm/msm_kms.h | 2 +- drivers/gpu/drm/msm/msm_submitqueue.c | 2 +- 23 files changed, 175 insertions(+), 189 deletions(-) diff --git a/drivers/gpu/drm/msm/adreno/a2xx_gpu.c b/drivers/gpu/drm/msm/ad= reno/a2xx_gpu.c index 889480aa13ba..ec38db45d8a3 100644 --- a/drivers/gpu/drm/msm/adreno/a2xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a2xx_gpu.c @@ -113,7 +113,7 @@ static int a2xx_hw_init(struct msm_gpu *gpu) uint32_t *ptr, len; int i, ret; =20 - a2xx_gpummu_params(gpu->vm->mmu, &pt_base, &tran_error); + a2xx_gpummu_params(to_msm_vm(gpu->vm)->mmu, &pt_base, &tran_error); =20 DBG("%s", gpu->name); =20 @@ -466,11 +466,11 @@ static struct msm_gpu_state *a2xx_gpu_state_get(struc= t msm_gpu *gpu) return state; } =20 -static struct msm_gem_vm * +static struct drm_gpuvm * a2xx_create_vm(struct msm_gpu *gpu, struct platform_device *pdev) { struct msm_mmu *mmu =3D a2xx_gpummu_new(&pdev->dev, gpu); - struct msm_gem_vm *vm; + struct drm_gpuvm *vm; =20 vm =3D msm_gem_vm_create(gpu->dev, mmu, "gpu", SZ_16M, 0xfff * SZ_64K, tr= ue); =20 diff --git a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c b/drivers/gpu/drm/msm/ad= reno/a5xx_gpu.c index 04138a06724b..ee927d8cc0dc 100644 --- a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c @@ -1786,7 +1786,8 @@ struct msm_gpu *a5xx_gpu_init(struct drm_device *dev) return ERR_PTR(ret); } =20 - msm_mmu_set_fault_handler(gpu->vm->mmu, gpu, a5xx_fault_handler); + msm_mmu_set_fault_handler(to_msm_vm(gpu->vm)->mmu, gpu, + a5xx_fault_handler); =20 /* Set up the preemption specific bits and pieces for each ringbuffer */ a5xx_preempt_init(gpu); diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c b/drivers/gpu/drm/msm/ad= reno/a6xx_gmu.c index 77d9ff9632d1..28e6705c6da6 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c @@ -1259,6 +1259,8 @@ int a6xx_gmu_stop(struct a6xx_gpu *a6xx_gpu) =20 static void a6xx_gmu_memory_free(struct a6xx_gmu *gmu) { + struct msm_mmu *mmu =3D to_msm_vm(gmu->vm)->mmu; + msm_gem_kernel_put(gmu->hfi.obj, gmu->vm); msm_gem_kernel_put(gmu->debug.obj, gmu->vm); msm_gem_kernel_put(gmu->icache.obj, gmu->vm); @@ -1266,8 +1268,8 @@ static void a6xx_gmu_memory_free(struct a6xx_gmu *gmu) msm_gem_kernel_put(gmu->dummy.obj, gmu->vm); msm_gem_kernel_put(gmu->log.obj, gmu->vm); =20 - gmu->vm->mmu->funcs->detach(gmu->vm->mmu); - msm_gem_vm_put(gmu->vm); + mmu->funcs->detach(mmu); + drm_gpuvm_put(gmu->vm); } =20 static int a6xx_gmu_memory_alloc(struct a6xx_gmu *gmu, struct a6xx_gmu_bo = *bo, diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gmu.h b/drivers/gpu/drm/msm/ad= reno/a6xx_gmu.h index fc288dfe889f..d1ce11131ba6 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gmu.h +++ b/drivers/gpu/drm/msm/adreno/a6xx_gmu.h @@ -62,7 +62,7 @@ struct a6xx_gmu { /* For serializing communication with the GMU: */ struct mutex lock; =20 - struct msm_gem_vm *vm; + struct drm_gpuvm *vm; =20 void __iomem *mmio; void __iomem *rscc; diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c b/drivers/gpu/drm/msm/ad= reno/a6xx_gpu.c index 262129cb4415..0b78888c58af 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c @@ -120,7 +120,7 @@ static void a6xx_set_pagetable(struct a6xx_gpu *a6xx_gp= u, if (ctx->seqno =3D=3D ring->cur_ctx_seqno) return; =20 - if (msm_iommu_pagetable_params(ctx->vm->mmu, &ttbr, &asid)) + if (msm_iommu_pagetable_params(to_msm_vm(ctx->vm)->mmu, &ttbr, &asid)) return; =20 if (adreno_gpu->info->family >=3D ADRENO_7XX_GEN1) { @@ -2256,7 +2256,7 @@ static void a6xx_gpu_set_freq(struct msm_gpu *gpu, st= ruct dev_pm_opp *opp, mutex_unlock(&a6xx_gpu->gmu.lock); } =20 -static struct msm_gem_vm * +static struct drm_gpuvm * a6xx_create_vm(struct msm_gpu *gpu, struct platform_device *pdev) { struct adreno_gpu *adreno_gpu =3D to_adreno_gpu(gpu); @@ -2274,12 +2274,12 @@ a6xx_create_vm(struct msm_gpu *gpu, struct platform= _device *pdev) return adreno_iommu_create_vm(gpu, pdev, quirks); } =20 -static struct msm_gem_vm * +static struct drm_gpuvm * a6xx_create_private_vm(struct msm_gpu *gpu) { struct msm_mmu *mmu; =20 - mmu =3D msm_iommu_pagetable_create(gpu->vm->mmu); + mmu =3D msm_iommu_pagetable_create(to_msm_vm(gpu->vm)->mmu); =20 if (IS_ERR(mmu)) return ERR_CAST(mmu); @@ -2559,7 +2559,8 @@ struct msm_gpu *a6xx_gpu_init(struct drm_device *dev) =20 adreno_gpu->uche_trap_base =3D 0x1fffffffff000ull; =20 - msm_mmu_set_fault_handler(gpu->vm->mmu, gpu, a6xx_fault_handler); + msm_mmu_set_fault_handler(to_msm_vm(gpu->vm)->mmu, gpu, + a6xx_fault_handler); =20 a6xx_calc_ubwc_config(adreno_gpu); /* Set up the preemption specific bits and pieces for each ringbuffer */ diff --git a/drivers/gpu/drm/msm/adreno/a6xx_preempt.c b/drivers/gpu/drm/ms= m/adreno/a6xx_preempt.c index f6194a57f794..9e7f2e5fb2b9 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_preempt.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_preempt.c @@ -377,7 +377,7 @@ static int preempt_init_ring(struct a6xx_gpu *a6xx_gpu, =20 struct a7xx_cp_smmu_info *smmu_info_ptr =3D ptr; =20 - msm_iommu_pagetable_params(gpu->vm->mmu, &ttbr, &asid); + msm_iommu_pagetable_params(to_msm_vm(gpu->vm)->mmu, &ttbr, &asid); =20 smmu_info_ptr->magic =3D GEN7_CP_SMMU_INFO_MAGIC; smmu_info_ptr->ttbr0 =3D ttbr; diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/= adreno/adreno_gpu.c index 46199a6d0e41..676fc078d545 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c @@ -191,21 +191,21 @@ int adreno_zap_shader_load(struct msm_gpu *gpu, u32 p= asid) return zap_shader_load_mdt(gpu, adreno_gpu->info->zapfw, pasid); } =20 -struct msm_gem_vm * +struct drm_gpuvm * adreno_create_vm(struct msm_gpu *gpu, struct platform_device *pdev) { return adreno_iommu_create_vm(gpu, pdev, 0); } =20 -struct msm_gem_vm * +struct drm_gpuvm * adreno_iommu_create_vm(struct msm_gpu *gpu, struct platform_device *pdev, unsigned long quirks) { struct iommu_domain_geometry *geometry; struct msm_mmu *mmu; - struct msm_gem_vm *vm; + struct drm_gpuvm *vm; u64 start, size; =20 mmu =3D msm_iommu_gpu_new(&pdev->dev, gpu, quirks); @@ -275,9 +275,11 @@ void adreno_check_and_reenable_stall(struct adreno_gpu= *adreno_gpu) if (!priv->stall_enabled && ktime_after(ktime_get(), priv->stall_reenable_time) && !READ_ONCE(gpu->crashstate)) { + struct msm_mmu *mmu =3D to_msm_vm(gpu->vm)->mmu; + priv->stall_enabled =3D true; =20 - gpu->vm->mmu->funcs->set_stall(gpu->vm->mmu, true); + mmu->funcs->set_stall(mmu, true); } spin_unlock_irqrestore(&priv->fault_stall_lock, flags); } @@ -292,6 +294,7 @@ int adreno_fault_handler(struct msm_gpu *gpu, unsigned = long iova, int flags, u32 scratch[4]) { struct msm_drm_private *priv =3D gpu->dev->dev_private; + struct msm_mmu *mmu =3D to_msm_vm(gpu->vm)->mmu; const char *type =3D "UNKNOWN"; bool do_devcoredump =3D info && (info->fsr & ARM_SMMU_FSR_SS) && !READ_ONCE(gpu->crashstate); @@ -305,7 +308,7 @@ int adreno_fault_handler(struct msm_gpu *gpu, unsigned = long iova, int flags, if (priv->stall_enabled) { priv->stall_enabled =3D false; =20 - gpu->vm->mmu->funcs->set_stall(gpu->vm->mmu, false); + mmu->funcs->set_stall(mmu, false); } =20 priv->stall_reenable_time =3D ktime_add_ms(ktime_get(), 500); @@ -405,7 +408,7 @@ int adreno_get_param(struct msm_gpu *gpu, struct msm_co= ntext *ctx, return 0; case MSM_PARAM_FAULTS: if (ctx->vm) - *value =3D gpu->global_faults + ctx->vm->faults; + *value =3D gpu->global_faults + to_msm_vm(ctx->vm)->faults; else *value =3D gpu->global_faults; return 0; @@ -415,12 +418,12 @@ int adreno_get_param(struct msm_gpu *gpu, struct msm_= context *ctx, case MSM_PARAM_VA_START: if (ctx->vm =3D=3D gpu->vm) return UERR(EINVAL, drm, "requires per-process pgtables"); - *value =3D ctx->vm->base.mm_start; + *value =3D ctx->vm->mm_start; return 0; case MSM_PARAM_VA_SIZE: if (ctx->vm =3D=3D gpu->vm) return UERR(EINVAL, drm, "requires per-process pgtables"); - *value =3D ctx->vm->base.mm_range; + *value =3D ctx->vm->mm_range; return 0; case MSM_PARAM_HIGHEST_BANK_BIT: *value =3D adreno_gpu->ubwc_config.highest_bank_bit; diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.h b/drivers/gpu/drm/msm/= adreno/adreno_gpu.h index b1761f990aa1..8650bbd8698e 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.h +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.h @@ -622,11 +622,11 @@ void adreno_show_object(struct drm_printer *p, void *= *ptr, int len, * Common helper function to initialize the default address space for arm-= smmu * attached targets */ -struct msm_gem_vm * +struct drm_gpuvm * adreno_create_vm(struct msm_gpu *gpu, struct platform_device *pdev); =20 -struct msm_gem_vm * +struct drm_gpuvm * adreno_iommu_create_vm(struct msm_gpu *gpu, struct platform_device *pdev, unsigned long quirks); diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/= disp/dpu1/dpu_kms.c index 2c5687a188b6..f7d0f39bcc5b 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c @@ -1098,17 +1098,17 @@ static void _dpu_kms_mmu_destroy(struct dpu_kms *dp= u_kms) if (!dpu_kms->base.vm) return; =20 - mmu =3D dpu_kms->base.vm->mmu; + mmu =3D to_msm_vm(dpu_kms->base.vm)->mmu; =20 mmu->funcs->detach(mmu); - msm_gem_vm_put(dpu_kms->base.vm); + drm_gpuvm_put(dpu_kms->base.vm); =20 dpu_kms->base.vm =3D NULL; } =20 static int _dpu_kms_mmu_init(struct dpu_kms *dpu_kms) { - struct msm_gem_vm *vm; + struct drm_gpuvm *vm; =20 vm =3D msm_kms_init_vm(dpu_kms->dev); if (IS_ERR(vm)) diff --git a/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c b/drivers/gpu/drm/msm= /disp/mdp4/mdp4_kms.c index a867c684c6d6..9acde91ad6c3 100644 --- a/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c +++ b/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c @@ -122,15 +122,16 @@ static void mdp4_destroy(struct msm_kms *kms) { struct mdp4_kms *mdp4_kms =3D to_mdp4_kms(to_mdp_kms(kms)); struct device *dev =3D mdp4_kms->dev->dev; - struct msm_gem_vm *vm =3D kms->vm; =20 if (mdp4_kms->blank_cursor_iova) msm_gem_unpin_iova(mdp4_kms->blank_cursor_bo, kms->vm); drm_gem_object_put(mdp4_kms->blank_cursor_bo); =20 - if (vm) { - vm->mmu->funcs->detach(vm->mmu); - msm_gem_vm_put(vm); + if (kms->vm) { + struct msm_mmu *mmu =3D to_msm_vm(kms->vm)->mmu; + + mmu->funcs->detach(mmu); + drm_gpuvm_put(kms->vm); } =20 if (mdp4_kms->rpm_enabled) @@ -398,7 +399,7 @@ static int mdp4_kms_init(struct drm_device *dev) struct mdp4_kms *mdp4_kms =3D to_mdp4_kms(to_mdp_kms(priv->kms)); struct msm_kms *kms =3D NULL; struct msm_mmu *mmu; - struct msm_gem_vm *vm; + struct drm_gpuvm *vm; int ret; u32 major, minor; unsigned long max_clk; diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c b/drivers/gpu/drm/msm= /disp/mdp5/mdp5_kms.c index 9dca0385a42d..b6e6bd1f95ee 100644 --- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c +++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c @@ -198,11 +198,12 @@ static void mdp5_destroy(struct mdp5_kms *mdp5_kms); static void mdp5_kms_destroy(struct msm_kms *kms) { struct mdp5_kms *mdp5_kms =3D to_mdp5_kms(to_mdp_kms(kms)); - struct msm_gem_vm *vm =3D kms->vm; =20 - if (vm) { - vm->mmu->funcs->detach(vm->mmu); - msm_gem_vm_put(vm); + if (kms->vm) { + struct msm_mmu *mmu =3D to_msm_vm(kms->vm)->mmu; + + mmu->funcs->detach(mmu); + drm_gpuvm_put(kms->vm); } =20 mdp_kms_destroy(&mdp5_kms->base); @@ -500,7 +501,7 @@ static int mdp5_kms_init(struct drm_device *dev) struct mdp5_kms *mdp5_kms; struct mdp5_cfg *config; struct msm_kms *kms =3D priv->kms; - struct msm_gem_vm *vm; + struct drm_gpuvm *vm; int i, ret; =20 ret =3D mdp5_init(to_platform_device(dev->dev), dev); diff --git a/drivers/gpu/drm/msm/dsi/dsi_host.c b/drivers/gpu/drm/msm/dsi/d= si_host.c index 16335ebd21e4..2d1699b7dc93 100644 --- a/drivers/gpu/drm/msm/dsi/dsi_host.c +++ b/drivers/gpu/drm/msm/dsi/dsi_host.c @@ -143,7 +143,7 @@ struct msm_dsi_host { =20 /* DSI 6G TX buffer*/ struct drm_gem_object *tx_gem_obj; - struct msm_gem_vm *vm; + struct drm_gpuvm *vm; =20 /* DSI v2 TX buffer */ void *tx_buf; @@ -1146,7 +1146,7 @@ int dsi_tx_buf_alloc_6g(struct msm_dsi_host *msm_host= , int size) uint64_t iova; u8 *data; =20 - msm_host->vm =3D msm_gem_vm_get(priv->kms->vm); + msm_host->vm =3D drm_gpuvm_get(priv->kms->vm); =20 data =3D msm_gem_kernel_new(dev, size, MSM_BO_WC, msm_host->vm, @@ -1194,7 +1194,7 @@ void msm_dsi_tx_buf_free(struct mipi_dsi_host *host) =20 if (msm_host->tx_gem_obj) { msm_gem_kernel_put(msm_host->tx_gem_obj, msm_host->vm); - msm_gem_vm_put(msm_host->vm); + drm_gpuvm_put(msm_host->vm); msm_host->tx_gem_obj =3D NULL; msm_host->vm =3D NULL; } diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h index eb009bd193e3..0fe3c9a24baa 100644 --- a/drivers/gpu/drm/msm/msm_drv.h +++ b/drivers/gpu/drm/msm/msm_drv.h @@ -48,8 +48,6 @@ struct msm_rd_state; struct msm_perf_state; struct msm_gem_submit; struct msm_fence_context; -struct msm_gem_vm; -struct msm_gem_vma; struct msm_disp_state; =20 #define MAX_CRTCS 8 @@ -253,7 +251,7 @@ void msm_crtc_disable_vblank(struct drm_crtc *crtc); int msm_register_mmu(struct drm_device *dev, struct msm_mmu *mmu); void msm_unregister_mmu(struct drm_device *dev, struct msm_mmu *mmu); =20 -struct msm_gem_vm *msm_kms_init_vm(struct drm_device *dev); +struct drm_gpuvm *msm_kms_init_vm(struct drm_device *dev); bool msm_use_mmu(struct drm_device *dev); =20 int msm_ioctl_gem_submit(struct drm_device *dev, void *data, diff --git a/drivers/gpu/drm/msm/msm_fb.c b/drivers/gpu/drm/msm/msm_fb.c index 3b17d83f6673..8ae2f326ec54 100644 --- a/drivers/gpu/drm/msm/msm_fb.c +++ b/drivers/gpu/drm/msm/msm_fb.c @@ -78,7 +78,7 @@ void msm_framebuffer_describe(struct drm_framebuffer *fb,= struct seq_file *m) int msm_framebuffer_prepare(struct drm_framebuffer *fb, bool needs_dirtyfb) { struct msm_drm_private *priv =3D fb->dev->dev_private; - struct msm_gem_vm *vm =3D priv->kms->vm; + struct drm_gpuvm *vm =3D priv->kms->vm; struct msm_framebuffer *msm_fb =3D to_msm_framebuffer(fb); int ret, i, n =3D fb->format->num_planes; =20 @@ -102,7 +102,7 @@ int msm_framebuffer_prepare(struct drm_framebuffer *fb,= bool needs_dirtyfb) void msm_framebuffer_cleanup(struct drm_framebuffer *fb, bool needed_dirty= fb) { struct msm_drm_private *priv =3D fb->dev->dev_private; - struct msm_gem_vm *vm =3D priv->kms->vm; + struct drm_gpuvm *vm =3D priv->kms->vm; struct msm_framebuffer *msm_fb =3D to_msm_framebuffer(fb); int i, n =3D fb->format->num_planes; =20 diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c index 82293806219a..763bafcff4cc 100644 --- a/drivers/gpu/drm/msm/msm_gem.c +++ b/drivers/gpu/drm/msm/msm_gem.c @@ -45,20 +45,20 @@ static int msm_gem_open(struct drm_gem_object *obj, str= uct drm_file *file) =20 static void put_iova_spaces(struct drm_gem_object *obj, struct drm_gpuvm *= vm, bool close); =20 -static void detach_vm(struct drm_gem_object *obj, struct msm_gem_vm *vm) +static void detach_vm(struct drm_gem_object *obj, struct drm_gpuvm *vm) { msm_gem_assert_locked(obj); - drm_gpuvm_resv_assert_held(&vm->base); + drm_gpuvm_resv_assert_held(vm); =20 - struct drm_gpuvm_bo *vm_bo =3D drm_gpuvm_bo_find(&vm->base, obj); + struct drm_gpuvm_bo *vm_bo =3D drm_gpuvm_bo_find(vm, obj); if (vm_bo) { struct drm_gpuva *vma; =20 drm_gpuvm_bo_for_each_va (vma, vm_bo) { - if (vma->vm !=3D &vm->base) + if (vma->vm !=3D vm) continue; - msm_gem_vma_purge(to_msm_vma(vma)); - msm_gem_vma_close(to_msm_vma(vma)); + msm_gem_vma_purge(vma); + msm_gem_vma_close(vma); break; } =20 @@ -89,7 +89,7 @@ static void msm_gem_close(struct drm_gem_object *obj, str= uct drm_file *file) msecs_to_jiffies(1000)); =20 msm_gem_lock_vm_and_obj(&exec, obj, ctx->vm); - put_iova_spaces(obj, &ctx->vm->base, true); + put_iova_spaces(obj, ctx->vm, true); detach_vm(obj, ctx->vm); drm_exec_fini(&exec); /* drop locks */ } @@ -386,8 +386,8 @@ uint64_t msm_gem_mmap_offset(struct drm_gem_object *obj) return offset; } =20 -static struct msm_gem_vma *lookup_vma(struct drm_gem_object *obj, - struct msm_gem_vm *vm) +static struct drm_gpuva *lookup_vma(struct drm_gem_object *obj, + struct drm_gpuvm *vm) { struct drm_gpuvm_bo *vm_bo; =20 @@ -397,13 +397,13 @@ static struct msm_gem_vma *lookup_vma(struct drm_gem_= object *obj, struct drm_gpuva *vma; =20 drm_gpuvm_bo_for_each_va (vma, vm_bo) { - if (vma->vm =3D=3D &vm->base) { + if (vma->vm =3D=3D vm) { /* lookup_vma() should only be used in paths * with at most one vma per vm */ GEM_WARN_ON(!list_is_singular(&vm_bo->list.gpuva)); =20 - return to_msm_vma(vma); + return vma; } } } @@ -433,22 +433,20 @@ put_iova_spaces(struct drm_gem_object *obj, struct dr= m_gpuvm *vm, bool close) drm_gpuvm_bo_get(vm_bo); =20 drm_gpuvm_bo_for_each_va_safe (vma, vmatmp, vm_bo) { - struct msm_gem_vma *msm_vma =3D to_msm_vma(vma); - - msm_gem_vma_purge(msm_vma); + msm_gem_vma_purge(vma); if (close) - msm_gem_vma_close(msm_vma); + msm_gem_vma_close(vma); } =20 drm_gpuvm_bo_put(vm_bo); } } =20 -static struct msm_gem_vma *get_vma_locked(struct drm_gem_object *obj, - struct msm_gem_vm *vm, - u64 range_start, u64 range_end) +static struct drm_gpuva *get_vma_locked(struct drm_gem_object *obj, + struct drm_gpuvm *vm, u64 range_start, + u64 range_end) { - struct msm_gem_vma *vma; + struct drm_gpuva *vma; =20 msm_gem_assert_locked(obj); =20 @@ -457,14 +455,14 @@ static struct msm_gem_vma *get_vma_locked(struct drm_= gem_object *obj, if (!vma) { vma =3D msm_gem_vma_new(vm, obj, range_start, range_end); } else { - GEM_WARN_ON(vma->base.va.addr < range_start); - GEM_WARN_ON((vma->base.va.addr + obj->size) > range_end); + GEM_WARN_ON(vma->va.addr < range_start); + GEM_WARN_ON((vma->va.addr + obj->size) > range_end); } =20 return vma; } =20 -int msm_gem_pin_vma_locked(struct drm_gem_object *obj, struct msm_gem_vma = *vma) +int msm_gem_pin_vma_locked(struct drm_gem_object *obj, struct drm_gpuva *v= ma) { struct msm_gem_object *msm_obj =3D to_msm_bo(obj); struct page **pages; @@ -517,17 +515,17 @@ void msm_gem_unpin_active(struct drm_gem_object *obj) update_lru_active(obj); } =20 -struct msm_gem_vma *msm_gem_get_vma_locked(struct drm_gem_object *obj, - struct msm_gem_vm *vm) +struct drm_gpuva *msm_gem_get_vma_locked(struct drm_gem_object *obj, + struct drm_gpuvm *vm) { return get_vma_locked(obj, vm, 0, U64_MAX); } =20 static int get_and_pin_iova_range_locked(struct drm_gem_object *obj, - struct msm_gem_vm *vm, uint64_t *iova, - u64 range_start, u64 range_end) + struct drm_gpuvm *vm, uint64_t *iova, + u64 range_start, u64 range_end) { - struct msm_gem_vma *vma; + struct drm_gpuva *vma; int ret; =20 msm_gem_assert_locked(obj); @@ -538,7 +536,7 @@ static int get_and_pin_iova_range_locked(struct drm_gem= _object *obj, =20 ret =3D msm_gem_pin_vma_locked(obj, vma); if (!ret) { - *iova =3D vma->base.va.addr; + *iova =3D vma->va.addr; pin_obj_locked(obj); } =20 @@ -550,8 +548,8 @@ static int get_and_pin_iova_range_locked(struct drm_gem= _object *obj, * limits iova to specified range (in pages) */ int msm_gem_get_and_pin_iova_range(struct drm_gem_object *obj, - struct msm_gem_vm *vm, uint64_t *iova, - u64 range_start, u64 range_end) + struct drm_gpuvm *vm, uint64_t *iova, + u64 range_start, u64 range_end) { struct drm_exec exec; int ret; @@ -564,8 +562,8 @@ int msm_gem_get_and_pin_iova_range(struct drm_gem_objec= t *obj, } =20 /* get iova and pin it. Should have a matching put */ -int msm_gem_get_and_pin_iova(struct drm_gem_object *obj, - struct msm_gem_vm *vm, uint64_t *iova) +int msm_gem_get_and_pin_iova(struct drm_gem_object *obj, struct drm_gpuvm = *vm, + uint64_t *iova) { return msm_gem_get_and_pin_iova_range(obj, vm, iova, 0, U64_MAX); } @@ -574,10 +572,10 @@ int msm_gem_get_and_pin_iova(struct drm_gem_object *o= bj, * Get an iova but don't pin it. Doesn't need a put because iovas are curr= ently * valid for the life of the object */ -int msm_gem_get_iova(struct drm_gem_object *obj, - struct msm_gem_vm *vm, uint64_t *iova) +int msm_gem_get_iova(struct drm_gem_object *obj, struct drm_gpuvm *vm, + uint64_t *iova) { - struct msm_gem_vma *vma; + struct drm_gpuva *vma; struct drm_exec exec; int ret =3D 0; =20 @@ -586,7 +584,7 @@ int msm_gem_get_iova(struct drm_gem_object *obj, if (IS_ERR(vma)) { ret =3D PTR_ERR(vma); } else { - *iova =3D vma->base.va.addr; + *iova =3D vma->va.addr; } drm_exec_fini(&exec); /* drop locks */ =20 @@ -594,9 +592,9 @@ int msm_gem_get_iova(struct drm_gem_object *obj, } =20 static int clear_iova(struct drm_gem_object *obj, - struct msm_gem_vm *vm) + struct drm_gpuvm *vm) { - struct msm_gem_vma *vma =3D lookup_vma(obj, vm); + struct drm_gpuva *vma =3D lookup_vma(obj, vm); =20 if (!vma) return 0; @@ -615,7 +613,7 @@ static int clear_iova(struct drm_gem_object *obj, * Setting an iova of zero will clear the vma. */ int msm_gem_set_iova(struct drm_gem_object *obj, - struct msm_gem_vm *vm, uint64_t iova) + struct drm_gpuvm *vm, uint64_t iova) { struct drm_exec exec; int ret =3D 0; @@ -624,11 +622,11 @@ int msm_gem_set_iova(struct drm_gem_object *obj, if (!iova) { ret =3D clear_iova(obj, vm); } else { - struct msm_gem_vma *vma; + struct drm_gpuva *vma; vma =3D get_vma_locked(obj, vm, iova, iova + obj->size); if (IS_ERR(vma)) { ret =3D PTR_ERR(vma); - } else if (GEM_WARN_ON(vma->base.va.addr !=3D iova)) { + } else if (GEM_WARN_ON(vma->va.addr !=3D iova)) { clear_iova(obj, vm); ret =3D -EBUSY; } @@ -643,10 +641,9 @@ int msm_gem_set_iova(struct drm_gem_object *obj, * purged until something else (shrinker, mm_notifier, destroy, etc) decid= es * to get rid of it */ -void msm_gem_unpin_iova(struct drm_gem_object *obj, - struct msm_gem_vm *vm) +void msm_gem_unpin_iova(struct drm_gem_object *obj, struct drm_gpuvm *vm) { - struct msm_gem_vma *vma; + struct drm_gpuva *vma; struct drm_exec exec; =20 msm_gem_lock_vm_and_obj(&exec, obj, vm); @@ -1276,9 +1273,9 @@ struct drm_gem_object *msm_gem_import(struct drm_devi= ce *dev, return ERR_PTR(ret); } =20 -void *msm_gem_kernel_new(struct drm_device *dev, uint32_t size, - uint32_t flags, struct msm_gem_vm *vm, - struct drm_gem_object **bo, uint64_t *iova) +void *msm_gem_kernel_new(struct drm_device *dev, uint32_t size, uint32_t f= lags, + struct drm_gpuvm *vm, struct drm_gem_object **bo, + uint64_t *iova) { void *vaddr; struct drm_gem_object *obj =3D msm_gem_new(dev, size, flags); @@ -1311,8 +1308,7 @@ void *msm_gem_kernel_new(struct drm_device *dev, uint= 32_t size, =20 } =20 -void msm_gem_kernel_put(struct drm_gem_object *bo, - struct msm_gem_vm *vm) +void msm_gem_kernel_put(struct drm_gem_object *bo, struct drm_gpuvm *vm) { if (IS_ERR_OR_NULL(bo)) return; diff --git a/drivers/gpu/drm/msm/msm_gem.h b/drivers/gpu/drm/msm/msm_gem.h index 33885a08cdd7..892e4132fa72 100644 --- a/drivers/gpu/drm/msm/msm_gem.h +++ b/drivers/gpu/drm/msm/msm_gem.h @@ -79,12 +79,7 @@ struct msm_gem_vm { }; #define to_msm_vm(x) container_of(x, struct msm_gem_vm, base) =20 -struct msm_gem_vm * -msm_gem_vm_get(struct msm_gem_vm *vm); - -void msm_gem_vm_put(struct msm_gem_vm *vm); - -struct msm_gem_vm * +struct drm_gpuvm * msm_gem_vm_create(struct drm_device *drm, struct msm_mmu *mmu, const char = *name, u64 va_start, u64 va_size, bool managed); =20 @@ -113,12 +108,12 @@ struct msm_gem_vma { }; #define to_msm_vma(x) container_of(x, struct msm_gem_vma, base) =20 -struct msm_gem_vma * -msm_gem_vma_new(struct msm_gem_vm *vm, struct drm_gem_object *obj, +struct drm_gpuva * +msm_gem_vma_new(struct drm_gpuvm *vm, struct drm_gem_object *obj, u64 range_start, u64 range_end); -void msm_gem_vma_purge(struct msm_gem_vma *vma); -int msm_gem_vma_map(struct msm_gem_vma *vma, int prot, struct sg_table *sg= t, int size); -void msm_gem_vma_close(struct msm_gem_vma *vma); +void msm_gem_vma_purge(struct drm_gpuva *vma); +int msm_gem_vma_map(struct drm_gpuva *vma, int prot, struct sg_table *sgt,= int size); +void msm_gem_vma_close(struct drm_gpuva *vma); =20 struct msm_gem_object { struct drm_gem_object base; @@ -163,22 +158,21 @@ struct msm_gem_object { #define to_msm_bo(x) container_of(x, struct msm_gem_object, base) =20 uint64_t msm_gem_mmap_offset(struct drm_gem_object *obj); -int msm_gem_pin_vma_locked(struct drm_gem_object *obj, struct msm_gem_vma = *vma); +int msm_gem_pin_vma_locked(struct drm_gem_object *obj, struct drm_gpuva *v= ma); void msm_gem_unpin_locked(struct drm_gem_object *obj); void msm_gem_unpin_active(struct drm_gem_object *obj); -struct msm_gem_vma *msm_gem_get_vma_locked(struct drm_gem_object *obj, - struct msm_gem_vm *vm); -int msm_gem_get_iova(struct drm_gem_object *obj, - struct msm_gem_vm *vm, uint64_t *iova); -int msm_gem_set_iova(struct drm_gem_object *obj, - struct msm_gem_vm *vm, uint64_t iova); +struct drm_gpuva *msm_gem_get_vma_locked(struct drm_gem_object *obj, + struct drm_gpuvm *vm); +int msm_gem_get_iova(struct drm_gem_object *obj, struct drm_gpuvm *vm, + uint64_t *iova); +int msm_gem_set_iova(struct drm_gem_object *obj, struct drm_gpuvm *vm, + uint64_t iova); int msm_gem_get_and_pin_iova_range(struct drm_gem_object *obj, - struct msm_gem_vm *vm, uint64_t *iova, - u64 range_start, u64 range_end); -int msm_gem_get_and_pin_iova(struct drm_gem_object *obj, - struct msm_gem_vm *vm, uint64_t *iova); -void msm_gem_unpin_iova(struct drm_gem_object *obj, - struct msm_gem_vm *vm); + struct drm_gpuvm *vm, uint64_t *iova, + u64 range_start, u64 range_end); +int msm_gem_get_and_pin_iova(struct drm_gem_object *obj, struct drm_gpuvm = *vm, + uint64_t *iova); +void msm_gem_unpin_iova(struct drm_gem_object *obj, struct drm_gpuvm *vm); void msm_gem_pin_obj_locked(struct drm_gem_object *obj); struct page **msm_gem_pin_pages_locked(struct drm_gem_object *obj); void msm_gem_unpin_pages_locked(struct drm_gem_object *obj); @@ -199,11 +193,10 @@ int msm_gem_new_handle(struct drm_device *dev, struct= drm_file *file, uint32_t size, uint32_t flags, uint32_t *handle, char *name); struct drm_gem_object *msm_gem_new(struct drm_device *dev, uint32_t size, uint32_t flags); -void *msm_gem_kernel_new(struct drm_device *dev, uint32_t size, - uint32_t flags, struct msm_gem_vm *vm, - struct drm_gem_object **bo, uint64_t *iova); -void msm_gem_kernel_put(struct drm_gem_object *bo, - struct msm_gem_vm *vm); +void *msm_gem_kernel_new(struct drm_device *dev, uint32_t size, uint32_t f= lags, + struct drm_gpuvm *vm, struct drm_gem_object **bo, + uint64_t *iova); +void msm_gem_kernel_put(struct drm_gem_object *bo, struct drm_gpuvm *vm); struct drm_gem_object *msm_gem_import(struct drm_device *dev, struct dma_buf *dmabuf, struct sg_table *sgt); __printf(2, 3) @@ -254,14 +247,14 @@ msm_gem_unlock(struct drm_gem_object *obj) static inline int msm_gem_lock_vm_and_obj(struct drm_exec *exec, struct drm_gem_object *obj, - struct msm_gem_vm *vm) + struct drm_gpuvm *vm) { int ret =3D 0; =20 drm_exec_init(exec, 0, 2); drm_exec_until_all_locked (exec) { - ret =3D drm_exec_lock_obj(exec, drm_gpuvm_resv_obj(&vm->base)); - if (!ret && (obj->resv !=3D drm_gpuvm_resv(&vm->base))) + ret =3D drm_exec_lock_obj(exec, drm_gpuvm_resv_obj(vm)); + if (!ret && (obj->resv !=3D drm_gpuvm_resv(vm))) ret =3D drm_exec_lock_obj(exec, obj); drm_exec_retry_on_contention(exec); if (GEM_WARN_ON(ret)) @@ -328,7 +321,7 @@ struct msm_gem_submit { struct kref ref; struct drm_device *dev; struct msm_gpu *gpu; - struct msm_gem_vm *vm; + struct drm_gpuvm *vm; struct list_head node; /* node in ring submit list */ struct drm_exec exec; uint32_t seqno; /* Sequence number of the submit on the ring */ diff --git a/drivers/gpu/drm/msm/msm_gem_submit.c b/drivers/gpu/drm/msm/msm= _gem_submit.c index bd8e465e8049..d8ff6aeb04ab 100644 --- a/drivers/gpu/drm/msm/msm_gem_submit.c +++ b/drivers/gpu/drm/msm/msm_gem_submit.c @@ -264,7 +264,7 @@ static int submit_lock_objects(struct msm_gem_submit *s= ubmit) =20 drm_exec_until_all_locked (&submit->exec) { ret =3D drm_exec_lock_obj(&submit->exec, - drm_gpuvm_resv_obj(&submit->vm->base)); + drm_gpuvm_resv_obj(submit->vm)); drm_exec_retry_on_contention(&submit->exec); if (ret) goto error; @@ -315,7 +315,7 @@ static int submit_pin_objects(struct msm_gem_submit *su= bmit) =20 for (i =3D 0; i < submit->nr_bos; i++) { struct drm_gem_object *obj =3D submit->bos[i].obj; - struct msm_gem_vma *vma; + struct drm_gpuva *vma; =20 /* if locking succeeded, pin bo: */ vma =3D msm_gem_get_vma_locked(obj, submit->vm); @@ -328,8 +328,8 @@ static int submit_pin_objects(struct msm_gem_submit *su= bmit) if (ret) break; =20 - submit->bos[i].vm_bo =3D drm_gpuvm_bo_get(vma->base.vm_bo); - submit->bos[i].iova =3D vma->base.va.addr; + submit->bos[i].vm_bo =3D drm_gpuvm_bo_get(vma->vm_bo); + submit->bos[i].iova =3D vma->va.addr; } =20 /* diff --git a/drivers/gpu/drm/msm/msm_gem_vma.c b/drivers/gpu/drm/msm/msm_ge= m_vma.c index ccb20897a2b0..df8eb910ca31 100644 --- a/drivers/gpu/drm/msm/msm_gem_vma.c +++ b/drivers/gpu/drm/msm/msm_gem_vma.c @@ -20,52 +20,38 @@ msm_gem_vm_free(struct drm_gpuvm *gpuvm) kfree(vm); } =20 - -void msm_gem_vm_put(struct msm_gem_vm *vm) -{ - if (vm) - drm_gpuvm_put(&vm->base); -} - -struct msm_gem_vm * -msm_gem_vm_get(struct msm_gem_vm *vm) -{ - if (!IS_ERR_OR_NULL(vm)) - drm_gpuvm_get(&vm->base); - - return vm; -} - /* Actually unmap memory for the vma */ -void msm_gem_vma_purge(struct msm_gem_vma *vma) +void msm_gem_vma_purge(struct drm_gpuva *vma) { - struct msm_gem_vm *vm =3D to_msm_vm(vma->base.vm); - unsigned size =3D vma->base.va.range; + struct msm_gem_vma *msm_vma =3D to_msm_vma(vma); + struct msm_gem_vm *vm =3D to_msm_vm(vma->vm); + unsigned size =3D vma->va.range; =20 /* Don't do anything if the memory isn't mapped */ - if (!vma->mapped) + if (!msm_vma->mapped) return; =20 - vm->mmu->funcs->unmap(vm->mmu, vma->base.va.addr, size); + vm->mmu->funcs->unmap(vm->mmu, vma->va.addr, size); =20 - vma->mapped =3D false; + msm_vma->mapped =3D false; } =20 /* Map and pin vma: */ int -msm_gem_vma_map(struct msm_gem_vma *vma, int prot, +msm_gem_vma_map(struct drm_gpuva *vma, int prot, struct sg_table *sgt, int size) { - struct msm_gem_vm *vm =3D to_msm_vm(vma->base.vm); + struct msm_gem_vma *msm_vma =3D to_msm_vma(vma); + struct msm_gem_vm *vm =3D to_msm_vm(vma->vm); int ret; =20 - if (GEM_WARN_ON(!vma->base.va.addr)) + if (GEM_WARN_ON(!vma->va.addr)) return -EINVAL; =20 - if (vma->mapped) + if (msm_vma->mapped) return 0; =20 - vma->mapped =3D true; + msm_vma->mapped =3D true; =20 /* * NOTE: iommu/io-pgtable can allocate pages, so we cannot hold @@ -76,38 +62,40 @@ msm_gem_vma_map(struct msm_gem_vma *vma, int prot, * Revisit this if we can come up with a scheme to pre-alloc pages * for the pgtable in map/unmap ops. */ - ret =3D vm->mmu->funcs->map(vm->mmu, vma->base.va.addr, sgt, size, prot); + ret =3D vm->mmu->funcs->map(vm->mmu, vma->va.addr, sgt, size, prot); =20 if (ret) { - vma->mapped =3D false; + msm_vma->mapped =3D false; } =20 return ret; } =20 /* Close an iova. Warn if it is still in use */ -void msm_gem_vma_close(struct msm_gem_vma *vma) +void msm_gem_vma_close(struct drm_gpuva *vma) { - struct msm_gem_vm *vm =3D to_msm_vm(vma->base.vm); + struct msm_gem_vm *vm =3D to_msm_vm(vma->vm); + struct msm_gem_vma *msm_vma =3D to_msm_vma(vma); =20 - GEM_WARN_ON(vma->mapped); + GEM_WARN_ON(msm_vma->mapped); =20 drm_gpuvm_resv_assert_held(&vm->base); =20 - if (vma->base.va.addr) - drm_mm_remove_node(&vma->node); + if (vma->va.addr && vm->managed) + drm_mm_remove_node(&msm_vma->node); =20 - drm_gpuva_remove(&vma->base); - drm_gpuva_unlink(&vma->base); + drm_gpuva_remove(vma); + drm_gpuva_unlink(vma); =20 kfree(vma); } =20 /* Create a new vma and allocate an iova for it */ -struct msm_gem_vma * -msm_gem_vma_new(struct msm_gem_vm *vm, struct drm_gem_object *obj, +struct drm_gpuva * +msm_gem_vma_new(struct drm_gpuvm *gpuvm, struct drm_gem_object *obj, u64 range_start, u64 range_end) { + struct msm_gem_vm *vm =3D to_msm_vm(gpuvm); struct drm_gpuvm_bo *vm_bo; struct msm_gem_vma *vma; int ret; @@ -149,7 +137,7 @@ msm_gem_vma_new(struct msm_gem_vm *vm, struct drm_gem_o= bject *obj, drm_gpuva_link(&vma->base, vm_bo); GEM_WARN_ON(drm_gpuvm_bo_put(vm_bo)); =20 - return vma; + return &vma->base; =20 err_va_remove: drm_gpuva_remove(&vma->base); @@ -179,7 +167,7 @@ static const struct drm_gpuvm_ops msm_gpuvm_ops =3D { * handles virtual address allocation, and both async and sync operations * are supported. */ -struct msm_gem_vm * +struct drm_gpuvm * msm_gem_vm_create(struct drm_device *drm, struct msm_mmu *mmu, const char = *name, u64 va_start, u64 va_size, bool managed) { @@ -215,7 +203,7 @@ msm_gem_vm_create(struct drm_device *drm, struct msm_mm= u *mmu, const char *name, =20 drm_mm_init(&vm->mm, va_start, va_size); =20 - return vm; + return &vm->base; =20 err_free_vm: kfree(vm); diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c index 47268aae7d54..fc4d6c9049b0 100644 --- a/drivers/gpu/drm/msm/msm_gpu.c +++ b/drivers/gpu/drm/msm/msm_gpu.c @@ -285,7 +285,7 @@ static void msm_gpu_crashstate_capture(struct msm_gpu *= gpu, =20 if (state->fault_info.ttbr0) { struct msm_gpu_fault_info *info =3D &state->fault_info; - struct msm_mmu *mmu =3D submit->vm->mmu; + struct msm_mmu *mmu =3D to_msm_vm(submit->vm)->mmu; =20 msm_iommu_pagetable_params(mmu, &info->pgtbl_ttbr0, &info->asid); @@ -390,7 +390,7 @@ static void recover_worker(struct kthread_work *work) /* Increment the fault counts */ submit->queue->faults++; if (submit->vm) - submit->vm->faults++; + to_msm_vm(submit->vm)->faults++; =20 get_comm_cmdline(submit, &comm, &cmd); =20 @@ -828,10 +828,11 @@ static int get_clocks(struct platform_device *pdev, s= truct msm_gpu *gpu) } =20 /* Return a new address space for a msm_drm_private instance */ -struct msm_gem_vm * +struct drm_gpuvm * msm_gpu_create_private_vm(struct msm_gpu *gpu, struct task_struct *task) { - struct msm_gem_vm *vm =3D NULL; + struct drm_gpuvm *vm =3D NULL; + if (!gpu) return NULL; =20 @@ -842,11 +843,11 @@ msm_gpu_create_private_vm(struct msm_gpu *gpu, struct= task_struct *task) if (gpu->funcs->create_private_vm) { vm =3D gpu->funcs->create_private_vm(gpu); if (!IS_ERR(vm)) - vm->pid =3D get_pid(task_pid(task)); + to_msm_vm(vm)->pid =3D get_pid(task_pid(task)); } =20 if (IS_ERR_OR_NULL(vm)) - vm =3D msm_gem_vm_get(gpu->vm); + vm =3D drm_gpuvm_get(gpu->vm); =20 return vm; } @@ -1014,8 +1015,9 @@ void msm_gpu_cleanup(struct msm_gpu *gpu) msm_gem_kernel_put(gpu->memptrs_bo, gpu->vm); =20 if (!IS_ERR_OR_NULL(gpu->vm)) { - gpu->vm->mmu->funcs->detach(gpu->vm->mmu); - msm_gem_vm_put(gpu->vm); + struct msm_mmu *mmu =3D to_msm_vm(gpu->vm)->mmu; + mmu->funcs->detach(mmu); + drm_gpuvm_put(gpu->vm); } =20 if (gpu->worker) { diff --git a/drivers/gpu/drm/msm/msm_gpu.h b/drivers/gpu/drm/msm/msm_gpu.h index 9d69dcad6612..231577656fae 100644 --- a/drivers/gpu/drm/msm/msm_gpu.h +++ b/drivers/gpu/drm/msm/msm_gpu.h @@ -78,8 +78,8 @@ struct msm_gpu_funcs { /* note: gpu_set_freq() can assume that we have been pm_resumed */ void (*gpu_set_freq)(struct msm_gpu *gpu, struct dev_pm_opp *opp, bool suspended); - struct msm_gem_vm *(*create_vm)(struct msm_gpu *gpu, struct platform_devi= ce *pdev); - struct msm_gem_vm *(*create_private_vm)(struct msm_gpu *gpu); + struct drm_gpuvm *(*create_vm)(struct msm_gpu *gpu, struct platform_devic= e *pdev); + struct drm_gpuvm *(*create_private_vm)(struct msm_gpu *gpu); uint32_t (*get_rptr)(struct msm_gpu *gpu, struct msm_ringbuffer *ring); =20 /** @@ -234,7 +234,7 @@ struct msm_gpu { void __iomem *mmio; int irq; =20 - struct msm_gem_vm *vm; + struct drm_gpuvm *vm; =20 /* Power Control: */ struct regulator *gpu_reg, *gpu_cx; @@ -357,7 +357,7 @@ struct msm_context { int queueid; =20 /** @vm: the per-process GPU address-space */ - struct msm_gem_vm *vm; + struct drm_gpuvm *vm; =20 /** @kref: the reference count */ struct kref ref; @@ -667,7 +667,7 @@ int msm_gpu_init(struct drm_device *drm, struct platfor= m_device *pdev, struct msm_gpu *gpu, const struct msm_gpu_funcs *funcs, const char *name, struct msm_gpu_config *config); =20 -struct msm_gem_vm * +struct drm_gpuvm * msm_gpu_create_private_vm(struct msm_gpu *gpu, struct task_struct *task); =20 void msm_gpu_cleanup(struct msm_gpu *gpu); diff --git a/drivers/gpu/drm/msm/msm_kms.c b/drivers/gpu/drm/msm/msm_kms.c index 6458bd82a0cd..e82b8569a468 100644 --- a/drivers/gpu/drm/msm/msm_kms.c +++ b/drivers/gpu/drm/msm/msm_kms.c @@ -176,9 +176,9 @@ static int msm_kms_fault_handler(void *arg, unsigned lo= ng iova, int flags, void return -ENOSYS; } =20 -struct msm_gem_vm *msm_kms_init_vm(struct drm_device *dev) +struct drm_gpuvm *msm_kms_init_vm(struct drm_device *dev) { - struct msm_gem_vm *vm; + struct drm_gpuvm *vm; struct msm_mmu *mmu; struct device *mdp_dev =3D dev->dev; struct device *mdss_dev =3D mdp_dev->parent; @@ -212,7 +212,7 @@ struct msm_gem_vm *msm_kms_init_vm(struct drm_device *d= ev) return vm; } =20 - msm_mmu_set_fault_handler(vm->mmu, kms, msm_kms_fault_handler); + msm_mmu_set_fault_handler(to_msm_vm(vm)->mmu, kms, msm_kms_fault_handler); =20 return vm; } diff --git a/drivers/gpu/drm/msm/msm_kms.h b/drivers/gpu/drm/msm/msm_kms.h index f45996a03e15..7cdb2eb67700 100644 --- a/drivers/gpu/drm/msm/msm_kms.h +++ b/drivers/gpu/drm/msm/msm_kms.h @@ -139,7 +139,7 @@ struct msm_kms { atomic_t fault_snapshot_capture; =20 /* mapper-id used to request GEM buffer mapped for scanout: */ - struct msm_gem_vm *vm; + struct drm_gpuvm *vm; =20 /* disp snapshot support */ struct kthread_worker *dump_worker; diff --git a/drivers/gpu/drm/msm/msm_submitqueue.c b/drivers/gpu/drm/msm/ms= m_submitqueue.c index 6298233c3568..8ced49c7557b 100644 --- a/drivers/gpu/drm/msm/msm_submitqueue.c +++ b/drivers/gpu/drm/msm/msm_submitqueue.c @@ -59,7 +59,7 @@ void __msm_context_destroy(struct kref *kref) kfree(ctx->entities[i]); } =20 - msm_gem_vm_put(ctx->vm); + drm_gpuvm_put(ctx->vm); kfree(ctx->comm); kfree(ctx->cmdline); kfree(ctx); --=20 2.50.0 From nobody Wed Oct 8 10:58:50 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 BD1B6237176 for ; Sun, 29 Jun 2025 14:07:47 +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=1751206069; cv=none; b=LfQzFjEM5jJivkqzVSBR3Pk1grwyGVOUc3P6ENEheAGvRt1JdAH53Z+502vDsDcE0ZKQS1kyQyjHprW50U6tKR6S/Wp6VcmXb/yQACoZULD3d8uZpsWAMEFB4oK1V1KGa6lhyvqIrrOBmYHWvjWWQzp4nx4KxBc37BUVlzUd7Fs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751206069; c=relaxed/simple; bh=8ynhkJOScfi9ikAGiRHB32lhFvswULa1Hiuup/gNOrE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KdihZlk2WoGZ9MgJHhzEVp8KiUCEkMBfXUNrKFAn3L7+8fDdnHj19bM3h8x1f2yumbOXcdnrdgygHVW7sJhYRFG79k/Z74oxQyQM+rpzsl+syMrcu4Szi1PlrB3S2tcdQV87zef+/nK8vzWMp8d1iSyxoP8qWYtPoXC/pkt+si8= 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=QPdaBB5h; 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="QPdaBB5h" 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 55TCIgZL000721 for ; Sun, 29 Jun 2025 14:07:46 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=F07tE0vJpnj OaneIx6xxhc1GKaxYebaabLke4Ul+Piw=; b=QPdaBB5hrC5+N8q6hltq84lHPeI Xj0aupFFxgYu9O8n6GvJGuJJMOZ8sWyDulg0DYlfizNU/cII7eGLH1nJ9R1bO/Wt EqdF1eymGEPaug/rhx+q56CR1/MKZ24g4I1qMSH1pOcHn5F0422qezn7jtt1tZzV wA19yvtexLscyLfDA4TplCkXFUXInYxtQeLa6Kw1/h9A3kX9YbQJ8vEd5FSQXKs+ tNnP+C83fQCvXWtkPXr9q3bW3kUDCpJ9vLZ07+J/pq7OPCxSD0Zya6Z8S0AO1iN1 7HsdI9zS7L8Zsau/wEI45fg5Ys4kTzFyXMzOZsFW5ywDiFPP/UrCc9KkECQ== Received: from mail-pl1-f199.google.com (mail-pl1-f199.google.com [209.85.214.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 47j7qm2839-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Sun, 29 Jun 2025 14:07:46 +0000 (GMT) Received: by mail-pl1-f199.google.com with SMTP id d9443c01a7336-2363bb41664so25719095ad.0 for ; Sun, 29 Jun 2025 07:07:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751206065; x=1751810865; 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=F07tE0vJpnjOaneIx6xxhc1GKaxYebaabLke4Ul+Piw=; b=UTnkZfNxK2g8a6wbcLtS+rz2cZ/DzTh5Nx9sskDQimAXHBl2vRvpZRPH8xirzbwlCH ztp1BiKNddjG6FtvYetEVU3GzsnAzI8UbHCrvEI5yPwgEQC2FjC9Fhft3NbYj7kbEe37 uYxy+9mB6w6dCPcWXU/WLgxWEuE8r/rCkIh29txoq8uwmwHO1T+ZywNTBzjKMf2IeUQV 8YESYcNWwI9tqZZt3AmHzt0MPr9cxzAEsEqLomz6Lu0Tr+nrXGwZlvwz9Xq0ZORS6l8T +pOYzPZMFvTwTOr21U+R+DM3ouzeWdRi+2Hyneq0hh4GVIbBcswy1WCXcgqvHymFSEGw aMoQ== X-Forwarded-Encrypted: i=1; AJvYcCVLRArzM5Ey9G5RTDArlCcJWRJ0ebWUsK2PChTLyqg2uk2AkT2tJ5+9QZZ+b9JEeRzluMGm9YBXm8vbeHo=@vger.kernel.org X-Gm-Message-State: AOJu0YzGrlyWhibThbzSbyKFSQaq3EfcGpmfF9c647YVbC0jwSwTV34Q IwYAcfSoXlpqEMZzNKWSLN8G4fRDOejEmLI189xu3JmUaYNT0DeIW1Y0pAGoPVvd8B0fjz8nmZB PWzKMEjvJdDYEX8kzax8k+IgTqyUeNHO4TU74FXwhLAKCBEtU3AavTsbgPz+t46hUoAw= X-Gm-Gg: ASbGncsDei+C8/6MzN5f7O88p3vjcA/SaUT08aDZu1l1o+Ks+24xCQF2qSMnwX176Su 3eCrgtjv789UKxAzE2u49rV0BbnLst2H+mlkrGgoZMIVkG8yh9PG3CYp1fvg/TQuem/JuPYVNUR jnHzRJcwkuOmL+3M7oVIxe3XtEHxSnoEvWpG+uUT8xpzDw6GkPJiaQYEHw9kZA+JD8smme8JYkL 5bqHGnfwq1+NDYO0Bxwyzy5CIv8uT9Bh5lUPF85eviY2pQmC7O2idFrnYpluLKepMkkZDAU4BZp 2Mvs6Kyvu8bZ+E3Yv6pUbFhK1QYWEDft X-Received: by 2002:a17:902:e5d2:b0:237:e3bc:7691 with SMTP id d9443c01a7336-23ac59ab6a4mr170031715ad.13.1751206065114; Sun, 29 Jun 2025 07:07:45 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEU2ZoZF1wsNzdvTcLhOOZH0w2oac4X1cVf9/aBLg0ihQ3Sg5MG0OwPeKZY+JtNgKAyuZME+g== X-Received: by 2002:a17:902:e5d2:b0:237:e3bc:7691 with SMTP id d9443c01a7336-23ac59ab6a4mr170031235ad.13.1751206064693; Sun, 29 Jun 2025 07:07:44 -0700 (PDT) Received: from localhost ([2601:1c0:5000:d5c:5b3e:de60:4fda:e7b1]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-23acb2e1bc3sm58755845ad.28.2025.06.29.07.07.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Jun 2025 07:07:44 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, Connor Abbott , Antonino Maniscalco , Danilo Krummrich , Rob Clark , Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v8 16/42] drm/msm: Split out helper to get iommu prot flags Date: Sun, 29 Jun 2025 07:03:19 -0700 Message-ID: <20250629140537.30850-17-robin.clark@oss.qualcomm.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250629140537.30850-1-robin.clark@oss.qualcomm.com> References: <20250629140537.30850-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-Authority-Analysis: v=2.4 cv=C4TpyRP+ c=1 sm=1 tr=0 ts=686148b2 cx=c_pps a=JL+w9abYAAE89/QcEU+0QA==:117 a=xqWC_Br6kY4A:10 a=6IFa9wvqVegA:10 a=cm27Pg_UAAAA:8 a=EUspDBNiAAAA:8 a=pGLkceISAAAA:8 a=8Ft5guHMEotweHOT_P0A:9 a=324X-CrmTo6CU4MGRt3R:22 X-Proofpoint-ORIG-GUID: 2-LLYTxSdwsMPQIXxqQn57vR53mdEJcV X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjI5MDExOSBTYWx0ZWRfXx57P8vXHwVF9 e00gOrc/Yh9nip2QgxoRjnU/rMFZa872Wfddt01hsThIqNnkA2P+ahJXwkL/02u9rEU4Zy0RJEw PGDcU4iw7N+7QeHXMIXNFrbgpM7R7BBD9rwIMyHeX8NazRXxXgRYPVBaP9fQSCxBOdL9ghSq0GK rkYrHAIbcyyjdEbUncXlnvojiIg3AosRa+Ps2q5TF3u4oTVMPqDQnZZfQeXJMpHy9xxezUcQy8l ox+2nlp+G/d1u8h7HZd0KauC8vbOiHhHyeDAkOAhyZDKUfGnAHL9bF300+qihhGA74JSL80lqwz 2gELPscNqC/HGBnpHQtrfy4eBBs70o77GaYvgu8LsJqAYJbGuigXUdv5Xrt76ng5OdHZYTu4CXx +C1y28A6TGw1wVb/nq/7kt2Iprvm3wqRHR0NpfsYlSzehnBTfWyhQ6vuvJZFB0lTN0Bk8Jvg X-Proofpoint-GUID: 2-LLYTxSdwsMPQIXxqQn57vR53mdEJcV 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-27_05,2025-06-27_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 phishscore=0 suspectscore=0 bulkscore=0 lowpriorityscore=0 clxscore=1015 priorityscore=1501 spamscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 malwarescore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2506290119 Content-Type: text/plain; charset="utf-8" From: Rob Clark We'll re-use this in the vm_bind path. Signed-off-by: Rob Clark Signed-off-by: Rob Clark Tested-by: Antonino Maniscalco Reviewed-by: Antonino Maniscalco --- drivers/gpu/drm/msm/msm_gem.c | 12 ++++++++++-- drivers/gpu/drm/msm/msm_gem.h | 1 + 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c index 763bafcff4cc..20d5e4b4d057 100644 --- a/drivers/gpu/drm/msm/msm_gem.c +++ b/drivers/gpu/drm/msm/msm_gem.c @@ -462,10 +462,9 @@ static struct drm_gpuva *get_vma_locked(struct drm_gem= _object *obj, return vma; } =20 -int msm_gem_pin_vma_locked(struct drm_gem_object *obj, struct drm_gpuva *v= ma) +int msm_gem_prot(struct drm_gem_object *obj) { struct msm_gem_object *msm_obj =3D to_msm_bo(obj); - struct page **pages; int prot =3D IOMMU_READ; =20 if (!(msm_obj->flags & MSM_BO_GPU_READONLY)) @@ -477,6 +476,15 @@ int msm_gem_pin_vma_locked(struct drm_gem_object *obj,= struct drm_gpuva *vma) if (msm_obj->flags & MSM_BO_CACHED_COHERENT) prot |=3D IOMMU_CACHE; =20 + return prot; +} + +int msm_gem_pin_vma_locked(struct drm_gem_object *obj, struct drm_gpuva *v= ma) +{ + struct msm_gem_object *msm_obj =3D to_msm_bo(obj); + struct page **pages; + int prot =3D msm_gem_prot(obj); + msm_gem_assert_locked(obj); =20 pages =3D msm_gem_get_pages_locked(obj, MSM_MADV_WILLNEED); diff --git a/drivers/gpu/drm/msm/msm_gem.h b/drivers/gpu/drm/msm/msm_gem.h index 892e4132fa72..a18872ab1393 100644 --- a/drivers/gpu/drm/msm/msm_gem.h +++ b/drivers/gpu/drm/msm/msm_gem.h @@ -158,6 +158,7 @@ struct msm_gem_object { #define to_msm_bo(x) container_of(x, struct msm_gem_object, base) =20 uint64_t msm_gem_mmap_offset(struct drm_gem_object *obj); +int msm_gem_prot(struct drm_gem_object *obj); int msm_gem_pin_vma_locked(struct drm_gem_object *obj, struct drm_gpuva *v= ma); void msm_gem_unpin_locked(struct drm_gem_object *obj); void msm_gem_unpin_active(struct drm_gem_object *obj); --=20 2.50.0 From nobody Wed Oct 8 10:58:50 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 56413226D1A for ; Sun, 29 Jun 2025 14:07:48 +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=1751206071; cv=none; b=BDlX7jfCakfp9vMYb0ECIL1FZ4U5Pgkc1pRW+pCQpmqv6fJ1jrYP+hCh0C7v9FAVNPT64CiiDGqAsGwaVZbL3Vbf+zITlyZpGJ3h5rI47dvE85ZR/0tD0Uw1THXB+GObzQddUdhBrPGeHyalsny67zUo4GIre1zQ3q69j8L1DnY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751206071; c=relaxed/simple; bh=WdQPriMrB8x+9JQHTqw4IQFdqMSdfDZGIPe1vDHc1bo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PBrSLViT6tTPQ0GuKpfmJ4wZcgxmbk8jZinVYDRla2JHnpcVDSBS0cluJScqVLJLPUPhQOi/b30xnz50Z/eiaZvnCTb5aMo048a8/z3rcuHhCFjjvm+DCwfszT72z//oI2uePp89CXjVVD49YoYgy2bQx2GSLUyXrmUqMbW/vF4= 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=Uw0nADv8; 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="Uw0nADv8" Received: from pps.filterd (m0279871.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 55TDEirj017237 for ; Sun, 29 Jun 2025 14:07:48 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=Dn6rNLtmwPZ aS21Jedvkq0LzDSIrl4pjgU4LG7FVLPE=; b=Uw0nADv8BVv28zDWdM0hCrTeORS CSS8yo/WR3Q7radejVXxXpWbHFXTxUKoGpy4rOGsLWKETreCZeuOKVGeUNSx4jt3 9hyT2oHQQU906ZfflRA5v55Rl3umwPN1oN7NRxaRdlhFVqIzssKXTEGy+IIh7fSN YzfutamzFp8rgxnUpRH9B5dqnD7m8WjhB9VBdFdpG3NPlb4AfFDS6eIJLKv9v7qQ buh8FbmxO/b4FJAdTHwaRG2Vitiuz21GAfKaFhRiP3X4ivi0ViXpbYE9F4vUN/qf 6fsVtYBmuekuYkvhxED8jBSULapT4AUWxHb9J/zd4WF46TI1XYuhd0yh08Q== Received: from mail-pf1-f199.google.com (mail-pf1-f199.google.com [209.85.210.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 47j801t7r6-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Sun, 29 Jun 2025 14:07:47 +0000 (GMT) Received: by mail-pf1-f199.google.com with SMTP id d2e1a72fcca58-748764d84feso2590627b3a.2 for ; Sun, 29 Jun 2025 07:07:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751206067; x=1751810867; 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=Dn6rNLtmwPZaS21Jedvkq0LzDSIrl4pjgU4LG7FVLPE=; b=uAe1GCnezzL7l5VLzt/KtODhHpMEkfGqz+QpjDcuf9N6O3wBaDZBRGfYH3azxGuwTH dRnMyB4dzBKs8fU9ucOcoT2orSwBIzal1+7Tq+XnOQJcWg1vJaMow5UpMndxbbiXrPFf WhrHEPWoAo5Ao2MdNyHYyInh3sdLdttkPNNu0ydOt2pO6Ey7adX09IzurqebPzb5n6ao sux7d8sajPVyEvxz+EO/p6kj8X5v5Nfor2sP26FQ5rjh6PvA27v0Wzs52HMfjKGAXZnM LYIKBRnS2uN6EWXbQbPM4o0iMI+ei/nKO4TcFmQzajZH0CPmzzmnYga5Vl2gwkLxm1dh 8kUg== X-Forwarded-Encrypted: i=1; AJvYcCVcrinSQ1++2SCaYWWkFgPuhxI6gPuDaRSA/fih+Q8Z6oqhR7Ie/5tqxaieV4jCYv3JT+JSmQv/oYHRai0=@vger.kernel.org X-Gm-Message-State: AOJu0YyyNv9D1tFxXp1fFMCUzkmVZAJDM9knqDcPMC6/knyIZR6rd4J6 T76Y53l6tWUXUi1C9JAtzt90Xxr2ssmEWJB5N0rQN/ItSMHkt/xLYKCLYlF5LVTu/HsLXzbrkH0 lZWdkkQTP1mRut3R+qSDAMrMQvvamjkW/BptKutbGNuoP8Tprt4lLA0dRn4mjjgT8h3o= X-Gm-Gg: ASbGncs7HLcXNaJ4gecS6FW9l+9D4RS0fgtORB+Y7MX7i6EyLiahwuZWkDCOM42RH01 Lewjr5i7YTjuV6HZy42llO9OKlMkVPCwS9yaBmITyo5hc/6uwKvWO1TCubg6oJVYytcWFx72svI CKWiigagRlbtw/tvQa89qkDcbXvMkHXXIv+9bSAJjyKumspPFNB8g3wLJAyRxON4ui85gkKQG74 RExoEyp8NyHaY8OmoBjMOa6EDZfUSwyMtzjeDU1UmjIK40yIiFZL9ZBjqDB+N/IwCf3m7FUAc6S viYrrZv+3OSrQ9dM7EK/mzrp/3cLmxu+ X-Received: by 2002:a05:6a00:3a04:b0:740:5927:bb8b with SMTP id d2e1a72fcca58-74af6cc48ddmr12775907b3a.0.1751206066618; Sun, 29 Jun 2025 07:07:46 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFhpT/b3SDSccYMa5CBmr+Nz8pP6Uz8/h7oHbjun/s8cT+dzTNn+jqYyULUBTy7JpVyUo6Zag== X-Received: by 2002:a05:6a00:3a04:b0:740:5927:bb8b with SMTP id d2e1a72fcca58-74af6cc48ddmr12775875b3a.0.1751206066173; Sun, 29 Jun 2025 07:07:46 -0700 (PDT) Received: from localhost ([2601:1c0:5000:d5c:5b3e:de60:4fda:e7b1]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-74af54098a3sm6847772b3a.16.2025.06.29.07.07.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Jun 2025 07:07:45 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, Connor Abbott , Antonino Maniscalco , Danilo Krummrich , Rob Clark , Rob Clark , Sean Paul , Konrad Dybcio , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Marijn Suijten , David Airlie , Simona Vetter , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v8 17/42] drm/msm: Add mmu support for non-zero offset Date: Sun, 29 Jun 2025 07:03:20 -0700 Message-ID: <20250629140537.30850-18-robin.clark@oss.qualcomm.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250629140537.30850-1-robin.clark@oss.qualcomm.com> References: <20250629140537.30850-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-GUID: iMZt9H-HzsE9MSWsYCTWm1jeagfPseyc X-Authority-Analysis: v=2.4 cv=YPWfyQGx c=1 sm=1 tr=0 ts=686148b4 cx=c_pps a=WW5sKcV1LcKqjgzy2JUPuA==:117 a=xqWC_Br6kY4A:10 a=6IFa9wvqVegA:10 a=cm27Pg_UAAAA:8 a=EUspDBNiAAAA:8 a=pGLkceISAAAA:8 a=SJjE8ph6EfIcxDFTuEgA:9 a=OpyuDcXvxspvyRM73sMx:22 X-Proofpoint-ORIG-GUID: iMZt9H-HzsE9MSWsYCTWm1jeagfPseyc X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjI5MDExOSBTYWx0ZWRfX/tNO2hHKIj1Z 9RJQCJnQhxVYiUvZIShXB+z6p4bk+VTpWndtMAcMFCbNpda7oy1RS1oIW3V7Ju4WSq0xK5emK+V fYvWTbBPnj6vsHq5E9/9lgTz6V4njYu3fFQLQvAAIoy24hXrko/XgroS0RUV5qhllE2JVhF8vVy 3vkaF36347y3qs6K8Nrvf6x76gc5j34UuUimtROLyM9IKTJtO17okAA7cqFYVHBtH/aJQWmQ6jH H+gxV1D5Y3/koYn2IJkne1+F+gCnrXohR63JiXhv6eWmIbtU1e8ibtnUqVpzjcbq1CGSfandzuq JolCZH0mPaTuKzxFaKhtuQij5pi0SWjIQlFduCWG6QtdXpTe+zlX7s3lwbD2G6w6YX9PKTYYkWd 5Nhs+IUc98x+VXQBWz94Yn+ZKNFvfgrcF86xsVnc7ggSPDfUo4VA44lIWXvoNPg86xsOihBp 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-27_05,2025-06-27_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 mlxlogscore=999 mlxscore=0 malwarescore=0 suspectscore=0 lowpriorityscore=0 clxscore=1015 impostorscore=0 adultscore=0 priorityscore=1501 bulkscore=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-2506290119 Content-Type: text/plain; charset="utf-8" From: Rob Clark Only needs to be supported for iopgtables mmu, the other cases are either only used for kernel managed mappings (where offset is always zero) or devices which do not support sparse bindings. Signed-off-by: Rob Clark Signed-off-by: Rob Clark Tested-by: Antonino Maniscalco Reviewed-by: Antonino Maniscalco --- drivers/gpu/drm/msm/adreno/a2xx_gpummu.c | 5 ++++- drivers/gpu/drm/msm/msm_gem.c | 4 ++-- drivers/gpu/drm/msm/msm_gem.h | 4 ++-- drivers/gpu/drm/msm/msm_gem_vma.c | 13 +++++++------ drivers/gpu/drm/msm/msm_iommu.c | 22 ++++++++++++++++++++-- drivers/gpu/drm/msm/msm_mmu.h | 2 +- 6 files changed, 36 insertions(+), 14 deletions(-) diff --git a/drivers/gpu/drm/msm/adreno/a2xx_gpummu.c b/drivers/gpu/drm/msm= /adreno/a2xx_gpummu.c index 4280f71e472a..0407c9bc8c1b 100644 --- a/drivers/gpu/drm/msm/adreno/a2xx_gpummu.c +++ b/drivers/gpu/drm/msm/adreno/a2xx_gpummu.c @@ -29,13 +29,16 @@ static void a2xx_gpummu_detach(struct msm_mmu *mmu) } =20 static int a2xx_gpummu_map(struct msm_mmu *mmu, uint64_t iova, - struct sg_table *sgt, size_t len, int prot) + struct sg_table *sgt, size_t off, size_t len, + int prot) { struct a2xx_gpummu *gpummu =3D to_a2xx_gpummu(mmu); unsigned idx =3D (iova - GPUMMU_VA_START) / GPUMMU_PAGE_SIZE; struct sg_dma_page_iter dma_iter; unsigned prot_bits =3D 0; =20 + WARN_ON(off !=3D 0); + if (prot & IOMMU_WRITE) prot_bits |=3D 1; if (prot & IOMMU_READ) diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c index 20d5e4b4d057..5c71a4be0dfa 100644 --- a/drivers/gpu/drm/msm/msm_gem.c +++ b/drivers/gpu/drm/msm/msm_gem.c @@ -453,7 +453,7 @@ static struct drm_gpuva *get_vma_locked(struct drm_gem_= object *obj, vma =3D lookup_vma(obj, vm); =20 if (!vma) { - vma =3D msm_gem_vma_new(vm, obj, range_start, range_end); + vma =3D msm_gem_vma_new(vm, obj, 0, range_start, range_end); } else { GEM_WARN_ON(vma->va.addr < range_start); GEM_WARN_ON((vma->va.addr + obj->size) > range_end); @@ -491,7 +491,7 @@ int msm_gem_pin_vma_locked(struct drm_gem_object *obj, = struct drm_gpuva *vma) if (IS_ERR(pages)) return PTR_ERR(pages); =20 - return msm_gem_vma_map(vma, prot, msm_obj->sgt, obj->size); + return msm_gem_vma_map(vma, prot, msm_obj->sgt); } =20 void msm_gem_unpin_locked(struct drm_gem_object *obj) diff --git a/drivers/gpu/drm/msm/msm_gem.h b/drivers/gpu/drm/msm/msm_gem.h index a18872ab1393..0e7b17b2093b 100644 --- a/drivers/gpu/drm/msm/msm_gem.h +++ b/drivers/gpu/drm/msm/msm_gem.h @@ -110,9 +110,9 @@ struct msm_gem_vma { =20 struct drm_gpuva * msm_gem_vma_new(struct drm_gpuvm *vm, struct drm_gem_object *obj, - u64 range_start, u64 range_end); + u64 offset, u64 range_start, u64 range_end); void msm_gem_vma_purge(struct drm_gpuva *vma); -int msm_gem_vma_map(struct drm_gpuva *vma, int prot, struct sg_table *sgt,= int size); +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 struct msm_gem_object { diff --git a/drivers/gpu/drm/msm/msm_gem_vma.c b/drivers/gpu/drm/msm/msm_ge= m_vma.c index df8eb910ca31..ef0efd87e4a6 100644 --- a/drivers/gpu/drm/msm/msm_gem_vma.c +++ b/drivers/gpu/drm/msm/msm_gem_vma.c @@ -38,8 +38,7 @@ void msm_gem_vma_purge(struct drm_gpuva *vma) =20 /* Map and pin vma: */ int -msm_gem_vma_map(struct drm_gpuva *vma, int prot, - struct sg_table *sgt, int size) +msm_gem_vma_map(struct drm_gpuva *vma, int prot, struct sg_table *sgt) { struct msm_gem_vma *msm_vma =3D to_msm_vma(vma); struct msm_gem_vm *vm =3D to_msm_vm(vma->vm); @@ -62,8 +61,9 @@ msm_gem_vma_map(struct drm_gpuva *vma, int prot, * Revisit this if we can come up with a scheme to pre-alloc pages * for the pgtable in map/unmap ops. */ - ret =3D vm->mmu->funcs->map(vm->mmu, vma->va.addr, sgt, size, prot); - + ret =3D vm->mmu->funcs->map(vm->mmu, vma->va.addr, sgt, + vma->gem.offset, vma->va.range, + prot); if (ret) { msm_vma->mapped =3D false; } @@ -93,7 +93,7 @@ void msm_gem_vma_close(struct drm_gpuva *vma) /* Create a new vma and allocate an iova for it */ struct drm_gpuva * msm_gem_vma_new(struct drm_gpuvm *gpuvm, struct drm_gem_object *obj, - u64 range_start, u64 range_end) + u64 offset, u64 range_start, u64 range_end) { struct msm_gem_vm *vm =3D to_msm_vm(gpuvm); struct drm_gpuvm_bo *vm_bo; @@ -107,6 +107,7 @@ msm_gem_vma_new(struct drm_gpuvm *gpuvm, struct drm_gem= _object *obj, return ERR_PTR(-ENOMEM); =20 if (vm->managed) { + BUG_ON(offset !=3D 0); ret =3D drm_mm_insert_node_in_range(&vm->mm, &vma->node, obj->size, PAGE_SIZE, 0, range_start, range_end, 0); @@ -120,7 +121,7 @@ msm_gem_vma_new(struct drm_gpuvm *gpuvm, struct drm_gem= _object *obj, =20 GEM_WARN_ON((range_end - range_start) > obj->size); =20 - drm_gpuva_init(&vma->base, range_start, range_end - range_start, obj, 0); + drm_gpuva_init(&vma->base, range_start, range_end - range_start, obj, off= set); vma->mapped =3D false; =20 ret =3D drm_gpuva_insert(&vm->base, &vma->base); diff --git a/drivers/gpu/drm/msm/msm_iommu.c b/drivers/gpu/drm/msm/msm_iomm= u.c index 739ce2c283a4..3c2eb59bfd49 100644 --- a/drivers/gpu/drm/msm/msm_iommu.c +++ b/drivers/gpu/drm/msm/msm_iommu.c @@ -113,7 +113,8 @@ static int msm_iommu_pagetable_unmap(struct msm_mmu *mm= u, u64 iova, } =20 static int msm_iommu_pagetable_map(struct msm_mmu *mmu, u64 iova, - struct sg_table *sgt, size_t len, int prot) + struct sg_table *sgt, size_t off, size_t len, + int prot) { struct msm_iommu_pagetable *pagetable =3D to_pagetable(mmu); struct io_pgtable_ops *ops =3D pagetable->pgtbl_ops; @@ -125,6 +126,19 @@ static int msm_iommu_pagetable_map(struct msm_mmu *mmu= , u64 iova, size_t size =3D sg->length; phys_addr_t phys =3D sg_phys(sg); =20 + if (!len) + break; + + if (size <=3D off) { + off -=3D size; + continue; + } + + phys +=3D off; + size -=3D off; + size =3D min_t(size_t, size, len); + off =3D 0; + while (size) { size_t pgsize, count, mapped =3D 0; int ret; @@ -140,6 +154,7 @@ static int msm_iommu_pagetable_map(struct msm_mmu *mmu,= u64 iova, phys +=3D mapped; addr +=3D mapped; size -=3D mapped; + len -=3D mapped; =20 if (ret) { msm_iommu_pagetable_unmap(mmu, iova, addr - iova); @@ -388,11 +403,14 @@ static void msm_iommu_detach(struct msm_mmu *mmu) } =20 static int msm_iommu_map(struct msm_mmu *mmu, uint64_t iova, - struct sg_table *sgt, size_t len, int prot) + struct sg_table *sgt, size_t off, size_t len, + int prot) { struct msm_iommu *iommu =3D to_msm_iommu(mmu); size_t ret; =20 + WARN_ON(off !=3D 0); + /* The arm-smmu driver expects the addresses to be sign extended */ if (iova & BIT_ULL(48)) iova |=3D GENMASK_ULL(63, 49); diff --git a/drivers/gpu/drm/msm/msm_mmu.h b/drivers/gpu/drm/msm/msm_mmu.h index 0c694907140d..9d61999f4d42 100644 --- a/drivers/gpu/drm/msm/msm_mmu.h +++ b/drivers/gpu/drm/msm/msm_mmu.h @@ -12,7 +12,7 @@ struct msm_mmu_funcs { void (*detach)(struct msm_mmu *mmu); int (*map)(struct msm_mmu *mmu, uint64_t iova, struct sg_table *sgt, - size_t len, int prot); + size_t off, size_t len, int prot); int (*unmap)(struct msm_mmu *mmu, uint64_t iova, size_t len); void (*destroy)(struct msm_mmu *mmu); void (*set_stall)(struct msm_mmu *mmu, bool enable); --=20 2.50.0 From nobody Wed Oct 8 10:58:51 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 5929A227BB6 for ; Sun, 29 Jun 2025 14:07:50 +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=1751206072; cv=none; b=SxJ3fmJBuoYKWT3osyelAG7jAiZ2O/LgSlJS1N+RaMEQbR0LGjZKun0qwMgF+hb4p7fuOctn6g32P1x3AnJrK2T6N19LxOJvI+3ErnsZ5Qol1h/oyCLtT51IAQJSrejl4iAHEsKMeQRm22EB/ZNy/PFRU4Cml3XCumrMvbso5rM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751206072; c=relaxed/simple; bh=N5h9QxX939KWcmj2LnrrApRV3L5jzVSUkXnQ9YEPILQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RfAz7rpNpUWE/qUeK6EtbbzgB/tlaZUkrR6FcLCQ1wVKID8It0f5K6IAJDzaCQH++Mt9te6VJsNlf9ZN1h4C3hgHsyE3xap9bwRq7RnMZX7zRtK8eAAmz724kB/LEg0jBC+IZLyiAxN+NCUsax+TnMwSRSCXvlKK4Jt865Bwqaw= 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=HQYfqQTQ; 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="HQYfqQTQ" Received: from pps.filterd (m0279873.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 55TDT1Pn000443 for ; Sun, 29 Jun 2025 14:07:49 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=JinTH7RBpIn edICQ29N4Lhfv00Y7qC0FBgXZnvj/oGw=; b=HQYfqQTQeGgoSe6x0pGrItnSsTk rHXOcQhp6g5A+2fEWRSHWASUKue65KpNq1OeTKM3e7kcqeX8fI9ONE8d7R3Pyq15 85suSv5oyNvVUYHuYvkILKK+LEKdqtU3bD/uWGPbcCwHZk493NhVVCvkX6q72ozA SCizEf3jA50uN0hNEiHVmkX7oagmChCJ9Uma2fFAF3xoYlWMCKk65T4yM8BwDw6C 1gqr4O2KzG2gbtKpqRFfcUnFOocla57IvVLQucrw2M/NVEwmXS+ov03JSDa0EvYB LYFa4bjD/opIfQarb4I3RzlhvLdcYOeMPlfqKQeXKTV4pzI6pMkKnW+ZrCA== Received: from mail-pf1-f199.google.com (mail-pf1-f199.google.com [209.85.210.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 47j5rq2ex0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Sun, 29 Jun 2025 14:07:49 +0000 (GMT) Received: by mail-pf1-f199.google.com with SMTP id d2e1a72fcca58-74913a4f606so1321676b3a.1 for ; Sun, 29 Jun 2025 07:07:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751206068; x=1751810868; 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=JinTH7RBpInedICQ29N4Lhfv00Y7qC0FBgXZnvj/oGw=; b=r3rz19LU4W9BDjZmL26pWGTOd8JyyE0M2kPKQPbn/QdJus+M2xuiUEhrvUsJcd8qnY G7ganAbKNmsvgRwC8m4BXDbVcDRqrvFeTKdWN6XArbnEc2FUzweMYwL0eLDWNxDHS+J6 UDeSGUD3hvDmjL0VOBjZurP6WioPmLr97kUDq39LcQGDyJnFuMIHvpnl8G9cnIchPoVi vUKlFtFYOewcDFIRvD/+KnPHfksaS13eOOfkkOxWmcWDnonTZiT06wo1ArFjbNwWd/hM 175m8FdVUHl9+PibKMKtDAa4jFLGhM3oMRh26BdOcwSKRYr/x5FSH52DyX87dd1KtpTf G+zw== X-Forwarded-Encrypted: i=1; AJvYcCXSUUsw11RgaIw1m+ZWvyOOfu2P8L+C7Cm8fqgNB85TbOqpN6JZV/iPZWHEgglHdfWZ1F7rMh/EFLyQl9s=@vger.kernel.org X-Gm-Message-State: AOJu0YxufIn2Rh97zWTkWRgcuMQnw6rN8F3Ulrj55Aba226Xl+Y4dED9 Zt/mhsM/7R9IU9YT7FCJo3OGU4jf86JcAr7iY05o4UbGgpOIjID22RIagZ6ZBVtZPyL9iazWnOV pPjc5QesSaHYxQVdcONvbXzPMPL5pccxiCR9mIxskI8lz1/uC6NOvMkqkptbPWxNDx1M= X-Gm-Gg: ASbGncv+zjo/Cj8/hey+G8L3djlxJzJk8ecpF5lKksddn+43gXK5RXTvY1msTTeE3+A 0J7lr15k/oKiyjHntFN/VsiNIGnqtKyX02HJpFS55Pq1r/6WBTD7G8ltvZNt/fp2ILIAaCQFwNQ CIOm7f9JEgAYojvRGCiwY4+tMcjfqZAUIsusTO2HIuBWzRzpkcjk5tqI2hxGrGCY/WsQugpt8ro +BsexQDXcpjJ98TDhbRkcMbynkeR9LL42xYYA1sGfD4++b+jMpCAdl+xhF9nzi5Jt5f7EkTNV7j wpjPIH1IMP6QlUmfH/OQhA7J1r0vfmvl X-Received: by 2002:a05:6a00:4fc1:b0:736:5664:53f3 with SMTP id d2e1a72fcca58-74af6fcf6c5mr13029875b3a.15.1751206067918; Sun, 29 Jun 2025 07:07:47 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEn35T9b/0kapM5IKGsL7a1XVCXPKFjZXq8JLCQPhjEBuAie0JCEdWyjBXiLZdtbg53DL+0lQ== X-Received: by 2002:a05:6a00:4fc1:b0:736:5664:53f3 with SMTP id d2e1a72fcca58-74af6fcf6c5mr13029837b3a.15.1751206067480; Sun, 29 Jun 2025 07:07:47 -0700 (PDT) Received: from localhost ([2601:1c0:5000:d5c:5b3e:de60:4fda:e7b1]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-74af5581020sm6884621b3a.87.2025.06.29.07.07.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Jun 2025 07:07:47 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, Connor Abbott , Antonino Maniscalco , Danilo Krummrich , Rob Clark , Rob Clark , Sean Paul , Konrad Dybcio , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Marijn Suijten , David Airlie , Simona Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v8 18/42] drm/msm: Add PRR support Date: Sun, 29 Jun 2025 07:03:21 -0700 Message-ID: <20250629140537.30850-19-robin.clark@oss.qualcomm.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250629140537.30850-1-robin.clark@oss.qualcomm.com> References: <20250629140537.30850-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-ORIG-GUID: m5DUi2vSraGIwP1C-PYy-UFIrYGEPMOz X-Authority-Analysis: v=2.4 cv=eIYTjGp1 c=1 sm=1 tr=0 ts=686148b5 cx=c_pps a=WW5sKcV1LcKqjgzy2JUPuA==:117 a=xqWC_Br6kY4A:10 a=6IFa9wvqVegA:10 a=cm27Pg_UAAAA:8 a=EUspDBNiAAAA:8 a=pGLkceISAAAA:8 a=m2jltaIWnU9X2HFGTMUA:9 a=OpyuDcXvxspvyRM73sMx:22 X-Proofpoint-GUID: m5DUi2vSraGIwP1C-PYy-UFIrYGEPMOz X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjI5MDExOSBTYWx0ZWRfX2Jva05+kd162 nvbw6Le1DccZGB74JXwT5ej9+ui3a6cuTAw7I0rbwDUkolWrgRCIQqtjj7MOBn15uv1ZcCkuE1s B/h7GuNEfASM/5GZp/m6yLNk8rkoDs95IGjzt/1q+NmSNHPpOzC2PuDOFPdPfjrYJckZDnKIRi/ I78+AQSg/Iq14hJM/6//X+SQ4KkNW6cHyh5UTmBYnxxidZJK+fW9RXeSXlQNH0CweQ5a4rwCqvr DoALCi8i2KyhsyUWS5uybJ7lZ19Jt0mDSNeIhwKb8v//ioI88g0k+9q4sgNXgkBfK3BxfsC0VO9 MMFX/kG6h0L8Pv/pp/6VqGIBNbMoXvP/kOf1h1k84bGsQLccfxJX/+gxkOUC0ZLUmDj+Zn/MXQz Y3dRKdiAgu0JFt3TntfvbDtN09Jq402s96QQMHlaN1WT0LjCD+eFZZL5GF1QnJoTVyVQx/ni 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-27_05,2025-06-27_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 clxscore=1015 mlxlogscore=999 priorityscore=1501 adultscore=0 mlxscore=0 phishscore=0 bulkscore=0 spamscore=0 suspectscore=0 lowpriorityscore=0 malwarescore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2506290119 Content-Type: text/plain; charset="utf-8" From: Rob Clark Add PRR (Partial Resident Region) is a bypass address which make GPU writes go to /dev/null and reads return zero. This is used to implement vulkan sparse residency. To support PRR/NULL mappings, we allocate a page to reserve a physical address which we know will not be used as part of a GEM object, and configure the SMMU to use this address for PRR/NULL mappings. Signed-off-by: Rob Clark Signed-off-by: Rob Clark Tested-by: Antonino Maniscalco Reviewed-by: Antonino Maniscalco --- drivers/gpu/drm/msm/adreno/adreno_gpu.c | 10 ++++ drivers/gpu/drm/msm/msm_iommu.c | 62 ++++++++++++++++++++++++- include/uapi/drm/msm_drm.h | 2 + 3 files changed, 73 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/= adreno/adreno_gpu.c index 676fc078d545..12bf39c0516c 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c @@ -357,6 +357,13 @@ int adreno_fault_handler(struct msm_gpu *gpu, unsigned= long iova, int flags, return 0; } =20 +static bool +adreno_smmu_has_prr(struct msm_gpu *gpu) +{ + struct adreno_smmu_priv *adreno_smmu =3D dev_get_drvdata(&gpu->pdev->dev); + return adreno_smmu && adreno_smmu->set_prr_addr; +} + int adreno_get_param(struct msm_gpu *gpu, struct msm_context *ctx, uint32_t param, uint64_t *value, uint32_t *len) { @@ -440,6 +447,9 @@ int adreno_get_param(struct msm_gpu *gpu, struct msm_co= ntext *ctx, case MSM_PARAM_UCHE_TRAP_BASE: *value =3D adreno_gpu->uche_trap_base; return 0; + case MSM_PARAM_HAS_PRR: + *value =3D adreno_smmu_has_prr(gpu); + return 0; default: return UERR(EINVAL, drm, "%s: invalid param: %u", gpu->name, param); } diff --git a/drivers/gpu/drm/msm/msm_iommu.c b/drivers/gpu/drm/msm/msm_iomm= u.c index 3c2eb59bfd49..a0c74ecdb11b 100644 --- a/drivers/gpu/drm/msm/msm_iommu.c +++ b/drivers/gpu/drm/msm/msm_iommu.c @@ -13,6 +13,7 @@ struct msm_iommu { struct msm_mmu base; struct iommu_domain *domain; atomic_t pagetables; + struct page *prr_page; }; =20 #define to_msm_iommu(x) container_of(x, struct msm_iommu, base) @@ -112,6 +113,36 @@ static int msm_iommu_pagetable_unmap(struct msm_mmu *m= mu, u64 iova, return (size =3D=3D 0) ? 0 : -EINVAL; } =20 +static int msm_iommu_pagetable_map_prr(struct msm_mmu *mmu, u64 iova, size= _t len, int prot) +{ + struct msm_iommu_pagetable *pagetable =3D to_pagetable(mmu); + struct io_pgtable_ops *ops =3D pagetable->pgtbl_ops; + struct msm_iommu *iommu =3D to_msm_iommu(pagetable->parent); + phys_addr_t phys =3D page_to_phys(iommu->prr_page); + u64 addr =3D iova; + + while (len) { + size_t mapped =3D 0; + size_t size =3D PAGE_SIZE; + int ret; + + ret =3D ops->map_pages(ops, addr, phys, size, 1, prot, GFP_KERNEL, &mapp= ed); + + /* map_pages could fail after mapping some of the pages, + * so update the counters before error handling. + */ + addr +=3D mapped; + len -=3D mapped; + + if (ret) { + msm_iommu_pagetable_unmap(mmu, iova, addr - iova); + return -EINVAL; + } + } + + return 0; +} + static int msm_iommu_pagetable_map(struct msm_mmu *mmu, u64 iova, struct sg_table *sgt, size_t off, size_t len, int prot) @@ -122,6 +153,9 @@ static int msm_iommu_pagetable_map(struct msm_mmu *mmu,= u64 iova, u64 addr =3D iova; unsigned int i; =20 + if (!sgt) + return msm_iommu_pagetable_map_prr(mmu, iova, len, prot); + for_each_sgtable_sg(sgt, sg, i) { size_t size =3D sg->length; phys_addr_t phys =3D sg_phys(sg); @@ -177,9 +211,16 @@ static void msm_iommu_pagetable_destroy(struct msm_mmu= *mmu) * If this is the last attached pagetable for the parent, * disable TTBR0 in the arm-smmu driver */ - if (atomic_dec_return(&iommu->pagetables) =3D=3D 0) + if (atomic_dec_return(&iommu->pagetables) =3D=3D 0) { adreno_smmu->set_ttbr0_cfg(adreno_smmu->cookie, NULL); =20 + if (adreno_smmu->set_prr_bit) { + adreno_smmu->set_prr_bit(adreno_smmu->cookie, false); + __free_page(iommu->prr_page); + iommu->prr_page =3D NULL; + } + } + free_io_pgtable_ops(pagetable->pgtbl_ops); kfree(pagetable); } @@ -336,6 +377,25 @@ struct msm_mmu *msm_iommu_pagetable_create(struct msm_= mmu *parent) kfree(pagetable); return ERR_PTR(ret); } + + BUG_ON(iommu->prr_page); + if (adreno_smmu->set_prr_bit) { + /* + * We need a zero'd page for two reasons: + * + * 1) Reserve a known physical address to use when + * mapping NULL / sparsely resident regions + * 2) Read back zero + * + * It appears the hw drops writes to the PRR region + * on the floor, but reads actually return whatever + * is in the PRR page. + */ + iommu->prr_page =3D alloc_page(GFP_KERNEL | __GFP_ZERO); + adreno_smmu->set_prr_addr(adreno_smmu->cookie, + page_to_phys(iommu->prr_page)); + adreno_smmu->set_prr_bit(adreno_smmu->cookie, true); + } } =20 /* Needed later for TLB flush */ diff --git a/include/uapi/drm/msm_drm.h b/include/uapi/drm/msm_drm.h index 2342cb90857e..5bc5e4526ccf 100644 --- a/include/uapi/drm/msm_drm.h +++ b/include/uapi/drm/msm_drm.h @@ -91,6 +91,8 @@ struct drm_msm_timespec { #define MSM_PARAM_UBWC_SWIZZLE 0x12 /* RO */ #define MSM_PARAM_MACROTILE_MODE 0x13 /* RO */ #define MSM_PARAM_UCHE_TRAP_BASE 0x14 /* RO */ +/* PRR (Partially Resident Region) is required for sparse residency: */ +#define MSM_PARAM_HAS_PRR 0x15 /* RO */ =20 /* For backwards compat. The original support for preemption was based on * a single ring per priority level so # of priority levels equals the # --=20 2.50.0 From nobody Wed Oct 8 10:58:51 2025 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 0F98D238159 for ; Sun, 29 Jun 2025 14:07:50 +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=1751206072; cv=none; b=g7GxUSjS2MidT0ZY5Wd1TrTrKltBLfC7IlLOnS5p6Z51HAYHpBTGXlZfh7jfT60ifpu37Uau1dp0ZB33ttjJhvV2T1eWlGHLXbB6R4r1rEIhPtXtHUwUCw7JYK/u59ABqueDv3EBa1vh8d3kKMxrOfKzqgSJ0cC7Iz89Ic1mCGc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751206072; c=relaxed/simple; bh=ESQLfaCKTG4R0R91DqiQm8NfAu6rY6ldXlZSVumZFv4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rehrqWGVz4Yrw2S+3I/OTwfwSC7/Uu1bPbFaGwVJdIKMBmoBpqRkzBccb0C80Yp4AXZZgrm0nbX1ybfAZMlIp/fboSMGeLkDWL4/qACeLxebKyMo3HPC9nV51+fp1lAgX0OopdkEf5rYvb4dPI5SKFoEniKkvEp5n9N13QPw2XQ= 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=jJcrPvyl; 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="jJcrPvyl" Received: from pps.filterd (m0279863.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 55T6gZ3X005200 for ; Sun, 29 Jun 2025 14:07:50 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=Aea4FNs+8GG CBuby38XbOoX3esCsoQzCfRoTW94GwEs=; b=jJcrPvyl7D1DSgJKQPuG2ZaNEJq TmxzF5N9gnvIjsoh4qX8XjmqJreN6TPHLp3w4XVWyIzdfC2siG4gibqJaH13qU09 2uBU8gzgtrGERKfPnFx6Bcg4YyYX7Zk9LchhAfe1O2t+w/HmVy8D6GH+FinaHmqs +mOgTgj+jwa9m8u3lO8aeIbwVtXdP78OqLtfTQi9IaKHUk3gk9E0umTRvpD5WjS+ Hs2exDFHz3iF9jGIJAPoApKed8WuCFF7dmw7xmBPbQ2VhN3gTv8qKKSDk7RCBO4a HBzPFEu/Sxn3X9lIoSrRVmYI+zO9Gxr9XWSMvgTJd+tzGuchbhJlsYFG+GQ== Received: from mail-pg1-f198.google.com (mail-pg1-f198.google.com [209.85.215.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 47j8m627db-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Sun, 29 Jun 2025 14:07:50 +0000 (GMT) Received: by mail-pg1-f198.google.com with SMTP id 41be03b00d2f7-b31e1ef8890so912788a12.2 for ; Sun, 29 Jun 2025 07:07:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751206069; x=1751810869; 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=Aea4FNs+8GGCBuby38XbOoX3esCsoQzCfRoTW94GwEs=; b=dkLELWG43iuwjTSXXGI0Z/ZjQU4gOjKO53IkLSXCmSfa/wcuyRKYIEOdT11veAtRyW TdaGjrrScZ0dOD5PV5lkMSTM4EyMts79rH6F69aQqxRZshba7DDf9yYpif6mZQPbvfCn paopAShsKYjc/6vOHnTg/Kd2DuCf/eBD3uCuhQ0AlydyjRBXLoW2EE0KSdT6agqaU/SD UjoVnxDdY7VC5vEbL1c3xpqu4IHepdGla1yVj+K9/EPHbNvP8JYLl5IIIhLlv9YsYaC5 6e+aa5G/w4gJ2tZ4EdWt/Vcysi4C2D6+TATE2RMMLRw85clF83dRUBn4thOUZ5m5acuH TOsA== X-Forwarded-Encrypted: i=1; AJvYcCWjx6KSdgp03RlkRlrJL1K/L6jIHEjifDmZKAhVtdcx0hw3ioAn8dB8BwLMIjZ8KRoxhcEfIi7nd1CULbQ=@vger.kernel.org X-Gm-Message-State: AOJu0YwEgFDvjb+X/atkkYyKytV/D4rgC2aoA9CyKuemLL2wn9oXRnYE 6nSyhpshBN5YAg+YT/+Ltj0g27jVlJK+Ls+XsOiC60QkjdHuCq/UyJwdVJpQrlvapHzjdvBgOd+ pFjHbFOZ9+MiTqhB3ORVb6Ee1xn5YpLqrETXon3ghThqAcAKxEqyih1FS5boVvh3+RUo= X-Gm-Gg: ASbGncvv2c9pHO98656IT08kiqRkkdgAYE1efVpBQecH1ouPRDZsh3+eyhoFJAIvuUO 4435GucMXsF1Gjoe2yvVrn9mz3wLymKBzdjWNveOXqJYhQgzGkb0PWcHUnHSpSy3vWjszI0Srpj s5z11qLQ9P8LWLVysfV4HTEfHtno6OWoayl81SDy5K+tafIFTxAgzpW0FOap5zkNjtEfwK8vtTi PLVIWLpWdbprvQyy4IRWYjVv/baCW/sAXHf38Ye4u1X4V8wCTCK77aCjZr6+GzDb34kQDl/rYYh IBXl9Wx5WEWsConHiRXpZJt4IyP4F3Pl X-Received: by 2002:a05:6a20:7d8b:b0:218:17c4:248c with SMTP id adf61e73a8af0-220a1696400mr15129154637.22.1751206069235; Sun, 29 Jun 2025 07:07:49 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE4h3RVVYdGoqKUxRhDHt+2Zko+cPdjWJ8H6//OEKtNu88w3yP8af8LGtq0ohnKwkPkhBc2gA== X-Received: by 2002:a05:6a20:7d8b:b0:218:17c4:248c with SMTP id adf61e73a8af0-220a1696400mr15129113637.22.1751206068805; Sun, 29 Jun 2025 07:07:48 -0700 (PDT) Received: from localhost ([2601:1c0:5000:d5c:5b3e:de60:4fda:e7b1]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-74af541ca0asm6760251b3a.57.2025.06.29.07.07.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Jun 2025 07:07:48 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, Connor Abbott , Antonino Maniscalco , Danilo Krummrich , Rob Clark , Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v8 19/42] drm/msm: Rename msm_gem_vma_purge() -> _unmap() Date: Sun, 29 Jun 2025 07:03:22 -0700 Message-ID: <20250629140537.30850-20-robin.clark@oss.qualcomm.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250629140537.30850-1-robin.clark@oss.qualcomm.com> References: <20250629140537.30850-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: AW1haW4tMjUwNjI5MDExOSBTYWx0ZWRfX2lb5hMKMKFj7 8IWc3Z6gzSfirbuF4+edmuyGIJBLo+D7bpWqQ2YnNAWDpROu7tyxCJVE/q70fiVvVPrsJF8NUy5 f1B8hG8+odmGgk+a7AlcuTQv8tLgl4XM4M3lDwoJAeGrpnxqyOM9+6rQfpLM35mDjrBeZDrJu57 VjYV1Q2c/WI/KOXbPYlPllU/Vujy+7c2zUz64ZqwLChWx5z3B5nzE73DxVZ/lt2BgMkTB5dv9os nwIrhezR8UdSV91flky6LYZSuR8S8hIpPW6gWfjx6+Na+rQiEINM3EIAxZegjqT5RWlPkY7k8J2 gMt/ZiOYuAJ2KOhErLBPWcsNN2PD8GAMy/YfnrbnVWONgxEoM2XPL/LNruWIezotWenzbDxsykN oBCMRLx8xCJLG1+JGDx4+EPqZ4iYk2LzhmI1OXYYL42lIKyAZ/DM1kAgLXTPxciOBNA0YB0c X-Authority-Analysis: v=2.4 cv=Fq0F/3rq c=1 sm=1 tr=0 ts=686148b6 cx=c_pps a=Qgeoaf8Lrialg5Z894R3/Q==:117 a=xqWC_Br6kY4A:10 a=6IFa9wvqVegA:10 a=cm27Pg_UAAAA:8 a=EUspDBNiAAAA:8 a=pGLkceISAAAA:8 a=jqtXezU9Yb2X64KsF0MA:9 a=x9snwWr2DeNwDh03kgHS:22 X-Proofpoint-GUID: DrTTp48VK0YHvnClC7bu0cATW3T-9ACB X-Proofpoint-ORIG-GUID: DrTTp48VK0YHvnClC7bu0cATW3T-9ACB 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-27_05,2025-06-27_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 mlxscore=0 suspectscore=0 adultscore=0 clxscore=1015 mlxlogscore=999 impostorscore=0 bulkscore=0 malwarescore=0 spamscore=0 priorityscore=1501 lowpriorityscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2506290119 Content-Type: text/plain; charset="utf-8" From: Rob Clark This is a more descriptive name. Signed-off-by: Rob Clark Signed-off-by: Rob Clark Tested-by: Antonino Maniscalco Reviewed-by: Antonino Maniscalco --- drivers/gpu/drm/msm/msm_gem.c | 6 +++--- drivers/gpu/drm/msm/msm_gem.h | 2 +- drivers/gpu/drm/msm/msm_gem_vma.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c index 5c71a4be0dfa..186d160b74de 100644 --- a/drivers/gpu/drm/msm/msm_gem.c +++ b/drivers/gpu/drm/msm/msm_gem.c @@ -57,7 +57,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_purge(vma); + msm_gem_vma_unmap(vma); msm_gem_vma_close(vma); break; } @@ -433,7 +433,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_purge(vma); + msm_gem_vma_unmap(vma); if (close) msm_gem_vma_close(vma); } @@ -607,7 +607,7 @@ static int clear_iova(struct drm_gem_object *obj, if (!vma) return 0; =20 - msm_gem_vma_purge(vma); + msm_gem_vma_unmap(vma); msm_gem_vma_close(vma); =20 return 0; diff --git a/drivers/gpu/drm/msm/msm_gem.h b/drivers/gpu/drm/msm/msm_gem.h index 0e7b17b2093b..b5bf21f62f9d 100644 --- a/drivers/gpu/drm/msm/msm_gem.h +++ b/drivers/gpu/drm/msm/msm_gem.h @@ -111,7 +111,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_purge(struct drm_gpuva *vma); +void msm_gem_vma_unmap(struct drm_gpuva *vma); 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 ef0efd87e4a6..e16a8cafd8be 100644 --- a/drivers/gpu/drm/msm/msm_gem_vma.c +++ b/drivers/gpu/drm/msm/msm_gem_vma.c @@ -21,7 +21,7 @@ msm_gem_vm_free(struct drm_gpuvm *gpuvm) } =20 /* Actually unmap memory for the vma */ -void msm_gem_vma_purge(struct drm_gpuva *vma) +void msm_gem_vma_unmap(struct drm_gpuva *vma) { struct msm_gem_vma *msm_vma =3D to_msm_vma(vma); struct msm_gem_vm *vm =3D to_msm_vm(vma->vm); --=20 2.50.0 From nobody Wed Oct 8 10:58:51 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 B7A81238D5A for ; Sun, 29 Jun 2025 14:07:52 +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=1751206074; cv=none; b=YYkQ6vVawCKSVBzqATA4sTS+FO2qSZNc/5++phn7fzrbhUavXJF3oGxaL98mt+/9j7TLumJMzBFMiM53NWfeDq70oJPM8JyScYlk+xRw1V/l4/aAZ1wQ6OxOx26bpkxqA38j8D1cEKwR6rirmkbsSpHALiMrPfRNJQTSbTQKNcE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751206074; c=relaxed/simple; bh=hFu0EsxKzuSQGzzTTvNrSL2I+uVbcASFTMQYh05jHrY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IPbVN+P2g6dc3EILEdSn+Og66v53zhWcXNe5g1x94RwugPFaR1j01YYFEs5yjBK33G96j7MxWbS+8cfRABeW3OLTleLd1at31iHJQmL3E2vWqF5RVa3stdvainqkJkKOXEX1lFKt4KHz5q4fS78Zf7c9G4OUqpNHqyFgCQLMhJM= 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=G7p2+MR1; 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="G7p2+MR1" Received: from pps.filterd (m0279871.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 55TAh20W010025 for ; Sun, 29 Jun 2025 14:07:52 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=hadax31kM4+ sOKW6+ZA9wpUzRSoBTDuckmpOBYZlztw=; b=G7p2+MR1tEeDzDKPrPTuONNUP9L zniDCHXGtc1yGhFtQi6/f+A0mjHa9KRGDipcgix2StQjXvu2K3jqfBPfWwDGLZMa k63IE5FIeaa1VYDLcl1OizbMArLJtKEyg88mCWHCp6h001QoUV6lYQ+wUWfsEqC/ 6xkSxNkonSlxF9JR2i3gQdC5AlP89yk016J0Clz1t9faeU7tgKOi4k1fOhiORnpi RInMtwKlW75mt9jtpn8mSOcWKqILYUDhFKxKDnuE04+miR8PiqomEF2z/4+nlq1d cGTTLKndwWk9yxIsWnb7ymZDJiv5SFRFlhsUJ+K9OlZVEdMkQBJSSmaFfhw== Received: from mail-pl1-f200.google.com (mail-pl1-f200.google.com [209.85.214.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 47j801t7rh-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Sun, 29 Jun 2025 14:07:51 +0000 (GMT) Received: by mail-pl1-f200.google.com with SMTP id d9443c01a7336-23536f7c2d7so19745125ad.2 for ; Sun, 29 Jun 2025 07:07:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751206070; x=1751810870; 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=hadax31kM4+sOKW6+ZA9wpUzRSoBTDuckmpOBYZlztw=; b=ZZD3nJqcPjWYAbYwVSMv0JHMg65LbqFRA/dBec4HP2ROpweKbwwoHxm2QBGloScQQt 5BdXF8oQSkrqXZeMhqVDxpKmFUEdfRoFEUNQzx4vGfJd0mzoWrAae2B27Vc8RwxQM3fe ZF0j8rOeJSFsYATLoj/ZyFsLu29w1smNFgJzda5/nVeWQZRMQLnjL2p3T69aWnkv0mit SRnfxGtF9UXnHEzCbYC4mEF315IzFl8sRtYsmIpLtDMAUGTDcQ514FyEajdFPlyfjTz6 ZWDO3iDycB+oqEMzc8eGlA0Gq4TyW7/svJr9AvaDqN+j68Cii8a+QQKeUgRlYi+hZJaR kGOA== X-Forwarded-Encrypted: i=1; AJvYcCUsAEH+ChU/HhqfDId7z0lX6Ap+t9V/OTJyuGuX47Q8ob0FfcqgQkhjnpx1ucyj91GVjjWZIK2AIBoP1bk=@vger.kernel.org X-Gm-Message-State: AOJu0YyrRXTNs52Kp0XdOE7YjjranU9Y9hfDIolb1fg2dRrbOpbQmMQ3 OJktEsPKPixeTxaLqZQBErHcJqYj99rtVmJomXAl6kSZ0JIZPW7PA07VYDot403ab9ZlKhPf20K Sg1WvJZyAgluyqB3si6z9wbUS6PEi3A3mr4SFg1x0KC2OlockzO4783pcjL/0EEzdeFk= X-Gm-Gg: ASbGncvBSNUZlwY1vIs00xrs8ZsYv6SWtT6ey9X6fABJxc0WeUOyEtaY9KAMO7q+FTV jke577slA1mzOeaCEuubKngeHPMxkMJzl7Kbi8P4bUXBKoOpmUFe4ox8rsOyG8VQkpVs0FvSOHI oZKGF0DXDuH7JgDT0KLMKEtsOlu1Hmwac3ktzV3NZ2CMSV89Ayrz3wIkFpMncpDEfsw+LtHbvZN N01vIVvw6PKFt64bnaZJqB/W1XbX961ZfbJLgJzOgLqCxdDtEzK2eJOlKQjoryz2kqOnxb9tZkr 6Ojziy2ZPAk7lT/7W16Nv/b5A02mVYDz X-Received: by 2002:a17:903:2449:b0:234:ba75:836 with SMTP id d9443c01a7336-23ac3bffd8bmr147181755ad.7.1751206070489; Sun, 29 Jun 2025 07:07:50 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEhgyBQ8WKKcLovdC2oavEyunsP/RHNeiUVkDACGNy5ppa5wMTeH1fWoAqZmD8XHl5viNYZ3A== X-Received: by 2002:a17:903:2449:b0:234:ba75:836 with SMTP id d9443c01a7336-23ac3bffd8bmr147181445ad.7.1751206070100; Sun, 29 Jun 2025 07:07:50 -0700 (PDT) Received: from localhost ([2601:1c0:5000:d5c:5b3e:de60:4fda:e7b1]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-23acb39baf5sm61278095ad.123.2025.06.29.07.07.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Jun 2025 07:07:49 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, Connor Abbott , Antonino Maniscalco , Danilo Krummrich , Rob Clark , Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Konrad Dybcio , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v8 20/42] drm/msm: Drop queued submits on lastclose() Date: Sun, 29 Jun 2025 07:03:23 -0700 Message-ID: <20250629140537.30850-21-robin.clark@oss.qualcomm.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250629140537.30850-1-robin.clark@oss.qualcomm.com> References: <20250629140537.30850-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-GUID: NJqkbnGh-bT9tx96XdS2j5ecVNTZTh13 X-Authority-Analysis: v=2.4 cv=YPWfyQGx c=1 sm=1 tr=0 ts=686148b7 cx=c_pps a=IZJwPbhc+fLeJZngyXXI0A==:117 a=xqWC_Br6kY4A:10 a=6IFa9wvqVegA:10 a=cm27Pg_UAAAA:8 a=EUspDBNiAAAA:8 a=pGLkceISAAAA:8 a=Vc5hAS3c26tUa1HFGawA:9 a=uG9DUKGECoFWVXl0Dc02:22 X-Proofpoint-ORIG-GUID: NJqkbnGh-bT9tx96XdS2j5ecVNTZTh13 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjI5MDExOSBTYWx0ZWRfXxrNcz3K9Rq5g XYf0GqnwenrgOHvzRcr8mKC6WBsm2AauEQ+GUShBQO3bboUm3mbbKtPRaTg+mrq1gb2yVN8k8JC 9mQ8dvvSdSmFvaiYLho4eWng+vrpZWD3MGCZnZv8a2hlvNIVD6O6FmNH5WpVXf+keGI+5u7lpch KrX2kGxLw6baXMiNrxhUf6/YQIYATH+htEvfA+kOJRiyXDG/3PAdhct1POrcKEylZ75nSTuCWk/ gXSbe68blneMFNT7mW69KScgEbCqSYecwoDRN89RmgCNRRcn67aAbYCaZjJA9V2HplNx94QhFIK m8EU5P3/B2U8yHerTwRO6thdIIrgqq6pTzIu5Kib0hFV1WDedagAqh8gLxYLwz2S3mSg4+Wp8+p zHvi0hxg26JCQieBlpWkmvzlQYfayU5o5QMlEVZxm6UT20Ot7ZpRszTzhxUZ8XJJWhfMccYw 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-27_05,2025-06-27_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 mlxlogscore=999 mlxscore=0 malwarescore=0 suspectscore=0 lowpriorityscore=0 clxscore=1015 impostorscore=0 adultscore=0 priorityscore=1501 bulkscore=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-2506290119 Content-Type: text/plain; charset="utf-8" From: Rob Clark If we haven't written the submit into the ringbuffer yet, then drop it. The submit still retires through the normal path, to preserve fence signalling order, but we can skip the IB's to userspace cmdstream. Signed-off-by: Rob Clark Signed-off-by: Rob Clark Tested-by: Antonino Maniscalco Reviewed-by: Antonino Maniscalco --- drivers/gpu/drm/msm/msm_drv.c | 1 + drivers/gpu/drm/msm/msm_gpu.h | 8 ++++++++ drivers/gpu/drm/msm/msm_ringbuffer.c | 6 ++++++ 3 files changed, 15 insertions(+) diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c index 488fdf02aee9..c4b0a38276fa 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -254,6 +254,7 @@ static int msm_open(struct drm_device *dev, struct drm_= file *file) =20 static void context_close(struct msm_context *ctx) { + ctx->closed =3D true; msm_submitqueue_close(ctx); msm_context_put(ctx); } diff --git a/drivers/gpu/drm/msm/msm_gpu.h b/drivers/gpu/drm/msm/msm_gpu.h index 231577656fae..a35e1c7bbcdd 100644 --- a/drivers/gpu/drm/msm/msm_gpu.h +++ b/drivers/gpu/drm/msm/msm_gpu.h @@ -356,6 +356,14 @@ struct msm_context { */ int queueid; =20 + /** + * @closed: The device file associated with this context has been closed. + * + * Once the device is closed, any submits that have not been written + * to the ring buffer are no-op'd. + */ + bool closed; + /** @vm: the per-process GPU address-space */ struct drm_gpuvm *vm; =20 diff --git a/drivers/gpu/drm/msm/msm_ringbuffer.c b/drivers/gpu/drm/msm/msm= _ringbuffer.c index 552b8da9e5f7..b2f612e5dc79 100644 --- a/drivers/gpu/drm/msm/msm_ringbuffer.c +++ b/drivers/gpu/drm/msm/msm_ringbuffer.c @@ -17,6 +17,7 @@ static struct dma_fence *msm_job_run(struct drm_sched_job= *job) struct msm_fence_context *fctx =3D submit->ring->fctx; struct msm_gpu *gpu =3D submit->gpu; struct msm_drm_private *priv =3D gpu->dev->dev_private; + unsigned nr_cmds =3D submit->nr_cmds; int i; =20 msm_fence_init(submit->hw_fence, fctx); @@ -36,8 +37,13 @@ static struct dma_fence *msm_job_run(struct drm_sched_jo= b *job) /* TODO move submit path over to using a per-ring lock.. */ mutex_lock(&gpu->lock); =20 + if (submit->queue->ctx->closed) + submit->nr_cmds =3D 0; + msm_gpu_submit(gpu, submit); =20 + submit->nr_cmds =3D nr_cmds; + mutex_unlock(&gpu->lock); =20 return dma_fence_get(submit->hw_fence); --=20 2.50.0 From nobody Wed Oct 8 10:58:51 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 9A40C23A98E for ; Sun, 29 Jun 2025 14:07:54 +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=1751206076; cv=none; b=ddg2xNN9tGgREpwPYI3tOd1IKSty0aXDZRM/Ced6oDY0wIT6pwd4Rg5R8RwqmSxTj0vM0kWWr5hV9cfoG26bcMEOZ4YSYWtgqWgBEYAsk5t7KZA7Adgn44ZnAsO++Y2S0NZUsdvj41xjievzIjTDLYZYtimcvjNLI1G4/5rD8fI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751206076; c=relaxed/simple; bh=B9YTTznctoHdBwrv5g0hUa2frK/TNvG5X6fwVs2vyWU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=C0RpV8oymzTPZl5XkuK1BsKMqGyEKZQNnHyJRum5fFRfZ0fXyDqqvEe9sn9VsKbubZU7qxdWNqwo/zNCXA6cKwzHiMRC9D3J7kzTTRbdIpKCR4PTUj5CUT5xQk7e1NPxytKUoMYp86Ex9qBLL9pUoV+WkNpiTJDG7dQKxFSRMQI= 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=X+wWrEAm; 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="X+wWrEAm" Received: from pps.filterd (m0279872.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 55TCk2dB001756 for ; Sun, 29 Jun 2025 14:07:53 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=P0BUJyXh6kP qdE8f3drw7XmhKLdbfVd0jGadfPkUqgU=; b=X+wWrEAmJGmu/SO93F7X1tUL/59 vtB+c8v6olldeFmmDYL6571eNla+EuxBl389yKouIntPniJnrcoTMH74DFhA7OQb oddhKmFUbna1mFj9CXiF4w/3WfR+IneSap3hPiEblx6jZ4KO/5+1Y55b3CvqA68B dfe6fWH5mBmwMIUuOZL56+34LKKgSxNaokRFM5UGNRSVr/c53Rb5X7B1LD7amryO WonnlJGGrFyQaKUnvREKcBgP8+8uQlGumwRN3kf0MInolI4eF+n2hMy4uHiQnXb+ YvFv4uOekV1IJdeU4KaiGyfcu7nFZrsULhP1tjY5SSpW336oVgiI1LYzJkQ== Received: from mail-pg1-f199.google.com (mail-pg1-f199.google.com [209.85.215.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 47j8s9a5y9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Sun, 29 Jun 2025 14:07:53 +0000 (GMT) Received: by mail-pg1-f199.google.com with SMTP id 41be03b00d2f7-b1ffc678adfso2361802a12.0 for ; Sun, 29 Jun 2025 07:07:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751206072; x=1751810872; 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=P0BUJyXh6kPqdE8f3drw7XmhKLdbfVd0jGadfPkUqgU=; b=bHIu3vFjRkpFCK2fWxziZF6mBJ+VO8V2vSG2wKR85CM2xvfir8DmTgEQU+ZIK3RxF3 00jtSwdKm9Y+lbbi4DtakJacHv7Q3gcQOGK6Rcp3jddJkAg4eGsMm4fP97GaI81iKSDS MdnaIBeGmvbcqrYsCZCzD351MkIjpVzttlOMJUDSPSc2rYjGGR7+6HJVjoCuxhW9cq2h ixgQDz4ndzEVlHQqDf2fvgmHWhi7342frkTzrSVmrUHU6yb1DfogvRBs8r8vwmcpcDap GnEADCX+jwQDBfskW1AHbYJXeoMDEKsRW8WgvrzOJXxd5yMwAoSehuDwjVfVfWkLeX+z 05TQ== X-Forwarded-Encrypted: i=1; AJvYcCXt08ZCAe6aOEBhlDSTxLHLVj7dLwpZ1oZ2Lh9YIa3P9EFp6KZEhfQr0j/ST+6CusgZ+dRyS8fEfSXDo0E=@vger.kernel.org X-Gm-Message-State: AOJu0YwERPmsIkLzJeShrRgxN2M+urKBJs4AnfFsB9IlcQW98dBnuXK4 A+k8u5NE9CqAaPDgLn/cXrNCgYk5Sd585tiTVbJIGyLu6uC1GmnFXk+Zg1Or8YEClffv1QACg81 OcAN9EvtWeh6n4oWigvS/kVtvOBnfyvYdzX/9Moh48P3rZyB7Q7Qz0c/LhSuG8vOfGyM= X-Gm-Gg: ASbGncsvgBYUVkv6IHN8CWTbu0F/L+gYxavM9jzQ8r0GSKRHRP9aTWzgtHgVgDkbiOh B+w02cbBd+nVEvzWsgWV9fXVqnc7atn5sUYYwk93dgdRxM5T0Rb7XUqfqy4nMENcInC47jmEnhL m5QrxsF15Ec76S+aYkBBs68dte4KX7fdskS+T54TK9qlsiKDMr9O7myUs8rdn4Og02aFFl5BIWa JoijysXrYbnvzbBIDB4lOK60i9xTqczZ3GJksaBSZgeWOrCO7lsvvvLhAMry1t64p86SCzxF3/K NjVVV1qE3HMN788bXVr4tUHvjs7lDR2e X-Received: by 2002:a17:902:db09:b0:226:38ff:1d6a with SMTP id d9443c01a7336-23ac3cf54d3mr146088715ad.7.1751206071989; Sun, 29 Jun 2025 07:07:51 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE32k7Afuea4S6YlDfLE+VUZzeCxgrzidUbH0ovqiE4vkhu2fW7o1UrBtt/LddK/revmNzJUg== X-Received: by 2002:a17:902:db09:b0:226:38ff:1d6a with SMTP id d9443c01a7336-23ac3cf54d3mr146088305ad.7.1751206071431; Sun, 29 Jun 2025 07:07:51 -0700 (PDT) Received: from localhost ([2601:1c0:5000:d5c:5b3e:de60:4fda:e7b1]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-23acb2f182csm62074285ad.55.2025.06.29.07.07.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Jun 2025 07:07:51 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, Connor Abbott , Antonino Maniscalco , Danilo Krummrich , Rob Clark , Rob Clark , Sean Paul , Konrad Dybcio , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Marijn Suijten , David Airlie , Simona Vetter , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v8 21/42] drm/msm: Lazily create context VM Date: Sun, 29 Jun 2025 07:03:24 -0700 Message-ID: <20250629140537.30850-22-robin.clark@oss.qualcomm.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250629140537.30850-1-robin.clark@oss.qualcomm.com> References: <20250629140537.30850-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-Authority-Analysis: v=2.4 cv=H/Pbw/Yi c=1 sm=1 tr=0 ts=686148b9 cx=c_pps a=Oh5Dbbf/trHjhBongsHeRQ==:117 a=xqWC_Br6kY4A:10 a=6IFa9wvqVegA:10 a=cm27Pg_UAAAA:8 a=EUspDBNiAAAA:8 a=pGLkceISAAAA:8 a=K8YrE2tTMaBrqk7BmowA:9 a=_Vgx9l1VpLgwpw_dHYaR:22 X-Proofpoint-ORIG-GUID: 6FFIjdHmtIwcQ_pA2bUNctpnWLjH4rNC X-Proofpoint-GUID: 6FFIjdHmtIwcQ_pA2bUNctpnWLjH4rNC X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjI5MDExOCBTYWx0ZWRfX/iUBMeXs2UW/ GCJBPMFsqyL7GhkAMHxxPAGFWc+YPndvjwRF2BW86TgnFT1/hnAPaSVA4CmNvQK8oaYi13/oguG koGIlHm3QvDCwQufuAMuK7i1Ve9sycyWNJ3GAE6hlxd5TUV/3Po2yvI8x3Zp4HBG2zUALUfSSUb ROKuYKMV9FLOWSJfT1EQihC8VT1altN09yDoockwIR7xV4XVTTC7KGsFoobLkceQG1Ip9TecfUN eEDrgE6JRpcXcAib6N/WBKYq8bB/GR6DYcECWybrnItG8qs0wM7+elrpsGIdFDtpZ8SzzQNPt0s s/E7nXc1UcNJDVuZvZza2osieNh4ZqLF4KGCymiktIsyrSlk+I8TPE27FQpXGc55Rf3ODyexEgy gICmzc8Xx5nag4tUiUH0EJs159c4Ibg0cHwlqhkcJvl/ik+tQ/NMUHA0NuLfzYB78h44n/J6 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-27_05,2025-06-27_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 malwarescore=0 suspectscore=0 mlxlogscore=999 priorityscore=1501 clxscore=1015 mlxscore=0 lowpriorityscore=0 spamscore=0 adultscore=0 bulkscore=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-2506290118 Content-Type: text/plain; charset="utf-8" From: Rob Clark In the next commit, a way for userspace to opt-in to userspace managed VM is added. For this to work, we need to defer creation of the VM until it is needed. Signed-off-by: Rob Clark Signed-off-by: Rob Clark Tested-by: Antonino Maniscalco Reviewed-by: Antonino Maniscalco --- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 3 ++- drivers/gpu/drm/msm/adreno/adreno_gpu.c | 14 +++++++----- drivers/gpu/drm/msm/msm_drv.c | 29 ++++++++++++++++++++----- drivers/gpu/drm/msm/msm_gem_submit.c | 2 +- drivers/gpu/drm/msm/msm_gpu.h | 9 +++++++- 5 files changed, 43 insertions(+), 14 deletions(-) diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c b/drivers/gpu/drm/msm/ad= reno/a6xx_gpu.c index 0b78888c58af..7364b7e9c266 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c @@ -112,6 +112,7 @@ static void a6xx_set_pagetable(struct a6xx_gpu *a6xx_gp= u, { bool sysprof =3D refcount_read(&a6xx_gpu->base.base.sysprof_active) > 1; struct msm_context *ctx =3D submit->queue->ctx; + struct drm_gpuvm *vm =3D msm_context_vm(submit->dev, ctx); struct adreno_gpu *adreno_gpu =3D &a6xx_gpu->base; phys_addr_t ttbr; u32 asid; @@ -120,7 +121,7 @@ static void a6xx_set_pagetable(struct a6xx_gpu *a6xx_gp= u, if (ctx->seqno =3D=3D ring->cur_ctx_seqno) return; =20 - if (msm_iommu_pagetable_params(to_msm_vm(ctx->vm)->mmu, &ttbr, &asid)) + if (msm_iommu_pagetable_params(to_msm_vm(vm)->mmu, &ttbr, &asid)) return; =20 if (adreno_gpu->info->family >=3D ADRENO_7XX_GEN1) { diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/= adreno/adreno_gpu.c index 12bf39c0516c..2baf381ea401 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c @@ -369,6 +369,8 @@ int adreno_get_param(struct msm_gpu *gpu, struct msm_co= ntext *ctx, { struct adreno_gpu *adreno_gpu =3D to_adreno_gpu(gpu); struct drm_device *drm =3D gpu->dev; + /* Note ctx can be NULL when called from rd_open(): */ + struct drm_gpuvm *vm =3D ctx ? msm_context_vm(drm, ctx) : NULL; =20 /* No pointer params yet */ if (*len !=3D 0) @@ -414,8 +416,8 @@ int adreno_get_param(struct msm_gpu *gpu, struct msm_co= ntext *ctx, *value =3D 0; return 0; case MSM_PARAM_FAULTS: - if (ctx->vm) - *value =3D gpu->global_faults + to_msm_vm(ctx->vm)->faults; + if (vm) + *value =3D gpu->global_faults + to_msm_vm(vm)->faults; else *value =3D gpu->global_faults; return 0; @@ -423,14 +425,14 @@ int adreno_get_param(struct msm_gpu *gpu, struct msm_= context *ctx, *value =3D gpu->suspend_count; return 0; case MSM_PARAM_VA_START: - if (ctx->vm =3D=3D gpu->vm) + if (vm =3D=3D gpu->vm) return UERR(EINVAL, drm, "requires per-process pgtables"); - *value =3D ctx->vm->mm_start; + *value =3D vm->mm_start; return 0; case MSM_PARAM_VA_SIZE: - if (ctx->vm =3D=3D gpu->vm) + if (vm =3D=3D gpu->vm) return UERR(EINVAL, drm, "requires per-process pgtables"); - *value =3D ctx->vm->mm_range; + *value =3D vm->mm_range; return 0; case MSM_PARAM_HIGHEST_BANK_BIT: *value =3D adreno_gpu->ubwc_config.highest_bank_bit; diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c index c4b0a38276fa..5cbc2c7b1204 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -218,10 +218,29 @@ static void load_gpu(struct drm_device *dev) mutex_unlock(&init_lock); } =20 +/** + * msm_context_vm - lazily create the context's VM + * + * @dev: the drm device + * @ctx: the context + * + * The VM is lazily created, so that userspace has a chance to opt-in to h= aving + * a userspace managed VM before the VM is created. + * + * Note that this does not return a reference to the VM. Once the VM is c= reated, + * it exists for the lifetime of the context. + */ +struct drm_gpuvm *msm_context_vm(struct drm_device *dev, struct msm_contex= t *ctx) +{ + struct msm_drm_private *priv =3D dev->dev_private; + if (!ctx->vm) + ctx->vm =3D msm_gpu_create_private_vm(priv->gpu, current); + return ctx->vm; +} + static int context_init(struct drm_device *dev, struct drm_file *file) { static atomic_t ident =3D ATOMIC_INIT(0); - struct msm_drm_private *priv =3D dev->dev_private; struct msm_context *ctx; =20 ctx =3D kzalloc(sizeof(*ctx), GFP_KERNEL); @@ -234,7 +253,6 @@ static int context_init(struct drm_device *dev, struct = drm_file *file) kref_init(&ctx->ref); msm_submitqueue_init(dev, ctx); =20 - ctx->vm =3D msm_gpu_create_private_vm(priv->gpu, current); file->driver_priv =3D ctx; =20 ctx->seqno =3D atomic_inc_return(&ident); @@ -413,7 +431,7 @@ static int msm_ioctl_gem_info_iova(struct drm_device *d= ev, * Don't pin the memory here - just get an address so that userspace can * be productive */ - return msm_gem_get_iova(obj, ctx->vm, iova); + return msm_gem_get_iova(obj, msm_context_vm(dev, ctx), iova); } =20 static int msm_ioctl_gem_info_set_iova(struct drm_device *dev, @@ -422,18 +440,19 @@ static int msm_ioctl_gem_info_set_iova(struct drm_dev= ice *dev, { struct msm_drm_private *priv =3D dev->dev_private; struct msm_context *ctx =3D file->driver_priv; + struct drm_gpuvm *vm =3D msm_context_vm(dev, ctx); =20 if (!priv->gpu) return -EINVAL; =20 /* Only supported if per-process address space is supported: */ - if (priv->gpu->vm =3D=3D ctx->vm) + if (priv->gpu->vm =3D=3D vm) return UERR(EOPNOTSUPP, dev, "requires per-process pgtables"); =20 if (should_fail(&fail_gem_iova, obj->size)) return -ENOMEM; =20 - return msm_gem_set_iova(obj, ctx->vm, iova); + return msm_gem_set_iova(obj, vm, iova); } =20 static int msm_ioctl_gem_info_set_metadata(struct drm_gem_object *obj, diff --git a/drivers/gpu/drm/msm/msm_gem_submit.c b/drivers/gpu/drm/msm/msm= _gem_submit.c index d8ff6aeb04ab..068ca618376c 100644 --- a/drivers/gpu/drm/msm/msm_gem_submit.c +++ b/drivers/gpu/drm/msm/msm_gem_submit.c @@ -63,7 +63,7 @@ static struct msm_gem_submit *submit_create(struct drm_de= vice *dev, =20 kref_init(&submit->ref); submit->dev =3D dev; - submit->vm =3D queue->ctx->vm; + submit->vm =3D msm_context_vm(dev, queue->ctx); submit->gpu =3D gpu; submit->cmd =3D (void *)&submit->bos[nr_bos]; submit->queue =3D queue; diff --git a/drivers/gpu/drm/msm/msm_gpu.h b/drivers/gpu/drm/msm/msm_gpu.h index a35e1c7bbcdd..29662742a7e1 100644 --- a/drivers/gpu/drm/msm/msm_gpu.h +++ b/drivers/gpu/drm/msm/msm_gpu.h @@ -364,7 +364,12 @@ struct msm_context { */ bool closed; =20 - /** @vm: the per-process GPU address-space */ + /** + * @vm: + * + * The per-process GPU address-space. Do not access directly, use + * msm_context_vm(). + */ struct drm_gpuvm *vm; =20 /** @kref: the reference count */ @@ -449,6 +454,8 @@ struct msm_context { atomic64_t ctx_mem; }; =20 +struct drm_gpuvm *msm_context_vm(struct drm_device *dev, struct msm_contex= t *ctx); + /** * msm_gpu_convert_priority - Map userspace priority to ring # and sched p= riority * --=20 2.50.0 From nobody Wed Oct 8 10:58:51 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 6B14223B614 for ; Sun, 29 Jun 2025 14:07:56 +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=1751206078; cv=none; b=I+af5PSnxbTu/4Kqfs3tJoWnF9YqxZUx6IlrAyW1uYK9J2bytwsMysChoYa3Z6R/jjvYbcFF+tQPUf/HsuZfFkmhiHyFH6D5+KR9IEJxyMgzaPxErU4WKGXtVegKdN3cFizvrYmlVOW3wiJxXwAvUWWU/O+vZnAPazTyIGMI1h0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751206078; c=relaxed/simple; bh=m0U9/s1Q9Od9FftI8RojXks8GPgRuLuUt0Z66pJguBw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=uNdLzWscs2135hgvRNhlWGomarPirIGPrdYtywdalvRTLqB+ZOvxqJp0+x+o7ov/R0ojr3jxHVjFPR7onqZAYH/BD0tdIeQIyVLdoeC+cD9TQ8rIlhE0zVKODHzPahwmhdDxcVYPFk/0KJmFHfnmbHJQMQSSI9K3umtSMCWdEV0= 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=fcxmN759; 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="fcxmN759" Received: from pps.filterd (m0279870.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 55T9gmMI002071 for ; Sun, 29 Jun 2025 14:07:55 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=S4kAEuyQKeE +qmE3bZkWMAOyZt7c6wX4bFKVn68PInY=; b=fcxmN759f4i6qKaLADOOaF5ik8m Pn8JUw9ODu7k0hVHo93n9rsV6RLwbrY/fZpMhi1d/R/NNwyYLPUW0NNJyz7FOGzm QHezVpw4NlE9y+E2oHzvbeTnHsYzrgAqDPd5BY6YQUC2IdxPGP1Hi2ER6Xt1LBHZ fn1rvAxnBWJNMTKT9Qc0HGnyAEE5AljDbdKYal58jU3FqG4LqZhCoLEvB18iQa25 E2wf4iZXf4t2ImArEnwEnRjHQCbpfzpyQGOj2d/1+JFAef/ERw5lms8wMYO3E9FJ nizZiTbDdD2PtUVd2bN1RNFEReZXGkAdtpGJkHn7PgJZq+BKxGmF7X9Uccw== Received: from mail-pl1-f199.google.com (mail-pl1-f199.google.com [209.85.214.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 47j8fxa8en-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Sun, 29 Jun 2025 14:07:55 +0000 (GMT) Received: by mail-pl1-f199.google.com with SMTP id d9443c01a7336-23692793178so28918705ad.0 for ; Sun, 29 Jun 2025 07:07:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751206074; x=1751810874; 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=S4kAEuyQKeE+qmE3bZkWMAOyZt7c6wX4bFKVn68PInY=; b=OUTbbmWt9ih3YOseu8FQANmlyuew+feSe2kvEnhaxdYkqzcRECxdRQCBHa42KgdUD2 n7LPZcgM6O6pChjeh5P5vqNOPssgNNSypGBdYMXDouqsgXzIL1ANotnMh8rkiArLw26e psVKnE9jTjotbNSfVf27I+kotrQQiLpTVPknZaNZPSkq+uPK9TRO/BR5b1tHlWGLAeBb QEB6SfwO2ZX4K/+nXQv/GKhTcUdsfMiryNGL+y7Kav51yRsZ3PLJ5b4XUNLPbFUzuVM5 9+YW31KDqYPXx5uZWaYLIOeMZCRiGeWpyeW9D+Clj3ZeykveUFYXd7Q6kARr6kyHzHqh UNSw== X-Forwarded-Encrypted: i=1; AJvYcCWNLtMs1OoL6JppFmc9G70Lr+vVSrbdUoCV2XSFaEWlHh44A0n5SpxdOIr2oZMaeMH8oDecp/Bnu+uOgyI=@vger.kernel.org X-Gm-Message-State: AOJu0YwtCXvpxyrUAN5drmi+/46ujtOTD06UeikWb+tz4QEfu2jVwqra P2sgtt6XyPs8d0XWBOEUoqy64NbPhHSKDTar5BbnKuoZARfIubE4zJrVmX6o1m/10Bs5+Aowcaj GXMKKW5wAAf7IRTY3iswxK3b4ygfc+5dgsRSle5dSp+X6crCHuH3GqnhZmzFLEqWPdmQ= X-Gm-Gg: ASbGncssg6So9mKflC+M5od0os0b9U5RBh2f8dbiOAs85U3A1xOV72IPLN7lk0OtVXB 49yVL7nnOJ+JSlusRTNOPUC9qxJdypkxp9piar4WbOrlzHZtWJPaL6OPCKfmE5GCPeKEEKqhny1 tqJLPTPz2+aWVtPHycnNtOPHCkQxVBE6ZmWYE4fKNFPFbd52AwylhjI3GVVaqOHc9ofAZdvAS9t Wqj6TnZbSe10/IBEOZzBHLnoE2kx07dpsng5L0utmVPbkd5vQSe9znwEZbqK7hRJnMJL2v8TWm8 GbH+ZeBBp6GQFFtG9y9Ot7u+osCw+tKN X-Received: by 2002:a17:903:230f:b0:234:8a4a:adb4 with SMTP id d9443c01a7336-23ac45ea926mr154659545ad.21.1751206073857; Sun, 29 Jun 2025 07:07:53 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHDFjkJ/2l3gBXJZ0dm/nqu3lCJ0DmF0UqzN8JdUb+/C/Yb3EBTnIMY/D/TL7ORLWfUgmVP4Q== X-Received: by 2002:a17:903:230f:b0:234:8a4a:adb4 with SMTP id d9443c01a7336-23ac45ea926mr154658885ad.21.1751206073161; Sun, 29 Jun 2025 07:07:53 -0700 (PDT) Received: from localhost ([2601:1c0:5000:d5c:5b3e:de60:4fda:e7b1]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-23acb3af744sm58321685ad.157.2025.06.29.07.07.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Jun 2025 07:07:52 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, Connor Abbott , Antonino Maniscalco , Danilo Krummrich , Rob Clark , Rob Clark , Sean Paul , Konrad Dybcio , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Marijn Suijten , David Airlie , Simona Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v8 22/42] drm/msm: Add opt-in for VM_BIND Date: Sun, 29 Jun 2025 07:03:25 -0700 Message-ID: <20250629140537.30850-23-robin.clark@oss.qualcomm.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250629140537.30850-1-robin.clark@oss.qualcomm.com> References: <20250629140537.30850-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: AW1haW4tMjUwNjI5MDExOSBTYWx0ZWRfX7k5xbJE0YO5l Wjex0rf8El6JHDGzR7ANhwVilv6TqWu8qflcTW0k1BZRDduVIynrC73BDt3At7RtiMl4/ZrCHbQ MafsydZdkN6iOYgPXunmA6n0FemxtQ0KSshBdFX4mZORnmGdJTHrkgV1A7qTP4r2psSX/Hawc0Z LxAdlJ0ssNGY119Rr6kln6mFIEq5A6ESFppebrqk2Rm3huYGhDf3P7m8C5jptM/HeJZDrfWt5d7 tEqXyGFU8e30DQc8VZFrtc9R7JlR0QJ2do9lKeqJuF87h5gWWsHpFqwam/OTirKVCdGkJGNrUEr cFEkpqvQ0vWVwciv2vZ5Z1syLvbVZOQ3pUOzjS6Mt7hSpFAvmll3lLHHACxXBYvSK9hx+Lwb9Mh pZjal26/kKALOeOEr6Oozr3eyAyQTMAzG/jS2DtJmoKNQssWqZvCqnkqz4pUBqwkMAN60VG/ X-Proofpoint-GUID: fXcSngOzvl6FojrfLK_Dfx7xJlycbjBP X-Proofpoint-ORIG-GUID: fXcSngOzvl6FojrfLK_Dfx7xJlycbjBP X-Authority-Analysis: v=2.4 cv=TqPmhCXh c=1 sm=1 tr=0 ts=686148bb cx=c_pps a=JL+w9abYAAE89/QcEU+0QA==:117 a=xqWC_Br6kY4A:10 a=6IFa9wvqVegA:10 a=cm27Pg_UAAAA:8 a=EUspDBNiAAAA:8 a=pGLkceISAAAA:8 a=iDRtRSvoPPFvr6RSarUA:9 a=324X-CrmTo6CU4MGRt3R: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-27_05,2025-06-27_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 bulkscore=0 mlxlogscore=999 suspectscore=0 adultscore=0 phishscore=0 malwarescore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 spamscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2506290119 Content-Type: text/plain; charset="utf-8" From: Rob Clark Add a SET_PARAM for userspace to request to manage to the VM itself, instead of getting a kernel managed VM. In order to transition to a userspace managed VM, this param must be set before any mappings are created. Signed-off-by: Rob Clark Signed-off-by: Rob Clark Tested-by: Antonino Maniscalco Reviewed-by: Antonino Maniscalco --- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 4 ++-- drivers/gpu/drm/msm/adreno/adreno_gpu.c | 15 +++++++++++++ drivers/gpu/drm/msm/msm_drv.c | 22 +++++++++++++++++-- drivers/gpu/drm/msm/msm_gem.c | 8 +++++++ drivers/gpu/drm/msm/msm_gpu.c | 5 +++-- drivers/gpu/drm/msm/msm_gpu.h | 29 +++++++++++++++++++++++-- include/uapi/drm/msm_drm.h | 24 ++++++++++++++++++++ 7 files changed, 99 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c b/drivers/gpu/drm/msm/ad= reno/a6xx_gpu.c index 7364b7e9c266..62b5f294a2aa 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c @@ -2276,7 +2276,7 @@ a6xx_create_vm(struct msm_gpu *gpu, struct platform_d= evice *pdev) } =20 static struct drm_gpuvm * -a6xx_create_private_vm(struct msm_gpu *gpu) +a6xx_create_private_vm(struct msm_gpu *gpu, bool kernel_managed) { struct msm_mmu *mmu; =20 @@ -2286,7 +2286,7 @@ a6xx_create_private_vm(struct msm_gpu *gpu) return ERR_CAST(mmu); =20 return msm_gem_vm_create(gpu->dev, mmu, "gpu", ADRENO_VM_START, - adreno_private_vm_size(gpu), true); + adreno_private_vm_size(gpu), kernel_managed); } =20 static uint32_t a6xx_get_rptr(struct msm_gpu *gpu, struct msm_ringbuffer *= ring) diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/= adreno/adreno_gpu.c index 2baf381ea401..ff25e3dada04 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c @@ -504,6 +504,21 @@ int adreno_set_param(struct msm_gpu *gpu, struct msm_c= ontext *ctx, if (!capable(CAP_SYS_ADMIN)) return UERR(EPERM, drm, "invalid permissions"); return msm_context_set_sysprof(ctx, gpu, value); + case MSM_PARAM_EN_VM_BIND: + /* We can only support VM_BIND with per-process pgtables: */ + if (ctx->vm =3D=3D gpu->vm) + return UERR(EINVAL, drm, "requires per-process pgtables"); + + /* + * We can only swtich to VM_BIND mode if the VM has not yet + * been created: + */ + if (ctx->vm) + return UERR(EBUSY, drm, "VM already created"); + + ctx->userspace_managed_vm =3D value; + + return 0; default: return UERR(EINVAL, drm, "%s: invalid param: %u", gpu->name, param); } diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c index 5cbc2c7b1204..c1627cae6ae6 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -232,9 +232,21 @@ static void load_gpu(struct drm_device *dev) */ struct drm_gpuvm *msm_context_vm(struct drm_device *dev, struct msm_contex= t *ctx) { + static DEFINE_MUTEX(init_lock); struct msm_drm_private *priv =3D dev->dev_private; - if (!ctx->vm) - ctx->vm =3D msm_gpu_create_private_vm(priv->gpu, current); + + /* Once ctx->vm is created it is valid for the lifetime of the context: */ + if (ctx->vm) + return ctx->vm; + + mutex_lock(&init_lock); + if (!ctx->vm) { + ctx->vm =3D msm_gpu_create_private_vm( + priv->gpu, current, !ctx->userspace_managed_vm); + + } + mutex_unlock(&init_lock); + return ctx->vm; } =20 @@ -424,6 +436,9 @@ static int msm_ioctl_gem_info_iova(struct drm_device *d= ev, if (!priv->gpu) return -EINVAL; =20 + if (msm_context_is_vmbind(ctx)) + return UERR(EINVAL, dev, "VM_BIND is enabled"); + if (should_fail(&fail_gem_iova, obj->size)) return -ENOMEM; =20 @@ -445,6 +460,9 @@ static int msm_ioctl_gem_info_set_iova(struct drm_devic= e *dev, if (!priv->gpu) return -EINVAL; =20 + if (msm_context_is_vmbind(ctx)) + return UERR(EINVAL, dev, "VM_BIND is enabled"); + /* Only supported if per-process address space is supported: */ if (priv->gpu->vm =3D=3D vm) return UERR(EOPNOTSUPP, dev, "requires per-process pgtables"); diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c index 186d160b74de..d16d3012434a 100644 --- a/drivers/gpu/drm/msm/msm_gem.c +++ b/drivers/gpu/drm/msm/msm_gem.c @@ -81,6 +81,14 @@ static void msm_gem_close(struct drm_gem_object *obj, st= ruct drm_file *file) if (!ctx->vm) return; =20 + /* + * VM_BIND does not depend on implicit teardown of VMAs on handle + * close, but instead on implicit teardown of the VM when the device + * is closed (see msm_gem_vm_close()) + */ + if (msm_context_is_vmbind(ctx)) + return; + /* * TODO we might need to kick this to a queue to avoid blocking * in CLOSE ioctl diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c index fc4d6c9049b0..c08c942d85a0 100644 --- a/drivers/gpu/drm/msm/msm_gpu.c +++ b/drivers/gpu/drm/msm/msm_gpu.c @@ -829,7 +829,8 @@ static int get_clocks(struct platform_device *pdev, str= uct msm_gpu *gpu) =20 /* Return a new address space for a msm_drm_private instance */ struct drm_gpuvm * -msm_gpu_create_private_vm(struct msm_gpu *gpu, struct task_struct *task) +msm_gpu_create_private_vm(struct msm_gpu *gpu, struct task_struct *task, + bool kernel_managed) { struct drm_gpuvm *vm =3D NULL; =20 @@ -841,7 +842,7 @@ msm_gpu_create_private_vm(struct msm_gpu *gpu, struct t= ask_struct *task) * the global one */ if (gpu->funcs->create_private_vm) { - vm =3D gpu->funcs->create_private_vm(gpu); + vm =3D gpu->funcs->create_private_vm(gpu, kernel_managed); if (!IS_ERR(vm)) to_msm_vm(vm)->pid =3D get_pid(task_pid(task)); } diff --git a/drivers/gpu/drm/msm/msm_gpu.h b/drivers/gpu/drm/msm/msm_gpu.h index 29662742a7e1..b38a33a67ee9 100644 --- a/drivers/gpu/drm/msm/msm_gpu.h +++ b/drivers/gpu/drm/msm/msm_gpu.h @@ -79,7 +79,7 @@ struct msm_gpu_funcs { void (*gpu_set_freq)(struct msm_gpu *gpu, struct dev_pm_opp *opp, bool suspended); struct drm_gpuvm *(*create_vm)(struct msm_gpu *gpu, struct platform_devic= e *pdev); - struct drm_gpuvm *(*create_private_vm)(struct msm_gpu *gpu); + struct drm_gpuvm *(*create_private_vm)(struct msm_gpu *gpu, bool kernel_m= anaged); uint32_t (*get_rptr)(struct msm_gpu *gpu, struct msm_ringbuffer *ring); =20 /** @@ -364,6 +364,14 @@ struct msm_context { */ bool closed; =20 + /** + * @userspace_managed_vm: + * + * Has userspace opted-in to userspace managed VM (ie. VM_BIND) via + * MSM_PARAM_EN_VM_BIND? + */ + bool userspace_managed_vm; + /** * @vm: * @@ -456,6 +464,22 @@ struct msm_context { =20 struct drm_gpuvm *msm_context_vm(struct drm_device *dev, struct msm_contex= t *ctx); =20 +/** + * msm_context_is_vm_bind() - has userspace opted in to VM_BIND? + * + * @ctx: the drm_file context + * + * See MSM_PARAM_EN_VM_BIND. If userspace is managing the VM, it can + * do sparse binding including having multiple, potentially partial, + * mappings in the VM. Therefore certain legacy uabi (ie. GET_IOVA, + * SET_IOVA) are rejected because they don't have a sensible meaning. + */ +static inline bool +msm_context_is_vmbind(struct msm_context *ctx) +{ + return ctx->userspace_managed_vm; +} + /** * msm_gpu_convert_priority - Map userspace priority to ring # and sched p= riority * @@ -683,7 +707,8 @@ int msm_gpu_init(struct drm_device *drm, struct platfor= m_device *pdev, const char *name, struct msm_gpu_config *config); =20 struct drm_gpuvm * -msm_gpu_create_private_vm(struct msm_gpu *gpu, struct task_struct *task); +msm_gpu_create_private_vm(struct msm_gpu *gpu, struct task_struct *task, + bool kernel_managed); =20 void msm_gpu_cleanup(struct msm_gpu *gpu); =20 diff --git a/include/uapi/drm/msm_drm.h b/include/uapi/drm/msm_drm.h index 5bc5e4526ccf..b974f5a24dbc 100644 --- a/include/uapi/drm/msm_drm.h +++ b/include/uapi/drm/msm_drm.h @@ -93,6 +93,30 @@ struct drm_msm_timespec { #define MSM_PARAM_UCHE_TRAP_BASE 0x14 /* RO */ /* PRR (Partially Resident Region) is required for sparse residency: */ #define MSM_PARAM_HAS_PRR 0x15 /* RO */ +/* MSM_PARAM_EN_VM_BIND is set to 1 to enable VM_BIND ops. + * + * With VM_BIND enabled, userspace is required to allocate iova and use the + * VM_BIND ops for map/unmap ioctls. MSM_INFO_SET_IOVA and MSM_INFO_GET_I= OVA + * will be rejected. (The latter does not have a sensible meaning when a = BO + * can have multiple and/or partial mappings.) + * + * With VM_BIND enabled, userspace does not include a submit_bo table in t= he + * SUBMIT ioctl (this will be rejected), the resident set is determined by + * the the VM_BIND ops. + * + * Enabling VM_BIND will fail on devices which do not have per-process pgt= ables. + * And it is not allowed to disable VM_BIND once it has been enabled. + * + * Enabling VM_BIND should be done (attempted) prior to allocating any BOs= or + * submitqueues of type MSM_SUBMITQUEUE_VM_BIND. + * + * Relatedly, when VM_BIND mode is enabled, the kernel will not try to rec= over + * from GPU faults or failed async VM_BIND ops, in particular because it is + * difficult to communicate to userspace which op failed so that userspace + * could rewind and try again. When the VM is marked unusable, the SUBMIT + * ioctl will throw -EPIPE. + */ +#define MSM_PARAM_EN_VM_BIND 0x16 /* WO, once */ =20 /* For backwards compat. The original support for preemption was based on * a single ring per priority level so # of priority levels equals the # --=20 2.50.0 From nobody Wed Oct 8 10:58:51 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 B926A23BD02 for ; Sun, 29 Jun 2025 14:07:57 +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=1751206079; cv=none; b=UBCifc89/QmwAgvoxAQO8poFro1VrgcJQY5qY54/jQ8X1hYzWhJifYkJCUShSzCXKsWGgqVVdEeZbHOPCA6shdSWVHXWVy7BthMuilqShowWJG5G2lnlQy/b/ZXF/9PXy4VoZj3XEYVHAT1HsVIo0duKUG6yEpuoPUWSvSStQT8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751206079; c=relaxed/simple; bh=Xrr+912y5vNYEYCSiqXQ5P/O+VoEFsvl61K5HGKqAeE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gbiy2m9w2FIqokF9IZjOJ08/u843xp4HiocTJXk+W3+/5M03uFNGlHGKgwRravrfHwGa9kP6ELiqf5zG3Bj4F6qAjM/Pc2raA7SkikMM2gaGvQsjHD04++vUyRG19EyPMl9kaI2Aur/8g3hnM8fzT5CuMVM3yv9HeXnyGkbXtFc= 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=PqH0dLnO; 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="PqH0dLnO" Received: from pps.filterd (m0279870.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 55TDf3sb031822 for ; Sun, 29 Jun 2025 14:07:56 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=/iFe2vNrJqp a0S0dcdbvotV9UbXoILAtHKmoL3TqRPw=; b=PqH0dLnObI0wyLWZYTsxKoc/+lU dhy15XQHsq1x6UU4b1RFHsjSdRAyJJBYd1jFQizvr/NjykuTPoSWZW7/5cRL6oxw tt3l70cJVV5bMH+C/9kWz0mNDequHZVq4xFdgZLdUuQd5mHGKouNhaHZJUfIA+6V bEn5xqC6LKqf9X0rWX4SrxOKPoIp2/TObItb49OB9yZyFQRxkjlDY0FOaYI8xWiw AYnBDqtmTTY5vpbPXi+VK+750vBJHU3EqMRj3Skw0i1Yi3EcyTIQaoB+CIPrnNcA K26RAd2HtcQqiEcfj6RwMAew8JGaMYGxaLBOsDuP9UTRpaKuKb2SFLXj7AA== Received: from mail-pj1-f70.google.com (mail-pj1-f70.google.com [209.85.216.70]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 47j8fxa8eq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Sun, 29 Jun 2025 14:07:56 +0000 (GMT) Received: by mail-pj1-f70.google.com with SMTP id 98e67ed59e1d1-3138c50d2a0so5692554a91.2 for ; Sun, 29 Jun 2025 07:07:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751206075; x=1751810875; 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=/iFe2vNrJqpa0S0dcdbvotV9UbXoILAtHKmoL3TqRPw=; b=KEYPRiZkTGO2gNAIV59fwsrXOrsKgPx2gKcTrJnfDyotdu3kdn7Q0SwZOnaHS9AYHd pbmkY3sUpjesNgqyhOjxDDV9cIpBFmd7FveGq5HG5r0//ae2XjME+D+ddWG/ITjVlGbp uXswn2MvU7AxdS8S5T+j0MhzhliHf2zDY8ydoDnDG29sAE5k+7zjXxjDh4D1ArKgNEwY Z7E+bG0208AshJob4vL8a/pJwOADyjongt7ViiQNQWrGyNCB3aM3u/TUqAfXOQdtyIZM PIHtOp8cytgTeHdBxU/nNpok0oLJmGu51Hq++yw+UCuez1qbvP7ylKZe8bulAYd42ZvB irrw== X-Forwarded-Encrypted: i=1; AJvYcCUKdHH6KWWiD896sn4+Z7TFr7FQCmLUWH/8iYb/DbpZXQhtwXtmCCoDa9ldUWr2+/rpy+LbaDcXUZx3+Mg=@vger.kernel.org X-Gm-Message-State: AOJu0Yw5iCwr5WxsW74umihElGljOQecpu34ad+OGfiZI+xSpzkAQFjm L31oi0LRbUhj0Zs3Kakjmf1GRi8tvGRDIU9aOdUZDcqYZZjsmYEmeUEk1+OOa84lXOzG5E6y6s3 FC+KO3VF16BYlO7gfBrLFMIMeMRuTG3mrfeC9x63oEef9Ogz0zD7R+JFF0Tq1Q+UI2Hc= X-Gm-Gg: ASbGncsTMdx2D7MdIuuiqQAhbLptBjtilNbKqgpyzPnTyCPNd+CAAK2EIMGojtefllh XkkwIc8pGYSiffkc9gmKEa00+rquaA3ICDWoO2EJo3r7zUSoeTeGgzQDtTewxTRzzqMTmU+Rt41 dQKWetlVanswHH2B3gZve2ZUYk3xkXKIN99vaaVmMNpaUO8hpJLRVF0Qze3/MfCYGDURtHEL4k+ CX6kDFwVqSP2z6J8VromS/yeDvLWaBgkRecbT5su8EpqnzFMLgdGuCEl2k7IGTlDeQCQU/jWClU XCWU2WLIcAnVx4kj1HK4DMU9WR4Vcc7c X-Received: by 2002:a17:90b:5347:b0:311:ba2e:bdc9 with SMTP id 98e67ed59e1d1-318c930f9c3mr14565157a91.27.1751206074981; Sun, 29 Jun 2025 07:07:54 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFPDMdsJ611F8y8JvrQrlcinGlj6zhivPonGdvEr/gwskrbg5lpJzq8J57v2DwyMT0wLTqjCw== X-Received: by 2002:a17:90b:5347:b0:311:ba2e:bdc9 with SMTP id 98e67ed59e1d1-318c930f9c3mr14565116a91.27.1751206074478; Sun, 29 Jun 2025 07:07:54 -0700 (PDT) Received: from localhost ([2601:1c0:5000:d5c:5b3e:de60:4fda:e7b1]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-318c14e224csm6959025a91.32.2025.06.29.07.07.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Jun 2025 07:07:54 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, Connor Abbott , Antonino Maniscalco , Danilo Krummrich , Rob Clark , Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Konrad Dybcio , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v8 23/42] drm/msm: Mark VM as unusable on GPU hangs Date: Sun, 29 Jun 2025 07:03:26 -0700 Message-ID: <20250629140537.30850-24-robin.clark@oss.qualcomm.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250629140537.30850-1-robin.clark@oss.qualcomm.com> References: <20250629140537.30850-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: AW1haW4tMjUwNjI5MDExOSBTYWx0ZWRfX/pkrJGIK6pmQ +InamZnWjC5/as7BLEAg9rKifra+OIFcy5zwM50hAb/UPzoi4v6KI0O/FE1f5Ub5XCUZNvrBIBf ef/Jvl61Hs8Qc5jkIqCr5E2iy3NTygv+bozwEztFeezHNYe5ZoYZEp9GdNryP3XOvBnPKNWd5kA UDN/3QIdpbpEYOMPP5ntlxX49YA8EJtZfFoJmwrkm7vNLY31RQxffIESp7BBZnJpxRXYRnznw7b yoNCB48Q5oeYIqTI4c6Qd5zuBa/pHWYhXWeqwovL4ytpmSdDcJxIjyRLEtCE/tLoaPstl2XuySF aMn+UNQjWSYoFCBy2V3fIwM95Eyjj31zxq2eZg/rDSy0G/8Gdu67IOf68Ly+zDqMhUlh5ZO4Emd XBfssn38ikn/D51Wyx6MdS6TpkegwxWA7B2dwelJIDX3uSeDjfkeWFHzlxfB1afJ5iLB5Gz7 X-Proofpoint-GUID: KwCUMce_6tP-XmFgj1gV7rTu4a27J-Tt X-Proofpoint-ORIG-GUID: KwCUMce_6tP-XmFgj1gV7rTu4a27J-Tt X-Authority-Analysis: v=2.4 cv=TqPmhCXh c=1 sm=1 tr=0 ts=686148bc cx=c_pps a=0uOsjrqzRL749jD1oC5vDA==:117 a=xqWC_Br6kY4A:10 a=6IFa9wvqVegA:10 a=cm27Pg_UAAAA:8 a=EUspDBNiAAAA:8 a=pGLkceISAAAA:8 a=DhdyfM8_h7Qj4WYt2N4A:9 a=mQ_c8vxmzFEMiUWkPHU9: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-27_05,2025-06-27_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 bulkscore=0 mlxlogscore=999 suspectscore=0 adultscore=0 phishscore=0 malwarescore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 spamscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2506290119 Content-Type: text/plain; charset="utf-8" From: Rob Clark If userspace has opted-in to VM_BIND, then GPU hangs and VM_BIND errors will mark the VM as unusable. Signed-off-by: Rob Clark Signed-off-by: Rob Clark Tested-by: Antonino Maniscalco Reviewed-by: Antonino Maniscalco --- drivers/gpu/drm/msm/msm_gem.h | 17 +++++++++++++++++ drivers/gpu/drm/msm/msm_gem_submit.c | 3 +++ drivers/gpu/drm/msm/msm_gpu.c | 16 ++++++++++++++-- 3 files changed, 34 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/msm/msm_gem.h b/drivers/gpu/drm/msm/msm_gem.h index b5bf21f62f9d..f2631a8c62b9 100644 --- a/drivers/gpu/drm/msm/msm_gem.h +++ b/drivers/gpu/drm/msm/msm_gem.h @@ -76,6 +76,23 @@ struct msm_gem_vm { =20 /** @managed: is this a kernel managed VM? */ bool managed; + + /** + * @unusable: True if the VM has turned unusable because something + * bad happened during an asynchronous request. + * + * We don't try to recover from such failures, because this implies + * informing userspace about the specific operation that failed, and + * hoping the userspace driver can replay things from there. This all + * sounds very complicated for little gain. + * + * Instead, we should just flag the VM as unusable, and fail any + * further request targeting this VM. + * + * As an analogy, this would be mapped to a VK_ERROR_DEVICE_LOST + * situation, where the logical device needs to be re-created. + */ + bool unusable; }; #define to_msm_vm(x) container_of(x, struct msm_gem_vm, base) =20 diff --git a/drivers/gpu/drm/msm/msm_gem_submit.c b/drivers/gpu/drm/msm/msm= _gem_submit.c index 068ca618376c..9562b6343e13 100644 --- a/drivers/gpu/drm/msm/msm_gem_submit.c +++ b/drivers/gpu/drm/msm/msm_gem_submit.c @@ -681,6 +681,9 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void *= data, if (args->pad) return -EINVAL; =20 + if (to_msm_vm(ctx->vm)->unusable) + return UERR(EPIPE, dev, "context is unusable"); + /* for now, we just have 3d pipe.. eventually this would need to * be more clever to dispatch to appropriate gpu module: */ diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c index c08c942d85a0..0846f6c5169f 100644 --- a/drivers/gpu/drm/msm/msm_gpu.c +++ b/drivers/gpu/drm/msm/msm_gpu.c @@ -389,8 +389,20 @@ static void recover_worker(struct kthread_work *work) =20 /* Increment the fault counts */ submit->queue->faults++; - if (submit->vm) - to_msm_vm(submit->vm)->faults++; + if (submit->vm) { + struct msm_gem_vm *vm =3D to_msm_vm(submit->vm); + + vm->faults++; + + /* + * If userspace has opted-in to VM_BIND (and therefore userspace + * management of the VM), faults mark the VM as unusuable. This + * matches vulkan expectations (vulkan is the main target for + * VM_BIND) + */ + if (!vm->managed) + vm->unusable =3D true; + } =20 get_comm_cmdline(submit, &comm, &cmd); =20 --=20 2.50.0 From nobody Wed Oct 8 10:58:51 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 B74EF23C4E7 for ; Sun, 29 Jun 2025 14:07:58 +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=1751206081; cv=none; b=E/gxXRuEP5qbKeU8N4yGFnJx5yZhBbr4rz9t1BTHv4xWHLzmUazLFhkPmaqrCTWB6H9gTomg9XjKfTSuGGd8wKJleOGfqCQn8BxXvmx6ncHJYxLNUCBdirtQXHtxnMTmCpFuUrpVxHFoaTnmN84yrHNGQgl0fF1dIxN74jwF9BM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751206081; c=relaxed/simple; bh=YuCHHK211nqpvFmOlpnR7LLsU5KAAseFcypOymve7lM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=EMxC2JE+Ldx8lLAO24PgggMEiwIZdhIpwgzUiOCDh9/OMZ865/pvV0eyqZRRJ3twVvmD1PVYne4QAJ0UdF6Fpy+YamJmw0jOizpI2IuK+7s6VyvScbETQHerrLOJIQ0scl9yspBtcKXwBBJz7DoQEx0fE4j6O/rB0ms0ZTNTfWw= 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=bp7Axe3Z; 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="bp7Axe3Z" Received: from pps.filterd (m0279870.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 55T4U2AP004168 for ; Sun, 29 Jun 2025 14:07:57 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=Dn2IbO0/ubD WRHxm3cfadMPbuPKYgkB0YKeKTE62Wnw=; b=bp7Axe3ZmrHKHzgVNwp+Bq+ZX00 asBodS0A5L3U1Lq7H4u4AoZq3IXvqdmFXWymOUD+oLWMV+6x4KbIJXzuQn7AT/zY dZv60Z3KBiAUZic1/bj9Kt9XMotRjY3ojrTbccgOrNgDFRsl1DumkVyMOtk0aBZg WCW1PetrErwCqd+uOnK0Ardmw7+QC4Kj7eFzLyKY9Odpm0BZosZbGtvOq0FVqPpR vXGlyUY1myNKgX/ZDIHo2nQov9FzLk3qlwVFn0SVGwZ3PTmWFOQiWCNPcgNYInNx DzBArd2riU/MDBYOuYHKl3/ZIGSHGlRknNVea5NTwpxh3PK86Fw2RXi+vYw== Received: from mail-pj1-f71.google.com (mail-pj1-f71.google.com [209.85.216.71]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 47j8fxa8ev-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Sun, 29 Jun 2025 14:07:57 +0000 (GMT) Received: by mail-pj1-f71.google.com with SMTP id 98e67ed59e1d1-3132c8437ffso1425011a91.1 for ; Sun, 29 Jun 2025 07:07:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751206076; x=1751810876; 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=Dn2IbO0/ubDWRHxm3cfadMPbuPKYgkB0YKeKTE62Wnw=; b=SR7Rx2pJb+W7todKGYPDGqzT5oMi7jvZMIbp1WNpUjEad6A+A76eHUeXkNG1lkICyv OWrsHvLSuLMTtQX+CUBvFakRKt1R6Jh7o5Sl0k6JTUETGItYscoOHwFANxM1WeDjsk0Q ZM4+GCYW2HUKcDBBaNYn+iXJSO16L/JXWean/X1NdjZw/hrosX5zj9Peb1Iu6KuCe1Zo N+/2YABnUPG2ZK+Q1q4/ZrlXPQ/53G5kLxsmDlVFixKj6nD0mLpvD1zou+I4G2MX1T3L ldttMc8s9JLcEbOMrcC5Ar2XcAB5PygKkCUyEDAq0DtQeNypZvm8QwwlRD9G2z8xPj0C AE7g== X-Forwarded-Encrypted: i=1; AJvYcCUkRDRr0Ow14MnyoYE1Qru8DspQMpC/igzLOKEFfPrN9yR2TSRpjummRgDVIunYmfvNS+vWDJxbHV2F+w4=@vger.kernel.org X-Gm-Message-State: AOJu0Yz1fvzAD7URh6JQdTsI8SljFqvPV+7Rj4Oo2MgXikc1RHh/06X2 gyZAyWNKp/9VxAAN25zceHImIK48nRFbSt8SEb9Rla8REhFZIqfA7S4uWvyMBu5AHqPjjhESvtB murQ8SJPGmgKL3uspoA2NhTv4Ji48MaOGNp29OHbY/QlE4m+Qf6Sy5htuKoPZtlXdo3I= X-Gm-Gg: ASbGncsGCiv7li3E61BM0WzOjf4ltlA2Usv1ePq9SzaSwiLVTDOav9cUDUVfR4xgDNi fsiB4Xdyp977TF0XEfpVUn5JVOg2PqCt1Ie32iiybYHTKyJzs03bKrE3pUY90nnAoKpzb0PL337 0mpwXclQmIJRGFjOxHbeuDKqEVoMXRQggp1VLyVdysefZjyMUtILIKjY+08wnln82wQOptJLa2d HmD3b5TbH2qZPpNCeIb2V3vVmUDLbwnd1xzoocj+68Ev6p/muwYzBVkM2psdWGekEPXHiy08h/B iWCtymSTWrmvgCLLfAWDPg9YteQLMgyW X-Received: by 2002:a17:90b:1d4d:b0:311:b0ec:135b with SMTP id 98e67ed59e1d1-318c9264acamr14997368a91.24.1751206076275; Sun, 29 Jun 2025 07:07:56 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE0YeMc3nI6ml5QBg86+QzQfLpwkSSpiUlWx9O/NZt33gUkqNoK+5koucvNw8/t+8WApQARww== X-Received: by 2002:a17:90b:1d4d:b0:311:b0ec:135b with SMTP id 98e67ed59e1d1-318c9264acamr14997321a91.24.1751206075813; Sun, 29 Jun 2025 07:07:55 -0700 (PDT) Received: from localhost ([2601:1c0:5000:d5c:5b3e:de60:4fda:e7b1]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-318c13a509asm6958046a91.20.2025.06.29.07.07.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Jun 2025 07:07:55 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, Connor Abbott , Antonino Maniscalco , Danilo Krummrich , Rob Clark , Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Konrad Dybcio , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Sumit Semwal , =?UTF-8?q?Christian=20K=C3=B6nig?= , linux-kernel@vger.kernel.org (open list), linux-media@vger.kernel.org (open list:DMA BUFFER SHARING FRAMEWORK:Keyword:\bdma_(?:buf|fence|resv)\b), linaro-mm-sig@lists.linaro.org (moderated list:DMA BUFFER SHARING FRAMEWORK:Keyword:\bdma_(?:buf|fence|resv)\b) Subject: [PATCH v8 24/42] drm/msm: Add _NO_SHARE flag Date: Sun, 29 Jun 2025 07:03:27 -0700 Message-ID: <20250629140537.30850-25-robin.clark@oss.qualcomm.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250629140537.30850-1-robin.clark@oss.qualcomm.com> References: <20250629140537.30850-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: AW1haW4tMjUwNjI5MDExOSBTYWx0ZWRfX5O4uvtBdAc/p JwPSkZU6i0XUOpPdBUwXlE26qeC69tB1w/o2i1Zyaso9KBcLYtgYbQE3xyST9F9GX4HWN0/Upxi oRKg5z5s5jjDPQ+ShTkCu9Vgb075rmOa1XMhCFDToJA2ve2zK99FRMwnHNvreyIc3s/+tMMErM+ tGdUZCtKgbGNSQ98wPCPMk7O9iaZr/TuDpSTM4lHbvDGa2yeIl1AKPYKD9Ui5kLmi+doYi3fQ83 Hf9JD8yfrvHA+j2b1lVO9KBJM57FOEcA6MkVf/JPifZp03MezQ7/kwJ/O4I7nCwZTKWZVBcNaB8 Gk+qb5RyVx4osbORpMnd8S1D/rXOgjVgLV+q208LawXplY8zPlhcAKbJXbT1zP90AL0mm9uUIli DRHiIduezYOeAl+wLkCPLBOlahkrCKHGVoqUScJC9tvwJjyDaFxEft6Lj734YUf9j0w8tAlx X-Proofpoint-GUID: GTYvOu17V60c3v0bPSwDdqfe8aJanjNw X-Proofpoint-ORIG-GUID: GTYvOu17V60c3v0bPSwDdqfe8aJanjNw X-Authority-Analysis: v=2.4 cv=TqPmhCXh c=1 sm=1 tr=0 ts=686148bd cx=c_pps a=UNFcQwm+pnOIJct1K4W+Mw==:117 a=xqWC_Br6kY4A:10 a=6IFa9wvqVegA:10 a=cm27Pg_UAAAA:8 a=EUspDBNiAAAA:8 a=pGLkceISAAAA:8 a=5GAAy6agFmV6x6zTEMEA:9 a=uKXjsCUrEbL0IQVhDsJ9: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-27_05,2025-06-27_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 bulkscore=0 mlxlogscore=999 suspectscore=0 adultscore=0 phishscore=0 malwarescore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 spamscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2506290119 Content-Type: text/plain; charset="utf-8" From: Rob Clark Buffers that are not shared between contexts can share a single resv object. This way drm_gpuvm will not track them as external objects, and submit-time validating overhead will be O(1) for all N non-shared BOs, instead of O(n). Signed-off-by: Rob Clark Signed-off-by: Rob Clark Tested-by: Antonino Maniscalco Reviewed-by: Antonino Maniscalco --- drivers/gpu/drm/msm/msm_drv.h | 1 + drivers/gpu/drm/msm/msm_gem.c | 21 +++++++++++++++++++++ drivers/gpu/drm/msm/msm_gem_prime.c | 15 +++++++++++++++ include/uapi/drm/msm_drm.h | 14 ++++++++++++++ 4 files changed, 51 insertions(+) diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h index 0fe3c9a24baa..9b1ccb2b18f6 100644 --- a/drivers/gpu/drm/msm/msm_drv.h +++ b/drivers/gpu/drm/msm/msm_drv.h @@ -269,6 +269,7 @@ int msm_gem_prime_vmap(struct drm_gem_object *obj, stru= ct iosys_map *map); void msm_gem_prime_vunmap(struct drm_gem_object *obj, struct iosys_map *ma= p); struct drm_gem_object *msm_gem_prime_import_sg_table(struct drm_device *de= v, struct dma_buf_attachment *attach, struct sg_table *sg); +struct dma_buf *msm_gem_prime_export(struct drm_gem_object *obj, int flags= ); int msm_gem_prime_pin(struct drm_gem_object *obj); void msm_gem_prime_unpin(struct drm_gem_object *obj); =20 diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c index d16d3012434a..100d159d52e2 100644 --- a/drivers/gpu/drm/msm/msm_gem.c +++ b/drivers/gpu/drm/msm/msm_gem.c @@ -546,6 +546,9 @@ static int get_and_pin_iova_range_locked(struct drm_gem= _object *obj, =20 msm_gem_assert_locked(obj); =20 + if (to_msm_bo(obj)->flags & MSM_BO_NO_SHARE) + return -EINVAL; + vma =3D get_vma_locked(obj, vm, range_start, range_end); if (IS_ERR(vma)) return PTR_ERR(vma); @@ -1076,6 +1079,14 @@ static void msm_gem_free_object(struct drm_gem_objec= t *obj) put_pages(obj); } =20 + if (msm_obj->flags & MSM_BO_NO_SHARE) { + struct drm_gem_object *r_obj =3D + container_of(obj->resv, struct drm_gem_object, _resv); + + /* Drop reference we hold to shared resv obj: */ + drm_gem_object_put(r_obj); + } + drm_gem_object_release(obj); =20 kfree(msm_obj->metadata); @@ -1108,6 +1119,15 @@ int msm_gem_new_handle(struct drm_device *dev, struc= t drm_file *file, if (name) msm_gem_object_set_name(obj, "%s", name); =20 + if (flags & MSM_BO_NO_SHARE) { + struct msm_context *ctx =3D file->driver_priv; + struct drm_gem_object *r_obj =3D drm_gpuvm_resv_obj(ctx->vm); + + drm_gem_object_get(r_obj); + + obj->resv =3D r_obj->resv; + } + ret =3D drm_gem_handle_create(file, obj, handle); =20 /* drop reference from allocate - handle holds it now */ @@ -1140,6 +1160,7 @@ static const struct drm_gem_object_funcs msm_gem_obje= ct_funcs =3D { .free =3D msm_gem_free_object, .open =3D msm_gem_open, .close =3D msm_gem_close, + .export =3D msm_gem_prime_export, .pin =3D msm_gem_prime_pin, .unpin =3D msm_gem_prime_unpin, .get_sg_table =3D msm_gem_prime_get_sg_table, diff --git a/drivers/gpu/drm/msm/msm_gem_prime.c b/drivers/gpu/drm/msm/msm_= gem_prime.c index 2e37913d5a6a..4d93f2daeeaa 100644 --- a/drivers/gpu/drm/msm/msm_gem_prime.c +++ b/drivers/gpu/drm/msm/msm_gem_prime.c @@ -16,6 +16,9 @@ struct sg_table *msm_gem_prime_get_sg_table(struct drm_ge= m_object *obj) struct msm_gem_object *msm_obj =3D to_msm_bo(obj); int npages =3D obj->size >> PAGE_SHIFT; =20 + if (msm_obj->flags & MSM_BO_NO_SHARE) + return ERR_PTR(-EINVAL); + if (WARN_ON(!msm_obj->pages)) /* should have already pinned! */ return ERR_PTR(-ENOMEM); =20 @@ -45,6 +48,15 @@ struct drm_gem_object *msm_gem_prime_import_sg_table(str= uct drm_device *dev, return msm_gem_import(dev, attach->dmabuf, sg); } =20 + +struct dma_buf *msm_gem_prime_export(struct drm_gem_object *obj, int flags) +{ + if (to_msm_bo(obj)->flags & MSM_BO_NO_SHARE) + return ERR_PTR(-EPERM); + + return drm_gem_prime_export(obj, flags); +} + int msm_gem_prime_pin(struct drm_gem_object *obj) { struct page **pages; @@ -53,6 +65,9 @@ int msm_gem_prime_pin(struct drm_gem_object *obj) if (drm_gem_is_imported(obj)) return 0; =20 + if (to_msm_bo(obj)->flags & MSM_BO_NO_SHARE) + return -EINVAL; + pages =3D msm_gem_pin_pages_locked(obj); if (IS_ERR(pages)) ret =3D PTR_ERR(pages); diff --git a/include/uapi/drm/msm_drm.h b/include/uapi/drm/msm_drm.h index b974f5a24dbc..1bccc347945c 100644 --- a/include/uapi/drm/msm_drm.h +++ b/include/uapi/drm/msm_drm.h @@ -140,6 +140,19 @@ struct drm_msm_param { =20 #define MSM_BO_SCANOUT 0x00000001 /* scanout capable */ #define MSM_BO_GPU_READONLY 0x00000002 +/* Private buffers do not need to be explicitly listed in the SUBMIT + * ioctl, unless referenced by a drm_msm_gem_submit_cmd. Private + * buffers may NOT be imported/exported or used for scanout (or any + * other situation where buffers can be indefinitely pinned, but + * cases other than scanout are all kernel owned BOs which are not + * visible to userspace). + * + * In exchange for those constraints, all private BOs associated with + * a single context (drm_file) share a single dma_resv, and if there + * has been no eviction since the last submit, there are no per-BO + * bookeeping to do, significantly cutting the SUBMIT overhead. + */ +#define MSM_BO_NO_SHARE 0x00000004 #define MSM_BO_CACHE_MASK 0x000f0000 /* cache modes */ #define MSM_BO_CACHED 0x00010000 @@ -149,6 +162,7 @@ struct drm_msm_param { =20 #define MSM_BO_FLAGS (MSM_BO_SCANOUT | \ MSM_BO_GPU_READONLY | \ + MSM_BO_NO_SHARE | \ MSM_BO_CACHE_MASK) =20 struct drm_msm_gem_new { --=20 2.50.0 From nobody Wed Oct 8 10:58:51 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 B97CC23AB87 for ; Sun, 29 Jun 2025 14:07:59 +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=1751206081; cv=none; b=lSuYLasxEC7M9b/HLLQgI4doA+5DHQctzSjPpNKEtRh5c6L+T9Pl1/v8mzpqzQTx0GkM3XKABfh4MQfOAPLv+RP/jOdJVUfeeY7qOixhiRz7R4I0rnGMHp43q+LVbWxRsYCVSBJGIlZFkGtyf++sPkb00oKduqshMjzRdWKiBI4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751206081; c=relaxed/simple; bh=e1ndf2hUIh/MotZmx2Og/v+YPEYB0tTP1wLOvcibMkU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WIPyMQxKXpK7qUwD+vWXQ9SaqO6LJY37dTbsVB1XLXsWi6vyDT8UHbp9jr1/i7z6Sm3wJ5+gDZq1J7L8bTNEnlWGxtAnC8hc3NxmAnmQBrU+nfDaVu9UAiFsSvwbG4DrK/AOaNGS/1wFW0oTvS0aOhmV2vjnMPKIwW9olZ1eUvY= 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=AvrQEOSb; 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="AvrQEOSb" Received: from pps.filterd (m0279873.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 55T5I8iu012920 for ; Sun, 29 Jun 2025 14:07:59 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=MXd06Saq6/9 4jOhWiMbD0wlZ29ngCx2vyB54A9DMyFk=; b=AvrQEOSbhfdN0xqwsF85EH/HC7k xLezfbooaKotPeSRtMFPQsn9IMe+mzcDe9yto3tMVk5+QHx7J7+w9ddq+n1JOege Rnzd5V+LUM2ZyzveJ6zDgWQKrwe01uTn7E/iN9zIVrRekDcOHMUR8MegjeBz7Eu8 XLUzfN3qehP6pAi952Ef5rSqmjpa6UnNPPHjmkzHAP1tGJUWiqDy7KP+LW8WpvGP 4abIDFyWCv8oUoCbE6Cj5ul+Af5BQ7yp1FFXljWtQ45H4yzYpZvMQHI92dpudn+D xPDQ/SMcPHweHw4+ocJTKdZdrYYKz69Ji6j9+eYtJOv0IQHPsE5JudZhYSg== Received: from mail-pf1-f199.google.com (mail-pf1-f199.google.com [209.85.210.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 47j5rq2exu-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Sun, 29 Jun 2025 14:07:58 +0000 (GMT) Received: by mail-pf1-f199.google.com with SMTP id d2e1a72fcca58-748b4d5c045so1106139b3a.1 for ; Sun, 29 Jun 2025 07:07:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751206077; x=1751810877; 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=MXd06Saq6/94jOhWiMbD0wlZ29ngCx2vyB54A9DMyFk=; b=mPbHcQLAlQn41HPFZHAV56SjkLSJUyKVMqGTv4ipDG03oVZZwhQx/mVwuvixmjXMCi rjG1scjruBdFIDjk1Tbp+fH8tUbfTfrbwK54jeXS5f02TZ1ikz10zXhtcliFxokq+SIL 1/aZtyR2UL0BaptEk+K2BC8qnlxMPWYFB0TJ5gX2rfiyf8jKEs5DMFvTV0uVZcK0fdgn pKvImFtehRCymbZR0QGByKu3ojy1Dnazj5NbOWloQT50eg72VXJw5DYUxooYvRAjJiM2 4+24OGoGIowoUkYw94NNz2fRe2L03LqiswAthEtGArPPi9eVfWHVee+G9iLoP63jDhqp KEuA== X-Forwarded-Encrypted: i=1; AJvYcCV3o5vEs+kZE09BB6/WY6UNqH++N24y8yKLRhQ4QWKXzlQkrnChxB/ir9HgL3s3Y1v3BjRLu6dNQtBaZAA=@vger.kernel.org X-Gm-Message-State: AOJu0Yxtt6h3PcifZTPirS2Ngxh58eL+Qx/IAbs76y6iW01aFzFpv/xI ldWoF990dYMO5efG7ap8g0+a/ARqBzGbJyIyAMrwqv7JAAd+UJCrj56hZmuzmmFCYmacIk0dd6V d8jaahGou7uZXR54BgJBF+xAueJ5xGClSkSGaXn3bN7sNUChZLUJz8huF6IAUMQKbzzk= X-Gm-Gg: ASbGnctqUgfrBjBgQjmmDPw7CS2J4YMLLsQwbnK8ZqbDjnwpSfgzm5Hf7XqOd3ecmb3 3aLHfH+j/pPIDNqR+U0Kio4yLPYAONZNeVFLu1gUhOv1RVcBdi04RbG2w+jzspI0QXSkYFlTtEA SeNCQu30q9z9Zu9Vp7eGhdaqPAxaGyhQYeJzvBLMQwGx73Fp4KFvUSlAz9JQoWU9YoZhGRyTpjU Z0lxVSEUI/Y7q77t8Ufl+OoPGmdI0hKzhc8sxlg69CJIdmFsQNE/whrOSEl7gKy9bWqXbUHGFwB 0l9HuU5Pi03CVb/dysKpd+4jxNngFN81 X-Received: by 2002:a05:6a21:6d87:b0:21d:fd1:9be with SMTP id adf61e73a8af0-220a12d79demr15914443637.12.1751206077504; Sun, 29 Jun 2025 07:07:57 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGtgMbaSrKXdEfb5QEosJVAua6RMUWIaHI/JgTIvRcRP5uUb9uPs6eSyW6TYvQFd3rcAy5Dqg== X-Received: by 2002:a05:6a21:6d87:b0:21d:fd1:9be with SMTP id adf61e73a8af0-220a12d79demr15914401637.12.1751206077089; Sun, 29 Jun 2025 07:07:57 -0700 (PDT) Received: from localhost ([2601:1c0:5000:d5c:5b3e:de60:4fda:e7b1]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-b34e31da944sm5864319a12.60.2025.06.29.07.07.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Jun 2025 07:07:56 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, Connor Abbott , Antonino Maniscalco , Danilo Krummrich , Rob Clark , Rob Clark , Sean Paul , Konrad Dybcio , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Marijn Suijten , David Airlie , Simona Vetter , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v8 25/42] drm/msm: Crashdump prep for sparse mappings Date: Sun, 29 Jun 2025 07:03:28 -0700 Message-ID: <20250629140537.30850-26-robin.clark@oss.qualcomm.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250629140537.30850-1-robin.clark@oss.qualcomm.com> References: <20250629140537.30850-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-ORIG-GUID: qrh0JS7lwF23aVoVTJ16cOpy4riS5YXt X-Authority-Analysis: v=2.4 cv=eIYTjGp1 c=1 sm=1 tr=0 ts=686148be cx=c_pps a=WW5sKcV1LcKqjgzy2JUPuA==:117 a=xqWC_Br6kY4A:10 a=6IFa9wvqVegA:10 a=cm27Pg_UAAAA:8 a=EUspDBNiAAAA:8 a=pGLkceISAAAA:8 a=bYXzjpskvHxJzFY9Y_MA:9 a=OpyuDcXvxspvyRM73sMx:22 X-Proofpoint-GUID: qrh0JS7lwF23aVoVTJ16cOpy4riS5YXt X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjI5MDExOSBTYWx0ZWRfX44WgiJoaQqDA VT98IJYg00k59kfUGOnYX0cD+/KkIJbjapvZlpozLVBCDIjG1mrvN2KOPFWxYYMymUuyW67tJLo 0Po1snksV4dZUS3mkSMc1pxgJDyQ9AVAhe4GVBD5G+fY/DNhCo2wd+yNyjgfkRG16wsI5wHtw2K scVOvwORK8Out6sOppivW52+Z7F7bRMJ8llDrCfS9dBdikbUcbl0vEL+/YAwQBxg5qeEA/tRfYd m3ZK9SzvRPbQdiJEWpH+zqw7RA/LGfeIoSYeTspjkMIERwa2wPIcwHiVQzAdl2V/Ctcp5N9VBDy gKUzCqVBBm1xGlz9ulSnxJHTGctlw+54P6faaZCvI8/3XnMnwoenWUOU97eiuUAO6iEOHy4an5q yIANZkfTkzTVkmNIonRY1FxwcX/syXDu90yk2xJkeQnXYHHlJNTliOaHWw8fjuwNFuqchF3g 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-27_05,2025-06-27_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 clxscore=1015 mlxlogscore=933 priorityscore=1501 adultscore=0 mlxscore=0 phishscore=0 bulkscore=0 spamscore=0 suspectscore=0 lowpriorityscore=0 malwarescore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2506290119 Content-Type: text/plain; charset="utf-8" From: Rob Clark In this case, userspace could request dumping partial GEM obj mappings. Also drop use of should_dump() helper, which really only makes sense in the old submit->bos[] table world. Signed-off-by: Rob Clark Signed-off-by: Rob Clark Tested-by: Antonino Maniscalco Reviewed-by: Antonino Maniscalco --- drivers/gpu/drm/msm/msm_gpu.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c index 0846f6c5169f..0a9d5ecbef7b 100644 --- a/drivers/gpu/drm/msm/msm_gpu.c +++ b/drivers/gpu/drm/msm/msm_gpu.c @@ -219,13 +219,14 @@ static void msm_gpu_devcoredump_free(void *data) } =20 static void msm_gpu_crashstate_get_bo(struct msm_gpu_state *state, - struct drm_gem_object *obj, u64 iova, bool full) + struct drm_gem_object *obj, u64 iova, + bool full, size_t offset, size_t size) { struct msm_gpu_state_bo *state_bo =3D &state->bos[state->nr_bos]; struct msm_gem_object *msm_obj =3D to_msm_bo(obj); =20 /* Don't record write only objects */ - state_bo->size =3D obj->size; + state_bo->size =3D size; state_bo->flags =3D msm_obj->flags; state_bo->iova =3D iova; =20 @@ -236,7 +237,7 @@ static void msm_gpu_crashstate_get_bo(struct msm_gpu_st= ate *state, if (full) { void *ptr; =20 - state_bo->data =3D kvmalloc(obj->size, GFP_KERNEL); + state_bo->data =3D kvmalloc(size, GFP_KERNEL); if (!state_bo->data) goto out; =20 @@ -249,7 +250,7 @@ static void msm_gpu_crashstate_get_bo(struct msm_gpu_st= ate *state, goto out; } =20 - memcpy(state_bo->data, ptr, obj->size); + memcpy(state_bo->data, ptr + offset, size); msm_gem_put_vaddr(obj); } out: @@ -281,6 +282,7 @@ static void msm_gpu_crashstate_capture(struct msm_gpu *= gpu, state->fault_info =3D *fault_info; =20 if (submit) { + extern bool rd_full; int i; =20 if (state->fault_info.ttbr0) { @@ -296,9 +298,10 @@ static void msm_gpu_crashstate_capture(struct msm_gpu = *gpu, sizeof(struct msm_gpu_state_bo), GFP_KERNEL); =20 for (i =3D 0; state->bos && i < submit->nr_bos; i++) { - msm_gpu_crashstate_get_bo(state, submit->bos[i].obj, - submit->bos[i].iova, - should_dump(submit, i)); + struct drm_gem_object *obj =3D submit->bos[i].obj; + bool dump =3D 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); } } =20 --=20 2.50.0 From nobody Wed Oct 8 10:58:51 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 1ED6F23D2AF for ; Sun, 29 Jun 2025 14:08:01 +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=1751206083; cv=none; b=EU5VJK2vG+SJIplz9elLLWgi/8kvsKUAFMw52NMOw40jJrPQhMZU6LPotvvdJfUOqwApqLx3pdyaOBSyn59N+PPJX2daxWaDLXbWPI1YHsZ+QIUULcTyc86sIwp25KXIpIDKJ4WzOuicGjpyGB0gedOC0COn3B6AA7+sybUe4AQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751206083; c=relaxed/simple; bh=r1zmu/qH1gARr8JF3JlMKkzrZ4FQv9/Rjdy5KUlvpfA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RbVjgn1HLvsQqnk3vX8ruTGPjlG+sjY2dnm/plbQpeJJSgOy5Yijj33lzFme4a7ys1qN4yhGRrHuA6Vlt0qg/rG2GdIt50tJguTfqoqzNl39TNbl+pKa0naMuHO9BfZQMXnLUDNWR15OPOV6K1zTqLDiEtOJyI+4WvR/YQl246M= 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=AlXxyggX; 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="AlXxyggX" Received: from pps.filterd (m0279872.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 55T80UdN018915 for ; Sun, 29 Jun 2025 14:08:00 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=POLN6v5Lpeq 4YKP9lCUNA2S7d/qpjdY9Nd2TrkcfwLQ=; b=AlXxyggXs76xsX25YWGkU6K2syu PdMb0WExu5Uw7MAZYV54/ahuEvU22JTOSuWDXJyLK9V0XlthXx8UnoSW8dmc29p5 G6tJItREbn523lPzu8Kf5HQgkxgWvPwtkutRm2gromlX0vXpj/9Q5yARTzqihu3A ZdGeqhkDfFndE0v+zavpU+VqZ1MQ3Z9/FqQHcdvrzKfhmYDhDXX8y6GG+1X5ffkl N4z3b6nbd/PHAx+U4UNAoGgw3qChs0f+AZypaSgI1d1V73DNKnyks2/sf3gMtx/u PKaFq4ppxXA09hGHoRLA+0gFGAA66ZQ1rO0a8e1ZKrLPC6Ny6WXVL96GvXw== Received: from mail-pl1-f200.google.com (mail-pl1-f200.google.com [209.85.214.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 47j8s9a5yv-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Sun, 29 Jun 2025 14:08:00 +0000 (GMT) Received: by mail-pl1-f200.google.com with SMTP id d9443c01a7336-235e1d66fa6so33004935ad.0 for ; Sun, 29 Jun 2025 07:07:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751206079; x=1751810879; 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=POLN6v5Lpeq4YKP9lCUNA2S7d/qpjdY9Nd2TrkcfwLQ=; b=G++kFkBDoMeqr07jzlps3bymR00enpKTquc+qdNOnlEtmhSJZafVWi/xfiyt5qZE0u Nb7be3+PYv6XahwNoSsE+o6GVmAe/fKdQ3TIRGnCxU090kqzUivLueukNh0qSLf7hpvD w0TaY0UeLcBTmZ4nvYiPtUeXwr4e6PnbnerDbyrsLAEdphQb6xelDvantiX+EEJpu2wC xlF/Ori5YN5ntXO8xsncNSEJwRlxzR57zjkEpDlo7s/jzwLgrz0dCol4L8O0CdK+aBLw nKETPvaWdz/0U62iiQ0q+/WkzlBbpdcxXFiYzOivOjFnPPtphXkq5xz2aJ3UTiww3k9k a8xA== X-Forwarded-Encrypted: i=1; AJvYcCVqli1nc0dHQyicGogUJoqZWEfHRYi3HyYEwFxEuf0wNKbGke9QcywltRsYuSkX2z2zi9cLgYDx9koF0tE=@vger.kernel.org X-Gm-Message-State: AOJu0YyArQStPqv7UFujwi9XlqZUg+PHEcg67F4xpfvsW6PdRdVYlRKv QOMvyQQKWWPIqw9PWY36j6eFSvHj79hPlaxAkA70AzJT3ay6XSLYRfrLHBb8zuFpIHoD+BKQhT+ Zww8T8dfeszZwqwrlLCBiW2Gau+GdAYFOoh1c+oAP2KeMtv29yk2dXQ5r+9+C03tL/ug= X-Gm-Gg: ASbGncvwP8FPd+ShIUt3P+sg/sP4mkjtWiUEyt75cXGffCWeEGxR7NK4f48T+IRVzVE RBjwyLmn8tttGhETodKZlFpYYn8IjMHpy1jgVGGdx3fTsNmAWr/MOkXHGTP1gT6BaqfrU8PS63t f7a8RWQyEbJfkJk2w0zWmNXD8JdehFGc6sOZEZbPZLIzbfNOPOydOi6FMm/ZxdJ0vM14fTa8/Y6 Qv0aL0vmB8nIV2nvCRZGsCn5EWxF/GjFW9JdOtes+k70jqJ9FkRtxXM5pnUr/LaUC7ZaY1LcKag DXzHnyXpKYaY/L6D0LfSsfQjERtvj63i X-Received: by 2002:a17:902:dacc:b0:236:15b7:62e4 with SMTP id d9443c01a7336-23ac4608402mr153208645ad.38.1751206078785; Sun, 29 Jun 2025 07:07:58 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGPNU82btQj8+J4hl9ShbsqcvJusHMltr9q+oeq9oKFgZGq/rOI6AAZr3mn9fhniRP+FGNn6A== X-Received: by 2002:a17:902:dacc:b0:236:15b7:62e4 with SMTP id d9443c01a7336-23ac4608402mr153208245ad.38.1751206078346; Sun, 29 Jun 2025 07:07:58 -0700 (PDT) Received: from localhost ([2601:1c0:5000:d5c:5b3e:de60:4fda:e7b1]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-23acb2e21c8sm62124325ad.36.2025.06.29.07.07.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Jun 2025 07:07:57 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, Connor Abbott , Antonino Maniscalco , Danilo Krummrich , Rob Clark , Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v8 26/42] drm/msm: rd dumping prep for sparse mappings Date: Sun, 29 Jun 2025 07:03:29 -0700 Message-ID: <20250629140537.30850-27-robin.clark@oss.qualcomm.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250629140537.30850-1-robin.clark@oss.qualcomm.com> References: <20250629140537.30850-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-Authority-Analysis: v=2.4 cv=H/Pbw/Yi c=1 sm=1 tr=0 ts=686148c0 cx=c_pps a=IZJwPbhc+fLeJZngyXXI0A==:117 a=xqWC_Br6kY4A:10 a=6IFa9wvqVegA:10 a=cm27Pg_UAAAA:8 a=EUspDBNiAAAA:8 a=pGLkceISAAAA:8 a=uvlqqL4q8Y98p8K7alsA:9 a=uG9DUKGECoFWVXl0Dc02:22 X-Proofpoint-ORIG-GUID: cXOO7DFxn2JHsfNhpcjIX76YWCoaL7Pk X-Proofpoint-GUID: cXOO7DFxn2JHsfNhpcjIX76YWCoaL7Pk X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjI5MDExOCBTYWx0ZWRfX4qkRcVd18Bc7 F911ZhPgJsxh9iG+igo7d7br/4ePGqGxCkUsnSTM99boxivG/Hl7C7V3dTW4xbwxpvNMPuyyRRS 8ZxTNO1OtTnwnwUlnMLWnrxxUDdmymRDMW0mo/SyilnxJLDif+1XCR8y27w5GwNitw2f/v3k5MZ Jd8lCRRLjRS61lBZwZ0Pq4/Z55YowY7EQwohrFavH2maOauBiYL55zDAz/yaqIYNaHOcXjiTxA7 oJJ9aQmZeT+oiRdTtFRsxIC4XvUv3htKjp1TO2Gp5TcPmkai5r/0An1ITXTTPTZ45+P9p+tARGT 5BDszC+TdOSfBZSpzVPdmGwG1seRhQcpC8pk6US574S6BxVQoSFBNTF+gcPZZN6M+E7kyPmL6tK LUobj8Hqv1naeJ0ajlO2qhadp16S0YvFVSXS/9VTx8rhLabhIenp6cg/sqs3qe5K3yuBtJCl 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-27_05,2025-06-27_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 malwarescore=0 suspectscore=0 mlxlogscore=999 priorityscore=1501 clxscore=1015 mlxscore=0 lowpriorityscore=0 spamscore=0 adultscore=0 bulkscore=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-2506290118 Content-Type: text/plain; charset="utf-8" From: Rob Clark Similar to the previous commit, add support for dumping partial mappings. Signed-off-by: Rob Clark Signed-off-by: Rob Clark Tested-by: Antonino Maniscalco Reviewed-by: Antonino Maniscalco --- drivers/gpu/drm/msm/msm_gem.h | 10 --------- drivers/gpu/drm/msm/msm_rd.c | 38 ++++++++++++++++------------------- 2 files changed, 17 insertions(+), 31 deletions(-) diff --git a/drivers/gpu/drm/msm/msm_gem.h b/drivers/gpu/drm/msm/msm_gem.h index f2631a8c62b9..3a5f81437b5d 100644 --- a/drivers/gpu/drm/msm/msm_gem.h +++ b/drivers/gpu/drm/msm/msm_gem.h @@ -403,14 +403,4 @@ static inline void msm_gem_submit_put(struct msm_gem_s= ubmit *submit) =20 void msm_submit_retire(struct msm_gem_submit *submit); =20 -/* helper to determine of a buffer in submit should be dumped, used for bo= th - * devcoredump and debugfs cmdstream dumping: - */ -static inline bool -should_dump(struct msm_gem_submit *submit, int idx) -{ - extern bool rd_full; - return rd_full || (submit->bos[idx].flags & MSM_SUBMIT_BO_DUMP); -} - #endif /* __MSM_GEM_H__ */ diff --git a/drivers/gpu/drm/msm/msm_rd.c b/drivers/gpu/drm/msm/msm_rd.c index 39138e190cb9..edbcb93410a9 100644 --- a/drivers/gpu/drm/msm/msm_rd.c +++ b/drivers/gpu/drm/msm/msm_rd.c @@ -308,21 +308,11 @@ void msm_rd_debugfs_cleanup(struct msm_drm_private *p= riv) priv->hangrd =3D NULL; } =20 -static void snapshot_buf(struct msm_rd_state *rd, - struct msm_gem_submit *submit, int idx, - uint64_t iova, uint32_t size, bool full) +static void snapshot_buf(struct msm_rd_state *rd, struct drm_gem_object *o= bj, + uint64_t iova, bool full, size_t offset, size_t size) { - struct drm_gem_object *obj =3D submit->bos[idx].obj; - unsigned offset =3D 0; const char *buf; =20 - if (iova) { - offset =3D iova - submit->bos[idx].iova; - } else { - iova =3D submit->bos[idx].iova; - size =3D obj->size; - } - /* * Always write the GPUADDR header so can get a complete list of all the * buffers in the cmd @@ -333,10 +323,6 @@ static void snapshot_buf(struct msm_rd_state *rd, if (!full) return; =20 - /* But only dump the contents of buffers marked READ */ - if (!(submit->bos[idx].flags & MSM_SUBMIT_BO_READ)) - return; - buf =3D msm_gem_get_vaddr_active(obj); if (IS_ERR(buf)) return; @@ -352,6 +338,7 @@ static void snapshot_buf(struct msm_rd_state *rd, void msm_rd_dump_submit(struct msm_rd_state *rd, struct msm_gem_submit *su= bmit, const char *fmt, ...) { + extern bool rd_full; struct task_struct *task; char msg[256]; int i, n; @@ -385,16 +372,25 @@ void msm_rd_dump_submit(struct msm_rd_state *rd, stru= ct msm_gem_submit *submit, =20 rd_write_section(rd, RD_CMD, msg, ALIGN(n, 4)); =20 - for (i =3D 0; i < submit->nr_bos; i++) - snapshot_buf(rd, submit, i, 0, 0, should_dump(submit, i)); + for (i =3D 0; i < submit->nr_bos; i++) { + struct drm_gem_object *obj =3D submit->bos[i].obj; + bool dump =3D rd_full || (submit->bos[i].flags & MSM_SUBMIT_BO_DUMP); + + snapshot_buf(rd, obj, submit->bos[i].iova, dump, 0, obj->size); + } =20 for (i =3D 0; i < submit->nr_cmds; i++) { uint32_t szd =3D submit->cmd[i].size; /* in dwords */ + int idx =3D submit->cmd[i].idx; + bool dump =3D rd_full || (submit->bos[idx].flags & MSM_SUBMIT_BO_DUMP); =20 /* snapshot cmdstream bo's (if we haven't already): */ - if (!should_dump(submit, i)) { - snapshot_buf(rd, submit, submit->cmd[i].idx, - submit->cmd[i].iova, szd * 4, true); + if (!dump) { + struct drm_gem_object *obj =3D submit->bos[idx].obj; + size_t offset =3D submit->cmd[i].iova - submit->bos[idx].iova; + + snapshot_buf(rd, obj, submit->cmd[i].iova, true, + offset, szd * 4); } } =20 --=20 2.50.0 From nobody Wed Oct 8 10:58:51 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 CD3EE23F419 for ; Sun, 29 Jun 2025 14:08:02 +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=1751206085; cv=none; b=cofLkpcSe3QzGeN0PuYqSOBd+P7kVs99o7usI/pndN6dkpYS1eD4wJ1zAvGccQYHHMe1ulKIHfnop4rV0xyiNi+AFnTyoOzpJup90Lu9HR576KiEq1DKxpm+T+NxeDhvW+FUJisocplj0k+G9Byhp4z6qMQLRajEWwBark+zuNk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751206085; c=relaxed/simple; bh=B/MJJNslJOsQHJswCv8VSXBdVcsWoC/DDELjr3YL7Bg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=EESlPkAU43aL9fQhdrAQ5Ivn8D6Gt9lvp24mRBfpOJyBWBNzMrO/E+RJGtjFlLIh+pa14LrEFoCNzAg8AeH1KxmuqzgG08zghFf4bCMYrW2GrBGhTgt8irBfKES9kc80S073R6qnenXdTmf0syrCsNsR5+WFb1QvLnAddK24vGc= 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=e3WXG8rQ; 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="e3WXG8rQ" 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 55TDrCgZ004924 for ; Sun, 29 Jun 2025 14:08:01 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=wKngwCavAFH eJEVVeeWKWIsmvkttEuyPvRiuEbDcy3U=; b=e3WXG8rQ6vHuJOqD6VGdpzNnBbX PUBJy/yVEcAa5UG18CIGIWSs1yGDkldBONwQjE1deVxapBFN1T6q/SlheZqziWPs 5Tx32azGmi13Qd8CtDjfEujKkelZvouXKJSj7YIDhgohch0uX2KjOWbhD9h6CEX1 lZB2IwbgkoJ65QtLXd4FwYjt/evKDDpikKmJRxEEq7VGRNJFc+ZJe0oJX0UYaMT+ 76rZiPYJ4dfAwmD9b4yAqyAPMmRVrsRej2AeD28ApyXSedTG2L6CoRmlajDSDeTU J+xhkFB1+6JwZe2pSJ8C/a2PniwfETZWjYvM7iivaZevT2AKzs9SdaDOJuw== Received: from mail-pj1-f71.google.com (mail-pj1-f71.google.com [209.85.216.71]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 47j7qm284d-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Sun, 29 Jun 2025 14:08:01 +0000 (GMT) Received: by mail-pj1-f71.google.com with SMTP id 98e67ed59e1d1-313d6d671ffso3061069a91.2 for ; Sun, 29 Jun 2025 07:08:01 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751206080; x=1751810880; 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=wKngwCavAFHeJEVVeeWKWIsmvkttEuyPvRiuEbDcy3U=; b=q/AoQQUFJrP+uxKAUlfE9JPLWR4r2OhRJez6iQSfXB+l9TKdXkSX775py+BJLcpr/U j1Lho1qqTyIpM4K3O4sXmBPs0Wmk5Lvh+EE/kYZYD5urCOPnPTQ/cFXh3x2N+WyNEYlh jMEwcIu7BaMeSRTepIHsViVsdt/fcIDNPHtSLxuLChloexO9TBH8+7uqNoFByQ+odWDf uYXRtyvNFgrn5r7VuoRKVHidtBwpsNWxnpk3tdV2CZ+rVwLxptFWQVrxkEyfVjxlXoz2 s3H94sNqwXY8a24TOpk3HaHaFs0rPs63079ILpcsOo37+aYoOolV7WGTawBxP64g58QJ Ij5A== X-Forwarded-Encrypted: i=1; AJvYcCUkV1Wf3DNk8oy9pdRK7xa7arGwW97/gchYRVUsUot0edsUhVruYMiffsJEUMArZE7qFDjkWrIprAP8vis=@vger.kernel.org X-Gm-Message-State: AOJu0YymwCUr0mng12bYC42A9n2oELAhEcQTz2K+38CFBysILuG+YqU5 ViiizPSbkiRpQk2/xWKT/Zv60KJVknFg4+q72xgzY+v47M/lrw8jF4q42o/j2nM3W0kl+JQbcT/ 99+FV3a+NrnaJOyoe4hfsiGsBr6Lb5r4MDsXszetEmRCWdL4i6uBhiHA5qW0cXBw4ntc= X-Gm-Gg: ASbGncvrwOCRPHJY1KeQcAlIlkI+POOb57WDVtGkzkM8JDYX87zIK0ia8/XHCKQuhlM H4dKEg1qnkCnma5R9IEjN4pTdtgsBFfP+srcz0H086WBW3FA5LAY8t8j9NGcR+aQH5xpmF+WRDj hE3p+6KIFJmqssM1nN7TlAkOsAP76JcnjZM4T5UpEZCXuo0wDtvevkkQbfIKtC2G5H9sTB6H9y0 XFbFj1Y/g7iYb0ruTWN5Z9eayj3ta3wUnYjSQZE1FY3bBnxyJVOj7zXLncr6zEUsLY+i1e14/c8 Pc3myt/1wOO6VqbnCjkMN5wda3GK/Su6 X-Received: by 2002:a17:90b:1844:b0:311:d258:3473 with SMTP id 98e67ed59e1d1-318c8ed854fmr13825615a91.13.1751206080065; Sun, 29 Jun 2025 07:08:00 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF2yCfAWZdhnM43W+FQAK7Ei13wp2HdXGViln7XgoM6zEbL0poVm6fbDuQVtD+plTe3hIuSDw== X-Received: by 2002:a17:90b:1844:b0:311:d258:3473 with SMTP id 98e67ed59e1d1-318c8ed854fmr13825561a91.13.1751206079616; Sun, 29 Jun 2025 07:07:59 -0700 (PDT) Received: from localhost ([2601:1c0:5000:d5c:5b3e:de60:4fda:e7b1]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-315f5382f02sm11175097a91.1.2025.06.29.07.07.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Jun 2025 07:07:59 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, Connor Abbott , Antonino Maniscalco , Danilo Krummrich , Rob Clark , Rob Clark , Sean Paul , Konrad Dybcio , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Marijn Suijten , David Airlie , Simona Vetter , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v8 27/42] drm/msm: Crashdump support for sparse Date: Sun, 29 Jun 2025 07:03:30 -0700 Message-ID: <20250629140537.30850-28-robin.clark@oss.qualcomm.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250629140537.30850-1-robin.clark@oss.qualcomm.com> References: <20250629140537.30850-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-Authority-Analysis: v=2.4 cv=C4TpyRP+ c=1 sm=1 tr=0 ts=686148c1 cx=c_pps a=UNFcQwm+pnOIJct1K4W+Mw==:117 a=xqWC_Br6kY4A:10 a=6IFa9wvqVegA:10 a=cm27Pg_UAAAA:8 a=EUspDBNiAAAA:8 a=pGLkceISAAAA:8 a=MUnOxqT-vkRKCsmERf0A:9 a=uKXjsCUrEbL0IQVhDsJ9:22 X-Proofpoint-ORIG-GUID: 9-M9sE7UDEVViJ4B5JnQO7MHCVtAz_Nx X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjI5MDExOSBTYWx0ZWRfX0PjbWkYznPsm Zs072CuZGIK6RUvxfYirf5RYJAVSozdPqhLAvkoNT0sffdinVGc1Fk+r5cfe6vU2rN4Hlta+xxa tVDEtrLEXkMkk3iTXk8jwOxpDpYLLYMlzXA0NwyXAi9KLPaxSHHL3k9Yks1csAS+9QwDW9S4Awt GuXe1hmHxXl0tRZgLJGYYtFgLZ0h/0ozvMwxGfU+Uak4iTMfE5qxQvTAIWwqT2Vr8Bq/SLMDdRy IkU272/N8THfKIAMqyAuieCQYkGFwXMvt+IOf4YmSUeWduvMuXIXo7DMnpQ6IIqASFslIev1AQ4 Kl7Qs43zIHEzW0QURUjPq6M6XkwutPVKnJq0d0gd3L7hQ/4tfnUUvQQr9mlBtGx54Q/OcB3gSZ2 uF4xrlusRueV70TAZaUtQQ2BU6Tp8hQ70OJi0r0PAv+yJW0qPsoH37BwIFlmdRrgHJV1Nh3D X-Proofpoint-GUID: 9-M9sE7UDEVViJ4B5JnQO7MHCVtAz_Nx 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-27_05,2025-06-27_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 phishscore=0 suspectscore=0 bulkscore=0 lowpriorityscore=0 clxscore=1015 priorityscore=1501 spamscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 malwarescore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2506290119 Content-Type: text/plain; charset="utf-8" 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 Signed-off-by: Rob Clark Tested-by: Antonino Maniscalco Reviewed-by: Antonino Maniscalco --- 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 0a9d5ecbef7b..ccd9ebfc5c7c 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_st= ate *state, if (!state_bo->data) goto out; =20 - msm_gem_lock(obj); ptr =3D msm_gem_get_vaddr_active(obj); - msm_gem_unlock(obj); if (IS_ERR(ptr)) { kvfree(state_bo->data); state_bo->data =3D NULL; @@ -251,12 +249,75 @@ static void msm_gpu_crashstate_get_bo(struct msm_gpu_= state *state, } =20 memcpy(state_bo->data, ptr + offset, size); - msm_gem_put_vaddr(obj); + msm_gem_put_vaddr_locked(obj); } out: state->nr_bos++; } =20 +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 =3D 0; + + drm_exec_init(&exec, DRM_EXEC_IGNORE_DUPLICATES, 0); + drm_exec_until_all_locked(&exec) { + cnt =3D 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 =3D kcalloc(cnt, sizeof(struct msm_gpu_state_bo), GFP_KERNEL); + + drm_gpuvm_for_each_va (vma, submit->vm) { + bool dump =3D 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 =3D kcalloc(submit->nr_bos, + sizeof(struct msm_gpu_state_bo), GFP_KERNEL); + + for (int i =3D 0; state->bos && i < submit->nr_bos; i++) { + struct drm_gem_object *obj =3D submit->bos[i].obj;; + bool dump =3D 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, struct msm_gpu_fault_info *fault_info, char *comm, char *cmd) @@ -281,30 +342,17 @@ static void msm_gpu_crashstate_capture(struct msm_gpu= *gpu, if (fault_info) state->fault_info =3D *fault_info; =20 - if (submit) { - extern bool rd_full; - int i; - - if (state->fault_info.ttbr0) { - struct msm_gpu_fault_info *info =3D &state->fault_info; - struct msm_mmu *mmu =3D to_msm_vm(submit->vm)->mmu; + if (submit && state->fault_info.ttbr0) { + struct msm_gpu_fault_info *info =3D &state->fault_info; + struct msm_mmu *mmu =3D to_msm_vm(submit->vm)->mmu; =20 - msm_iommu_pagetable_params(mmu, &info->pgtbl_ttbr0, - &info->asid); - msm_iommu_pagetable_walk(mmu, info->iova, info->ptes); - } - - state->bos =3D kcalloc(submit->nr_bos, - sizeof(struct msm_gpu_state_bo), GFP_KERNEL); - - for (i =3D 0; state->bos && i < submit->nr_bos; i++) { - struct drm_gem_object *obj =3D submit->bos[i].obj; - bool dump =3D 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); } =20 + crashstate_get_bos(state, submit); + /* Set the active crash state to be dumped on failure */ gpu->crashstate =3D state; =20 --=20 2.50.0 From nobody Wed Oct 8 10:58:51 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 D63822405E1 for ; Sun, 29 Jun 2025 14:08:03 +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=1751206085; cv=none; b=RRCDH8biNbGeG6Iu//sapjqjxVtI2V16qsDhocHa3C2ts9f/XR6hNMbUIaJblzvllxMMNlWEjTpr0Slbcx5BMyXVw966ukhDxKAPYD1Sjt83HJ6Jyjevu4XY+TKn8NKX3J57Bx/lmVwpZFeOQSIz10Dc5A7NLVTPWqJh+pNzVjQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751206085; c=relaxed/simple; bh=oSLD17tD3i/SIJGyBuomwvpM409qt9O5IQtczoH19mw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Dzb1AJGAxt3gHHfcXSwgENbBTA5DRrkoCDdFObSPY98oko+9uADDhG8Hqy8eWrE8Eigo/Gqzhzkyuyr0QQnZXCDj6fPyqDmg2Nx9npxUQcVT2hXEGEcTdZgN6S+EBLcfvpeqMSGYtOVuTMbWaWSGbpob5ROPhhCkWHU99jDsMYg= 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=Z+ygvKBn; 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="Z+ygvKBn" 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 55TAEgiD011214 for ; Sun, 29 Jun 2025 14:08:02 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=GiAM1wF2+vU wkpCq/AxW+9TLh9YmmG5Rgyh/h2VPEqQ=; b=Z+ygvKBni9pEGYCiM9rf0Iu/F7C zRLq730rCjKrBWdpuwX27f6nyqZdi3lT7Jq7LK1I2pia9HYJqFYwB/hm9SKdKo0S AwC2wEiIUrnaWEqw22IAIJZY5I4eoLHWhkhN7fof12jicGGKcLNBzr7h4T3+ym72 1RVxlpE+Ozyn/4sOU6J45MGsUtockHqzazJMEPTC6vqyEtYIwZqJCiFg+I8QGbb0 KSap0cruUndl6TnXrRX38wibe/qP3r9aWoObkNVYxHdq6QQSiKiOzFOFowGQcIK0 c4dzxkmRrZp5t0FK47c9K9rxoExEkggy84pXyNf+ZpOevRson4X6hxweAWg== Received: from mail-pf1-f200.google.com (mail-pf1-f200.google.com [209.85.210.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 47j7qm284h-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Sun, 29 Jun 2025 14:08:02 +0000 (GMT) Received: by mail-pf1-f200.google.com with SMTP id d2e1a72fcca58-74ad608d60aso1108082b3a.1 for ; Sun, 29 Jun 2025 07:08:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751206081; x=1751810881; 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=GiAM1wF2+vUwkpCq/AxW+9TLh9YmmG5Rgyh/h2VPEqQ=; b=V1vKM0qstICmFw4CvJEPTvntwIZ9iYZ5X+D79IiI85juXZZWnB81QM0ZQKYhUOsmQr zu8+7eLPfdtenGb5LMUnGYY/Riktu18Qxux8gAKH6xsH2yeq8QsfQnoEoNHgpYaYMnAT uTpTKuluvUbwMs0UVCSytp5WV5bzUNY+iO1GYeCgZWCpa+kz+65jNjzRMgWi71KB791g t4tw6iMa4TzFeNzWjji1wzjccknJ2b+C2GqcVlnAi+Rqzc9wfIjNNrDi1BhCcA1J/h3j 4WS4IjB3D9ZxNZ5/fIato4TNHxFwnS0792OEsJGdC3eBQed+z3OPNcEGV8nToZjFGT9D F20Q== X-Forwarded-Encrypted: i=1; AJvYcCXL7TKZ9uTv5xPv6q9k7JR499thDYXH7K4K05kz++oCUXVztW0UqQWkNXooLBhXO/zN0odgaMxTB6vYckk=@vger.kernel.org X-Gm-Message-State: AOJu0YwWB3TubRqQR02pEljkCZxMyoHxjhVPUW6fk6mz8K/37Kzmt/Lo Pp8T/5L2F1ld4H6tIn8qbdp/UhxQn1YswRBwsy6e7RTsQjTR6ao4d0B3rdJ6RQ+IPt1JENxdl9j /OedZPE5zziaXG8/ejXtOn3PhQKGWlcMyUnFSbv48Z+Y0MpCRdDC+clv5F3Q0565CNXM= X-Gm-Gg: ASbGncu54pEHIt5qKm4NB/BvDO+AjwHm87hPrgYAcdiKu/vLLp1j2jSKacDRr+6BoAE JXDjnjF4F9c0kXg2+fFIYI/MplN1MXruei5wpq0kayFOQm65VJ7YxHmrSd3mganx/F2RMZg03Ba 3j5A0JZLzpECzYpPIMWzbI/pD9qfh5IR4bnpsbK+75h3l9+koePAUG2jpW41YCxTS+q4Cbcp89e +mIo2261yNIBKefDykwUQPXWTgkE//BktrFAWK3f95hKsBATOIZ8G7a2N1r7S31QT/OC/D7ZNi0 MSKQKRfK/VNacnngCxnbFKZ/LQ0GcP2R X-Received: by 2002:a05:6a00:4b0c:b0:742:8d52:62f1 with SMTP id d2e1a72fcca58-74af6e61b06mr15386839b3a.8.1751206081305; Sun, 29 Jun 2025 07:08:01 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGmEjFT9YhO9qCARxAsGvGVKPjEex9KKnkOxbT8IIcaWHUwA/BA945pWU2NB5DkhvJU1gw/lA== X-Received: by 2002:a05:6a00:4b0c:b0:742:8d52:62f1 with SMTP id d2e1a72fcca58-74af6e61b06mr15386802b3a.8.1751206080907; Sun, 29 Jun 2025 07:08:00 -0700 (PDT) Received: from localhost ([2601:1c0:5000:d5c:5b3e:de60:4fda:e7b1]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-74af557591asm6977022b3a.99.2025.06.29.07.08.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Jun 2025 07:08:00 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, Connor Abbott , Antonino Maniscalco , Danilo Krummrich , Rob Clark , Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v8 28/42] drm/msm: rd dumping support for sparse Date: Sun, 29 Jun 2025 07:03:31 -0700 Message-ID: <20250629140537.30850-29-robin.clark@oss.qualcomm.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250629140537.30850-1-robin.clark@oss.qualcomm.com> References: <20250629140537.30850-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-Authority-Analysis: v=2.4 cv=C4TpyRP+ c=1 sm=1 tr=0 ts=686148c2 cx=c_pps a=mDZGXZTwRPZaeRUbqKGCBw==:117 a=xqWC_Br6kY4A:10 a=6IFa9wvqVegA:10 a=cm27Pg_UAAAA:8 a=EUspDBNiAAAA:8 a=pGLkceISAAAA:8 a=Oi01P0gpvwaEutKy2E0A:9 a=zc0IvFSfCIW2DFIPzwfm:22 X-Proofpoint-ORIG-GUID: GbnziACWV3xfqVhRkgSVtRUmZLY2_HQX X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjI5MDExOSBTYWx0ZWRfX+Uya0fEM9xLK eAHyF7dQcoV9QFK/pQhwXwSiAdd4udSDq9Xk777z7IW3MkdOR8py5yDm+kL1e42Tqa5xfsNexun qZq3rMI1E2Idwn0B+B9HJLCoB7v/blhC9FTJCyLLpM1M+Ki07+EgC4pdYMW7uKgoPCNlP/L/UTU lKBfXYjyPXE+E5sBM/OKhrFepfZJUf835hYUmxdW4IBB8Z1QdVTl6VqWLLd4WxSrrvNYGLtR6cB +UPZABzuj/3grHY0MDy+8wOtROl7u02aGVSDtMDNGNwMvKk3Cvl07ttyDp3rNuCOhG+xdYC5aFm 54vB51EgMBvteLKNRvnbFdsA3ADaNac+gjNIKhXxH01RXnS75ES7ylLVsfuieGpfjDbENueO8aQ Ui8Z2wKGkESdiF0D1AkmRQc9Mh8SyQLrQKHZIwCBya3zZMiN83oTJtrcABxmqBYUISDG4t9W X-Proofpoint-GUID: GbnziACWV3xfqVhRkgSVtRUmZLY2_HQX 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-27_05,2025-06-27_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 phishscore=0 suspectscore=0 bulkscore=0 lowpriorityscore=0 clxscore=1015 priorityscore=1501 spamscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 malwarescore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2506290119 Content-Type: text/plain; charset="utf-8" From: Rob Clark As with devcoredump, we need to iterate the VMAs to figure out what to dump. Signed-off-by: Rob Clark Signed-off-by: Rob Clark Tested-by: Antonino Maniscalco Reviewed-by: Antonino Maniscalco --- drivers/gpu/drm/msm/msm_rd.c | 48 +++++++++++++++++++++++++----------- 1 file changed, 33 insertions(+), 15 deletions(-) diff --git a/drivers/gpu/drm/msm/msm_rd.c b/drivers/gpu/drm/msm/msm_rd.c index edbcb93410a9..54493a94dcb7 100644 --- a/drivers/gpu/drm/msm/msm_rd.c +++ b/drivers/gpu/drm/msm/msm_rd.c @@ -372,25 +372,43 @@ void msm_rd_dump_submit(struct msm_rd_state *rd, stru= ct msm_gem_submit *submit, =20 rd_write_section(rd, RD_CMD, msg, ALIGN(n, 4)); =20 - for (i =3D 0; i < submit->nr_bos; i++) { - struct drm_gem_object *obj =3D submit->bos[i].obj; - bool dump =3D rd_full || (submit->bos[i].flags & MSM_SUBMIT_BO_DUMP); + if (msm_context_is_vmbind(submit->queue->ctx)) { + struct drm_gpuva *vma; =20 - snapshot_buf(rd, obj, submit->bos[i].iova, dump, 0, obj->size); - } + drm_gpuvm_resv_assert_held(submit->vm); =20 - for (i =3D 0; i < submit->nr_cmds; i++) { - uint32_t szd =3D submit->cmd[i].size; /* in dwords */ - int idx =3D submit->cmd[i].idx; - bool dump =3D rd_full || (submit->bos[idx].flags & MSM_SUBMIT_BO_DUMP); + drm_gpuvm_for_each_va (vma, submit->vm) { + bool dump =3D rd_full || (vma->flags & MSM_VMA_DUMP); + + /* Skip MAP_NULL/PRR VMAs: */ + if (!vma->gem.obj) + continue; + + snapshot_buf(rd, vma->gem.obj, vma->va.addr, dump, + vma->gem.offset, vma->va.range); + } + + } else { + for (i =3D 0; i < submit->nr_bos; i++) { + struct drm_gem_object *obj =3D submit->bos[i].obj; + bool dump =3D rd_full || (submit->bos[i].flags & MSM_SUBMIT_BO_DUMP); + + snapshot_buf(rd, obj, submit->bos[i].iova, dump, 0, obj->size); + } + + for (i =3D 0; i < submit->nr_cmds; i++) { + uint32_t szd =3D submit->cmd[i].size; /* in dwords */ + int idx =3D submit->cmd[i].idx; + bool dump =3D rd_full || (submit->bos[idx].flags & MSM_SUBMIT_BO_DUMP); =20 - /* snapshot cmdstream bo's (if we haven't already): */ - if (!dump) { - struct drm_gem_object *obj =3D submit->bos[idx].obj; - size_t offset =3D submit->cmd[i].iova - submit->bos[idx].iova; + /* snapshot cmdstream bo's (if we haven't already): */ + if (!dump) { + struct drm_gem_object *obj =3D submit->bos[idx].obj; + size_t offset =3D submit->cmd[i].iova - submit->bos[idx].iova; =20 - snapshot_buf(rd, obj, submit->cmd[i].iova, true, - offset, szd * 4); + snapshot_buf(rd, obj, submit->cmd[i].iova, true, + offset, szd * 4); + } } } =20 --=20 2.50.0 From nobody Wed Oct 8 10:58:51 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 31D8C242907 for ; Sun, 29 Jun 2025 14:08:06 +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=1751206088; cv=none; b=jlpIuR8yF1t9AZj/gR6URoBcEjf6eNaGULNv3O9NZPxJxhll9uScIr4xwcDu+213/o33rxLtkyHb5XOUVmksvJdT30omKZH/WAorulMlUm7W/qKCm0ss6bZKuKk3zbIwoDTOx6Leq7xz+eYSEzclOb1h+FWCMboONNImHY0qXWg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751206088; c=relaxed/simple; bh=r5Rh34eJlYEsfjB6VBgkUDpQ07rxKaam9Y+K93lKsy8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=llLYYmRqnY0cQzwe/gHwu+UfpqU9Jg1nnAAqtv96XP3VqO3y3GlEVQ+w1gNQvqS77P/B5lthKVyArfNSgJ99H54VnyW+Z+ZwbxCV9DsRxPlmjGbazDEwptDQLBEJezRGpzyOnvOfi+MFALGRfXQOULPgcFDUtUU7w1gqXesG3e4= 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=KCsBOF3t; 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="KCsBOF3t" 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 55TAqiR2011971 for ; Sun, 29 Jun 2025 14:08:05 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=pcVDmJx0Nao yKUEjzh14AEiEkv5Hih5RipJEl19C9hM=; b=KCsBOF3tAKYk3JndtILg6NhO6ej xTnWHTrHTldUvRVV+ztheVTuEMNKcv+SGwXmZDd79c8ekKdtu2lYi0k8f0ihe0MW aOCLhOS2GS6cMAnnT0DF9IVctktABzkVVbqLobtlI6Glq+ircp/xlEfb1d8+hy5G via69eHR/nX7d0+6xzqHBMoCwexXVOXUEPoYIRnD97Cx+CiFaAJtr53h+Q0BFynk eDcPGr6HZXqXPbMEGlQHtrltC4ycvzDtT1ZQYTluY0CXe6FnaGQsfZ5/guRgUUWL PeUJ75+xBsBmISNyYponAKcfJqhrGHQYlnHFmI0v9nHPNWNGl0F3U5RWkag== Received: from mail-pg1-f197.google.com (mail-pg1-f197.google.com [209.85.215.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 47j7qm284r-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Sun, 29 Jun 2025 14:08:05 +0000 (GMT) Received: by mail-pg1-f197.google.com with SMTP id 41be03b00d2f7-b1ffc678adfso2361874a12.0 for ; Sun, 29 Jun 2025 07:08:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751206084; x=1751810884; 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=pcVDmJx0NaoyKUEjzh14AEiEkv5Hih5RipJEl19C9hM=; b=QNU8Prmq4rCIcnMre3e5c8J3rV3uijWaKPj+kjnRwVeXtsO9i5/madCNPiQ3kt14GT iH/uf+gV7Ee13sZkAqhk6hyHYhw8nctOai8MEW3kF7GVy7LdEwKucyvKdfnStPwjVJQy +rF+M8lT1LGFTh6nIsTU3Sk8j/NMADMQjVEOtDIP8a1H1ZJA8Cy6YtSTyTMogDgHO90c szTW+7wx9c4kOHr4HhPhWzSHMH5DvePmeU9cfBV08hRyYnWKCymNYSyo6q4Dc49Pz6bP SlI1CP48GQcEW3t+As+MOLBy4gxLgKwctsb26S6J2Ju925EOW9GPYdxs/HpuClodlGAV zG2w== X-Forwarded-Encrypted: i=1; AJvYcCV6gErbI4uPeTNQP8kXDD3ijVtJVeEehB2Q72A8+yct1FktFhLUJJZEgkus2bVcLvCfXuLtTSrfAI4TUSc=@vger.kernel.org X-Gm-Message-State: AOJu0YwGM8+5Ke2Zl96wimjhJmBKo1Jbuf75rnXJXAbPqW+zh65qPlvq A0UwzNESuErR94TauOJuf1Dpcio0pun9nVEagh2wJPfl7CjtA5jZsHxJs59dGaTE+IiqFzFKvOL Gs9uoXz8NLdbTip+b3HK3x5AMxW1HtX5UB3T67e+rlvUoNKkiDVAwsNkgLSadLUEr7lE= X-Gm-Gg: ASbGncsDBdiJdKhGINHU8RKKZMdu/o8sF7FN5UsAovQDrXKeAJsYXZoAmv+NuYXfLRO YYhc2zOgPDq/fSVPGsGuoYeVcPH2Wva0XlX0lxlnhAOYnbJvL9JSSskdjPB3Ygv9X9R/fUfA7nv /ThzvKrzIZnKVvqs9nLOlAsCUdxVG7VWFVS76NseEJtNs3t4LxZv10T4SjEecYPV8sfrJiN3UMB DtrHLk3IX1R4ukSZtIG0lp5G2f4X9fA0uFM/9TiT9v7EP+kEhZjWkoavi9F0o+8IQkUREHCCZrM /0Vns7mT5rBo/kFppNSfZZkqmWI9D5FB X-Received: by 2002:a05:6a21:6d8f:b0:220:396b:991e with SMTP id adf61e73a8af0-220a16c98efmr15020487637.32.1751206083391; Sun, 29 Jun 2025 07:08:03 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFG42IoSZm72kSiiZ/aTL5n46sEg5lenicKsL6RWapGwR9TQUTq8P8yxf1oUFKteTvHOOWgTg== X-Received: by 2002:a05:6a21:6d8f:b0:220:396b:991e with SMTP id adf61e73a8af0-220a16c98efmr15020416637.32.1751206082789; Sun, 29 Jun 2025 07:08:02 -0700 (PDT) Received: from localhost ([2601:1c0:5000:d5c:5b3e:de60:4fda:e7b1]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-74af57efaecsm6762377b3a.161.2025.06.29.07.08.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Jun 2025 07:08:02 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, Connor Abbott , Antonino Maniscalco , Danilo Krummrich , Rob Clark , Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Konrad Dybcio , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Sumit Semwal , =?UTF-8?q?Christian=20K=C3=B6nig?= , linux-kernel@vger.kernel.org (open list), linux-media@vger.kernel.org (open list:DMA BUFFER SHARING FRAMEWORK:Keyword:\bdma_(?:buf|fence|resv)\b), linaro-mm-sig@lists.linaro.org (moderated list:DMA BUFFER SHARING FRAMEWORK:Keyword:\bdma_(?:buf|fence|resv)\b) Subject: [PATCH v8 29/42] drm/msm: Extract out syncobj helpers Date: Sun, 29 Jun 2025 07:03:32 -0700 Message-ID: <20250629140537.30850-30-robin.clark@oss.qualcomm.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250629140537.30850-1-robin.clark@oss.qualcomm.com> References: <20250629140537.30850-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-Authority-Analysis: v=2.4 cv=C4TpyRP+ c=1 sm=1 tr=0 ts=686148c5 cx=c_pps a=rz3CxIlbcmazkYymdCej/Q==:117 a=xqWC_Br6kY4A:10 a=6IFa9wvqVegA:10 a=cm27Pg_UAAAA:8 a=EUspDBNiAAAA:8 a=pGLkceISAAAA:8 a=ii7SkllToyZ1umWTbp4A:9 a=bFCP_H2QrGi7Okbo017w:22 X-Proofpoint-ORIG-GUID: IdaCvzdSf9TjgM60XAQl9CywiWdKg88B X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjI5MDExOSBTYWx0ZWRfX7NZt6V05pJyX nnA+BChIqTAVP5kGjGzbseORfU6phkl/JFOpesUU+jYUbnpS8g1S4CvbjLgxajhX4pqzSZRu1vI VIyMMjQcWWlDzcPjMGKYWOH2EPwu0vUbrDe0d8dGYF0JiXDVE3BnRFyc4TOiy8FNBLa9CUzSYBC jb8rl1tDAdsQwyPLXRvFXd504Lo58V8tMeA7lRWhLTYdBh346rIefnOvWLgjhrZbS24apB9hfJn 46o/0XSocZj8FM7f5MTYZrNxfhPUeSDSCvLBC3j67t6x6ozyGrUnb7Rtja9goVAZG0EK+RDs6yO OisJIO0FG7Eq4N6vGDMrakodMGLs8ylJF4IsJluAW4XZ4LGq4jzhj+4Rzjf2hHVml5hVLjuAOQ2 bFMZJ/sc8G/STawCcMcXqtKYy7yGWb3T9FZm4DgZlWqCypotbtUOKA3fsT7lbRPm9LO7F+4U X-Proofpoint-GUID: IdaCvzdSf9TjgM60XAQl9CywiWdKg88B 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-27_05,2025-06-27_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 phishscore=0 suspectscore=0 bulkscore=0 lowpriorityscore=0 clxscore=1015 priorityscore=1501 spamscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 malwarescore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2506290119 Content-Type: text/plain; charset="utf-8" From: Rob Clark We'll be re-using these for the VM_BIND ioctl. Also, rename a few things in the uapi header to reflect that syncobj use is not specific to the submit ioctl. Signed-off-by: Rob Clark Signed-off-by: Rob Clark Tested-by: Antonino Maniscalco Reviewed-by: Antonino Maniscalco --- drivers/gpu/drm/msm/Makefile | 1 + drivers/gpu/drm/msm/msm_gem_submit.c | 192 ++------------------------- drivers/gpu/drm/msm/msm_syncobj.c | 172 ++++++++++++++++++++++++ drivers/gpu/drm/msm/msm_syncobj.h | 37 ++++++ include/uapi/drm/msm_drm.h | 26 ++-- 5 files changed, 235 insertions(+), 193 deletions(-) create mode 100644 drivers/gpu/drm/msm/msm_syncobj.c create mode 100644 drivers/gpu/drm/msm/msm_syncobj.h diff --git a/drivers/gpu/drm/msm/Makefile b/drivers/gpu/drm/msm/Makefile index 7a2ada6e2d74..7e81441903a7 100644 --- a/drivers/gpu/drm/msm/Makefile +++ b/drivers/gpu/drm/msm/Makefile @@ -127,6 +127,7 @@ msm-y +=3D \ msm_rd.o \ msm_ringbuffer.o \ msm_submitqueue.o \ + msm_syncobj.o \ msm_gpu_tracepoints.o \ =20 msm-$(CONFIG_DRM_FBDEV_EMULATION) +=3D msm_fbdev.o diff --git a/drivers/gpu/drm/msm/msm_gem_submit.c b/drivers/gpu/drm/msm/msm= _gem_submit.c index 9562b6343e13..9f18771a1e88 100644 --- a/drivers/gpu/drm/msm/msm_gem_submit.c +++ b/drivers/gpu/drm/msm/msm_gem_submit.c @@ -16,6 +16,7 @@ #include "msm_gpu.h" #include "msm_gem.h" #include "msm_gpu_trace.h" +#include "msm_syncobj.h" =20 /* For userspace errors, use DRM_UT_DRIVER.. so that userspace can enable * error msgs for debugging, but we don't spam dmesg by default @@ -491,173 +492,6 @@ void msm_submit_retire(struct msm_gem_submit *submit) } } =20 -struct msm_submit_post_dep { - struct drm_syncobj *syncobj; - uint64_t point; - struct dma_fence_chain *chain; -}; - -static struct drm_syncobj **msm_parse_deps(struct msm_gem_submit *submit, - struct drm_file *file, - uint64_t in_syncobjs_addr, - uint32_t nr_in_syncobjs, - size_t syncobj_stride) -{ - struct drm_syncobj **syncobjs =3D NULL; - struct drm_msm_gem_submit_syncobj syncobj_desc =3D {0}; - int ret =3D 0; - uint32_t i, j; - - syncobjs =3D kcalloc(nr_in_syncobjs, sizeof(*syncobjs), - GFP_KERNEL | __GFP_NOWARN | __GFP_NORETRY); - if (!syncobjs) - return ERR_PTR(-ENOMEM); - - for (i =3D 0; i < nr_in_syncobjs; ++i) { - uint64_t address =3D in_syncobjs_addr + i * syncobj_stride; - - if (copy_from_user(&syncobj_desc, - u64_to_user_ptr(address), - min(syncobj_stride, sizeof(syncobj_desc)))) { - ret =3D -EFAULT; - break; - } - - if (syncobj_desc.point && - !drm_core_check_feature(submit->dev, DRIVER_SYNCOBJ_TIMELINE)) { - ret =3D SUBMIT_ERROR(EOPNOTSUPP, submit, "syncobj timeline unsupported"= ); - break; - } - - if (syncobj_desc.flags & ~MSM_SUBMIT_SYNCOBJ_FLAGS) { - ret =3D SUBMIT_ERROR(EINVAL, submit, "invalid syncobj flags: %x", synco= bj_desc.flags); - break; - } - - ret =3D drm_sched_job_add_syncobj_dependency(&submit->base, file, - syncobj_desc.handle, syncobj_desc.point); - if (ret) - break; - - if (syncobj_desc.flags & MSM_SUBMIT_SYNCOBJ_RESET) { - syncobjs[i] =3D - drm_syncobj_find(file, syncobj_desc.handle); - if (!syncobjs[i]) { - ret =3D SUBMIT_ERROR(EINVAL, submit, "invalid syncobj handle: %u", i); - break; - } - } - } - - if (ret) { - for (j =3D 0; j <=3D i; ++j) { - if (syncobjs[j]) - drm_syncobj_put(syncobjs[j]); - } - kfree(syncobjs); - return ERR_PTR(ret); - } - return syncobjs; -} - -static void msm_reset_syncobjs(struct drm_syncobj **syncobjs, - uint32_t nr_syncobjs) -{ - uint32_t i; - - for (i =3D 0; syncobjs && i < nr_syncobjs; ++i) { - if (syncobjs[i]) - drm_syncobj_replace_fence(syncobjs[i], NULL); - } -} - -static struct msm_submit_post_dep *msm_parse_post_deps(struct drm_device *= dev, - struct drm_file *fi= le, - uint64_t syncobjs_a= ddr, - uint32_t nr_syncobj= s, - size_t syncobj_stri= de) -{ - struct msm_submit_post_dep *post_deps; - struct drm_msm_gem_submit_syncobj syncobj_desc =3D {0}; - int ret =3D 0; - uint32_t i, j; - - post_deps =3D kcalloc(nr_syncobjs, sizeof(*post_deps), - GFP_KERNEL | __GFP_NOWARN | __GFP_NORETRY); - if (!post_deps) - return ERR_PTR(-ENOMEM); - - for (i =3D 0; i < nr_syncobjs; ++i) { - uint64_t address =3D syncobjs_addr + i * syncobj_stride; - - if (copy_from_user(&syncobj_desc, - u64_to_user_ptr(address), - min(syncobj_stride, sizeof(syncobj_desc)))) { - ret =3D -EFAULT; - break; - } - - post_deps[i].point =3D syncobj_desc.point; - - if (syncobj_desc.flags) { - ret =3D UERR(EINVAL, dev, "invalid syncobj flags"); - break; - } - - if (syncobj_desc.point) { - if (!drm_core_check_feature(dev, - DRIVER_SYNCOBJ_TIMELINE)) { - ret =3D UERR(EOPNOTSUPP, dev, "syncobj timeline unsupported"); - break; - } - - post_deps[i].chain =3D dma_fence_chain_alloc(); - if (!post_deps[i].chain) { - ret =3D -ENOMEM; - break; - } - } - - post_deps[i].syncobj =3D - drm_syncobj_find(file, syncobj_desc.handle); - if (!post_deps[i].syncobj) { - ret =3D UERR(EINVAL, dev, "invalid syncobj handle"); - break; - } - } - - if (ret) { - for (j =3D 0; j <=3D i; ++j) { - dma_fence_chain_free(post_deps[j].chain); - if (post_deps[j].syncobj) - drm_syncobj_put(post_deps[j].syncobj); - } - - kfree(post_deps); - return ERR_PTR(ret); - } - - return post_deps; -} - -static void msm_process_post_deps(struct msm_submit_post_dep *post_deps, - uint32_t count, struct dma_fence *fence) -{ - uint32_t i; - - for (i =3D 0; post_deps && i < count; ++i) { - if (post_deps[i].chain) { - drm_syncobj_add_point(post_deps[i].syncobj, - post_deps[i].chain, - fence, post_deps[i].point); - post_deps[i].chain =3D NULL; - } else { - drm_syncobj_replace_fence(post_deps[i].syncobj, - fence); - } - } -} - int msm_ioctl_gem_submit(struct drm_device *dev, void *data, struct drm_file *file) { @@ -668,7 +502,7 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void *= data, struct msm_gpu *gpu =3D priv->gpu; struct msm_gpu_submitqueue *queue; struct msm_ringbuffer *ring; - struct msm_submit_post_dep *post_deps =3D NULL; + struct msm_syncobj_post_dep *post_deps =3D NULL; struct drm_syncobj **syncobjs_to_reset =3D NULL; struct sync_file *sync_file =3D NULL; int out_fence_fd =3D -1; @@ -745,10 +579,10 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void= *data, } =20 if (args->flags & MSM_SUBMIT_SYNCOBJ_IN) { - syncobjs_to_reset =3D msm_parse_deps(submit, file, - args->in_syncobjs, - args->nr_in_syncobjs, - args->syncobj_stride); + syncobjs_to_reset =3D msm_syncobj_parse_deps(dev, &submit->base, + file, args->in_syncobjs, + args->nr_in_syncobjs, + args->syncobj_stride); if (IS_ERR(syncobjs_to_reset)) { ret =3D PTR_ERR(syncobjs_to_reset); goto out_unlock; @@ -756,10 +590,10 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void= *data, } =20 if (args->flags & MSM_SUBMIT_SYNCOBJ_OUT) { - post_deps =3D msm_parse_post_deps(dev, file, - args->out_syncobjs, - args->nr_out_syncobjs, - args->syncobj_stride); + post_deps =3D msm_syncobj_parse_post_deps(dev, file, + args->out_syncobjs, + args->nr_out_syncobjs, + args->syncobj_stride); if (IS_ERR(post_deps)) { ret =3D PTR_ERR(post_deps); goto out_unlock; @@ -902,10 +736,8 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void = *data, args->fence =3D submit->fence_id; queue->last_fence =3D submit->fence_id; =20 - msm_reset_syncobjs(syncobjs_to_reset, args->nr_in_syncobjs); - msm_process_post_deps(post_deps, args->nr_out_syncobjs, - submit->user_fence); - + msm_syncobj_reset(syncobjs_to_reset, args->nr_in_syncobjs); + msm_syncobj_process_post_deps(post_deps, args->nr_out_syncobjs, submit->u= ser_fence); =20 out: submit_cleanup(submit, !!ret); diff --git a/drivers/gpu/drm/msm/msm_syncobj.c b/drivers/gpu/drm/msm/msm_sy= ncobj.c new file mode 100644 index 000000000000..4baa9f522c54 --- /dev/null +++ b/drivers/gpu/drm/msm/msm_syncobj.c @@ -0,0 +1,172 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* Copyright (C) 2020 Google, Inc */ + +#include "drm/drm_drv.h" + +#include "msm_drv.h" +#include "msm_syncobj.h" + +struct drm_syncobj ** +msm_syncobj_parse_deps(struct drm_device *dev, + struct drm_sched_job *job, + struct drm_file *file, + uint64_t in_syncobjs_addr, + uint32_t nr_in_syncobjs, + size_t syncobj_stride) +{ + struct drm_syncobj **syncobjs =3D NULL; + struct drm_msm_syncobj syncobj_desc =3D {0}; + int ret =3D 0; + uint32_t i, j; + + syncobjs =3D kcalloc(nr_in_syncobjs, sizeof(*syncobjs), + GFP_KERNEL | __GFP_NOWARN | __GFP_NORETRY); + if (!syncobjs) + return ERR_PTR(-ENOMEM); + + for (i =3D 0; i < nr_in_syncobjs; ++i) { + uint64_t address =3D in_syncobjs_addr + i * syncobj_stride; + + if (copy_from_user(&syncobj_desc, + u64_to_user_ptr(address), + min(syncobj_stride, sizeof(syncobj_desc)))) { + ret =3D -EFAULT; + break; + } + + if (syncobj_desc.point && + !drm_core_check_feature(dev, DRIVER_SYNCOBJ_TIMELINE)) { + ret =3D UERR(EOPNOTSUPP, dev, "syncobj timeline unsupported"); + break; + } + + if (syncobj_desc.flags & ~MSM_SYNCOBJ_FLAGS) { + ret =3D UERR(EINVAL, dev, "invalid syncobj flags: %x", syncobj_desc.fla= gs); + break; + } + + ret =3D drm_sched_job_add_syncobj_dependency(job, file, + syncobj_desc.handle, + syncobj_desc.point); + if (ret) + break; + + if (syncobj_desc.flags & MSM_SYNCOBJ_RESET) { + syncobjs[i] =3D drm_syncobj_find(file, syncobj_desc.handle); + if (!syncobjs[i]) { + ret =3D UERR(EINVAL, dev, "invalid syncobj handle: %u", i); + break; + } + } + } + + if (ret) { + for (j =3D 0; j <=3D i; ++j) { + if (syncobjs[j]) + drm_syncobj_put(syncobjs[j]); + } + kfree(syncobjs); + return ERR_PTR(ret); + } + return syncobjs; +} + +void +msm_syncobj_reset(struct drm_syncobj **syncobjs, uint32_t nr_syncobjs) +{ + uint32_t i; + + for (i =3D 0; syncobjs && i < nr_syncobjs; ++i) { + if (syncobjs[i]) + drm_syncobj_replace_fence(syncobjs[i], NULL); + } +} + +struct msm_syncobj_post_dep * +msm_syncobj_parse_post_deps(struct drm_device *dev, + struct drm_file *file, + uint64_t syncobjs_addr, + uint32_t nr_syncobjs, + size_t syncobj_stride) +{ + struct msm_syncobj_post_dep *post_deps; + struct drm_msm_syncobj syncobj_desc =3D {0}; + int ret =3D 0; + uint32_t i, j; + + post_deps =3D kcalloc(nr_syncobjs, sizeof(*post_deps), + GFP_KERNEL | __GFP_NOWARN | __GFP_NORETRY); + if (!post_deps) + return ERR_PTR(-ENOMEM); + + for (i =3D 0; i < nr_syncobjs; ++i) { + uint64_t address =3D syncobjs_addr + i * syncobj_stride; + + if (copy_from_user(&syncobj_desc, + u64_to_user_ptr(address), + min(syncobj_stride, sizeof(syncobj_desc)))) { + ret =3D -EFAULT; + break; + } + + post_deps[i].point =3D syncobj_desc.point; + + if (syncobj_desc.flags) { + ret =3D UERR(EINVAL, dev, "invalid syncobj flags"); + break; + } + + if (syncobj_desc.point) { + if (!drm_core_check_feature(dev, + DRIVER_SYNCOBJ_TIMELINE)) { + ret =3D UERR(EOPNOTSUPP, dev, "syncobj timeline unsupported"); + break; + } + + post_deps[i].chain =3D dma_fence_chain_alloc(); + if (!post_deps[i].chain) { + ret =3D -ENOMEM; + break; + } + } + + post_deps[i].syncobj =3D + drm_syncobj_find(file, syncobj_desc.handle); + if (!post_deps[i].syncobj) { + ret =3D UERR(EINVAL, dev, "invalid syncobj handle"); + break; + } + } + + if (ret) { + for (j =3D 0; j <=3D i; ++j) { + dma_fence_chain_free(post_deps[j].chain); + if (post_deps[j].syncobj) + drm_syncobj_put(post_deps[j].syncobj); + } + + kfree(post_deps); + return ERR_PTR(ret); + } + + return post_deps; +} + +void +msm_syncobj_process_post_deps(struct msm_syncobj_post_dep *post_deps, + uint32_t count, struct dma_fence *fence) +{ + uint32_t i; + + for (i =3D 0; post_deps && i < count; ++i) { + if (post_deps[i].chain) { + drm_syncobj_add_point(post_deps[i].syncobj, + post_deps[i].chain, + fence, post_deps[i].point); + post_deps[i].chain =3D NULL; + } else { + drm_syncobj_replace_fence(post_deps[i].syncobj, + fence); + } + } +} diff --git a/drivers/gpu/drm/msm/msm_syncobj.h b/drivers/gpu/drm/msm/msm_sy= ncobj.h new file mode 100644 index 000000000000..bcaa15d01da0 --- /dev/null +++ b/drivers/gpu/drm/msm/msm_syncobj.h @@ -0,0 +1,37 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* Copyright (C) 2020 Google, Inc */ + +#ifndef __MSM_GEM_SYNCOBJ_H__ +#define __MSM_GEM_SYNCOBJ_H__ + +#include "drm/drm_device.h" +#include "drm/drm_syncobj.h" +#include "drm/gpu_scheduler.h" + +struct msm_syncobj_post_dep { + struct drm_syncobj *syncobj; + uint64_t point; + struct dma_fence_chain *chain; +}; + +struct drm_syncobj ** +msm_syncobj_parse_deps(struct drm_device *dev, + struct drm_sched_job *job, + struct drm_file *file, + uint64_t in_syncobjs_addr, + uint32_t nr_in_syncobjs, + size_t syncobj_stride); + +void msm_syncobj_reset(struct drm_syncobj **syncobjs, uint32_t nr_syncobjs= ); + +struct msm_syncobj_post_dep * +msm_syncobj_parse_post_deps(struct drm_device *dev, + struct drm_file *file, + uint64_t syncobjs_addr, + uint32_t nr_syncobjs, + size_t syncobj_stride); + +void msm_syncobj_process_post_deps(struct msm_syncobj_post_dep *post_deps, + uint32_t count, struct dma_fence *fence); + +#endif /* __MSM_GEM_SYNCOBJ_H__ */ diff --git a/include/uapi/drm/msm_drm.h b/include/uapi/drm/msm_drm.h index 1bccc347945c..2c2fc4b284d0 100644 --- a/include/uapi/drm/msm_drm.h +++ b/include/uapi/drm/msm_drm.h @@ -220,6 +220,17 @@ struct drm_msm_gem_cpu_fini { * Cmdstream Submission: */ =20 +#define MSM_SYNCOBJ_RESET 0x00000001 /* Reset syncobj after wait. */ +#define MSM_SYNCOBJ_FLAGS ( \ + MSM_SYNCOBJ_RESET | \ + 0) + +struct drm_msm_syncobj { + __u32 handle; /* in, syncobj handle. */ + __u32 flags; /* in, from MSM_SUBMIT_SYNCOBJ_FLAGS */ + __u64 point; /* in, timepoint for timeline syncobjs. */ +}; + /* The value written into the cmdstream is logically: * * ((relocbuf->gpuaddr + reloc_offset) << shift) | or @@ -309,17 +320,6 @@ struct drm_msm_gem_submit_bo { MSM_SUBMIT_FENCE_SN_IN | \ 0) =20 -#define MSM_SUBMIT_SYNCOBJ_RESET 0x00000001 /* Reset syncobj after wait. */ -#define MSM_SUBMIT_SYNCOBJ_FLAGS ( \ - MSM_SUBMIT_SYNCOBJ_RESET | \ - 0) - -struct drm_msm_gem_submit_syncobj { - __u32 handle; /* in, syncobj handle. */ - __u32 flags; /* in, from MSM_SUBMIT_SYNCOBJ_FLAGS */ - __u64 point; /* in, timepoint for timeline syncobjs. */ -}; - /* Each cmdstream submit consists of a table of buffers involved, and * one or more cmdstream buffers. This allows for conditional execution * (context-restore), and IB buffers needed for per tile/bin draw cmds. @@ -333,8 +333,8 @@ struct drm_msm_gem_submit { __u64 cmds; /* in, ptr to array of submit_cmd's */ __s32 fence_fd; /* in/out fence fd (see MSM_SUBMIT_FENCE_FD_IN/OUT)= */ __u32 queueid; /* in, submitqueue id */ - __u64 in_syncobjs; /* in, ptr to array of drm_msm_gem_submit_syncobj */ - __u64 out_syncobjs; /* in, ptr to array of drm_msm_gem_submit_syncobj */ + __u64 in_syncobjs; /* in, ptr to array of drm_msm_syncobj */ + __u64 out_syncobjs; /* in, ptr to array of drm_msm_syncobj */ __u32 nr_in_syncobjs; /* in, number of entries in in_syncobj */ __u32 nr_out_syncobjs; /* in, number of entries in out_syncobj. */ __u32 syncobj_stride; /* in, stride of syncobj arrays. */ --=20 2.50.0 From nobody Wed Oct 8 10:58:51 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 1960124293C for ; Sun, 29 Jun 2025 14:08:07 +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=1751206089; cv=none; b=aoTHfnnlbd0fa+udv1gy6eMF+8Dm80BygjgtOpURExvZ0ZnVQmd0RjMWGXfFHGhxOF7wU9GfrpKxlN66ZRMHToEyMFUivE3jC3Ifyoj81MQ96XIdO+lwGLNW5lfYdmNMehstm2rJDD2nm9xd6dmgx2mHjobYjJ7IVSKr/HXliSM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751206089; c=relaxed/simple; bh=VgCwVWqTpqRlfRQ5gyAJCTfkO3Reb3p+U/Zm/p//H08=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Clo2qMJnVPGhN5QV50lYt8wn5QnKhNEFmkUx0JtBOibhQnLkQOVF+bydwc4JoJy6ulYGy9XJak+W2W5Z1Gf4NDqV3KujAb6qdFtb2JFF4PHU+gu/ap4s9nf52ct+AIxm2MUn/IVA7EChXRWR0bwpk/k9PINd57wg1yRwn6kudPc= 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=H8KtDQ7+; 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="H8KtDQ7+" Received: from pps.filterd (m0279872.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 55T9TfQ8013288 for ; Sun, 29 Jun 2025 14:08:06 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=fDzBgQEKZYU G26jz6qIHJn61zKgVSXScxT3NVbL/LOU=; b=H8KtDQ7+cji0fJIzrUl/zXGdgqM brV9B5h7udP7kKwVaaeC/bphrM4sg6sl15tQaH80GAu7rg6eFeypRFlWOIf9ebYM VI8q/JIuiRZwZHtxAESM5XZZu26s+pqWR/QwA9T7YyNfrlBzbuedAT+krdxWfX9Z wCkXRR36xJFvREGsbAk5STh/F5a/o/C0WxYsQQcgrTquELfXXVwxAq1s8UWDgGP7 LsO6HhQjm5LE0hpJuNM7fpyIU31ZSkkv1G6aBjTz5spAhQFhXVKKIBkqy/5Fwmxq CjfCXCJx1daD2hhSjietLeHWyFczxIR6cb3WuNwuMtbcIkt/loomiXZVY6Q== 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 47j8s9a60d-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Sun, 29 Jun 2025 14:08:05 +0000 (GMT) Received: by mail-pl1-f197.google.com with SMTP id d9443c01a7336-235e3f93687so19019105ad.2 for ; Sun, 29 Jun 2025 07:08:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751206085; x=1751810885; 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=fDzBgQEKZYUG26jz6qIHJn61zKgVSXScxT3NVbL/LOU=; b=ssHzighotlXRVJIg1lpII8uG+UBAo9ATE+egzmy7Q4V979c7sMtbdiDvDV0jyGmjb2 mFoIo5wJw1XisSp5uoLdLRbQlUI6Av1ZXVZUGIdynNrckT75ZV3RuJ1liJgPKLMsuvgR UK5YpEorf3ibysIIzRwYJoUZxBUr8qSbvTZYbmcGnce98PBL6+/OAKo+2cOuThZKgKgg ulacuR4S4rSj/cbWeC1RJ1Az+0JtismkqQToY0gM2fT4iqtvyVAgZ37mUim+U0NBcCa3 LPqodpORjh31JZmE1f2Ytua+UyqrodoSbzlG2XG1crvrFBLwbfDnLIUVdrZbNf6BFpHX 4AgA== X-Forwarded-Encrypted: i=1; AJvYcCUmykLwVIEPJF4ZN/LKfnvBKJNbVgP3wJGwWjCpwMhzCNCfyscSBlflPCyezShQj09QWOLFyJD/QMhDqvI=@vger.kernel.org X-Gm-Message-State: AOJu0YwgZhmW54I//2HIgVTDfNb2XXVXEtswidDcZr5CNRDV7+geKwBd cdHhtiK4wdbSb+nDAfte74U6kRufHzYQGUvZHukzWMikRyutAYT4wwbP7qlQCZr5St7nAg4sff9 WYqQB5Ot3O/ukGqxuWl2pDa0eAo3FDraBi9QHAbA7aGT1+XnP/5fpB28GsKKQY2W7Oqw= X-Gm-Gg: ASbGncucU0m8v6VG+XCAe4fNMs1/5gina35MRlUx8Q/svnKRZWO4ZnVuT4DNlB6HXyR MWcHTyNdbL0eFDQhPGBeW4gYAFiF0dulCQ1JxKwnDGYEBb1d0wQpKGQuT/NqMr6XK+g3/khC/mr Pf2wqxCRj2wl3i3h5/xLU6fKtZmZ71OUjyGv/qVpVNJiNjqSY0oEOMM0iSXmHVP142fqjEyJify h/gV83XN+DX1p/Zh1Sz2s+gzIQolsD/ViQLwFcobLPTERsBHa4GprkmZj9ydkIEYMddKvaV05c1 t2vSf4B90QhdxkYdzxDBkV1ycfJjura6 X-Received: by 2002:a17:902:e54b:b0:235:eb8b:9968 with SMTP id d9443c01a7336-23ac463470cmr169136375ad.36.1751206084533; Sun, 29 Jun 2025 07:08:04 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHkyc5NqpGoUysSULZkt4YI8T4ojjTyZxoY3YnC9AbbMNNhL19AVyCjD/gR1PB/UUJsbTP6lQ== X-Received: by 2002:a17:902:e54b:b0:235:eb8b:9968 with SMTP id d9443c01a7336-23ac463470cmr169136005ad.36.1751206084070; Sun, 29 Jun 2025 07:08:04 -0700 (PDT) Received: from localhost ([2601:1c0:5000:d5c:5b3e:de60:4fda:e7b1]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-23acb3adeabsm57654565ad.159.2025.06.29.07.08.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Jun 2025 07:08:03 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, Connor Abbott , Antonino Maniscalco , Danilo Krummrich , Rob Clark , Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v8 30/42] drm/msm: Use DMA_RESV_USAGE_BOOKKEEP/KERNEL Date: Sun, 29 Jun 2025 07:03:33 -0700 Message-ID: <20250629140537.30850-31-robin.clark@oss.qualcomm.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250629140537.30850-1-robin.clark@oss.qualcomm.com> References: <20250629140537.30850-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-Authority-Analysis: v=2.4 cv=H/Pbw/Yi c=1 sm=1 tr=0 ts=686148c5 cx=c_pps a=cmESyDAEBpBGqyK7t0alAg==:117 a=xqWC_Br6kY4A:10 a=6IFa9wvqVegA:10 a=cm27Pg_UAAAA:8 a=EUspDBNiAAAA:8 a=pGLkceISAAAA:8 a=8Ft5guHMEotweHOT_P0A:9 a=1OuFwYUASf3TG4hYMiVC:22 X-Proofpoint-ORIG-GUID: dIdpn-Ar9DIucrcElkXJKGpySwwOGmMc X-Proofpoint-GUID: dIdpn-Ar9DIucrcElkXJKGpySwwOGmMc X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjI5MDExOCBTYWx0ZWRfX99hbC9H6N4i3 e7tSWGkm1U6EqQPI/q4Vv80BBPYfs385mWMN1qm7/BeFC3N/SNVbGeXh/WiWIDh7HxuPCFbQXFf iEb1e3Rp5y3GMRtEZTRFlMgFJLQWroRm0IAEd3KS4l6dH1R0xeJpstPSV2UL8TvgX7wQCR4j99c gEFCwp+55aA7OTtBQH7KmGYyk4ZO9b9EhembUoq6EROHJn4SOrYk09J7lCJsPe6eUN4nMRIXILN N+jRS6xC3d2uvkFVcN3fna21VRaXK8WlIKCnuAl0oOBUAG8RPmtMWnVpFjVROR1+n9JtG5VZGDs PkL4mX9nGXGH+bDZhw4AK+1O+5lAZkqza1r8clcDTvTbhFgasxxPpjCMUl9UBoPBso2mDdfruno vitEFgRpqHAJUiMXp8yudmxvbZU1R7ZMCd7Ys/aPehfRB/WV9yvtjQQAWp8zcznra1GVA+a2 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-27_05,2025-06-27_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 malwarescore=0 suspectscore=0 mlxlogscore=999 priorityscore=1501 clxscore=1015 mlxscore=0 lowpriorityscore=0 spamscore=0 adultscore=0 bulkscore=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-2506290118 Content-Type: text/plain; charset="utf-8" From: Rob Clark Any place we wait for a BO to become idle, we should use BOOKKEEP usage, to ensure that it waits for _any_ activity. Signed-off-by: Rob Clark Signed-off-by: Rob Clark Tested-by: Antonino Maniscalco Reviewed-by: Antonino Maniscalco --- drivers/gpu/drm/msm/msm_gem.c | 6 +++--- drivers/gpu/drm/msm/msm_gem_shrinker.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c index 100d159d52e2..b688d397cc47 100644 --- a/drivers/gpu/drm/msm/msm_gem.c +++ b/drivers/gpu/drm/msm/msm_gem.c @@ -93,8 +93,8 @@ static void msm_gem_close(struct drm_gem_object *obj, str= uct drm_file *file) * TODO we might need to kick this to a queue to avoid blocking * in CLOSE ioctl */ - dma_resv_wait_timeout(obj->resv, DMA_RESV_USAGE_READ, false, - msecs_to_jiffies(1000)); + dma_resv_wait_timeout(obj->resv, DMA_RESV_USAGE_BOOKKEEP, false, + MAX_SCHEDULE_TIMEOUT); =20 msm_gem_lock_vm_and_obj(&exec, obj, ctx->vm); put_iova_spaces(obj, ctx->vm, true); @@ -895,7 +895,7 @@ bool msm_gem_active(struct drm_gem_object *obj) if (to_msm_bo(obj)->pin_count) return true; =20 - return !dma_resv_test_signaled(obj->resv, dma_resv_usage_rw(true)); + return !dma_resv_test_signaled(obj->resv, DMA_RESV_USAGE_BOOKKEEP); } =20 int msm_gem_cpu_prep(struct drm_gem_object *obj, uint32_t op, ktime_t *tim= eout) diff --git a/drivers/gpu/drm/msm/msm_gem_shrinker.c b/drivers/gpu/drm/msm/m= sm_gem_shrinker.c index 5faf6227584a..1039e3c0a47b 100644 --- a/drivers/gpu/drm/msm/msm_gem_shrinker.c +++ b/drivers/gpu/drm/msm/msm_gem_shrinker.c @@ -139,7 +139,7 @@ evict(struct drm_gem_object *obj, struct ww_acquire_ctx= *ticket) static bool wait_for_idle(struct drm_gem_object *obj) { - enum dma_resv_usage usage =3D dma_resv_usage_rw(true); + enum dma_resv_usage usage =3D DMA_RESV_USAGE_BOOKKEEP; return dma_resv_wait_timeout(obj->resv, usage, false, 10) > 0; } =20 --=20 2.50.0 From nobody Wed Oct 8 10:58:51 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 250C62248AB for ; Sun, 29 Jun 2025 14:08:08 +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=1751206091; cv=none; b=McRx+klrigQfgc5mVLIa6w6Wl67J5anDuwv6iWTokLEEFVqMJkblLCVwmXyKGYeMQJPvkfqZqB7kxN49MiIK4iebCTacq+eoV+Ll7UAqaiWEyHj4qFqZb3s2fn3Br1lQYADBi697k6MaYSG9Cu/qK3wKJbonquB7MI7dNtubJxA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751206091; c=relaxed/simple; bh=SAnJbWKW2vq739V1GVt3PN+Q/A9/mQPoudYPrWMRl7I=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lpTzppI4XFmbm8Wki6GicewgoBQ8vRqjfuGh0RL/U9rexpOgJhChWCFK70GAIWB6kDim1UUjpSCv86xZVR7vH3UfvhuTd/EWcPp0mlTx/Whp1wKt3tacEb/OpBfpzwLW5J0m+i+72AfHioBlwjwZTbOB7ihfx2W23UgOrvdZIZ4= 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=YeMTCVdy; 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="YeMTCVdy" Received: from pps.filterd (m0279872.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 55T80UdP018915 for ; Sun, 29 Jun 2025 14:08:08 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=u3Vk/605sFT lfOKNcEzCbK6kAX2mmjGgvJ9lJRRpvp8=; b=YeMTCVdyxNA3qlzrcTJVCUiMQ3p Qu3dk9TZxD87mYJISmVQ1AY3UFybjOD9fcG2K6tJI8T3ZC1RbhrpRrHkJh2PuZqu yrE8m/jeWniy5HU4+CvO2D5lkpZwt02qvlvzQINnnGgt6dZ1/+uC5ks33GFEoGaN Psmq9nX0VvXJcwXEMu3RBDH1pXWqiHyeRN8ORN/RNzzS0mpaR5iy9gi4ce8iDa+e FD4vnTGgUnBe9UuvBspfyRMbYb3NIhI8PApAv64VzH7jVgQhwYZ2RLcU1dqcEHRk 7BG/q6pZFOGv0gsFxIPAY0bT71tAuxR2Rxc9Sy74jJhI5rL3xXZCDqloK4w== Received: from mail-pf1-f200.google.com (mail-pf1-f200.google.com [209.85.210.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 47j8s9a60g-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Sun, 29 Jun 2025 14:08:07 +0000 (GMT) Received: by mail-pf1-f200.google.com with SMTP id d2e1a72fcca58-748e1e474f8so2470544b3a.2 for ; Sun, 29 Jun 2025 07:08:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751206086; x=1751810886; 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=u3Vk/605sFTlfOKNcEzCbK6kAX2mmjGgvJ9lJRRpvp8=; b=ctUBYannpojOT8u8J/tbH+fj4neE80YQdnDKARXH122Gy+jkYWLn6FVaMPIXybDuwS hHwe0JECLR58CM1vXcMqrsiLufxMnELH7a6LkOFNBqI3hJzpCB1cQQAGrs8imZrfkFPy rHDycOLFJr0vznqH0xDVtlCCoGJGAWyjNZT6uSNCQdkpxKosFkvzPSzWPsv6e6x5jAGF /LgDYxReCiquAYvBHO/c18f8oeIY88jeCYUf0zTvB/gmuYpopuWrlDarjGsU3IB1gOOB 9ePnaEJh9C+qmFotF0yL9yZegjssmRdOE1n0B3xOEb6LdmliDjbTXWlccLYf3h/P1t5a +/+g== X-Forwarded-Encrypted: i=1; AJvYcCXRUi3ie+eYNg6bnWScs5xpcUXWaGPqfW9de7YlW/QOCxdlc6sVCat/5+1NI919KeKV8JYZid/SVrQ8uVk=@vger.kernel.org X-Gm-Message-State: AOJu0YxjTmDs8OEJZE2szBom2So5VbVMOzRrlXaaCJgPA0fJ+K2K1hIu f5sh4gAqBn9zvNxGty0ETTgYkTB1gDR+U9MJeTI4EN0D3QhlyLzxzDrqMlVd5FgtWj0cudaCw1S QQGDukmohrmCD9PPJtUb1aryr3SmArF+x82f9S5/nqePexCG+1gGI+UcDZxtT1hkndTE= X-Gm-Gg: ASbGncsNueZxPzOiBMsBiGv4feePcpWr59uacCvqI9ee9aJ6Mhhxe0xlO48jsLPuCvH nHlWck8PZAhQ2GAveIPHFiuIp+r295jtoQdk7hUQNpJqH2TuY/DwRzQjHcIJt7zx7FALorCJLvd SL4mfuMUx8pLjq0OwkTpukvcrxFDFb+mt7Z47WLWOQTo4eP+U6FQwmjZR9EH4hxaplV04H8de4w 9P8YPQUsqiV+SNZmbzyge68VLNFlhVbgV/ruSz4XBRieRlgU99rdkP6DFxa+Yr531NkjNofD6jM yrd1i0oX7Ro0qzQWS7KKMLlsI0Ak1X/o X-Received: by 2002:a05:6a00:4fc1:b0:736:5664:53f3 with SMTP id d2e1a72fcca58-74af6fcf6c5mr13030999b3a.15.1751206086269; Sun, 29 Jun 2025 07:08:06 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHPF0r+KbIJLkMpnGJMuJ/yjrmjEcP7CR6qcDhirZTEZTfTvp71Z0FYiOLb8KvVz889YuZrRA== X-Received: by 2002:a05:6a00:4fc1:b0:736:5664:53f3 with SMTP id d2e1a72fcca58-74af6fcf6c5mr13030958b3a.15.1751206085614; Sun, 29 Jun 2025 07:08:05 -0700 (PDT) Received: from localhost ([2601:1c0:5000:d5c:5b3e:de60:4fda:e7b1]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-74af540ae41sm6917244b3a.19.2025.06.29.07.08.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Jun 2025 07:08:05 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, Connor Abbott , Antonino Maniscalco , Danilo Krummrich , Rob Clark , Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Konrad Dybcio , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Sumit Semwal , =?UTF-8?q?Christian=20K=C3=B6nig?= , linux-kernel@vger.kernel.org (open list), linux-media@vger.kernel.org (open list:DMA BUFFER SHARING FRAMEWORK:Keyword:\bdma_(?:buf|fence|resv)\b), linaro-mm-sig@lists.linaro.org (moderated list:DMA BUFFER SHARING FRAMEWORK:Keyword:\bdma_(?:buf|fence|resv)\b) Subject: [PATCH v8 31/42] drm/msm: Add VM_BIND submitqueue Date: Sun, 29 Jun 2025 07:03:34 -0700 Message-ID: <20250629140537.30850-32-robin.clark@oss.qualcomm.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250629140537.30850-1-robin.clark@oss.qualcomm.com> References: <20250629140537.30850-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-Authority-Analysis: v=2.4 cv=H/Pbw/Yi c=1 sm=1 tr=0 ts=686148c7 cx=c_pps a=mDZGXZTwRPZaeRUbqKGCBw==:117 a=xqWC_Br6kY4A:10 a=6IFa9wvqVegA:10 a=cm27Pg_UAAAA:8 a=EUspDBNiAAAA:8 a=pGLkceISAAAA:8 a=PnHp71_pcMtKiH-pJVMA:9 a=zc0IvFSfCIW2DFIPzwfm:22 X-Proofpoint-ORIG-GUID: IUQMCx6aqNmp8xDK4tKJufrJpxYbjHVr X-Proofpoint-GUID: IUQMCx6aqNmp8xDK4tKJufrJpxYbjHVr X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjI5MDExOCBTYWx0ZWRfX3vsd3A7/Aqhb 94IBn4me9qHZTVUc++k3wc2lVbLwTLSHA82Yx57oHRREhMEUa7Z5PFzaHsAkYnu+atsyFMDbxCY NbsFTOYxDEAgCqRK37m3REdML8JZPuk+naw4cm1W5pwLqR0O/0y7fWq4TS2q3rrXBm2fS5jSi/d ROTsoOTFvH7W7hp11RHPKqvo67DMdYz0+i4JgnMBzfDy3rnxbprNmTv61yGCdIIsgIMk250pEl1 miu0dvLC8EAuto6OvzKpmZGPk6ZTNzDPF8YanufUv8sKYx3b5zsbWywybxz0hF+vbB0WihEYSD5 iagl4NRczvs1O8+WcFh3F3qDrkKefet64JNmiiiKjMRt2dgpqHqpIUb2pBrzCYCFUEIpXylrwAw DePAQYjevNVxQNPIuu4F5Iy3uYutv+cCVAt3DS9sawyZYkqvB8Ro+lbYqigFpJXBNxV43glr 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-27_05,2025-06-27_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 malwarescore=0 suspectscore=0 mlxlogscore=999 priorityscore=1501 clxscore=1015 mlxscore=0 lowpriorityscore=0 spamscore=0 adultscore=0 bulkscore=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-2506290118 Content-Type: text/plain; charset="utf-8" From: Rob Clark This submitqueue type isn't tied to a hw ringbuffer, but instead executes on the CPU for performing async VM_BIND ops. Signed-off-by: Rob Clark Signed-off-by: Rob Clark Tested-by: Antonino Maniscalco Reviewed-by: Antonino Maniscalco --- drivers/gpu/drm/msm/msm_gem.h | 12 +++++ drivers/gpu/drm/msm/msm_gem_submit.c | 60 +++++++++++++++++++--- drivers/gpu/drm/msm/msm_gem_vma.c | 71 +++++++++++++++++++++++++++ drivers/gpu/drm/msm/msm_gpu.h | 3 ++ drivers/gpu/drm/msm/msm_submitqueue.c | 67 +++++++++++++++++++------ include/uapi/drm/msm_drm.h | 9 +++- 6 files changed, 197 insertions(+), 25 deletions(-) diff --git a/drivers/gpu/drm/msm/msm_gem.h b/drivers/gpu/drm/msm/msm_gem.h index 3a5f81437b5d..af637409be39 100644 --- a/drivers/gpu/drm/msm/msm_gem.h +++ b/drivers/gpu/drm/msm/msm_gem.h @@ -53,6 +53,13 @@ struct msm_gem_vm { /** @base: Inherit from drm_gpuvm. */ struct drm_gpuvm base; =20 + /** + * @sched: Scheduler used for asynchronous VM_BIND request. + * + * Unused for kernel managed VMs (where all operations are synchronous). + */ + struct drm_gpu_scheduler sched; + /** * @mm: Memory management for kernel managed VA allocations * @@ -71,6 +78,9 @@ struct msm_gem_vm { */ struct pid *pid; =20 + /** @last_fence: Fence for last pending work scheduled on the VM */ + struct dma_fence *last_fence; + /** @faults: the number of GPU hangs associated with this address space */ int faults; =20 @@ -100,6 +110,8 @@ struct drm_gpuvm * msm_gem_vm_create(struct drm_device *drm, struct msm_mmu *mmu, const char = *name, u64 va_start, u64 va_size, bool managed); =20 +void msm_gem_vm_close(struct drm_gpuvm *gpuvm); + struct msm_fence_context; =20 #define MSM_VMA_DUMP (DRM_GPUVA_USERBITS << 0) diff --git a/drivers/gpu/drm/msm/msm_gem_submit.c b/drivers/gpu/drm/msm/msm= _gem_submit.c index 9f18771a1e88..e2174b7d0e40 100644 --- a/drivers/gpu/drm/msm/msm_gem_submit.c +++ b/drivers/gpu/drm/msm/msm_gem_submit.c @@ -4,6 +4,7 @@ * Author: Rob Clark */ =20 +#include #include #include #include @@ -258,30 +259,43 @@ static int submit_lookup_cmds(struct msm_gem_submit *= submit, static int submit_lock_objects(struct msm_gem_submit *submit) { unsigned flags =3D DRM_EXEC_IGNORE_DUPLICATES | DRM_EXEC_INTERRUPTIBLE_WA= IT; + struct drm_exec *exec =3D &submit->exec; int ret; =20 -// TODO need to add vm_bind path which locks vm resv + external objs drm_exec_init(&submit->exec, flags, submit->nr_bos); =20 + if (msm_context_is_vmbind(submit->queue->ctx)) { + drm_exec_until_all_locked (&submit->exec) { + ret =3D drm_gpuvm_prepare_vm(submit->vm, exec, 1); + drm_exec_retry_on_contention(exec); + if (ret) + return ret; + + ret =3D drm_gpuvm_prepare_objects(submit->vm, exec, 1); + drm_exec_retry_on_contention(exec); + if (ret) + return ret; + } + + return 0; + } + drm_exec_until_all_locked (&submit->exec) { ret =3D drm_exec_lock_obj(&submit->exec, drm_gpuvm_resv_obj(submit->vm)); drm_exec_retry_on_contention(&submit->exec); if (ret) - goto error; + return ret; for (unsigned i =3D 0; i < submit->nr_bos; i++) { struct drm_gem_object *obj =3D submit->bos[i].obj; ret =3D drm_exec_prepare_obj(&submit->exec, obj, 1); drm_exec_retry_on_contention(&submit->exec); if (ret) - goto error; + return ret; } } =20 return 0; - -error: - return ret; } =20 static int submit_fence_sync(struct msm_gem_submit *submit) @@ -367,9 +381,18 @@ static void submit_unpin_objects(struct msm_gem_submit= *submit) =20 static void submit_attach_object_fences(struct msm_gem_submit *submit) { - int i; + struct msm_gem_vm *vm =3D to_msm_vm(submit->vm); + struct dma_fence *last_fence; + + if (msm_context_is_vmbind(submit->queue->ctx)) { + drm_gpuvm_resv_add_fence(submit->vm, &submit->exec, + submit->user_fence, + DMA_RESV_USAGE_BOOKKEEP, + DMA_RESV_USAGE_BOOKKEEP); + return; + } =20 - for (i =3D 0; i < submit->nr_bos; i++) { + for (unsigned i =3D 0; i < submit->nr_bos; i++) { struct drm_gem_object *obj =3D submit->bos[i].obj; =20 if (submit->bos[i].flags & MSM_SUBMIT_BO_WRITE) @@ -379,6 +402,10 @@ static void submit_attach_object_fences(struct msm_gem= _submit *submit) dma_resv_add_fence(obj->resv, submit->user_fence, DMA_RESV_USAGE_READ); } + + last_fence =3D vm->last_fence; + vm->last_fence =3D dma_fence_unwrap_merge(submit->user_fence, last_fence); + dma_fence_put(last_fence); } =20 static int submit_bo(struct msm_gem_submit *submit, uint32_t idx, @@ -537,6 +564,11 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void = *data, if (!queue) return -ENOENT; =20 + if (queue->flags & MSM_SUBMITQUEUE_VM_BIND) { + ret =3D UERR(EINVAL, dev, "Invalid queue type"); + goto out_post_unlock; + } + ring =3D gpu->rb[queue->ring_nr]; =20 if (args->flags & MSM_SUBMIT_FENCE_FD_OUT) { @@ -726,6 +758,18 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void = *data, =20 submit_attach_object_fences(submit); =20 + if (msm_context_is_vmbind(ctx)) { + /* + * If we are not using VM_BIND, submit_pin_vmas() will validate + * just the BOs attached to the submit. In that case we don't + * need to validate the _entire_ vm, because userspace tracked + * what BOs are associated with the submit. + */ + ret =3D drm_gpuvm_validate(submit->vm, &submit->exec); + if (ret) + goto out; + } + /* The scheduler owns a ref now: */ msm_gem_submit_get(submit); =20 diff --git a/drivers/gpu/drm/msm/msm_gem_vma.c b/drivers/gpu/drm/msm/msm_ge= m_vma.c index e16a8cafd8be..cf37abb98235 100644 --- a/drivers/gpu/drm/msm/msm_gem_vma.c +++ b/drivers/gpu/drm/msm/msm_gem_vma.c @@ -16,6 +16,7 @@ msm_gem_vm_free(struct drm_gpuvm *gpuvm) drm_mm_takedown(&vm->mm); if (vm->mmu) vm->mmu->funcs->destroy(vm->mmu); + dma_fence_put(vm->last_fence); put_pid(vm->pid); kfree(vm); } @@ -154,6 +155,9 @@ static const struct drm_gpuvm_ops msm_gpuvm_ops =3D { .vm_free =3D msm_gem_vm_free, }; =20 +static const struct drm_sched_backend_ops msm_vm_bind_ops =3D { +}; + /** * msm_gem_vm_create() - Create and initialize a &msm_gem_vm * @drm: the drm device @@ -195,6 +199,21 @@ msm_gem_vm_create(struct drm_device *drm, struct msm_m= mu *mmu, const char *name, goto err_free_vm; } =20 + if (!managed) { + struct drm_sched_init_args args =3D { + .ops =3D &msm_vm_bind_ops, + .num_rqs =3D 1, + .credit_limit =3D 1, + .timeout =3D MAX_SCHEDULE_TIMEOUT, + .name =3D "msm-vm-bind", + .dev =3D drm->dev, + }; + + ret =3D drm_sched_init(&vm->sched, &args); + if (ret) + goto err_free_dummy; + } + drm_gpuvm_init(&vm->base, name, flags, drm, dummy_gem, va_start, va_size, 0, 0, &msm_gpuvm_ops); drm_gem_object_put(dummy_gem); @@ -206,8 +225,60 @@ msm_gem_vm_create(struct drm_device *drm, struct msm_m= mu *mmu, const char *name, =20 return &vm->base; =20 +err_free_dummy: + drm_gem_object_put(dummy_gem); + err_free_vm: kfree(vm); return ERR_PTR(ret); =20 } + +/** + * msm_gem_vm_close() - Close a VM + * @gpuvm: The VM to close + * + * Called when the drm device file is closed, to tear down VM related reso= urces + * (which will drop refcounts to GEM objects that were still mapped into t= he + * VM at the time). + */ +void +msm_gem_vm_close(struct drm_gpuvm *gpuvm) +{ + struct msm_gem_vm *vm =3D to_msm_vm(gpuvm); + struct drm_gpuva *vma, *tmp; + + /* + * For kernel managed VMs, the VMAs are torn down when the handle is + * closed, so nothing more to do. + */ + if (vm->managed) + return; + + if (vm->last_fence) + dma_fence_wait(vm->last_fence, false); + + /* Kill the scheduler now, so we aren't racing with it for cleanup: */ + drm_sched_stop(&vm->sched, NULL); + drm_sched_fini(&vm->sched); + + /* Tear down any remaining mappings: */ + dma_resv_lock(drm_gpuvm_resv(gpuvm), NULL); + drm_gpuvm_for_each_va_safe (vma, tmp, gpuvm) { + struct drm_gem_object *obj =3D vma->gem.obj; + + if (obj && obj->resv !=3D drm_gpuvm_resv(gpuvm)) { + drm_gem_object_get(obj); + msm_gem_lock(obj); + } + + msm_gem_vma_unmap(vma); + msm_gem_vma_close(vma); + + if (obj && obj->resv !=3D drm_gpuvm_resv(gpuvm)) { + msm_gem_unlock(obj); + drm_gem_object_put(obj); + } + } + dma_resv_unlock(drm_gpuvm_resv(gpuvm)); +} diff --git a/drivers/gpu/drm/msm/msm_gpu.h b/drivers/gpu/drm/msm/msm_gpu.h index b38a33a67ee9..5705e8d4e6b9 100644 --- a/drivers/gpu/drm/msm/msm_gpu.h +++ b/drivers/gpu/drm/msm/msm_gpu.h @@ -564,6 +564,9 @@ struct msm_gpu_submitqueue { struct mutex lock; struct kref ref; struct drm_sched_entity *entity; + + /** @_vm_bind_entity: used for @entity pointer for VM_BIND queues */ + struct drm_sched_entity _vm_bind_entity[0]; }; =20 struct msm_gpu_state_bo { diff --git a/drivers/gpu/drm/msm/msm_submitqueue.c b/drivers/gpu/drm/msm/ms= m_submitqueue.c index 8ced49c7557b..8617a82cd6b3 100644 --- a/drivers/gpu/drm/msm/msm_submitqueue.c +++ b/drivers/gpu/drm/msm/msm_submitqueue.c @@ -72,6 +72,9 @@ void msm_submitqueue_destroy(struct kref *kref) =20 idr_destroy(&queue->fence_idr); =20 + if (queue->entity =3D=3D &queue->_vm_bind_entity[0]) + drm_sched_entity_destroy(queue->entity); + msm_context_put(queue->ctx); =20 kfree(queue); @@ -102,7 +105,7 @@ struct msm_gpu_submitqueue *msm_submitqueue_get(struct = msm_context *ctx, =20 void msm_submitqueue_close(struct msm_context *ctx) { - struct msm_gpu_submitqueue *entry, *tmp; + struct msm_gpu_submitqueue *queue, *tmp; =20 if (!ctx) return; @@ -111,10 +114,17 @@ void msm_submitqueue_close(struct msm_context *ctx) * No lock needed in close and there won't * be any more user ioctls coming our way */ - list_for_each_entry_safe(entry, tmp, &ctx->submitqueues, node) { - list_del(&entry->node); - msm_submitqueue_put(entry); + list_for_each_entry_safe(queue, tmp, &ctx->submitqueues, node) { + if (queue->entity =3D=3D &queue->_vm_bind_entity[0]) + drm_sched_entity_flush(queue->entity, MAX_WAIT_SCHED_ENTITY_Q_EMPTY); + list_del(&queue->node); + msm_submitqueue_put(queue); } + + if (!ctx->vm) + return; + + msm_gem_vm_close(ctx->vm); } =20 static struct drm_sched_entity * @@ -160,8 +170,6 @@ int msm_submitqueue_create(struct drm_device *drm, stru= ct msm_context *ctx, struct msm_drm_private *priv =3D drm->dev_private; struct msm_gpu_submitqueue *queue; enum drm_sched_priority sched_prio; - extern int enable_preemption; - bool preemption_supported; unsigned ring_nr; int ret; =20 @@ -171,26 +179,53 @@ int msm_submitqueue_create(struct drm_device *drm, st= ruct msm_context *ctx, if (!priv->gpu) return -ENODEV; =20 - preemption_supported =3D priv->gpu->nr_rings =3D=3D 1 && enable_preemptio= n !=3D 0; + if (flags & MSM_SUBMITQUEUE_VM_BIND) { + unsigned sz; =20 - if (flags & MSM_SUBMITQUEUE_ALLOW_PREEMPT && preemption_supported) - return -EINVAL; + /* Not allowed for kernel managed VMs (ie. kernel allocs VA) */ + if (!msm_context_is_vmbind(ctx)) + return -EINVAL; =20 - ret =3D msm_gpu_convert_priority(priv->gpu, prio, &ring_nr, &sched_prio); - if (ret) - return ret; + if (prio) + return -EINVAL; + + sz =3D struct_size(queue, _vm_bind_entity, 1); + queue =3D kzalloc(sz, GFP_KERNEL); + } else { + extern int enable_preemption; + bool preemption_supported =3D + priv->gpu->nr_rings =3D=3D 1 && enable_preemption !=3D 0; + + if (flags & MSM_SUBMITQUEUE_ALLOW_PREEMPT && preemption_supported) + return -EINVAL; =20 - queue =3D kzalloc(sizeof(*queue), GFP_KERNEL); + ret =3D msm_gpu_convert_priority(priv->gpu, prio, &ring_nr, &sched_prio); + if (ret) + return ret; + + queue =3D kzalloc(sizeof(*queue), GFP_KERNEL); + } =20 if (!queue) return -ENOMEM; =20 kref_init(&queue->ref); queue->flags =3D flags; - queue->ring_nr =3D ring_nr; =20 - queue->entity =3D get_sched_entity(ctx, priv->gpu->rb[ring_nr], - ring_nr, sched_prio); + if (flags & MSM_SUBMITQUEUE_VM_BIND) { + struct drm_gpu_scheduler *sched =3D &to_msm_vm(msm_context_vm(drm, ctx))= ->sched; + + queue->entity =3D &queue->_vm_bind_entity[0]; + + drm_sched_entity_init(queue->entity, DRM_SCHED_PRIORITY_KERNEL, + &sched, 1, NULL); + } else { + queue->ring_nr =3D ring_nr; + + queue->entity =3D get_sched_entity(ctx, priv->gpu->rb[ring_nr], + ring_nr, sched_prio); + } + if (IS_ERR(queue->entity)) { ret =3D PTR_ERR(queue->entity); kfree(queue); diff --git a/include/uapi/drm/msm_drm.h b/include/uapi/drm/msm_drm.h index 2c2fc4b284d0..6d6cd1219926 100644 --- a/include/uapi/drm/msm_drm.h +++ b/include/uapi/drm/msm_drm.h @@ -385,12 +385,19 @@ struct drm_msm_gem_madvise { /* * Draw queues allow the user to set specific submission parameter. Command * submissions specify a specific submitqueue to use. ID 0 is reserved for - * backwards compatibility as a "default" submitqueue + * backwards compatibility as a "default" submitqueue. + * + * Because VM_BIND async updates happen on the CPU, they must run on a + * virtual queue created with the flag MSM_SUBMITQUEUE_VM_BIND. If we had + * a way to do pgtable updates on the GPU, we could drop this restriction. */ =20 #define MSM_SUBMITQUEUE_ALLOW_PREEMPT 0x00000001 +#define MSM_SUBMITQUEUE_VM_BIND 0x00000002 /* virtual queue for VM_BIND o= ps */ + #define MSM_SUBMITQUEUE_FLAGS ( \ MSM_SUBMITQUEUE_ALLOW_PREEMPT | \ + MSM_SUBMITQUEUE_VM_BIND | \ 0) =20 /* --=20 2.50.0 From nobody Wed Oct 8 10:58:51 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 E4DBD229B23 for ; Sun, 29 Jun 2025 14:08:09 +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=1751206091; cv=none; b=n6wXSHjSZkw493W+7rucVM80SrCqX3DrdysJOTIZec2XttHVA9DbNBKKMBu3MhVw1nWEpvL0ZQoXhGaVXR8kkSiLbiBPBFLXtNDX0sdYtd4syg+sSXifyoWcsdPFvPyI6vH6Cug+hde+Vvmw4lUXw3XM3JSGMaT9f+vD3Qhx97o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751206091; c=relaxed/simple; bh=Ci4tiURPEN3fgQgUAfKfwBL/Zz+rrpzlouAnx0HAJyE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LPTNP24g/prJ9EUXG0iVTWXD7wzI4YQm9lndJI1ThyEwaVo2VWLYvwjzHaBossh6hey2ugXnwiU59B6smG4YZ4sUvHtWQwd8aXJ3XMK/jodZB9zKtISbtLIO/niC70MnlNau1w0hbNHBKzrp3sD+rFI53fAe0hvJsjh2gZtOqfk= 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=VZSmCBvG; 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="VZSmCBvG" 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 55TDM1fV015173 for ; Sun, 29 Jun 2025 14:08:09 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=+3e0ksDzZ42 mLlKJB4uSylL2Fh/ag708LB47aoZZ0mw=; b=VZSmCBvGgZjdmydzwZ5DBStUTGQ UV9Wqke/L28Nva2w5HQeQ3RLj3WtxSH4mPGU6WroNOAwfG1uLj55alMN/mx4iMXm qvFYN3RLYlRlCfYnGVxxWXrd9fGaBDkp7v7Kh1Xyd9PlSN5RAOdM3iU1dgHCD0X+ Pnk6U09kU0/VB8JRQe/Qq/dQzBBOLTzipDnqWv1jTD0Cn4wExz7pe+R8To0OI9xr QMOw51Uw38FgQOHZa4i5qICMDKEdiKn+uDSImuwBabTtDDG9y4R9EVAd0j/d0Oa9 mS5xLpkclwaY0KidVBIhUAd08jjCo6kueta+FSzce9iPHLitVfP5tXdON3A== Received: from mail-pg1-f199.google.com (mail-pg1-f199.google.com [209.85.215.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 47j7qm2854-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Sun, 29 Jun 2025 14:08:08 +0000 (GMT) Received: by mail-pg1-f199.google.com with SMTP id 41be03b00d2f7-b321087b1cdso2072453a12.2 for ; Sun, 29 Jun 2025 07:08:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751206088; x=1751810888; 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=+3e0ksDzZ42mLlKJB4uSylL2Fh/ag708LB47aoZZ0mw=; b=ZHRJVRkyKV5fs5R3r40Z2yfBdJy/TOCTxOncDds1YYrm5SCrWvVtOfmau26jLfLTF5 cr9GuTMo7jsmc7DDOV0Zz/0xFMo4m6gkwa/jC7Dn3ndoKv1ExvJIYD2b7pexoQT7C8a3 oZYw33A2ZplzbvVLvmML0puq9i1pYp5eWOO1798xjT51Oeb+b//CE/ZsUB5iga72pGOQ msSJN2cDjJM1H32y/WiYzpgCt2RzUJPgSRK06vIlfuaXmN3kmc8OF2eryo3GqERM+dcz pHluTCWIolio+lLeV7seTsku7u+74HSpS2Zquv3mf+M1l3hkw5mr+bZtNR0CMvPQ1jpg FdhA== X-Forwarded-Encrypted: i=1; AJvYcCU03aA4S16uPEuXqrS/Taw8s8YgLMKx0VoUa3BRHa1i2hqYuqD0DFyFbEJcDJgXhoXg1icAGv3Np3c8FEI=@vger.kernel.org X-Gm-Message-State: AOJu0YyBEixP+nnYhnh/RGG1fiCJ9XEkbJPRHKNGV/1a4miq3HvtcT03 qSpqcu0JU+2gzvaTMVDR1ybIembnF5G215a4s7BlDA/p96QEWeiDdYtS3qe9qD/reP7QcnkDZTo QkVOV3FE7rECeAQLjQl9YPY7cCxKatYs8s95aYKKUbOyrWcSzUwK/C+Qf6QgnwgHUr9o= X-Gm-Gg: ASbGncvdQFcIeVK/q6gJIacIESZD4psyG9QYpZfdgo3rVonY7h9FFuL6xOGOVHrbJ3l XZ77jCLHjMGTka5h9XQCTVOX064yf/qxnBa8pXzSP8Fh3ZmpGMo9iybomJRLI8i2WNQieiM0P0G Gav0q1i1OXexX3I1beY98wLaM4DqDBiY8UZkwDFkHW8iy4Mk998W82RtOOyRTiaK5FRicCHAnsL Fl13fRMbDMJ8JAdeoZtUjI/u2zaAg7gqkoyMStAAxf0Z8oypoDcpfYALT7I1OpKrCyf021VEJFW dMHNrpQdQeUrTpjGhkcPNWV1XX2MJsji X-Received: by 2002:a17:90b:4a8e:b0:311:e5b2:356b with SMTP id 98e67ed59e1d1-318c8eed32amr14074249a91.11.1751206087602; Sun, 29 Jun 2025 07:08:07 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGYkvmCpaWJmCDoX/uhVGt0Pk6ICFtUgsS6BHNOC2nwdb/Xmkyt9dsqSqbLYw4AbYMUQq+a2w== X-Received: by 2002:a17:90b:4a8e:b0:311:e5b2:356b with SMTP id 98e67ed59e1d1-318c8eed32amr14074204a91.11.1751206087057; Sun, 29 Jun 2025 07:08:07 -0700 (PDT) Received: from localhost ([2601:1c0:5000:d5c:5b3e:de60:4fda:e7b1]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-23acb39bc7dsm59102335ad.114.2025.06.29.07.08.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Jun 2025 07:08:06 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, Connor Abbott , Antonino Maniscalco , Danilo Krummrich , Rob Clark , Rob Clark , Sean Paul , Konrad Dybcio , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Marijn Suijten , David Airlie , Simona Vetter , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v8 32/42] drm/msm: Support IO_PGTABLE_QUIRK_NO_WARN_ON Date: Sun, 29 Jun 2025 07:03:35 -0700 Message-ID: <20250629140537.30850-33-robin.clark@oss.qualcomm.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250629140537.30850-1-robin.clark@oss.qualcomm.com> References: <20250629140537.30850-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-Authority-Analysis: v=2.4 cv=C4TpyRP+ c=1 sm=1 tr=0 ts=686148c8 cx=c_pps a=Oh5Dbbf/trHjhBongsHeRQ==:117 a=xqWC_Br6kY4A:10 a=6IFa9wvqVegA:10 a=cm27Pg_UAAAA:8 a=EUspDBNiAAAA:8 a=pGLkceISAAAA:8 a=MLfKQGWeMraaM-6YArcA:9 a=_Vgx9l1VpLgwpw_dHYaR:22 X-Proofpoint-ORIG-GUID: Aevpeugd0LROh2KcPwEhoEoeXooqldC8 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjI5MDExOSBTYWx0ZWRfX2mkWYeQDt/Gr PjcdkGaCNifyPKldSmtCHsQG6l5ZJ49DO0w5/JWADwY2JqAJyvdX+C+rurCwMLx68iJ40oApBkR WNpDOxwRGzlXhYC9oQQoUmfQ7e596TeI7sWEtvaMEd0kIV7b/z0fy3Tm1oAo73BjuJetHG8fPAP 6nWPJiNr0Qkq6a8DkIpGrV4X7Tf2Fkj5OodDa6OrBDcOHHQF0VDr+fQrbtuj4UzGZeUZS0MKXT5 1R23xYDxiRAUVre0/agTgdNu6bMrMG1+1olvZ1HoFlRqxnuCLkh06IIrE0N0WaI816vm+dDPdi1 R0QYH6mPRO1MYQW4mgSfp31DPy5StvvhtamVv+eZRr+U7+xkOkKR/5oaMB4ZsQqS0zaPg42DB1L GHbmSA5ro00zFc5Z8yQvOTZq6BnfbOCRFoGRnro6qqjKJHeKU7oSObdvcvG4beXedWejAiAm X-Proofpoint-GUID: Aevpeugd0LROh2KcPwEhoEoeXooqldC8 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-27_05,2025-06-27_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 phishscore=0 suspectscore=0 bulkscore=0 lowpriorityscore=0 clxscore=1015 priorityscore=1501 spamscore=0 mlxscore=0 mlxlogscore=981 adultscore=0 malwarescore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2506290119 Content-Type: text/plain; charset="utf-8" From: Rob Clark With user managed VMs and multiple queues, it is in theory possible to trigger map/unmap errors. These will (in a later patch) mark the VM as unusable. But we want to tell the io-pgtable helpers not to spam the log. In addition, in the unmap path, we don't want to bail early from the unmap, to ensure we don't leave some dangling pages mapped. Signed-off-by: Rob Clark Signed-off-by: Rob Clark Tested-by: Antonino Maniscalco Reviewed-by: Antonino Maniscalco --- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 2 +- drivers/gpu/drm/msm/msm_iommu.c | 23 ++++++++++++++++++----- drivers/gpu/drm/msm/msm_mmu.h | 2 +- 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c b/drivers/gpu/drm/msm/ad= reno/a6xx_gpu.c index 62b5f294a2aa..5e115abe7692 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c @@ -2280,7 +2280,7 @@ a6xx_create_private_vm(struct msm_gpu *gpu, bool kern= el_managed) { struct msm_mmu *mmu; =20 - mmu =3D msm_iommu_pagetable_create(to_msm_vm(gpu->vm)->mmu); + mmu =3D msm_iommu_pagetable_create(to_msm_vm(gpu->vm)->mmu, kernel_manage= d); =20 if (IS_ERR(mmu)) return ERR_CAST(mmu); diff --git a/drivers/gpu/drm/msm/msm_iommu.c b/drivers/gpu/drm/msm/msm_iomm= u.c index a0c74ecdb11b..bd67431cb25f 100644 --- a/drivers/gpu/drm/msm/msm_iommu.c +++ b/drivers/gpu/drm/msm/msm_iommu.c @@ -94,15 +94,24 @@ static int msm_iommu_pagetable_unmap(struct msm_mmu *mm= u, u64 iova, { struct msm_iommu_pagetable *pagetable =3D to_pagetable(mmu); struct io_pgtable_ops *ops =3D pagetable->pgtbl_ops; + int ret =3D 0; =20 while (size) { - size_t unmapped, pgsize, count; + size_t pgsize, count; + ssize_t unmapped; =20 pgsize =3D calc_pgsize(pagetable, iova, iova, size, &count); =20 unmapped =3D ops->unmap_pages(ops, iova, pgsize, count, NULL); - if (!unmapped) - break; + if (unmapped <=3D 0) { + ret =3D -EINVAL; + /* + * Continue attempting to unamp the remained of the + * range, so we don't end up with some dangling + * mapped pages + */ + unmapped =3D PAGE_SIZE; + } =20 iova +=3D unmapped; size -=3D unmapped; @@ -110,7 +119,7 @@ static int msm_iommu_pagetable_unmap(struct msm_mmu *mm= u, u64 iova, =20 iommu_flush_iotlb_all(to_msm_iommu(pagetable->parent)->domain); =20 - return (size =3D=3D 0) ? 0 : -EINVAL; + return ret; } =20 static int msm_iommu_pagetable_map_prr(struct msm_mmu *mmu, u64 iova, size= _t len, int prot) @@ -324,7 +333,7 @@ static const struct iommu_flush_ops tlb_ops =3D { static int msm_gpu_fault_handler(struct iommu_domain *domain, struct devic= e *dev, unsigned long iova, int flags, void *arg); =20 -struct msm_mmu *msm_iommu_pagetable_create(struct msm_mmu *parent) +struct msm_mmu *msm_iommu_pagetable_create(struct msm_mmu *parent, bool ke= rnel_managed) { struct adreno_smmu_priv *adreno_smmu =3D dev_get_drvdata(parent->dev); struct msm_iommu *iommu =3D to_msm_iommu(parent); @@ -358,6 +367,10 @@ struct msm_mmu *msm_iommu_pagetable_create(struct msm_= mmu *parent) ttbr0_cfg.quirks &=3D ~IO_PGTABLE_QUIRK_ARM_TTBR1; ttbr0_cfg.tlb =3D &tlb_ops; =20 + if (!kernel_managed) { + ttbr0_cfg.quirks |=3D IO_PGTABLE_QUIRK_NO_WARN; + } + pagetable->pgtbl_ops =3D alloc_io_pgtable_ops(ARM_64_LPAE_S1, &ttbr0_cfg, pagetable); =20 diff --git a/drivers/gpu/drm/msm/msm_mmu.h b/drivers/gpu/drm/msm/msm_mmu.h index 9d61999f4d42..04dce0faaa3a 100644 --- a/drivers/gpu/drm/msm/msm_mmu.h +++ b/drivers/gpu/drm/msm/msm_mmu.h @@ -51,7 +51,7 @@ static inline void msm_mmu_set_fault_handler(struct msm_m= mu *mmu, void *arg, mmu->handler =3D handler; } =20 -struct msm_mmu *msm_iommu_pagetable_create(struct msm_mmu *parent); +struct msm_mmu *msm_iommu_pagetable_create(struct msm_mmu *parent, bool ke= rnel_managed); =20 int msm_iommu_pagetable_params(struct msm_mmu *mmu, phys_addr_t *ttbr, int *asid); --=20 2.50.0 From nobody Wed Oct 8 10:58:51 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 7E74224467D for ; Sun, 29 Jun 2025 14:08:11 +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=1751206093; cv=none; b=AcsJ00WkhTdLoeIhBJPBjA7xli0dzs8co2kANP9kE6oWuRMcDlf4bG3w/XJ2O//AZU7Vypz9UK23+kZbmVKesj8BEagLg9noQUbg0RoLrl47ent8T9IRgL/7IH7jiuoI/cWlcXr4dZxmiJV3B5fB98jCP6BQBrtXvaVAh2gBhjk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751206093; c=relaxed/simple; bh=JsILLt2+b+xZrxxAbVvwrl1hB4+WAdrIOnzh9EnzXdU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KseKnHe1QJBqyFL7XYir0BWrnxedjTxmqDXeVV7WVCEPSUhEr2fodt0/DGRixkJmbinddcUKWgSAVpj/nV1GUm9sBYKzu8heF1e92uqA6XMFh++cm4Fzy4fpPeov55yxUqMAZn+G3j916zysxRJP1wSXxY7/mjvKYk83GT2i5cQ= 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=fiI+gJT2; 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="fiI+gJT2" Received: from pps.filterd (m0279869.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 55TADXsQ028542 for ; Sun, 29 Jun 2025 14:08:10 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=iVk8CflO5KH TgfTqgOrc0graSmlaqzNMFTNHNE1Irm0=; b=fiI+gJT29jd5drbJ4nOPSM6hCPW DJpwqCUOXjIhbElg8gjmDz+c0bxMGhKwd8fwK4o/LwnURG4ZloHqioMH3bfxM1Ie unzPEa5pIadQDdTpx0lUJ0Ey0ems8wd9APThFn5RniqZNBRj/L8jQs+OFlff9M2r QTN9GxmZaQpbWRl0s13OZPHA/G+rgsQjLxDFWZU8TnbjcVzXmTEw28U0a0hKUo7+ ODl3LPEfUBsQM4euqZQQpVZbBoBly6uzh8DN2SC9lm1uW7wODgu/56qqfPsymCIL XPnDF5x9mqEUXBveEcZpcwMK29AQt7ZsGbLIbHdy3/Fk2RCgDX5fozuhnCA== Received: from mail-pf1-f199.google.com (mail-pf1-f199.google.com [209.85.210.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 47j7d9t9et-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Sun, 29 Jun 2025 14:08:10 +0000 (GMT) Received: by mail-pf1-f199.google.com with SMTP id d2e1a72fcca58-7492da755a1so976557b3a.1 for ; Sun, 29 Jun 2025 07:08:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751206089; x=1751810889; 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=iVk8CflO5KHTgfTqgOrc0graSmlaqzNMFTNHNE1Irm0=; b=MSKB/SwZEKjemO/Y1506kr92dUGtE6Ov/+YpFTYvw71y4uoR135jojbJ42diP4sPID KWXMQAeDLHIY4VcApMq/pzrvjXICxLBxMkUXf3kYxusyzq/l1AKYbdEZx16Iy4u+NfGn 6a/pcReGK90K+6VC0KTmKATp2ZCSTpJ2zQexI5IYVRRW+Cuuskuk0zst/ur4lx43opak HB2ENzVUq3isyXgfvVGquXC9e3gu75n13ru9MGb8skDrILRNqvnOjdZByOIOxOx+X1wi slJO9hQbKSWdqVRpeztE5MAksGrwdphJt+gjuWkrHpzjtTiw+vwfRiBS6KoO/WjHD6qa YMpg== X-Forwarded-Encrypted: i=1; AJvYcCXqOwuU0kr0STtrJMe7xXWfz5V0ZIsr1hIK0R5vqGtNYTpprvwIz8Rt0h2pqut2dPwIU4e0zFTntofGpcs=@vger.kernel.org X-Gm-Message-State: AOJu0YxACuoncpJO80etKASCiRHsIeSZBwbDh0ueNvfYZ5QEmcEkz+ii f9d9ecg7vOe6MerZR0Z019KUjVWY5Ldpn2vZk1vF4wR9GO4RK5mBFTrb6YYHutzhhBcu23i7Ptl 2lkP8ztipvpi7O9gUVjED1QLru3DG58wlKLcuBM6QonTypEtEHGhcNJhSvJkNPSEDXmY= X-Gm-Gg: ASbGncuU26DTFBTC3I3E/XlzdD0G+e5Cwb5DMe9AGYB3TVmMe/wRBFGGXs8I3on81Df i5XWz/nxKCNDiizxk62gh7GAvQSWjoTI4+/umlAylfBMbbVxJqRw1u2UJ/W+mioD1pSTV23qYM5 I3wLkLFI9FA12IJTtT52iBsk+/R9u57Yn8F86dA0fcg3wM+JTzqS0BzfkiTQRvXvwpmMkWQLksc HWregKzLkbdca04G11mxiI3fkP2CWHmDwMxSiCKtyUlYbzYxhrtBVi7XPSDpnwSpbiBe9vP5Yrh UeYs3Sbx68nsH/Wih+EgDQTncji/T6uB X-Received: by 2002:a05:6a00:3d0c:b0:740:a023:5d60 with SMTP id d2e1a72fcca58-74af70169c1mr13465930b3a.19.1751206088929; Sun, 29 Jun 2025 07:08:08 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFbWJbIQvDHD8EycgQb7AXqLyixheO7u4K5OIPfMTfi/5S9NCTN+H8I/tsChT7qBZnIDgfDhg== X-Received: by 2002:a05:6a00:3d0c:b0:740:a023:5d60 with SMTP id d2e1a72fcca58-74af70169c1mr13465890b3a.19.1751206088402; Sun, 29 Jun 2025 07:08:08 -0700 (PDT) Received: from localhost ([2601:1c0:5000:d5c:5b3e:de60:4fda:e7b1]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-74af56cffd8sm7212728b3a.137.2025.06.29.07.08.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Jun 2025 07:08:07 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, Connor Abbott , Antonino Maniscalco , Danilo Krummrich , Rob Clark , Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v8 33/42] drm/msm: Support pgtable preallocation Date: Sun, 29 Jun 2025 07:03:36 -0700 Message-ID: <20250629140537.30850-34-robin.clark@oss.qualcomm.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250629140537.30850-1-robin.clark@oss.qualcomm.com> References: <20250629140537.30850-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: AW1haW4tMjUwNjI5MDExOSBTYWx0ZWRfX4DBgoZzztDjy yncJOTcSBmCZ+ohMV5AZ/eA1AnlcaBBxhhEfCi3gANjxglHSrXHIgZvXtdBImGdoP3KZXdJVxCl 2hNMZ7QZ2qW0j1ojVdVdrgHYT1Bb+YK8FIuz1vwKSeInm0r7lbgCgLCG4G8+chq7bbn7l/oGvvm qWe1obQ2r6SJbVTyb7bCoo+/u3rL/bPEoLpx7wdtqdHrep+duHDLe71S3cSiXc45NoLNfpHanug AW2RH/b/kubleXcEGXS/+SU84pK7/GKutViVMEqxpmUd+5XD+yNn2pW2fM4JFSFfKS7ewoA6t0M MjPhLWRMoKnYUnspsHB9lpZRUgkvjYavVk+PvdHvHDNXlffprE2SeUlgsBVyXuthTCr+2VfuCYV JzISY/HejLJtsoQS5cLbhtGKNxe8gxxJLeBLU2DSN+Y+yfIcusT5mpR/dT8Nf2XD6L+1c45D X-Proofpoint-GUID: DBv_yZxKSG6nvFG6T79gQC8emLhSrHFm X-Authority-Analysis: v=2.4 cv=RrbFLDmK c=1 sm=1 tr=0 ts=686148ca cx=c_pps a=WW5sKcV1LcKqjgzy2JUPuA==:117 a=xqWC_Br6kY4A:10 a=6IFa9wvqVegA:10 a=7CQSdrXTAAAA:8 a=cm27Pg_UAAAA:8 a=EUspDBNiAAAA:8 a=pGLkceISAAAA:8 a=FDPAursefL7ktZtO0vwA:9 a=OpyuDcXvxspvyRM73sMx:22 a=a-qgeE7W1pNrGK8U0ZQC:22 X-Proofpoint-ORIG-GUID: DBv_yZxKSG6nvFG6T79gQC8emLhSrHFm 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-27_05,2025-06-27_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 mlxlogscore=999 adultscore=0 clxscore=1015 suspectscore=0 phishscore=0 bulkscore=0 malwarescore=0 spamscore=0 mlxscore=0 priorityscore=1501 lowpriorityscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2506290119 Content-Type: text/plain; charset="utf-8" From: Rob Clark Introduce a mechanism to count the worst case # of pages required in a VM_BIND op. Note that previously we would have had to somehow account for allocations in unmap, when splitting a block. This behavior was removed in commit 33729a5fc0ca ("iommu/io-pgtable-arm: Remove split on unmap behavior)" Signed-off-by: Rob Clark Signed-off-by: Rob Clark Tested-by: Antonino Maniscalco Reviewed-by: Antonino Maniscalco --- drivers/gpu/drm/msm/msm_gem.h | 1 + drivers/gpu/drm/msm/msm_iommu.c | 191 +++++++++++++++++++++++++++++++- drivers/gpu/drm/msm/msm_mmu.h | 34 ++++++ 3 files changed, 225 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/msm/msm_gem.h b/drivers/gpu/drm/msm/msm_gem.h index af637409be39..f369a30a247c 100644 --- a/drivers/gpu/drm/msm/msm_gem.h +++ b/drivers/gpu/drm/msm/msm_gem.h @@ -7,6 +7,7 @@ #ifndef __MSM_GEM_H__ #define __MSM_GEM_H__ =20 +#include "msm_mmu.h" #include #include #include "drm/drm_exec.h" diff --git a/drivers/gpu/drm/msm/msm_iommu.c b/drivers/gpu/drm/msm/msm_iomm= u.c index bd67431cb25f..887c9023f8a2 100644 --- a/drivers/gpu/drm/msm/msm_iommu.c +++ b/drivers/gpu/drm/msm/msm_iommu.c @@ -6,6 +6,7 @@ =20 #include #include +#include #include "msm_drv.h" #include "msm_mmu.h" =20 @@ -14,6 +15,8 @@ struct msm_iommu { struct iommu_domain *domain; atomic_t pagetables; struct page *prr_page; + + struct kmem_cache *pt_cache; }; =20 #define to_msm_iommu(x) container_of(x, struct msm_iommu, base) @@ -27,6 +30,9 @@ struct msm_iommu_pagetable { unsigned long pgsize_bitmap; /* Bitmap of page sizes in use */ phys_addr_t ttbr; u32 asid; + + /** @root_page_table: Stores the root page table pointer. */ + void *root_page_table; }; static struct msm_iommu_pagetable *to_pagetable(struct msm_mmu *mmu) { @@ -282,7 +288,145 @@ msm_iommu_pagetable_walk(struct msm_mmu *mmu, unsigne= d long iova, uint64_t ptes[ return 0; } =20 +static void +msm_iommu_pagetable_prealloc_count(struct msm_mmu *mmu, struct msm_mmu_pre= alloc *p, + uint64_t iova, size_t len) +{ + u64 pt_count; + + /* + * L1, L2 and L3 page tables. + * + * We could optimize L3 allocation by iterating over the sgt and merging + * 2M contiguous blocks, but it's simpler to over-provision and return + * the pages if they're not used. + * + * The first level descriptor (v8 / v7-lpae page table format) encodes + * 30 bits of address. The second level encodes 29. For the 3rd it is + * 39. + * + * https://developer.arm.com/documentation/ddi0406/c/System-Level-Archite= cture/Virtual-Memory-System-Architecture--VMSA-/Long-descriptor-translation= -table-format/Long-descriptor-translation-table-format-descriptors?lang=3De= n#BEIHEFFB + */ + pt_count =3D ((ALIGN(iova + len, 1ull << 39) - ALIGN_DOWN(iova, 1ull << 3= 9)) >> 39) + + ((ALIGN(iova + len, 1ull << 30) - ALIGN_DOWN(iova, 1ull << 30)) >> 30= ) + + ((ALIGN(iova + len, 1ull << 21) - ALIGN_DOWN(iova, 1ull << 21)) >> 21= ); + + p->count +=3D pt_count; +} + +static struct kmem_cache * +get_pt_cache(struct msm_mmu *mmu) +{ + struct msm_iommu_pagetable *pagetable =3D to_pagetable(mmu); + return to_msm_iommu(pagetable->parent)->pt_cache; +} + +static int +msm_iommu_pagetable_prealloc_allocate(struct msm_mmu *mmu, struct msm_mmu_= prealloc *p) +{ + struct kmem_cache *pt_cache =3D get_pt_cache(mmu); + int ret; + + p->pages =3D kvmalloc_array(p->count, sizeof(p->pages), GFP_KERNEL); + if (!p->pages) + return -ENOMEM; + + ret =3D kmem_cache_alloc_bulk(pt_cache, GFP_KERNEL, p->count, p->pages); + if (ret !=3D p->count) { + p->count =3D ret; + return -ENOMEM; + } + + return 0; +} + +static void +msm_iommu_pagetable_prealloc_cleanup(struct msm_mmu *mmu, struct msm_mmu_p= realloc *p) +{ + struct kmem_cache *pt_cache =3D get_pt_cache(mmu); + uint32_t remaining_pt_count =3D p->count - p->ptr; + + kmem_cache_free_bulk(pt_cache, remaining_pt_count, &p->pages[p->ptr]); + kvfree(p->pages); +} + +/** + * alloc_pt() - Custom page table allocator + * @cookie: Cookie passed at page table allocation time. + * @size: Size of the page table. This size should be fixed, + * and determined at creation time based on the granule size. + * @gfp: GFP flags. + * + * We want a custom allocator so we can use a cache for page table + * allocations and amortize the cost of the over-reservation that's + * done to allow asynchronous VM operations. + * + * Return: non-NULL on success, NULL if the allocation failed for any + * reason. + */ +static void * +msm_iommu_pagetable_alloc_pt(void *cookie, size_t size, gfp_t gfp) +{ + struct msm_iommu_pagetable *pagetable =3D cookie; + struct msm_mmu_prealloc *p =3D pagetable->base.prealloc; + void *page; + + /* Allocation of the root page table happening during init. */ + if (unlikely(!pagetable->root_page_table)) { + struct page *p; + + p =3D alloc_pages_node(dev_to_node(pagetable->iommu_dev), + gfp | __GFP_ZERO, get_order(size)); + page =3D p ? page_address(p) : NULL; + pagetable->root_page_table =3D page; + return page; + } + + if (WARN_ON(!p) || WARN_ON(p->ptr >=3D p->count)) + return NULL; + + page =3D p->pages[p->ptr++]; + memset(page, 0, size); + + /* + * Page table entries don't use virtual addresses, which trips out + * kmemleak. kmemleak_alloc_phys() might work, but physical addresses + * are mixed with other fields, and I fear kmemleak won't detect that + * either. + * + * Let's just ignore memory passed to the page-table driver for now. + */ + kmemleak_ignore(page); + + return page; +} + + +/** + * free_pt() - Custom page table free function + * @cookie: Cookie passed at page table allocation time. + * @data: Page table to free. + * @size: Size of the page table. This size should be fixed, + * and determined at creation time based on the granule size. + */ +static void +msm_iommu_pagetable_free_pt(void *cookie, void *data, size_t size) +{ + struct msm_iommu_pagetable *pagetable =3D cookie; + + if (unlikely(pagetable->root_page_table =3D=3D data)) { + free_pages((unsigned long)data, get_order(size)); + pagetable->root_page_table =3D NULL; + return; + } + + kmem_cache_free(get_pt_cache(&pagetable->base), data); +} + static const struct msm_mmu_funcs pagetable_funcs =3D { + .prealloc_count =3D msm_iommu_pagetable_prealloc_count, + .prealloc_allocate =3D msm_iommu_pagetable_prealloc_allocate, + .prealloc_cleanup =3D msm_iommu_pagetable_prealloc_cleanup, .map =3D msm_iommu_pagetable_map, .unmap =3D msm_iommu_pagetable_unmap, .destroy =3D msm_iommu_pagetable_destroy, @@ -333,6 +477,17 @@ static const struct iommu_flush_ops tlb_ops =3D { static int msm_gpu_fault_handler(struct iommu_domain *domain, struct devic= e *dev, unsigned long iova, int flags, void *arg); =20 +static size_t get_tblsz(const struct io_pgtable_cfg *cfg) +{ + int pg_shift, bits_per_level; + + pg_shift =3D __ffs(cfg->pgsize_bitmap); + /* arm_lpae_iopte is u64: */ + bits_per_level =3D pg_shift - ilog2(sizeof(u64)); + + return sizeof(u64) << bits_per_level; +} + struct msm_mmu *msm_iommu_pagetable_create(struct msm_mmu *parent, bool ke= rnel_managed) { struct adreno_smmu_priv *adreno_smmu =3D dev_get_drvdata(parent->dev); @@ -369,8 +524,34 @@ struct msm_mmu *msm_iommu_pagetable_create(struct msm_= mmu *parent, bool kernel_m =20 if (!kernel_managed) { ttbr0_cfg.quirks |=3D IO_PGTABLE_QUIRK_NO_WARN; + + /* + * With userspace managed VM (aka VM_BIND), we need to pre- + * allocate pages ahead of time for map/unmap operations, + * handing them to io-pgtable via custom alloc/free ops as + * needed: + */ + ttbr0_cfg.alloc =3D msm_iommu_pagetable_alloc_pt; + ttbr0_cfg.free =3D msm_iommu_pagetable_free_pt; + + /* + * Restrict to single page granules. Otherwise we may run + * into a situation where userspace wants to unmap/remap + * only a part of a larger block mapping, which is not + * possible without unmapping the entire block. Which in + * turn could cause faults if the GPU is accessing other + * parts of the block mapping. + * + * Note that prior to commit 33729a5fc0ca ("iommu/io-pgtable-arm: + * Remove split on unmap behavior)" this was handled in + * io-pgtable-arm. But this apparently does not work + * correctly on SMMUv3. + */ + WARN_ON(!(ttbr0_cfg.pgsize_bitmap & PAGE_SIZE)); + ttbr0_cfg.pgsize_bitmap =3D PAGE_SIZE; } =20 + pagetable->iommu_dev =3D ttbr1_cfg->iommu_dev; pagetable->pgtbl_ops =3D alloc_io_pgtable_ops(ARM_64_LPAE_S1, &ttbr0_cfg, pagetable); =20 @@ -414,7 +595,6 @@ struct msm_mmu *msm_iommu_pagetable_create(struct msm_m= mu *parent, bool kernel_m /* Needed later for TLB flush */ pagetable->parent =3D parent; pagetable->tlb =3D ttbr1_cfg->tlb; - pagetable->iommu_dev =3D ttbr1_cfg->iommu_dev; pagetable->pgsize_bitmap =3D ttbr0_cfg.pgsize_bitmap; pagetable->ttbr =3D ttbr0_cfg.arm_lpae_s1_cfg.ttbr; =20 @@ -510,6 +690,7 @@ static void msm_iommu_destroy(struct msm_mmu *mmu) { struct msm_iommu *iommu =3D to_msm_iommu(mmu); iommu_domain_free(iommu->domain); + kmem_cache_destroy(iommu->pt_cache); kfree(iommu); } =20 @@ -583,6 +764,14 @@ struct msm_mmu *msm_iommu_gpu_new(struct device *dev, = struct msm_gpu *gpu, unsig return mmu; =20 iommu =3D to_msm_iommu(mmu); + if (adreno_smmu && adreno_smmu->cookie) { + const struct io_pgtable_cfg *cfg =3D + adreno_smmu->get_ttbr1_cfg(adreno_smmu->cookie); + size_t tblsz =3D get_tblsz(cfg); + + iommu->pt_cache =3D + kmem_cache_create("msm-mmu-pt", tblsz, tblsz, 0, NULL); + } iommu_set_fault_handler(iommu->domain, msm_gpu_fault_handler, iommu); =20 /* Enable stall on iommu fault: */ diff --git a/drivers/gpu/drm/msm/msm_mmu.h b/drivers/gpu/drm/msm/msm_mmu.h index 04dce0faaa3a..8915662fbd4d 100644 --- a/drivers/gpu/drm/msm/msm_mmu.h +++ b/drivers/gpu/drm/msm/msm_mmu.h @@ -9,8 +9,16 @@ =20 #include =20 +struct msm_mmu_prealloc; +struct msm_mmu; +struct msm_gpu; + struct msm_mmu_funcs { void (*detach)(struct msm_mmu *mmu); + void (*prealloc_count)(struct msm_mmu *mmu, struct msm_mmu_prealloc *p, + uint64_t iova, size_t len); + int (*prealloc_allocate)(struct msm_mmu *mmu, struct msm_mmu_prealloc *p); + void (*prealloc_cleanup)(struct msm_mmu *mmu, struct msm_mmu_prealloc *p); int (*map)(struct msm_mmu *mmu, uint64_t iova, struct sg_table *sgt, size_t off, size_t len, int prot); int (*unmap)(struct msm_mmu *mmu, uint64_t iova, size_t len); @@ -24,12 +32,38 @@ enum msm_mmu_type { MSM_MMU_IOMMU_PAGETABLE, }; =20 +/** + * struct msm_mmu_prealloc - Tracking for pre-allocated pages for MMU upda= tes. + */ +struct msm_mmu_prealloc { + /** @count: Number of pages reserved. */ + uint32_t count; + /** @ptr: Index of first unused page in @pages */ + uint32_t ptr; + /** + * @pages: Array of pages preallocated for MMU table updates. + * + * After a VM operation, there might be free pages remaining in this + * array (since the amount allocated is a worst-case). These are + * returned to the pt_cache at mmu->prealloc_cleanup(). + */ + void **pages; +}; + struct msm_mmu { const struct msm_mmu_funcs *funcs; struct device *dev; int (*handler)(void *arg, unsigned long iova, int flags, void *data); void *arg; enum msm_mmu_type type; + + /** + * @prealloc: pre-allocated pages for pgtable + * + * Set while a VM_BIND job is running, serialized under + * msm_gem_vm::mmu_lock. + */ + struct msm_mmu_prealloc *prealloc; }; =20 static inline void msm_mmu_init(struct msm_mmu *mmu, struct device *dev, --=20 2.50.0 From nobody Wed Oct 8 10:58:51 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 78EE5244699 for ; Sun, 29 Jun 2025 14:08:12 +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=1751206094; cv=none; b=FFyFa/WWpVBR8krNEVl84QGtszutcNa593x4mYXfJXNI92Zm5t+nrb25z8jZdFL+Xq6GO66FEySw3HeutaMYb9llmxE/I1LPuHhUYpRwsZ9lQMNKw2oSzOvtT5aX3PH3B+KgxSQm7FkqMA8tNrD2QPS4SO5VkxDblbHnCVuGjgk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751206094; c=relaxed/simple; bh=MPo1IkqWJ2Qo6U6FxPeDsi41WXUD+qgCx9wi/nJZ6nA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=N6i5oszGrJPQnrZppsKDdYKg1bWOyn0+122uvbhZmet8KMBBwrQkXkY8D5o5A6KNLDt92Yxt31MP6z25Z604+XBWvxO0WAlXKtKYT6h6CcxzSt6wYlODYhUwnxmTh1FITjuzEHXs4w80AqwKMCiu2jFBf6YjmjBIw6Io2xvFc/8= 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=aGaXb+qk; 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="aGaXb+qk" Received: from pps.filterd (m0279873.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 55T4smQD005857 for ; Sun, 29 Jun 2025 14:08:11 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=A54UdMciCNB ls2/cngumRMQ7rIW/ZCmN2ztDtF1NIpw=; b=aGaXb+qkNkHnKCMQbHKywKgHKpR BL2wXJ3XgRy9grgSj28Hcaii/GvaLwx1rkb7D25TLzS4Kkbd+NWfXNZ8JmqRmTln 1MNpAqz9rSWsx+DZwMyjtiugpHICVfVDqAnJHbDw5hVEBRIGuuvYev6R5tjN0Fsx SJgauruyd6TvQyv7o1E449TL5Brm8keuQj1CnFAb3b4+yGAec2CJ95auxetRV5e3 RgY2fmH1m4SgpCpTRkdBGnqsevJ1MjbzGI2Lh+KS4VLJjmUkApCBp/EcXCMTbExF 1T0Lzb4SNzSGxw1/9t6qsUQtHlPpL1is+Na/THTPn4TCBFGoiXZgPDLA/og== Received: from mail-pf1-f199.google.com (mail-pf1-f199.google.com [209.85.210.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 47j5rq2eyx-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Sun, 29 Jun 2025 14:08:11 +0000 (GMT) Received: by mail-pf1-f199.google.com with SMTP id d2e1a72fcca58-74ae13e99d6so3168208b3a.0 for ; Sun, 29 Jun 2025 07:08:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751206090; x=1751810890; 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=A54UdMciCNBls2/cngumRMQ7rIW/ZCmN2ztDtF1NIpw=; b=bs33QHYGCGO+9ckdab5jlv5KgIYrzksM9bdQ8s2G7bOdNF9BnfdY+g5ABtS9nWVRje E8tgBFex+UOKg5FsU8UzEfnNlxEaWm5aFUucAeFSVhcoCii+aqPjkNCNIdRnaN1eKhrQ NCzZUKBiZ9SU1mxhZiri/9TE2L61HoQyejnqJchgG2hnYSLwu61sYeVCYmfHEQX149lt sNi/zZ/rI+45q/kDGMSwwWSzlRoK5Si58Oy8YNYGZGS2ybmFSxalPjQnItaElVo4K8q5 gYLQGwYyvWv0XNJm+QPDiHdEyRBqjPrf11udi7XmVIL4t93Ew3+t3Ns5CmAd9viKcr0K KMbA== X-Forwarded-Encrypted: i=1; AJvYcCWRbyGH9TMpWCiid+4LuZ6C5KD9TWzf3G12oWPCP/oTCszyD6YDYCAvD0kuz+ddFT9XlhVkT0/uhLOUB3M=@vger.kernel.org X-Gm-Message-State: AOJu0YxNHkzSL1o74LH3c0d4/atOx00WH56GcD9pJmQUOi8zvLvBlst9 YjyXJcTSawgBXzRmDO+oVzURcWSHyRuqhnj5gxiR3dRSBv1ora13X0mWPuts9Ez5cLz47d5lJ/I rDYGjlPffRWcmEOyk9JEsQ4UwHSSOoHzPwxxFtsYIGKIxMO1FO9FSXTlXVEg/lmigdAc= X-Gm-Gg: ASbGncs5sLvt5of34tyI10tY9dqacAdK3EVl6to6/N+xdLMpMR+lSsLcSthcoZORj+y saA/UqjVRB+BlxOQ7HvfuJ9Ky91DaeMrAXaieNac89oDavGmHVPJK0kFOHlfWxRukzpVo0nfTyE sEzCKe3YYqhyk/YJwlZa0+dKWIF9VHQXpXoWzlPO9a/5D+dEH7SZVq0BMH7Jq/mrcwV+9LrZpsJ 5APfwKH4YfXQ/Pf7a130fHMCfNuHHaA0xsULRZAuC3S6+Vj6T8obBjxfKMiXccNC6Lup5wnpMgR iY4nZrTlq1G2SzjxDS6mLii9kwtCPawi X-Received: by 2002:a05:6a20:2453:b0:21f:53e4:1919 with SMTP id adf61e73a8af0-220a0893979mr18746136637.3.1751206090151; Sun, 29 Jun 2025 07:08:10 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF8rwemeeKoXa3dY68CP5crYj0elFksFOZ4WGRjdgo7BPXpcPNprB8m352xNp9ATYbOhE0nUw== X-Received: by 2002:a05:6a20:2453:b0:21f:53e4:1919 with SMTP id adf61e73a8af0-220a0893979mr18746079637.3.1751206089570; Sun, 29 Jun 2025 07:08:09 -0700 (PDT) Received: from localhost ([2601:1c0:5000:d5c:5b3e:de60:4fda:e7b1]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-74af557b3adsm6718564b3a.106.2025.06.29.07.08.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Jun 2025 07:08:09 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, Connor Abbott , Antonino Maniscalco , Danilo Krummrich , Rob Clark , Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v8 34/42] drm/msm: Split out map/unmap ops Date: Sun, 29 Jun 2025 07:03:37 -0700 Message-ID: <20250629140537.30850-35-robin.clark@oss.qualcomm.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250629140537.30850-1-robin.clark@oss.qualcomm.com> References: <20250629140537.30850-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-ORIG-GUID: q8Gx0wTQSuWvqYIdLIt5iYBt0G-nB8Qu X-Authority-Analysis: v=2.4 cv=eIYTjGp1 c=1 sm=1 tr=0 ts=686148cb cx=c_pps a=WW5sKcV1LcKqjgzy2JUPuA==:117 a=xqWC_Br6kY4A:10 a=6IFa9wvqVegA:10 a=cm27Pg_UAAAA:8 a=EUspDBNiAAAA:8 a=pGLkceISAAAA:8 a=xxbd-mT8tQbqgF3hF1cA:9 a=OpyuDcXvxspvyRM73sMx:22 X-Proofpoint-GUID: q8Gx0wTQSuWvqYIdLIt5iYBt0G-nB8Qu X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjI5MDExOSBTYWx0ZWRfXwBZsd+D/93Vn BkPIFkocq9TR1aY+f5rQ7zfWp6OVK1iPPO4GXAgN0WUU+LTmgm7st+CoSE0xrI9kfG00lifKQXJ mHawNdYaf2AeELdJQ+ckelyX7+5skw+/etksgNWvB1wMVT4APqbDvNtMApsDsB1NNYgqezACL+G FOwdSimKQxFmdJAe/dpR1q9V3lIt/PmUjpgf8D9wdBrrJ+G6xd8eItRSpl3BfuNIxEXlZe+MLL3 tLYdwO/Az0QdLMWMmERFAbREJ6ZQhCuWPi5bzKkGq+QEpax4Vw/zzKrVr+bllp0N6C/KrwzZk9P 5tdlQVjMpIJeb/+iRVgxmltQJGzuAEI/jSt8G06ht/IOvWT/6NqrW/mvhT4JN25E6oTTt++hzkK h1oV96pIKviVQfLhL4b9KPRURY2jX7JyrseNsLK9qtCVTG6IAcRylJfDJ6OyeWtUyjVq7Yhl 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-27_05,2025-06-27_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 clxscore=1015 mlxlogscore=999 priorityscore=1501 adultscore=0 mlxscore=0 phishscore=0 bulkscore=0 spamscore=0 suspectscore=0 lowpriorityscore=0 malwarescore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2506290119 Content-Type: text/plain; charset="utf-8" From: Rob Clark With async VM_BIND, the actual pgtable updates are deferred. Synchronously, a list of map/unmap ops will be generated, but the actual pgtable changes are deferred. To support that, split out op handlers and change the existing non-VM_BIND paths to use them. Note in particular, the vma itself may already be destroyed/freed by the time an UNMAP op runs (or even a MAP op if there is a later queued UNMAP). For this reason, the op handlers cannot reference the vma pointer. Signed-off-by: Rob Clark Signed-off-by: Rob Clark Tested-by: Antonino Maniscalco Reviewed-by: Antonino Maniscalco --- drivers/gpu/drm/msm/msm_gem_vma.c | 63 +++++++++++++++++++++++++++---- 1 file changed, 56 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/msm/msm_gem_vma.c b/drivers/gpu/drm/msm/msm_ge= m_vma.c index cf37abb98235..76b79c122182 100644 --- a/drivers/gpu/drm/msm/msm_gem_vma.c +++ b/drivers/gpu/drm/msm/msm_gem_vma.c @@ -8,6 +8,34 @@ #include "msm_gem.h" #include "msm_mmu.h" =20 +#define vm_dbg(fmt, ...) pr_debug("%s:%d: "fmt"\n", __func__, __LINE__, ##= __VA_ARGS__) + +/** + * struct msm_vm_map_op - create new pgtable mapping + */ +struct msm_vm_map_op { + /** @iova: start address for mapping */ + uint64_t iova; + /** @range: size of the region to map */ + uint64_t range; + /** @offset: offset into @sgt to map */ + uint64_t offset; + /** @sgt: pages to map, or NULL for a PRR mapping */ + struct sg_table *sgt; + /** @prot: the mapping protection flags */ + int prot; +}; + +/** + * struct msm_vm_unmap_op - unmap a range of pages from pgtable + */ +struct msm_vm_unmap_op { + /** @iova: start address for unmap */ + uint64_t iova; + /** @range: size of region to unmap */ + uint64_t range; +}; + static void msm_gem_vm_free(struct drm_gpuvm *gpuvm) { @@ -21,18 +49,36 @@ msm_gem_vm_free(struct drm_gpuvm *gpuvm) kfree(vm); } =20 +static void +vm_unmap_op(struct msm_gem_vm *vm, const struct msm_vm_unmap_op *op) +{ + vm_dbg("%p: %016llx %016llx", vm, op->iova, op->iova + op->range); + + vm->mmu->funcs->unmap(vm->mmu, op->iova, op->range); +} + +static int +vm_map_op(struct msm_gem_vm *vm, const struct msm_vm_map_op *op) +{ + vm_dbg("%p: %016llx %016llx", vm, op->iova, op->iova + op->range); + + return vm->mmu->funcs->map(vm->mmu, op->iova, op->sgt, op->offset, + op->range, op->prot); +} + /* Actually unmap memory for the vma */ void msm_gem_vma_unmap(struct drm_gpuva *vma) { struct msm_gem_vma *msm_vma =3D to_msm_vma(vma); - struct msm_gem_vm *vm =3D to_msm_vm(vma->vm); - unsigned size =3D vma->va.range; =20 /* Don't do anything if the memory isn't mapped */ if (!msm_vma->mapped) return; =20 - vm->mmu->funcs->unmap(vm->mmu, vma->va.addr, size); + vm_unmap_op(to_msm_vm(vma->vm), &(struct msm_vm_unmap_op){ + .iova =3D vma->va.addr, + .range =3D vma->va.range, + }); =20 msm_vma->mapped =3D false; } @@ -42,7 +88,6 @@ int msm_gem_vma_map(struct drm_gpuva *vma, int prot, struct sg_table *sgt) { struct msm_gem_vma *msm_vma =3D to_msm_vma(vma); - struct msm_gem_vm *vm =3D to_msm_vm(vma->vm); int ret; =20 if (GEM_WARN_ON(!vma->va.addr)) @@ -62,9 +107,13 @@ msm_gem_vma_map(struct drm_gpuva *vma, int prot, struct= sg_table *sgt) * Revisit this if we can come up with a scheme to pre-alloc pages * for the pgtable in map/unmap ops. */ - ret =3D vm->mmu->funcs->map(vm->mmu, vma->va.addr, sgt, - vma->gem.offset, vma->va.range, - prot); + ret =3D vm_map_op(to_msm_vm(vma->vm), &(struct msm_vm_map_op){ + .iova =3D vma->va.addr, + .range =3D vma->va.range, + .offset =3D vma->gem.offset, + .sgt =3D sgt, + .prot =3D prot, + }); if (ret) { msm_vma->mapped =3D false; } --=20 2.50.0 From nobody Wed Oct 8 10:58:51 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 910E6246789 for ; Sun, 29 Jun 2025 14:08:15 +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=1751206099; cv=none; b=hJQO72gd6Lmz6X3bmpWUUygObpLABFSjbyLi2+tgC4aDcI09SZ0o7jCOQzJD5sjVMtcnTU6Qqc/6DmB86K5CMJtZR/itX2c87xJdkFl/2kINkgEk5ye8t5yZia6kS+cfzQTG2BFcIB2kKvAMnufMKoxbtCCPXhAK9rjBMkI4ymE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751206099; c=relaxed/simple; bh=YMwjoGzT7gWmSUsAdXb0rPoOXdJdhodZ6aqduF1/I2o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pTtywjwaXDwYJWig0tCM7FVa9W1x+BrDcTch1CnGCi6gZ1vX7PBW8T9cjHzf3jhVjADHH9d6IwuKHkNGyXy1rnvg28UfoxujVFfDhKPuhinpPwPIhQEI3SxwjfUvIzE137uy8c4z34FVFA4hMjayisniJ6MDQ22LA72KLmwlh8c= 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=avEVw/iL; 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="avEVw/iL" Received: from pps.filterd (m0279873.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 55T9n5CD002958 for ; Sun, 29 Jun 2025 14:08:14 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=UvBpdWpTblW X+dSlwHAbuKmhjUX26/ljS5IzCHRPGJo=; b=avEVw/iLX1ZHRfh+trVYtqKbTvR VSKnCrWH8f/haNpo0UeKJtRbAC8l6bnIoizNcsqyEh2s2HZoJMcqCatXu1ZfrHhY TmF6+Y2B6if0gbFD02ZE7TY94L3B6k5YvhPar/1csidwIfxHLQYyq8Ga223kilxN W4fBmdBgsux+hs7gNceR9qp3qbd/tR6BO1Kq7us0bw9e+WW5UTbu1VStdpE0kcSH /CObp1t2tP3mfZmnv5j/1D0ILd2owwUmIaPE5RKKQ31/zEh1pi6QZTPDerOx0YhF sYwANbTXEJtgUgzXEY/x2SFDoOFJnHuCUFs2kgdv90pB0pNTr7iNXdZ8cLA== Received: from mail-pl1-f198.google.com (mail-pl1-f198.google.com [209.85.214.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 47j5rq2f03-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Sun, 29 Jun 2025 14:08:14 +0000 (GMT) Received: by mail-pl1-f198.google.com with SMTP id d9443c01a7336-2349fe994a9so8191205ad.1 for ; Sun, 29 Jun 2025 07:08:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751206093; x=1751810893; 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=UvBpdWpTblWX+dSlwHAbuKmhjUX26/ljS5IzCHRPGJo=; b=d6XgpAYb0/dB2xoQ/cJgLb8cUJV+XcNDxFAg/SSMybEAsda+ULRkBVugP7/p2TWNTZ YWyZ8SDG/GHVwa9UwFJyf18DOlMX0wvEpAZkGfRZq2JpHlLAjpjHlqOdjGWbFiEnsoKq ErMkU7RS7ZiqzvlaQemDzPk9cdJ9dCt4DOp9EgZG5UxCvFcrezoCJcz9HZ9MxwDUWHDh V6ketHqcQ3eJKgdijsTEgAZ6jc8tOV1LLo/tZj2MKdrJ/hsJyfQ4M0E1OFaH6lAOwTLT 6JdYAXrM8m1nQ3A/dCO3lHYG/EaPibBgH71NMyYFdSYbXS2HwGcFb+MDL852igkl8TTa y9fQ== X-Forwarded-Encrypted: i=1; AJvYcCVQt5R7up7aGnBPSsmSqjex4+9pP6y6Oq2YpOnAegIQMjYhuoHL0FJQvi7sfi314kIKMJhhUwgzw6WkWAc=@vger.kernel.org X-Gm-Message-State: AOJu0YwCRkgDLRb8T3h2WJXCgq86UHDMkGU1n8F8tffhI/3muED07Zxe Qo9l4YoKM3mIO5BJS/Nt/9d0YmUJevFdJGbAIstAEdNo9hcY5U+Qz1tyIS9uovfXVuDPEI+inUg AvBY7EUKNe9++T3LY5JF1h3L27FptthXBywf7jlvxjpShAzKYxbrLEAcFB2/bdGiHmsk= X-Gm-Gg: ASbGncvxKE6M6r3eIEQw9v40T3Rx6tYPxC3vk1GLzWeS5lHyW9hGj5S3E0MHa4zElGu p6gI13GxAtzZMqzI6cyEXoxzWijFOjDK7WlTN8Vy3u2kvYVaotBwgYaBckbQj5J7/tFIlm63ZQN 6Fi1TUoro00rzsCin7g/JQCoogT8IJJYK+hWp51PpCAuuEkdPq3Xd7IPsaVq54NskW8zw9ZvBHO w0PJ4vR0MB7mAQIN6NvC3HuZkwx+i8uYA53pRYpxN3K7iwgoWWb/+oVRvVx6liwZf125Xm9tori srDUq9eXZqFgXT+rEg6RfKx5kjuf2cOh X-Received: by 2002:a17:903:110d:b0:235:1706:2002 with SMTP id d9443c01a7336-23ac19cf845mr169360015ad.0.1751206092383; Sun, 29 Jun 2025 07:08:12 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFytC7Maxwbw+iSDgr7KypvUaL59ra6xJ80vydUOup4Upr8FaaTahFlcsHNxvoAF0XtessriQ== X-Received: by 2002:a17:903:110d:b0:235:1706:2002 with SMTP id d9443c01a7336-23ac19cf845mr169359105ad.0.1751206091501; Sun, 29 Jun 2025 07:08:11 -0700 (PDT) Received: from localhost ([2601:1c0:5000:d5c:5b3e:de60:4fda:e7b1]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-23acb3b7a3asm60435385ad.170.2025.06.29.07.08.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Jun 2025 07:08: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 , Antonino Maniscalco , Danilo Krummrich , Rob Clark , Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Konrad Dybcio , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Sumit Semwal , =?UTF-8?q?Christian=20K=C3=B6nig?= , linux-kernel@vger.kernel.org (open list), linux-media@vger.kernel.org (open list:DMA BUFFER SHARING FRAMEWORK:Keyword:\bdma_(?:buf|fence|resv)\b), linaro-mm-sig@lists.linaro.org (moderated list:DMA BUFFER SHARING FRAMEWORK:Keyword:\bdma_(?:buf|fence|resv)\b) Subject: [PATCH v8 35/42] drm/msm: Add VM_BIND ioctl Date: Sun, 29 Jun 2025 07:03:38 -0700 Message-ID: <20250629140537.30850-36-robin.clark@oss.qualcomm.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250629140537.30850-1-robin.clark@oss.qualcomm.com> References: <20250629140537.30850-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-ORIG-GUID: _R4jGyvewTy61OuSWbxd-o28hl9FpOng X-Authority-Analysis: v=2.4 cv=eIYTjGp1 c=1 sm=1 tr=0 ts=686148ce cx=c_pps a=MTSHoo12Qbhz2p7MsH1ifg==:117 a=xqWC_Br6kY4A:10 a=6IFa9wvqVegA:10 a=cm27Pg_UAAAA:8 a=EUspDBNiAAAA:8 a=pGLkceISAAAA:8 a=9iYb1zYOeEBEA4qMVjAA:9 a=lT2Ezh7aeK42-gto:21 a=GvdueXVYPmCkWapjIL-Q:22 X-Proofpoint-GUID: _R4jGyvewTy61OuSWbxd-o28hl9FpOng X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjI5MDExOSBTYWx0ZWRfX5+sBYbXxVLzr +rSaJ8+L4jnd473ApzdyIHbAroO01Q+VpN9UF4+mpSaLhzedX2U/9lCoA92UKp+DSwsz7OozHXy OibbwUuaj1JoPPyl6yrRv1Ej1r2Mvol9UmWrKubVT+SMRWIVDM61I9aZPLmOslV3moU2p8EFSwt sqbvuBQXQRMOMZdQL6mwmm+dfBQs0e94Q8Vm9WY5s6JrLVQY4HWbALCs9wJIeU9wBZu6OctKWFz 7P1DkFp+bHYfFELpbRsKAR6+QaDsGvLMk6n/Pqh/B0lkgVeCRyfjOhYaQm3G10sckFrYnG1WtRU 3NJTLUDKoxXvhzDUm90kB+sJc+sZVh1CFYsGKy/+Qn57d+0roBT6TCgemaq37gmI+PYCIHwMLXJ mL8Qosj8Te4+G0ITMSTlrU3+Equ9vj+6pGER6jTxA8AxzUlVjR+eQ5q2m5Oy2CB4/bk7g+GP 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-27_05,2025-06-27_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 clxscore=1015 mlxlogscore=999 priorityscore=1501 adultscore=0 mlxscore=0 phishscore=0 bulkscore=0 spamscore=0 suspectscore=0 lowpriorityscore=0 malwarescore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2506290119 Content-Type: text/plain; charset="utf-8" From: Rob Clark Add a VM_BIND ioctl for binding/unbinding buffers into a VM. This is only supported if userspace has opted in to MSM_PARAM_EN_VM_BIND. Signed-off-by: Rob Clark Signed-off-by: Rob Clark Tested-by: Antonino Maniscalco Reviewed-by: Antonino Maniscalco --- drivers/gpu/drm/msm/msm_drv.c | 1 + drivers/gpu/drm/msm/msm_drv.h | 4 +- drivers/gpu/drm/msm/msm_gem.c | 40 +- drivers/gpu/drm/msm/msm_gem.h | 4 + drivers/gpu/drm/msm/msm_gem_submit.c | 22 +- drivers/gpu/drm/msm/msm_gem_vma.c | 1092 +++++++++++++++++++++++++- include/uapi/drm/msm_drm.h | 74 +- 7 files changed, 1204 insertions(+), 33 deletions(-) diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c index c1627cae6ae6..7881afa3a75a 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -795,6 +795,7 @@ static const struct drm_ioctl_desc msm_ioctls[] =3D { DRM_IOCTL_DEF_DRV(MSM_SUBMITQUEUE_NEW, msm_ioctl_submitqueue_new, DRM= _RENDER_ALLOW), DRM_IOCTL_DEF_DRV(MSM_SUBMITQUEUE_CLOSE, msm_ioctl_submitqueue_close, DRM= _RENDER_ALLOW), DRM_IOCTL_DEF_DRV(MSM_SUBMITQUEUE_QUERY, msm_ioctl_submitqueue_query, DRM= _RENDER_ALLOW), + DRM_IOCTL_DEF_DRV(MSM_VM_BIND, msm_ioctl_vm_bind, DRM_RENDER_AL= LOW), }; =20 static void msm_show_fdinfo(struct drm_printer *p, struct drm_file *file) diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h index 9b1ccb2b18f6..200c3135bbf9 100644 --- a/drivers/gpu/drm/msm/msm_drv.h +++ b/drivers/gpu/drm/msm/msm_drv.h @@ -255,7 +255,9 @@ struct drm_gpuvm *msm_kms_init_vm(struct drm_device *de= v); bool msm_use_mmu(struct drm_device *dev); =20 int msm_ioctl_gem_submit(struct drm_device *dev, void *data, - struct drm_file *file); + struct drm_file *file); +int msm_ioctl_vm_bind(struct drm_device *dev, void *data, + struct drm_file *file); =20 #ifdef CONFIG_DEBUG_FS unsigned long msm_gem_shrinker_shrink(struct drm_device *dev, unsigned lon= g nr_to_scan); diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c index b688d397cc47..77fdf53d3e33 100644 --- a/drivers/gpu/drm/msm/msm_gem.c +++ b/drivers/gpu/drm/msm/msm_gem.c @@ -251,8 +251,7 @@ static void put_pages(struct drm_gem_object *obj) } } =20 -static struct page **msm_gem_get_pages_locked(struct drm_gem_object *obj, - unsigned madv) +struct page **msm_gem_get_pages_locked(struct drm_gem_object *obj, unsigne= d madv) { struct msm_gem_object *msm_obj =3D to_msm_bo(obj); =20 @@ -1052,18 +1051,37 @@ static void msm_gem_free_object(struct drm_gem_obje= ct *obj) /* * We need to lock any VMs the object is still attached to, but not * the object itself (see explaination in msm_gem_assert_locked()), - * so just open-code this special case: + * so just open-code this special case. + * + * Note that we skip the dance if we aren't attached to any VM. This + * is load bearing. The driver needs to support two usage models: + * + * 1. Legacy kernel managed VM: Userspace expects the VMA's to be + * implicitly torn down when the object is freed, the VMA's do + * not hold a hard reference to the BO. + * + * 2. VM_BIND, userspace managed VM: The VMA holds a reference to the + * BO. This can be dropped when the VM is closed and it's associated + * VMAs are torn down. (See msm_gem_vm_close()). + * + * In the latter case the last reference to a BO can be dropped while + * we already have the VM locked. It would have already been removed + * from the gpuva list, but lockdep doesn't know that. Or understand + * the differences between the two usage models. */ - drm_exec_init(&exec, 0, 0); - drm_exec_until_all_locked (&exec) { - struct drm_gpuvm_bo *vm_bo; - drm_gem_for_each_gpuvm_bo (vm_bo, obj) { - drm_exec_lock_obj(&exec, drm_gpuvm_resv_obj(vm_bo->vm)); - drm_exec_retry_on_contention(&exec); + if (!list_empty(&obj->gpuva.list)) { + drm_exec_init(&exec, 0, 0); + drm_exec_until_all_locked (&exec) { + struct drm_gpuvm_bo *vm_bo; + drm_gem_for_each_gpuvm_bo (vm_bo, obj) { + drm_exec_lock_obj(&exec, + drm_gpuvm_resv_obj(vm_bo->vm)); + drm_exec_retry_on_contention(&exec); + } } + put_iova_spaces(obj, NULL, true); + drm_exec_fini(&exec); /* drop locks */ } - put_iova_spaces(obj, NULL, true); - drm_exec_fini(&exec); /* drop locks */ =20 if (drm_gem_is_imported(obj)) { GEM_WARN_ON(msm_obj->vaddr); diff --git a/drivers/gpu/drm/msm/msm_gem.h b/drivers/gpu/drm/msm/msm_gem.h index f369a30a247c..ee464e315643 100644 --- a/drivers/gpu/drm/msm/msm_gem.h +++ b/drivers/gpu/drm/msm/msm_gem.h @@ -73,6 +73,9 @@ struct msm_gem_vm { /** @mmu: The mmu object which manages the pgtables */ struct msm_mmu *mmu; =20 + /** @mmu_lock: Protects access to the mmu */ + struct mutex mmu_lock; + /** * @pid: For address spaces associated with a specific process, this * will be non-NULL: @@ -205,6 +208,7 @@ int msm_gem_get_and_pin_iova(struct drm_gem_object *obj= , struct drm_gpuvm *vm, uint64_t *iova); void msm_gem_unpin_iova(struct drm_gem_object *obj, struct drm_gpuvm *vm); void msm_gem_pin_obj_locked(struct drm_gem_object *obj); +struct page **msm_gem_get_pages_locked(struct drm_gem_object *obj, unsigne= d madv); struct page **msm_gem_pin_pages_locked(struct drm_gem_object *obj); void msm_gem_unpin_pages_locked(struct drm_gem_object *obj); int msm_gem_dumb_create(struct drm_file *file, struct drm_device *dev, diff --git a/drivers/gpu/drm/msm/msm_gem_submit.c b/drivers/gpu/drm/msm/msm= _gem_submit.c index e2174b7d0e40..283e807c7874 100644 --- a/drivers/gpu/drm/msm/msm_gem_submit.c +++ b/drivers/gpu/drm/msm/msm_gem_submit.c @@ -193,6 +193,7 @@ static int submit_lookup_objects(struct msm_gem_submit = *submit, static int submit_lookup_cmds(struct msm_gem_submit *submit, struct drm_msm_gem_submit *args, struct drm_file *file) { + struct msm_context *ctx =3D file->driver_priv; unsigned i; size_t sz; int ret =3D 0; @@ -224,6 +225,20 @@ static int submit_lookup_cmds(struct msm_gem_submit *s= ubmit, goto out; } =20 + if (msm_context_is_vmbind(ctx)) { + if (submit_cmd.nr_relocs) { + ret =3D SUBMIT_ERROR(EINVAL, submit, "nr_relocs must be zero"); + goto out; + } + + if (submit_cmd.submit_idx || submit_cmd.submit_offset) { + ret =3D SUBMIT_ERROR(EINVAL, submit, "submit_idx/offset must be zero"); + goto out; + } + + submit->cmd[i].iova =3D submit_cmd.iova; + } + submit->cmd[i].type =3D submit_cmd.type; submit->cmd[i].size =3D submit_cmd.size / 4; submit->cmd[i].offset =3D submit_cmd.submit_offset / 4; @@ -532,6 +547,7 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void *= data, struct msm_syncobj_post_dep *post_deps =3D NULL; struct drm_syncobj **syncobjs_to_reset =3D NULL; struct sync_file *sync_file =3D NULL; + unsigned cmds_to_parse; int out_fence_fd =3D -1; unsigned i; int ret; @@ -655,7 +671,9 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void *= data, if (ret) goto out; =20 - for (i =3D 0; i < args->nr_cmds; i++) { + cmds_to_parse =3D msm_context_is_vmbind(ctx) ? 0 : args->nr_cmds; + + for (i =3D 0; i < cmds_to_parse; i++) { struct drm_gem_object *obj; uint64_t iova; =20 @@ -686,7 +704,7 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void *= data, goto out; } =20 - submit->nr_cmds =3D i; + submit->nr_cmds =3D args->nr_cmds; =20 idr_preload(GFP_KERNEL); =20 diff --git a/drivers/gpu/drm/msm/msm_gem_vma.c b/drivers/gpu/drm/msm/msm_ge= m_vma.c index 76b79c122182..5d4b7e3e9d2c 100644 --- a/drivers/gpu/drm/msm/msm_gem_vma.c +++ b/drivers/gpu/drm/msm/msm_gem_vma.c @@ -4,9 +4,16 @@ * Author: Rob Clark */ =20 +#include "drm/drm_file.h" +#include "drm/msm_drm.h" +#include "linux/file.h" +#include "linux/sync_file.h" + #include "msm_drv.h" #include "msm_gem.h" +#include "msm_gpu.h" #include "msm_mmu.h" +#include "msm_syncobj.h" =20 #define vm_dbg(fmt, ...) pr_debug("%s:%d: "fmt"\n", __func__, __LINE__, ##= __VA_ARGS__) =20 @@ -36,6 +43,97 @@ struct msm_vm_unmap_op { uint64_t range; }; =20 +/** + * struct msm_vma_op - A MAP or UNMAP operation + */ +struct msm_vm_op { + /** @op: The operation type */ + enum { + MSM_VM_OP_MAP =3D 1, + MSM_VM_OP_UNMAP, + } op; + union { + /** @map: Parameters used if op =3D=3D MSM_VMA_OP_MAP */ + struct msm_vm_map_op map; + /** @unmap: Parameters used if op =3D=3D MSM_VMA_OP_UNMAP */ + struct msm_vm_unmap_op unmap; + }; + /** @node: list head in msm_vm_bind_job::vm_ops */ + struct list_head node; + + /** + * @obj: backing object for pages to be mapped/unmapped + * + * Async unmap ops, in particular, must hold a reference to the + * original GEM object backing the mapping that will be unmapped. + * But the same can be required in the map path, for example if + * there is not a corresponding unmap op, such as process exit. + * + * This ensures that the pages backing the mapping are not freed + * before the mapping is torn down. + */ + struct drm_gem_object *obj; +}; + +/** + * struct msm_vm_bind_job - Tracking for a VM_BIND ioctl + * + * A table of userspace requested VM updates (MSM_VM_BIND_OP_UNMAP/MAP/MAP= _NULL) + * gets applied to the vm, generating a list of VM ops (MSM_VM_OP_MAP/UNMA= P) + * which are applied to the pgtables asynchronously. For example a usersp= ace + * requested MSM_VM_BIND_OP_MAP could end up generating both an MSM_VM_OP_= UNMAP + * to unmap an existing mapping, and a MSM_VM_OP_MAP to apply the new mapp= ing. + */ +struct msm_vm_bind_job { + /** @base: base class for drm_sched jobs */ + struct drm_sched_job base; + /** @vm: The VM being operated on */ + struct drm_gpuvm *vm; + /** @fence: The fence that is signaled when job completes */ + struct dma_fence *fence; + /** @queue: The queue that the job runs on */ + struct msm_gpu_submitqueue *queue; + /** @prealloc: Tracking for pre-allocated MMU pgtable pages */ + struct msm_mmu_prealloc prealloc; + /** @vm_ops: a list of struct msm_vm_op */ + struct list_head vm_ops; + /** @bos_pinned: are the GEM objects being bound pinned? */ + bool bos_pinned; + /** @nr_ops: the number of userspace requested ops */ + unsigned int nr_ops; + /** + * @ops: the userspace requested ops + * + * The userspace requested ops are copied/parsed and validated + * before we start applying the updates to try to do as much up- + * front error checking as possible, to avoid the VM being in an + * undefined state due to partially executed VM_BIND. + * + * This table also serves to hold a reference to the backing GEM + * objects. + */ + struct msm_vm_bind_op { + uint32_t op; + uint32_t flags; + union { + struct drm_gem_object *obj; + uint32_t handle; + }; + uint64_t obj_offset; + uint64_t iova; + uint64_t range; + } ops[]; +}; + +#define job_foreach_bo(obj, _job) \ + for (unsigned i =3D 0; i < (_job)->nr_ops; i++) \ + if ((obj =3D (_job)->ops[i].obj)) + +static inline struct msm_vm_bind_job *to_msm_vm_bind_job(struct drm_sched_= job *job) +{ + return container_of(job, struct msm_vm_bind_job, base); +} + static void msm_gem_vm_free(struct drm_gpuvm *gpuvm) { @@ -52,6 +150,9 @@ msm_gem_vm_free(struct drm_gpuvm *gpuvm) static void vm_unmap_op(struct msm_gem_vm *vm, const struct msm_vm_unmap_op *op) { + if (!vm->managed) + lockdep_assert_held(&vm->mmu_lock); + vm_dbg("%p: %016llx %016llx", vm, op->iova, op->iova + op->range); =20 vm->mmu->funcs->unmap(vm->mmu, op->iova, op->range); @@ -60,6 +161,9 @@ vm_unmap_op(struct msm_gem_vm *vm, const struct msm_vm_u= nmap_op *op) static int vm_map_op(struct msm_gem_vm *vm, const struct msm_vm_map_op *op) { + if (!vm->managed) + lockdep_assert_held(&vm->mmu_lock); + vm_dbg("%p: %016llx %016llx", vm, op->iova, op->iova + op->range); =20 return vm->mmu->funcs->map(vm->mmu, op->iova, op->sgt, op->offset, @@ -69,17 +173,29 @@ vm_map_op(struct msm_gem_vm *vm, const struct msm_vm_m= ap_op *op) /* Actually unmap memory for the vma */ void msm_gem_vma_unmap(struct drm_gpuva *vma) { + struct msm_gem_vm *vm =3D to_msm_vm(vma->vm); struct msm_gem_vma *msm_vma =3D to_msm_vma(vma); =20 /* Don't do anything if the memory isn't mapped */ if (!msm_vma->mapped) return; =20 - vm_unmap_op(to_msm_vm(vma->vm), &(struct msm_vm_unmap_op){ + /* + * The mmu_lock is only needed when preallocation is used. But + * in that case we don't need to worry about recursion into + * shrinker + */ + if (!vm->managed) + mutex_lock(&vm->mmu_lock); + + vm_unmap_op(vm, &(struct msm_vm_unmap_op){ .iova =3D vma->va.addr, .range =3D vma->va.range, }); =20 + if (!vm->managed) + mutex_unlock(&vm->mmu_lock); + msm_vma->mapped =3D false; } =20 @@ -87,6 +203,7 @@ void msm_gem_vma_unmap(struct drm_gpuva *vma) int msm_gem_vma_map(struct drm_gpuva *vma, int prot, struct sg_table *sgt) { + struct msm_gem_vm *vm =3D to_msm_vm(vma->vm); struct msm_gem_vma *msm_vma =3D to_msm_vma(vma); int ret; =20 @@ -98,6 +215,14 @@ msm_gem_vma_map(struct drm_gpuva *vma, int prot, struct= sg_table *sgt) =20 msm_vma->mapped =3D true; =20 + /* + * The mmu_lock is only needed when preallocation is used. But + * in that case we don't need to worry about recursion into + * shrinker + */ + if (!vm->managed) + mutex_lock(&vm->mmu_lock); + /* * NOTE: iommu/io-pgtable can allocate pages, so we cannot hold * a lock across map/unmap which is also used in the job_run() @@ -107,16 +232,19 @@ msm_gem_vma_map(struct drm_gpuva *vma, int prot, stru= ct sg_table *sgt) * Revisit this if we can come up with a scheme to pre-alloc pages * for the pgtable in map/unmap ops. */ - ret =3D vm_map_op(to_msm_vm(vma->vm), &(struct msm_vm_map_op){ + ret =3D vm_map_op(vm, &(struct msm_vm_map_op){ .iova =3D vma->va.addr, .range =3D vma->va.range, .offset =3D vma->gem.offset, .sgt =3D sgt, .prot =3D prot, }); - if (ret) { + + if (!vm->managed) + mutex_unlock(&vm->mmu_lock); + + if (ret) msm_vma->mapped =3D false; - } =20 return ret; } @@ -131,6 +259,9 @@ void msm_gem_vma_close(struct drm_gpuva *vma) =20 drm_gpuvm_resv_assert_held(&vm->base); =20 + if (vma->gem.obj) + msm_gem_assert_locked(vma->gem.obj); + if (vma->va.addr && vm->managed) drm_mm_remove_node(&msm_vma->node); =20 @@ -158,6 +289,7 @@ msm_gem_vma_new(struct drm_gpuvm *gpuvm, struct drm_gem= _object *obj, =20 if (vm->managed) { BUG_ON(offset !=3D 0); + BUG_ON(!obj); /* NULL mappings not valid for kernel managed VM */ ret =3D drm_mm_insert_node_in_range(&vm->mm, &vma->node, obj->size, PAGE_SIZE, 0, range_start, range_end, 0); @@ -169,7 +301,8 @@ msm_gem_vma_new(struct drm_gpuvm *gpuvm, struct drm_gem= _object *obj, range_end =3D range_start + obj->size; } =20 - GEM_WARN_ON((range_end - range_start) > obj->size); + if (obj) + GEM_WARN_ON((range_end - range_start) > obj->size); =20 drm_gpuva_init(&vma->base, range_start, range_end - range_start, obj, off= set); vma->mapped =3D false; @@ -178,6 +311,9 @@ msm_gem_vma_new(struct drm_gpuvm *gpuvm, struct drm_gem= _object *obj, if (ret) goto err_free_range; =20 + if (!obj) + return &vma->base; + vm_bo =3D drm_gpuvm_bo_obtain(&vm->base, obj); if (IS_ERR(vm_bo)) { ret =3D PTR_ERR(vm_bo); @@ -200,11 +336,297 @@ msm_gem_vma_new(struct drm_gpuvm *gpuvm, struct drm_= gem_object *obj, return ERR_PTR(ret); } =20 +static int +msm_gem_vm_bo_validate(struct drm_gpuvm_bo *vm_bo, struct drm_exec *exec) +{ + struct drm_gem_object *obj =3D vm_bo->obj; + struct drm_gpuva *vma; + int ret; + + vm_dbg("validate: %p", obj); + + msm_gem_assert_locked(obj); + + drm_gpuvm_bo_for_each_va (vma, vm_bo) { + ret =3D msm_gem_pin_vma_locked(obj, vma); + if (ret) + return ret; + } + + return 0; +} + +struct op_arg { + unsigned flags; + struct msm_vm_bind_job *job; +}; + +static void +vm_op_enqueue(struct op_arg *arg, struct msm_vm_op _op) +{ + struct msm_vm_op *op =3D kmalloc(sizeof(*op), GFP_KERNEL); + *op =3D _op; + list_add_tail(&op->node, &arg->job->vm_ops); + + if (op->obj) + drm_gem_object_get(op->obj); +} + +static struct drm_gpuva * +vma_from_op(struct op_arg *arg, struct drm_gpuva_op_map *op) +{ + return msm_gem_vma_new(arg->job->vm, op->gem.obj, op->gem.offset, + op->va.addr, op->va.addr + op->va.range); +} + +static int +msm_gem_vm_sm_step_map(struct drm_gpuva_op *op, void *arg) +{ + struct drm_gem_object *obj =3D op->map.gem.obj; + struct drm_gpuva *vma; + struct sg_table *sgt; + unsigned prot; + + vma =3D vma_from_op(arg, &op->map); + if (WARN_ON(IS_ERR(vma))) + return PTR_ERR(vma); + + vm_dbg("%p:%p:%p: %016llx %016llx", vma->vm, vma, vma->gem.obj, + vma->va.addr, vma->va.range); + + vma->flags =3D ((struct op_arg *)arg)->flags; + + if (obj) { + sgt =3D to_msm_bo(obj)->sgt; + prot =3D msm_gem_prot(obj); + } else { + sgt =3D NULL; + prot =3D IOMMU_READ | IOMMU_WRITE; + } + + vm_op_enqueue(arg, (struct msm_vm_op){ + .op =3D MSM_VM_OP_MAP, + .map =3D { + .sgt =3D sgt, + .iova =3D vma->va.addr, + .range =3D vma->va.range, + .offset =3D vma->gem.offset, + .prot =3D prot, + }, + .obj =3D vma->gem.obj, + }); + + to_msm_vma(vma)->mapped =3D true; + + return 0; +} + +static int +msm_gem_vm_sm_step_remap(struct drm_gpuva_op *op, void *arg) +{ + struct msm_vm_bind_job *job =3D ((struct op_arg *)arg)->job; + struct drm_gpuvm *vm =3D job->vm; + struct drm_gpuva *orig_vma =3D op->remap.unmap->va; + struct drm_gpuva *prev_vma =3D NULL, *next_vma =3D NULL; + struct drm_gpuvm_bo *vm_bo =3D orig_vma->vm_bo; + bool mapped =3D to_msm_vma(orig_vma)->mapped; + unsigned flags; + + vm_dbg("orig_vma: %p:%p:%p: %016llx %016llx", vm, orig_vma, + orig_vma->gem.obj, orig_vma->va.addr, orig_vma->va.range); + + if (mapped) { + uint64_t unmap_start, unmap_range; + + drm_gpuva_op_remap_to_unmap_range(&op->remap, &unmap_start, &unmap_range= ); + + vm_op_enqueue(arg, (struct msm_vm_op){ + .op =3D MSM_VM_OP_UNMAP, + .unmap =3D { + .iova =3D unmap_start, + .range =3D unmap_range, + }, + .obj =3D orig_vma->gem.obj, + }); + + /* + * Part of this GEM obj is still mapped, but we're going to kill the + * existing VMA and replace it with one or two new ones (ie. two if + * the unmapped range is in the middle of the existing (unmap) VMA). + * So just set the state to unmapped: + */ + to_msm_vma(orig_vma)->mapped =3D false; + } + + /* + * Hold a ref to the vm_bo between the msm_gem_vma_close() and the + * creation of the new prev/next vma's, in case the vm_bo is tracked + * in the VM's evict list: + */ + if (vm_bo) + drm_gpuvm_bo_get(vm_bo); + + /* + * The prev_vma and/or next_vma are replacing the unmapped vma, and + * therefore should preserve it's flags: + */ + flags =3D orig_vma->flags; + + msm_gem_vma_close(orig_vma); + + if (op->remap.prev) { + prev_vma =3D vma_from_op(arg, op->remap.prev); + if (WARN_ON(IS_ERR(prev_vma))) + return PTR_ERR(prev_vma); + + vm_dbg("prev_vma: %p:%p: %016llx %016llx", vm, prev_vma, prev_vma->va.ad= dr, prev_vma->va.range); + to_msm_vma(prev_vma)->mapped =3D mapped; + prev_vma->flags =3D flags; + } + + if (op->remap.next) { + next_vma =3D vma_from_op(arg, op->remap.next); + if (WARN_ON(IS_ERR(next_vma))) + return PTR_ERR(next_vma); + + vm_dbg("next_vma: %p:%p: %016llx %016llx", vm, next_vma, next_vma->va.ad= dr, next_vma->va.range); + to_msm_vma(next_vma)->mapped =3D mapped; + next_vma->flags =3D flags; + } + + if (!mapped) + drm_gpuvm_bo_evict(vm_bo, true); + + /* Drop the previous ref: */ + drm_gpuvm_bo_put(vm_bo); + + return 0; +} + +static int +msm_gem_vm_sm_step_unmap(struct drm_gpuva_op *op, void *arg) +{ + struct drm_gpuva *vma =3D op->unmap.va; + struct msm_gem_vma *msm_vma =3D to_msm_vma(vma); + + vm_dbg("%p:%p:%p: %016llx %016llx", vma->vm, vma, vma->gem.obj, + vma->va.addr, vma->va.range); + + if (!msm_vma->mapped) + goto out_close; + + vm_op_enqueue(arg, (struct msm_vm_op){ + .op =3D MSM_VM_OP_UNMAP, + .unmap =3D { + .iova =3D vma->va.addr, + .range =3D vma->va.range, + }, + .obj =3D vma->gem.obj, + }); + + msm_vma->mapped =3D false; + +out_close: + msm_gem_vma_close(vma); + + return 0; +} + static const struct drm_gpuvm_ops msm_gpuvm_ops =3D { .vm_free =3D msm_gem_vm_free, + .vm_bo_validate =3D msm_gem_vm_bo_validate, + .sm_step_map =3D msm_gem_vm_sm_step_map, + .sm_step_remap =3D msm_gem_vm_sm_step_remap, + .sm_step_unmap =3D msm_gem_vm_sm_step_unmap, }; =20 +static struct dma_fence * +msm_vma_job_run(struct drm_sched_job *_job) +{ + struct msm_vm_bind_job *job =3D to_msm_vm_bind_job(_job); + struct msm_gem_vm *vm =3D to_msm_vm(job->vm); + struct drm_gem_object *obj; + int ret =3D vm->unusable ? -EINVAL : 0; + + vm_dbg(""); + + mutex_lock(&vm->mmu_lock); + vm->mmu->prealloc =3D &job->prealloc; + + while (!list_empty(&job->vm_ops)) { + struct msm_vm_op *op =3D + list_first_entry(&job->vm_ops, struct msm_vm_op, node); + + switch (op->op) { + case MSM_VM_OP_MAP: + /* + * On error, stop trying to map new things.. but we + * still want to process the unmaps (or in particular, + * the drm_gem_object_put()s) + */ + if (!ret) + ret =3D vm_map_op(vm, &op->map); + break; + case MSM_VM_OP_UNMAP: + vm_unmap_op(vm, &op->unmap); + break; + } + drm_gem_object_put(op->obj); + list_del(&op->node); + kfree(op); + } + + vm->mmu->prealloc =3D NULL; + mutex_unlock(&vm->mmu_lock); + + /* + * We failed to perform at least _some_ of the pgtable updates, so + * now the VM is in an undefined state. Game over! + */ + if (ret) + vm->unusable =3D true; + + job_foreach_bo (obj, job) { + msm_gem_lock(obj); + msm_gem_unpin_locked(obj); + msm_gem_unlock(obj); + } + + /* VM_BIND ops are synchronous, so no fence to wait on: */ + return NULL; +} + +static void +msm_vma_job_free(struct drm_sched_job *_job) +{ + struct msm_vm_bind_job *job =3D to_msm_vm_bind_job(_job); + struct msm_mmu *mmu =3D to_msm_vm(job->vm)->mmu; + struct drm_gem_object *obj; + + mmu->funcs->prealloc_cleanup(mmu, &job->prealloc); + + drm_sched_job_cleanup(_job); + + job_foreach_bo (obj, job) + drm_gem_object_put(obj); + + msm_submitqueue_put(job->queue); + dma_fence_put(job->fence); + + /* In error paths, we could have unexecuted ops: */ + while (!list_empty(&job->vm_ops)) { + struct msm_vm_op *op =3D + list_first_entry(&job->vm_ops, struct msm_vm_op, node); + list_del(&op->node); + kfree(op); + } + + kfree(job); +} + static const struct drm_sched_backend_ops msm_vm_bind_ops =3D { + .run_job =3D msm_vma_job_run, + .free_job =3D msm_vma_job_free }; =20 /** @@ -268,6 +690,7 @@ msm_gem_vm_create(struct drm_device *drm, struct msm_mm= u *mmu, const char *name, drm_gem_object_put(dummy_gem); =20 vm->mmu =3D mmu; + mutex_init(&vm->mmu_lock); vm->managed =3D managed; =20 drm_mm_init(&vm->mm, va_start, va_size); @@ -280,7 +703,6 @@ msm_gem_vm_create(struct drm_device *drm, struct msm_mm= u *mmu, const char *name, err_free_vm: kfree(vm); return ERR_PTR(ret); - } =20 /** @@ -296,6 +718,7 @@ msm_gem_vm_close(struct drm_gpuvm *gpuvm) { struct msm_gem_vm *vm =3D to_msm_vm(gpuvm); struct drm_gpuva *vma, *tmp; + struct drm_exec exec; =20 /* * For kernel managed VMs, the VMAs are torn down when the handle is @@ -312,22 +735,655 @@ msm_gem_vm_close(struct drm_gpuvm *gpuvm) drm_sched_fini(&vm->sched); =20 /* Tear down any remaining mappings: */ - dma_resv_lock(drm_gpuvm_resv(gpuvm), NULL); - drm_gpuvm_for_each_va_safe (vma, tmp, gpuvm) { - struct drm_gem_object *obj =3D vma->gem.obj; + drm_exec_init(&exec, 0, 2); + drm_exec_until_all_locked (&exec) { + drm_exec_lock_obj(&exec, drm_gpuvm_resv_obj(gpuvm)); + drm_exec_retry_on_contention(&exec); =20 - if (obj && obj->resv !=3D drm_gpuvm_resv(gpuvm)) { - drm_gem_object_get(obj); - msm_gem_lock(obj); + drm_gpuvm_for_each_va_safe (vma, tmp, gpuvm) { + struct drm_gem_object *obj =3D vma->gem.obj; + + /* + * MSM_BO_NO_SHARE objects share the same resv as the + * VM, in which case the obj is already locked: + */ + if (obj && (obj->resv =3D=3D drm_gpuvm_resv(gpuvm))) + obj =3D NULL; + + if (obj) { + drm_exec_lock_obj(&exec, obj); + drm_exec_retry_on_contention(&exec); + } + + msm_gem_vma_unmap(vma); + msm_gem_vma_close(vma); + + if (obj) { + drm_exec_unlock_obj(&exec, obj); + } } + } + drm_exec_fini(&exec); +} + + +static struct msm_vm_bind_job * +vm_bind_job_create(struct drm_device *dev, struct msm_gpu *gpu, + struct msm_gpu_submitqueue *queue, uint32_t nr_ops) +{ + struct msm_vm_bind_job *job; + uint64_t sz; + int ret; + + sz =3D struct_size(job, ops, nr_ops); + + if (sz > SIZE_MAX) + return ERR_PTR(-ENOMEM); + + job =3D kzalloc(sz, GFP_KERNEL | __GFP_NOWARN); + if (!job) + return ERR_PTR(-ENOMEM); + + ret =3D drm_sched_job_init(&job->base, queue->entity, 1, queue); + if (ret) { + kfree(job); + return ERR_PTR(ret); + } =20 - msm_gem_vma_unmap(vma); - msm_gem_vma_close(vma); + job->vm =3D msm_context_vm(dev, queue->ctx); + job->queue =3D queue; + INIT_LIST_HEAD(&job->vm_ops); =20 - if (obj && obj->resv !=3D drm_gpuvm_resv(gpuvm)) { - msm_gem_unlock(obj); - drm_gem_object_put(obj); + return job; +} + +static bool invalid_alignment(uint64_t addr) +{ + /* + * Technically this is about GPU alignment, not CPU alignment. But + * I've not seen any qcom SoC where the SMMU does not support the + * CPU's smallest page size. + */ + return !PAGE_ALIGNED(addr); +} + +static int +lookup_op(struct msm_vm_bind_job *job, const struct drm_msm_vm_bind_op *op) +{ + struct drm_device *dev =3D job->vm->drm; + int i =3D job->nr_ops++; + int ret =3D 0; + + job->ops[i].op =3D op->op; + job->ops[i].handle =3D op->handle; + job->ops[i].obj_offset =3D op->obj_offset; + job->ops[i].iova =3D op->iova; + job->ops[i].range =3D op->range; + job->ops[i].flags =3D op->flags; + + if (op->flags & ~MSM_VM_BIND_OP_FLAGS) + ret =3D UERR(EINVAL, dev, "invalid flags: %x\n", op->flags); + + if (invalid_alignment(op->iova)) + ret =3D UERR(EINVAL, dev, "invalid address: %016llx\n", op->iova); + + if (invalid_alignment(op->obj_offset)) + ret =3D UERR(EINVAL, dev, "invalid bo_offset: %016llx\n", op->obj_offset= ); + + if (invalid_alignment(op->range)) + ret =3D UERR(EINVAL, dev, "invalid range: %016llx\n", op->range); + + if (!drm_gpuvm_range_valid(job->vm, op->iova, op->range)) + ret =3D UERR(EINVAL, dev, "invalid range: %016llx, %016llx\n", op->iova,= op->range); + + /* + * MAP must specify a valid handle. But the handle MBZ for + * UNMAP or MAP_NULL. + */ + if (op->op =3D=3D MSM_VM_BIND_OP_MAP) { + if (!op->handle) + ret =3D UERR(EINVAL, dev, "invalid handle\n"); + } else if (op->handle) { + ret =3D UERR(EINVAL, dev, "handle must be zero\n"); + } + + switch (op->op) { + case MSM_VM_BIND_OP_MAP: + case MSM_VM_BIND_OP_MAP_NULL: + case MSM_VM_BIND_OP_UNMAP: + break; + default: + ret =3D UERR(EINVAL, dev, "invalid op: %u\n", op->op); + break; + } + + return ret; +} + +/* + * ioctl parsing, parameter validation, and GEM handle lookup + */ +static int +vm_bind_job_lookup_ops(struct msm_vm_bind_job *job, struct drm_msm_vm_bind= *args, + struct drm_file *file, int *nr_bos) +{ + struct drm_device *dev =3D job->vm->drm; + int ret =3D 0; + int cnt =3D 0; + + if (args->nr_ops =3D=3D 1) { + /* Single op case, the op is inlined: */ + ret =3D lookup_op(job, &args->op); + } else { + for (unsigned i =3D 0; i < args->nr_ops; i++) { + struct drm_msm_vm_bind_op op; + void __user *userptr =3D + u64_to_user_ptr(args->ops + (i * sizeof(op))); + + /* make sure we don't have garbage flags, in case we hit + * error path before flags is initialized: + */ + job->ops[i].flags =3D 0; + + if (copy_from_user(&op, userptr, sizeof(op))) { + ret =3D -EFAULT; + break; + } + + ret =3D lookup_op(job, &op); + if (ret) + break; + } + } + + if (ret) { + job->nr_ops =3D 0; + goto out; + } + + spin_lock(&file->table_lock); + + for (unsigned i =3D 0; i < args->nr_ops; i++) { + struct drm_gem_object *obj; + + if (!job->ops[i].handle) { + job->ops[i].obj =3D NULL; + continue; + } + + /* + * normally use drm_gem_object_lookup(), but for bulk lookup + * all under single table_lock just hit object_idr directly: + */ + obj =3D idr_find(&file->object_idr, job->ops[i].handle); + if (!obj) { + ret =3D UERR(EINVAL, dev, "invalid handle %u at index %u\n", job->ops[i= ].handle, i); + goto out_unlock; + } + + drm_gem_object_get(obj); + + job->ops[i].obj =3D obj; + cnt++; + } + + *nr_bos =3D cnt; + +out_unlock: + spin_unlock(&file->table_lock); + +out: + return ret; +} + +static void +prealloc_count(struct msm_vm_bind_job *job, + struct msm_vm_bind_op *first, + struct msm_vm_bind_op *last) +{ + struct msm_mmu *mmu =3D to_msm_vm(job->vm)->mmu; + + if (!first) + return; + + uint64_t start_iova =3D first->iova; + uint64_t end_iova =3D last->iova + last->range; + + mmu->funcs->prealloc_count(mmu, &job->prealloc, start_iova, end_iova - st= art_iova); +} + +static bool +ops_are_same_pte(struct msm_vm_bind_op *first, struct msm_vm_bind_op *next) +{ + /* + * Last level pte covers 2MB.. so we should merge two ops, from + * the PoV of figuring out how much pgtable pages to pre-allocate + * if they land in the same 2MB range: + */ + uint64_t pte_mask =3D ~(SZ_2M - 1); + return ((first->iova + first->range) & pte_mask) =3D=3D (next->iova & pte= _mask); +} + +/* + * Determine the amount of memory to prealloc for pgtables. For sparse im= ages, + * in particular, userspace plays some tricks with the order of page mappi= ngs + * to get the desired swizzle pattern, resulting in a large # of tiny MAP = ops. + * So detect when multiple MAP operations are physically contiguous, and c= ount + * them as a single mapping. Otherwise the prealloc_count() will not real= ize + * they can share pagetable pages and vastly overcount. + */ +static void +vm_bind_prealloc_count(struct msm_vm_bind_job *job) +{ + struct msm_vm_bind_op *first =3D NULL, *last =3D NULL; + + for (int i =3D 0; i < job->nr_ops; i++) { + struct msm_vm_bind_op *op =3D &job->ops[i]; + + /* We only care about MAP/MAP_NULL: */ + if (op->op =3D=3D MSM_VM_BIND_OP_UNMAP) + continue; + + /* + * If op is contiguous with last in the current range, then + * it becomes the new last in the range and we continue + * looping: + */ + if (last && ops_are_same_pte(last, op)) { + last =3D op; + continue; + } + + /* + * If op is not contiguous with the current range, flush + * the current range and start anew: + */ + prealloc_count(job, first, last); + first =3D last =3D op; + } + + /* Flush the remaining range: */ + prealloc_count(job, first, last); +} + +/* + * Lock VM and GEM objects + */ +static int +vm_bind_job_lock_objects(struct msm_vm_bind_job *job, struct drm_exec *exe= c) +{ + int ret; + + /* Lock VM and objects: */ + drm_exec_until_all_locked (exec) { + ret =3D drm_exec_lock_obj(exec, drm_gpuvm_resv_obj(job->vm)); + drm_exec_retry_on_contention(exec); + if (ret) + return ret; + + for (unsigned i =3D 0; i < job->nr_ops; i++) { + const struct msm_vm_bind_op *op =3D &job->ops[i]; + + switch (op->op) { + case MSM_VM_BIND_OP_UNMAP: + ret =3D drm_gpuvm_sm_unmap_exec_lock(job->vm, exec, + op->iova, + op->obj_offset); + break; + case MSM_VM_BIND_OP_MAP: + case MSM_VM_BIND_OP_MAP_NULL: + ret =3D drm_gpuvm_sm_map_exec_lock(job->vm, exec, 1, + op->iova, op->range, + op->obj, op->obj_offset); + break; + default: + /* + * lookup_op() should have already thrown an error for + * invalid ops + */ + WARN_ON("unreachable"); + } + + drm_exec_retry_on_contention(exec); + if (ret) + return ret; + } + } + + return 0; +} + +/* + * Pin GEM objects, ensuring that we have backing pages. Pinning will move + * the object to the pinned LRU so that the shrinker knows to first consid= er + * other objects for evicting. + */ +static int +vm_bind_job_pin_objects(struct msm_vm_bind_job *job) +{ + struct drm_gem_object *obj; + + /* + * First loop, before holding the LRU lock, avoids holding the + * LRU lock while calling msm_gem_pin_vma_locked (which could + * trigger get_pages()) + */ + job_foreach_bo (obj, job) { + struct page **pages; + + pages =3D msm_gem_get_pages_locked(obj, MSM_MADV_WILLNEED); + if (IS_ERR(pages)) + return PTR_ERR(pages); + } + + struct msm_drm_private *priv =3D job->vm->drm->dev_private; + + /* + * A second loop while holding the LRU lock (a) avoids acquiring/dropping + * the LRU lock for each individual bo, while (b) avoiding holding the + * LRU lock while calling msm_gem_pin_vma_locked() (which could trigger + * get_pages() which could trigger reclaim.. and if we held the LRU lock + * could trigger deadlock with the shrinker). + */ + mutex_lock(&priv->lru.lock); + job_foreach_bo (obj, job) + msm_gem_pin_obj_locked(obj); + mutex_unlock(&priv->lru.lock); + + job->bos_pinned =3D true; + + return 0; +} + +/* + * Unpin GEM objects. Normally this is done after the bind job is run. + */ +static void +vm_bind_job_unpin_objects(struct msm_vm_bind_job *job) +{ + struct drm_gem_object *obj; + + if (!job->bos_pinned) + return; + + job_foreach_bo (obj, job) + msm_gem_unpin_locked(obj); + + job->bos_pinned =3D false; +} + +/* + * Pre-allocate pgtable memory, and translate the VM bind requests into a + * sequence of pgtable updates to be applied asynchronously. + */ +static int +vm_bind_job_prepare(struct msm_vm_bind_job *job) +{ + struct msm_gem_vm *vm =3D to_msm_vm(job->vm); + struct msm_mmu *mmu =3D vm->mmu; + int ret; + + ret =3D mmu->funcs->prealloc_allocate(mmu, &job->prealloc); + if (ret) + return ret; + + for (unsigned i =3D 0; i < job->nr_ops; i++) { + const struct msm_vm_bind_op *op =3D &job->ops[i]; + struct op_arg arg =3D { + .job =3D job, + }; + + switch (op->op) { + case MSM_VM_BIND_OP_UNMAP: + ret =3D drm_gpuvm_sm_unmap(job->vm, &arg, op->iova, + op->range); + break; + case MSM_VM_BIND_OP_MAP: + if (op->flags & MSM_VM_BIND_OP_DUMP) + arg.flags |=3D MSM_VMA_DUMP; + fallthrough; + case MSM_VM_BIND_OP_MAP_NULL: + ret =3D drm_gpuvm_sm_map(job->vm, &arg, op->iova, + op->range, op->obj, op->obj_offset); + break; + default: + /* + * lookup_op() should have already thrown an error for + * invalid ops + */ + BUG_ON("unreachable"); + } + + if (ret) { + /* + * If we've already started modifying the vm, we can't + * adequetly describe to userspace the intermediate + * state the vm is in. So throw up our hands! + */ + if (i > 0) + vm->unusable =3D true; + return ret; + } + } + + return 0; +} + +/* + * Attach fences to the GEM objects being bound. This will signify to + * the shrinker that they are busy even after dropping the locks (ie. + * drm_exec_fini()) + */ +static void +vm_bind_job_attach_fences(struct msm_vm_bind_job *job) +{ + for (unsigned i =3D 0; i < job->nr_ops; i++) { + struct drm_gem_object *obj =3D job->ops[i].obj; + + if (!obj) + continue; + + dma_resv_add_fence(obj->resv, job->fence, + DMA_RESV_USAGE_KERNEL); + } +} + +int +msm_ioctl_vm_bind(struct drm_device *dev, void *data, struct drm_file *fil= e) +{ + struct msm_drm_private *priv =3D dev->dev_private; + struct drm_msm_vm_bind *args =3D data; + struct msm_context *ctx =3D file->driver_priv; + struct msm_vm_bind_job *job =3D NULL; + struct msm_gpu *gpu =3D priv->gpu; + struct msm_gpu_submitqueue *queue; + struct msm_syncobj_post_dep *post_deps =3D NULL; + struct drm_syncobj **syncobjs_to_reset =3D NULL; + struct sync_file *sync_file =3D NULL; + struct dma_fence *fence; + int out_fence_fd =3D -1; + int ret, nr_bos =3D 0; + unsigned i; + + if (!gpu) + return -ENXIO; + + /* + * Maybe we could allow just UNMAP ops? OTOH userspace should just + * immediately close the device file and all will be torn down. + */ + if (to_msm_vm(ctx->vm)->unusable) + return UERR(EPIPE, dev, "context is unusable"); + + /* + * Technically, you cannot create a VM_BIND submitqueue in the first + * place, if you haven't opted in to VM_BIND context. But it is + * cleaner / less confusing, to check this case directly. + */ + if (!msm_context_is_vmbind(ctx)) + return UERR(EINVAL, dev, "context does not support vmbind"); + + if (args->flags & ~MSM_VM_BIND_FLAGS) + return UERR(EINVAL, dev, "invalid flags"); + + queue =3D msm_submitqueue_get(ctx, args->queue_id); + if (!queue) + return -ENOENT; + + if (!(queue->flags & MSM_SUBMITQUEUE_VM_BIND)) { + ret =3D UERR(EINVAL, dev, "Invalid queue type"); + goto out_post_unlock; + } + + if (args->flags & MSM_VM_BIND_FENCE_FD_OUT) { + out_fence_fd =3D get_unused_fd_flags(O_CLOEXEC); + if (out_fence_fd < 0) { + ret =3D out_fence_fd; + goto out_post_unlock; } } - dma_resv_unlock(drm_gpuvm_resv(gpuvm)); + + job =3D vm_bind_job_create(dev, gpu, queue, args->nr_ops); + if (IS_ERR(job)) { + ret =3D PTR_ERR(job); + goto out_post_unlock; + } + + ret =3D mutex_lock_interruptible(&queue->lock); + if (ret) + goto out_post_unlock; + + if (args->flags & MSM_VM_BIND_FENCE_FD_IN) { + struct dma_fence *in_fence; + + in_fence =3D sync_file_get_fence(args->fence_fd); + + if (!in_fence) { + ret =3D UERR(EINVAL, dev, "invalid in-fence"); + goto out_unlock; + } + + ret =3D drm_sched_job_add_dependency(&job->base, in_fence); + if (ret) + goto out_unlock; + } + + if (args->in_syncobjs > 0) { + syncobjs_to_reset =3D msm_syncobj_parse_deps(dev, &job->base, + file, args->in_syncobjs, + args->nr_in_syncobjs, + args->syncobj_stride); + if (IS_ERR(syncobjs_to_reset)) { + ret =3D PTR_ERR(syncobjs_to_reset); + goto out_unlock; + } + } + + if (args->out_syncobjs > 0) { + post_deps =3D msm_syncobj_parse_post_deps(dev, file, + args->out_syncobjs, + args->nr_out_syncobjs, + args->syncobj_stride); + if (IS_ERR(post_deps)) { + ret =3D PTR_ERR(post_deps); + goto out_unlock; + } + } + + ret =3D vm_bind_job_lookup_ops(job, args, file, &nr_bos); + if (ret) + goto out_unlock; + + vm_bind_prealloc_count(job); + + struct drm_exec exec; + unsigned flags =3D DRM_EXEC_IGNORE_DUPLICATES | DRM_EXEC_INTERRUPTIBLE_WA= IT; + drm_exec_init(&exec, flags, nr_bos + 1); + + ret =3D vm_bind_job_lock_objects(job, &exec); + if (ret) + goto out; + + ret =3D vm_bind_job_pin_objects(job); + if (ret) + goto out; + + ret =3D vm_bind_job_prepare(job); + if (ret) + goto out; + + drm_sched_job_arm(&job->base); + + job->fence =3D dma_fence_get(&job->base.s_fence->finished); + + if (args->flags & MSM_VM_BIND_FENCE_FD_OUT) { + sync_file =3D sync_file_create(job->fence); + if (!sync_file) { + ret =3D -ENOMEM; + } else { + fd_install(out_fence_fd, sync_file->file); + args->fence_fd =3D out_fence_fd; + } + } + + if (ret) + goto out; + + vm_bind_job_attach_fences(job); + + /* + * The job can be free'd (and fence unref'd) at any point after + * drm_sched_entity_push_job(), so we need to hold our own ref + */ + fence =3D dma_fence_get(job->fence); + + drm_sched_entity_push_job(&job->base); + + msm_syncobj_reset(syncobjs_to_reset, args->nr_in_syncobjs); + msm_syncobj_process_post_deps(post_deps, args->nr_out_syncobjs, fence); + + dma_fence_put(fence); + +out: + if (ret) + vm_bind_job_unpin_objects(job); + + drm_exec_fini(&exec); +out_unlock: + mutex_unlock(&queue->lock); +out_post_unlock: + if (ret && (out_fence_fd >=3D 0)) { + put_unused_fd(out_fence_fd); + if (sync_file) + fput(sync_file->file); + } + + if (!IS_ERR_OR_NULL(job)) { + if (ret) + msm_vma_job_free(&job->base); + } else { + /* + * If the submit hasn't yet taken ownership of the queue + * then we need to drop the reference ourself: + */ + msm_submitqueue_put(queue); + } + + if (!IS_ERR_OR_NULL(post_deps)) { + for (i =3D 0; i < args->nr_out_syncobjs; ++i) { + kfree(post_deps[i].chain); + drm_syncobj_put(post_deps[i].syncobj); + } + kfree(post_deps); + } + + if (!IS_ERR_OR_NULL(syncobjs_to_reset)) { + for (i =3D 0; i < args->nr_in_syncobjs; ++i) { + if (syncobjs_to_reset[i]) + drm_syncobj_put(syncobjs_to_reset[i]); + } + kfree(syncobjs_to_reset); + } + + return ret; } diff --git a/include/uapi/drm/msm_drm.h b/include/uapi/drm/msm_drm.h index 6d6cd1219926..5c67294edc95 100644 --- a/include/uapi/drm/msm_drm.h +++ b/include/uapi/drm/msm_drm.h @@ -272,7 +272,10 @@ struct drm_msm_gem_submit_cmd { __u32 size; /* in, cmdstream size */ __u32 pad; __u32 nr_relocs; /* in, number of submit_reloc's */ - __u64 relocs; /* in, ptr to array of submit_reloc's */ + union { + __u64 relocs; /* in, ptr to array of submit_reloc's */ + __u64 iova; /* cmdstream address (for VM_BIND contexts) */ + }; }; =20 /* Each buffer referenced elsewhere in the cmdstream submit (ie. the @@ -339,7 +342,74 @@ struct drm_msm_gem_submit { __u32 nr_out_syncobjs; /* in, number of entries in out_syncobj. */ __u32 syncobj_stride; /* in, stride of syncobj arrays. */ __u32 pad; /*in, reserved for future use, always 0. */ +}; + +#define MSM_VM_BIND_OP_UNMAP 0 +#define MSM_VM_BIND_OP_MAP 1 +#define MSM_VM_BIND_OP_MAP_NULL 2 + +#define MSM_VM_BIND_OP_DUMP 1 +#define MSM_VM_BIND_OP_FLAGS ( \ + MSM_VM_BIND_OP_DUMP | \ + 0) =20 +/** + * struct drm_msm_vm_bind_op - bind/unbind op to run + */ +struct drm_msm_vm_bind_op { + /** @op: one of MSM_VM_BIND_OP_x */ + __u32 op; + /** @handle: GEM object handle, MBZ for UNMAP or MAP_NULL */ + __u32 handle; + /** @obj_offset: Offset into GEM object, MBZ for UNMAP or MAP_NULL */ + __u64 obj_offset; + /** @iova: Address to operate on */ + __u64 iova; + /** @range: Number of bites to to map/unmap */ + __u64 range; + /** @flags: Bitmask of MSM_VM_BIND_OP_FLAG_x */ + __u32 flags; + /** @pad: MBZ */ + __u32 pad; +}; + +#define MSM_VM_BIND_FENCE_FD_IN 0x00000001 +#define MSM_VM_BIND_FENCE_FD_OUT 0x00000002 +#define MSM_VM_BIND_FLAGS ( \ + MSM_VM_BIND_FENCE_FD_IN | \ + MSM_VM_BIND_FENCE_FD_OUT | \ + 0) + +/** + * struct drm_msm_vm_bind - Input of &DRM_IOCTL_MSM_VM_BIND + */ +struct drm_msm_vm_bind { + /** @flags: in, bitmask of MSM_VM_BIND_x */ + __u32 flags; + /** @nr_ops: the number of bind ops in this ioctl */ + __u32 nr_ops; + /** @fence_fd: in/out fence fd (see MSM_VM_BIND_FENCE_FD_IN/OUT) */ + __s32 fence_fd; + /** @queue_id: in, submitqueue id */ + __u32 queue_id; + /** @in_syncobjs: in, ptr to array of drm_msm_gem_syncobj */ + __u64 in_syncobjs; + /** @out_syncobjs: in, ptr to array of drm_msm_gem_syncobj */ + __u64 out_syncobjs; + /** @nr_in_syncobjs: in, number of entries in in_syncobj */ + __u32 nr_in_syncobjs; + /** @nr_out_syncobjs: in, number of entries in out_syncobj */ + __u32 nr_out_syncobjs; + /** @syncobj_stride: in, stride of syncobj arrays */ + __u32 syncobj_stride; + /** @op_stride: sizeof each struct drm_msm_vm_bind_op in @ops */ + __u32 op_stride; + union { + /** @op: used if num_ops =3D=3D 1 */ + struct drm_msm_vm_bind_op op; + /** @ops: userptr to array of drm_msm_vm_bind_op if num_ops > 1 */ + __u64 ops; + }; }; =20 #define MSM_WAIT_FENCE_BOOST 0x00000001 @@ -435,6 +505,7 @@ struct drm_msm_submitqueue_query { #define DRM_MSM_SUBMITQUEUE_NEW 0x0A #define DRM_MSM_SUBMITQUEUE_CLOSE 0x0B #define DRM_MSM_SUBMITQUEUE_QUERY 0x0C +#define DRM_MSM_VM_BIND 0x0D =20 #define DRM_IOCTL_MSM_GET_PARAM DRM_IOWR(DRM_COMMAND_BASE + DRM_MSM= _GET_PARAM, struct drm_msm_param) #define DRM_IOCTL_MSM_SET_PARAM DRM_IOW (DRM_COMMAND_BASE + DRM_MSM= _SET_PARAM, struct drm_msm_param) @@ -448,6 +519,7 @@ struct drm_msm_submitqueue_query { #define DRM_IOCTL_MSM_SUBMITQUEUE_NEW DRM_IOWR(DRM_COMMAND_BASE + DRM_M= SM_SUBMITQUEUE_NEW, struct drm_msm_submitqueue) #define DRM_IOCTL_MSM_SUBMITQUEUE_CLOSE DRM_IOW (DRM_COMMAND_BASE + DRM_M= SM_SUBMITQUEUE_CLOSE, __u32) #define DRM_IOCTL_MSM_SUBMITQUEUE_QUERY DRM_IOW (DRM_COMMAND_BASE + DRM_M= SM_SUBMITQUEUE_QUERY, struct drm_msm_submitqueue_query) +#define DRM_IOCTL_MSM_VM_BIND DRM_IOWR(DRM_COMMAND_BASE + DRM_MSM= _VM_BIND, struct drm_msm_vm_bind) =20 #if defined(__cplusplus) } --=20 2.50.0 From nobody Wed Oct 8 10:58:51 2025 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 ABB54246795 for ; Sun, 29 Jun 2025 14:08:15 +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=1751206098; cv=none; b=WiOEZZh0cuAjCdHszAcyMUgj7K5VNJJDLivMUZiLN4qN75KsiP8E/f8GknahQWj8F2lQcvOM5zJe4unHX5OfN9Jh4dWleoaJwfjmQjtNVJT63eYYfqXwqdHbPovW9Zv3aYIe9oAey5v0hwt2bKRM7dtcJZiq2mOWru+jItDP+2E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751206098; c=relaxed/simple; bh=A/YMwPxI4drHsEBpMlSI4ZEIOUWk+enu87xKZM4vC9Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RrH/87FdwJWOGkk595zAfu55po0hYlPVy5xksK7c1/+YIFoi9YsgXWQ4PIloNyMiQ+YYyk40+6Tbs5G/KRTQTi5Eiv2p9ea0t9lnbBY+TcgNzt1dgMH6BjYS9RV8Kirl2TAvHm70mMY+an3rJiu+OzPHIsQybn9oT2128HDI7T0= 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=C26AHzPI; 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="C26AHzPI" Received: from pps.filterd (m0279867.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 55TCVoR5022520 for ; Sun, 29 Jun 2025 14:08:15 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=H0NxUUerXIP OxBBD23fcfhMmUbbhrv7qSetQ/SEeLRg=; b=C26AHzPIHEgxxSsd6oK68P57Jvd StXZpmJ6bz9mbDuYvJ2ge74a5WAM3cIuQNGKxvx9BpGasXBPzoHF99NQotpfLDyG HG55lCSslnDHAOTDiZ7u/TwZe/UvjbdToRUafDrpuy5Kw8Re6/VYhMWEaIOPhPtP +rrtPWAwtvC8vBduD4XfJgfkKrqtbpMdnG31CgybqmFSVp7OjT73Q21cCsbEO6xs ScoFFGD3rMtIWmdXz0wYBCyQB41kip7uREs7rvEnMoAhGj/fK/G/6GqHMQ9XHVWS I0Q8lhHT0SWLI4TUNGLIrpRrR++koy0JGOh1xEU/u8KeZcPQheBHZ+1OJMw== Received: from mail-pf1-f200.google.com (mail-pf1-f200.google.com [209.85.210.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 47j63k2e3f-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Sun, 29 Jun 2025 14:08:14 +0000 (GMT) Received: by mail-pf1-f200.google.com with SMTP id d2e1a72fcca58-748f3613e6aso496704b3a.0 for ; Sun, 29 Jun 2025 07:08:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751206094; x=1751810894; 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=H0NxUUerXIPOxBBD23fcfhMmUbbhrv7qSetQ/SEeLRg=; b=rce0/4et9ChxKYAFuWgnpQz2VXG1uR/qau3k52vkjwZx0ndA32PGZtR8QHUI48Pxi1 RByWU6VdaEXwjWna4YQ1gdXgu2LBJEJkRjWTD9RNYBisD36CRotMLIxDyccJGlSt7UgQ rqu+uiX4YKE36cWJCXqhDK5r8usdGWJhdyNYV0taIU7hTqADb+Spn4nCpvuULAJIgp1N yuQWkmECr3v4upvkN6I+FrOgA/74S2aT0Wn8JYswgyWyrykEBQaZ/ASz7ShVUM9KzHIs ybyve9XyHDVHZ08kQ5WfmZ+gOGpoB5dVw4e5QSKhCICVdErqp9OTUbm09aFppQ3iuPUD U9qw== X-Forwarded-Encrypted: i=1; AJvYcCXiozf1ZS1dhdZFKkPR1dWgCa6fr/U+hIBT9jN0OJdE+xvpq2DVAHDzjYIAl0ah+BqAQ1c3QHn0+aSijcQ=@vger.kernel.org X-Gm-Message-State: AOJu0YxBG6wt4DhEZnObSIGJxQdYtBJMkXQmofiCyIGFkF0rWU7n9avQ J2eHSNDV4+25olXhiaLD851j8RJNb4rb9fLCMyln8PQ8M6a2JE49N3lBj5lfrwZU1fA/bntR+6t 6cNnF1f6DLHW5SsFJFY6aJJf5o+PxvY583CQZRzht+CuspFUllFfb+CAJthSaRjNOBJs= X-Gm-Gg: ASbGnctMm3tI28kgrLJ+/dn3j72Wl63i+ssraj8d2kAf8OeVba0FlSWuGhsjx21UVzY NoVNKyXVElpNQCjGTD2MD/UuaIHJdJT3scMuQzDiUVPvvF95eUlL9xUG8PyFlCS2xSSDo7C+C3m j55lGQ+b4STKQyjCagiKdHJOE+Ec6Ykxtc/gW/xiAAJSrEPgKh7aKrUwZG7autbYiGyNjUZe06I KZH1LvYrfcSXZVbETL1WN6N+UZ8hH/F1we76rY0FQSrjBfNW6EVYVAjm3heVMAY/gPm6SQirUR8 i8AwbWBDHs0opMzbefgeNNmfPtR1pKY4 X-Received: by 2002:a05:6a00:2da9:b0:742:a02e:dd8d with SMTP id d2e1a72fcca58-74af6ff20d6mr14434356b3a.20.1751206093570; Sun, 29 Jun 2025 07:08:13 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEXzpFYuUR58PK6R1U6IZlQOQQicOB5AVjWsgE/yTrdAFaNjonI9m+OqXm3iu/TIEe6mcsvng== X-Received: by 2002:a05:6a00:2da9:b0:742:a02e:dd8d with SMTP id d2e1a72fcca58-74af6ff20d6mr14434311b3a.20.1751206092999; Sun, 29 Jun 2025 07:08:12 -0700 (PDT) Received: from localhost ([2601:1c0:5000:d5c:5b3e:de60:4fda:e7b1]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-74af55c8437sm6535281b3a.115.2025.06.29.07.08.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Jun 2025 07:08:12 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, Connor Abbott , Antonino Maniscalco , Danilo Krummrich , Rob Clark , Rob Clark , Sean Paul , Konrad Dybcio , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Marijn Suijten , David Airlie , Simona Vetter , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v8 36/42] drm/msm: Add VM logging for VM_BIND updates Date: Sun, 29 Jun 2025 07:03:39 -0700 Message-ID: <20250629140537.30850-37-robin.clark@oss.qualcomm.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250629140537.30850-1-robin.clark@oss.qualcomm.com> References: <20250629140537.30850-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-Authority-Analysis: v=2.4 cv=ZKfXmW7b c=1 sm=1 tr=0 ts=686148ce cx=c_pps a=mDZGXZTwRPZaeRUbqKGCBw==:117 a=xqWC_Br6kY4A:10 a=6IFa9wvqVegA:10 a=cm27Pg_UAAAA:8 a=EUspDBNiAAAA:8 a=pGLkceISAAAA:8 a=Ivokvn2EMlC-zZWxPmsA:9 a=zc0IvFSfCIW2DFIPzwfm:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjI5MDExOSBTYWx0ZWRfX6hdB9H4mM9Qb vpN7QEmS5073RIWFYOp0XZAdGlxxdVMIpB82eM2EPKr1t8axxNM9TiifRkVqK5RMwpQCSQXZ2Uj UPXcnlZxxwQdpeeZyhJdaIQV1rctHH9WosO/Cdf3JWTflvTOdS21EdDHYrSiZfSO158kq1/FtfR f4MeC305puPCQvSV/GZZDm55YxxgZtusN3ni7OTEr1BIuOtetsdOe4k7w3WIgF3emp1cSfdrolY T1RQtiUOOxh/H0nmfzZE0DNK5PfeLWtGRyN0kOzS4gBrT1b1LixiXd23ATlR8gLLUMQOlJTcfMG ncc9gmX1TC9rY43sbALQMSCIpotfrp4x70IIfma9HCVtZZKmcxIZ7jc9KPVNF3secikd2DKJCLm +/m+VeQ+ZjhME2QmVcuyDfjj9P86rY3UuKUCF3K0YWCAgwtPCclI/2Ewg5ya87Zn0y/zl8ZU X-Proofpoint-ORIG-GUID: key1Ys0ETDj3dXAVHgpaQtj-uHe4EBza X-Proofpoint-GUID: key1Ys0ETDj3dXAVHgpaQtj-uHe4EBza 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-27_05,2025-06-27_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 mlxscore=0 mlxlogscore=999 spamscore=0 suspectscore=0 bulkscore=0 priorityscore=1501 lowpriorityscore=0 phishscore=0 impostorscore=0 malwarescore=0 clxscore=1015 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2506290119 Content-Type: text/plain; charset="utf-8" From: Rob Clark When userspace opts in to VM_BIND, the submit no longer holds references keeping the VMA alive. This makes it difficult to distinguish between UMD/KMD/app bugs. So add a debug option for logging the most recent VM updates and capturing these in GPU devcoredumps. The submitqueue id is also captured, a value of zero means the operation did not go via a submitqueue (ie. comes from msm_gem_vm_close() tearing down the remaining mappings when the device file is closed. Signed-off-by: Rob Clark Signed-off-by: Rob Clark Tested-by: Antonino Maniscalco Reviewed-by: Antonino Maniscalco --- drivers/gpu/drm/msm/adreno/adreno_gpu.c | 11 +++ drivers/gpu/drm/msm/msm_gem.h | 24 +++++ drivers/gpu/drm/msm/msm_gem_vma.c | 124 ++++++++++++++++++++++-- drivers/gpu/drm/msm/msm_gpu.c | 52 +++++++++- drivers/gpu/drm/msm/msm_gpu.h | 4 + 5 files changed, 202 insertions(+), 13 deletions(-) diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/= adreno/adreno_gpu.c index ff25e3dada04..53cbfa5a507b 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c @@ -833,6 +833,7 @@ void adreno_gpu_state_destroy(struct msm_gpu_state *sta= te) for (i =3D 0; state->bos && i < state->nr_bos; i++) kvfree(state->bos[i].data); =20 + kfree(state->vm_logs); kfree(state->bos); kfree(state->comm); kfree(state->cmd); @@ -973,6 +974,16 @@ void adreno_show(struct msm_gpu *gpu, struct msm_gpu_s= tate *state, info->ptes[0], info->ptes[1], info->ptes[2], info->ptes[3]); } =20 + if (state->vm_logs) { + drm_puts(p, "vm-log:\n"); + for (i =3D 0; i < state->nr_vm_logs; i++) { + struct msm_gem_vm_log_entry *e =3D &state->vm_logs[i]; + drm_printf(p, " - %s:%d: 0x%016llx-0x%016llx\n", + e->op, e->queue_id, e->iova, + e->iova + e->range); + } + } + drm_printf(p, "rbbm-status: 0x%08x\n", state->rbbm_status); =20 drm_puts(p, "ringbuffer:\n"); diff --git a/drivers/gpu/drm/msm/msm_gem.h b/drivers/gpu/drm/msm/msm_gem.h index ee464e315643..062d1b5477d6 100644 --- a/drivers/gpu/drm/msm/msm_gem.h +++ b/drivers/gpu/drm/msm/msm_gem.h @@ -24,6 +24,20 @@ #define MSM_BO_STOLEN 0x10000000 /* try to use stolen/splash mem= ory */ #define MSM_BO_MAP_PRIV 0x20000000 /* use IOMMU_PRIV when mapping = */ =20 +/** + * struct msm_gem_vm_log_entry - An entry in the VM log + * + * For userspace managed VMs, a log of recent VM updates is tracked and + * captured in GPU devcore dumps, to aid debugging issues caused by (for + * example) incorrectly synchronized VM updates + */ +struct msm_gem_vm_log_entry { + const char *op; + uint64_t iova; + uint64_t range; + int queue_id; +}; + /** * struct msm_gem_vm - VM object * @@ -85,6 +99,15 @@ struct msm_gem_vm { /** @last_fence: Fence for last pending work scheduled on the VM */ struct dma_fence *last_fence; =20 + /** @log: A log of recent VM updates */ + struct msm_gem_vm_log_entry *log; + + /** @log_shift: length of @log is (1 << @log_shift) */ + uint32_t log_shift; + + /** @log_idx: index of next @log entry to write */ + uint32_t log_idx; + /** @faults: the number of GPU hangs associated with this address space */ int faults; =20 @@ -115,6 +138,7 @@ msm_gem_vm_create(struct drm_device *drm, struct msm_mm= u *mmu, const char *name, u64 va_start, u64 va_size, bool managed); =20 void msm_gem_vm_close(struct drm_gpuvm *gpuvm); +void msm_gem_vm_unusable(struct drm_gpuvm *gpuvm); =20 struct msm_fence_context; =20 diff --git a/drivers/gpu/drm/msm/msm_gem_vma.c b/drivers/gpu/drm/msm/msm_ge= m_vma.c index 5d4b7e3e9d2c..729027245986 100644 --- a/drivers/gpu/drm/msm/msm_gem_vma.c +++ b/drivers/gpu/drm/msm/msm_gem_vma.c @@ -17,6 +17,10 @@ =20 #define vm_dbg(fmt, ...) pr_debug("%s:%d: "fmt"\n", __func__, __LINE__, ##= __VA_ARGS__) =20 +static uint vm_log_shift =3D 0; +MODULE_PARM_DESC(vm_log_shift, "Length of VM op log"); +module_param_named(vm_log_shift, vm_log_shift, uint, 0600); + /** * struct msm_vm_map_op - create new pgtable mapping */ @@ -31,6 +35,13 @@ struct msm_vm_map_op { struct sg_table *sgt; /** @prot: the mapping protection flags */ int prot; + + /** + * @queue_id: The id of the submitqueue the operation is performed + * on, or zero for (in particular) UNMAP ops triggered outside of + * a submitqueue (ie. process cleanup) + */ + int queue_id; }; =20 /** @@ -41,6 +52,13 @@ struct msm_vm_unmap_op { uint64_t iova; /** @range: size of region to unmap */ uint64_t range; + + /** + * @queue_id: The id of the submitqueue the operation is performed + * on, or zero for (in particular) UNMAP ops triggered outside of + * a submitqueue (ie. process cleanup) + */ + int queue_id; }; =20 /** @@ -144,16 +162,87 @@ msm_gem_vm_free(struct drm_gpuvm *gpuvm) vm->mmu->funcs->destroy(vm->mmu); dma_fence_put(vm->last_fence); put_pid(vm->pid); + kfree(vm->log); kfree(vm); } =20 +/** + * msm_gem_vm_unusable() - Mark a VM as unusable + * @vm: the VM to mark unusable + */ +void +msm_gem_vm_unusable(struct drm_gpuvm *gpuvm) +{ + struct msm_gem_vm *vm =3D to_msm_vm(gpuvm); + uint32_t vm_log_len =3D (1 << vm->log_shift); + uint32_t vm_log_mask =3D vm_log_len - 1; + uint32_t nr_vm_logs; + int first; + + vm->unusable =3D true; + + /* Bail if no log, or empty log: */ + if (!vm->log || !vm->log[0].op) + return; + + mutex_lock(&vm->mmu_lock); + + /* + * log_idx is the next entry to overwrite, meaning it is the oldest, or + * first, entry (other than the special case handled below where the + * log hasn't wrapped around yet) + */ + first =3D vm->log_idx; + + if (!vm->log[first].op) { + /* + * If the next log entry has not been written yet, then only + * entries 0 to idx-1 are valid (ie. we haven't wrapped around + * yet) + */ + nr_vm_logs =3D MAX(0, first - 1); + first =3D 0; + } else { + nr_vm_logs =3D vm_log_len; + } + + pr_err("vm-log:\n"); + for (int i =3D 0; i < nr_vm_logs; i++) { + int idx =3D (i + first) & vm_log_mask; + struct msm_gem_vm_log_entry *e =3D &vm->log[idx]; + pr_err(" - %s:%d: 0x%016llx-0x%016llx\n", + e->op, e->queue_id, e->iova, + e->iova + e->range); + } + + mutex_unlock(&vm->mmu_lock); +} + static void -vm_unmap_op(struct msm_gem_vm *vm, const struct msm_vm_unmap_op *op) +vm_log(struct msm_gem_vm *vm, const char *op, uint64_t iova, uint64_t rang= e, int queue_id) { + int idx; + if (!vm->managed) lockdep_assert_held(&vm->mmu_lock); =20 - vm_dbg("%p: %016llx %016llx", vm, op->iova, op->iova + op->range); + vm_dbg("%s:%p:%d: %016llx %016llx", op, vm, queue_id, iova, iova + range); + + if (!vm->log) + return; + + idx =3D vm->log_idx; + vm->log[idx].op =3D op; + vm->log[idx].iova =3D iova; + vm->log[idx].range =3D range; + vm->log[idx].queue_id =3D queue_id; + vm->log_idx =3D (vm->log_idx + 1) & ((1 << vm->log_shift) - 1); +} + +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); =20 vm->mmu->funcs->unmap(vm->mmu, op->iova, op->range); } @@ -161,10 +250,7 @@ vm_unmap_op(struct msm_gem_vm *vm, const struct msm_vm= _unmap_op *op) static int vm_map_op(struct msm_gem_vm *vm, const struct msm_vm_map_op *op) { - if (!vm->managed) - lockdep_assert_held(&vm->mmu_lock); - - vm_dbg("%p: %016llx %016llx", vm, op->iova, op->iova + op->range); + vm_log(vm, "map", op->iova, op->range, op->queue_id); =20 return vm->mmu->funcs->map(vm->mmu, op->iova, op->sgt, op->offset, op->range, op->prot); @@ -382,6 +468,7 @@ vma_from_op(struct op_arg *arg, struct drm_gpuva_op_map= *op) static int msm_gem_vm_sm_step_map(struct drm_gpuva_op *op, void *arg) { + struct msm_vm_bind_job *job =3D ((struct op_arg *)arg)->job; struct drm_gem_object *obj =3D op->map.gem.obj; struct drm_gpuva *vma; struct sg_table *sgt; @@ -412,6 +499,7 @@ msm_gem_vm_sm_step_map(struct drm_gpuva_op *op, void *a= rg) .range =3D vma->va.range, .offset =3D vma->gem.offset, .prot =3D prot, + .queue_id =3D job->queue->id, }, .obj =3D vma->gem.obj, }); @@ -445,6 +533,7 @@ msm_gem_vm_sm_step_remap(struct drm_gpuva_op *op, void = *arg) .unmap =3D { .iova =3D unmap_start, .range =3D unmap_range, + .queue_id =3D job->queue->id, }, .obj =3D orig_vma->gem.obj, }); @@ -506,6 +595,7 @@ msm_gem_vm_sm_step_remap(struct drm_gpuva_op *op, void = *arg) static int msm_gem_vm_sm_step_unmap(struct drm_gpuva_op *op, void *arg) { + struct msm_vm_bind_job *job =3D ((struct op_arg *)arg)->job; struct drm_gpuva *vma =3D op->unmap.va; struct msm_gem_vma *msm_vma =3D to_msm_vma(vma); =20 @@ -520,6 +610,7 @@ msm_gem_vm_sm_step_unmap(struct drm_gpuva_op *op, void = *arg) .unmap =3D { .iova =3D vma->va.addr, .range =3D vma->va.range, + .queue_id =3D job->queue->id, }, .obj =3D vma->gem.obj, }); @@ -584,7 +675,7 @@ msm_vma_job_run(struct drm_sched_job *_job) * now the VM is in an undefined state. Game over! */ if (ret) - vm->unusable =3D true; + msm_gem_vm_unusable(job->vm); =20 job_foreach_bo (obj, job) { msm_gem_lock(obj); @@ -695,6 +786,23 @@ msm_gem_vm_create(struct drm_device *drm, struct msm_m= mu *mmu, const char *name, =20 drm_mm_init(&vm->mm, va_start, va_size); =20 + /* + * We don't really need vm log for kernel managed VMs, as the kernel + * is responsible for ensuring that GEM objs are mapped if they are + * used by a submit. Furthermore we piggyback on mmu_lock to serialize + * access to the log. + * + * Limit the max log_shift to 8 to prevent userspace from asking us + * for an unreasonable log size. + */ + if (!managed) + vm->log_shift =3D MIN(vm_log_shift, 8); + + if (vm->log_shift) { + vm->log =3D kmalloc_array(1 << vm->log_shift, sizeof(vm->log[0]), + GFP_KERNEL | __GFP_ZERO); + } + return &vm->base; =20 err_free_dummy: @@ -1161,7 +1269,7 @@ vm_bind_job_prepare(struct msm_vm_bind_job *job) * state the vm is in. So throw up our hands! */ if (i > 0) - vm->unusable =3D true; + msm_gem_vm_unusable(job->vm); return ret; } } diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c index ccd9ebfc5c7c..c317b25a8162 100644 --- a/drivers/gpu/drm/msm/msm_gpu.c +++ b/drivers/gpu/drm/msm/msm_gpu.c @@ -259,9 +259,6 @@ static void crashstate_get_bos(struct msm_gpu_state *st= ate, struct msm_gem_submi { extern bool rd_full; =20 - if (!submit) - return; - if (msm_context_is_vmbind(submit->queue->ctx)) { struct drm_exec exec; struct drm_gpuva *vma; @@ -318,6 +315,48 @@ static void crashstate_get_bos(struct msm_gpu_state *s= tate, struct msm_gem_submi } } =20 +static void crashstate_get_vm_logs(struct msm_gpu_state *state, struct msm= _gem_vm *vm) +{ + uint32_t vm_log_len =3D (1 << vm->log_shift); + uint32_t vm_log_mask =3D vm_log_len - 1; + int first; + + /* Bail if no log, or empty log: */ + if (!vm->log || !vm->log[0].op) + return; + + mutex_lock(&vm->mmu_lock); + + /* + * log_idx is the next entry to overwrite, meaning it is the oldest, or + * first, entry (other than the special case handled below where the + * log hasn't wrapped around yet) + */ + first =3D vm->log_idx; + + if (!vm->log[first].op) { + /* + * If the next log entry has not been written yet, then only + * entries 0 to idx-1 are valid (ie. we haven't wrapped around + * yet) + */ + state->nr_vm_logs =3D MAX(0, first - 1); + first =3D 0; + } else { + state->nr_vm_logs =3D vm_log_len; + } + + state->vm_logs =3D kmalloc_array( + state->nr_vm_logs, sizeof(vm->log[0]), GFP_KERNEL); + for (int i =3D 0; i < state->nr_vm_logs; i++) { + int idx =3D (i + first) & vm_log_mask; + + state->vm_logs[i] =3D vm->log[idx]; + } + + mutex_unlock(&vm->mmu_lock); +} + static void msm_gpu_crashstate_capture(struct msm_gpu *gpu, struct msm_gem_submit *submit, struct msm_gpu_fault_info *fault_info, char *comm, char *cmd) @@ -351,7 +390,10 @@ static void msm_gpu_crashstate_capture(struct msm_gpu = *gpu, msm_iommu_pagetable_walk(mmu, info->iova, info->ptes); } =20 - crashstate_get_bos(state, submit); + if (submit) { + crashstate_get_vm_logs(state, to_msm_vm(submit->vm)); + crashstate_get_bos(state, submit); + } =20 /* Set the active crash state to be dumped on failure */ gpu->crashstate =3D state; @@ -452,7 +494,7 @@ static void recover_worker(struct kthread_work *work) * VM_BIND) */ if (!vm->managed) - vm->unusable =3D true; + msm_gem_vm_unusable(submit->vm); } =20 get_comm_cmdline(submit, &comm, &cmd); diff --git a/drivers/gpu/drm/msm/msm_gpu.h b/drivers/gpu/drm/msm/msm_gpu.h index 5705e8d4e6b9..b2a96544f92a 100644 --- a/drivers/gpu/drm/msm/msm_gpu.h +++ b/drivers/gpu/drm/msm/msm_gpu.h @@ -20,6 +20,7 @@ #include "msm_gem.h" =20 struct msm_gem_submit; +struct msm_gem_vm_log_entry; struct msm_gpu_perfcntr; struct msm_gpu_state; struct msm_context; @@ -603,6 +604,9 @@ struct msm_gpu_state { =20 struct msm_gpu_fault_info fault_info; =20 + int nr_vm_logs; + struct msm_gem_vm_log_entry *vm_logs; + int nr_bos; struct msm_gpu_state_bo *bos; }; --=20 2.50.0 From nobody Wed Oct 8 10:58:51 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 2FEB02472AB for ; Sun, 29 Jun 2025 14:08:17 +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=1751206099; cv=none; b=hfdlTVIaDmZAmt/CbbXOzmVxfGJY77RThI/dbQXKEQtain5raUDf8bZXyrCp7UU27H+X8+mxa592er5+6/6TlPL/rFZoG+Wbp+Jw5Pt8hMqpoi/MOh9HQhSJMLY2bHkBV4sTja0t7SH0GwAUtyfmSrUkfpZNL/CJyfE7zw4jeqM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751206099; c=relaxed/simple; bh=jMPs5r3BTYO36F8stkrr8rTxNIBrNmfozE3/6ZLEedw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=SJthCCHyXIz+Y6q1FaD0LweGgve07CQh0hMZ7KsaQGziHWV3u2Ou6G5VkMlalyItBNZ6aHZpOLWKADpDTBs8F9gbW+o3mgGkUCx7pv0Udfyd7dftNCXoiKOysi3C7oS29iswiGdc9JECoCCrj/PJJ0WtqjzAQ6FCYaD0mtJEVb0= 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=l3TQES6y; 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="l3TQES6y" Received: from pps.filterd (m0279869.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 55TADXsT028542 for ; Sun, 29 Jun 2025 14:08:16 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=aKBBWm7nPUU yOq4hUiOYJrGsYTYqKezSGuXIgspUUko=; b=l3TQES6yTa5NfOHAP+efygYFmPj 5G31ChneJukxs1NeLvG4v20xNHi6h3mL701oANu+vCrshzpGB+o1jFQjD7zmTk/J I+f6SG0BbEpKP9/YE2i/ET+CDyNiuJr5an7v98YVcrJP9wT+MUdW73Ee8Dt8MQTO KfG0bA5KUOJVy0NTCZGnEbJHUb7ipgyVA3Eh+NL6K+G1SN19Q8m6NqdPicxwElIS ABcnhDR0XGsKCKadKswKgNU2pr6cf/9KHTa462UL81vxNAf5MuB3CbBzTjsUsxpZ d7pHbWlFgowEbcLkksmFa65BJeZcewvJFCrQoXCRg1cEIaTuhloWQLGa2HQ== Received: from mail-pf1-f197.google.com (mail-pf1-f197.google.com [209.85.210.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 47j7d9t9f8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Sun, 29 Jun 2025 14:08:16 +0000 (GMT) Received: by mail-pf1-f197.google.com with SMTP id d2e1a72fcca58-74890390d17so3145243b3a.2 for ; Sun, 29 Jun 2025 07:08:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751206095; x=1751810895; 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=aKBBWm7nPUUyOq4hUiOYJrGsYTYqKezSGuXIgspUUko=; b=lfqv0rM2H9VZqIYk0WLow9pSAQY9I5sB0rXYybHa76Ia17SdGFKHJ+8qqicRjNc60z GpBRDpHZQ7gG5dRcOAP80pZ/lTdYWTc4+NkoV2s6tZq43tMNLO2hHfVUYlKUO/o1TKNV UB1PB0gRWoovuwM/SqY5YfRIsAS5IqvhuEzV3uIOwUb8fmSiJ0QlrbNJ5Yl2p5uTJSaB Vesb+xXKHw48VIeR/vFYfROHQVUH2ScREDy/+xSBsW4jn9IydFae0jtZlvgxaNpMPYRd QWeBVAnbDIYHrnrSgYQXUXTKCBeACScg+gAMFOzSMXbc5tT6oegvdwhoBWy3nKDTVoV7 IPLg== X-Forwarded-Encrypted: i=1; AJvYcCWL8tTI0UaYcOiuYt4M41dCLqqZh7MZZnInDlqYUI/nTyp5t8I0Rpyc1gkZkqZzdCf4+WcyHBA7wsom17Q=@vger.kernel.org X-Gm-Message-State: AOJu0Yx6Q5Hbr+Rel738IrGqPBJmphf8xwluxNEkABXcM3INvWfkQcHP OmLIARgJelYeB4ki82ZUQ93GHpNMpQTEuZ8SoH6gmUyJzhyYJE9ZFZhrwga3epKLGD/8S7hsR7a Dbn9YW1RmaMsW7X4ROkBwKSqd02xx/MH7ctZgZYj2bfit4yuvfnPGNw/iBgM21OgB0bI= X-Gm-Gg: ASbGncs/uNyJEBGnKOXZSjz/g6r2KN4j8WwKcMwvqqkARBPGmGjn77jMKmToHkvE3Qd t4xtXbsbOZW9gWzYzuB8Sf1Gu5Z+EdtocvJ0uXe+xGzaSQ2calgmYJAcWcYldsQvzI4TOJ8aRha xxSipR4iVVrQjwCvUp6XioAovdtxvlsJToNTYb1TuWEMQcJJAEej9XiJvOCtFftJuLaeVKpqbkJ sT4OmggovSNv8xv/JfWl8xFYarUIkyG2NIdtlfPqdWZTsMLpx3xX4BfyqQay1yQTf+XPJFcyW/s fBHAVp5ZKVLr45rV8p5/WfjZwMsTm0Kp X-Received: by 2002:a05:6a00:b4f:b0:748:e4f6:ff31 with SMTP id d2e1a72fcca58-74af6e509f7mr14911755b3a.8.1751206094714; Sun, 29 Jun 2025 07:08:14 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFNGlWtWr74xS35IMxD89cPCX02EDxaMUNf02HqSTbtkooQymavLXX5RV0QM6HK0OEbV8Y9aQ== X-Received: by 2002:a05:6a00:b4f:b0:748:e4f6:ff31 with SMTP id d2e1a72fcca58-74af6e509f7mr14911710b3a.8.1751206094272; Sun, 29 Jun 2025 07:08:14 -0700 (PDT) Received: from localhost ([2601:1c0:5000:d5c:5b3e:de60:4fda:e7b1]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-74af558914dsm6998004b3a.78.2025.06.29.07.08.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Jun 2025 07:08:13 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, Connor Abbott , Antonino Maniscalco , Danilo Krummrich , Rob Clark , Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v8 37/42] drm/msm: Add VMA unmap reason Date: Sun, 29 Jun 2025 07:03:40 -0700 Message-ID: <20250629140537.30850-38-robin.clark@oss.qualcomm.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250629140537.30850-1-robin.clark@oss.qualcomm.com> References: <20250629140537.30850-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: AW1haW4tMjUwNjI5MDExOSBTYWx0ZWRfX/JRMPQJX/LU3 qVJQIcqml6YP0txRHzW+KTQaPG5RtHOB+sXcJAKeR/sZkJ0O13i0mlquSfzbYVB+c99y5GO9qUo IjFcPPQQLuEg5f/SPjH2IIJNSImJIR+wjTv2FpqtWVbjj/ZIc9dj0THuQHhKdkXYpdLobvjHLlb WemeI6HGwNGnMY21w+2UfiBH/rezYrJtQH8/NAxFSKVQl9ujolMS8uFEp4p2nuAxv79BI1Ga8qw c2XUmi6eS4Spzz76u4fqwEwL6B2THP28MA+pZgxAMkCms/JiW9gMouI2IMCkClG3RlyjuzvVbcB VbWDkFpdsvcpndD5fYzSgH1w5ApddvBziFFnYUd4Qd2eAKGkyApOgaq+7YRb7DGE/f363P0smT/ ZKOpOOuytd4a9jgBn912QxDvKBwbnPW8vWin0aP/Bfk7yGyM0CWV2pxjIuVaKaDZ1Te4fEeW X-Proofpoint-GUID: XuP64aFKsxslK9ILk757QiaC3Aje9elA X-Authority-Analysis: v=2.4 cv=RrbFLDmK c=1 sm=1 tr=0 ts=686148d0 cx=c_pps a=rEQLjTOiSrHUhVqRoksmgQ==:117 a=xqWC_Br6kY4A:10 a=6IFa9wvqVegA:10 a=cm27Pg_UAAAA:8 a=EUspDBNiAAAA:8 a=pGLkceISAAAA:8 a=S93TA_zjY9FrSvCmoiAA:9 a=2VI0MkxyNR6bbpdq8BZq:22 X-Proofpoint-ORIG-GUID: XuP64aFKsxslK9ILk757QiaC3Aje9elA 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-27_05,2025-06-27_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 mlxlogscore=999 adultscore=0 clxscore=1015 suspectscore=0 phishscore=0 bulkscore=0 malwarescore=0 spamscore=0 mlxscore=0 priorityscore=1501 lowpriorityscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2506290119 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 Tested-by: Antonino Maniscalco Reviewed-by: Antonino Maniscalco --- 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 77fdf53d3e33..e3ccda777ef3 100644 --- a/drivers/gpu/drm/msm/msm_gem.c +++ b/drivers/gpu/drm/msm/msm_gem.c @@ -43,7 +43,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) { @@ -57,7 +58,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; } @@ -97,7 +98,7 @@ static void msm_gem_close(struct drm_gem_object *obj, str= uct 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 */ } @@ -425,7 +426,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 @@ -440,7 +442,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); } @@ -617,7 +619,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; @@ -829,7 +831,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 @@ -867,7 +869,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 @@ -1079,7 +1081,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 062d1b5477d6..ce5e90ba935b 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.50.0 From nobody Wed Oct 8 10:58:51 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 6C3CD24889F for ; Sun, 29 Jun 2025 14:08:18 +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=1751206100; cv=none; b=UOYgtyeQTreI5Bl07A6kMW5NDz6DpSOPSBwSLwF+JhD80NLF2PlGvihU6pzHp1I1DsGLg7agVNXci9vg6MC3TyYDTFjcJpGun0NfiC3WfQWYxIPAYpg1H+elq7pArAMeUTUCZ/xXHd/9BxdKcw0tEvZNnO83lE435AsbXwtgHSQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751206100; c=relaxed/simple; bh=DBDmWCiCFVgbl4WtBxHdzqbNhlAEm9jFk7Gr/5+tOIQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=K9N5PKNIiwz5J0uaD+TbIm80X9nDy6ESlIm+3XEHrnSiHz4MBbHaiIlX3QfPu22eFmGrDeaCF2W/RPlS5Vk1wX2jBjnWRaHk6R7auWk5kfO/y2nJGPMazmaiGOfphYm/m89zb74aGMZ6JCmgwroYiPSdE9gpoQ1v3gFybn97JCQ= 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=QtR1bxDX; 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="QtR1bxDX" Received: from pps.filterd (m0279871.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 55TDRDp9007373 for ; Sun, 29 Jun 2025 14:08:17 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=5mY0F5PMmU9 vrS33+13h25TEJD4UxWJEsq72XU3xSVs=; b=QtR1bxDXoq1dpVHguN0qwtmvC4Y 0xC18TAnzct4aipM6HUb94TLMrrCAKsP60bZJFPIsgOe2s0DgsONMSWzseKdGXgn twCKv1gfnAGO3FObyCtuEdEhGDD+ulXJn+iMNSaCZW1QNygoMfx5w6yaj5gBNIQp LkBJDFS5H1Hac4sYN2Bt2aEpUrQVKMH5LQYw/mqxQ85l7wj6hDTZKAwJhsz9u46I pG/Vx2U6r4U3p9LSsIZXgKYHsXkItu72ynwuONtWSrmBnp0HkBjY7cVa4VzWpGPS MPOvBWqwCa6qvpJoyf6fdYRRFR+Pz2Z96JIenGdByZyT4PCqjrsFILRe9Cg== Received: from mail-pg1-f197.google.com (mail-pg1-f197.google.com [209.85.215.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 47j801t7tn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Sun, 29 Jun 2025 14:08:17 +0000 (GMT) Received: by mail-pg1-f197.google.com with SMTP id 41be03b00d2f7-b115fb801bcso4428665a12.3 for ; Sun, 29 Jun 2025 07:08:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751206096; x=1751810896; 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=5mY0F5PMmU9vrS33+13h25TEJD4UxWJEsq72XU3xSVs=; b=GPC+zf3p3H3w9I+IA0n1limJSp02oNDrCrRk8GnHGWnb+qtHNjOhWGaKx3cV7XJ+8Q +Rh8GxByqRBrRM+qs7sF/BcG0QDaDIZt2/pCpMqWWGvVLz+IMX1/HYE19e1b3/b2mU+0 zsSvpUN1s8fOZzLFpMw5mtfJxSlcnnSGsQxX2Jil36AVRxpyvCnF95KJ70vP8A3PEX58 WwOV79dZCFaoS12Xm4xBqdh3BxqOXuoc8sCwB4t8IAPsKTPYhHQrXeZ9Yp6lj+CBbFoQ HE70LV9vxtOxWYM0GDVKGYY4MQy0YtakHxgcRpKec3kuiGCg3nYnxvAyqq74hopIleca YJFA== X-Forwarded-Encrypted: i=1; AJvYcCX6ZhU8+Uby7PleMvLo6Te0PB6P4AD0Qe21Qj7DNMWjS1Yn6+rAFJjPqj2bhm5ttJRzQXspYoWw+RmH8g4=@vger.kernel.org X-Gm-Message-State: AOJu0YwW2OldFdACSqlP/y3o2eTX4TvCxi7qx+zi0wMuYY4VkHgN9l7z kN32ykwk/qISoXgLgAoA9no38RMQvjaXn+xi/DCTaepVVyMda+ZKkYyk9fBryR8tEiYr5bV18dC VYtbQHG9hGtIuQQs+lbJcnOo2FIg6oDdhhUvSEvNiQzoq8oKmXtSQp73wjO4e+Q9x/GM= X-Gm-Gg: ASbGnct/UBNI+Pj8HP/be6xtE/e7DOal1wwpEPhKCuyYMeQTU54lmV1vNwJJsbKZrnn L/qBfh0Dbm3fqgVmy2eQ7lErQUW00NhV5ApsTz+2nG70+7DGKS3nYgTeF+0nBYQDDro6gqZKHqN oCIMePGmZW2AaYoz6qJLlYfoa8p6codN7XJum2bmDvg0JH8B7mET8A21ol+/mgxRYntGdLNVcC+ RHFk9T9w9L5f0xHkc9wkPOXuZq7GCloVXkQ3nkuRpHyNA9ug5Jjg6KinMb3JO31h6FSny3doK1T s2Pbiec+vVfw5kYh5ZXifJgdwsocZvKo X-Received: by 2002:a05:6a21:6b0f:b0:21f:5361:d7f7 with SMTP id adf61e73a8af0-220a18343cdmr17849620637.31.1751206096055; Sun, 29 Jun 2025 07:08:16 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHfYDkWzgCDdpgGyHKdq4vr6VIPmal4jKOqqpi3gamCdrIPmrcPzY2NWoSmG5zIgIYn9cnZRA== X-Received: by 2002:a05:6a21:6b0f:b0:21f:5361:d7f7 with SMTP id adf61e73a8af0-220a18343cdmr17849557637.31.1751206095533; Sun, 29 Jun 2025 07:08:15 -0700 (PDT) Received: from localhost ([2601:1c0:5000:d5c:5b3e:de60:4fda:e7b1]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-74af541c369sm6676309b3a.42.2025.06.29.07.08.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Jun 2025 07:08:15 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, Connor Abbott , Antonino Maniscalco , Danilo Krummrich , Rob Clark , Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v8 38/42] drm/msm: Add mmu prealloc tracepoint Date: Sun, 29 Jun 2025 07:03:41 -0700 Message-ID: <20250629140537.30850-39-robin.clark@oss.qualcomm.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250629140537.30850-1-robin.clark@oss.qualcomm.com> References: <20250629140537.30850-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-GUID: 6laXiOz-rLU_9izz9Cq8S1KE93q_yyfh X-Authority-Analysis: v=2.4 cv=YPWfyQGx c=1 sm=1 tr=0 ts=686148d1 cx=c_pps a=rz3CxIlbcmazkYymdCej/Q==:117 a=xqWC_Br6kY4A:10 a=6IFa9wvqVegA:10 a=cm27Pg_UAAAA:8 a=EUspDBNiAAAA:8 a=pGLkceISAAAA:8 a=W9C9WuCMp67TlgULjysA:9 a=bFCP_H2QrGi7Okbo017w:22 X-Proofpoint-ORIG-GUID: 6laXiOz-rLU_9izz9Cq8S1KE93q_yyfh X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjI5MDExOSBTYWx0ZWRfXzUkeiNBLZlYL bTz9hN0RQk/7IoLkbEEzmY2CQlkSVxDG0RyOkD0G78QN1l4USXFboUxXCmtvdjJbriCV5tgKyJ6 X76Z2O+eSwTOo0U2SqNdCUnNJeqICp/6xcghIZmn5wCNZAMf6XeDBh590y3OeUn0kCh+y/cmpU9 7kjFPgvLtO3rb1WqQjYIsQSP5n+EmMS4CvC59nHhOuPpkypyQDRRJ5nW03NI8JVv8iwly15Upyx NDMn0nRB+QoIc0wPJZBYUuK5+4Dr/iRzmST0BDXtGh1T4KMRIx37t9o8kYn7niOUl16PKxav6Th OOAJGI8PgEtwLUBUetQzwZ0LU+c2c9AFyFh6QfX2YSxWHL9hQ63mjMVv2ANdiE/S8IfplNbQ/QK nRO+y97LUlp16+0vi9YwGfZJTA1Vl181H+inpy5LQZrc3EQGRUIfy5hrLLCPW/1zk0ZkMUXM 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-27_05,2025-06-27_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 mlxlogscore=999 mlxscore=0 malwarescore=0 suspectscore=0 lowpriorityscore=0 clxscore=1015 impostorscore=0 adultscore=0 priorityscore=1501 bulkscore=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-2506290119 Content-Type: text/plain; charset="utf-8" From: Rob Clark So we can monitor how many pages are getting preallocated vs how many get used. Signed-off-by: Rob Clark Signed-off-by: Rob Clark Tested-by: Antonino Maniscalco Reviewed-by: Antonino Maniscalco --- drivers/gpu/drm/msm/msm_gpu_trace.h | 14 ++++++++++++++ drivers/gpu/drm/msm/msm_iommu.c | 4 ++++ 2 files changed, 18 insertions(+) diff --git a/drivers/gpu/drm/msm/msm_gpu_trace.h b/drivers/gpu/drm/msm/msm_= gpu_trace.h index 7f863282db0d..781bbe5540bd 100644 --- a/drivers/gpu/drm/msm/msm_gpu_trace.h +++ b/drivers/gpu/drm/msm/msm_gpu_trace.h @@ -205,6 +205,20 @@ TRACE_EVENT(msm_gpu_preemption_irq, TP_printk("preempted to %u", __entry->ring_id) ); =20 +TRACE_EVENT(msm_mmu_prealloc_cleanup, + TP_PROTO(u32 count, u32 remaining), + TP_ARGS(count, remaining), + TP_STRUCT__entry( + __field(u32, count) + __field(u32, remaining) + ), + TP_fast_assign( + __entry->count =3D count; + __entry->remaining =3D remaining; + ), + TP_printk("count=3D%u, remaining=3D%u", __entry->count, __entry->remaini= ng) +); + #endif =20 #undef TRACE_INCLUDE_PATH diff --git a/drivers/gpu/drm/msm/msm_iommu.c b/drivers/gpu/drm/msm/msm_iomm= u.c index 887c9023f8a2..55c29f49b788 100644 --- a/drivers/gpu/drm/msm/msm_iommu.c +++ b/drivers/gpu/drm/msm/msm_iommu.c @@ -8,6 +8,7 @@ #include #include #include "msm_drv.h" +#include "msm_gpu_trace.h" #include "msm_mmu.h" =20 struct msm_iommu { @@ -346,6 +347,9 @@ msm_iommu_pagetable_prealloc_cleanup(struct msm_mmu *mm= u, struct msm_mmu_preallo struct kmem_cache *pt_cache =3D get_pt_cache(mmu); uint32_t remaining_pt_count =3D p->count - p->ptr; =20 + if (p->count > 0) + trace_msm_mmu_prealloc_cleanup(p->count, remaining_pt_count); + kmem_cache_free_bulk(pt_cache, remaining_pt_count, &p->pages[p->ptr]); kvfree(p->pages); } --=20 2.50.0 From nobody Wed Oct 8 10:58:51 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 88E8D242907 for ; Sun, 29 Jun 2025 14:08:19 +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=1751206101; cv=none; b=jriqIFy2LElKQ3oSUDVqWZwczZhEytdizJYFEEIKlymE0qSDozr6p5DWRDMSs7uDuONqEYidAgzWzvbWJ/CJ6Kth2QCiJUY3Vx2hsErzmvTOP67TKMWqc0iVPhXrKAIG/DeHXdAGdNhse++Z3LHcifqohYSigXauX/LD67Vkek4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751206101; c=relaxed/simple; bh=gTdjIx8wy++YElnZqgMmZAa5qptcrzEPn6AG4VdQe9s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=SRxftb0+c6Yi1VxwxpY6EhjLWPM+XFlFlQ4E17KhatUNZvXJQk54l023wDcwCBW0Fv+xb76VqLnauLlOqSOpBShI2fkjnDo7hy+C1jNfHjm74TMupt82h+Cj3eB9SKaae+iFEBTn5XrziV5UPQIUF6zvSWKVM/m6Y/OTxHSq9W4= 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=N15+P78H; 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="N15+P78H" Received: from pps.filterd (m0279873.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 55TCs0Cj002765 for ; Sun, 29 Jun 2025 14:08:18 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=ufkxvlCaXqE +JOcTp0SgGPSX3GCc3cmG0IREiQb02Vo=; b=N15+P78HFqJ2QDE4lj0Bqkg67/D C1V94pwkSemNSxnav6EC9uQNEn3T5V3CT4/rs5lihNXj4oSuN4423eoHYr4IVTVz yE4xRjsO1+Q7SOuXZxmY20VdxujXoUlj+kEqrvdiy/u80I3PSajyNStFuW8NxpqO hGaMCU+VUnc2MVaSJqaCJ6K+UOX8/tOHPo9KwyFTXNueddSWoSmBz6Yl544HohLe timFtgFDPhlkN/IRG+H7P7Dyxii9cXkLR4s2QTmamE+JDpLcgg31jcEtAqsr7f8h 9Dw6UWpYHuYKoRbW3RM6pUdQ8KncCX9Ccz/5QX4ps8UIjZzasAl4fa/OksA== Received: from mail-pj1-f69.google.com (mail-pj1-f69.google.com [209.85.216.69]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 47j5rq2f0f-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Sun, 29 Jun 2025 14:08:18 +0000 (GMT) Received: by mail-pj1-f69.google.com with SMTP id 98e67ed59e1d1-313fab41f4bso5063893a91.0 for ; Sun, 29 Jun 2025 07:08:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751206097; x=1751810897; 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=ufkxvlCaXqE+JOcTp0SgGPSX3GCc3cmG0IREiQb02Vo=; b=nZKOUIE51RkbJr/Od4c1yZ3VStnisyF+0BKj+hdL/J5pA4huHqeou/ZsjblZ48CV+R B1hoVsq4wItUcSxNXc2xvK9t0dfxtkI+vWaHkjAx9h0CPaDqhiWHfgvQX7LGFvAVONg/ 9YmxqgU4NBLBIxtS93NOfBaJWwbJ3aY2KUosoQN+51risvKW5zZz0O7bHm/NJxebiO3F AafPwCS7/DpXczdemxTtbE2uDAL1wc5W1JsQg0FJdg2z3Xg+W6XRXtkoPXPrE5zKalSH eva06xgtEOJEtnvItp1Kj1Hn6+2Gth2ZYboOuPw3Sh8q7olyY0/l67jSlTGAR1s417Zw svCw== X-Forwarded-Encrypted: i=1; AJvYcCU31uUlxS7NDUnhvgI5MHs60X8RL6+aZG/lH4/qXlvW7uDoEUiFgQBU5+8Z76ZeIgVLW0gfkc5egCrnvbc=@vger.kernel.org X-Gm-Message-State: AOJu0Yw0Nd1xWpF0Wek3oaBKNRgpfpD8VvS+vbMc2oS9ZolT+ZQ+j0Qh k1yqfd12L0eYv/GPO59sUYednjpU6fi+0kwsgqPAA+mbG0UBOupYZbKXnYTzU98hl6E/UrcABRF 4eXtER9XSCfhup0hOkzOYOG9YxrnNgG2D9WE0o403e61zr8F1WGkySYpodVP3O6EuJE8= X-Gm-Gg: ASbGnctcLzNLFdFlTGBQQlRODfg6Nq6/SseW1j1ue/ewZzmPQZIdk2hz004OjUswnmo 7u3DYinLFYeoOImRJC92XiRDyyr4VHjHMBJXv/RhhYJZOzaZKtpE62E54sa2uPxCplm1Mrk7bm1 HmM19XXE6Pi+z0WCIjeWwPW8G9TYnWdeX1DRr8LRkjpyZmT0iqE+ARYPqyeSNdqReyJo/7iHhuC 9xpuafkdIuVQWnDKoFnrTeX+t2Ps0DIwYe1FKUDpPJFdvIDFNgLDOWKj1EIAlyCBkHJiLAZnyM6 K/NRlYRgzOwP8rtiLK2ooq8sZSkikAns X-Received: by 2002:a17:90b:5347:b0:311:ba2e:bdc9 with SMTP id 98e67ed59e1d1-318c930f9c3mr14566743a91.27.1751206097270; Sun, 29 Jun 2025 07:08:17 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHJayQhQWhT5vTJXy0mRK+FWWNsp3OY4G0Nbi/rEwA8XLYXa5Wnw/fbVSwXi+QB7lNSjIGwcQ== X-Received: by 2002:a17:90b:5347:b0:311:ba2e:bdc9 with SMTP id 98e67ed59e1d1-318c930f9c3mr14566701a91.27.1751206096824; Sun, 29 Jun 2025 07:08:16 -0700 (PDT) Received: from localhost ([2601:1c0:5000:d5c:5b3e:de60:4fda:e7b1]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-318c13921b4sm6582806a91.1.2025.06.29.07.08.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Jun 2025 07:08:16 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, Connor Abbott , Antonino Maniscalco , Danilo Krummrich , Rob Clark , Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v8 39/42] drm/msm: use trylock for debugfs Date: Sun, 29 Jun 2025 07:03:42 -0700 Message-ID: <20250629140537.30850-40-robin.clark@oss.qualcomm.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250629140537.30850-1-robin.clark@oss.qualcomm.com> References: <20250629140537.30850-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-ORIG-GUID: 8TjlJ7EKaA6Uo1X8bK4M07VzLy94CN7S X-Authority-Analysis: v=2.4 cv=eIYTjGp1 c=1 sm=1 tr=0 ts=686148d2 cx=c_pps a=vVfyC5vLCtgYJKYeQD43oA==:117 a=xqWC_Br6kY4A:10 a=6IFa9wvqVegA:10 a=cm27Pg_UAAAA:8 a=EUspDBNiAAAA:8 a=pGLkceISAAAA:8 a=UIWvmcERRd2or3XT2GcA:9 a=rl5im9kqc5Lf4LNbBjHf:22 X-Proofpoint-GUID: 8TjlJ7EKaA6Uo1X8bK4M07VzLy94CN7S X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjI5MDExOSBTYWx0ZWRfXw+gsA9/ZvK1i cDRFyu2waWBVoNMySEsyiIY7llxCIolyKJfozfjYMwJsXXccbjxAyH16txHLrNE4uRf6pWnbZeN Qwe7KEAvHhuPM3rhaZkwjmIppIDb1dbuNoChokWy8/zUvVPTtMYc6sZufOqpXVXVloyJzIio63a yVx15dV+8mZeaWWwVPjYu41iu+Ror6Atgio+TGA7JJ2Z0oj5hoSWt9g+3HqNv7Ks7es7RKqBcNB 380pINutOx4YWBv/lHGqcOqZeOtGhL+N5iNY+zI+ky/jPSd9d/dql2m4l5JPXR37ULmAILYhMgH VrzzRyHe+fMy2ds3dDAh39A7q+20ZUqYmWgkcm89mTRN1ha6Jx0jSMovi6/WAgAyLxHFMNikor/ W/A739yvcCTHklEQTMITbXkPKq5GuKKAYhzTuRAZHdQzz7k0k3QbOcjTRLfDRlUoTHCf9hb+ 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-27_05,2025-06-27_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 clxscore=1015 mlxlogscore=999 priorityscore=1501 adultscore=0 mlxscore=0 phishscore=0 bulkscore=0 spamscore=0 suspectscore=0 lowpriorityscore=0 malwarescore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2506290119 Content-Type: text/plain; charset="utf-8" From: Rob Clark This resolves a potential deadlock vs msm_gem_vm_close(). Otherwise for _NO_SHARE buffers msm_gem_describe() could be trying to acquire the shared vm resv, while already holding priv->obj_lock. But _vm_close() might drop the last reference to a GEM obj while already holding the vm resv, and msm_gem_free_object() needs to grab priv->obj_lock, a locking inversion. OTOH this is only for debugfs and it isn't critical if we undercount by skipping a locked obj. So just use trylock() and move along if we can't get the lock. Signed-off-by: Rob Clark Signed-off-by: Rob Clark Tested-by: Antonino Maniscalco Reviewed-by: Antonino Maniscalco --- drivers/gpu/drm/msm/msm_gem.c | 3 ++- drivers/gpu/drm/msm/msm_gem.h | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c index e3ccda777ef3..3e87d27dfcb6 100644 --- a/drivers/gpu/drm/msm/msm_gem.c +++ b/drivers/gpu/drm/msm/msm_gem.c @@ -938,7 +938,8 @@ void msm_gem_describe(struct drm_gem_object *obj, struc= t seq_file *m, uint64_t off =3D drm_vma_node_start(&obj->vma_node); const char *madv; =20 - msm_gem_lock(obj); + if (!msm_gem_trylock(obj)) + return; =20 stats->all.count++; stats->all.size +=3D obj->size; diff --git a/drivers/gpu/drm/msm/msm_gem.h b/drivers/gpu/drm/msm/msm_gem.h index ce5e90ba935b..1ce97f8a30bb 100644 --- a/drivers/gpu/drm/msm/msm_gem.h +++ b/drivers/gpu/drm/msm/msm_gem.h @@ -280,6 +280,12 @@ msm_gem_lock(struct drm_gem_object *obj) dma_resv_lock(obj->resv, NULL); } =20 +static inline bool __must_check +msm_gem_trylock(struct drm_gem_object *obj) +{ + return dma_resv_trylock(obj->resv); +} + static inline int msm_gem_lock_interruptible(struct drm_gem_object *obj) { --=20 2.50.0 From nobody Wed Oct 8 10:58:51 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 ACD6A24DCF3 for ; Sun, 29 Jun 2025 14:08: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=1751206102; cv=none; b=dSiVW/m8qFdcwAmncN5ih7nTzhsAtXSHPF2aY+kYUVZ0zCgZi2rNFjT9VN4eJij2esSWURqJmESmdCIYpjo66mZK1RVZCUd50GXy5Bkqih3JuM1rzZb2UkklPd8qPB/glFrbN4/59XP1C7YD93hG8v1L4o73TYFD+XQM2JDPv8U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751206102; c=relaxed/simple; bh=ayKPNIzMHytJlMgLXTS3H2whkdxFm6qzz5vdQc2N/d4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RhsdIfqzQCPDHvPMK+iIvkMLrAiPfY86tSfzVmGoqx2dx+s2+XYmYNfeOuwFYgbDy3qwZBjmTUUc9A/fQS/94jdMRwHpieGchq2yUHLdGcGT/JB08gRRtqQOqOAGMyCiiuWH6SlULichpd+m1NlQFz/u+KAGwB9vR8SvnrwQDzY= 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=BrLv/1jz; 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="BrLv/1jz" Received: from pps.filterd (m0279871.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 55TAEeHI024207 for ; Sun, 29 Jun 2025 14:08:19 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=k07yEnAyEzE a9/0q+Hpj8bv2+DIU1Tpq9KBSOGFREQM=; b=BrLv/1jz9HuoGFdTMkip3HYRli4 mZUyfD8ATY8tG0dbrEqCF+eY7hbeRdvP5hBt+g0GP+PkyDeJL5+LuxFHp7KBU9kh xCu4c5ivPZtVQuGgC736sAROPGlmBn9/gMAqJx/5Aiqm8kgd/1v1kExS+jQh+6lc JRxd35QrvyQPrCj1nEeMyXIhX3zT/vUZjUaGlMOoo2YXmXSi5jGBQuEY2aIAK74J +yMjdY38vniDkBYiBow/vCT8ll/bSMOn7aif0pRjENgvU+ZqfsL/nuzS+MwmReXM Evn4MUrEY4AYWf7XaOQgS7HLaTqKXlGtQ7Ir5cBt83nUXr7R7ozV32P4F3A== Received: from mail-pg1-f199.google.com (mail-pg1-f199.google.com [209.85.215.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 47j801t7u0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Sun, 29 Jun 2025 14:08:19 +0000 (GMT) Received: by mail-pg1-f199.google.com with SMTP id 41be03b00d2f7-b31c8104e84so1017510a12.0 for ; Sun, 29 Jun 2025 07:08:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751206098; x=1751810898; 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=k07yEnAyEzEa9/0q+Hpj8bv2+DIU1Tpq9KBSOGFREQM=; b=XW/qmpad3w6T+/Lcp96xiaXrK0czAuJfVU+t/w1mIU/d2f1nf0FCtBFDdD4QeF/Vve MlPErhg5VhEGlkOomxDxaYg/XWAJ8J7FtFSYJQkmxPezm5HS3K3PF3YucJV+EDRVHoGs hjvEtI4bcpGNhVRlVOrhzNmTWOOw2hxtOf2BQso8818xuWcrIugCl3sz6bCN4OMGIxtD oAaBJ5uUGULBqUnqkOiyvilR/exJ8VV1+1EpBUC1o3fgY1utjhBFtXAAKcOqH9BYU9xx qxfsqHVmwnyWZ2h85ucoPLGgD26CpdCBOMox9oCWub8T65JlhRR/4Gcm/OJERk3Jo6nr ngdw== X-Forwarded-Encrypted: i=1; AJvYcCVzU7R0ktE1DphzqsQStvUx8SiCFdPokHUSL5fi0qED5kitKpjdsMqtwJQLmM4VcdMxkYgEzx/dxp7U+9s=@vger.kernel.org X-Gm-Message-State: AOJu0YxsFq5rGbQonLrH74JWK9ydj8rS2mEl9IrJdji+/GFOmW46cFjp Qkcba9cKJrZL8xRPkBlewxqx4MmhrbEe9xJ2HA1aWQgZjSS+HcMPoviO9bchAJuljcYE6ekFxtj T6ajS8B1axiek0tT7VZ+zKKgZjDlRY2B9cHIX6juhPpXPV7YWO2xpy8x3Skf//it2iqc= X-Gm-Gg: ASbGncvACJ3uZ3/JjcBbhrykI6TbPIG078A5Y77nYm2nMMY2zjX7S4niGWY3aW1V62B zcLlCRGcdqg8vzgRO0lnXMQD8UMIfXxBRO8KLbGIQ4FIwalfdYFoDvlwKNx8sp0qeuBRb0zHN5v 9EPbh3SbyIRhVMQe+uDMVcBidaes9YHYRlZovB/6k5xZHUeKtHVKcifFvxL6+VhCUkfmmVs2yWy L/CMhbJKrtU9ruqHp3tlV2ytXUkI09n7ucVxqZYAZggpN3KdSbW9AIbXVo9ORR/tsDpFYYUP1bU 2E6COUmZY7n8RV2oSIlIxZ62LUkMByhi X-Received: by 2002:a05:6a21:393:b0:220:33e9:15da with SMTP id adf61e73a8af0-220a12a6673mr15927711637.2.1751206098442; Sun, 29 Jun 2025 07:08:18 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFUhzRnC2Gzmes1F+eCUOlvqyKWiSWRnUQbOPPUCyCwcoSzMtVgC+1PBHnNQkUf+FfAkfUkNw== X-Received: by 2002:a05:6a21:393:b0:220:33e9:15da with SMTP id adf61e73a8af0-220a12a6673mr15927685637.2.1751206098054; Sun, 29 Jun 2025 07:08:18 -0700 (PDT) Received: from localhost ([2601:1c0:5000:d5c:5b3e:de60:4fda:e7b1]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-74af5571b7asm6905338b3a.85.2025.06.29.07.08.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Jun 2025 07:08:17 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, Connor Abbott , Antonino Maniscalco , Danilo Krummrich , Rob Clark , Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v8 40/42] drm/msm: Bump UAPI version Date: Sun, 29 Jun 2025 07:03:43 -0700 Message-ID: <20250629140537.30850-41-robin.clark@oss.qualcomm.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250629140537.30850-1-robin.clark@oss.qualcomm.com> References: <20250629140537.30850-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-GUID: -gN9_DQKWKBfdFdee3-OC006cY3UIYOS X-Authority-Analysis: v=2.4 cv=YPWfyQGx c=1 sm=1 tr=0 ts=686148d3 cx=c_pps a=Oh5Dbbf/trHjhBongsHeRQ==:117 a=xqWC_Br6kY4A:10 a=6IFa9wvqVegA:10 a=cm27Pg_UAAAA:8 a=EUspDBNiAAAA:8 a=pGLkceISAAAA:8 a=KgEaFMypzpKrXJt10QQA:9 a=_Vgx9l1VpLgwpw_dHYaR:22 X-Proofpoint-ORIG-GUID: -gN9_DQKWKBfdFdee3-OC006cY3UIYOS X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjI5MDExOSBTYWx0ZWRfX0FHX3QwfSIDi ns9PT3jolTF2iKHZWJ0jJf4+5rCV+dJfMMRPaArS5d9ZGFxulCwD5rGJck0TBqLeEq0qTS6XkRs k08OfgAsSuoKCDOeii+lKuu7KZPln6By5wRRQ9fVoL5vV7K91t3tkrJeDHdGCgkTEuucwGv5uCJ J5CNPknUDld8r0d4JTpRQmA3M+rIBEiSaKe/R2OpWA3I528y4FCAAN5Sz+wjdkh5PIwxmM3zXpS FlSszhdY99NlrtsqCjoq4zTk15d7QTUuH1PwHbArKWJdR7YHb5xyl/Wd9D7bWyMCIUuGlxL4f62 PPCHShWAuOSctqlu+qJ3pB+Md4W7manVxP/4XGN/66g0JqgPcQgNIVHdeLoa1vonRdUs+hOp/iz 7hlIw4CRPmvYdUq2z+rqclrC6Xjkovn/UjiKbXrTJ92Z4v+SHPylmwx16FEpVkgecAdlsVrS 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-27_05,2025-06-27_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 mlxlogscore=999 mlxscore=0 malwarescore=0 suspectscore=0 lowpriorityscore=0 clxscore=1015 impostorscore=0 adultscore=0 priorityscore=1501 bulkscore=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-2506290119 Content-Type: text/plain; charset="utf-8" From: Rob Clark Bump version to signal to userspace that VM_BIND is supported. Signed-off-by: Rob Clark Signed-off-by: Rob Clark Tested-by: Antonino Maniscalco Reviewed-by: Antonino Maniscalco --- drivers/gpu/drm/msm/msm_drv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c index 7881afa3a75a..9b1f1c1a41d4 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -41,9 +41,10 @@ * - 1.10.0 - Add MSM_SUBMIT_BO_NO_IMPLICIT * - 1.11.0 - Add wait boost (MSM_WAIT_FENCE_BOOST, MSM_PREP_BOOST) * - 1.12.0 - Add MSM_INFO_SET_METADATA and MSM_INFO_GET_METADATA + * - 1.13.0 - Add VM_BIND */ #define MSM_VERSION_MAJOR 1 -#define MSM_VERSION_MINOR 12 +#define MSM_VERSION_MINOR 13 #define MSM_VERSION_PATCHLEVEL 0 =20 bool dumpstate; --=20 2.50.0 From nobody Wed Oct 8 10:58:51 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 A3A0F25393D for ; Sun, 29 Jun 2025 14:08:22 +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=1751206105; cv=none; b=fxIOs2hZ5Unl6hlosyjK+qdvuhGfX2sItRkTuZb5AjH1t8O2ZltFRU/uLfHaOjdwIj9x4V4/H+fxW87BTfDxSbi2Di0CexTEkZuNyqUNPlafItNaga0LB3i4w+LEEFson3oN9X+dmIiL/KIgm+WS1MNKUgF84I8I4jov2NJwA80= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751206105; c=relaxed/simple; bh=W8kPWjbVzloymT+WUD1vDHZMSH23Ip4gfQjinZZYu1Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kir1mQpxgw6VMUpcryd18o7y//tCfwwJSByJNMFX234jtjGfg/FbzltHG4dKOh2topNTYuoiEbGzzTelZ+krwJ/3DQXkIL3pIMeIUCSaOnKRDycaniU3h00zlS85g70fekin4QgFAUl/Mw61mkbvRk3HzRlwz+T9Hr6mnCE9QOM= 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=RnhurXEW; 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="RnhurXEW" Received: from pps.filterd (m0279870.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 55TAgvJJ010227 for ; Sun, 29 Jun 2025 14:08:21 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=b2JMHHLa1rE J4Hs2IxSKvgFj2W/GQDFpMVFHK3adsj0=; b=RnhurXEWnAH8uYJ3s6DP5uG/WRL F/5z9lItVk3+tUZspn/DgHu1wH31NA8wKMkAShUxYbPD0rco5Vz37TKdQsed8t0C q2wAUZJv9+UU9Jq5QtHxCwQr32yqEPEf6dAXT1OVIZH8L1FhUOQYU+5C5+0Exazx OmxZkTh4T3T+CwtW7on1M++KJpVnkrJi39X54R5qCkqdybvec+85ZMzvIjgRDMMJ USEydlk/NEYtU1gAbUThCAMIgO4rahD7qsv9g0c10v9CqPlZbhoyd6X3KT7pt8Nb i3vDdy7HKpMBV7Dnmlqa5CtR0Vz7L2DjLZ9mAW70SF1vJvYUAZ6Aqg8nU+g== Received: from mail-pj1-f72.google.com (mail-pj1-f72.google.com [209.85.216.72]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 47j8fxa8gv-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Sun, 29 Jun 2025 14:08:21 +0000 (GMT) Received: by mail-pj1-f72.google.com with SMTP id 98e67ed59e1d1-313c3915345so5324396a91.3 for ; Sun, 29 Jun 2025 07:08:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751206100; x=1751810900; 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=b2JMHHLa1rEJ4Hs2IxSKvgFj2W/GQDFpMVFHK3adsj0=; b=GoppuRF9Qq+CajON0Q2OOk1coMdOHsvNepqDvr/fgz1QiyEa/JpPVCQ+nzKMKX1ShC r5AIyxl5+xCo0Z8HMKJ2H0vSQyMR+qpKeeIaGDSFzdewWPblgkaw3Ku6K+zuuLOXVUlK uQ5dbRSzuMqd1Az5xzFubKBkuNaxnH4hKUulJON6NahJit2VXGwyRJI8gpRgCthwNdy2 WeqUh1B4nqrzxsMxRZxT3T5mE14imBaDt0SzyrDMURUQ8L+A2zfsN7sQ/Y2gHOSTfjX1 v85ijIVPabZ1OvZ/qLX9/izaFv638XNtvm12zkjx7fDg+O7o3Uprveyi0bUo7Q/6mC3z gUAw== X-Forwarded-Encrypted: i=1; AJvYcCWktmyKlacid19p8KNE4MOrDR+xQcwu0OBAJFFsjmTjUPB4pNk5PC7ldFiVYgXKRDA3pI5HqzTf80K7ggM=@vger.kernel.org X-Gm-Message-State: AOJu0Yxmr4BPB43SZlJFR+Jwm+4weDcDEne+eUxbZpgp5Ld60JkEQGQ/ uZ32xOTYotdhbCPB745auXniPyah0m1lsbRAFVV1+d7HoRGgmGxghZqj/9pex4zbNGyCSDLpAYF r8xvAiQ1K3ZPF5DM2BJ8miqN4Kmr2C8MyOigfRjWv9Om4xOJW6Y4Vo7VLbjdUMdu5f8I= X-Gm-Gg: ASbGncsxehePuf7kSNngWSAIGXsLi2b1ewm0r0IxTXsUKtts/y2P06BsLnMlNshrnaB rYxhkrEeYpNfPVZp36L9Aj3tIndyY9KjI6+nM7S1myEZrZE4MOA5hvFfuaE2/kxHUXGf0Swx37O w1HHyuwyv9wgqOsqOvNer6eAJJlMeJPHB8D0WPqXcbf3WJavsdPmwkyi5ZBEoSGIbIIPAshaSnh EAd2blxm09BTADlY4iedc3r+SRJfIGoItSk/oihu7EagF+Y+ibSgnzM2o54mM1KiBULbwPhGzrb fMTySDcW1VVolASlHHxsLi7rVl5nuyNA X-Received: by 2002:a17:90b:4c89:b0:30e:8c5d:8ed with SMTP id 98e67ed59e1d1-318c92ec0b3mr12948873a91.19.1751206100134; Sun, 29 Jun 2025 07:08:20 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFiDMbz31LMjbBb02d/S56Uv7tkiAC4YMLY2zh6CZRHS60/qIk/uFxuDOgoVcjoCDswRHPwiw== X-Received: by 2002:a17:90b:4c89:b0:30e:8c5d:8ed with SMTP id 98e67ed59e1d1-318c92ec0b3mr12948828a91.19.1751206099564; Sun, 29 Jun 2025 07:08:19 -0700 (PDT) Received: from localhost ([2601:1c0:5000:d5c:5b3e:de60:4fda:e7b1]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-23acb3b3afbsm59289295ad.161.2025.06.29.07.08.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Jun 2025 07:08:19 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, Connor Abbott , Antonino Maniscalco , Danilo Krummrich , Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Sumit Semwal , =?UTF-8?q?Christian=20K=C3=B6nig?= , linux-kernel@vger.kernel.org (open list), linux-media@vger.kernel.org (open list:DMA BUFFER SHARING FRAMEWORK:Keyword:\bdma_(?:buf|fence|resv)\b), linaro-mm-sig@lists.linaro.org (moderated list:DMA BUFFER SHARING FRAMEWORK:Keyword:\bdma_(?:buf|fence|resv)\b) Subject: [PATCH v8 41/42] drm/msm: Defer VMA unmap for fb unpins Date: Sun, 29 Jun 2025 07:03:44 -0700 Message-ID: <20250629140537.30850-42-robin.clark@oss.qualcomm.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250629140537.30850-1-robin.clark@oss.qualcomm.com> References: <20250629140537.30850-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: AW1haW4tMjUwNjI5MDExOSBTYWx0ZWRfX288mUkdQcoxx u4dvbYqy9EqUsHSZNqJMYB7vogB6nFy44W8PR/khpEvJn6+Gfv/cppqhfk3Br0+YzrnPBZUBBRA jXQSalchT8nEiubjxSZC58vxEtu/XAkJJQExLZaswX8jnaDWiSUtfoLayfp9Zq7EipoyzM9Zhad N+M+y5xQv6TcljM+UrOwbgR7lsOQ9j/rFDmzQ2BdVcgY5/qirnRsdI5wX0EQHN1UJF+cHFZkJVx WJPMKsfccFt52C03C9Bv561pKJS0rjBUva5mO5V3eSnkM+9beNg+4Am1GmkzfaNO1WC4J0dKZls GmtvsCCNtUD42IQW4f+6YhULEZeQ5KYIyL9E6Q7uU1t+A70NlaKul1Rd2PfiJiIp81pHJb/njNp dyzDy2/i4wf/z0QDEWn4yDi8sIArVMNWMZPsH6sBVknRAdDrGEZnQl3XqaolqCRiCgwytugG X-Proofpoint-GUID: G7DymsdL9lpj56jJ6IRckD-jifjWPHR4 X-Proofpoint-ORIG-GUID: G7DymsdL9lpj56jJ6IRckD-jifjWPHR4 X-Authority-Analysis: v=2.4 cv=TqPmhCXh c=1 sm=1 tr=0 ts=686148d5 cx=c_pps a=RP+M6JBNLl+fLTcSJhASfg==:117 a=xqWC_Br6kY4A:10 a=6IFa9wvqVegA:10 a=EUspDBNiAAAA:8 a=pGLkceISAAAA:8 a=HvHaJK4xSQnTU1JWlMsA:9 a=iS9zxrgQBfv6-_F4QbHw: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-27_05,2025-06-27_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 bulkscore=0 mlxlogscore=919 suspectscore=0 adultscore=0 phishscore=0 malwarescore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 spamscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2506290119 Content-Type: text/plain; charset="utf-8" With the conversion to drm_gpuvm, we lost the lazy VMA cleanup, which means that fb cleanup/unpin when pageflipping to new scanout buffers immediately unmaps the scanout buffer. This is costly (with tlbinv, it can be 4-6ms for a 1080p scanout buffer, and more for higher resolutions)! To avoid this, introduce a vma_ref, which is incremented whenever userspace has a GEM handle or dma-buf fd. When unpinning if the vm is the kms->vm we defer tearing down the VMA until the vma_ref drops to zero. If the buffer is still part of a flip-chain then userspace will be holding some sort of reference to the BO, either via a GEM handle and/or dma-buf fd. So this avoids unmapping the VMA when there is a strong possibility that it will be needed again. Signed-off-by: Rob Clark Tested-by: Antonino Maniscalco Reviewed-by: Antonino Maniscalco --- drivers/gpu/drm/msm/msm_drv.c | 1 + drivers/gpu/drm/msm/msm_drv.h | 1 + drivers/gpu/drm/msm/msm_fb.c | 5 ++- drivers/gpu/drm/msm/msm_gem.c | 60 ++++++++++++++++++----------- drivers/gpu/drm/msm/msm_gem.h | 28 ++++++++++++++ drivers/gpu/drm/msm/msm_gem_prime.c | 54 +++++++++++++++++++++++++- 6 files changed, 123 insertions(+), 26 deletions(-) diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c index 9b1f1c1a41d4..0597ff6da317 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -830,6 +830,7 @@ static const struct drm_driver msm_driver =3D { .postclose =3D msm_postclose, .dumb_create =3D msm_gem_dumb_create, .dumb_map_offset =3D msm_gem_dumb_map_offset, + .gem_prime_import =3D msm_gem_prime_import, .gem_prime_import_sg_table =3D msm_gem_prime_import_sg_table, #ifdef CONFIG_DEBUG_FS .debugfs_init =3D msm_debugfs_init, diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h index 200c3135bbf9..2b49c4b800ee 100644 --- a/drivers/gpu/drm/msm/msm_drv.h +++ b/drivers/gpu/drm/msm/msm_drv.h @@ -269,6 +269,7 @@ void msm_gem_shrinker_cleanup(struct drm_device *dev); struct sg_table *msm_gem_prime_get_sg_table(struct drm_gem_object *obj); int msm_gem_prime_vmap(struct drm_gem_object *obj, struct iosys_map *map); void msm_gem_prime_vunmap(struct drm_gem_object *obj, struct iosys_map *ma= p); +struct drm_gem_object *msm_gem_prime_import(struct drm_device *dev, struct= dma_buf *buf); struct drm_gem_object *msm_gem_prime_import_sg_table(struct drm_device *de= v, struct dma_buf_attachment *attach, struct sg_table *sg); struct dma_buf *msm_gem_prime_export(struct drm_gem_object *obj, int flags= ); diff --git a/drivers/gpu/drm/msm/msm_fb.c b/drivers/gpu/drm/msm/msm_fb.c index 8ae2f326ec54..bc7c2bb8f01e 100644 --- a/drivers/gpu/drm/msm/msm_fb.c +++ b/drivers/gpu/drm/msm/msm_fb.c @@ -89,6 +89,7 @@ int msm_framebuffer_prepare(struct drm_framebuffer *fb, b= ool needs_dirtyfb) return 0; =20 for (i =3D 0; i < n; i++) { + msm_gem_vma_get(fb->obj[i]); ret =3D msm_gem_get_and_pin_iova(fb->obj[i], vm, &msm_fb->iova[i]); drm_dbg_state(fb->dev, "FB[%u]: iova[%d]: %08llx (%d)\n", fb->base.id, i, msm_fb->iova[i], ret); @@ -114,8 +115,10 @@ void msm_framebuffer_cleanup(struct drm_framebuffer *f= b, bool needed_dirtyfb) =20 memset(msm_fb->iova, 0, sizeof(msm_fb->iova)); =20 - for (i =3D 0; i < n; i++) + for (i =3D 0; i < n; i++) { msm_gem_unpin_iova(fb->obj[i], vm); + msm_gem_vma_put(fb->obj[i]); + } } =20 uint32_t msm_framebuffer_iova(struct drm_framebuffer *fb, int plane) diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c index 3e87d27dfcb6..33d3354c6102 100644 --- a/drivers/gpu/drm/msm/msm_gem.c +++ b/drivers/gpu/drm/msm/msm_gem.c @@ -19,6 +19,7 @@ #include "msm_drv.h" #include "msm_gem.h" #include "msm_gpu.h" +#include "msm_kms.h" =20 static void update_device_mem(struct msm_drm_private *priv, ssize_t size) { @@ -39,6 +40,7 @@ static void update_ctx_mem(struct drm_file *file, ssize_t= size) =20 static int msm_gem_open(struct drm_gem_object *obj, struct drm_file *file) { + msm_gem_vma_get(obj); update_ctx_mem(file, obj->size); return 0; } @@ -46,33 +48,13 @@ static int msm_gem_open(struct drm_gem_object *obj, str= uct drm_file *file) 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) -{ - msm_gem_assert_locked(obj); - drm_gpuvm_resv_assert_held(vm); - - struct drm_gpuvm_bo *vm_bo =3D drm_gpuvm_bo_find(vm, obj); - if (vm_bo) { - struct drm_gpuva *vma; - - drm_gpuvm_bo_for_each_va (vma, vm_bo) { - if (vma->vm !=3D vm) - continue; - msm_gem_vma_unmap(vma, "detach"); - msm_gem_vma_close(vma); - break; - } - - drm_gpuvm_bo_put(vm_bo); - } -} - static void msm_gem_close(struct drm_gem_object *obj, struct drm_file *fil= e) { struct msm_context *ctx =3D file->driver_priv; struct drm_exec exec; =20 update_ctx_mem(file, -obj->size); + msm_gem_vma_put(obj); =20 /* * If VM isn't created yet, nothing to cleanup. And in fact calling @@ -99,7 +81,31 @@ static void msm_gem_close(struct drm_gem_object *obj, st= ruct drm_file *file) =20 msm_gem_lock_vm_and_obj(&exec, obj, ctx->vm); put_iova_spaces(obj, ctx->vm, true, "close"); - detach_vm(obj, ctx->vm); + drm_exec_fini(&exec); /* drop locks */ +} + +/* + * Get/put for kms->vm VMA + */ + +void msm_gem_vma_get(struct drm_gem_object *obj) +{ + atomic_inc(&to_msm_bo(obj)->vma_ref); +} + +void msm_gem_vma_put(struct drm_gem_object *obj) +{ + struct msm_drm_private *priv =3D obj->dev->dev_private; + struct drm_exec exec; + + if (atomic_dec_return(&to_msm_bo(obj)->vma_ref)) + return; + + if (!priv->kms) + return; + + msm_gem_lock_vm_and_obj(&exec, obj, priv->kms->vm); + put_iova_spaces(obj, priv->kms->vm, true, "vma_put"); drm_exec_fini(&exec); /* drop locks */ } =20 @@ -656,6 +662,13 @@ int msm_gem_set_iova(struct drm_gem_object *obj, return ret; } =20 +static bool is_kms_vm(struct drm_gpuvm *vm) +{ + struct msm_drm_private *priv =3D vm->drm->dev_private; + + return priv->kms && (priv->kms->vm =3D=3D vm); +} + /* * Unpin a iova by updating the reference counts. The memory isn't actually * purged until something else (shrinker, mm_notifier, destroy, etc) decid= es @@ -671,7 +684,8 @@ void msm_gem_unpin_iova(struct drm_gem_object *obj, str= uct drm_gpuvm *vm) if (vma) { msm_gem_unpin_locked(obj); } - detach_vm(obj, vm); + if (!is_kms_vm(vm)) + put_iova_spaces(obj, vm, true, "close"); 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 1ce97f8a30bb..5c0c59e4835c 100644 --- a/drivers/gpu/drm/msm/msm_gem.h +++ b/drivers/gpu/drm/msm/msm_gem.h @@ -211,9 +211,37 @@ struct msm_gem_object { * Protected by LRU lock. */ int pin_count; + + /** + * @vma_ref: Reference count of VMA users. + * + * With the vm_bo/vma holding a reference to the GEM object, we'd + * otherwise have to actively tear down a VMA when, for example, + * a buffer is unpinned for scanout, vs. the pre-drm_gpuvm approach + * where a VMA did not hold a reference to the BO, but instead was + * implicitly torn down when the BO was freed. + * + * To regain the lazy VMA teardown, we use the @vma_ref. It is + * incremented for any of the following: + * + * 1) the BO is exported as a dma_buf + * 2) the BO has open userspace handle + * + * All of those conditions will hold an reference to the BO, + * preventing it from being freed. So lazily keeping around the + * VMA will not prevent the BO from being freed. (Or rather, the + * reference loop is harmless in this case.) + * + * When the @vma_ref drops to zero, then kms->vm VMA will be + * torn down. + */ + atomic_t vma_ref; }; #define to_msm_bo(x) container_of(x, struct msm_gem_object, base) =20 +void msm_gem_vma_get(struct drm_gem_object *obj); +void msm_gem_vma_put(struct drm_gem_object *obj); + uint64_t msm_gem_mmap_offset(struct drm_gem_object *obj); int msm_gem_prot(struct drm_gem_object *obj); int msm_gem_pin_vma_locked(struct drm_gem_object *obj, struct drm_gpuva *v= ma); diff --git a/drivers/gpu/drm/msm/msm_gem_prime.c b/drivers/gpu/drm/msm/msm_= gem_prime.c index 4d93f2daeeaa..c0a33ac839cb 100644 --- a/drivers/gpu/drm/msm/msm_gem_prime.c +++ b/drivers/gpu/drm/msm/msm_gem_prime.c @@ -6,6 +6,7 @@ =20 #include =20 +#include #include =20 #include "msm_drv.h" @@ -42,19 +43,68 @@ void msm_gem_prime_vunmap(struct drm_gem_object *obj, s= truct iosys_map *map) msm_gem_put_vaddr_locked(obj); } =20 +static void msm_gem_dmabuf_release(struct dma_buf *dma_buf) +{ + struct drm_gem_object *obj =3D dma_buf->priv; + + msm_gem_vma_put(obj); + drm_gem_dmabuf_release(dma_buf); +} + +static const struct dma_buf_ops msm_gem_prime_dmabuf_ops =3D { + .attach =3D drm_gem_map_attach, + .detach =3D drm_gem_map_detach, + .map_dma_buf =3D drm_gem_map_dma_buf, + .unmap_dma_buf =3D drm_gem_unmap_dma_buf, + .release =3D msm_gem_dmabuf_release, + .mmap =3D drm_gem_dmabuf_mmap, + .vmap =3D drm_gem_dmabuf_vmap, + .vunmap =3D drm_gem_dmabuf_vunmap, +}; + +struct drm_gem_object *msm_gem_prime_import(struct drm_device *dev, + struct dma_buf *buf) +{ + if (buf->ops =3D=3D &msm_gem_prime_dmabuf_ops) { + struct drm_gem_object *obj =3D buf->priv; + if (obj->dev =3D=3D dev) { + /* + * Importing dmabuf exported from our own gem increases + * refcount on gem itself instead of f_count of dmabuf. + */ + drm_gem_object_get(obj); + return obj; + } + } + + return drm_gem_prime_import(dev, buf); +} + struct drm_gem_object *msm_gem_prime_import_sg_table(struct drm_device *de= v, struct dma_buf_attachment *attach, struct sg_table *sg) { return msm_gem_import(dev, attach->dmabuf, sg); } =20 - struct dma_buf *msm_gem_prime_export(struct drm_gem_object *obj, int flags) { if (to_msm_bo(obj)->flags & MSM_BO_NO_SHARE) return ERR_PTR(-EPERM); =20 - return drm_gem_prime_export(obj, flags); + msm_gem_vma_get(obj); + + struct drm_device *dev =3D obj->dev; + struct dma_buf_export_info exp_info =3D { + .exp_name =3D KBUILD_MODNAME, /* white lie for debug */ + .owner =3D dev->driver->fops->owner, + .ops =3D &msm_gem_prime_dmabuf_ops, + .size =3D obj->size, + .flags =3D flags, + .priv =3D obj, + .resv =3D obj->resv, + }; + + return drm_gem_dmabuf_export(dev, &exp_info); } =20 int msm_gem_prime_pin(struct drm_gem_object *obj) --=20 2.50.0 From nobody Wed Oct 8 10:58:51 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 F29AB2550D3 for ; Sun, 29 Jun 2025 14:08:23 +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=1751206106; cv=none; b=azGSV7JlQkgTKmzo9pnAqmECUCeEnBLQBNnrzYY6JB1rUHCVoQkpVZVUzmtQK4qeMmvfkCq33jjIRZ6I1YfhDIVmjMasOnBiPGJMZW9MUmQLeKXUj8RhIJ4OBenjMKCNmfeVBEMZYHF57+o8Yiq+hhWeKtd09tfl32zD5yNEae4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751206106; c=relaxed/simple; bh=nBjrw9veY0ZydTKNOJ2rJlgvZJil97gvgE9S6DJKImU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DUgPG5iAJFExcufzctj28annsvP10G7e3z6Y8vnUz7X0kagRZl4W3J4ZNxDllu7VpZkSS4ZmvLQVW2/cY+GFTeeIXow4EGOBV/Ly3C/OQIjfWPb2rl6h/f28G2gxlwm9ftA0rCF180WOXABhR06zJG10f210ucjNrkcZs5dGvVM= 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=Ah42uKy6; 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="Ah42uKy6" 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 55TDjOul024708 for ; Sun, 29 Jun 2025 14:08:23 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=B7t3J9Gz7Wr bwv2GHFeD9oavvwiDOSYnGrAA3GiBoCM=; b=Ah42uKy6WruGMZPvQ/PiGa29l6g YYtcA8xtYb9JeXCglgN6Aw9O1jiWeyCHQny5UJM2GznwXRbUKltl7VrQ6fRPrx30 t4ZDQLAqBN26JP1p+HTTpRIVEyXxiMDOqvXIyrC44iBz8GYH7vOJW8+IQJkC5aGE yTmoT/Tbr8N2q8tmRwTDbPqaEqmPMh4GIYr4YHaks1eU0rX6MSuWSDdSaZK1A2SO J/tBY9TlipbFZvNgls7ycn+EjfMVkKL91XSL5KqU/kPcqd/l4ZDsgqjWsBjUXXx0 sFTGAXLaDpdy0k04Hgj8jkM1VKg/eAf9DYF40/Vp/W4RRCVB1vjuSY3/zrg== Received: from mail-pf1-f199.google.com (mail-pf1-f199.google.com [209.85.210.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 47j7qm2862-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Sun, 29 Jun 2025 14:08:22 +0000 (GMT) Received: by mail-pf1-f199.google.com with SMTP id d2e1a72fcca58-748e1e474f8so2470708b3a.2 for ; Sun, 29 Jun 2025 07:08:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751206101; x=1751810901; 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=B7t3J9Gz7Wrbwv2GHFeD9oavvwiDOSYnGrAA3GiBoCM=; b=tdpoTvohz8fmiK7maSeM2a4H2GTjUltwWzihzEV+ySwmdo7lPi1eEOHXf9M5kSuSiy EafXyRtfDVv9r1fv4YZY3ynEQEgZizJ9dJBfZcZSkAWml/MWKxVJ3Qo3ZHOAITZGjNiV REDVk0lBvE9/tH2NTTFzuATySFuHaDP7JeP7roZnmnzIpentmLvXrUAUlpbU2LYqyBQ1 l0/dJSAHZX22m4b+PyuBrsQfYy/3HXXrPabyJs03wZStfYKelYlC/w52K0Itm+cypbgf hrJgOOIuTwENWP5/UF2WPcRx1ya4065yhZMBjISJ6xf3nje3+tOchnRyBMxFtvFgLJk3 f2Og== X-Forwarded-Encrypted: i=1; AJvYcCVjmgFQ9WQvUadR4f/HC59kjQEJXAgXWAHXatJy1YaAKukbikYsMa2EsqwdF0uQR2kCe+z3fboxwG5a7LA=@vger.kernel.org X-Gm-Message-State: AOJu0YyQu45c56LVERWvdyXUafS00USL9Eywn+BgK0t2Sg0GMulu9Uxj PZtymkPJvPiL4iCL/rS2CoBAXWGa6SuhwH2PvOGg3BDOj66hbZgdBx7LPY5awjZ2A8T7xeSuhwD Mjj5Ov7rTjmdoNfLauwklK7geixShbhRwkaR9ukDXg3ldZam0nwj/beo/TYmsyWaTt3o= X-Gm-Gg: ASbGncsg8mHR1RAEHz1RV41MnDJ/xM2yMUo+52h3zeig8xsVMJxyr0T5sc+QhA7H1fl N9Ar3UxaPxfLY52ZS6SJkyJrb02E4q0tkVZjno4UP9m1hH5AT448jJP8NdPopc/h1xsDzXznqr3 Ans6Q9aMNvXXqWSpAm0dpNJPrQrL+U0XaWl7SQ4BGPMvYRKyehWoW9afESnzE3cUqxbNOalpje6 rcw289763/LmbyB0qtDFGKpBGBYVQz4KjTpDSbqBc96xhW0t6g7FDyHiFUvkQWIETSg0+MRN7xF IGuhVgFzSeNH30t3MXfb5vUhVl2Zn3K7 X-Received: by 2002:a05:6a00:1914:b0:748:ef3d:3247 with SMTP id d2e1a72fcca58-74af7046bd3mr14810396b3a.20.1751206101462; Sun, 29 Jun 2025 07:08:21 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHeFPIiwhi3m4DwFAWJK1g1uk8hI6kROjrLRrGCACj+Y91U6WovNlDgcMK9sTU7GMpxFYpzZg== X-Received: by 2002:a05:6a00:1914:b0:748:ef3d:3247 with SMTP id d2e1a72fcca58-74af7046bd3mr14810360b3a.20.1751206101057; Sun, 29 Jun 2025 07:08:21 -0700 (PDT) Received: from localhost ([2601:1c0:5000:d5c:5b3e:de60:4fda:e7b1]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-74af56cffd8sm7213107b3a.137.2025.06.29.07.08.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Jun 2025 07:08:20 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, Connor Abbott , Antonino Maniscalco , Danilo Krummrich , Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Konrad Dybcio , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v8 42/42] drm/msm: Add VM_BIND throttling Date: Sun, 29 Jun 2025 07:03:45 -0700 Message-ID: <20250629140537.30850-43-robin.clark@oss.qualcomm.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250629140537.30850-1-robin.clark@oss.qualcomm.com> References: <20250629140537.30850-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-Authority-Analysis: v=2.4 cv=C4TpyRP+ c=1 sm=1 tr=0 ts=686148d6 cx=c_pps a=WW5sKcV1LcKqjgzy2JUPuA==:117 a=xqWC_Br6kY4A:10 a=6IFa9wvqVegA:10 a=EUspDBNiAAAA:8 a=pGLkceISAAAA:8 a=9ew1I-5mWBoiHqGEK3IA:9 a=OpyuDcXvxspvyRM73sMx:22 X-Proofpoint-ORIG-GUID: USpFeFTv0xzD9YFKnUsuR8bpj7fxo31x X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjI5MDExOSBTYWx0ZWRfX5jb5R42beX3L M32DsvhMx0+A2KFb+bfYPYkTC4xzytC0tic1HOwK9k87DaUqjRRBtPKgpWrz/5UJTElIDsuRwPS rtDaS69yeaNWcD2HCZggm42O746mWMP+6us0oDkhs8GVEh2DfPQy9tFBjJ6p0IAlPIb5GU1dZ1t hBQYML3hW0yfmLyImX/FRZ5BYDPZM8ul4KmLFpgtSiAYg289JYuvHqaXJx4NXx/QcarwcUwIZlX AuK/zGY3DMChVdPPLirDcgD7ku9i6KFo+nZlDWcTQXJIgZNACk/i9uSjmGZy9KRwMGNTgIOeEcb vkDwqKJe2BL+WZ5yZCTudV83e3j1nwvG3bBJF06PSEu3pwc5zWm6DQ4ql1F+TN+lhxRMbDrAisU 2GAPE3EZJkDFTDD1OQ2L1YIxHADiXbofNdECgWfud0sjE2BW/4tgVfW2cicL1MoexSkq10L4 X-Proofpoint-GUID: USpFeFTv0xzD9YFKnUsuR8bpj7fxo31x 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-27_05,2025-06-27_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 phishscore=0 suspectscore=0 bulkscore=0 lowpriorityscore=0 clxscore=1015 priorityscore=1501 spamscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 malwarescore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2506290119 Content-Type: text/plain; charset="utf-8" A large number of (unsorted or separate) small (<2MB) mappings can cause a lot of, probably unnecessary, prealloc pages. Ie. a single 4k page size mapping will pre-allocate 3 pages (for levels 2-4) for the pagetable. Which can chew up a large amount of unneeded memory. So add a mechanism to put an upper bound on the # of pre-alloc pages. Signed-off-by: Rob Clark Tested-by: Antonino Maniscalco Reviewed-by: Antonino Maniscalco --- drivers/gpu/drm/msm/msm_gem_vma.c | 23 +++++++++++++++++++++-- drivers/gpu/drm/msm/msm_gpu.h | 3 +++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/msm/msm_gem_vma.c b/drivers/gpu/drm/msm/msm_ge= m_vma.c index 907ebf5073e6..bb3a6e8320c9 100644 --- a/drivers/gpu/drm/msm/msm_gem_vma.c +++ b/drivers/gpu/drm/msm/msm_gem_vma.c @@ -705,6 +705,8 @@ msm_vma_job_free(struct drm_sched_job *_job) =20 mmu->funcs->prealloc_cleanup(mmu, &job->prealloc); =20 + atomic_sub(job->prealloc.count, &job->queue->in_flight_prealloc); + drm_sched_job_cleanup(_job); =20 job_foreach_bo (obj, job) @@ -1089,10 +1091,11 @@ ops_are_same_pte(struct msm_vm_bind_op *first, stru= ct msm_vm_bind_op *next) * them as a single mapping. Otherwise the prealloc_count() will not real= ize * they can share pagetable pages and vastly overcount. */ -static void +static int vm_bind_prealloc_count(struct msm_vm_bind_job *job) { struct msm_vm_bind_op *first =3D NULL, *last =3D NULL; + int ret; =20 for (int i =3D 0; i < job->nr_ops; i++) { struct msm_vm_bind_op *op =3D &job->ops[i]; @@ -1121,6 +1124,20 @@ vm_bind_prealloc_count(struct msm_vm_bind_job *job) =20 /* Flush the remaining range: */ prealloc_count(job, first, last); + + /* + * Now that we know the needed amount to pre-alloc, throttle on pending + * VM_BIND jobs if we already have too much pre-alloc memory in flight + */ + ret =3D wait_event_interruptible( + to_msm_vm(job->vm)->sched.job_scheduled, + atomic_read(&job->queue->in_flight_prealloc) <=3D 1024); + if (ret) + return ret; + + atomic_add(job->prealloc.count, &job->queue->in_flight_prealloc); + + return 0; } =20 /* @@ -1411,7 +1428,9 @@ msm_ioctl_vm_bind(struct drm_device *dev, void *data,= struct drm_file *file) if (ret) goto out_unlock; =20 - vm_bind_prealloc_count(job); + ret =3D vm_bind_prealloc_count(job); + if (ret) + goto out_unlock; =20 struct drm_exec exec; unsigned flags =3D DRM_EXEC_IGNORE_DUPLICATES | DRM_EXEC_INTERRUPTIBLE_WA= IT; diff --git a/drivers/gpu/drm/msm/msm_gpu.h b/drivers/gpu/drm/msm/msm_gpu.h index b2a96544f92a..8bb8bd080cb0 100644 --- a/drivers/gpu/drm/msm/msm_gpu.h +++ b/drivers/gpu/drm/msm/msm_gpu.h @@ -549,6 +549,8 @@ static inline int msm_gpu_convert_priority(struct msm_g= pu *gpu, int prio, * seqno, protected by submitqueue lock * @idr_lock: for serializing access to fence_idr * @lock: submitqueue lock for serializing submits on a queue + * @in_flight_prealloc: for VM_BIND queue, # of preallocated pgtable pages= for + * queued VM_BIND jobs * @ref: reference count * @entity: the submit job-queue */ @@ -563,6 +565,7 @@ struct msm_gpu_submitqueue { struct idr fence_idr; struct spinlock idr_lock; struct mutex lock; + atomic_t in_flight_prealloc; struct kref ref; struct drm_sched_entity *entity; =20 --=20 2.50.0