From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D6D4327C840; Tue, 8 Apr 2025 12:48:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744116529; cv=none; b=fFDPdMQeI9ZHGHGKK6/LZP4twiLUXGl+H68cbyBR7tb1+NLEsQ+NeW6sYUmdodErE4pwW7SgeSGgx1Dqd+rSbfMcTHm9WtgozIyfKkHqB/AiPVEi+LGdduRK77ENjxTtEqTeLZX+PjuClTA8GfHAUz4QMXKspaLxfSc+57pxFx0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744116529; c=relaxed/simple; bh=uQR8zsP3ZR87TlTUNrYGb89FMklvi7WjV8Gzm2f2eg8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Wh7jxwH6I+TVV6iI6aGPLRs0cG/4r5pDW17wxxxvOFgluJJ/reU4ZFBWnoqGccNAqcq4x+VeLAPJgKLN1f4L7HKXN3BZhtYgBFomyGV5gLhiWd49L3WmUbq/yXm2nxFqFFSuX5HxABoH8zwXTCtRTvfrGc1tllWBbCSRSbPCq34= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=p6PlgoQD; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="p6PlgoQD" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 66B6AC4CEEC; Tue, 8 Apr 2025 12:48:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1744116529; bh=uQR8zsP3ZR87TlTUNrYGb89FMklvi7WjV8Gzm2f2eg8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=p6PlgoQDeKCdPV4RqL7PNL/B93KSdFbdP0pJbKKppNjLsDjR99YfxKoPWSlz1iuws 3g7ib78+qClk4LrQbtxw4BW3K0t8hEFJjs7A+DVUCgnuyL1+smAt9KRL50N/9cVGgu Ag/6HNAlLm1hLEb0Dae46sM3FW5w7CFUojp+85mo= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Ilkka Koskinen , Suzuki K Poulose , Sasha Levin Subject: [PATCH 6.12 171/423] coresight: catu: Fix number of pages while using 64k pages Date: Tue, 8 Apr 2025 12:48:17 +0200 Message-ID: <20250408104849.726286848@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250408104845.675475678@linuxfoundation.org> References: <20250408104845.675475678@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ilkka Koskinen [ 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 Signed-off-by: Suzuki K Poulose Link: https://lore.kernel.org/r/20250109215348.5483-1-ilkka@os.amperecomputing.com Signed-off-by: Sasha Levin --- drivers/hwtracing/coresight/coresight-catu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/hwtracing/coresight/coresight-catu.c b/drivers/hwtracing/coresight/coresight-catu.c index bfea880d6dfbf..d8ad64ea81f11 100644 --- a/drivers/hwtracing/coresight/coresight-catu.c +++ b/drivers/hwtracing/coresight/coresight-catu.c @@ -269,7 +269,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)) -- 2.39.5