From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 70B504052AC for ; Wed, 29 Jul 2026 15:57:13 +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=1785340636; cv=none; b=g8L9Mvsd9Z95UUbQexsZy6ECdHS4O1rTgkRG/YTGDHGgaHCtjufvoFzPyXhkpCUA+W3t2BLQcglbFf3YcDuqLZS0bDNW/gGC01Q1jqFaroksoxWftl1nrx8mkDauYwzhtmjRoaVQ3CCBlKHQpig6fFwu42jg7RLmM8NLHQNRcLs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785340636; c=relaxed/simple; bh=zp0M+Vm2VG1Oqc9pTz9Ow+PpcVwW0DLDp2QjSfitMBE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HKhCgQp2Kd2oz8hZcGvYLP1psI/B1tiCqLadogphH3aJj368Jm/4j1Fgd+XRPEs6+dsP2D17hnTngz7KAvI+EJ6RzWpQh6g+HIkaxDWJfZS247+eUgxYMRodOK2gobNqbpJe8KEG4W3/HesRQZhqt0VJQxlHYvwsuCxd6KDZlwI= 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=Dof81QTv; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=JHH11+Hh; 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="Dof81QTv"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="JHH11+Hh" Received: from pps.filterd (m0279867.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66TF37i43343206 for ; Wed, 29 Jul 2026 15:57:12 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=LKg0Jig2RkR o1/gnDZZ15WTbhHY0CsisFdaLrgf+he0=; b=Dof81QTvNcwf2CyhVLn0kGRaitj oANPKDN7pGI/v8NWBM0gih05ohSuM0f74e3cxglNn+7otP2J4DEvudF1WV6FOJNl hLO7E4cwLjpycexyL2J7CJ10a6tucFbZUChfOEYR0wlUgS6zwKM88zbgJ5xpZebO IjkRlUukoVGOFI7arO/QRG5Q4fdUOwOfIr8G9PKzf7elxh+KAJFlNYfBnz5FtHw5 WKMp1l4WPElgCd16yP82IrUFlPJhAfY6OoFZeZnQDC24rDbUOvhLgUDasvNc+41Y MoGYc6yghro/R5pnFQhAcKCypql35rsZuRDoyNXX0t4UXExkDqRgvgSkfUw== 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 4fqh3ms6tj-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 29 Jul 2026 15:57:11 +0000 (GMT) Received: by mail-pl1-f199.google.com with SMTP id d9443c01a7336-2ccb6f6a3f4so108775ad.1 for ; Wed, 29 Jul 2026 08:57:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1785340631; x=1785945431; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=LKg0Jig2RkRo1/gnDZZ15WTbhHY0CsisFdaLrgf+he0=; b=JHH11+HhngXFBqoydirFiMpwImTrsrsIk1VvcJc5Ta8V0cjQaBnFSHJ23ud7EFLo1f tYhl0cej2WvUWHHTaOLGrX/dLL3JMA98GfVE7q/jyuwZ1G7HjLBp7L25NB0wD56qaQbp XFtmIYR+K41gJ+wN1dmNKnYTq+P7KKFDAEwRQ0Pz4f0es/O4jXtEFCvIVo0608aeQA58 2cwA6OpoHTJQq23U5RTygKLbu4L+Zz/h+j31q0SesrZpFDcyfIoBnoqLpuoLQAtCC8EL 3YDQz6fiYk1lo0M4bE95TExQtO5J7iW0JoigMwETlwVUZaJ3dmE0nqFyfqd7pYGPee+w siTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785340631; x=1785945431; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=LKg0Jig2RkRo1/gnDZZ15WTbhHY0CsisFdaLrgf+he0=; b=i9YCD1oFsz5raNVrqaIFVE3ikGxmO24ly99Qmp7GuP5G9Zd8EaR2oOWqHCRbC84exb ff6/bTQ0CavlZiPBgDeX1fX4rcozKwVaDSyPK/jRuVu/FOL3OtwRrBeXjQbrz9oZWPLV AMdGiS4RStBL3j3SShgcDpZiGSmlvmJNsNA/7RUyJJFQaHs+vZxXBYRUAdENsa77BqUZ d0+iUjnEIKINyFLU+ZYHPEUzeB07grkLg5/gQ0K29/my97F6uz7UYrmTgmSqZ8ETfMdf 6G2HfTdCZPkN3PnQ5qGsp+i03DOduNJoK8JwgVmLA+R+DfutdmA0595zMrdhI+XRcksy BpfQ== X-Forwarded-Encrypted: i=1; AHgh+RrM7XzVPkkGI+nSzd9uilWerIu6vLBZUpkCQTI2QFi1Y2dWeZYhA9ZZZleQ4E/PT/ZQ8jE+WyY+c8TmZkA=@vger.kernel.org X-Gm-Message-State: AOJu0YxMaaYCS0NI7PP/GAHNvTBGf5t9uI3Kq5fNOsnET9YNP1dIKAg+ S+ohCq16slGTKh8dNF607YjLK7Xwz00VIbnjFjkSfaIU+pC5HRyofbXGYhSnCMJE9+YnlNIaNJ1 lkWuJ8O4YtXZakfMNsRlnA/DMcqpjzC1MrnFFkKr64a9e15sBRptIpV0BM+EmGKpHjtM= X-Gm-Gg: AR+sD10Equ+IzFpyW/lCArl1Qk3osaIHNXKrN8T8XuzMoZVcaK5oIo20DcvwYEMDmQu ewezl01IyFdJxD6EJxI1DsitGuq/l6DNiBcovAYlgoasH5gPNACBnmUuKU2pfoqjpSJTZ+70Bhx TRDOsRs6jtXs/hMCSO5gZk+Wz7XwNxRlYZVNZpk7kxk3Q81xFsdxFtqd+WC0QaHPkxWAarD5FGg kmWt6GrsSRNWeOgtOdGdJ/WEhoWddo/ydsnBDhJXDCp/sKh3CBImDpLHvfJq4gcozbA39mxRqwg qkXIbdE/ETc7eZXUZC484Kj6RBpLHPdY++hayeOZeylHs0uieE4oHZIdiZO7ntV7ZwpXPPLB3Wl LVntl8YfGNYSB+5PbcD4S3rT3kms4xswH3JGGgthZvwst/VA= X-Received: by 2002:a17:903:2282:b0:2ca:53f7:3c69 with SMTP id d9443c01a7336-2d0266945f4mr30364585ad.9.1785340631050; Wed, 29 Jul 2026 08:57:11 -0700 (PDT) X-Received: by 2002:a17:903:2282:b0:2ca:53f7:3c69 with SMTP id d9443c01a7336-2d0266945f4mr30364355ad.9.1785340630566; Wed, 29 Jul 2026 08:57:10 -0700 (PDT) Received: from localhost (c-73-37-105-206.hsd1.or.comcast.net. [73.37.105.206]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2d022a7fabasm13833005ad.37.2026.07.29.08.57.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Jul 2026 08:57:10 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, Rob Clark , Sean Paul , Konrad Dybcio , Akhil P Oommen , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Marijn Suijten , David Airlie , Simona Vetter , Luca Ceresoli , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v7 12/17] drm/msm/gem: Set resv before exposing obj Date: Wed, 29 Jul 2026 08:55:49 -0700 Message-ID: <20260729155609.20190-13-robin.clark@oss.qualcomm.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260729155609.20190-1-robin.clark@oss.qualcomm.com> References: <20260729155609.20190-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: 8bit X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzI5MDEyNyBTYWx0ZWRfXyS+roj3Fr2kt vXBgHjCwYsY9IMyrwm+Lupm4KQe6EZWvNYSDhbI8wXaFO5z9n1rvVWvWA44XoWkEGLzOEmbGvk2 MbBUNqxTr31yDDm7xykxnurZMTAAKnznXIfbeYQMghxoODuvTxllVNPS6XhLCJ46Xe6KjEtzTZ6 ZCmvRYpmayYjW9g5u962Op7RBrycJrwHesu/XDe6yVxO+TS9m5x17aS6lfoZBmjkKSolhibjQNQ E3vrs+AYGwQo3vDg78YF8C94EH7LcfFlYwwJL138buJMKMpLCHOKDlq+p52wlfD6GHgd8IgcsGw XkV/aAGr7Re/wBvUcgjqqEM4Iuk+cOI7M98bc1cnrM9OK4v4oLW02MGdBz6W+2FAUQWboK21Fd9 nk5o9eHT8ZApdOqSKhItw/vge3DVAXEAvUk5Xkpkaj24KFISZDw5JKhQa35wjlyiRCDWASkw/EC 5Qyw818DbkyN4HL4tuQ== X-Authority-Analysis: v=2.4 cv=F49nsKhN c=1 sm=1 tr=0 ts=6a6a22d7 cx=c_pps a=JL+w9abYAAE89/QcEU+0QA==:117 a=19Wyn7e3V/0aNffMjNCMQw==:17 a=RAioF0-LDSMA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=eoimf2acIAo5FJnRuUoq:22 a=EUspDBNiAAAA:8 a=EaMrRQiLzwQp3BzynKIA:9 a=324X-CrmTo6CU4MGRt3R:22 X-Proofpoint-GUID: tSi1hbNSJPzivCOropDWi3UyH3W54N6A X-Proofpoint-ORIG-GUID: tSi1hbNSJPzivCOropDWi3UyH3W54N6A X-Proofpoint-Spam-Info: AW1haW4tMjYwNzI5MDEyNyBTYWx0ZWRfXyoCAABRIC/a1 51E/kGNZpU/EpwSLY3PwEQN8PgWwIH9kIeHvKrY+LvWUUsNzZzgVY2Eg1AuWsuuqcrSWkbwnZSP 4CNnpjiP7G4oBNda5A+WY7NidATWCWw= X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-29_06,2026-07-29_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 suspectscore=0 priorityscore=1501 bulkscore=0 clxscore=1015 spamscore=0 lowpriorityscore=0 phishscore=0 impostorscore=0 adultscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607290127 Don't swap the resv object _after_ exposing the newly created obj in LRU or global objects list, as that creates a race condition where another thread could lock the object using the original (per-obj) resv, but then unlock after the resv is replaced. Signed-off-by: Rob Clark --- drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 2 +- drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | 2 +- drivers/gpu/drm/msm/msm_fb.c | 4 +-- drivers/gpu/drm/msm/msm_gem.c | 32 ++++++++++++++---------- drivers/gpu/drm/msm/msm_gem.h | 2 +- 5 files changed, 24 insertions(+), 18 deletions(-) diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c index 2e5d7b53a0c3..9aed142faea1 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c @@ -1546,7 +1546,7 @@ static int a6xx_gmu_memory_alloc(struct a6xx_gmu *gmu, struct a6xx_gmu_bo *bo, flags |= MSM_BO_MAP_PRIV; } - bo->obj = msm_gem_new(dev, size, flags); + bo->obj = msm_gem_new(dev, size, flags, NULL); if (IS_ERR(bo->obj)) return PTR_ERR(bo->obj); diff --git a/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c b/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c index 7726edb0d4ed..c289dff78cd5 100644 --- a/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c +++ b/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c @@ -463,7 +463,7 @@ static int mdp4_kms_init(struct drm_device *dev) goto fail; } - mdp4_kms->blank_cursor_bo = msm_gem_new(dev, SZ_16K, MSM_BO_WC | MSM_BO_SCANOUT); + mdp4_kms->blank_cursor_bo = msm_gem_new(dev, SZ_16K, MSM_BO_WC | MSM_BO_SCANOUT, NULL); if (IS_ERR(mdp4_kms->blank_cursor_bo)) { ret = PTR_ERR(mdp4_kms->blank_cursor_bo); DRM_DEV_ERROR(dev->dev, "could not allocate blank-cursor bo: %d\n", ret); diff --git a/drivers/gpu/drm/msm/msm_fb.c b/drivers/gpu/drm/msm/msm_fb.c index 9b681e144c07..ee17a47f31c4 100644 --- a/drivers/gpu/drm/msm/msm_fb.c +++ b/drivers/gpu/drm/msm/msm_fb.c @@ -267,11 +267,11 @@ msm_alloc_stolen_fb(struct drm_device *dev, int w, int h, int p, uint32_t format /* allocate backing bo */ size = mode_cmd.pitches[0] * mode_cmd.height; DBG("allocating %d bytes for fb %d", size, dev->primary->index); - bo = msm_gem_new(dev, size, MSM_BO_SCANOUT | MSM_BO_WC | MSM_BO_STOLEN); + bo = msm_gem_new(dev, size, MSM_BO_SCANOUT | MSM_BO_WC | MSM_BO_STOLEN, NULL); if (IS_ERR(bo)) { dev_warn(dev->dev, "could not allocate stolen bo\n"); /* try regular bo: */ - bo = msm_gem_new(dev, size, MSM_BO_SCANOUT | MSM_BO_WC); + bo = msm_gem_new(dev, size, MSM_BO_SCANOUT | MSM_BO_WC, NULL); } if (IS_ERR(bo)) { DRM_DEV_ERROR(dev->dev, "failed to allocate buffer object\n"); diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c index 3c36b1c4a4d5..535c6e1acb3c 100644 --- a/drivers/gpu/drm/msm/msm_gem.c +++ b/drivers/gpu/drm/msm/msm_gem.c @@ -1136,10 +1136,17 @@ int msm_gem_new_handle(struct drm_device *dev, struct drm_file *file, size_t size, uint32_t flags, uint32_t *handle, char *name) { - struct drm_gem_object *obj; + struct drm_gem_object *obj, *r_obj = NULL; int ret; - obj = msm_gem_new(dev, size, flags); + if (flags & MSM_BO_NO_SHARE) { + struct msm_context *ctx = file->driver_priv; + struct drm_gpuvm *vm = msm_context_vm(dev, ctx); + + r_obj = drm_gpuvm_resv_obj(vm); + } + + obj = msm_gem_new(dev, size, flags, r_obj); if (IS_ERR(obj)) return PTR_ERR(obj); @@ -1147,15 +1154,6 @@ int msm_gem_new_handle(struct drm_device *dev, struct drm_file *file, if (name) msm_gem_object_set_name(obj, "%s", name); - if (flags & MSM_BO_NO_SHARE) { - struct msm_context *ctx = file->driver_priv; - struct drm_gem_object *r_obj = drm_gpuvm_resv_obj(ctx->vm); - - drm_gem_object_get(r_obj); - - obj->resv = r_obj->resv; - } - ret = drm_gem_handle_create(file, obj, handle); /* drop reference from allocate - handle holds it now */ @@ -1251,7 +1249,9 @@ static int msm_gem_init_bookkeeping(struct drm_gem_object *obj) return drm_gem_create_mmap_offset(obj); } -struct drm_gem_object *msm_gem_new(struct drm_device *dev, size_t size, uint32_t flags) +struct drm_gem_object * +msm_gem_new(struct drm_device *dev, size_t size, uint32_t flags, + struct drm_gem_object *r_obj) { struct drm_gem_object *obj = NULL; int ret; @@ -1268,6 +1268,11 @@ struct drm_gem_object *msm_gem_new(struct drm_device *dev, size_t size, uint32_t if (ret) return ERR_PTR(ret); + if (flags & MSM_BO_NO_SHARE) { + drm_gem_object_get(r_obj); + obj->resv = r_obj->resv; + } + ret = drm_gem_object_init(dev, obj, size); if (ret) goto fail; @@ -1311,6 +1316,7 @@ struct drm_gem_object *msm_gem_import(struct drm_device *dev, * up in drm_gem_object_put() -> msm_gem_free_object() */ obj->import_attach = attach; + obj->resv = dmabuf->resv; drm_gem_private_object_init(dev, obj, size); npages = size / PAGE_SIZE; @@ -1346,7 +1352,7 @@ void *msm_gem_kernel_new(struct drm_device *dev, size_t size, uint32_t flags, uint64_t *iova) { void *vaddr; - struct drm_gem_object *obj = msm_gem_new(dev, size, flags); + struct drm_gem_object *obj = msm_gem_new(dev, size, flags, NULL); int ret; if (IS_ERR(obj)) diff --git a/drivers/gpu/drm/msm/msm_gem.h b/drivers/gpu/drm/msm/msm_gem.h index 86dc93cc1804..dff60cbc9d95 100644 --- a/drivers/gpu/drm/msm/msm_gem.h +++ b/drivers/gpu/drm/msm/msm_gem.h @@ -296,7 +296,7 @@ int msm_gem_cpu_fini(struct drm_gem_object *obj); int msm_gem_new_handle(struct drm_device *dev, struct drm_file *file, size_t size, uint32_t flags, uint32_t *handle, char *name); struct drm_gem_object *msm_gem_new(struct drm_device *dev, - size_t size, uint32_t flags); + size_t size, uint32_t flags, struct drm_gem_object *r_obj); void *msm_gem_kernel_new(struct drm_device *dev, size_t size, uint32_t flags, struct drm_gpuvm *vm, struct drm_gem_object **bo, uint64_t *iova); -- 2.55.0