From nobody Mon May 12 12:50:23 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zwzwb66sYz5w0ks; Mon, 12 May 2025 12:50:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zwzwb3n22z3rFp; Mon, 12 May 2025 12:50:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747054223; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GmKZD624l8jCdxxK0+0wE6k1vlwot6CNVDbgldemuY4=; b=H7W7nLxvxUFX2CBVO2GLkeK8OT5CrG4kf2QWfpgFdK6cDTQGPH6ShZJqIAa47XC/bL7WA4 gFkKVz7tccec6LTtpuIUT4QJcHUpUovt7cla3IXkbCWaG1LLNaQwcDddfonRdonPqT8GmB L05IrFZgWt5qibypRqc2eeU2z2r1SJFh78vzV3n3LDHAr+aHH/sam534PS4uRquSDhKjkh X2ePIwjab6JutX3AwL+fP3hI8MlrfsW+2NA/NHCSvMXw8vuNr9KwN0rYT8aoYIQpnnJpPW 9SKmixmlzO7iqEmk4YjhWIqZDeUSJ1e0g4ELS+DHDdv1gy4RVoXn8pb9onKwRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747054223; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GmKZD624l8jCdxxK0+0wE6k1vlwot6CNVDbgldemuY4=; b=dw+H3jZIj6NM2rHZ5Wcx65m6gmqAeFrG1kconchG5oakFz+dK+6wl6CI/uDnCWQ99MiDk3 UVlPHPopShYFKB5ni6pbUF8atO3yzOIP8UcyTbhCqLKZ78vk+VBUL7ReiIvC165p0R3Coi ygDcC0UurFCMbudLx/vh/PjDVnnalIG0N5pguNy+rq0kKq0kAu4BD9ELE8BGqFyJp+9TEU r8pqdan0Hj/gtOZrEMuVtFqO8T7DsoLIO+BUeNlUYr9qaZR7eDauyE3AcxuxWys1azsOsh L9P1U2Sc22H7CQu269tIx5Ny1yqVseL2NaCoJB47NwUmu70CgoWPbp2gvqsjeQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747054223; a=rsa-sha256; cv=none; b=bjbl6ierYFIaCdB8IsCzNxkofwVe+LEOnL6KUVAQihbAoIYrtanTSBo1mKbu0W8SAjGSBx iRa4zLvkKw3PdoTQeLOCzzn4QjZ59hVg/yo9ybwxv2Z7zgk0BCe+JaBrba4md73wNk6ruc u15ijBHO82NChd9d1wV0wkiUpiQpSPew1S+mmHjvMFJRMQV4ber5C5pGqfyIw7nU1PzpPR S+oWxpj20LrWTYstYtXCijl70H7obvIzx1JUhhIAv89RU721ySNUPZCaQXYb8cTyR3fzNK 4TLwRXJh7TTEAtHj7Gy1qEY8jFmlAtSJnFe1kztn3aRehJ10ZmEoQvCpR4Pc5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zwzwb3C6Cz1Fyv; Mon, 12 May 2025 12:50:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54CCoN0D082932; Mon, 12 May 2025 12:50:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54CCoNYU082928; Mon, 12 May 2025 12:50:23 GMT (envelope-from git) Date: Mon, 12 May 2025 12:50:23 GMT Message-Id: <202505121250.54CCoNYU082928@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 71ca0252dc6d - main - arm64: Split out the 32-bit undef handling List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 71ca0252dc6d75b1f945b32a53ae5cbdb405ce24 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=71ca0252dc6d75b1f945b32a53ae5cbdb405ce24 commit 71ca0252dc6d75b1f945b32a53ae5cbdb405ce24 Author: Andrew Turner AuthorDate: 2025-05-12 11:06:37 +0000 Commit: Andrew Turner CommitDate: 2025-05-12 11:06:37 +0000 arm64: Split out the 32-bit undef handling Rather than checking in the handler if we are in a 32 or 64 bit process have two lists to iterate over. Reviewed by: harry.moulton_arm.com Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D50207 --- sys/arm64/arm64/undefined.c | 40 ++++++++++++++++++++++++++++++++++------ sys/arm64/include/undefined.h | 3 +++ 2 files changed, 37 insertions(+), 6 deletions(-) diff --git a/sys/arm64/arm64/undefined.c b/sys/arm64/arm64/undefined.c index 71c9b689aa78..74b9de49a7ef 100644 --- a/sys/arm64/arm64/undefined.c +++ b/sys/arm64/arm64/undefined.c @@ -88,6 +88,10 @@ struct undef_handler { */ LIST_HEAD(, undef_handler) undef_handlers = LIST_HEAD_INITIALIZER(undef_handlers); +#ifdef COMPAT_FREEBSD32 +LIST_HEAD(, undef_handler) undef32_handlers = + LIST_HEAD_INITIALIZER(undef32_handlers); +#endif static bool arm_cond_match(uint32_t insn, struct trapframe *frame) @@ -150,8 +154,7 @@ gdb_trapper(vm_offset_t va, uint32_t insn, struct trapframe *frame, struct thread *td = curthread; if (insn == GDB_BREAKPOINT || insn == GDB5_BREAKPOINT) { - if (SV_PROC_FLAG(td->td_proc, SV_ILP32) && - va < VM_MAXUSER_ADDRESS) { + if (va < VM_MAXUSER_ADDRESS) { ksiginfo_t ksi; ksiginfo_init_trap(&ksi); @@ -183,8 +186,7 @@ swp_emulate(vm_offset_t va, uint32_t insn, struct trapframe *frame, * swp, swpb only; there are no Thumb swp/swpb instructions so we can * safely bail out if we're in Thumb mode. */ - if (!compat32_emul_swp || !SV_PROC_FLAG(td->td_proc, SV_ILP32) || - (frame->tf_spsr & PSR_T) != 0) + if (!compat32_emul_swp || (frame->tf_spsr & PSR_T) != 0) return (0); else if ((insn & 0x0fb00ff0) != 0x01000090) return (0); @@ -250,8 +252,8 @@ void undef_init(void) { #ifdef COMPAT_FREEBSD32 - install_undef_handler(gdb_trapper); - install_undef_handler(swp_emulate); + install_undef32_handler(gdb_trapper); + install_undef32_handler(swp_emulate); #endif } @@ -267,6 +269,20 @@ install_undef_handler(undef_handler_t func) return (uh); } +#ifdef COMPAT_FREEBSD32 +void * +install_undef32_handler(undef_handler_t func) +{ + struct undef_handler *uh; + + uh = malloc(sizeof(*uh), M_UNDEF, M_WAITOK); + uh->uh_handler = func; + LIST_INSERT_HEAD(&undef32_handlers, uh, uh_link); + + return (uh); +} +#endif + void remove_undef_handler(void *handle) { @@ -289,6 +305,18 @@ undef_insn(struct trapframe *frame) if (ret != 0) return (0); +#ifdef COMPAT_FREEBSD32 + if (SV_PROC_FLAG(curthread->td_proc, SV_ILP32)) { + LIST_FOREACH(uh, &undef32_handlers, uh_link) { + ret = uh->uh_handler(frame->tf_elr, insn, frame, + frame->tf_esr); + if (ret) + return (1); + } + return (0); + } +#endif + LIST_FOREACH(uh, &undef_handlers, uh_link) { ret = uh->uh_handler(frame->tf_elr, insn, frame, frame->tf_esr); if (ret) diff --git a/sys/arm64/include/undefined.h b/sys/arm64/include/undefined.h index 1370a648b17c..104d6e9a8e67 100644 --- a/sys/arm64/include/undefined.h +++ b/sys/arm64/include/undefined.h @@ -58,6 +58,9 @@ MRS_GET(Op2) void undef_init(void); void *install_undef_handler(undef_handler_t); +#ifdef COMPAT_FREEBSD32 +void *install_undef32_handler(undef_handler_t); +#endif void remove_undef_handler(void *); int undef_insn(struct trapframe *);