From nobody Mon May 12 12:50:18 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 4ZwzwW0Lz9z5w0Sj; Mon, 12 May 2025 12:50:19 +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 4ZwzwV6vSFz3rNL; Mon, 12 May 2025 12:50:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747054219; 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=g0ZjNwuwDG0EC5Jyo1Z12h8r50SJSXpNvKYXzPV9UKI=; b=DiPp3QxuEsGhPyEgsRhpqCy9rbYDueCIZjCqvVCbLTVV/qSfQO7y2lDyNp/Fo07oN/hpgL on3C1wI8GH2mQ5/wgvoYgTCK6wIPQM88amFwjoGdtoBuIj5D+d49sY24KMshfAGwXaandh AFsJIJ6dMBHpJP5thtMANUtl5ZE9Ds7VTFRpDiGYFOSWBljnPeF5AOGd0KUdPix299qb+t yMfBgJGtD2UlwanIQWsPnj4Yvke8e7ymt24CfhHVBs8vAlDiyGHKapPhPE+yBvndukbL5L UzeSU+jagycN07CXRlFqqPzP7YwqfrqSeaVm/y90GHARFWk0BjmVyp49cUmLUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747054219; 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=g0ZjNwuwDG0EC5Jyo1Z12h8r50SJSXpNvKYXzPV9UKI=; b=DrLy1vBrLhWB5TmhcvaIGN3eMKtLBudNxecm/fhaLYTaH4bcXVPu0SWfQYrUWjm7WYBQiL u6JXlYji62/AiwCJLlvq0KB7hks3V+z9HsElJhgQyTwjHGWdmw7uP0rl0TLu3FBOugIFXU ssWPRkhEogRbRI5oc6IIlXYklrOcTaYlpRR15RW0SH8GIZ02qDoNIlht8HOFb7sTpirQdo VfGMnuvq0xEZIV6jpFqTNFA4cflgqXKZr/V7U6Dp6drlfcv62Kp4p43UTnMUlE+VyP8H63 PmLzwBOYFD4tMXkYJkVqkVUlKdnoQPe9XDZ2A2p4eO3Uu3fKGVqaEOenaK0rNA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747054219; a=rsa-sha256; cv=none; b=LOw9Sj495RXhziLYpTmqQLu/mH0KQ6XpgBqc29lnj/WZrqHNYN5+yXafMhtRxjaMPekd5f pRt4eqN1IvSCwZvh1IOBHJcSboq18NdXnmn2FN/Q+cUfG6pG6DMhLaxvPImBxdz+nwYVgl JW3teXj7slKauLX2t1e89+wGgWzrOpuxfyO0W74Ot0rmAgYgF33qIa0WGkdst8AaK2jD7D M5ZLxXZUnLSsERqzA9rrhA0h+h4b8J1kzDW1o6qH+ucyAjNjKmoNxRG6vGSZz/T1aRWTmw HGxrA9WJfoRzkPoNZb6G5dL5kXsiJDkbarLZlFmEkqcV9K+U9ib3wDNNKAdy5g== 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 4ZwzwV6VvYz1G4H; Mon, 12 May 2025 12:50:18 +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 54CCoIHo082790; Mon, 12 May 2025 12:50:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54CCoIhW082787; Mon, 12 May 2025 12:50:18 GMT (envelope-from git) Date: Mon, 12 May 2025 12:50:18 GMT Message-Id: <202505121250.54CCoIhW082787@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: 8bfb456eafd3 - main - arm64: Raise a SIGILL if we fail reading an insn 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: 8bfb456eafd34e2de89d2fb77af7a1d34474ca0d Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=8bfb456eafd34e2de89d2fb77af7a1d34474ca0d commit 8bfb456eafd34e2de89d2fb77af7a1d34474ca0d Author: Andrew Turner AuthorDate: 2025-05-12 11:04:05 +0000 Commit: Andrew Turner CommitDate: 2025-05-12 11:04:05 +0000 arm64: Raise a SIGILL if we fail reading an insn When reading an instruction we may fail if another thread is unmapping a page while the current thread is executing from it. In this case raise a SIGILL rather than panicing the kernel. Reviewed by: harry.moulton_arm.com Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D50203 --- sys/arm64/arm64/undefined.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/arm64/arm64/undefined.c b/sys/arm64/arm64/undefined.c index c307281ea523..cdd2a083ec17 100644 --- a/sys/arm64/arm64/undefined.c +++ b/sys/arm64/arm64/undefined.c @@ -322,8 +322,9 @@ undef_insn(u_int el, struct trapframe *frame) if (el == 0) { ret = fueword32((uint32_t *)frame->tf_elr, &insn); + /* Raise a SIGILL if we are unable to read the instruction */ if (ret != 0) - panic("Unable to read userspace faulting instruction"); + return (0); } else { insn = *(uint32_t *)frame->tf_elr; }