From: Yeoreum Yun <yeoreum.yun@arm.com>
To: suzuki.poulose@arm.com, mike.leach@linaro.org,
james.clark@linaro.org, alexander.shishkin@linux.intel.com,
bigeasy@linutronix.de, clrkwllms@kernel.org, rostedt@goodmis.org
Cc: coresight@lists.linaro.org, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, linux-rt-devel@lists.linux.dev,
nd@arm.com, Levi Yun <yeoreum.yun@arm.com>
Subject: [PATCH 7/9] coresight-replicator: change replicator_drvdata spinlock's type to raw_spinlock_t
Date: Mon, 25 Nov 2024 09:48:14 +0000 [thread overview]
Message-ID: <20241125094816.365472-8-yeoreum.yun@arm.com> (raw)
In-Reply-To: <20241125094816.365472-1-yeoreum.yun@arm.com>
From: Levi Yun <yeoreum.yun@arm.com>
In coresight-replicator drivers, replicator_drvdata->spinlock can be held
during __schedule() by perf_event_task_sched_out()/in().
Since replicator_drvdata->spinlock type is spinlock_t and
perf_event_task_sched_out()/in() is called after acquiring rq_lock,
which is raw_spinlock_t (an unsleepable lock),
this poses an issue in PREEMPT_RT kernel where spinlock_t is sleepable.
To address this, change type replicator_drvdata->spinlock in
coresight-replicator drivers, which can be called
by perf_event_task_sched_out()/in(), from spinlock_t to raw_spinlock_t.
Signed-off-by: Yeoreum Yun <yeoreum.yun@arm.com>
---
.../coresight/coresight-replicator.c | 36 +++++++++----------
1 file changed, 17 insertions(+), 19 deletions(-)
diff --git a/drivers/hwtracing/coresight/coresight-replicator.c b/drivers/hwtracing/coresight/coresight-replicator.c
index 3e55be9c8418..7ff08fb70758 100644
--- a/drivers/hwtracing/coresight/coresight-replicator.c
+++ b/drivers/hwtracing/coresight/coresight-replicator.c
@@ -41,7 +41,7 @@ struct replicator_drvdata {
struct clk *atclk;
struct clk *pclk;
struct coresight_device *csdev;
- spinlock_t spinlock;
+ raw_spinlock_t spinlock;
bool check_idfilter_val;
};
@@ -122,20 +122,19 @@ static int replicator_enable(struct coresight_device *csdev,
{
int rc = 0;
struct replicator_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent);
- unsigned long flags;
bool first_enable = false;
- spin_lock_irqsave(&drvdata->spinlock, flags);
+ scoped_guard(raw_spinlock_irqsave, &drvdata->spinlock) {
if (atomic_read(&out->src_refcnt) == 0) {
- if (drvdata->base)
- rc = dynamic_replicator_enable(drvdata, in->dest_port,
- out->src_port);
+ if (drvdata->base)
+ rc = dynamic_replicator_enable(drvdata, in->dest_port,
+ out->src_port);
+ if (!rc)
+ first_enable = true;
+ }
if (!rc)
- first_enable = true;
+ atomic_inc(&out->src_refcnt);
}
- if (!rc)
- atomic_inc(&out->src_refcnt);
- spin_unlock_irqrestore(&drvdata->spinlock, flags);
if (first_enable)
dev_dbg(&csdev->dev, "REPLICATOR enabled\n");
@@ -176,17 +175,16 @@ static void replicator_disable(struct coresight_device *csdev,
struct coresight_connection *out)
{
struct replicator_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent);
- unsigned long flags;
bool last_disable = false;
- spin_lock_irqsave(&drvdata->spinlock, flags);
- if (atomic_dec_return(&out->src_refcnt) == 0) {
- if (drvdata->base)
- dynamic_replicator_disable(drvdata, in->dest_port,
- out->src_port);
- last_disable = true;
+ scoped_guard(raw_spinlock_irqsave, &drvdata->spinlock) {
+ if (atomic_dec_return(&out->src_refcnt) == 0) {
+ if (drvdata->base)
+ dynamic_replicator_disable(drvdata, in->dest_port,
+ out->src_port);
+ last_disable = true;
+ }
}
- spin_unlock_irqrestore(&drvdata->spinlock, flags);
if (last_disable)
dev_dbg(&csdev->dev, "REPLICATOR disabled\n");
@@ -277,7 +275,7 @@ static int replicator_probe(struct device *dev, struct resource *res)
}
dev->platform_data = pdata;
- spin_lock_init(&drvdata->spinlock);
+ raw_spin_lock_init(&drvdata->spinlock);
desc.type = CORESIGHT_DEV_TYPE_LINK;
desc.subtype.link_subtype = CORESIGHT_DEV_SUBTYPE_LINK_SPLIT;
desc.ops = &replicator_cs_ops;
--
LEVI:{C3F47F37-75D8-414A-A8BA-3980EC8A46D7}
next prev parent reply other threads:[~2024-11-25 10:17 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-25 9:48 [PATCH 0/9] coresight: change some driver' spinlock type to raw_spinlock_t Yeoreum Yun
2024-11-25 9:48 ` [PATCH 1/9] coresight: change coresight_device lock " Yeoreum Yun
2024-11-27 17:09 ` Steven Rostedt
2024-11-28 7:39 ` Yeo Reum Yun
2024-12-02 15:38 ` Steven Rostedt
2024-12-03 8:31 ` Yeo Reum Yun
2024-12-03 15:20 ` Steven Rostedt
2024-12-03 15:30 ` Yeo Reum Yun
2024-11-25 9:48 ` [PATCH 2/9] coresight-etm4x: change etmv4_drvdata spinlock " Yeoreum Yun
2024-11-27 16:30 ` James Clark
2024-11-28 6:39 ` Yeo Reum Yun
2024-11-25 9:48 ` [PATCH 3/9] coresight: change coresight_trace_id_map's lock " Yeoreum Yun
2024-11-25 9:48 ` [PATCH 4/9] coresight-cti: change cti_drvdata spinlock's " Yeoreum Yun
2024-11-25 9:48 ` [PATCH 5/9] coresight-etb10: change etb_drvdata " Yeoreum Yun
2024-11-25 9:48 ` [PATCH 6/9] coresight-funnel: change funnel_drvdata " Yeoreum Yun
2024-11-25 9:48 ` Yeoreum Yun [this message]
2024-11-25 9:48 ` [PATCH 8/9] coresight-tmc: change tmc_drvdata " Yeoreum Yun
2024-11-25 9:48 ` [PATCH 9/9] coresight/ultrasoc: change cti_drvdata " Yeoreum Yun
2024-11-27 16:44 ` [PATCH 0/9] coresight: change some driver' spinlock " James Clark
2024-11-28 6:23 ` Yeo Reum Yun
2024-11-28 10:55 ` James Clark
2024-11-28 11:48 ` Yeo Reum Yun
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=20241125094816.365472-8-yeoreum.yun@arm.com \
--to=yeoreum.yun@arm.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=bigeasy@linutronix.de \
--cc=clrkwllms@kernel.org \
--cc=coresight@lists.linaro.org \
--cc=james.clark@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rt-devel@lists.linux.dev \
--cc=mike.leach@linaro.org \
--cc=nd@arm.com \
--cc=rostedt@goodmis.org \
--cc=suzuki.poulose@arm.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