From nobody Sat May 31 19:52:53 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 4b8rPL4n71z5xVQ3; Sat, 31 May 2025 19:52:54 +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 4b8rPK5yRVz3J3p; Sat, 31 May 2025 19:52:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748721173; 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=xw7BUwjZXnLelD1PblH2RRM+hZ/2v3Afox3rMiQYYXQ=; b=Ple9aYW/b4TNnEQHvUcdjj1C2sIM1xDK44YYACIIIoueo2mo4ZUMduSbKgo+aNeNBR34I5 yOlGBFmX676vAxyvR6GUS8/8X47ju5udgzBQYTQn54lboBszS4iNh8rOPMW1cfzjGaXDh8 pi3S+JTW5exuOZfEUdG6HtlJH2m4AaGAG54qRi/zGWA6N5xQzEBa+OB3CBTD5CotelNg87 dxQe8nDRa9RDPEqXjAJ+h7e/dfHMjl9CqDQtCuFSuhq4iVdAdtz3mLWEqOwLCXTlB2WOwE 0SdK5GPNwDaD/20zPnoZD8SBKqVwPAGcaHljPZYQm/u+TpmHIEjF7hPjB/oT/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748721173; 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=xw7BUwjZXnLelD1PblH2RRM+hZ/2v3Afox3rMiQYYXQ=; b=pDDoGfcPg+16wb/a9cwUd5prBNF1rFs6nhopee+GC+la5ylzmq2hajrO1SB5Tzm6Ci5h4M TQq++RPeAVIF1CIgskpccJR7GAbpviB8EbcY1I4WjiRBwVPAabO3K43mQWWsr3GboLkJL4 Wjgm6n2sdz0Ft/1xSqWCK7Oaf4Ixw8SWsjBQGtVcPS6wanEF5qKRbPqMpMdwMoQbTo6MSB QuJcBQc9xv9PMpCF/vXHJClXL6DK3QoycUQObeUI3bglVYYFUOggdbVJ6PsJ2wbvglgtlt lV0H7Qj0+GmTtqOcC673YDN89BQP+y1Qyvl0tkIzhnvq8QxoYFC3cpHreEh7lg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748721173; a=rsa-sha256; cv=none; b=hOhCcxSh4GDV4vDSewkLhkYdK4sT4NELaLOXnFleBNBY8Svk77UwTAD45IvBpb0O0H4ka8 H+9B0hcM2KRthww4YRtfi7Qr6WgfwCmo1jvOCS09a1y0OL/zBrZv1LSzVqLLHtVL+Of+6i /HL9Pg+ZpirD72RFLSTFN+sEIphE+6DxP3OJaLz4UyOLjFCgZ4NvbNina5XQ44K57XRCBR zOA2l7hdxgqbOPu2/t/uV49mh7OkrDGvb9n3mCxc256WhPfvzURtzvEhTvgVWGGBXL+H2Z d8bucUCJ1RH4G4xxUccPAD2JAJgJP4SpXxyVu4Wd+6fclQw4MK5YGUEHq5GAFw== 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 4b8rPK4Cygzs5p; Sat, 31 May 2025 19:52:53 +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 54VJqr3P029767; Sat, 31 May 2025 19:52:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54VJqrKO029764; Sat, 31 May 2025 19:52:53 GMT (envelope-from git) Date: Sat, 31 May 2025 19:52:53 GMT Message-Id: <202505311952.54VJqrKO029764@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 7212b3734593 - main - kinfo_proc: report address of extended kernel error structure 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7212b37345936899e979c63d0b054e114576faa0 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=7212b37345936899e979c63d0b054e114576faa0 commit 7212b37345936899e979c63d0b054e114576faa0 Author: Konstantin Belousov AuthorDate: 2025-05-24 03:37:00 +0000 Commit: Konstantin Belousov CommitDate: 2025-05-31 19:52:41 +0000 kinfo_proc: report address of extended kernel error structure Reviewed by: brooks Sponsored by: The FreeBSD Foundation MFC after: 2 weeks Differential revision: https://reviews.freebsd.org/D50483 --- sys/compat/freebsd32/freebsd32.h | 1 + sys/kern/kern_proc.c | 4 ++++ sys/sys/user.h | 3 ++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/sys/compat/freebsd32/freebsd32.h b/sys/compat/freebsd32/freebsd32.h index 9d7a99535288..9d724c93fee7 100644 --- a/sys/compat/freebsd32/freebsd32.h +++ b/sys/compat/freebsd32/freebsd32.h @@ -419,6 +419,7 @@ struct kinfo_proc32 { uint32_t ki_kstack; uint32_t ki_udata; uint32_t ki_tdaddr; + uint32_t ki_uerrmsg; uint32_t ki_spareptrs[KI_NSPARE_PTR]; /* spare room for growth */ int ki_sparelongs[KI_NSPARE_LONG]; int ki_sflag; diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c index 191143443d42..379fbda619c0 100644 --- a/sys/kern/kern_proc.c +++ b/sys/kern/kern_proc.c @@ -1348,6 +1348,9 @@ fill_kinfo_thread(struct thread *td, struct kinfo_proc *kp, int preferthread) thread_unlock(td); if (preferthread) PROC_STATUNLOCK(p); + + if ((td->td_pflags & TDP2_UEXTERR) != 0) + kp->ki_uerrmsg = td->td_exterr_ptr; } /* @@ -1503,6 +1506,7 @@ freebsd32_kinfo_proc_out(const struct kinfo_proc *ki, struct kinfo_proc32 *ki32) PTRTRIM_CP(*ki, *ki32, ki_tdaddr); CP(*ki, *ki32, ki_sflag); CP(*ki, *ki32, ki_tdflags); + PTRTRIM_CP(*ki, *ki32, ki_uerrmsg); } #endif diff --git a/sys/sys/user.h b/sys/sys/user.h index 0c443672a3b1..f94a91ca1238 100644 --- a/sys/sys/user.h +++ b/sys/sys/user.h @@ -86,7 +86,7 @@ */ #define KI_NSPARE_INT 2 #define KI_NSPARE_LONG 12 -#define KI_NSPARE_PTR 5 +#define KI_NSPARE_PTR 4 #ifndef _KERNEL #ifndef KINFO_PROC_SIZE @@ -212,6 +212,7 @@ struct kinfo_proc { * That way the spare room from both arrays will remain contiguous. */ struct pwddesc *ki_pd; /* pointer to process paths info */ + void *ki_uerrmsg; /* address of the ext err msg place */ void *ki_spareptrs[KI_NSPARE_PTR]; /* spare room for growth */ long ki_sparelongs[KI_NSPARE_LONG]; /* spare room for growth */ long ki_sflag; /* PS_* flags */