From: Junhao He <hejunhao3@huawei.com>
To: <suzuki.poulose@arm.com>, <james.clark@arm.com>,
<anshuman.khandual@arm.com>, <mike.leach@linaro.org>,
<leo.yan@arm.com>
Cc: <coresight@lists.linaro.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-kernel@vger.kernel.org>, <linuxarm@huawei.com>,
<jonathan.cameron@huawei.com>, <yangyicong@huawei.com>,
<hejunhao3@huawei.com>
Subject: [PATCH 2/4] coresight: catu: add locking to catu enable/disable functions
Date: Fri, 18 Apr 2025 13:58:18 +0800 [thread overview]
Message-ID: <20250418055820.3689408-3-hejunhao3@huawei.com> (raw)
In-Reply-To: <20250418055820.3689408-1-hejunhao3@huawei.com>
In the function coresight_enable_path(), all adjacent helper components
along the path are enabled first. Without proper locking, a race
condition may occur between concurrent sysfs and perf calls to these
functions, potentially leading to incorrectly obtained settings or
misconfigured CATU control-enable flags.
Requires spinlock in catu_enable()/catu_disable() to:
- Serialize sysfs/perf concurrent accesses
- Prevent corruption of CATU control-enable flags
Signed-off-by: Junhao He <hejunhao3@huawei.com>
---
drivers/hwtracing/coresight/coresight-catu.c | 6 ++++++
drivers/hwtracing/coresight/coresight-catu.h | 1 +
2 files changed, 7 insertions(+)
diff --git a/drivers/hwtracing/coresight/coresight-catu.c b/drivers/hwtracing/coresight/coresight-catu.c
index 275cc0d9f505..54ce13254d7c 100644
--- a/drivers/hwtracing/coresight/coresight-catu.c
+++ b/drivers/hwtracing/coresight/coresight-catu.c
@@ -461,6 +461,8 @@ static int catu_enable(struct coresight_device *csdev, enum cs_mode mode,
int rc;
struct catu_drvdata *catu_drvdata = csdev_to_catu_drvdata(csdev);
+ guard(spinlock_irqsave)(&catu_drvdata->spinlock);
+
CS_UNLOCK(catu_drvdata->base);
rc = catu_enable_hw(catu_drvdata, mode, data);
CS_LOCK(catu_drvdata->base);
@@ -489,6 +491,8 @@ static int catu_disable(struct coresight_device *csdev, void *__unused)
int rc;
struct catu_drvdata *catu_drvdata = csdev_to_catu_drvdata(csdev);
+ guard(spinlock_irqsave)(&catu_drvdata->spinlock);
+
CS_UNLOCK(catu_drvdata->base);
rc = catu_disable_hw(catu_drvdata);
CS_LOCK(catu_drvdata->base);
@@ -523,6 +527,8 @@ static int __catu_probe(struct device *dev, struct resource *res)
goto out;
}
+ spin_lock_init(&drvdata->spinlock);
+
/* Setup dma mask for the device */
dma_mask = readl_relaxed(base + CORESIGHT_DEVID) & 0x3f;
switch (dma_mask) {
diff --git a/drivers/hwtracing/coresight/coresight-catu.h b/drivers/hwtracing/coresight/coresight-catu.h
index 141feac1c14b..eb7c9189b066 100644
--- a/drivers/hwtracing/coresight/coresight-catu.h
+++ b/drivers/hwtracing/coresight/coresight-catu.h
@@ -64,6 +64,7 @@ struct catu_drvdata {
struct clk *pclk;
void __iomem *base;
struct coresight_device *csdev;
+ spinlock_t spinlock;
int irq;
};
--
2.33.0
next prev parent reply other threads:[~2025-04-18 6:04 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-18 5:58 [PATCH 0/4] Coresight TMC-ETR some bugfixes and cleanups Junhao He
2025-04-18 5:58 ` [PATCH 1/4] coresight: tmc: Add missing doc of tmc_drvdata::reading Junhao He
2025-04-18 5:58 ` Junhao He [this message]
2025-04-18 5:58 ` [PATCH 3/4] coresight: tmc: refactor the tmc-etr mode setting Junhao He
2025-04-18 7:12 ` Jie Gan
2025-04-22 12:52 ` hejunhao
2025-04-23 2:07 ` Jie Gan
2025-04-25 2:16 ` hejunhao
2025-04-18 5:58 ` [PATCH 4/4] coresight: tmc-etr: Decouple the perf buffer allocation from sysfs mode Junhao He
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250418055820.3689408-3-hejunhao3@huawei.com \
--to=hejunhao3@huawei.com \
--cc=anshuman.khandual@arm.com \
--cc=coresight@lists.linaro.org \
--cc=james.clark@arm.com \
--cc=jonathan.cameron@huawei.com \
--cc=leo.yan@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxarm@huawei.com \
--cc=mike.leach@linaro.org \
--cc=suzuki.poulose@arm.com \
--cc=yangyicong@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox