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 609511350CA; Tue, 23 Jan 2024 01:05:35 +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=1705971935; cv=none; b=jct7GelI39MoYH54Mr7zeNJtWXSSxlRb4NHZKVOxNLtQlXYBuKr/FLusvhaL303qI3Num3QnABAraArXB6G48fknUhbQY2xdATUBOnNNbnrx40qyqyG+wFz39kFjN1NDqjmf9dLz3eSEXOTqOIIv39jqb59GRtIUOA2t+uNzG7c= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705971935; c=relaxed/simple; bh=Yc/LKOxVvXv9SwdvsarZ4bIt3BrGxQilVEOjtkjOW4g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cznWuknXTBZpqfkCXsTLz5OZhICc7UbnojLiwGPkVagOHvsVObty5KYQR3In+WHzrgkJKQQqO/KnZMaP8o2VlGI/Xh1r5yHsK2LmfVVoiOAYnMW3oR2vX+rImJTDvpk8KAf3lIKRyBnihP2EWwkQul7MDMb1ng/kIgmtPCRSP24= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Uc3s3WPZ; 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="Uc3s3WPZ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E6E45C433C7; Tue, 23 Jan 2024 01:05:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1705971935; bh=Yc/LKOxVvXv9SwdvsarZ4bIt3BrGxQilVEOjtkjOW4g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Uc3s3WPZtaO1rdNx+iAui2zFRn7jB30z64sh3M+yFdsrAzjmVU5ZLkfBp9KpbKAja 54kkDP4LMGFRrAAWZ7JFgrF7QFPbvsoUi3L5Q+Nyy1J+QXjLFSETik+fvfK25ISaFX So4W/kGEyKbl5bYc4i3M1W/dx/Y7P4qKo4Ahxj/M= 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 6.1 355/417] perf genelf: Set ELF program header addresses properly Date: Mon, 22 Jan 2024 15:58:43 -0800 Message-ID: <20240122235804.100405683@linuxfoundation.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240122235751.480367507@linuxfoundation.org> References: <20240122235751.480367507@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 6.1-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 fefc72066c4e..ac17a3cb59dc 100644 --- a/tools/perf/util/genelf.c +++ b/tools/perf/util/genelf.c @@ -293,9 +293,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