summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorIlkka Koskinen <ilkka@os.amperecomputing.com>2025-01-09 21:53:48 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2025-04-10 14:33:35 +0200
commit90b7ad7678ad60cf71f2cd1910ae414ae1e736e7 (patch)
tree62d7f218d43e9dd70120acfcdc0d079f3e93d0da /drivers
parentb0201583c12387beec28def40680f6a0e74c0e7a (diff)
downloadlinux-90b7ad7678ad60cf71f2cd1910ae414ae1e736e7.tar.gz
linux-90b7ad7678ad60cf71f2cd1910ae414ae1e736e7.tar.bz2
linux-90b7ad7678ad60cf71f2cd1910ae414ae1e736e7.zip
coresight: catu: Fix number of pages while using 64k pages
[ Upstream commit 0e14e062f5ff98aa15264dfa87c5f5e924028561 ] Trying to record a trace on kernel with 64k pages resulted in -ENOMEM. This happens due to a bug in calculating the number of table pages, which returns zero. Fix the issue by rounding up. $ perf record --kcore -e cs_etm/@tmc_etr55,cycacc,branch_broadcast/k --per-thread taskset --cpu-list 1 dd if=/dev/zero of=/dev/null failed to mmap with 12 (Cannot allocate memory) Fixes: 8ed536b1e283 ("coresight: catu: Add support for scatter gather tables") Signed-off-by: Ilkka Koskinen <ilkka@os.amperecomputing.com> Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com> Link: https://lore.kernel.org/r/20250109215348.5483-1-ilkka@os.amperecomputing.com Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/hwtracing/coresight/coresight-catu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwtracing/coresight/coresight-catu.c b/drivers/hwtracing/coresight/coresight-catu.c
index bc90a03f478f..6ef7afa25631 100644
--- a/drivers/hwtracing/coresight/coresight-catu.c
+++ b/drivers/hwtracing/coresight/coresight-catu.c
@@ -267,7 +267,7 @@ catu_init_sg_table(struct device *catu_dev, int node,
* Each table can address upto 1MB and we can have
* CATU_PAGES_PER_SYSPAGE tables in a system page.
*/
- nr_tpages = DIV_ROUND_UP(size, SZ_1M) / CATU_PAGES_PER_SYSPAGE;
+ nr_tpages = DIV_ROUND_UP(size, CATU_PAGES_PER_SYSPAGE * SZ_1M);
catu_table = tmc_alloc_sg_table(catu_dev, node, nr_tpages,
size >> PAGE_SHIFT, pages);
if (IS_ERR(catu_table))