coresight: catu: Introduce refcount and spinlock for enabling/disabling

When tracing ETM data on multiple CPUs concurrently via the
perf interface, the CATU device is shared across different CPU
paths. This can lead to race conditions when multiple CPUs attempt
to enable or disable the CATU device simultaneously.

To address these race conditions, this patch introduces the
following changes:

1. The enable and disable operations for the CATU device are not
   reentrant. Therefore, a spinlock is added to ensure that only
   one CPU can enable or disable a given CATU device at any point
   in time.

2. A reference counter is used to manage the enable/disable state
   of the CATU device. The device is enabled when the first CPU
   requires it and is only disabled when the last CPU finishes
   using it. This ensures the device remains active as long as at
   least one CPU needs it.

Fixes: fcacb5c154ba ("coresight: Introduce support for Coresight Address Translation Unit")
Signed-off-by: Yabin Cui <yabinc@google.com>
Reviewed-by: James Clark <james.clark@linaro.org>
Reviewed-by: Leo Yan <leo.yan@arm.com>
Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com>
Link: https://lore.kernel.org/r/20250429231301.1952246-2-yabinc@google.com

diff --git a/drivers/hwtracing/coresight/coresight-catu.c b/drivers/hwtracing/coresight/coresight-catu.c
index 96cb48b140afa809c1b5ecc48ce64a7ee16b4dac..d4e2e175e077006949c7ba9d224c83e9a96e0dd0 100644 (file)
--- a/drivers/hwtracing/coresight/coresight-catu.c
+++ b/drivers/hwtracing/coresight/coresight-catu.c
@@ -458,12 +458,17 @@ static int catu_enable_hw(struct catu_drvdata *drvdata, enum cs_mode cs_mode,
 static int catu_enable(struct coresight_device *csdev, enum cs_mode mode,
                       void *data)
 {
-       int rc;
+       int rc = 0;
        struct catu_drvdata *catu_drvdata = csdev_to_catu_drvdata(csdev);
 
-       CS_UNLOCK(catu_drvdata->base);
-       rc = catu_enable_hw(catu_drvdata, mode, data);
-       CS_LOCK(catu_drvdata->base);
+       guard(raw_spinlock_irqsave)(&catu_drvdata->spinlock);
+       if (csdev->refcnt == 0) {
+               CS_UNLOCK(catu_drvdata->base);
+               rc = catu_enable_hw(catu_drvdata, mode, data);
+               CS_LOCK(catu_drvdata->base);
+       }
+       if (!rc)
+               csdev->refcnt++;
        return rc;
 }
 
@@ -486,12 +491,15 @@ static int catu_disable_hw(struct catu_drvdata *drvdata)
 
 static int catu_disable(struct coresight_device *csdev, void *__unused)
 {
-       int rc;
+       int rc = 0;
        struct catu_drvdata *catu_drvdata = csdev_to_catu_drvdata(csdev);
 
-       CS_UNLOCK(catu_drvdata->base);
-       rc = catu_disable_hw(catu_drvdata);
-       CS_LOCK(catu_drvdata->base);
+       guard(raw_spinlock_irqsave)(&catu_drvdata->spinlock);
+       if (--csdev->refcnt == 0) {
+               CS_UNLOCK(catu_drvdata->base);
+               rc = catu_disable_hw(catu_drvdata);
+               CS_LOCK(catu_drvdata->base);
+       }
        return rc;
 }
 
@@ -550,6 +558,7 @@ static int __catu_probe(struct device *dev, struct resource *res)
        dev->platform_data = pdata;
 
        drvdata->base = base;
+       raw_spin_lock_init(&drvdata->spinlock);
        catu_desc.access = CSDEV_ACCESS_IOMEM(base);
        catu_desc.pdata = pdata;
        catu_desc.dev = dev;

diff --git a/drivers/hwtracing/coresight/coresight-catu.h b/drivers/hwtracing/coresight/coresight-catu.h
index 141feac1c14b0850671f92261c56844a1f772592..755776cd19c5bb724845ca586ace1e0b29e72556 100644 (file)
--- a/drivers/hwtracing/coresight/coresight-catu.h
+++ b/drivers/hwtracing/coresight/coresight-catu.h
@@ -65,6 +65,7 @@ struct catu_drvdata {
        void __iomem *base;
        struct coresight_device *csdev;
        int irq;
+       raw_spinlock_t spinlock;
 };
 
 #define CATU_REG32(name, offset)                                       \