From: Suraj Jitindar Singh <sjitindarsingh@gmail.com> To: madvenka@linux.microsoft.com, jpoimboe@redhat.com, peterz@infradead.org, chenzhongjin@huawei.com, mark.rutland@arm.com, broonie@kernel.org, nobuta.keiya@fujitsu.com, catalin.marinas@arm.com, will@kernel.org, jamorris@linux.microsoft.com, linux-arm-kernel@lists.infradead.org, live-patching@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [RFC PATCH v3 05/22] objtool: Reorganize ORC types Date: Sat, 18 Feb 2023 17:30:20 +0800 [thread overview] Message-ID: <a1b83a8d621e37310194c0c32b9d847a0952d282.camel@gmail.com> (raw) In-Reply-To: <20230202074036.507249-6-madvenka@linux.microsoft.com> On Thu, 2023-02-02 at 01:40 -0600, madvenka@linux.microsoft.com wrote: > From: "Madhavan T. Venkataraman" <madvenka@linux.microsoft.com> > > The ORC code needs to be reorganized into arch-specific and generic > parts > so that architectures other than X86 can use the generic parts. > > orc_types.h contains the following ORC definitions shared between > objtool > and the kernel: > > - ORC register definitions which are arch-specific. > - orc_entry structure which is generic. > > Move orc_entry into a new file include/linux/orc_entry.h. Also, the > field > names bp_reg and bp_offset in struct orc_entry are x86-specific. > Change > them to fp_reg and fp_offset. FP stands for frame pointer. > > Currently, the type field in orc_entry is only 2 bits. For other > architectures, we will need more. So, expand this to 3 bits. > > Signed-off-by: Madhavan T. Venkataraman <madvenka@linux.microsoft.com > > > --- > arch/x86/include/asm/orc_types.h | 37 +++++------------------- > include/linux/orc_entry.h | 39 > ++++++++++++++++++++++++++ > tools/arch/x86/include/asm/orc_types.h | 37 +++++------------------- > tools/include/linux/orc_entry.h | 39 > ++++++++++++++++++++++++++ > tools/objtool/orc_gen.c | 4 +-- > tools/objtool/sync-check.sh | 1 + > 6 files changed, 95 insertions(+), 62 deletions(-) > create mode 100644 include/linux/orc_entry.h > create mode 100644 tools/include/linux/orc_entry.h > [snip] > diff --git a/tools/include/linux/orc_entry.h > b/tools/include/linux/orc_entry.h > new file mode 100644 > index 000000000000..3d49e3b9dabe > --- /dev/null > +++ b/tools/include/linux/orc_entry.h > @@ -0,0 +1,39 @@ > +/* SPDX-License-Identifier: GPL-2.0-or-later */ > +/* > + * Copyright (C) 2017 Josh Poimboeuf <jpoimboe@redhat.com> > + */ > + > +#ifndef _ORC_ENTRY_H > +#define _ORC_ENTRY_H > + > +#ifndef __ASSEMBLY__ > +#include <asm/byteorder.h> > + > +/* > + * This struct is more or less a vastly simplified version of the > DWARF Call > + * Frame Information standard. It contains only the necessary parts > of DWARF > + * CFI, simplified for ease of access by the in-kernel unwinder. It > tells the > + * unwinder how to find the previous SP and BP (and sometimes entry > regs) on > + * the stack for a given code address. Each instance of the struct > corresponds > + * to one or more code locations. > + */ > +struct orc_entry { > + s16 sp_offset; > + s16 fp_offset; > +#if defined(__LITTLE_ENDIAN_BITFIELD) > + unsigned sp_reg:4; > + unsigned fp_reg:4; > + unsigned type:3; > + unsigned end:1; > +#elif defined(__BIG_ENDIAN_BITFIELD) > + unsigned fp_reg:4; > + unsigned sp_reg:4; > + unsigned unused:4; > + unsigned end:1; > + unsigned type:3; > +# nit: I believe you also need to update fp_reg/bp_offset -> fp_reg/fp_offset in orc_dump() in orc_dump.c - Suraj > + > +#endif /* __ASSEMBLY__ */ > + > +#endif /* _ORC_ENTRY_H */ > diff --git a/tools/objtool/orc_gen.c b/tools/objtool/orc_gen.c > index dd3c64af9db2..68c317daadbf 100644 > --- a/tools/objtool/orc_gen.c > +++ b/tools/objtool/orc_gen.c > @@ -98,7 +98,7 @@ static int write_orc_entry(struct elf *elf, struct > section *orc_sec, > orc = (struct orc_entry *)orc_sec->data->d_buf + idx; > memcpy(orc, o, sizeof(*orc)); > orc->sp_offset = bswap_if_needed(orc->sp_offset); > - orc->bp_offset = bswap_if_needed(orc->bp_offset); > + orc->fp_offset = bswap_if_needed(orc->fp_offset); > > /* populate reloc for ip */ > if (elf_add_reloc_to_insn(elf, ip_sec, idx * sizeof(int), > R_X86_64_PC32, > @@ -149,7 +149,7 @@ int orc_create(struct objtool_file *file) > > struct orc_entry null = { > .sp_reg = ORC_REG_UNDEFINED, > - .bp_reg = ORC_REG_UNDEFINED, > + .fp_reg = ORC_REG_UNDEFINED, > .type = UNWIND_HINT_TYPE_CALL, > }; > > diff --git a/tools/objtool/sync-check.sh b/tools/objtool/sync- > check.sh > index ee49b4e9e72c..ef1acb064605 100755 > --- a/tools/objtool/sync-check.sh > +++ b/tools/objtool/sync-check.sh > @@ -18,6 +18,7 @@ arch/x86/include/asm/unwind_hints.h > arch/x86/lib/x86-opcode-map.txt > arch/x86/tools/gen-insn-attr-x86.awk > include/linux/static_call_types.h > +include/linux/orc_entry.h > " > > SYNC_CHECK_FILES='
WARNING: multiple messages have this Message-ID (diff)
From: Suraj Jitindar Singh <sjitindarsingh@gmail.com> To: madvenka@linux.microsoft.com, jpoimboe@redhat.com, peterz@infradead.org, chenzhongjin@huawei.com, mark.rutland@arm.com, broonie@kernel.org, nobuta.keiya@fujitsu.com, catalin.marinas@arm.com, will@kernel.org, jamorris@linux.microsoft.com, linux-arm-kernel@lists.infradead.org, live-patching@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [RFC PATCH v3 05/22] objtool: Reorganize ORC types Date: Sat, 18 Feb 2023 17:30:20 +0800 [thread overview] Message-ID: <a1b83a8d621e37310194c0c32b9d847a0952d282.camel@gmail.com> (raw) In-Reply-To: <20230202074036.507249-6-madvenka@linux.microsoft.com> On Thu, 2023-02-02 at 01:40 -0600, madvenka@linux.microsoft.com wrote: > From: "Madhavan T. Venkataraman" <madvenka@linux.microsoft.com> > > The ORC code needs to be reorganized into arch-specific and generic > parts > so that architectures other than X86 can use the generic parts. > > orc_types.h contains the following ORC definitions shared between > objtool > and the kernel: > > - ORC register definitions which are arch-specific. > - orc_entry structure which is generic. > > Move orc_entry into a new file include/linux/orc_entry.h. Also, the > field > names bp_reg and bp_offset in struct orc_entry are x86-specific. > Change > them to fp_reg and fp_offset. FP stands for frame pointer. > > Currently, the type field in orc_entry is only 2 bits. For other > architectures, we will need more. So, expand this to 3 bits. > > Signed-off-by: Madhavan T. Venkataraman <madvenka@linux.microsoft.com > > > --- > arch/x86/include/asm/orc_types.h | 37 +++++------------------- > include/linux/orc_entry.h | 39 > ++++++++++++++++++++++++++ > tools/arch/x86/include/asm/orc_types.h | 37 +++++------------------- > tools/include/linux/orc_entry.h | 39 > ++++++++++++++++++++++++++ > tools/objtool/orc_gen.c | 4 +-- > tools/objtool/sync-check.sh | 1 + > 6 files changed, 95 insertions(+), 62 deletions(-) > create mode 100644 include/linux/orc_entry.h > create mode 100644 tools/include/linux/orc_entry.h > [snip] > diff --git a/tools/include/linux/orc_entry.h > b/tools/include/linux/orc_entry.h > new file mode 100644 > index 000000000000..3d49e3b9dabe > --- /dev/null > +++ b/tools/include/linux/orc_entry.h > @@ -0,0 +1,39 @@ > +/* SPDX-License-Identifier: GPL-2.0-or-later */ > +/* > + * Copyright (C) 2017 Josh Poimboeuf <jpoimboe@redhat.com> > + */ > + > +#ifndef _ORC_ENTRY_H > +#define _ORC_ENTRY_H > + > +#ifndef __ASSEMBLY__ > +#include <asm/byteorder.h> > + > +/* > + * This struct is more or less a vastly simplified version of the > DWARF Call > + * Frame Information standard. It contains only the necessary parts > of DWARF > + * CFI, simplified for ease of access by the in-kernel unwinder. It > tells the > + * unwinder how to find the previous SP and BP (and sometimes entry > regs) on > + * the stack for a given code address. Each instance of the struct > corresponds > + * to one or more code locations. > + */ > +struct orc_entry { > + s16 sp_offset; > + s16 fp_offset; > +#if defined(__LITTLE_ENDIAN_BITFIELD) > + unsigned sp_reg:4; > + unsigned fp_reg:4; > + unsigned type:3; > + unsigned end:1; > +#elif defined(__BIG_ENDIAN_BITFIELD) > + unsigned fp_reg:4; > + unsigned sp_reg:4; > + unsigned unused:4; > + unsigned end:1; > + unsigned type:3; > +# nit: I believe you also need to update fp_reg/bp_offset -> fp_reg/fp_offset in orc_dump() in orc_dump.c - Suraj > + > +#endif /* __ASSEMBLY__ */ > + > +#endif /* _ORC_ENTRY_H */ > diff --git a/tools/objtool/orc_gen.c b/tools/objtool/orc_gen.c > index dd3c64af9db2..68c317daadbf 100644 > --- a/tools/objtool/orc_gen.c > +++ b/tools/objtool/orc_gen.c > @@ -98,7 +98,7 @@ static int write_orc_entry(struct elf *elf, struct > section *orc_sec, > orc = (struct orc_entry *)orc_sec->data->d_buf + idx; > memcpy(orc, o, sizeof(*orc)); > orc->sp_offset = bswap_if_needed(orc->sp_offset); > - orc->bp_offset = bswap_if_needed(orc->bp_offset); > + orc->fp_offset = bswap_if_needed(orc->fp_offset); > > /* populate reloc for ip */ > if (elf_add_reloc_to_insn(elf, ip_sec, idx * sizeof(int), > R_X86_64_PC32, > @@ -149,7 +149,7 @@ int orc_create(struct objtool_file *file) > > struct orc_entry null = { > .sp_reg = ORC_REG_UNDEFINED, > - .bp_reg = ORC_REG_UNDEFINED, > + .fp_reg = ORC_REG_UNDEFINED, > .type = UNWIND_HINT_TYPE_CALL, > }; > > diff --git a/tools/objtool/sync-check.sh b/tools/objtool/sync- > check.sh > index ee49b4e9e72c..ef1acb064605 100755 > --- a/tools/objtool/sync-check.sh > +++ b/tools/objtool/sync-check.sh > @@ -18,6 +18,7 @@ arch/x86/include/asm/unwind_hints.h > arch/x86/lib/x86-opcode-map.txt > arch/x86/tools/gen-insn-attr-x86.awk > include/linux/static_call_types.h > +include/linux/orc_entry.h > " > > SYNC_CHECK_FILES=' _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2023-02-18 9:30 UTC|newest] Thread overview: 110+ messages / expand[flat|nested] mbox.gz Atom feed top [not found] <0337266cf19f4c98388e3f6d09f590d9de258dc7> 2023-02-02 7:40 ` [RFC PATCH v3 00/22] arm64: livepatch: Use ORC for dynamic frame pointer validation madvenka 2023-02-02 7:40 ` madvenka 2023-02-02 7:40 ` [RFC PATCH v3 01/22] objtool: Reorganize CFI code madvenka 2023-02-02 7:40 ` madvenka 2023-02-02 7:40 ` [RFC PATCH v3 02/22] objtool: Reorganize instruction-related code madvenka 2023-02-02 7:40 ` madvenka 2023-02-02 7:40 ` [RFC PATCH v3 03/22] objtool: Move decode_instructions() to a separate file madvenka 2023-02-02 7:40 ` madvenka 2023-02-02 7:40 ` [RFC PATCH v3 04/22] objtool: Reorganize Unwind hint code madvenka 2023-02-02 7:40 ` madvenka 2023-02-02 7:40 ` [RFC PATCH v3 05/22] objtool: Reorganize ORC types madvenka 2023-02-02 7:40 ` madvenka 2023-02-18 9:30 ` Suraj Jitindar Singh [this message] 2023-02-18 9:30 ` Suraj Jitindar Singh 2023-03-06 16:45 ` Madhavan T. Venkataraman 2023-03-06 16:45 ` Madhavan T. Venkataraman 2023-02-02 7:40 ` [RFC PATCH v3 06/22] objtool: Reorganize ORC code madvenka 2023-02-02 7:40 ` madvenka 2023-02-02 7:40 ` [RFC PATCH v3 07/22] objtool: Reorganize ORC kernel code madvenka 2023-02-02 7:40 ` madvenka 2023-02-02 7:40 ` [RFC PATCH v3 08/22] objtool: Introduce STATIC_CHECK madvenka 2023-02-02 7:40 ` madvenka 2023-02-02 7:40 ` [RFC PATCH v3 09/22] objtool: arm64: Add basic definitions and compile madvenka 2023-02-02 7:40 ` madvenka 2023-02-02 7:40 ` [RFC PATCH v3 10/22] objtool: arm64: Implement decoder for Dynamic FP validation madvenka 2023-02-02 7:40 ` madvenka 2023-02-02 7:40 ` [RFC PATCH v3 11/22] objtool: arm64: Invoke the decoder madvenka 2023-02-02 7:40 ` madvenka 2023-02-02 7:40 ` [RFC PATCH v3 12/22] objtool: arm64: Compute destinations for call and jump instructions madvenka 2023-02-02 7:40 ` madvenka 2023-02-02 7:40 ` [RFC PATCH v3 13/22] objtool: arm64: Walk instructions and compute CFI for each instruction madvenka 2023-02-02 7:40 ` madvenka 2023-02-02 7:40 ` [RFC PATCH v3 14/22] objtool: arm64: Generate ORC data from CFI for object files madvenka 2023-02-02 7:40 ` madvenka 2023-02-02 7:40 ` [RFC PATCH v3 15/22] objtool: arm64: Add unwind hint support madvenka 2023-02-02 7:40 ` madvenka 2023-02-02 7:40 ` [RFC PATCH v3 16/22] arm64: Add unwind hints to exception handlers madvenka 2023-02-02 7:40 ` madvenka 2023-02-02 7:40 ` [RFC PATCH v3 17/22] arm64: Add kernel and module support for ORC madvenka 2023-02-02 7:40 ` madvenka 2023-02-02 7:40 ` [RFC PATCH v3 18/22] arm64: Build the kernel with ORC information madvenka 2023-02-02 7:40 ` madvenka 2023-02-10 7:52 ` Tomohiro Misono (Fujitsu) 2023-02-10 7:52 ` Tomohiro Misono (Fujitsu) 2023-02-11 4:34 ` Madhavan T. Venkataraman 2023-02-11 4:34 ` Madhavan T. Venkataraman 2023-02-02 7:40 ` [RFC PATCH v3 19/22] arm64: unwinder: Add a reliability check in the unwinder based on ORC madvenka 2023-02-02 7:40 ` madvenka 2023-02-23 4:07 ` Suraj Jitindar Singh 2023-02-23 4:07 ` Suraj Jitindar Singh 2023-03-06 16:52 ` Madhavan T. Venkataraman 2023-03-06 16:52 ` Madhavan T. Venkataraman 2023-02-02 7:40 ` [RFC PATCH v3 20/22] arm64: Define HAVE_DYNAMIC_FTRACE_WITH_ARGS madvenka 2023-02-02 7:40 ` madvenka 2023-02-02 7:40 ` [RFC PATCH v3 21/22] arm64: Define TIF_PATCH_PENDING for livepatch madvenka 2023-02-02 7:40 ` madvenka 2023-02-02 7:40 ` [RFC PATCH v3 22/22] arm64: Enable livepatch for ARM64 madvenka 2023-02-02 7:40 ` madvenka 2023-03-01 3:12 ` [RFC PATCH v3 00/22] arm64: livepatch: Use ORC for dynamic frame pointer validation Tomohiro Misono (Fujitsu) 2023-03-01 3:12 ` Tomohiro Misono (Fujitsu) 2023-03-02 16:23 ` Petr Mladek 2023-03-02 16:23 ` Petr Mladek 2023-03-03 9:40 ` Tomohiro Misono (Fujitsu) 2023-03-03 9:40 ` Tomohiro Misono (Fujitsu) 2023-03-06 16:58 ` Madhavan T. Venkataraman 2023-03-06 16:58 ` Madhavan T. Venkataraman 2023-03-06 16:57 ` Madhavan T. Venkataraman 2023-03-06 16:57 ` Madhavan T. Venkataraman 2023-03-23 17:17 ` Mark Rutland 2023-03-23 17:17 ` Mark Rutland 2023-04-08 3:40 ` Madhavan T. Venkataraman 2023-04-08 3:40 ` Madhavan T. Venkataraman 2023-04-11 13:25 ` Mark Rutland 2023-04-11 13:25 ` Mark Rutland 2023-04-12 4:17 ` Josh Poimboeuf 2023-04-12 4:17 ` Josh Poimboeuf 2023-04-12 4:48 ` Madhavan T. Venkataraman 2023-04-12 4:48 ` Madhavan T. Venkataraman 2023-04-12 4:50 ` Madhavan T. Venkataraman 2023-04-12 4:50 ` Madhavan T. Venkataraman 2023-04-12 5:01 ` Josh Poimboeuf 2023-04-12 5:01 ` Josh Poimboeuf 2023-04-12 14:50 ` Madhavan T. Venkataraman 2023-04-12 14:50 ` Madhavan T. Venkataraman 2023-04-12 15:52 ` Josh Poimboeuf 2023-04-12 15:52 ` Josh Poimboeuf 2023-04-13 14:59 ` Madhavan T. Venkataraman 2023-04-13 14:59 ` Madhavan T. Venkataraman 2023-04-13 16:30 ` Josh Poimboeuf 2023-04-13 16:30 ` Josh Poimboeuf 2023-04-15 4:27 ` Madhavan T. Venkataraman 2023-04-15 4:27 ` Madhavan T. Venkataraman 2023-04-15 5:05 ` Josh Poimboeuf 2023-04-15 5:05 ` Josh Poimboeuf 2023-04-15 16:15 ` Madhavan T. Venkataraman 2023-04-15 16:15 ` Madhavan T. Venkataraman 2023-04-16 8:21 ` Indu Bhagat 2023-04-16 8:21 ` Indu Bhagat 2023-04-13 17:04 ` Nick Desaulniers 2023-04-13 17:04 ` Nick Desaulniers 2023-04-13 18:15 ` Jose E. Marchesi 2023-04-13 18:15 ` Jose E. Marchesi 2023-04-15 4:14 ` Madhavan T. Venkataraman 2023-04-15 4:14 ` Madhavan T. Venkataraman 2023-12-14 20:49 ` ARM64 Livepatch based on SFrame Madhavan T. Venkataraman 2023-12-14 20:49 ` Madhavan T. Venkataraman 2023-12-15 13:04 ` Mark Rutland 2023-12-15 13:04 ` Mark Rutland 2023-12-15 15:15 ` Madhavan T. Venkataraman 2023-12-15 15:15 ` Madhavan T. Venkataraman
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=a1b83a8d621e37310194c0c32b9d847a0952d282.camel@gmail.com \ --to=sjitindarsingh@gmail.com \ --cc=broonie@kernel.org \ --cc=catalin.marinas@arm.com \ --cc=chenzhongjin@huawei.com \ --cc=jamorris@linux.microsoft.com \ --cc=jpoimboe@redhat.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=live-patching@vger.kernel.org \ --cc=madvenka@linux.microsoft.com \ --cc=mark.rutland@arm.com \ --cc=nobuta.keiya@fujitsu.com \ --cc=peterz@infradead.org \ --cc=will@kernel.org \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.