From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id caC0NbEElGmOej4AWB0awg (envelope-from ) for ; Tue, 17 Feb 2026 01:03:29 -0500 Authentication-Results: simark.ca; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=mz8G3m94; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id D4C8B1E0BA; Tue, 17 Feb 2026 01:03:29 -0500 (EST) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-2.4 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED,RCVD_IN_VALIDITY_CERTIFIED_BLOCKED, RCVD_IN_VALIDITY_RPBL_BLOCKED,RCVD_IN_VALIDITY_SAFE_BLOCKED autolearn=ham autolearn_force=no version=4.0.1 Received: from vm01.sourceware.org (vm01.sourceware.org [38.145.34.32]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id A15DA1E089 for ; Tue, 17 Feb 2026 01:03:28 -0500 (EST) Received: from vm01.sourceware.org (localhost [127.0.0.1]) by sourceware.org (Postfix) with ESMTP id 682B74BAE7CA for ; Tue, 17 Feb 2026 06:03:27 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 682B74BAE7CA Authentication-Results: sourceware.org; dkim=pass (2048-bit key, unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=mz8G3m94 Received: from mail-vk1-xa2f.google.com (mail-vk1-xa2f.google.com [IPv6:2607:f8b0:4864:20::a2f]) by sourceware.org (Postfix) with ESMTPS id E353F4BAE7C5 for ; Tue, 17 Feb 2026 06:01:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E353F4BAE7C5 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linaro.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org E353F4BAE7C5 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::a2f ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1771308075; cv=none; b=Ruk7Zv9DQSMFAh3QC5Uf36aaai0wZJmnrmuYsF2detdl5XS1WKlsUWQb+JL9TqBFao94no4Gqc2K/CE54bcuQLhXYE3DKFyt/1nMbxg5w9VnDQNGKdU3UGwwxcW/fpMqclK2GZBrhcx80NkfdgmEoOtxxNnWBUYC3F7JM/zPJdY= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1771308075; c=relaxed/simple; bh=m52oReywTeL1PBm4gU8xYCOpSioTTD9pPXC4N0AHD0o=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=EX6yd5NEX72TJY8chLui6j7OXr32qoNlVHIgV5il5SZFi27ylEfbEyX52fDz9GXMJD4fqXMsmyvEaXfmD1BH8qMCTwGR3JzkY23gxn9qYLcmYgRi0ShtuvPHpmr3ZXiMB+tRUq5wyNd1ntcIOyHfiHy1ScDBpjTp/M/7wbMiumY= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E353F4BAE7C5 Received: by mail-vk1-xa2f.google.com with SMTP id 71dfb90a1353d-5665171836cso4753054e0c.2 for ; Mon, 16 Feb 2026 22:01:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1771308074; x=1771912874; darn=sourceware.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=migo9CvoXmEazSMm2qXAaS7o1+SP+o+Nj9vBFGMJZoE=; b=mz8G3m94/ZqH5C0OzY5Unq1xRFfFhFZG4Ptm9uhdlfqlObEBtU17IsY50ZtudKDFgz 3vxsQL3wD3M4wnpGbr0YCZa04i7wNSYb4HfVaZJEm7Frpuo+X9eBhBgtU0ndcrXwvsJY iAawNcbTl0r66NZqZ8i4+mFKxpiccGOox3Y7abplqu8E/b/05AKYx7D0H9EAwxCRBMTa 89CYT7SXosdWlxZNyAeSrZkD3r1VQYOUDZLqFCbPq5RGgQ2tzkolGWuKqH/LocIKPC0d r/oOy0OVunIk/p+SK8gukEwi/yajYWGQrGFhpYjMd968Ee3/r1J06zFKVmKNIcHY50Gi Zzgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771308074; x=1771912874; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=migo9CvoXmEazSMm2qXAaS7o1+SP+o+Nj9vBFGMJZoE=; b=svEOzyUnSteq9OA5a/TlEC2wy/puMPgag/14v+arf5mzxa1CNg22b0kUviRE0CETL4 uqbxFKv0yEjrvpcYJR5FHpGyaFv3ipOBIvjGioaL/QcujiiXTtBoDCyXtDgbBwUfFOzi dVMvkBnZvzSTCnpzGalAtk1rtWnHaZwhVFFS036DEHwqVvSLRlR2I3Hy8ZLFR/oRIPLr cWeivxkKVtTaiSFaYzRMyi59AQuGxIcwCiH+Inv+7ACXS+9hfMwAxIh/azH0hpRS1psQ K7TkiWo29HINb/X2C+o8phyvgaGSqcsXSr/LfPS6pRBoSXtFs339RQHHpRJoBSl0uoQA VVvw== X-Gm-Message-State: AOJu0YyHQzE7oD6eYrDyVs2ejS+qAW+s4MjsDu8SIhoO9RZetoEUlOdZ +qI8qtcPXLMJusOKvSSfFoyFwDqDdKfVV5Gz+mlvsGCQDeH8WV8+czc5CJRJ+o23IrQBnY38SNj pRt27 X-Gm-Gg: AZuq6aLF7zY/TyHDXG/1KQsefYiCQIm2LuVCAY53z/5gDuP4KwXiZyA05OudRV+hRmG 7EthQipGt12R26VVtVZD1AKlJxJNaldZ+zIHJqZl6xRDmyZg5dZPI2anlu1+ynlPvpPGbyUqNC1 a6+1e3CerLIYkcZjYMc4bBvQxxnVeuWHT3KZhLkDWGLPR4aJENKh2gho8pYdMBiIsVlpE3U3sYy 9NkEqNHJHCfQH3Gti2FGuOCIDze1eJX9YFdBriTVyLTKmo41PPuplcOLuj3fsymuh+zlxiNViNn /DX3U40gRlvQG6OK5eCCnZBofo4Ghxl1v7JV0u7D44nYDRFZgHcCBg1wQjkbqLyIu8qMmvDuSc3 DawQi2NvPPxF5QV+o5mZTWqyQ3k4n/8nfqiDmZpGl5rKg9Dcy6Kh1qgkVUdSZrUj8T6DCmRAT8h a47jNK+6JGuJ6XSpPkcKlWr2n34TVcvPZX0Q== X-Received: by 2002:a05:6122:8b0e:b0:55b:305b:4e41 with SMTP id 71dfb90a1353d-5676aa6c837mr4157007e0c.18.1771308074156; Mon, 16 Feb 2026 22:01:14 -0800 (PST) Received: from localhost ([2804:14d:7e39:8083:f04c:42e3:5943:38f6]) by smtp.gmail.com with ESMTPSA id 71dfb90a1353d-56767276f8bsm7399577e0c.14.2026.02.16.22.01.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Feb 2026 22:01:13 -0800 (PST) From: Thiago Jung Bauermann To: gdb-patches@sourceware.org Cc: Chris Packham , Luis , Tom Tromey , Simon Marchi Subject: [PATCH v3 1/4] GDB: Add gdb/arch/aarch64-pauth-linux.h Date: Tue, 17 Feb 2026 03:00:59 -0300 Message-ID: <20260217060106.1906312-2-thiago.bauermann@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260217060106.1906312-1-thiago.bauermann@linaro.org> References: <20260217060106.1906312-1-thiago.bauermann@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces~public-inbox=simark.ca@sourceware.org The code supporting Pointer Authentication duplicates the definition of AARCH64_HWCAP_PACA and of AARCH64_LINUX_SIZEOF_PAUTH between GDB and gdbserver, so add new header to host those definitions. Also, rename AARCH64_HWCAP_PACA to HWCAP_PACA and only define it if it isn't already defined by the system headers, as is done for other HWCAP constants. Suggested-by: Luis --- gdb/Makefile.in | 1 + gdb/aarch64-linux-nat.c | 3 ++- gdb/aarch64-linux-tdep.c | 3 ++- gdb/aarch64-linux-tdep.h | 6 ------ gdb/arch/aarch64-pauth-linux.h | 31 +++++++++++++++++++++++++++++++ gdb/arch/aarch64.h | 3 --- gdbserver/linux-aarch64-low.cc | 8 +++----- 7 files changed, 39 insertions(+), 16 deletions(-) create mode 100644 gdb/arch/aarch64-pauth-linux.h diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 2aa95be968ac..8f8a95beccc3 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -1306,6 +1306,7 @@ HFILES_NO_SRCDIR = \ arch/aarch64-insn.h \ arch/aarch64-mte.h \ arch/aarch64-mte-linux.h \ + arch/aarch64-pauth-linux.h \ arch/aarch64-scalable-linux.h \ arch/amd64.h \ arch/amd64-linux-tdesc.h \ diff --git a/gdb/aarch64-linux-nat.c b/gdb/aarch64-linux-nat.c index 028de981588b..d310d3e814b2 100644 --- a/gdb/aarch64-linux-nat.c +++ b/gdb/aarch64-linux-nat.c @@ -53,6 +53,7 @@ #include "arch/aarch64-gcs-linux.h" #include "arch/aarch64-mte-linux.h" +#include "arch/aarch64-pauth-linux.h" #include "nat/aarch64-mte-linux-ptrace.h" #include "arch/aarch64-scalable-linux.h" @@ -1012,7 +1013,7 @@ aarch64_linux_nat_target::read_description () or the streaming vector length, depending on whether streaming mode is active or not. */ features.vq = aarch64_sve_get_vq (tid); - features.pauth = hwcap & AARCH64_HWCAP_PACA; + features.pauth = hwcap & HWCAP_PACA; features.gcs = features.gcs_linux = hwcap & HWCAP_GCS; features.mte = hwcap2 & HWCAP2_MTE; features.tls = aarch64_tls_register_count (tid); diff --git a/gdb/aarch64-linux-tdep.c b/gdb/aarch64-linux-tdep.c index b85c25ecae1d..b5af281d8a40 100644 --- a/gdb/aarch64-linux-tdep.c +++ b/gdb/aarch64-linux-tdep.c @@ -54,6 +54,7 @@ #include "arch/aarch64-gcs-linux.h" #include "arch/aarch64-mte.h" #include "arch/aarch64-mte-linux.h" +#include "arch/aarch64-pauth-linux.h" #include "arch/aarch64-scalable-linux.h" #include "arch-utils.h" @@ -1760,7 +1761,7 @@ aarch64_linux_core_read_description (struct gdbarch *gdbarch, have the correct target description with the correct SVE vector length. */ features.vq = aarch64_linux_core_read_vq_from_sections (gdbarch, abfd); - features.pauth = hwcap & AARCH64_HWCAP_PACA; + features.pauth = hwcap & HWCAP_PACA; features.gcs = features.gcs_linux = hwcap & HWCAP_GCS; features.mte = hwcap2 & HWCAP2_MTE; features.fpmr = hwcap2 & HWCAP2_FPMR; diff --git a/gdb/aarch64-linux-tdep.h b/gdb/aarch64-linux-tdep.h index e926687ff6eb..b99fe91f36bd 100644 --- a/gdb/aarch64-linux-tdep.h +++ b/gdb/aarch64-linux-tdep.h @@ -33,16 +33,10 @@ alignment. */ #define AARCH64_LINUX_SIZEOF_FPREGSET (33 * V_REGISTER_SIZE) -/* The pauth regset consists of 2 X sized registers. */ -#define AARCH64_LINUX_SIZEOF_PAUTH (2 * X_REGISTER_SIZE) - /* The MTE regset consists of a 64-bit register. */ #define AARCH64_LINUX_SIZEOF_MTE_REGSET (8) extern const struct regset aarch64_linux_gregset; extern const struct regset aarch64_linux_fpregset; -/* Matches HWCAP_PACA in kernel header arch/arm64/include/uapi/asm/hwcap.h. */ -#define AARCH64_HWCAP_PACA (1 << 30) - #endif /* GDB_AARCH64_LINUX_TDEP_H */ diff --git a/gdb/arch/aarch64-pauth-linux.h b/gdb/arch/aarch64-pauth-linux.h new file mode 100644 index 000000000000..e973c79c8767 --- /dev/null +++ b/gdb/arch/aarch64-pauth-linux.h @@ -0,0 +1,31 @@ +/* Common Linux target-dependent definitions for AArch64 PAuth. + + Copyright (C) 2019-2026 Free Software Foundation, Inc. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +#ifndef GDB_ARCH_AARCH64_PAUTH_LINUX_H +#define GDB_ARCH_AARCH64_PAUTH_LINUX_H + +/* Feature check for Pointer Authentication Code Extension. */ +#ifndef HWCAP_PACA +#define HWCAP_PACA (1 << 30) +#endif + +/* The pauth regset consists of 2 64-bit registers. */ +#define AARCH64_LINUX_SIZEOF_PAUTH 16 + +#endif /* GDB_ARCH_AARCH64_PAUTH_LINUX_H */ diff --git a/gdb/arch/aarch64.h b/gdb/arch/aarch64.h index 0e9715a4268a..7856d95a93b1 100644 --- a/gdb/arch/aarch64.h +++ b/gdb/arch/aarch64.h @@ -178,9 +178,6 @@ enum aarch64_regnum #define AARCH64_PAUTH_DMASK_HIGH_REGNUM(pauth_reg_base) (pauth_reg_base + 2) #define AARCH64_PAUTH_CMASK_HIGH_REGNUM(pauth_reg_base) (pauth_reg_base + 3) -/* This size is only meant for Linux, not bare metal. QEMU exposes 4 masks. */ -#define AARCH64_PAUTH_REGS_SIZE (16) - #define AARCH64_X_REGS_NUM 31 #define AARCH64_V_REGS_NUM 32 #define AARCH64_SVE_Z_REGS_NUM AARCH64_V_REGS_NUM diff --git a/gdbserver/linux-aarch64-low.cc b/gdbserver/linux-aarch64-low.cc index b19e605f55d6..69aaabc1a8f9 100644 --- a/gdbserver/linux-aarch64-low.cc +++ b/gdbserver/linux-aarch64-low.cc @@ -45,6 +45,7 @@ #include "linux-aarch32-tdesc.h" #include "linux-aarch64-tdesc.h" #include "nat/aarch64-mte-linux-ptrace.h" +#include "arch/aarch64-pauth-linux.h" #include "nat/aarch64-scalable-linux-ptrace.h" #include "tdesc.h" @@ -952,7 +953,7 @@ aarch64_adjust_register_sets (const struct aarch64_features &features) break; case NT_ARM_PAC_MASK: if (features.pauth) - regset->size = AARCH64_PAUTH_REGS_SIZE; + regset->size = AARCH64_LINUX_SIZEOF_PAUTH; break; case NT_ARM_TAGGED_ADDR_CTRL: if (features.mte) @@ -984,9 +985,6 @@ aarch64_adjust_register_sets (const struct aarch64_features &features) } } -/* Matches HWCAP_PACA in kernel header arch/arm64/include/uapi/asm/hwcap.h. */ -#define AARCH64_HWCAP_PACA (1 << 30) - /* Implementation of linux target ops method "low_arch_setup". */ void @@ -1005,7 +1003,7 @@ aarch64_target::low_arch_setup () features.vq = aarch64_sve_get_vq (tid); /* A-profile PAC is 64-bit only. */ - features.pauth = linux_get_hwcap (pid, 8) & AARCH64_HWCAP_PACA; + features.pauth = linux_get_hwcap (pid, 8) & HWCAP_PACA; /* A-profile MTE is 64-bit only. */ features.mte = linux_get_hwcap2 (pid, 8) & HWCAP2_MTE; features.tls = aarch64_tls_register_count (tid);