From nobody Sat Feb 7 14:51:50 2026 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 610CA35DCE0 for ; Tue, 27 Jan 2026 15:06:07 +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=1769526367; cv=none; b=iW2cAZDkQ/LLprkzmwZRqSgwGa6ta9vAruJYyV+m8j2NOLrKnWT5iriCE6D39FbPhwB+CJwC+tQLIXe5myCChiFQc9ZDUcekF1Es2JVS0OdV9579f+6PSmJsCEgnCF0Lo00hopk1ueN+X1tbwtOQjVzQhF26zBq7XqzQMrT+l2o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769526367; c=relaxed/simple; bh=UZebaUi5DgLc7MzMKMKI79nDnKbOblVAjX2OuUQ8Lp8=; h=Message-ID:Date:From:To:Cc:Subject:References:MIME-Version: Content-Type; b=QzSpAOb0zrAou5jZcFJ8sBb+9I+IdLeNtiBAu2T/kFJYP23ZnDgQFUMpw93xTItXbBdjKp4GuNWWxf0l1h+aUjHUL/iv35f6mTLcsf0CMFPdyg3x9cJlOhmaMRgpJst/oQhcppiVIsVYG0/Jg9RRiNI5QlScxt18NAKncjBRatY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=M/DIpySl; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="M/DIpySl" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 44CF9C116C6; Tue, 27 Jan 2026 15:06:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1769526367; bh=UZebaUi5DgLc7MzMKMKI79nDnKbOblVAjX2OuUQ8Lp8=; h=Date:From:To:Cc:Subject:References:From; b=M/DIpySlxzKqTF+x3COODTcf47BTVX7nC3oQyCjxbsWzDi/AC1sXOmoGV2Mtxfl9R 9xIkKD/5V+dEz6RHVEH0SdND8EYNDNbl6PTKqAx+iBWIFHLIjT53RVB094DNIpi1/x LB3DNZNA03PMImjdo5hhN0s0xoeQ0UiZDO9cifGZ2auly2V0JBU9WiaN7UpEKVOQ1L vyHb/JGQxCNEE0n6wlAMTUyj57U2QpTg7UPr5qYhbJ6oNA/H3YatDvHs1UcQRCOkwR v572oZ2be7rDneMU2kQpfr5vrzQ2fvDNnSwNSduKpklt9q3YAyyJrvOKm2qt4GRPfs Hv+EE9dEnlAQg== Received: from rostedt by gandalf with local (Exim 4.99.1) (envelope-from ) id 1vkkdx-00000000Lf0-0PTS; Tue, 27 Jan 2026 10:06:13 -0500 Message-ID: <20260127150612.953117141@kernel.org> User-Agent: quilt/0.68 Date: Tue, 27 Jan 2026 10:06:05 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Andrew Morton , Guenter Roeck Subject: [for-next][PATCH 10/15] ftrace: Introduce and use ENTRIES_PER_PAGE_GROUP macro References: <20260127150555.840066272@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Guenter Roeck ENTRIES_PER_PAGE_GROUP() returns the number of dyn_ftrace entries in a page group, identified by its order. No functional change. Cc: Masami Hiramatsu Cc: Mark Rutland Cc: Mathieu Desnoyers Link: https://patch.msgid.link/20260113152243.3557219-2-linux@roeck-us.net Signed-off-by: Guenter Roeck Signed-off-by: Steven Rostedt (Google) --- kernel/trace/ftrace.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index aa758efc3731..df4ce244202e 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c @@ -1148,6 +1148,7 @@ struct ftrace_page { }; =20 #define ENTRY_SIZE sizeof(struct dyn_ftrace) +#define ENTRIES_PER_PAGE_GROUP(order) ((PAGE_SIZE << (order)) / ENTRY_SIZE) =20 static struct ftrace_page *ftrace_pages_start; static struct ftrace_page *ftrace_pages; @@ -3862,7 +3863,7 @@ static int ftrace_allocate_records(struct ftrace_page= *pg, int count, *num_pages +=3D 1 << order; ftrace_number_of_groups++; =20 - cnt =3D (PAGE_SIZE << order) / ENTRY_SIZE; + cnt =3D ENTRIES_PER_PAGE_GROUP(order); pg->order =3D order; =20 if (cnt > count) @@ -7309,7 +7310,7 @@ static int ftrace_process_locs(struct module *mod, long skip; =20 /* Count the number of entries unused and compare it to skipped. */ - pg_remaining =3D (PAGE_SIZE << pg->order) / ENTRY_SIZE - pg->index; + pg_remaining =3D ENTRIES_PER_PAGE_GROUP(pg->order) - pg->index; =20 if (!WARN(skipped < pg_remaining, "Extra allocated pages for ftrace")) { =20 @@ -7317,7 +7318,7 @@ static int ftrace_process_locs(struct module *mod, =20 for (pg =3D pg_unuse; pg && skip > 0; pg =3D pg->next) { remaining +=3D 1 << pg->order; - skip -=3D (PAGE_SIZE << pg->order) / ENTRY_SIZE; + skip -=3D ENTRIES_PER_PAGE_GROUP(pg->order); } =20 pages -=3D remaining; --=20 2.51.0