From: Giuliano Procida <gprocida@google.com>
To: dwarves@vger.kernel.org
Cc: acme@kernel.org, andrii@kernel.org, ast@kernel.org,
gprocida@google.com, maennich@google.com,
kernel-team@android.com, kernel-team@fb.com, bpf@vger.kernel.org
Subject: [PATCH dwarves v2 4/4] btf_encoder: Align .BTF section/segment to 8 bytes
Date: Mon, 1 Feb 2021 17:25:30 +0000 [thread overview]
Message-ID: <20210201172530.1141087-5-gprocida@google.com> (raw)
In-Reply-To: <20210201172530.1141087-1-gprocida@google.com>
This is to avoid misaligned access to BTF type structs when
memory-mapping ELF sections.
Signed-off-by: Giuliano Procida <gprocida@google.com>
---
libbtf.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/libbtf.c b/libbtf.c
index 048a873..ae99a93 100644
--- a/libbtf.c
+++ b/libbtf.c
@@ -755,7 +755,13 @@ static int btf_elf__write(const char *filename, struct btf *btf)
* This actually happens in practice with vmlinux which has .strtab
* after .shstrtab, resulting in a (small) hole the size of the original
* .shstrtab.
+ *
+ * We'll align .BTF to 8 bytes to cater for all architectures. It'd be
+ * nice if we could fetch this value from somewhere. The BTF
+ * specification does not discuss alignment and its trailing string
+ * table is not currently padded to any particular alignment.
*/
+ const size_t btf_alignment = 8;
/*
* First we look if there was already a .BTF section present and
@@ -847,8 +853,8 @@ static int btf_elf__write(const char *filename, struct btf *btf)
elf_flagdata(btf_data, ELF_C_SET, ELF_F_DIRTY);
/* Update .BTF section in the SHT */
- size_t new_btf_offset = high_water_mark;
- size_t new_btf_size = raw_btf_size;
+ size_t new_btf_offset = roundup(high_water_mark, btf_alignment);
+ size_t new_btf_size = roundup(raw_btf_size, btf_alignment);
GElf_Shdr btf_shdr_mem;
GElf_Shdr *btf_shdr = gelf_getshdr(btf_scn, &btf_shdr_mem);
if (!btf_shdr) {
@@ -856,6 +862,7 @@ static int btf_elf__write(const char *filename, struct btf *btf)
__func__, elf_errmsg(elf_errno()));
goto out;
}
+ btf_shdr->sh_addralign = btf_alignment;
btf_shdr->sh_entsize = 0;
btf_shdr->sh_flags = SHF_ALLOC;
if (dot_btf_offset)
@@ -926,6 +933,7 @@ static int btf_elf__write(const char *filename, struct btf *btf)
pht[phnum].p_memsz = pht[phnum].p_filesz = btf_shdr->sh_size;
pht[phnum].p_vaddr = pht[phnum].p_paddr = 0;
pht[phnum].p_flags = PF_R;
+ pht[phnum].p_align = btf_alignment;
void *phdr = gelf_newphdr(elf, phnum+1);
if (!phdr) {
fprintf(stderr, "%s: gelf_newphdr failed: %s\n",
--
2.30.0.365.g02bc693789-goog
next prev parent reply other threads:[~2021-02-01 17:27 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <87a83353155506cc02141e6e4108d89aa4e7d284>
2021-02-01 17:25 ` [PATCH dwarves v2 0/4] BTF ELF writing changes Giuliano Procida
2021-02-01 17:25 ` [PATCH dwarves v2 1/4] btf_encoder: Add .BTF section using libelf Giuliano Procida
2021-02-04 4:10 ` Andrii Nakryiko
2021-02-04 18:29 ` Giuliano Procida
2021-02-01 17:25 ` [PATCH dwarves v2 2/4] btf_encoder: Manually lay out updated ELF sections Giuliano Procida
2021-02-04 4:13 ` Andrii Nakryiko
2021-02-04 18:34 ` Giuliano Procida
2021-02-04 23:06 ` Andrii Nakryiko
2021-02-01 17:25 ` [PATCH dwarves v2 3/4] btf_encoder: Add .BTF as a loadable segment Giuliano Procida
2021-02-02 10:54 ` Giuliano Procida
2021-02-01 17:25 ` Giuliano Procida [this message]
2021-02-04 4:10 ` [PATCH dwarves v2 4/4] btf_encoder: Align .BTF section/segment to 8 bytes Andrii Nakryiko
2021-02-04 15:11 ` Giuliano Procida
2021-02-04 15:11 ` [PATCH] btf_encoder: Align .BTF section " Giuliano Procida
2021-02-05 13:42 ` [PATCH dwarves v3 0/5] ELF writing changes Giuliano Procida
2021-02-05 13:42 ` [PATCH dwarves v3 1/5] btf_encoder: Funnel ELF error reporting through a macro Giuliano Procida
2021-02-08 22:20 ` Andrii Nakryiko
2021-02-05 13:42 ` [PATCH dwarves v3 2/5] btf_encoder: Do not use both structs and pointers for the same data Giuliano Procida
2021-02-08 22:23 ` Andrii Nakryiko
2021-02-09 14:52 ` Giuliano Procida
2021-02-05 13:42 ` [PATCH dwarves v3 3/5] btf_encoder: Traverse sections using a for-loop Giuliano Procida
2021-02-08 22:24 ` Andrii Nakryiko
2021-02-09 14:59 ` Giuliano Procida
2021-02-05 13:42 ` [PATCH dwarves v3 4/5] btf_encoder: Add .BTF section using libelf Giuliano Procida
2021-02-08 22:29 ` Andrii Nakryiko
2021-02-09 15:04 ` Giuliano Procida
2021-02-05 13:42 ` [PATCH dwarves v3 5/5] btf_encoder: Align .BTF section to 8 bytes Giuliano Procida
2021-02-08 22:29 ` Andrii Nakryiko
2021-02-09 15:05 ` Giuliano Procida
2021-02-17 11:07 ` [PATCH dwarves v4 0/5] ELF writing changes Giuliano Procida
2021-02-17 11:08 ` [PATCH dwarves v4 1/5] btf_encoder: Funnel ELF error reporting through a macro Giuliano Procida
2021-02-17 11:08 ` [PATCH dwarves v4 2/5] btf_encoder: Do not use both structs and pointers for the same data Giuliano Procida
2021-02-17 11:08 ` [PATCH dwarves v4 3/5] btf_encoder: Traverse sections using a for-loop Giuliano Procida
2021-02-17 11:08 ` [PATCH dwarves v4 4/5] btf_encoder: Add .BTF section using libelf Giuliano Procida
2021-02-17 11:08 ` [PATCH dwarves v4 5/5] btf_encoder: Align .BTF section to 8 bytes Giuliano Procida
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210201172530.1141087-5-gprocida@google.com \
--to=gprocida@google.com \
--cc=acme@kernel.org \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=dwarves@vger.kernel.org \
--cc=kernel-team@android.com \
--cc=kernel-team@fb.com \
--cc=maennich@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).