From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 7D2F3330B14 for ; Wed, 22 Apr 2026 13:22:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776864149; cv=none; b=qR6WI+ddZ6qegw4/ja3IzSdaK/DWnz2SM+kTx+E61qPNZLnsf7Y1voyAgWY8ud1KjC4jyXW7KideJR6EIpBHYbvQ9dOAOxbiS63oHm4okThsLxMVOzi3oF8o+W6TbpFxw63HDBv+/LgEI6z9JggqGmtp2Z+PY1M5YrCpz79UegE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776864149; c=relaxed/simple; bh=gHPhf/rLsWK1Jg146ax7ng4ZMmOvo16EVraH3FI8/Vg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=cd3HBVVk7jlL4wBkyfNhinHh/4L6c7PwTHxc7qG7jh2Aq7w2z8luXM3fis26rc1Mr1q86Bh5Rr+Alx5spQRwIo9qpKUOesrad0U4NOGpX4aLnZKxEOhOBzWZbyfMJqFy0ZIKrRNH58xlLgJpBeFElhPK9zAD7xqug0b/I0QQJwg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; dkim=pass (1024-bit key) header.d=arm.com header.i=@arm.com header.b=hRsHEoki; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=arm.com header.i=@arm.com header.b="hRsHEoki" Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 58C032454; Wed, 22 Apr 2026 06:22:22 -0700 (PDT) Received: from e129823.cambridge.arm.com (e129823.arm.com [10.1.197.6]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 171D73FD46; Wed, 22 Apr 2026 06:22:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arm.com; s=foss; t=1776864147; bh=gHPhf/rLsWK1Jg146ax7ng4ZMmOvo16EVraH3FI8/Vg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hRsHEoki1fPkGI6HdXWcmSqf2/BAfZK2lNF7vuGwuUyjVOCO84p0lvqVUQZ9IbJwI mD98s7ZDvJzB4KH/Xr7fbBM20JLJKgKVTmf2YoTTOSnZT+x1PR4F9FlA+0byd/X6Es LAooylbiUs4TwSwWO9zfuN2NAMy3LAvldYwRw9T8= From: Yeoreum Yun To: coresight@lists.linaro.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: suzuki.poulose@arm.com, mike.leach@arm.com, james.clark@linaro.org, alexander.shishkin@linux.intel.com, leo.yan@arm.com, jie.gan@oss.qualcomm.com, Yeoreum Yun Subject: [PATCH v6 09/13] coresight: etm4x: missing cscfg_csdev_disable_active_config() in perf enable Date: Wed, 22 Apr 2026 14:21:59 +0100 Message-Id: <20260422132203.977549-10-yeoreum.yun@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260422132203.977549-1-yeoreum.yun@arm.com> References: <20260422132203.977549-1-yeoreum.yun@arm.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 In the perf enable path, there are missing cases where cscfg_csdev_disable_active_config() is not called: - Branch broadcast is selected but not supported by the hardware - etm4_enable_hw() fails This can lead to a leak of config_desc->active_cnt. Fix this by properly calling cscfg_csdev_disable_active_config() in these error paths. Fixes: 810ac401db1f ("coresight: etm4x: Add complex configuration handlers to etmv4") Signed-off-by: Yeoreum Yun --- .../hwtracing/coresight/coresight-etm4x-core.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/drivers/hwtracing/coresight/coresight-etm4x-core.c b/drivers/hwtracing/coresight/coresight-etm4x-core.c index 66d09e0a4171..d6fd6125ef60 100644 --- a/drivers/hwtracing/coresight/coresight-etm4x-core.c +++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c @@ -895,6 +895,8 @@ static int etm4_parse_event_config(struct coresight_device *csdev, * Missing BB support could cause silent decode errors * so fail to open if it's not supported. */ + if (cfg_hash) + cscfg_csdev_disable_active_config(csdev); ret = -EINVAL; goto out; } else { @@ -911,6 +913,7 @@ static int etm4_enable_perf(struct coresight_device *csdev, struct coresight_path *path) { struct etmv4_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent); + struct perf_event_attr *attr = &event->attr; int ret; if (WARN_ON_ONCE(drvdata->cpu != smp_processor_id())) @@ -922,7 +925,7 @@ static int etm4_enable_perf(struct coresight_device *csdev, /* Configure the tracer based on the session's specifics */ ret = etm4_parse_event_config(csdev, event); if (ret) - goto out; + goto err; drvdata->trcid = path->trace_id; @@ -931,11 +934,17 @@ static int etm4_enable_perf(struct coresight_device *csdev, /* And enable it */ ret = etm4_enable_hw(drvdata); + if (ret) { + if (ATTR_CFG_GET_FLD(attr, configid)) + cscfg_csdev_disable_active_config(csdev); + goto err; + } -out: + return 0; + +err: /* Failed to start tracer; roll back to DISABLED mode */ - if (ret) - coresight_set_mode(csdev, CS_MODE_DISABLED); + coresight_set_mode(csdev, CS_MODE_DISABLED); return ret; } -- LEVI:{C3F47F37-75D8-414A-A8BA-3980EC8A46D7}