From nobody Thu Oct 24 10:36:37 2024 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 4XZ2QZ1r9pz5bKls; Thu, 24 Oct 2024 10:36:38 +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 4XZ2QY6FVhz4plC; Thu, 24 Oct 2024 10:36:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729766197; 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=JygcN5nMcdkdle9apUQEUCDzFsyfiS8FX0T3m6gW4Ms=; b=V4dSK+L/LNxF5cEUgIF9ToyFxiqYHPnUnnnlvdE0mBcI4VtLX/SzzUvL/uMHDuyPSnErZH Qr8TE4szeWcpHOdJvJNPcVfiw1It5OQy2yZmW5hK730lGjxI/H/7e1QLzDhMDZG/kY7L75 Sj+ay/VWHPgbiV6PptIK0Ovzpeijf+R52EGAFkjUhDFpUOP2UxD9wafKnw+Mv6q81K+Pjo TCuQsOBdomuVDysKy1nOq0EY6yMFoCgPK3K8EAGigg4zKBBENi7+xpQrgMSTWn2Tc5bF4s w0rGtsLq1eWq3q8OmJPGFZYgXMtaWkrkVEcvoiZHc3STjCyEptOP3tiphCB8Hg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729766197; 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=JygcN5nMcdkdle9apUQEUCDzFsyfiS8FX0T3m6gW4Ms=; b=uvNAjgNHDCCddb/OrXPJEZH6Jy9mPR3e5Z/+fFbrJc3a86WbSCK1wuEQv/VFjRALL2HfRe Y4FeibQ/Sq4bwfGHDOOcZaQaTzOkcwtmocxRfe/xedt6yqs0Z8A3quqgDRSdZy+f2R5EUP 071lYToFWgFqOaMoiP5NTY2iRF8pCVUXbsSMp/fMgexleD/ifmXGbnojiBr26BA/xTEXPx D5we8gFp0Dhb1cq/tTIH+yqFvKwYCpo2GrV7Go6qWOZNGT54ajmdQgO9Q+mYaqW3Fw5DTw ZalCrgSsmbw5XKKXOmimGaLN9GGWU8rJjDLsHq+4n8Q5CQ/WrJ7LkscZO0Czcg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729766197; a=rsa-sha256; cv=none; b=Y/WrjcuzsrNZpRVUrkmNUOe/skblMhsTEku/jJQzLZKv3PP2VAmKcBDMyOF7WpNaeU/43D tYq3vbi+efLtqYqKhpbrTgEU7gAFMHanWXvXr7pS17eWeUlDGPgv9jS73h8sblQzc7O1Rt J3fbF922Yoc9clt4AddBLBq/++dQaHVdXH1G6d+yWi27PTyYQgGLmxumfVuriZ87pltO3b ruMrchrKN81EZ4KmAAAqWghGkIZNpxsse9zOPUggzQ3jCo6Ex8+ghiHTflE2p9QSYj3mEz kz6F307rKQVOfBgtSZEhl4caEE1YRTYJGxJWhzR4rBgOVOpBb+R29Vk4sc1aBw== 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 4XZ2QY5r2nzfGW; Thu, 24 Oct 2024 10:36:37 +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 49OAabMW059056; Thu, 24 Oct 2024 10:36:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49OAabtV059053; Thu, 24 Oct 2024 10:36:37 GMT (envelope-from git) Date: Thu, 24 Oct 2024 10:36:37 GMT Message-Id: <202410241036.49OAabtV059053@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: 6204391e99ca - main - arm64: Check TDP_NOFAULTING in a data abort 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: 6204391e99ca4da6a3cbce6b36b02f47da40802c Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=6204391e99ca4da6a3cbce6b36b02f47da40802c commit 6204391e99ca4da6a3cbce6b36b02f47da40802c Author: Andrew Turner AuthorDate: 2024-10-24 09:49:02 +0000 Commit: Andrew Turner CommitDate: 2024-10-24 10:20:48 +0000 arm64: Check TDP_NOFAULTING in a data abort As with other architectures when the TDP_NOFAULTING flag is set we shouldn't panic when td_critnest is non-zero or if the witness check fails. The EFI runtime service functions will soon set this flag to handle exceptions in the services. Reviewed by: markj Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D46815 --- sys/arm64/arm64/trap.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/arm64/arm64/trap.c b/sys/arm64/arm64/trap.c index fa1132305067..d6e316e7ae0a 100644 --- a/sys/arm64/arm64/trap.c +++ b/sys/arm64/arm64/trap.c @@ -338,8 +338,9 @@ data_abort(struct thread *td, struct trapframe *frame, uint64_t esr, td->td_md.md_spinlock_count); } #endif - if (td->td_critnest != 0 || WITNESS_CHECK(WARN_SLEEPOK | - WARN_GIANTOK, NULL, "Kernel page fault") != 0) { + if ((td->td_pflags & TDP_NOFAULTING) == 0 && + (td->td_critnest != 0 || WITNESS_CHECK(WARN_SLEEPOK | + WARN_GIANTOK, NULL, "Kernel page fault") != 0)) { print_registers(frame); print_gp_register("far", far); printf(" esr: 0x%.16lx\n", esr);