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 CE09A2FFDE1 for ; Mon, 11 May 2026 13:00:57 +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=1778504460; cv=none; b=qTtnm9wVC6xu0yI0X6xJMC4rEyY90ddkFLq1xnI2r+K0NnTksG+Ny4C0CZYBbZ3LerxOt6uF24AnjbuGfF2e2p9N1FVgS//tLXv/B2AXyG9knkbuQNhznztKmtsgC3yszf+wN5+F3wGsVjZsWsF0bg1GhsX2hdJHx4StuxV5y/0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778504460; c=relaxed/simple; bh=iTtdqNG+4e2D4TedZvUBzLQPIiy7/I8n2hAXCp34m0w=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=OCcTxSO0KXOJXiO88kG8pqkgdJ7H8ocXWmq/ifvyrvQ0eKFZtyuR0YBOpPDa1mJNAA4QopX07YQHlk02esGQ/2HMjfvdFGIZLru+y/wDShlTLD/NxBBppvGNEUWXvRSQBHUAKYpqxEamBBFG0KSadwccehRWBN58f5e83lijm/E= 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=R2C6XVCV; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=QSBz8p8t; 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="R2C6XVCV"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="QSBz8p8t" Received: from pps.filterd (m0279863.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 64BC4SAq1106952 for ; Mon, 11 May 2026 13:00:56 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:message-id:mime-version :subject:to; s=qcppdkim1; bh=TpHroqNFYrbHc+Hyc8A7RZr1LE9fkn+T3bp iGnJTfpQ=; b=R2C6XVCVvTqmEEametLLwmbGpiJulaV1Y+BOWVVqDjhIFFg8aRC xmB/XliURraDnSSLGnUaAgX88jgeiWFfgELdoa9ip4I+g8t14vtxamEBtxH8sxtL 1UhCht5Gs5aMdRp9akAE8u9MIl9VZ85Kvo+b4iEwDL344+eS2Q6ehb0fOLICSJfY p/h2hQIFZlPwTCW4d/gXUZPq/JvAsiJEIC79vnapG9Xn/qScpFyXpQAkIrkPRan+ rYGWZE8TNrX8eBGeV9wBUGbIT3hb+JgIJx8eld/IFG7sA9pNHXekE1kj1mi+Fphi CNWpm3xbDS05NoJqQB/A+iNSyYyho3S+Wfw== 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 4e3esr85h4-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 11 May 2026 13:00:56 +0000 (GMT) Received: by mail-pl1-f199.google.com with SMTP id d9443c01a7336-2b9a6d84522so81691255ad.2 for ; Mon, 11 May 2026 06:00:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1778504456; x=1779109256; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=TpHroqNFYrbHc+Hyc8A7RZr1LE9fkn+T3bpiGnJTfpQ=; b=QSBz8p8txmVES/y630vSj9mqc3IMXZpCmbOnYJ43uyGjJOdCadyF5fBFu7Q+ScZZAL 8GCQkJvqlK5Y4aAXHb0WGtm72XmxSdM44HGTIWV+VC7Grn42ehA7xW+q/h32x0xYjHCx xVTW9gxTwuIZmgyH/oDTQUDXrZy42bYwM2eRyyYoUppUMCm5UNAHn1di8RZqeatzPAL1 iAVt8JYboChZj4GLf9SrZbJ16LyaxfEyK83E8SdEGVDvy4LajOvd6XFvhBOANciTHie8 /728sIxw3/2QsV5H/T87nFFhjFHdIZ1h/P/3SYBwew8NH/0h831zQGNnLlDnefMUBOE3 HV5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778504456; x=1779109256; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=TpHroqNFYrbHc+Hyc8A7RZr1LE9fkn+T3bpiGnJTfpQ=; b=Z3IbKEvqOjDFKSXpA/w+DlZnQXPRq45RwrMWVPNMpzg6BVekPm7ooupiBmgEPez/Ng DdfOuQTDO+Eao5MfxYvq6TiBOT8zEFU1rvpVYmYV5bYVw7pC9Zy3oLYBXxQr5cNIQCKu vVs8LVuBcOUB7INC56OsUobY/R4XVtN9Z98fT5yR9lF+rLuj6//XEtnFu0K9EHcTgk+m BElIT4bvABYPnN2eKcwuWXxbRQwYR2hitKzlv0soRLrWMeCx+3vuOfK3Szo0CXZ4Bv19 tw0q/MW9m9bGzzF0gyNTSIuqNM93BMXJ25YSOpANmqQjqbvIk6aRT3Ox8+1GfO0uwNh2 Vv3w== X-Forwarded-Encrypted: i=1; AFNElJ+AbQ8n5c7nvDy9wfm84SurF/jZ/9UnNJd9DRuCdDptPZl1pOWXSljZSUSFRYGxTLzQi0g+luTib/+c4N8=@vger.kernel.org X-Gm-Message-State: AOJu0YxU+uVve9TzMrjvfINr61RfcVjWNHk7zYT7DG0xBHZZ9J3DhXQD B7gACJkh+DLpHG8QJ2PWtfcgl50kQi6s3o/y1NdXYfyZezKcVhr/X2YUkdO0fw/v5a7uWQ0eGKY rcGdr7XgQtc3VTfJGSLedmuVsjKvvvqm30CcTXaDs96xVqSpQlYDkQOkuSlisuECyMDQ= X-Gm-Gg: Acq92OHUin/rWJnyWCeC2GGjdq14ORu4GBOsiiKF822eqjMCw+j9tK9WmTAS2uk/ACo 8WyTqYJQOBDeZ1Zyfkij4AjafDXIQjQwy781PDR0RPS0BrmMlJrTSUp8plmu8+qmly3d+Y6Mh6Y XPMfkHNa6M92FSP1NzC4PZA0Ct9ZxDi5IuzvTjodsxxwTOc2yD81vflRms/qlHN51RW0wM9vM8N XjYhLna7tsGQkVTxFGQIi3t/v30Os5IFpC5phNAGvOvVlFHW9MAFqwyT1RQ7Qb7hUialAi7u4pS Xc5FCKchROMauJ8HXNbpQKxuchtixj5mF3tcG8OTQxONBJyPu9QOWKMS9UTA/JFnD+X/IjUN3Om b868A0lA3HQEZMMPFhcCXTedxHDvh/4y0 X-Received: by 2002:a17:902:7042:b0:2bc:e299:4c9c with SMTP id d9443c01a7336-2bce299504cmr15972165ad.3.1778504455166; Mon, 11 May 2026 06:00:55 -0700 (PDT) X-Received: by 2002:a17:902:7042:b0:2bc:e299:4c9c with SMTP id d9443c01a7336-2bce299504cmr15971115ad.3.1778504454330; Mon, 11 May 2026 06:00:54 -0700 (PDT) Received: from localhost ([2601:1c0:5000:d5c:4ec8:83f5:8254:6891]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2baf1e9723esm112028105ad.67.2026.05.11.06.00.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 May 2026 06:00:53 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, Akhil P Oommen , Rob Clark , Abhinav Kumar , Bill Wendling , David Airlie , Dmitry Baryshkov , Jessica Zhang , Justin Stitt , Konrad Dybcio , linux-kernel@vger.kernel.org (open list), llvm@lists.linux.dev (open list:CLANG/LLVM BUILD SUPPORT:Keyword:\b(?i:clang|llvm)\b), Maarten Lankhorst , Marijn Suijten , Maxime Ripard , Nathan Chancellor , Nick Desaulniers , Sean Paul , Simona Vetter , Thomas Zimmermann Subject: [PATCH v5 00/16] drm/msm: Add PERFCNTR_CONFIG ioctl Date: Mon, 11 May 2026 05:59:13 -0700 Message-ID: <20260511130017.96867-1-robin.clark@oss.qualcomm.com> X-Mailer: git-send-email 2.54.0 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-GUID: FyeJFJfQKaBw-vk0d_0vOsFQJz2kiFXu X-Proofpoint-ORIG-GUID: FyeJFJfQKaBw-vk0d_0vOsFQJz2kiFXu X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTExMDE0NCBTYWx0ZWRfX3qhG35ewvTC1 sC7CHEILJ5Mi0k/QvsNglN+WvAhc//FlAAkYyvnBir5Oe7JyI3N+ipi0+fIlIbIAdZxESsNnY+2 pdVlK2SqTyuRuyEZ7GlSjavwQd3lE5Bx7awxY0iFvBGwb2i9FKS64s5MjOAZgK4nqy0L3TDE2jx 0k6zQc5WPGrLvNdlrNc3c4u00BFOAXvfavDLpwlRy4KKm8F5s2cWUfUrh9AtWpnnQ1VsiSIgMz5 HjBvcDCgFI3jokdOPI3Lu9+ruKr38YDiiQwU+tH4PstTiAJlGp0WnLl3RTaLmzhogZG+FSg/v5k xMEs7oDw9J/SOm5NPXUVexfGWunwrkzBEvPqFE8jTEkgbdVDjaViFCtvWFeOqfZHr7QCnBEqOFJ 5dgeOhvgVGcyiCcPx496ClLBh9nu6trSLUhpG68x1OqDX27buA0UdER9rva7q+FQ12UzWurrpVh HbZapRts3r2eSpEPN7g== X-Authority-Analysis: v=2.4 cv=G40s1dk5 c=1 sm=1 tr=0 ts=6a01d308 cx=c_pps a=JL+w9abYAAE89/QcEU+0QA==:117 a=xqWC_Br6kY4A:10 a=NGcC8JguVDcA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=yOCtJkima9RkubShWh1s:22 a=e5mUnYsNAAAA:8 a=VwQbUJbxAAAA:8 a=EUspDBNiAAAA:8 a=j6mXroKpKqDHY7BEWhIA:9 a=324X-CrmTo6CU4MGRt3R:22 a=Vxmtnl_E_bksehYqCbjh:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-05-11_03,2026-05-08_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 priorityscore=1501 adultscore=0 bulkscore=0 clxscore=1015 malwarescore=0 impostorscore=0 lowpriorityscore=0 phishscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2604200000 definitions=main-2605110144 Add a new PERFCNTR_CONFIG ioctl, serving two functions: 1. Global counter collection (restricted to perfmon_capable()) using the MSM_PERFCNTR_STREAM flag. Global counter sampling is, global, across contexts. Only a single global counter stream is allowed at a time. 2. Reserve counters for local counter collection. Local counter collection is local to a cmdstream (GEM_SUBMIT), and as such is allowed in all processes without additional privileges. The kernel enforces that counters assigned for global counter collection do not conflict with counters reserved for local counter collection, and visa versa. Since local counter collection is scoped to a single cmd- stream, multiple UMD processes can overlap in their reserved counters. But cannot conflict with global counter usage. In the case of local counter collection, the UMD is still responsible for programming the corresponding SELect registers, and sampling the counter values, from it's cmdstream. But by performing the reservation step, the UMD protects itself from the kernel trying to use the same SEL/counter regs for global counter collection. For global counter collection, the kernel programs SEL regs, and sets up a timer for counter sampling. Userspace reads out the sampled values from the returned perfcntr stream fd. Releasing the global perfcntr stream is simply a matter of close()ing the fd. The final two patches wire up the needed support for global counter stream collection while IFPC is active, and drops disabling of IFPC. The mesa side of this is at: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/41158 igt test at: https://gitlab.freedesktop.org/robclark/igt-gpu-tools/-/commits/perfcntrs wiki page about the design: https://gitlab.freedesktop.org/drm/msm/-/wikis/adreno:-perfcounter-UABI Changes in v5: - Drop unnecessary runpm in ioctl path - Link to v4: https://lore.kernel.org/all/20260506171127.133572-1-robin.clark@oss.qualcomm.com Changes in v4: - Fix null ptr deref on older gens without perfcntr support [Claude] - Add upper limit to userspace controlled FIFO size [Claude] - Fix nr_regs calculation [Claude] - Link to v3: https://lore.kernel.org/all/20260504190751.61052-1-robin.clark@oss.qualcomm.com/ Changes in v3: - Fix loop counter issue spotted by Claude review - Add MSM_PERFCNTR_UPDATE flag to ask kernel to return the actual # of available counters in case of -E2BIG - Proper barriers for modifying pwrup_Link - Link to v2: https://lore.kernel.org/all/20260424151140.104093-1-robin.clark@oss.qualcomm.com Changes in v2: - Rework makefile magic based on Dmitry's suggestion, and add a2xx/a5xx perfcntr tables (although only a6xx+ is supported at this point) - Fix compile error for compilers that are picky about a struct that only contains a flex array - Drop a6xx_idle() under gpu->lock in a6xx_perfcntr_configure(), replace with perfcntr_fence that sel_worker can check - Add a7xx+ pwrup_reglist support for restoring SELect regs on exit from IFPC. (a6xx doesn't support IFPC, and the pwrup_reglist works a bit differently) - Stop disabling IFPC when global counter stream is active. - Link to v1: https://lore.kernel.org/all/20260420222621.417276-1-robin.clark@oss.qualcomm.com/ Rob Clark (16): drm/msm: Remove obsolete perf infrastructure drm/msm: Allow CAP_PERFMON for setting SYSPROF drm/msm/adreno: Sync registers from mesa drm/msm/registers: Sync gen_header.py from mesa drm/msm/registers: Add perfcntr json drm/msm: Add a6xx+ perfcntr tables drm/msm: Add sysprof accessors drm/msm/a6xx: Add yield & flush helper drm/msm: Add per-context perfcntr state drm/msm: Add basic perfcntr infrastructure drm/msm/a6xx+: Add support to configure perfcntrs drm/msm/a8xx: Add perfcntr flush sequence drm/msm: Add PERFCNTR_CONFIG ioctl drm/msm/a6xx: Increase pwrup_reglist size drm/msm/a6xx: Append SEL regs to dyn pwrup reglist drm/msm/a6xx: Allow IFPC with perfcntr stream drivers/gpu/drm/msm/Makefile | 27 +- drivers/gpu/drm/msm/adreno/a2xx_gpu.c | 7 - drivers/gpu/drm/msm/adreno/a3xx_gpu.c | 16 - drivers/gpu/drm/msm/adreno/a4xx_gpu.c | 3 - drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 16 +- drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 10 +- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 217 +- drivers/gpu/drm/msm/adreno/a6xx_gpu.h | 15 +- drivers/gpu/drm/msm/adreno/a6xx_preempt.c | 2 +- drivers/gpu/drm/msm/adreno/a8xx_gpu.c | 33 +- drivers/gpu/drm/msm/adreno/a8xx_preempt.c | 2 +- drivers/gpu/drm/msm/adreno/adreno_device.c | 8 +- drivers/gpu/drm/msm/adreno/adreno_gpu.c | 7 +- drivers/gpu/drm/msm/msm_debugfs.c | 6 - drivers/gpu/drm/msm/msm_drv.c | 2 +- drivers/gpu/drm/msm/msm_drv.h | 13 +- drivers/gpu/drm/msm/msm_gpu.c | 119 +- drivers/gpu/drm/msm/msm_gpu.h | 104 +- drivers/gpu/drm/msm/msm_perf.c | 235 -- drivers/gpu/drm/msm/msm_perfcntr.c | 648 +++++ drivers/gpu/drm/msm/msm_perfcntr.h | 155 ++ drivers/gpu/drm/msm/msm_ringbuffer.h | 2 + drivers/gpu/drm/msm/msm_submitqueue.c | 3 +- .../msm/registers/adreno/a2xx_perfcntrs.json | 109 + drivers/gpu/drm/msm/registers/adreno/a3xx.xml | 8 +- drivers/gpu/drm/msm/registers/adreno/a5xx.xml | 141 +- .../msm/registers/adreno/a5xx_perfcntrs.json | 128 + drivers/gpu/drm/msm/registers/adreno/a6xx.xml | 1300 ++++++----- .../msm/registers/adreno/a6xx_descriptors.xml | 71 +- .../drm/msm/registers/adreno/a6xx_enums.xml | 3 + .../msm/registers/adreno/a6xx_perfcntrs.json | 105 + .../msm/registers/adreno/a7xx_perfcntrs.json | 228 ++ .../msm/registers/adreno/a8xx_descriptors.xml | 96 +- .../msm/registers/adreno/a8xx_perfcntrs.json | 240 ++ .../msm/registers/adreno/a8xx_perfcntrs.xml | 1929 +++++++++++++++ .../msm/registers/adreno/adreno_common.xml | 42 + .../drm/msm/registers/adreno/adreno_pm4.xml | 50 +- drivers/gpu/drm/msm/registers/gen_header.py | 2079 +++++++++-------- include/uapi/drm/msm_drm.h | 48 + 39 files changed, 6015 insertions(+), 2212 deletions(-) delete mode 100644 drivers/gpu/drm/msm/msm_perf.c create mode 100644 drivers/gpu/drm/msm/msm_perfcntr.c create mode 100644 drivers/gpu/drm/msm/msm_perfcntr.h create mode 100644 drivers/gpu/drm/msm/registers/adreno/a2xx_perfcntrs.json create mode 100644 drivers/gpu/drm/msm/registers/adreno/a5xx_perfcntrs.json create mode 100644 drivers/gpu/drm/msm/registers/adreno/a6xx_perfcntrs.json create mode 100644 drivers/gpu/drm/msm/registers/adreno/a7xx_perfcntrs.json create mode 100644 drivers/gpu/drm/msm/registers/adreno/a8xx_perfcntrs.json create mode 100644 drivers/gpu/drm/msm/registers/adreno/a8xx_perfcntrs.xml -- 2.54.0