From owner-svn-src-all@freebsd.org Thu Dec 10 22:20:21 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7DC234BADCC; Thu, 10 Dec 2020 22:20:21 +0000 (UTC) (envelope-from mhorne@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CsSz938y6z4QnL; Thu, 10 Dec 2020 22:20:21 +0000 (UTC) (envelope-from mhorne@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5F1D4200CD; Thu, 10 Dec 2020 22:20:21 +0000 (UTC) (envelope-from mhorne@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0BAMKLSm097092; Thu, 10 Dec 2020 22:20:21 GMT (envelope-from mhorne@FreeBSD.org) Received: (from mhorne@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0BAMKLrj097091; Thu, 10 Dec 2020 22:20:21 GMT (envelope-from mhorne@FreeBSD.org) Message-Id: <202012102220.0BAMKLrj097091@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mhorne set sender to mhorne@FreeBSD.org using -f From: Mitchell Horne Date: Thu, 10 Dec 2020 22:20:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r368527 - head/sys/riscv/riscv X-SVN-Group: head X-SVN-Commit-Author: mhorne X-SVN-Commit-Paths: head/sys/riscv/riscv X-SVN-Commit-Revision: 368527 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Dec 2020 22:20:21 -0000 Author: mhorne Date: Thu Dec 10 22:20:20 2020 New Revision: 368527 URL: https://svnweb.freebsd.org/changeset/base/368527 Log: riscv: handle debug.debugger_on_trap for fatal page faults Allows recovery or diagnosis of a fatal page fault before panicking the system. Reviewed by: jhb, kp Differential Revision: https://reviews.freebsd.org/D27534 Modified: head/sys/riscv/riscv/trap.c Modified: head/sys/riscv/riscv/trap.c ============================================================================== --- head/sys/riscv/riscv/trap.c Thu Dec 10 21:12:25 2020 (r368526) +++ head/sys/riscv/riscv/trap.c Thu Dec 10 22:20:20 2020 (r368527) @@ -179,6 +179,9 @@ page_fault_handler(struct trapframe *frame, int usermo vm_offset_t va; struct proc *p; int error, sig, ucode; +#ifdef KDB + bool handled; +#endif #ifdef KDB if (kdb_active) { @@ -250,6 +253,15 @@ done: fatal: dump_regs(frame); +#ifdef KDB + if (debugger_on_trap) { + kdb_why = KDB_WHY_TRAP; + handled = kdb_trap(frame->tf_scause & SCAUSE_CODE, 0, frame); + kdb_why = KDB_WHY_UNSET; + if (handled) + return; + } +#endif panic("Fatal page fault at %#lx: %#016lx", frame->tf_sepc, stval); }