From nobody Wed Dec 17 00:15:51 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EFC89C4167B for ; Fri, 8 Dec 2023 10:25:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1573543AbjLHKZN (ORCPT ); Fri, 8 Dec 2023 05:25:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42372 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235889AbjLHKZF (ORCPT ); Fri, 8 Dec 2023 05:25:05 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AFB001984 for ; Fri, 8 Dec 2023 02:25:11 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1F007C433C8; Fri, 8 Dec 2023 10:25:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1702031111; bh=BJTb9S/48BMXgKg9JdebJFjIf4uCQaHDkO4DGbu+/d0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Rjbs+hxYEcpPGC8MLSK/pRCVRAlHDbE4xyI26zR8oOJ2neJs8NZElyzvWcuAglWyZ 6t7b6lQ+IBpA5CRFFwnlgLfpPBc87ApEPbidq42KRdPkgztPGUlHJeR8VcN/YjwEVm lh+tvQXFVncZc60f9RGHknM4JkopKP1bepIBXGJlr/hnzjytvBohTu+OjXV1AfuSMq KCqVjaiOmFqtAvkAvf+9Tf9odx/Njr1mOhSdQUlj8hok1i9Ud4RlwfHLlxL/nAaTAp i2C3LSiTdAPbqSgF05bRGR+HZIZ6XC1fjKavyeFRHbZB8850iHQ7d1RjfVCDV4zlJJ 51T6M60msuGJA== From: "Masami Hiramatsu (Google)" To: Alexei Starovoitov , Steven Rostedt , Florent Revest Cc: linux-trace-kernel@vger.kernel.org, LKML , Martin KaFai Lau , bpf , Sven Schnelle , Alexei Starovoitov , Jiri Olsa , Arnaldo Carvalho de Melo , Daniel Borkmann , Alan Maguire , Mark Rutland , Peter Zijlstra , Thomas Gleixner , Guo Ren Subject: [PATCH v4 04/33] fgraph: Use BUILD_BUG_ON() to make sure we have structures divisible by long Date: Fri, 8 Dec 2023 19:25:04 +0900 Message-Id: <170203110417.579004.1203622490067947084.stgit@devnote2> X-Mailer: git-send-email 2.34.1 In-Reply-To: <170203105427.579004.8033550792660734570.stgit@devnote2> References: <170203105427.579004.8033550792660734570.stgit@devnote2> User-Agent: StGit/0.19 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Steven Rostedt (VMware) Instead of using "ALIGN()", use BUILD_BUG_ON() as the structures should always be divisible by sizeof(long). Link: http://lkml.kernel.org/r/20190524111144.GI2589@hirez.programming.kick= s-ass.net Suggested-by: Peter Zijlstra Signed-off-by: Steven Rostedt (VMware) Signed-off-by: Masami Hiramatsu (Google) --- kernel/trace/fgraph.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/kernel/trace/fgraph.c b/kernel/trace/fgraph.c index 30edeb6d4aa9..837daf929d2a 100644 --- a/kernel/trace/fgraph.c +++ b/kernel/trace/fgraph.c @@ -26,10 +26,9 @@ #endif =20 #define FGRAPH_RET_SIZE sizeof(struct ftrace_ret_stack) -#define FGRAPH_RET_INDEX (ALIGN(FGRAPH_RET_SIZE, sizeof(long)) / sizeof(lo= ng)) +#define FGRAPH_RET_INDEX (FGRAPH_RET_SIZE / sizeof(long)) #define SHADOW_STACK_SIZE (PAGE_SIZE) -#define SHADOW_STACK_INDEX \ - (ALIGN(SHADOW_STACK_SIZE, sizeof(long)) / sizeof(long)) +#define SHADOW_STACK_INDEX (SHADOW_STACK_SIZE / sizeof(long)) /* Leave on a buffer at the end */ #define SHADOW_STACK_MAX_INDEX (SHADOW_STACK_INDEX - FGRAPH_RET_INDEX) =20 @@ -91,6 +90,8 @@ ftrace_push_return_trace(unsigned long ret, unsigned long= func, if (!current->ret_stack) return -EBUSY; =20 + BUILD_BUG_ON(SHADOW_STACK_SIZE % sizeof(long)); + /* * We must make sure the ret_stack is tested before we read * anything else. @@ -325,6 +326,8 @@ ftrace_graph_get_ret_stack(struct task_struct *task, in= t idx) { int index =3D task->curr_ret_stack; =20 + BUILD_BUG_ON(FGRAPH_RET_SIZE % sizeof(long)); + index -=3D FGRAPH_RET_INDEX * (idx + 1); if (index < 0) return NULL;