From nobody Sat Dec 13 13:22:57 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1764880584; cv=none; d=zohomail.com; s=zohoarc; b=EUUckdBSeROhbORqA7BJTPztT5DzjIexQrQfPHRNnMHIaOOv9B+Me5sTLLMCWx4z9zwVDjymLvNEXHCs3Nh5Ik4ztHCLgoxOeR49A2kMT2eRp+x6NX61iC6g7T13kwVgmX9DjK9jj5lHaY7+HN3rGTDCIF8boZCyG1wxH8lW0w0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764880584; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=ADXnR0TbdNMzWQdMQoPHqGEf2r7+AjyVPKeqyWdpADM=; b=X+hu04pKpuKvvdvE7AiZrlgpaRZi72ly2OB+8AuGJ+PYdnXZJRzn2xTpOx+eGgLqPvoSuQf2LTv32ANHoXIqrRcQutZxSnP6/ZejkWyXb6TJqB9cW+YZdl9ULS5w5sSPfqK0LFX83dPe9LZhZsU5Bvhr4qT4mOzOZ1v8ZHr0/Z4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1764880584808820.4541507896719; Thu, 4 Dec 2025 12:36:24 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vRG3I-0002Ua-Tz; Thu, 04 Dec 2025 15:35:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vRG3H-0002TJ-9s for qemu-devel@nongnu.org; Thu, 04 Dec 2025 15:35:47 -0500 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vRG3F-0006Nv-Dp for qemu-devel@nongnu.org; Thu, 04 Dec 2025 15:35:47 -0500 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-47118259fd8so13644265e9.3 for ; Thu, 04 Dec 2025 12:35:45 -0800 (PST) Received: from draig.lan ([185.126.160.19]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4792b157783sm51248535e9.5.2025.12.04.12.35.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Dec 2025 12:35:43 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 46B625F7E9; Thu, 04 Dec 2025 20:35:42 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1764880544; x=1765485344; darn=nongnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=ADXnR0TbdNMzWQdMQoPHqGEf2r7+AjyVPKeqyWdpADM=; b=OrVC74NYiIhmE3dnhryQzg0JXIaXdRI3gdSwdnCQBLcG3qMTM5VRAFJE48vSC9N+gk IYkaatS55oABPdfzc19AzDgA9e81kqNyIW3amg94lWkTM+5dQyvtEZf1AoCPPJdszuRq LafSdIf/EpnIEWvRNlkkxGtbXxNFg8OFf/jIwuReM7F9c5uCAHVBpNDvCeH8stqPxCDP hdrWsqhEytBCba7UNR62D4BzU2PbatkwYpZxkHWh05OaZStX3iQJI9/H/63/u1nfrOQs PXISAl267IrhoIinDAMAMeG+hCoMo+y/Sahnfwd5+M8ar3v+iDwpeBF6oPVGq9lP/ous eUhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764880544; x=1765485344; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=ADXnR0TbdNMzWQdMQoPHqGEf2r7+AjyVPKeqyWdpADM=; b=Q7WA26qoMpc6H9p+SxLNw+B3oHwLJXeSN5ZCQU0VoWIPZATnrjxWl5w/fY52GLSEL8 tzBHlGrHiRW26w8fxp/BA2DHwEzSiGHFFLZAYVvUETsmbD19mAr4zIKFDeOu3bD6sN9q e7SV29UCUlz9xymRnrvXGfm68nqQe0BLlv4dB2grqQyvr6twdt3CGjQn+3NDM8+iaSUR JPW7TtSpBebfL2HdkPv46zW3gQit50RgK/8OZ3L2qixP5CLWKNdjbBD9m+yxEQm60MMi 7h+HWvCijPORFqo8w2no3l//+avKBxcHYxN4PdRizpnqGvgWT198psnfOtCayEWE0Ofy N8LA== X-Gm-Message-State: AOJu0YzcVdic5skVlLzt08v0gHS8KVzCTZ4sRDjr98uXxf2l6N/0KVm1 NggcUDKIymWWEL8yKaWB6lZf3Tmq/V4RrZBZ1lln99ElLtSx5/60dPq9jWvtnHUdfzs= X-Gm-Gg: ASbGncsjQZpTk5+0bREsxMAsYqSEbH/pxscT/CamNpPv0USkj0HCfKMbjGXzSn3YEzo Do/vRkdGDLmOYa2UNPTRaY2Tbvf6V6aW0PReAZrx83E2SVsnTR9KW9gN6MPnsGLgj4fJGaHCiaQ CYOzp7Fv4J2Wvfx5lwVJnLodEMCyYm5+sKQaF/OJCCdPRrkeWVpD+fIGfrHffX72y7fDEIo9vnt na3Qyf2QsnFvYNdwzbr7ISx4ISsTJ+jniQ5S3sH9NN49tEAKR6H1E9Dcgpl24yQDitJhFQjlo5c G9SXC8yfVUf1sbz4jHzJdH6RwRwi1AmDGar+KCsveYSsPx2rOJsYRDRkCw0tM0xMQeMCbz5Pu83 4mJbvkQDu0MveFdT3v21ijYG6IHMA8PSU+P9vNBELk9WC+WmcfkvBWhKzA2JrZ99kMJXYt5tIWM i2hwhnzlOQnEE= X-Google-Smtp-Source: AGHT+IEpubWCIp7iEu65iFT7ZYXVrQ/bGONIMjX5RRVsbTOh3QysnqHaoJAO9IFlnVVnxVADCKks8A== X-Received: by 2002:a05:600c:1d1d:b0:477:abea:9028 with SMTP id 5b1f17b1804b1-4792f24418bmr44440775e9.6.1764880543664; Thu, 04 Dec 2025 12:35:43 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Jessica Clarke , Peter Maydell , qemu-arm@nongnu.org (open list:ARM TCG CPUs) Subject: [PATCH v3] target/arm: handle unaligned PC during tlb probe Date: Thu, 4 Dec 2025 20:35:40 +0000 Message-ID: <20251204203540.1381896-1-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1764880587520019200 PC alignment faults have priority over instruction aborts and we have code to deal with this in the translation front-ends. However during tb_lookup we can see a potentially faulting probe which doesn't get a MemOp set. If the page isn't available this results in EC_INSNABORT (0x20) instead of EC_PCALIGNMENT (0x22). As there is no easy way to set the appropriate MemOp in the instruction fetch probe path lets just detect it in arm_cpu_tlb_fill_align() ahead of the main alignment check. We also teach arm_deliver_fault to deliver the right syndrome for MMU_INST_FETCH alignment issues. Fixes: https://gitlab.com/qemu-project/qemu/-/issues/3233 Tested-by: Jessica Clarke Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Richard Henderson --- v2 - don't mess with MemOp for alignment check - expand arm_deliver_fault to pick up alignment issues v3 - update commit message --- target/arm/tcg/tlb_helper.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/target/arm/tcg/tlb_helper.c b/target/arm/tcg/tlb_helper.c index f1983a5732e..5c689d3b69f 100644 --- a/target/arm/tcg/tlb_helper.c +++ b/target/arm/tcg/tlb_helper.c @@ -250,7 +250,11 @@ void arm_deliver_fault(ARMCPU *cpu, vaddr addr, fsr =3D compute_fsr_fsc(env, fi, target_el, mmu_idx, &fsc); =20 if (access_type =3D=3D MMU_INST_FETCH) { - syn =3D syn_insn_abort(same_el, fi->ea, fi->s1ptw, fsc); + if (fi->type =3D=3D ARMFault_Alignment) { + syn =3D syn_pcalignment(); + } else { + syn =3D syn_insn_abort(same_el, fi->ea, fi->s1ptw, fsc); + } exc =3D EXCP_PREFETCH_ABORT; } else { bool gcs =3D regime_is_gcs(core_to_arm_mmu_idx(env, mmu_idx)); @@ -346,11 +350,18 @@ bool arm_cpu_tlb_fill_align(CPUState *cs, CPUTLBEntry= Full *out, vaddr address, } =20 /* - * Per R_XCHFJ, alignment fault not due to memory type has - * highest precedence. Otherwise, walk the page table and - * and collect the page description. + * PC alignment faults should be dealt with at translation time + * but we also need to catch them while being probed. + * + * Then per R_XCHFJ, alignment fault not due to memory type take + * precedence. Otherwise, walk the page table and and collect the + * page description. + * */ - if (address & ((1 << memop_alignment_bits(memop)) - 1)) { + if (access_type =3D=3D MMU_INST_FETCH && !cpu->env.thumb && + (address & 3)) { + fi->type =3D ARMFault_Alignment; + } else if (address & ((1 << memop_alignment_bits(memop)) - 1)) { fi->type =3D ARMFault_Alignment; } else if (!get_phys_addr(&cpu->env, address, access_type, memop, core_to_arm_mmu_idx(&cpu->env, mmu_idx), --=20 2.47.3