From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: qemu-arm@nongnu.org, Pierrick Bouvier <pierrick.bouvier@linaro.org>
Subject: [PATCH v3 69/85] target/arm: Load gcs record for RET
Date: Thu, 14 Aug 2025 22:57:36 +1000 [thread overview]
Message-ID: <20250814125752.164107-70-richard.henderson@linaro.org> (raw)
In-Reply-To: <20250814125752.164107-1-richard.henderson@linaro.org>
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
target/arm/tcg/translate-a64.c | 29 ++++++++++++++++++++++++++++-
1 file changed, 28 insertions(+), 1 deletion(-)
diff --git a/target/arm/tcg/translate-a64.c b/target/arm/tcg/translate-a64.c
index 3a25a24047..e4a298d61d 100644
--- a/target/arm/tcg/translate-a64.c
+++ b/target/arm/tcg/translate-a64.c
@@ -444,6 +444,27 @@ static void gen_add_gcs_record(DisasContext *s, TCGv_i64 value)
tcg_gen_mov_i64(gcspr, addr);
}
+static void gen_load_check_gcs_record(DisasContext *s, TCGv_i64 target,
+ GCSInstructionType it, int rt)
+{
+ TCGv_i64 gcspr = cpu_gcspr[s->current_el];
+ int mmuidx = core_gcs_mem_index(s->mmu_idx);
+ MemOp mop = finalize_memop(s, MO_64 | MO_ALIGN);
+ TCGv_i64 rec_va = tcg_temp_new_i64();
+
+ tcg_gen_qemu_ld_i64(rec_va, clean_data_tbi(s, gcspr), mmuidx, mop);
+
+ if (s->gcs_rvcen) {
+ TCGLabel *fail_label =
+ delay_exception(s, EXCP_UDEF, syn_gcs_data_check(it, rt));
+
+ tcg_gen_brcond_i64(TCG_COND_NE, rec_va, target, fail_label);
+ }
+
+ gen_a64_set_pc(s, rec_va);
+ tcg_gen_addi_i64(gcspr, gcspr, 8);
+}
+
typedef struct DisasCompare64 {
TCGCond cond;
TCGv_i64 value;
@@ -1798,7 +1819,13 @@ static bool trans_BLR(DisasContext *s, arg_r *a)
static bool trans_RET(DisasContext *s, arg_r *a)
{
- gen_a64_set_pc(s, cpu_reg(s, a->rn));
+ TCGv_i64 target = cpu_reg(s, a->rn);
+
+ if (s->gcs_en) {
+ gen_load_check_gcs_record(s, target, GCS_IT_RET_nPauth, a->rn);
+ } else {
+ gen_a64_set_pc(s, target);
+ }
s->base.is_jmp = DISAS_JUMP;
return true;
}
--
2.43.0
next prev parent reply other threads:[~2025-08-14 13:09 UTC|newest]
Thread overview: 87+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-08-14 12:56 [PATCH v3 00/85] target/arm: Implement FEAT_GCS Richard Henderson
2025-08-14 12:56 ` [PATCH v3 01/85] linux-user/aarch64: Split out signal_for_exception Richard Henderson
2025-08-14 12:56 ` [PATCH v3 02/85] linux-user/aarch64: Check syndrome for EXCP_UDEF Richard Henderson
2025-08-14 12:56 ` [PATCH v3 03/85] linux-user/aarch64: Generate ESR signal records Richard Henderson
2025-08-14 12:56 ` [PATCH v3 04/85] target/arm: Add prot_check parameter to pmsav8_mpu_lookup Richard Henderson
2025-08-14 12:56 ` [PATCH v3 05/85] target/arm: Add in_prot_check to S1Translate Richard Henderson
2025-08-14 12:56 ` [PATCH v3 06/85] target/arm: Skip permission check from arm_cpu_get_phys_page_attrs_debug Richard Henderson
2025-08-14 12:56 ` [PATCH v3 07/85] target/arm: Introduce get_phys_addr_for_at Richard Henderson
2025-08-14 12:56 ` [PATCH v3 08/85] target/arm: Skip AF and DB updates for AccessType_AT Richard Henderson
2025-08-14 12:56 ` [PATCH v3 09/85] target/arm: Add prot_check parameter to do_ats_write Richard Henderson
2025-08-14 12:56 ` [PATCH v3 10/85] target/arm: Fill in HFG[RWI]TR_EL2 bits for Arm v9.5 Richard Henderson
2025-08-14 12:56 ` [PATCH v3 11/85] target/arm: Remove outdated comment for ZCR_EL12 Richard Henderson
2025-08-14 12:56 ` [PATCH v3 12/85] target/arm: Implement FEAT_ATS1A Richard Henderson
2025-08-14 12:56 ` [PATCH v3 13/85] target/arm: Add isar feature test for FEAT_S1PIE, FEAT_S2PIE Richard Henderson
2025-08-14 12:56 ` [PATCH v3 14/85] target/arm: Enable TCR2_ELx.PIE Richard Henderson
2025-08-14 12:56 ` [PATCH v3 15/85] target/arm: Implement PIR_ELx, PIRE0_ELx, S2PIR_EL2 registers Richard Henderson
2025-08-14 12:56 ` [PATCH v3 16/85] target/arm: Force HPD for stage2 translations Richard Henderson
2025-08-14 12:56 ` [PATCH v3 17/85] target/arm: Cache NV1 early in get_phys_addr_lpae Richard Henderson
2025-08-14 12:56 ` [PATCH v3 18/85] target/arm: Populate PIE in aa64_va_parameters Richard Henderson
2025-08-14 12:56 ` [PATCH v3 19/85] target/arm: Implement get_S1prot_indirect Richard Henderson
2025-08-14 12:56 ` [PATCH v3 20/85] target/arm: Implement get_S2prot_indirect Richard Henderson
2025-08-14 12:56 ` [PATCH v3 21/85] target/arm: Do not migrate env->exception Richard Henderson
2025-08-14 12:56 ` [PATCH v3 22/85] target/arm: Expand CPUARMState.exception.syndrome to 64 bits Richard Henderson
2025-08-14 12:56 ` [PATCH v3 23/85] target/arm: Expand syndrome parameter to raise_exception* Richard Henderson
2025-08-14 12:56 ` [PATCH v3 24/85] target/arm: Implement dirtybit check for PIE Richard Henderson
2025-08-14 12:56 ` [PATCH v3 25/85] target/arm: Enable FEAT_S1PIE and FEAT_S2PIE on -cpu max Richard Henderson
2025-08-14 12:56 ` [PATCH v3 26/85] include/hw/core/cpu: Introduce MMUIdxMap Richard Henderson
2025-08-14 12:56 ` [PATCH v3 27/85] include/hw/core/cpu: Introduce cpu_tlb_fast Richard Henderson
2025-08-14 12:56 ` [PATCH v3 28/85] include/hw/core/cpu: Invert the indexing into CPUTLBDescFast Richard Henderson
2025-08-14 12:56 ` [PATCH v3 29/85] target/hppa: Adjust mmu indexes to begin with 0 Richard Henderson
2025-08-14 12:56 ` [PATCH v3 30/85] include/exec/memopidx: Adjust for 32 mmu indexes Richard Henderson
2025-08-14 12:56 ` [PATCH v3 31/85] include/hw/core/cpu: Widen MMUIdxMap Richard Henderson
2025-08-14 12:56 ` [PATCH v3 32/85] target/arm: Split out mmuidx.h from cpu.h Richard Henderson
2025-08-14 12:57 ` [PATCH v3 33/85] target/arm: Convert arm_mmu_idx_to_el from switch to table Richard Henderson
2025-08-14 12:57 ` [PATCH v3 34/85] target/arm: Remove unused env argument from regime_el Richard Henderson
2025-08-14 12:57 ` [PATCH v3 35/85] target/arm: Convert regime_el from switch to table Richard Henderson
2025-08-14 12:57 ` [PATCH v3 36/85] target/arm: Convert regime_has_2_ranges " Richard Henderson
2025-08-14 12:57 ` [PATCH v3 37/85] target/arm: Remove unused env argument from regime_is_pan Richard Henderson
2025-08-14 12:57 ` [PATCH v3 38/85] target/arm: Convert regime_is_pan from switch to table Richard Henderson
2025-08-14 12:57 ` [PATCH v3 39/85] target/arm: Remove unused env argument from regime_is_user Richard Henderson
2025-08-14 12:57 ` [PATCH v3 40/85] target/arm: Convert regime_is_user from switch to table Richard Henderson
2025-08-14 12:57 ` [PATCH v3 41/85] target/arm: Convert arm_mmu_idx_is_stage1_of_2 " Richard Henderson
2025-08-14 12:57 ` [PATCH v3 42/85] target/arm: Convert regime_is_stage2 " Richard Henderson
2025-08-14 12:57 ` [PATCH v3 43/85] target/arm: Introduce mmu indexes for GCS Richard Henderson
2025-08-14 12:57 ` [PATCH v3 44/85] target/arm: Introduce regime_to_gcs Richard Henderson
2025-08-14 12:57 ` [PATCH v3 45/85] target/arm: Support page protections for GCS mmu indexes Richard Henderson
2025-08-14 12:57 ` [PATCH v3 46/85] target/arm: Implement gcs bit for data abort Richard Henderson
2025-08-14 12:57 ` [PATCH v3 47/85] target/arm: Add GCS cpregs Richard Henderson
2025-08-14 12:57 ` [PATCH v3 48/85] target/arm: Add GCS enable and trap levels to DisasContext Richard Henderson
2025-08-14 12:57 ` [PATCH v3 49/85] target/arm: Implement FEAT_CHK Richard Henderson
2025-08-14 12:57 ` [PATCH v3 50/85] target/arm: Expand pstate to 64 bits Richard Henderson
2025-08-14 12:57 ` [PATCH v3 51/85] target/arm: Add syndrome data for EC_GCS Richard Henderson
2025-08-14 12:57 ` [PATCH v3 52/85] target/arm: Implement EXLOCKException for ELR_ELx and SPSR_ELx Richard Henderson
2025-08-14 12:57 ` [PATCH v3 53/85] target/arm: Split {arm,core}_user_mem_index Richard Henderson
2025-08-14 12:57 ` [PATCH v3 54/85] target/arm: Introduce delay_exception{_el} Richard Henderson
2025-08-14 12:57 ` [PATCH v3 55/85] target/arm: Emit HSTR trap exception out of line Richard Henderson
2025-08-14 12:57 ` [PATCH v3 56/85] target/arm: Emit v7m LTPSIZE " Richard Henderson
2025-08-14 12:57 ` [PATCH v3 57/85] target/arm: Implement GCSSTR, GCSSTTR Richard Henderson
2025-08-14 12:57 ` [PATCH v3 58/85] target/arm: Implement GCSB Richard Henderson
2025-08-14 12:57 ` [PATCH v3 59/85] target/arm: Implement GCSPUSHM Richard Henderson
2025-08-14 12:57 ` [PATCH v3 60/85] target/arm: Implement GCSPOPM Richard Henderson
2025-08-14 12:57 ` [PATCH v3 61/85] target/arm: Implement GCSPUSHX Richard Henderson
2025-08-14 12:57 ` [PATCH v3 62/85] target/arm: Implement GCSPOPX Richard Henderson
2025-08-14 12:57 ` [PATCH v3 63/85] target/arm: Implement GCSPOPCX Richard Henderson
2025-08-14 12:57 ` [PATCH v3 64/85] target/arm: Implement GCSSS1 Richard Henderson
2025-08-14 12:57 ` [PATCH v3 65/85] target/arm: Implement GCSSS2 Richard Henderson
2025-08-14 12:57 ` [PATCH v3 66/85] target/arm: Add gcs record for BL Richard Henderson
2025-08-14 12:57 ` [PATCH v3 67/85] target/arm: Add gcs record for BLR Richard Henderson
2025-08-14 12:57 ` [PATCH v3 68/85] target/arm: Add gcs record for BLR with PAuth Richard Henderson
2025-08-14 12:57 ` Richard Henderson [this message]
2025-08-14 12:57 ` [PATCH v3 70/85] target/arm: Load gcs record for RET " Richard Henderson
2025-08-14 12:57 ` [PATCH v3 71/85] target/arm: Copy EXLOCKEn to EXLOCK on exception to the same EL Richard Henderson
2025-08-14 12:57 ` [PATCH v3 72/85] target/arm: Implement EXLOCK check during exception return Richard Henderson
2025-08-14 12:57 ` [PATCH v3 73/85] target/arm: Enable FEAT_GCS with -cpu max Richard Henderson
2025-08-14 12:57 ` [PATCH v3 74/85] linux-user/aarch64: Implement prctls for GCS Richard Henderson
2025-08-14 12:57 ` [PATCH v3 75/85] linux-user/aarch64: Allocate new gcs stack on clone Richard Henderson
2025-08-14 12:57 ` [PATCH v3 76/85] linux-user/aarch64: Release gcs stack on thread exit Richard Henderson
2025-08-14 12:57 ` [PATCH v3 77/85] linux-user/aarch64: Implement map_shadow_stack syscall Richard Henderson
2025-08-14 12:57 ` [PATCH v3 78/85] target/arm: Enable GCSPR_EL0 for read in user-mode Richard Henderson
2025-08-14 12:57 ` [PATCH v3 79/85] linux-user/aarch64: Inject SIGSEGV for GCS faults Richard Henderson
2025-08-14 12:57 ` [PATCH v3 80/85] linux-user/aarch64: Generate GCS signal records Richard Henderson
2025-08-14 12:57 ` [PATCH v3 81/85] linux-user: Change exported get_elf_hwcap to abi_ulong Richard Henderson
2025-08-14 12:57 ` [PATCH v3 82/85] linux-user/aarch64: Enable GCS in HWCAP Richard Henderson
2025-08-14 12:57 ` [PATCH v3 83/85] tests/tcg/aarch64: Add gcsstr Richard Henderson
2025-08-14 12:57 ` [PATCH v3 84/85] tests/tcg/aarch64: Add gcspushm Richard Henderson
2025-08-14 12:57 ` [PATCH v3 85/85] tests/tcg/aarch64: Add gcsss Richard Henderson
2025-08-29 23:14 ` [PATCH v3 00/85] target/arm: Implement FEAT_GCS Thiago Jung Bauermann
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=20250814125752.164107-70-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=pierrick.bouvier@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.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: 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).