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 8837A63122; Tue, 23 Jan 2024 01:56:40 +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=1705975000; cv=none; b=KNrFnmQHKC1o/fVgGnbCakaPoOpGA4gXrIoV8+Aw4LgXXmImYDgzDdnMe5kNVLM8Tk+6NH74H7KIdopMNNBUa5zWvrL9DFLbjEnEwqh76J1F/woF3NNxeWPrsm4RzltptUCHH9JofVRmi051V87MY0QwFNcwOc7hursUrWvWJqY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705975000; c=relaxed/simple; bh=fpycfdGFQ527WRMjj7LdVse7tBIt6UNUROweiqPJ4nc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=h7aVLekc2w/pD1dwXBOrBw/aszBmMrsx8FOnriaDPvAJKO6wMFG2qI44ysLGlIpnKn8gSDY8R4ERZUd91A8cVz1IT3K+Wo0HBvKXAYlIP305pzf7PL4oZUof+PyL4PrJ+cjPD4t8Lt6H4D1heGBDHBJXNYX5b7Xy54ZH/jIDzsY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=VwN9Fuwy; 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="VwN9Fuwy" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 42595C433A6; Tue, 23 Jan 2024 01:56:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1705975000; bh=fpycfdGFQ527WRMjj7LdVse7tBIt6UNUROweiqPJ4nc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VwN9FuwyMgMNdWUkFurv++tr/QTnM09eisErklxTMmON6o1XFR5YB8yj/So1zITOc 8CUYNkwLqxey4OvfnlalMBnx3Ss6/1QTFY/28xVeCi2CuabnGtipP7+c0+5BASnby9 V3ADenSw1wpYC35KYnlwJIGzcJW6ByGnkVJQTzv4= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Ian Rogers , Namhyung Kim , Adrian Hunter , Fangrui Song , Ingo Molnar , Jiri Olsa , Lieven Hey , Milian Wolff , Pablo Galindo , Peter Zijlstra , Arnaldo Carvalho de Melo , Sasha Levin Subject: [PATCH 5.15 315/374] perf genelf: Set ELF program header addresses properly Date: Mon, 22 Jan 2024 15:59:31 -0800 Message-ID: <20240122235755.836076164@linuxfoundation.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240122235744.598274724@linuxfoundation.org> References: <20240122235744.598274724@linuxfoundation.org> User-Agent: quilt/0.67 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 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Namhyung Kim [ Upstream commit 1af478903fc48c1409a8dd6b698383b62387adf1 ] The text section starts after the ELF headers so PHDR.p_vaddr and others should have the correct addresses. Fixes: babd04386b1df8c3 ("perf jit: Include program header in ELF files") Reviewed-by: Ian Rogers Signed-off-by: Namhyung Kim Cc: Adrian Hunter Cc: Fangrui Song Cc: Ingo Molnar Cc: Jiri Olsa Cc: Lieven Hey Cc: Milian Wolff Cc: Pablo Galindo Cc: Peter Zijlstra Link: https://lore.kernel.org/r/20231212070547.612536-2-namhyung@kernel.org Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Sasha Levin --- tools/perf/util/genelf.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/perf/util/genelf.c b/tools/perf/util/genelf.c index 02cd9f75e3d2..89a85601485d 100644 --- a/tools/perf/util/genelf.c +++ b/tools/perf/util/genelf.c @@ -291,9 +291,9 @@ jit_write_elf(int fd, uint64_t load_addr, const char *sym, */ phdr = elf_newphdr(e, 1); phdr[0].p_type = PT_LOAD; - phdr[0].p_offset = 0; - phdr[0].p_vaddr = 0; - phdr[0].p_paddr = 0; + phdr[0].p_offset = GEN_ELF_TEXT_OFFSET; + phdr[0].p_vaddr = GEN_ELF_TEXT_OFFSET; + phdr[0].p_paddr = GEN_ELF_TEXT_OFFSET; phdr[0].p_filesz = csize; phdr[0].p_memsz = csize; phdr[0].p_flags = PF_X | PF_R; -- 2.43.0