Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 933053E489 for ; Tue, 9 Jan 2024 21:49:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ECOfTO/p" Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-1d3f29fea66so17407855ad.3 for ; Tue, 09 Jan 2024 13:49:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704836998; x=1705441798; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=CnBPxEnXk7KjlkqXAC9IxPbYGia/n1Rz7kNemo9mTos=; b=ECOfTO/pXgSBBtP3vd/Cx6B0bWQjZxE5IqTbKCgR/J3C08LEnvrg2RPWxtz7tS7y+f 5LGhzVdXgrcDHixQMZkTCnuvxQ2+44Gwlbi4pYeBJxFLjOYvc0SI/KdSt1DFaNafZKGh y5r6q/yZGHP7vXB2WF2B1qBc+B5MGAcQHb+V/zt/LPFmZkENIhDjOUnJbZZ4/EyuZW0B ft3zVXr3etMGO2Ji/4DLvVpgWlZ0bdf0pzQmwABMGFY5Y1/E3bWJnhqpZrRmkW47uuZP XqxcZ89Za/Uhs7xn+IcNndx2ZH+N1QcW6HI+8wzldHF6B3nQ+H/hEULpQSb4qLeoiQGl SQOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704836998; x=1705441798; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=CnBPxEnXk7KjlkqXAC9IxPbYGia/n1Rz7kNemo9mTos=; b=KX8HvYm8PLdOX125AGSJjUnFXFH9EIGvmmo2DhGLiPM8BpS/FNMqBGsofJUpkfv7xD LsEYvrtuuvhiIRTYAkyYbp7vsTLEzhqWZHCy0w3uzmFXbskku7rimGpDH0//zVkwtAmO cR3Nvskeu03iVSn0yKGO3D/hkzDCpyqa0zbZ5C0T/7kWqRc+TxZFP3tj7KFx+Z8smWcX LO0uRazSxBAAQIB5Bh8By4QViK9+d7Y1TP/RhEAEHNTvmP6ERR6m0hUek2yDtE9JE4OC hgVTKGIbo9GimDaBBH82DETLM9AA7w3Lrs7aqzgt8d1r861Q26lpKYScLW+ireJiD75Y 1K9Q== X-Gm-Message-State: AOJu0YzQ1uOpUgl+8nzKrRTJkYNvIlJAuWIAZEvzujV0pKNo0fAuiMMJ bbHNpZ9z2XuGRbnElqdpdog= X-Google-Smtp-Source: AGHT+IFY2Ld9moWymK/ytefZKpitqb9BBrNdq4JahB3/Dd7cexihzS/iRjzJ9kat+JUkyc//v6zpZQ== X-Received: by 2002:a17:902:c949:b0:1d4:e36f:748f with SMTP id i9-20020a170902c94900b001d4e36f748fmr71428pla.41.1704836997726; Tue, 09 Jan 2024 13:49:57 -0800 (PST) Received: from bangji.corp.google.com ([2620:15c:2c0:5:b4e:5c78:a5b3:ef5b]) by smtp.gmail.com with ESMTPSA id t9-20020a170902bc4900b001d4b0ae7052sm2249146plz.135.2024.01.09.13.49.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jan 2024 13:49:57 -0800 (PST) Sender: Namhyung Kim From: Namhyung Kim To: Greg Kroah-Hartman Cc: Harshit Mogalapalli , stable@vger.kernel.org, patches@lists.linux.dev, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, akpm@linux-foundation.org, linux@roeck-us.net, shuah@kernel.org, patches@kernelci.org, lkft-triage@lists.linaro.org, pavel@denx.de, jonathanh@nvidia.com, f.fainelli@gmail.com, sudipm.mukherjee@gmail.com, srw@sladewatkins.net, rwarsow@gmx.de, conor@kernel.org, allen.lkml@gmail.com, Vegard Nossum , Darren Kenny , Adrian Hunter , Arnaldo Carvalho de Melo , Ian Rogers , Jiri Olsa , Lieven Hey Subject: [PATCH for-5.15] perf inject: Fix GEN_ELF_TEXT_OFFSET for jit Date: Tue, 9 Jan 2024 13:49:55 -0800 Message-ID: <20240109214955.451513-1-namhyung@kernel.org> X-Mailer: git-send-email 2.43.0.472.g3155946c3a-goog In-Reply-To: <2024010711-skeletal-material-15e8@gregkh> References: <2024010711-skeletal-material-15e8@gregkh> Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Adrian Hunter 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 Link: https://lore.kernel.org/r/20221014170905.64069-7-adrian.hunter@intel.com Signed-off-by: Arnaldo Carvalho de Melo [namhyung: use "linux/kernel.h" instead to avoid build failure] Signed-off-by: Namhyung Kim --- 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 b5c909546e3f..6af062d1c452 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, @@ -76,6 +78,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.43.0.472.g3155946c3a-goog