From nobody Sun Jun 22 03:58:09 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 4bPy9Z2Ssdz5tC7K; Sun, 22 Jun 2025 03:58:10 +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 4bPy9Z0Fvpz3gN9; Sun, 22 Jun 2025 03:58:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750564690; 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=z4heyBoGUor6f9Y2St/8Wg559wTNyj2lm7H/OwTZywg=; b=GjaXKl49LwJUe+q3G5UKzUI4n5zA8sAL5NKLfqtBbnrJS07/UsA7zOYZ4ZNjOA+46ly4w+ UbsIsWDZAGUmeVEizxMNYm66z5QFYNm26EAJmgEP7XZm0rRIZiifZYJ84Fqi9AmTP3hgnf ZBMeNlWRo2TgJ+gk71I0eyUgGBnrFNAMhBdodeCEWeViLjblAARw3tX1N4nxEPvcwlYOfJ B15ttmaXZXOxmQouz3LC4GriEvMfa2gOmNcBMjOtgal1Bp0tBlVoF/kS2O73MtBLlbqsmd cl7FmtXAprW8S38T1kLWS/twXI0wLXs/Eq/w+LWhtuNitHXI73qX+nexAyJ3NQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750564690; 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=z4heyBoGUor6f9Y2St/8Wg559wTNyj2lm7H/OwTZywg=; b=MVRcXwnZMUAXI0FC6yJnajA2XBKQLtZ8bIovTdSognq5aJCbm5LlUr/7gLjdw6l9p+gjzG QOiPAFtlqyHloc9s0Is6y/fs4xQlxIQb1o+p5tpziDV5nwL96uwe/KZU+QPG8Pdg6xXPaN b5xL2ZqqP+/juXzGj6PxLOOnVbgIWDO9Mz8aFBrI+ktPn5U25AUcqe+TX8yxIuefudBeU2 NGM8Rbdt/anvNbncZb2vrrdM5EwQiI9alZsyaFTmDCiTQdV/8CD5v+I65aPTpuAxKkw55D 1o8G+Bm/IR4ox3mxTa+q2w6g9YtDj6Jz4uNA0SuP8O2D2sUncR9bF76wvM0w3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750564690; a=rsa-sha256; cv=none; b=KvdCBk8LF+49S2ujmQVRMAds58rLQePvQnmPylVwiLtJUhpH6HLugPicevx70ySa68Tq/k Fy2hIDz10UWUCm935D/4rCLj6ekuzT1EA8PcbADHjrXuuiJYi+UVOkgnHxZFMS4t8x1pCk N7lY3sGIL9vp42JCwt1NQyOPsO3p3TPZrO+7SD7xsXVfK7o1mpnVMpptJnd/g5aCbZ6/QW oAwg89JK0jWqPGhjrlRDzpy0rQ9muxyUt0ZOf827dWWMAvxP8YD5qEN82hNdGR3vhEGKGF IY2/yfPNlxHfnuf9AgKg9BOcRLntdVkRBKf0Y+7sP3YokQ+QjxD3uj6RM7o6/A== 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 4bPy9Y6lN8z10yh; Sun, 22 Jun 2025 03:58:09 +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 55M3w9jH041006; Sun, 22 Jun 2025 03:58:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55M3w9RE041003; Sun, 22 Jun 2025 03:58:09 GMT (envelope-from git) Date: Sun, 22 Jun 2025 03:58:09 GMT Message-Id: <202506220358.55M3w9RE041003@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ahmad Khalifa Subject: git: 294182256116 - main - sys: provide the kernel's pa when dumping on amd64 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: vexeduxr X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 29418225611689d5dafeff1f0b7e2f170305ca90 Auto-Submitted: auto-generated The branch main has been updated by vexeduxr: URL: https://cgit.FreeBSD.org/src/commit/?id=29418225611689d5dafeff1f0b7e2f170305ca90 commit 29418225611689d5dafeff1f0b7e2f170305ca90 Author: Ahmad Khalifa AuthorDate: 2025-05-21 20:57:33 +0000 Commit: Ahmad Khalifa CommitDate: 2025-06-22 03:49:32 +0000 sys: provide the kernel's pa when dumping on amd64 Provide the kernel's physical address in an ELF section when doing a full memory dump on amd64. This allows libkvm to figure out where the kernel was loaded in physical memory. Reviewed by: markj Approved by: imp (mentor) Pull Request: https://github.com/freebsd/freebsd-src/pull/1706 --- sys/sys/elf_common.h | 4 ++-- sys/x86/include/dump.h | 8 ++++++++ sys/x86/x86/dump_machdep.c | 26 ++++++++++++++++++++++++++ 3 files changed, 36 insertions(+), 2 deletions(-) diff --git a/sys/sys/elf_common.h b/sys/sys/elf_common.h index 1c33b55fc5b6..a5e605624e1e 100644 --- a/sys/sys/elf_common.h +++ b/sys/sys/elf_common.h @@ -554,8 +554,8 @@ typedef struct { #define PT_GNU_EH_FRAME 0x6474e550 #define PT_GNU_STACK 0x6474e551 #define PT_GNU_RELRO 0x6474e552 -#define PT_DUMP_DELTA 0x6fb5d000 /* va->pa map for kernel dumps - (currently arm). */ +#define PT_DUMP_DELTA 0x6fb5d000 /* va->pa map for arm and amd64 kernel + dumps */ #define PT_LOSUNW 0x6ffffffa #define PT_SUNWBSS 0x6ffffffa /* Sun Specific segment */ #define PT_SUNWSTACK 0x6ffffffb /* describes the stack segment */ diff --git a/sys/x86/include/dump.h b/sys/x86/include/dump.h index 7f4caf9e8292..cdd07f32703c 100644 --- a/sys/x86/include/dump.h +++ b/sys/x86/include/dump.h @@ -38,7 +38,11 @@ /* 20 phys_avail entry pairs correspond to 10 pa's */ #define DUMPSYS_MD_PA_NPAIRS 10 +#ifdef __amd64__ +#define DUMPSYS_NUM_AUX_HDRS 1 +#else #define DUMPSYS_NUM_AUX_HDRS 0 +#endif /* How often to check the dump progress bar? */ #define DUMPSYS_PB_CHECK_BITS 24 /* Every 16MB */ @@ -71,12 +75,16 @@ dumpsys_unmap_chunk(vm_paddr_t pa, size_t s, void *va) dumpsys_gen_unmap_chunk(pa, s, va); } +#ifdef __amd64__ +int dumpsys_write_aux_headers(struct dumperinfo *di); +#else static inline int dumpsys_write_aux_headers(struct dumperinfo *di) { return (dumpsys_gen_write_aux_headers(di)); } +#endif static inline int dumpsys(struct dumperinfo *di) diff --git a/sys/x86/x86/dump_machdep.c b/sys/x86/x86/dump_machdep.c index 866247610c07..71598e2c9808 100644 --- a/sys/x86/x86/dump_machdep.c +++ b/sys/x86/x86/dump_machdep.c @@ -37,6 +37,13 @@ #include #include +#ifdef __amd64__ +#include +#include +#include +#include +#endif + int do_minidump = 1; SYSCTL_INT(_debug, OID_AUTO, minidump, CTLFLAG_RWTUN, &do_minidump, 0, "Enable mini crash dumps"); @@ -52,3 +59,22 @@ dumpsys_map_chunk(vm_paddr_t pa, size_t chunk, void **va) *va = pmap_kenter_temporary(trunc_page(a), i); } } + +#ifdef __amd64__ +int +dumpsys_write_aux_headers(struct dumperinfo *di) +{ + Elf_Phdr phdr; + + phdr.p_type = PT_DUMP_DELTA; + phdr.p_flags = PF_R; + phdr.p_offset = 0; + phdr.p_vaddr = KERNBASE; + phdr.p_paddr = kernphys; + phdr.p_filesz = 0; + phdr.p_memsz = 0; + phdr.p_align = KERNLOAD; + + return (dumpsys_buf_write(di, (char *)&phdr, sizeof(phdr))); +} +#endif