microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

coresight: tmc-etr: Fix perf_data check 

When tracing etm data of multiple threads on multiple cpus through
perf interface, each cpu has a unique etr_perf_buffer while sharing
the same etr device. There is no guarantee that the last cpu starts
etm tracing also stops last. This makes perf_data check fail.

Fix it by checking etr_buf instead of etr_perf_buffer.
Also move the code setting and clearing perf_buf to more suitable
places.

Fixes: 3147da92a8 ("coresight: tmc-etr: Allocate and free ETR memory buffers for CPU-wide scenarios")
Signed-off-by: Yabin Cui <yabinc@google.com>
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Link: https://lore.kernel.org/r/20190829202842.580-15-mathieu.poirier@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Yabin Cui 2019-08-29 14:28:39 -06:00 коммит произвёл Greg Kroah-Hartman
Родитель 13af88f312
Коммит bbedcb91cc
2 изменённых файлов: 7 добавлений и 7 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

8
drivers/hwtracing/coresight/coresight-tmc-etr.c
Просмотреть файл

@ -1488,7 +1488,7 @@ tmc_update_etr_buffer(struct coresight_device *csdev,
goto out; goto out;
} }
if (WARN_ON(drvdata->perf_data != etr_perf)) { if (WARN_ON(drvdata->perf_buf != etr_buf)) {
lost = true; lost = true;
spin_unlock_irqrestore(&drvdata->spinlock, flags); spin_unlock_irqrestore(&drvdata->spinlock, flags);
goto out; goto out;
@ -1500,8 +1500,6 @@ tmc_update_etr_buffer(struct coresight_device *csdev,
tmc_sync_etr_buf(drvdata); tmc_sync_etr_buf(drvdata);
CS_LOCK(drvdata->base); CS_LOCK(drvdata->base);
/* Reset perf specific data */
drvdata->perf_data = NULL;
spin_unlock_irqrestore(&drvdata->spinlock, flags); spin_unlock_irqrestore(&drvdata->spinlock, flags);
size = etr_buf->len; size = etr_buf->len;
@ -1564,7 +1562,6 @@ static int tmc_enable_etr_sink_perf(struct coresight_device *csdev, void *data)
} }
etr_perf->head = PERF_IDX2OFF(handle->head, etr_perf); etr_perf->head = PERF_IDX2OFF(handle->head, etr_perf);
drvdata->perf_data = etr_perf;
/* /*
* No HW configuration is needed if the sink is already in * No HW configuration is needed if the sink is already in
@ -1580,6 +1577,7 @@ static int tmc_enable_etr_sink_perf(struct coresight_device *csdev, void *data)
/* Associate with monitored process. */ /* Associate with monitored process. */
drvdata->pid = pid; drvdata->pid = pid;
drvdata->mode = CS_MODE_PERF; drvdata->mode = CS_MODE_PERF;
drvdata->perf_buf = etr_perf->etr_buf;
atomic_inc(csdev->refcnt); atomic_inc(csdev->refcnt);
} }
@ -1625,6 +1623,8 @@ static int tmc_disable_etr_sink(struct coresight_device *csdev)
/* Dissociate from monitored process. */ /* Dissociate from monitored process. */
drvdata->pid = -1; drvdata->pid = -1;
drvdata->mode = CS_MODE_DISABLED; drvdata->mode = CS_MODE_DISABLED;
/* Reset perf specific data */
drvdata->perf_buf = NULL;
spin_unlock_irqrestore(&drvdata->spinlock, flags); spin_unlock_irqrestore(&drvdata->spinlock, flags);

6
drivers/hwtracing/coresight/coresight-tmc.h
Просмотреть файл

@ -182,8 +182,8 @@ struct etr_buf {
* device configuration register (DEVID) * device configuration register (DEVID)
* @idr: Holds etr_bufs allocated for this ETR. * @idr: Holds etr_bufs allocated for this ETR.
* @idr_mutex: Access serialisation for idr. * @idr_mutex: Access serialisation for idr.
* @perf_data: PERF buffer for ETR. * @sysfs_buf: SYSFS buffer for ETR.
* @sysfs_data: SYSFS buffer for ETR. * @perf_buf: PERF buffer for ETR.
*/ */
struct tmc_drvdata { struct tmc_drvdata {
void __iomem *base; void __iomem *base;
@ -206,7 +206,7 @@ struct tmc_drvdata {
struct idr idr; struct idr idr;
struct mutex idr_mutex; struct mutex idr_mutex;
struct etr_buf *sysfs_buf; struct etr_buf *sysfs_buf;
void *perf_data; struct etr_buf *perf_buf;
}; };
struct etr_buf_operations { struct etr_buf_operations {