From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5B55FCD4F4A for ; Mon, 18 May 2026 19:08:01 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 634D610E807; Mon, 18 May 2026 19:08:00 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=qualcomm.com header.i=@qualcomm.com header.b="Rc8Ej0nU"; dkim=pass (2048-bit key; unprotected) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="O43kNNBB"; dkim-atps=neutral Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) by gabe.freedesktop.org (Postfix) with ESMTPS id 936F210E7E9 for ; Mon, 18 May 2026 19:07:58 +0000 (UTC) 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 64ICLGdk1890506 for ; Mon, 18 May 2026 19:07:58 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=sNlcHMTJjZebXoe4HRzps1kie9SV5KzjtW3 FlVVL4zY=; b=Rc8Ej0nU+1edGn4q0FrMUcdkGptepRDg+/QVr6i1cgSr8o8rIzw YxLcvk2rBzNe89guNxTg4pMjdHAMkTP/Wchq22HwLm0rScGEDzjmCVD3C9TTAxhp hLcTJNY2l5WioWq0FQwb5+9ogKwjQn1tJKYKonX2d4FI2pUryM96r9mAG4BC1sQe vPbhQzHmYpJ/tSMvPN1M81SiKHua2qA8VATq8uoXJP0bdmEyGO4W7/iCA6NzNUID fu/x7msTCcH0Rtugts1HQjgKz3cYrBvkaa2U4OwlPZeJW3LM7MkCQvQwCPQ6cuhT O+lZTzcRHEtyqWjijatDlZkJAUg15IFoyww== 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 4e82pw1k2m-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 18 May 2026 19:07:58 +0000 (GMT) Received: by mail-pl1-f199.google.com with SMTP id d9443c01a7336-2bc7f9b2213so20597195ad.0 for ; Mon, 18 May 2026 12:07:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1779131277; x=1779736077; darn=lists.freedesktop.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=sNlcHMTJjZebXoe4HRzps1kie9SV5KzjtW3FlVVL4zY=; b=O43kNNBBTZmfY8kuqclj9nE2VCZP6TjQdbH/+RrPBdVCSoeaoTrhvzXFzdQ2kD4jQ0 tEj0N+9ukkb+PQqLgEaHW8f36Tj1J1xJKUSumiZ6YOnRthAgLF70Uenli+/ZxlUlMxvx SX3+d+QVFaS9VsrhqE3Fvbc8X1vAvag5W9e3o/oJsMYB5mykwqG+UEwdTCmj2EM44cty FlwcJRhpBwz3DEMgIX9jir6z49yopAVmxuLomgBzNb4rB2wzlzsd9xdbWVtb+sXAkRj0 79m8ADw0TrP/8j6JcOZ/8gXRI+lGvQuiM2H4Z5L/GwBhMR9pVDXbOZT5aIGafVOjuAlm /wag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779131277; x=1779736077; 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=sNlcHMTJjZebXoe4HRzps1kie9SV5KzjtW3FlVVL4zY=; b=jvn7vh1hQNoNWBMbYXVesHQ6Bs6nppUTR34VukBcuqfM4iP2Rxnu+lHwwluZn6Yi7U 86jumCpeSDB6dCPSdWyq7cprLWzxieDEQmq3EIeI3OD8QT+Qi4ave1YKkm26dGsXTfJu 45uQKnsRwOqgvzZng7epknb9xFLMgR+OA6/WNprejiDmTs2gUh3nnTrxYVvaxE48m+Pm s2jnPUoTY2VEZPOot3jdSPwCagCD0efhtfm9J9O3ysgV8eDXXSxNtNvnsW4crrMsMU/8 n3wSd1bhs8C2m7Q9dU5wduG9Z2RwU5iw8NoQVAKw/VcT6VG3sQEokbPHEMn+gP08iNBo Nj/Q== X-Gm-Message-State: AOJu0YxIhWeKXvXhUyoSvU/l38s/aZqm2zrzSGx//7xPrhx3z2mVyzmG Plbj6C3j7gh8GwFpQ6PXCs90QrwHivERehhpzO4Lttht1Pdv7xZHM/i73ofzkdr61dTtXPsqXDx YJzSBpzgAW4VnK8g2M+lZRBBS/MqDgFXTc6n1kb6KKI+lUWu3jLKcZ1evFkVgEGaB4wrZgqfMWJ gM3Nk= X-Gm-Gg: Acq92OESx8+alqzVYORvA65fWoZLwrPEBZDL30D3qkYagm6LNLhRWRVIlwgooyKlTRV qMGnvfIwto/mgox6cMUSJ0jKnqyPwnzHEpWjfe9XyXX4Zxv3bBz/ckXhsSJC/8Zb5bvNZTlO2QO 3tNbcPbhMvZ9896LqkRz2VFsACXizqsidKSSgd4v+PnGOhiGyuIHJwz9zrazWH2D4ggeQrPcUu7 vdlecs6OTo5H99XMIw20x5pTRQJBVqgKSgyWzY0ja4e8HfqhS8suUXn9JUUSLx+dWSNBWB1Ybvs zarc1SF38AwLse47CmYTpAQZaYCtLNfS/1lcmFDstAHoeg2cbzNZkH2p+8Kjo87mHALTfrnYx9l BachyQ378o4XKKUVCYrDCPG9Tnr120quj X-Received: by 2002:a17:903:2f07:b0:2bd:a403:4ab8 with SMTP id d9443c01a7336-2bda403553emr114187795ad.25.1779131276998; Mon, 18 May 2026 12:07:56 -0700 (PDT) X-Received: by 2002:a17:903:2f07:b0:2bd:a403:4ab8 with SMTP id d9443c01a7336-2bda403553emr114187345ad.25.1779131276482; Mon, 18 May 2026 12:07:56 -0700 (PDT) Received: from localhost ([2601:1c0:5000:d5c:4ec8:83f5:8254:6891]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2bd5c05ffbesm162791025ad.27.2026.05.18.12.07.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 May 2026 12:07:55 -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 v7 00/16] drm/msm: Add PERFCNTR_CONFIG ioctl Date: Mon, 18 May 2026 12:06:27 -0700 Message-ID: <20260518190735.16236-1-robin.clark@oss.qualcomm.com> X-Mailer: git-send-email 2.54.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Authority-Analysis: v=2.4 cv=a6AAM0SF c=1 sm=1 tr=0 ts=6a0b638e 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=y2SdjSjt7DsdxN5ViJQA:9 a=324X-CrmTo6CU4MGRt3R:22 a=Vxmtnl_E_bksehYqCbjh:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTE4MDE4OCBTYWx0ZWRfX/GKGBfNW54aT 8P+cRLg6MbaIRJ817VHb3jtAZvENYIwvVeO7/SXoBIQwIHeA437mMqnDRpjcgJCsCO5/j1vXIgp oQ0/J6vIqouRgzGRD31DSjBcG7syA3N7LkQVBlt5PKYSE8n7cZUxJKBGxzJDrVNYJNSx0Yp+iJG OByCeNf/okxNZQs8K45M/CDtZOQ8O5+9RgZhPDBmn0x1a2BH1Bz6NfgAtL2SZa2IIuwHuQ5b0ZC wv09qL1NoPcxyZtXFz64wQv3eVXYoSF0/sr4RQxpqCzJdQajz8z83i/ky1E+w52tuxQn98HmbH4 yXc6EP6aKev5cslN93ZjW+wC4FoGKaaiKWF6fEvIuY6V9Xvnt++08dd8V4SfUu1VCMOgRt43q4F +vGsWsx3jUCdI1dHnKcDszxXrSMQlQvsbqdP9UuJGEsm/5wxtHQEVnGdJPZ4ok5DSfKZx5v5Tyh USAltO1X5B6XfuY6qHg== X-Proofpoint-GUID: KE5cOLAIu4ZgYxR1XfrKBWsEfAp9BdiB X-Proofpoint-ORIG-GUID: KE5cOLAIu4ZgYxR1XfrKBWsEfAp9BdiB 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-18_03,2026-05-18_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=0 phishscore=0 priorityscore=1501 lowpriorityscore=0 malwarescore=0 bulkscore=0 impostorscore=0 adultscore=0 clxscore=1015 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605130000 definitions=main-2605180188 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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 v7: - Use smp_load_acquire() for fifo_count_to_end() [Akhil] - Defer installing stream_fd until end [Akhil] - Link to v6: https://lore.kernel.org/all/20260514134052.361771-1-robin.clark@oss.qualcomm.com/ Changes in v6: - Reword comment [Anna] - Link to v5: https://lore.kernel.org/all/20260511130017.96867-1-robin.clark@oss.qualcomm.com/ 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