From mboxrd@z Thu Jan 1 00:00:00 1970 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 5197ECDB465 for ; Mon, 16 Oct 2023 08:45:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230219AbjJPIpr (ORCPT ); Mon, 16 Oct 2023 04:45:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34272 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231149AbjJPIpq (ORCPT ); Mon, 16 Oct 2023 04:45:46 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2BA95A1 for ; Mon, 16 Oct 2023 01:45:44 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 40986C433C7; Mon, 16 Oct 2023 08:45:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1697445943; bh=Pp3Y0FnLckvBzveMfajO0zi/VguKIBimVVHQwaLCwFg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TKc822TDgpva1dqexEfP+bhr2rlWEaQMbHxRGUaHM/peTGKrj7M6t6/ofyG43qrfa fmwnUeJ9cv0KFGoCSi0VrlzoMzyirtYtwscXBci90gI8lL1nppq0fd8nxAvROAyLD3 j2vKyoWTTT0v0Tqp560E2Xm/8/Xn810gzxbX/+a4= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Adrian Hunter , Arnaldo Carvalho de Melo , Ian Rogers , Jiri Olsa , Lieven Hey , Namhyung Kim , Sasha Levin Subject: [PATCH 5.15 042/102] perf inject: Fix GEN_ELF_TEXT_OFFSET for jit Date: Mon, 16 Oct 2023 10:40:41 +0200 Message-ID: <20231016083954.821877131@linuxfoundation.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231016083953.689300946@linuxfoundation.org> References: <20231016083953.689300946@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Adrian Hunter [ Upstream commit 89b15d00527b7825ff19130ed83478e80e3fae99 ] When a program header was added, it moved the text section but GEN_ELF_TEXT_OFFSET was not updated. Fix by adding the program header size and aligning. Fixes: babd04386b1df8c3 ("perf jit: Include program header in ELF files") Signed-off-by: Adrian Hunter Tested-by: Arnaldo Carvalho de Melo Cc: Ian Rogers Cc: Jiri Olsa Cc: Lieven Hey Cc: Namhyung Kim Link: https://lore.kernel.org/r/20221014170905.64069-7-adrian.hunter@intel.com Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Sasha Levin --- tools/perf/util/genelf.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/genelf.h b/tools/perf/util/genelf.h index ac638945b4cb0..159c69bcc33e6 100644 --- a/tools/perf/util/genelf.h +++ b/tools/perf/util/genelf.h @@ -2,6 +2,8 @@ #ifndef __GENELF_H__ #define __GENELF_H__ +#include + /* genelf.c */ int jit_write_elf(int fd, uint64_t code_addr, const char *sym, const void *code, int csize, void *debug, int nr_debug_entries, @@ -73,6 +75,6 @@ int jit_add_debug_info(Elf *e, uint64_t code_addr, void *debug, int nr_debug_ent #endif /* The .text section is directly after the ELF header */ -#define GEN_ELF_TEXT_OFFSET sizeof(Elf_Ehdr) +#define GEN_ELF_TEXT_OFFSET round_up(sizeof(Elf_Ehdr) + sizeof(Elf_Phdr), 16) #endif -- 2.40.1