From nobody Wed Aug 31 01:32:17 2022 X-Original-To: dev-commits-src-all@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 4MHRVp1mXTz4bqLk; Wed, 31 Aug 2022 01:32:18 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MHRVn6gSfz3CmJ; Wed, 31 Aug 2022 01:32:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661909537; 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=jrvt1KzRWN8QD6PebCYtNcx5B6F2VT07yw4s65nshyc=; b=NBphrW4TXh7zPPAtP4RHF+363BMbfkDxe5k8nwNUt6S3OpGXNEjg4UZgSbzDlP5lzvUaSQ JRa68ZKme99As96KvbMGab02R8J0nuxoE2Vnii3z6u5EjxUcdnMTonnKKSuXZZffdb+Z+T /jVMnkzJDp7y+yYItpP6VLjnx51WGYHAz6I0YByLUkhPDSjFv4z8slnsYYmA8pk0uiU6yk kmyQ150ut71GpppmVoruCi+CsB0yntJMsJ4cVSWYzLGKaStZJ2keCtxgIFCOLDIORl2kcY UtIXqiRHqkxYz82HP81/j7hW+UqtztxnLEOr3Md7K9FtSQyEhXNA+9Sbat0ZvQ== 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 4MHRVn5jlnzy4B; Wed, 31 Aug 2022 01:32:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 27V1WHvv033259; Wed, 31 Aug 2022 01:32:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27V1WHWA033258; Wed, 31 Aug 2022 01:32:17 GMT (envelope-from git) Date: Wed, 31 Aug 2022 01:32:17 GMT Message-Id: <202208310132.27V1WHWA033258@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: d96dc612b363 - stable/13 - x86: print trap name in addition of trap number List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d96dc612b363f2407a0153faa989b4d7f1803a42 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661909537; 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=jrvt1KzRWN8QD6PebCYtNcx5B6F2VT07yw4s65nshyc=; b=V4IzoSdULL2fzsjs8/3gNU4cM4X7zR1rXhK7p+TM0jPVWYt4J8q22Gsin9Yi9jjbkzlrXG bUgmlqTI0FB9UkMJjgPMPYZT4ulVz5fdX+dqrMBEZZ8xYbKI7V8gtnOdMg1wYvFnVzDRf4 4sWZL3vuvErNunuJdpo7kmmCxLRR5zbWkx0wtyHQ9G44vweHdjhUqvBdGOZOm18yHYU7x6 w9hXHQWFiioz8CWCtgkbb6a2pmVhh7mSZjeHBoHD+/HihRLpMZoY0N/8qEQjLhrKDamx0e Li9hCpwxb3YSEyEohsFjnPlsldGTHwuTKjhZACPB/RiAjb25mr2nETu3YiTUGg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661909537; a=rsa-sha256; cv=none; b=XSs2mVgYHkzX1KN1GIxHdZ2mVLSeMWWLZ8w38Du9LC/lyw3jfMsTKyMa9IKO4Z3+B96EPP YRSPO9Bi7pp6K5oNoB/xRsmcFi+Rl3NijfoYOBz4Hl9+4sAKWFr+bwtR1v4MsgVPo0aq/J YKi2ecFmdYuksoZpZcTEEXyimUl3mYENgEu9srrnDKiabipwcFvHj5mrg0rVNspcya+BCt o8foK5GP2dqz8eJGqfBSD2O9J+RkgLp6xV0L/bDTBvL9swzfJO780IDOk2/z+qC4lYXhMn HsfyHExJBKpAkrTsToCTxQIARomuokBr6kgraj8s14UQ7h26IhIA0HWei0Y9ew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=d96dc612b363f2407a0153faa989b4d7f1803a42 commit d96dc612b363f2407a0153faa989b4d7f1803a42 Author: Konstantin Belousov AuthorDate: 2022-08-21 01:46:13 +0000 Commit: Konstantin Belousov CommitDate: 2022-08-31 01:20:28 +0000 x86: print trap name in addition of trap number (cherry picked from commit 01a33b2af534445ef4d417175dc77a27d7575a76) --- sys/amd64/amd64/trap.c | 6 ++++-- sys/i386/i386/trap.c | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c index 271191b785d2..6b4f7df9d174 100644 --- a/sys/amd64/amd64/trap.c +++ b/sys/amd64/amd64/trap.c @@ -275,8 +275,10 @@ trap(struct trapframe *frame) */ if (TRAPF_USERMODE(frame)) { uprintf( - "pid %ld (%s): trap %d with interrupts disabled\n", - (long)curproc->p_pid, curthread->td_name, type); + "pid %ld (%s): trap %d (%s) " + "with interrupts disabled\n", + (long)curproc->p_pid, curthread->td_name, type, + trap_msg[type]); } else { switch (type) { case T_NMI: diff --git a/sys/i386/i386/trap.c b/sys/i386/i386/trap.c index c158ed1d0264..271ef2c3118f 100644 --- a/sys/i386/i386/trap.c +++ b/sys/i386/i386/trap.c @@ -283,8 +283,10 @@ trap(struct trapframe *frame) */ if ((frame->tf_eflags & PSL_I) == 0 && TRAPF_USERMODE(frame) && (curpcb->pcb_flags & PCB_VM86CALL) == 0) - uprintf("pid %ld (%s): trap %d with interrupts disabled\n", - (long)curproc->p_pid, curthread->td_name, type); + uprintf("pid %ld (%s): usermode trap %d (%s) with " + "interrupts disabled\n", + (long)curproc->p_pid, curthread->td_name, type, + trap_data[type].msg); /* * Conditionally reenable interrupts. If we hold a spin lock,