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 1E3BF27456; Tue, 23 Jan 2024 00:11:46 +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=1705968706; cv=none; b=tYH+oCbLmfB0JL2JKYxiQA4t9WV2IMC7b3Bq9NuDYgG28GFhnsX9BHQ1caERr6ntfoIVSNY2vLwxerlYX5SkICNO98EBaiRaIQZtwpu7uCiw6IOGdffI+H68NN/YI0P+BbkTYAEzwOq22M4zbqE4zkJ2o/cQFpwitILB+H1SeWg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705968706; c=relaxed/simple; bh=dOG+y8XOCIanoV/5H+h+2x1XCilAcQGGhSusrmZwBu4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rPrnnZX2PGT1qOnZM8iIYFKvKgfPnUZYGNIWLrnOhXEOf+g86G89gPtYkF16vI7wuKawR+8Pj0nbXcGQA3KEGJb/8vW0jkRa88OGnLajrUtSz8SSoL/7Zg/B4yNIsRQcfPL67KZtShDBEiPXcLvUOclPe8Nl+roAt6pzjywKUaM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=b2PSgBin; 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="b2PSgBin" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BABDFC433F1; Tue, 23 Jan 2024 00:11:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1705968705; bh=dOG+y8XOCIanoV/5H+h+2x1XCilAcQGGhSusrmZwBu4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=b2PSgBinyeJB2Ug3m+qqM1FXybIvk2uhoOhANfs92y8Y8ebRE2MQgJ9eAe8btdr4u zoAN3UGNyobDg5+IQonQhGQSti1NXytRlonnzw/h29g3Fl6H5MuTmTBOv/8QrbVqXn Nbe/gzjSWSPbLH6PUiocvNidgzrt4H4gZYRS8kX0= 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 4.19 136/148] perf genelf: Set ELF program header addresses properly Date: Mon, 22 Jan 2024 15:58:12 -0800 Message-ID: <20240122235718.060425311@linuxfoundation.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240122235712.442097787@linuxfoundation.org> References: <20240122235712.442097787@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 4.19-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 65e41e259af8..72860270e935 100644 --- a/tools/perf/util/genelf.c +++ b/tools/perf/util/genelf.c @@ -296,9 +296,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