From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lf1-x135.google.com (mail-lf1-x135.google.com [IPv6:2a00:1450:4864:20::135]) by sourceware.org (Postfix) with ESMTPS id 5542C3858D32 for ; Wed, 5 Oct 2022 02:07:42 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 5542C3858D32 Authentication-Results: sourceware.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=google.com Received: by mail-lf1-x135.google.com with SMTP id 25so13360061lft.9 for ; Tue, 04 Oct 2022 19:07:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date; bh=ZiAhzif2Jhtx0lG/qHYV0WQf0sLPzVBukY3aJbElGns=; b=X/3r4F+nCssPYTSxKQ667nVPMNE0Ab4/z3vnV0WviloYgcPNX16YRfHRtQXTB55n03 ZE2BTpBeUGSL6sGZssg4dzce8eE0RGWMgIQeqhHBTIE6s6DcVJjAYOtp0goAfdDfFAU8 TQ8xjqG/oqFPkAFtkUbBqPOHeih+3QbnDoztCks4lVXNae0sXzUWH3hf6OgyFSjpFiRK QvC+ejS5jkauXaRZ/FyQU/+GKY6q0dVhXvgmdWTPiWwR8yXcBix3L0c8zGS6TFOdossQ SI/1ZFR4mGLdcAy1rSGjLztVLF8rNk+y1css+MqSr3vOEh3VvOPyB3lyiJtNup8vpVns jj/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date; bh=ZiAhzif2Jhtx0lG/qHYV0WQf0sLPzVBukY3aJbElGns=; b=IW/WFyIvQWizDCBB18ZJ4ECDv1wg5dILu+abpoz61T7ljCzbhbbo0yR3pA/TRtdnKi F0b9Yl6FOmoJvS6PiHkgWaOdIF9eKJN2YsfWU7zRlXpP0A4UKfxtDSOvkSoIKg58Qams zabWy0XuDiNoFdvMu8MSvPtEhjcv6VGSQIxFgkHzCfyTsGOW3yaE5roJAgp3qgX64Amh +sSSRq/Ij67j+kZMkZxvNmfgOBswMv5G4il9e5C4rpruv9Lz00kpQ+6HzQZ9//uHcdvQ ahB5vaKlDPntuua8011Y+rKEr30j9u2miksiCXBADhVzSXfZBPPtaOMAFahSP2/E8c+J UrmA== X-Gm-Message-State: ACrzQf1qiERO/20Cqt79t1EsRDouM5b32sDwh48wEKumAzx8ntvDFpcG cEYcPRCxedhXnKiME/pkli3aBmC3AyZd1WnzGgl9YWVw+Yo= X-Google-Smtp-Source: AMsMyM7onsE+eyCkIkpThhUIbRZZkTiUYNGC0sB5pnvDUI4Ov21ij1b8CXwRF0uuUTjf0r6Ki13sTiZPEg6mi7aOEdU= X-Received: by 2002:a05:6512:110f:b0:4a2:697f:c39a with SMTP id l15-20020a056512110f00b004a2697fc39amr161359lfg.685.1664935660727; Tue, 04 Oct 2022 19:07:40 -0700 (PDT) MIME-Version: 1.0 References: <20220928025057.188075-1-koudai@google.com> <5f2703cf-c2f3-493a-e756-e0546f117aed@arm.com> In-Reply-To: <5f2703cf-c2f3-493a-e756-e0546f117aed@arm.com> From: Koudai Iwahori Date: Wed, 5 Oct 2022 10:07:29 +0800 Message-ID: Subject: Re: [PATCH] AArch64 pauth: Fix internal error when target supports extra regs To: Luis Machado Cc: gdb-patches@sourceware.org Content-Type: multipart/alternative; boundary="000000000000a2357b05ea400aa5" X-Spam-Status: No, score=-25.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,ENV_AND_HDR_SPF_MATCH,GIT_PATCH_0,HTML_MESSAGE,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP,USER_IN_DEF_DKIM_WL,USER_IN_DEF_SPF_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Message-ID: <20221005020729.xO6vjrogA3OjYVG9-yuWnBnOQKeRL8weLcAvNTR6hI8@z> --000000000000a2357b05ea400aa5 Content-Type: text/plain; charset="UTF-8" Hi Luis, It worked, thank you! I'm using OpenOCD. OpenOCD provides registers like ELR_EL1. On Tue, Oct 4, 2022 at 5:27 PM Luis Machado wrote: > Hi, > > This should be addressed by > https://sourceware.org/pipermail/gdb-patches/2022-October/192272.html. > > Could you please give it a try? It was pushed yesterday. > > Out of curiosity, are you using user-mode QEMU? You mentioned extra > registers, and those are usually > provided by emulators. > > On 9/28/22 03:50, Koudai Iwahori via Gdb-patches wrote: > > GDB crashes in aarch64_pseudo_register_type() when target supports pauth > > and extra registers. > > When the target supports pauth, GDB keeps a pseudo register `RA_STATE` > > and aarch64_gdbarch_tdep::ra_sign_state_regnum has the integer index of > > the register. > > aarch64_gdbarch_tdep::ra_sign_state_regnum is initialized to > > (# of reg) + (# of pseudo reg) right after GDB checking if the target > > supports the core/fpu/sve registers. > > However, the number of registers is updated in tdesc_use_registers() if > > the target can provide extra registers. > > In such cases, ra_sign_state_regnum does not have the right value and > > internal_error() in aarch64_pseudo_register_type() fires. > > I added ra_sign_state_pseudo_regnum field to aarch64_gdbarch_tdep for > > storing the pseudo register number and added get_ra_sign_state_regnum > > member function. > > --- > > gdb/aarch64-tdep.c | 23 ++++++++++++----------- > > gdb/aarch64-tdep.h | 8 +++++++- > > 2 files changed, 19 insertions(+), 12 deletions(-) > > > > diff --git a/gdb/aarch64-tdep.c b/gdb/aarch64-tdep.c > > index 7229b53838e..87335ad22ae 100644 > > --- a/gdb/aarch64-tdep.c > > +++ b/gdb/aarch64-tdep.c > > @@ -254,7 +254,8 @@ aarch64_frame_unmask_lr (aarch64_gdbarch_tdep *tdep, > > { > > if (tdep->has_pauth () > > && frame_unwind_register_unsigned (this_frame, > > - tdep->ra_sign_state_regnum)) > > + tdep->get_ra_sign_state_regnum ( > > + get_frame_arch > (this_frame)))) > > { > > int cmask_num = AARCH64_PAUTH_CMASK_REGNUM > (tdep->pauth_reg_base); > > CORE_ADDR cmask = frame_unwind_register_unsigned (this_frame, > cmask_num); > > @@ -542,7 +543,7 @@ aarch64_analyze_prologue (struct gdbarch *gdbarch, > > > > if (tdep->has_pauth () && cache != nullptr) > > { > > - int regnum = tdep->ra_sign_state_regnum; > > + int regnum = tdep->get_ra_sign_state_regnum (gdbarch); > > cache->saved_regs[regnum].set_value (ra_state_val); > > } > > } > > @@ -882,7 +883,7 @@ aarch64_analyze_prologue_test (void) > > > > if (tdep->has_pauth ()) > > { > > - int regnum = tdep->ra_sign_state_regnum; > > + int regnum = tdep->get_ra_sign_state_regnum (gdbarch); > > SELF_CHECK (cache.saved_regs[regnum].is_value ()); > > } > > } > > @@ -1137,7 +1138,8 @@ aarch64_prologue_prev_register (struct frame_info > *this_frame, > > lr = frame_unwind_register_unsigned (this_frame, > AARCH64_LR_REGNUM); > > > > if (tdep->has_pauth () > > - && cache->saved_regs[tdep->ra_sign_state_regnum].is_value ()) > > + && cache->saved_regs[tdep->get_ra_sign_state_regnum (gdbarch)] > > + .is_value ()) > > lr = aarch64_frame_unmask_lr (tdep, this_frame, lr); > > > > return frame_unwind_got_constant (this_frame, prev_regnum, lr); > > @@ -1344,7 +1346,7 @@ aarch64_dwarf2_frame_init_reg (struct gdbarch > *gdbarch, int regnum, > > /* Init pauth registers. */ > > if (tdep->has_pauth ()) > > { > > - if (regnum == tdep->ra_sign_state_regnum) > > + if (regnum == tdep->get_ra_sign_state_regnum (gdbarch)) > > { > > /* Initialize RA_STATE to zero. */ > > reg->how = DWARF2_FRAME_REG_SAVED_VAL_EXP; > > @@ -2255,7 +2257,7 @@ aarch64_dwarf_reg_to_regnum (struct gdbarch > *gdbarch, int reg) > > if (tdep->has_pauth ()) > > { > > if (reg == AARCH64_DWARF_RA_SIGN_STATE) > > - return tdep->ra_sign_state_regnum; > > + return tdep->get_ra_sign_state_regnum (gdbarch); > > } > > > > return -1; > > @@ -2662,7 +2664,7 @@ aarch64_pseudo_register_name (struct gdbarch > *gdbarch, int regnum) > > /* RA_STATE is used for unwinding only. Do not assign it a name - > this > > prevents it from being read by methods such as > > mi_cmd_trace_frame_collected. */ > > - if (tdep->has_pauth () && regnum == tdep->ra_sign_state_regnum) > > + if (tdep->has_pauth () && p_regnum == > tdep->ra_sign_state_pseudo_regnum) > > return ""; > > > > internal_error (__FILE__, __LINE__, > > @@ -2698,7 +2700,7 @@ aarch64_pseudo_register_type (struct gdbarch > *gdbarch, int regnum) > > && p_regnum < AARCH64_SVE_V0_REGNUM + AARCH64_V_REGS_NUM) > > return aarch64_vnv_type (gdbarch); > > > > - if (tdep->has_pauth () && regnum == tdep->ra_sign_state_regnum) > > + if (tdep->has_pauth () && p_regnum == > tdep->ra_sign_state_pseudo_regnum) > > return builtin_type (gdbarch)->builtin_uint64; > > > > internal_error (__FILE__, __LINE__, > > @@ -2732,7 +2734,7 @@ aarch64_pseudo_register_reggroup_p (struct gdbarch > *gdbarch, int regnum, > > && p_regnum < AARCH64_SVE_V0_REGNUM + AARCH64_V_REGS_NUM) > > return group == all_reggroup || group == vector_reggroup; > > /* RA_STATE is used for unwinding only. Do not assign it to any > groups. */ > > - if (tdep->has_pauth () && regnum == tdep->ra_sign_state_regnum) > > + if (tdep->has_pauth () && p_regnum == > tdep->ra_sign_state_pseudo_regnum) > > return 0; > > > > return group == all_reggroup; > > @@ -3598,8 +3600,7 @@ aarch64_gdbarch_init (struct gdbarch_info info, > struct gdbarch_list *arches) > > tdep->jb_elt_size = 8; > > tdep->vq = vq; > > tdep->pauth_reg_base = first_pauth_regnum; > > - tdep->ra_sign_state_regnum = (feature_pauth == NULL) ? -1 > > - : ra_sign_state_offset + num_regs; > > + tdep->ra_sign_state_pseudo_regnum = ra_sign_state_offset; > > tdep->mte_reg_base = first_mte_regnum; > > tdep->tls_regnum = tls_regnum; > > > > diff --git a/gdb/aarch64-tdep.h b/gdb/aarch64-tdep.h > > index d8513023c37..acb69b2dc40 100644 > > --- a/gdb/aarch64-tdep.h > > +++ b/gdb/aarch64-tdep.h > > @@ -94,7 +94,13 @@ struct aarch64_gdbarch_tdep : gdbarch_tdep_base > > } > > > > int pauth_reg_base = 0; > > - int ra_sign_state_regnum = 0; > > + int ra_sign_state_pseudo_regnum = -1; > > + > > + int get_ra_sign_state_regnum (gdbarch *gdbarch) const > > + { > > + gdb_assert (ra_sign_state_pseudo_regnum >= 0); > > + return ra_sign_state_pseudo_regnum + gdbarch_num_regs (gdbarch); > > + } > > > > /* Returns true if the target supports pauth. */ > > bool has_pauth () const > > --000000000000a2357b05ea400aa5--