diff options
author | Luis Machado <luis.machado@arm.com> | 2022-05-24 23:31:09 +0100 |
---|---|---|
committer | Luis Machado <luis.machado@arm.com> | 2022-12-16 11:18:32 +0000 |
commit | d88cb738e6a7a7179dfaff8af78d69250c852af1 (patch) | |
tree | c34f73f06cea5177a4763afb73baf2e8a41c68f6 /gdb/gdbarch-gen.h | |
parent | 22a8433e00fd33efcb1fa4961eb826cd97f2cd8b (diff) | |
download | gdb-d88cb738e6a7a7179dfaff8af78d69250c852af1.zip gdb-d88cb738e6a7a7179dfaff8af78d69250c852af1.tar.gz gdb-d88cb738e6a7a7179dfaff8af78d69250c852af1.tar.bz2 |
[aarch64] Fix removal of non-address bits for PAuth
PR gdb/28947
The address_significant gdbarch setting was introduced as a way to remove
non-address bits from pointers, and it is specified by a constant. This
constant represents the number of address bits in a pointer.
Right now AArch64 is the only architecture that uses it, and 56 was a
correct option so far.
But if we are using Pointer Authentication (PAuth), we might use up to 2 bytes
from the address space to store the required information. We could also have
cases where we're using both PAuth and MTE.
We could adjust the constant to 48 to cover those cases, but this doesn't
cover the case where GDB needs to sign-extend kernel addresses after removal
of the non-address bits.
This has worked so far because bit 55 is used to select between kernel-space
and user-space addresses. But trying to clear a range of bits crossing the
bit 55 boundary requires the hook to be smarter.
The following patch renames the gdbarch hook from significant_addr_bit to
remove_non_address_bits and passes a pointer as opposed to the number of
bits. The hook is now responsible for removing the required non-address bits
and sign-extending the address if needed.
While at it, make GDB and GDBServer share some more code for aarch64 and add a
new arch-specific testcase gdb.arch/aarch64-non-address-bits.exp.
Bug-url: https://sourceware.org/bugzilla/show_bug.cgi?id=28947
Approved-By: Simon Marchi <simon.marchi@efficios.com>
Diffstat (limited to 'gdb/gdbarch-gen.h')
-rw-r--r-- | gdb/gdbarch-gen.h | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/gdb/gdbarch-gen.h b/gdb/gdbarch-gen.h index a663316..5918de5 100644 --- a/gdb/gdbarch-gen.h +++ b/gdb/gdbarch-gen.h @@ -626,13 +626,20 @@ typedef CORE_ADDR (gdbarch_addr_bits_remove_ftype) (struct gdbarch *gdbarch, COR extern CORE_ADDR gdbarch_addr_bits_remove (struct gdbarch *gdbarch, CORE_ADDR addr); extern void set_gdbarch_addr_bits_remove (struct gdbarch *gdbarch, gdbarch_addr_bits_remove_ftype *addr_bits_remove); -/* On some machines, not all bits of an address word are significant. - For example, on AArch64, the top bits of an address known as the "tag" - are ignored by the kernel, the hardware, etc. and can be regarded as - additional data associated with the address. */ - -extern int gdbarch_significant_addr_bit (struct gdbarch *gdbarch); -extern void set_gdbarch_significant_addr_bit (struct gdbarch *gdbarch, int significant_addr_bit); +/* On some architectures, not all bits of a pointer are significant. + On AArch64, for example, the top bits of a pointer may carry a "tag", which + can be ignored by the kernel and the hardware. The "tag" can be regarded as + additional data associated with the pointer, but it is not part of the address. + + Given a pointer for the architecture, this hook removes all the + non-significant bits and sign-extends things as needed. It gets used to remove + non-address bits from data pointers (for example, removing the AArch64 MTE tag + bits from a pointer) and from code pointers (removing the AArch64 PAC signature + from a pointer containing the return address). */ + +typedef CORE_ADDR (gdbarch_remove_non_address_bits_ftype) (struct gdbarch *gdbarch, CORE_ADDR pointer); +extern CORE_ADDR gdbarch_remove_non_address_bits (struct gdbarch *gdbarch, CORE_ADDR pointer); +extern void set_gdbarch_remove_non_address_bits (struct gdbarch *gdbarch, gdbarch_remove_non_address_bits_ftype *remove_non_address_bits); /* Return a string representation of the memory tag TAG. */ |