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 0627B4052B6 for ; Wed, 29 Jul 2026 15:56:55 +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=1785340617; cv=none; b=G3HXuj33It+sdW3vBFDs7Ks+DNjL+Jz7gs3FjYThpoRFgHSgdGxuBclvxS5UPBkjSN6EBYmqkXxtLJS2tmBvpxnPdvKSOddVlzR8r2sDJ50EKk6yFyj1nFdX/SdOWWZ36EQ//cxCHOlL9U0FuoH35zJKo4lBD+eKoTs7y6jPa60= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785340617; c=relaxed/simple; bh=/3bqSJFB87g3YyDDP7AkU7aDRmxHIev5pH2eJsJSsIE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kVSS58Y1XIjkfeDxy0Cm9+cWWJgz6sox0p7+rJYU32wJn/EMdZy10+zMwIwxS0f8txq/9ysb83M+iev+yTAT7rb4diicrxmFJqu7jEg/1Iwenue+KfUyjuyf/I8caDxLFODL5sbEjXDsATPUZ6gAhNH9swKZQ0BscK2y8IASSgU= 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=BbAzXx1Y; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=WFAYQjGG; 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="BbAzXx1Y"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="WFAYQjGG" Received: from pps.filterd (m0279865.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66TF2TZN2591751 for ; Wed, 29 Jul 2026 15:56: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=CCt/FUCHkSx E63Ah7s7mIN0CuS0Ln8VYXya9PKCt1vg=; b=BbAzXx1Yixt4o/EdlUKj+9Ws9FN +xbzwmhrIpr04/L4n58yeyn3GQuxF7Rw5dk+cRvJA9dX/btPccWhS4XevqbcP9yY rrncA9Uu14eDLyEM0pbaP1FAAy9AqVqs3PEOaGjSb2gqNoth81wdGv4TjHIw0AUb 7Mp9RDTRJcuL/JvyZRWq2DMdtMQrihLdpazzmLePcuTU5vZrdwK8Urn44wUU927V YTfOoICggZ8JYn+Rda8VGRC5h6I/izpjns55w0Oq0blbIJywhOm6RT47+KUDFqb6 /wji3TFHk5q8V85yOc7jojkRttV7IB1LQEHUyZ/G822d/wurG/9iw5Xbw3g== 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 4fqke08gxp-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 29 Jul 2026 15:56:55 +0000 (GMT) Received: by mail-pj1-f71.google.com with SMTP id 98e67ed59e1d1-38e5a616d07so1259718a91.2 for ; Wed, 29 Jul 2026 08:56:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1785340615; x=1785945415; 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=CCt/FUCHkSxE63Ah7s7mIN0CuS0Ln8VYXya9PKCt1vg=; b=WFAYQjGGie4Sjr89wXHx0ED8XRFBi+Aji6TBWXryGCIk1DnMLKnlU1zTHDvYGtNsbB J7GvaRBgjfJ+q2xpG+FydBEKXHId56OF1wW9B5NfHuCYMj4qJtjCN/hPijHzcyi6esU5 KLotObvW33b34EgxLBOwNfre5Z5qQkgFvjY0Ky4ybAVakhekagNVgpOAWFGQ7BM59k2K rC508ShFB+6yWBC28vZ53P7tAexPLFfo4CfmULxXX8UQdBW1qj1QZwLTCkjbCrNUy2ka sSqWMP7M9ZLcp4pbEyIScQgHQxLVl9MAHrQ93CNeGmZH58Ct5AlNhpHDEV4zI6G/ZZXB Qj2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785340615; x=1785945415; 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=CCt/FUCHkSxE63Ah7s7mIN0CuS0Ln8VYXya9PKCt1vg=; b=i8uNMQ2qxN5VcHd8QsP5nQhwz1QbiQzU21m101JVY0Ug7DgiToUUeWxOustSQXCWlk ROrOnSYFj+YF4fKHM0Xyhxysk3r0XKG1AHGJeSmuMikQm7EFNVFpkiGz71wiBeiwAnIW 7M8HYV9GZI5Juvoje5haKYlm00CujIB/pik42YCPETPnA8YZ7+hmwxujoZp9xgHaHHMV Xbv/mHouuo5RVIar5gUhHXTTauLlsa7kTRHRrHUGmjU/+s6xIdFFKh2clyCnRHVhQXHN pNAqIAzdkBVjcTOmv9GsZaHUip5W+aHfu+NEAd1HuRaq6NhAUU4QqUV4g3oDtVZPyLqq hRug== X-Forwarded-Encrypted: i=1; AHgh+RokGsrDdytsHxFSmex2qtBzfjhLnLgYEmXsz8FRCYuuR6ZBq38YCqeAKwuLezeDe51QYRzievBKwER56W8=@vger.kernel.org X-Gm-Message-State: AOJu0Yzz244s/e+LpQK3aix8tgCWaULbYlmGGr2r5np46oqqUqpbOhGU 6v5oZBB6KdT88Phw38mgJIUGLKQEsxRMErKefU/4TvmnJ1UA3IFzh0qvjnVjvDdNbWIQidMyJ2/ mMH6jul6aZj+bBVAXac96PAj3nJDALpToYDXtDfoupl324sF6HpyKG9v4XbSJ93d4YNs= X-Gm-Gg: AR+sD10pplEfp2n7AbiouldHwhrIuXwPkv8k5vkteGq15kff67iCY6xbLlFfYGQpRBM U6M6ecxIGakEJxrrYxnUdZdc07mSMesRTNL2qPDgb/UUCR0XOMXYB6YJaqQgblGibEXcHo6EMJz MwfIPhKSUzsrzRKl8Z4arJEydf96Hd1GzMqjmsJZbqRGhQsJqKkKgsN7+X+CQlqGBHSRj2p1qH+ KP0fWkBOehJHr8pHSct7aClVvQTJRXzoycv1tr+oWgROTzES5mtj/L5w5qQaE5KBl2vo4uury4e kthu9+BLjsvP8U5bab9BddLGymUCCrhUoAy7AWOwC58TnKdXXltZD9NKtDP1NsD1yuraQ97KRY8 /F+Y/RZV+snDuUqi5fWzPwFB7V7CcBbhX6m0CP7DyBbTlr1M= X-Received: by 2002:a17:90b:258e:b0:387:e0db:bc2c with SMTP id 98e67ed59e1d1-38f6a422e25mr7851763a91.34.1785340614583; Wed, 29 Jul 2026 08:56:54 -0700 (PDT) X-Received: by 2002:a17:90b:258e:b0:387:e0db:bc2c with SMTP id 98e67ed59e1d1-38f6a422e25mr7851733a91.34.1785340614131; Wed, 29 Jul 2026 08:56:54 -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 98e67ed59e1d1-38f7f2b690fsm1637860a91.13.2026.07.29.08.56.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Jul 2026 08:56:53 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Konrad Dybcio , Akhil P Oommen , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v7 02/17] drm/msm: Rework queuelock Date: Wed, 29 Jul 2026 08:55:39 -0700 Message-ID: <20260729155609.20190-3-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: AW1haW4tMjYwNzI5MDEyNyBTYWx0ZWRfX4UqWZ3zkIqgT wqZwzti4Zm48dggWUvA2IwaVUT0BKk/3HvFgZaPCLKERc628gpRaUpjM6z5hA7mCibCiTkWVM25 4cHWZ1+Pj5CDnXP3vo1GX2K9poSYeQmLtpEZcmbWGp8QkOysnsRG6qKRS35DvgZF61fUnSJ1bZa UgI5FNPS+6xbSHnd+lK4nd0qTZBmnnl2xJ8Ywh2peEYh3tnQXXFyoTy9UPIK0sQs2oPlFyOwuub Kpotl3ZhhcYnz2v6PIxJo6ffZelHg9Kng6JHYH/RlgQ5nsVWvrddu6/uxivDtQbsmyJoRyMlkwm fmyI/bVPPCVJDnbXJqsdIk8vB9VAWMszmQW4P0Ducd72KiGGgveqIIW0iKwadXuBwI3YL1STzdy q0f302niEBgS54fsDJNahkiVDO00ovoTuFoxqckiuQpgiaJrIVeWIC1TZ/b6urLwQ3el1VV3OUL HBiwHsQv5iuGRrHguvg== X-Proofpoint-GUID: 8I8fErc6MFA2lHTETwdEtqg2dis_w_rR X-Proofpoint-Spam-Info: AW1haW4tMjYwNzI5MDEyNyBTYWx0ZWRfX75ksod81Lqu9 i6tJjFjm1xeMwyQlVwTNaEbWXGrozxqS01lDvOrXrM1JRVSQfVoYtIkpDR3PHmXFC3v3qshpFu0 RE5jIPbaG7NtTU2SRzimq2Vo0m7XQFE= X-Authority-Analysis: v=2.4 cv=ONYXGyaB c=1 sm=1 tr=0 ts=6a6a22c7 cx=c_pps a=UNFcQwm+pnOIJct1K4W+Mw==:117 a=19Wyn7e3V/0aNffMjNCMQw==:17 a=RAioF0-LDSMA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=Um2Pa8k9VHT-vaBCBUpS:22 a=EUspDBNiAAAA:8 a=2F56w5eUDQPWH_qpgLoA:9 a=0bXxn9q0MV6snEgNplNhOjQmxlI=:19 a=uKXjsCUrEbL0IQVhDsJ9:22 X-Proofpoint-ORIG-GUID: 8I8fErc6MFA2lHTETwdEtqg2dis_w_rR 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 impostorscore=0 lowpriorityscore=0 spamscore=0 adultscore=0 priorityscore=1501 suspectscore=0 bulkscore=0 clxscore=1015 phishscore=0 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607290127 Rename to ctxlock, and use cleanup guards to manage releasing the lock. This will let us re-use it for other per-context read/write serial- ization, such as VM creation. Signed-off-by: Rob Clark --- drivers/gpu/drm/msm/msm_drv.c | 2 +- drivers/gpu/drm/msm/msm_gpu.h | 4 ++-- drivers/gpu/drm/msm/msm_submitqueue.c | 14 +++----------- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c index ec88155e0ed7..384f32f4d0c2 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -251,7 +251,7 @@ static int context_init(struct drm_device *dev, struct drm_file *file) return -ENOMEM; INIT_LIST_HEAD(&ctx->submitqueues); - rwlock_init(&ctx->queuelock); + init_rwsem(&ctx->ctxlock); kref_init(&ctx->ref); msm_submitqueue_init(dev, ctx); diff --git a/drivers/gpu/drm/msm/msm_gpu.h b/drivers/gpu/drm/msm/msm_gpu.h index 6c83b8cbbb90..d27d54bdb7a7 100644 --- a/drivers/gpu/drm/msm/msm_gpu.h +++ b/drivers/gpu/drm/msm/msm_gpu.h @@ -392,8 +392,8 @@ msm_gpu_sysprof_no_ifpc(struct msm_gpu *gpu) * struct msm_context - per-drm_file context */ struct msm_context { - /** @queuelock: synchronizes access to submitqueues list */ - rwlock_t queuelock; + /** @ctxlock: synchronizes access to submitqueues list, etc */ + struct rw_semaphore ctxlock; /** @submitqueues: list of &msm_gpu_submitqueue created by userspace */ struct list_head submitqueues; /** diff --git a/drivers/gpu/drm/msm/msm_submitqueue.c b/drivers/gpu/drm/msm/msm_submitqueue.c index 1a5a77b28016..8b5980d5a6a7 100644 --- a/drivers/gpu/drm/msm/msm_submitqueue.c +++ b/drivers/gpu/drm/msm/msm_submitqueue.c @@ -93,18 +93,15 @@ struct msm_gpu_submitqueue *msm_submitqueue_get(struct msm_context *ctx, if (!ctx) return NULL; - read_lock(&ctx->queuelock); + guard(rwsem_read)(&ctx->ctxlock); list_for_each_entry(entry, &ctx->submitqueues, node) { if (entry->id == id) { kref_get(&entry->ref); - read_unlock(&ctx->queuelock); - return entry; } } - read_unlock(&ctx->queuelock); return NULL; } @@ -237,7 +234,7 @@ int msm_submitqueue_create(struct drm_device *drm, struct msm_context *ctx, return ret; } - write_lock(&ctx->queuelock); + guard(rwsem_write)(&ctx->ctxlock); queue->ctx = msm_context_get(ctx); queue->id = ctx->queueid++; @@ -251,8 +248,6 @@ int msm_submitqueue_create(struct drm_device *drm, struct msm_context *ctx, list_add_tail(&queue->node, &ctx->submitqueues); - write_unlock(&ctx->queuelock); - return 0; } @@ -335,19 +330,16 @@ int msm_submitqueue_remove(struct msm_context *ctx, u32 id) if (!id) return -ENOENT; - write_lock(&ctx->queuelock); + guard(rwsem_write)(&ctx->ctxlock); list_for_each_entry(entry, &ctx->submitqueues, node) { if (entry->id == id) { list_del(&entry->node); - write_unlock(&ctx->queuelock); - msm_submitqueue_put(entry); return 0; } } - write_unlock(&ctx->queuelock); return -ENOENT; } -- 2.55.0