From nobody Mon Oct 12 03:59:48 2026 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 4j33dK2b6wz6vNS1 for ; Mon, 12 Oct 2026 03:59:49 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4j33dJ6YTdz4fnR for ; Mon, 12 Oct 2026 03:59:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791777588; 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=eX6ss49fFacj1vNZUDjz76YroxieGfNtzoiLIMXIhvc=; b=qD/rPceZL3Sq/c4X4APgXwZpsikt+LJPF9A3I2ZiaBxLXc7P+U9IjRa5vgVcF3YDsdOqfw nCPqKqv1Z4XNWkO7P+N1gaFMp9Ds+weirL7doESZZ+NVW1K+Ul3Z09qkQBWEyi25ZbANnW PwwAs4MEM9dlIsR8VHNxXCwGgB2ZY+wBowjqM7qVA5rFV+HnRCx65NLnCrYFN9o47ZA6kD 52eO0gYru6TI/SiruP5NwbLGysENwVSULhMNPSsX/y6fVBoCNts5Nbnd3DEem1236x444k hVFlgAtfwEd0/TPdooY3FpKRUBqPXzKbyP3SBJxzO3iDwUOnZh9FURNIT93Wfw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791777588; b=t5YO/c66kKFwoOqruW6kdejGjj3TDVFbB3OK/tfe/vprF9mRdqB1+dLSckFzFH368VL+Tt PojopooLsFHkctY1Z7TQL9suJwT3P01k6TaUsHSvgt5N+rsXyko6c8u80XCgjxzBZMgPYa OJO99F+HY9UncKmIEjth+s6yd+ZKr4/gufmPlpCd5aV2i66862PjIEFgdEhboMVx4ilWQ8 GdUoJfzQI39ukuK+eSghnhr0eDw8aK/1MBjw6waxyYBTiGW6y7XEpsNyZMNjVnshqQVzlx CGci45AIplBPHpQ+xAilDUfJR7KLsMz53BOYPD4kyKjOHaX5SoWTtTjGfhlS4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791777588; 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=eX6ss49fFacj1vNZUDjz76YroxieGfNtzoiLIMXIhvc=; b=xFEOfGW9pYU8rGTulNjeliVThWsPP/0h1tG3Di6xS5LzmhyNHNt9xWIit6hfO/dX1Q08z/ 6XaxNHty1nVqjMv/Tzat95P1QeUe3yk31wKrWrxoF/IjENcxQ8e0Id9J+DTbzrqMJeIktk 8XyP0MJ7Q61dPmWwg7yQEHrgLDvQwws0lyS0oz8I9QW53hlIqtwZlzlVnhMoLeXDDwhTC9 LuIsiFyp5BcKRorGW8QHYWsDxmlpOPcFn8bVkjtIzYhDLnXvmKqhxKqnJYN30ofIteRJJK liXsqlcSkeMdxLLPtpO9muukTJAFE2zVvIFg52S6KeCZnPaIYuv7g0QQyOZrZw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4j33dJ4kCvz19M7 for ; Mon, 12 Oct 2026 03:59:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18415 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 12 Oct 2026 03:59:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Minsoo Choo Subject: git: a73e8c4f2663 - stable/15 - libkvm: route powerpc64 minidumps to minidump backend List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mchoo X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: a73e8c4f2663cc6aababec4ad4115ef05121528c Auto-Submitted: auto-generated Date: Mon, 12 Oct 2026 03:59:48 +0000 Message-Id: <6acc5b34.18415.1e5f1675@gitrepo.freebsd.org> The branch stable/15 has been updated by mchoo: URL: https://cgit.FreeBSD.org/src/commit/?id=a73e8c4f2663cc6aababec4ad4115ef05121528c commit a73e8c4f2663cc6aababec4ad4115ef05121528c Author: Minsoo Choo AuthorDate: 2026-09-16 03:26:34 +0000 Commit: Minsoo Choo CommitDate: 2026-10-12 03:58:14 +0000 libkvm: route powerpc64 minidumps to minidump backend The regular powerpc64 core probes only checked the kernel ELF and thus also matched minidumps. In particular, the powerpc64le probe could claim a minidump before the minidump backend and then reject it as an invalid ELF core. Exclude minidumps from both regular powerpc64 probes and add a regression test that verifies a powerpc64le minidump reaches the minidump parser. Reviewed by: jhibbits Approved by: olce (mentor) Fixes: f4eb39ba6bc9 ("[PowerPC64LE] libkvm powerpc64le support.") MFC after: 2 weeks Sponsored by: FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D59719 (cherry picked from commit 51b1272fca667ad4c57d94ca24600bf68f29ebd2) --- lib/libkvm/kvm_powerpc64.c | 6 ++-- lib/libkvm/tests/kvm_open2_test.c | 67 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+), 2 deletions(-) diff --git a/lib/libkvm/kvm_powerpc64.c b/lib/libkvm/kvm_powerpc64.c index f0292ec8d757..b3dda7becc80 100644 --- a/lib/libkvm/kvm_powerpc64.c +++ b/lib/libkvm/kvm_powerpc64.c @@ -187,7 +187,8 @@ _powerpc64_probe(kvm_t *kd) { return (_kvm_probe_elf_kernel(kd, ELFCLASS64, EM_PPC64) && - kd->nlehdr.e_ident[EI_DATA] == ELFDATA2MSB); + kd->nlehdr.e_ident[EI_DATA] == ELFDATA2MSB && + !_kvm_is_minidump(kd)); } static int @@ -195,7 +196,8 @@ _powerpc64le_probe(kvm_t *kd) { return (_kvm_probe_elf_kernel(kd, ELFCLASS64, EM_PPC64) && - kd->nlehdr.e_ident[EI_DATA] == ELFDATA2LSB); + kd->nlehdr.e_ident[EI_DATA] == ELFDATA2LSB && + !_kvm_is_minidump(kd)); } static int diff --git a/lib/libkvm/tests/kvm_open2_test.c b/lib/libkvm/tests/kvm_open2_test.c index 0ad0b47de948..5f882578c1f2 100644 --- a/lib/libkvm/tests/kvm_open2_test.c +++ b/lib/libkvm/tests/kvm_open2_test.c @@ -24,6 +24,8 @@ */ #include +#include +#include #include #include #include @@ -33,11 +35,61 @@ #include #include #include +#include #include #include "kvm_test_common.h" +static int +unresolved_symbol(const char *name __unused, kvaddr_t *value __unused) +{ + + return (-1); +} + +static void +create_powerpc64le_kernel(const char *path) +{ + Elf64_Ehdr ehdr; + ssize_t n; + int fd; + + memset(&ehdr, 0, sizeof(ehdr)); + memcpy(ehdr.e_ident, ELFMAG, SELFMAG); + ehdr.e_ident[EI_CLASS] = ELFCLASS64; + ehdr.e_ident[EI_DATA] = ELFDATA2LSB; + ehdr.e_ident[EI_VERSION] = EV_CURRENT; + ehdr.e_type = htole16(ET_DYN); + ehdr.e_machine = htole16(EM_PPC64); + ehdr.e_version = htole32(EV_CURRENT); + ehdr.e_ehsize = htole16(sizeof(ehdr)); + + fd = open(path, O_WRONLY | O_CREAT | O_TRUNC, 0600); + ATF_REQUIRE(fd != -1); + n = write(fd, &ehdr, sizeof(ehdr)); + ATF_REQUIRE_EQ(n, (ssize_t)sizeof(ehdr)); + ATF_REQUIRE(close(fd) == 0); +} + +static void +create_invalid_powerpc64_minidump(const char *path) +{ + char buf[PAGE_SIZE]; + ssize_t n; + int fd; + + memset(buf, 0, sizeof(buf)); + memcpy(buf, "minidump FreeBSD/powerpc64", + sizeof("minidump FreeBSD/powerpc64")); + + fd = open(path, O_WRONLY | O_CREAT | O_TRUNC, 0600); + ATF_REQUIRE(fd != -1); + n = write(fd, buf, sizeof(buf)); + ATF_REQUIRE_EQ(n, (ssize_t)sizeof(buf)); + ATF_REQUIRE(close(fd) == 0); +} + ATF_TC_WITHOUT_HEAD(kvm_open2_negative_test_nonexistent_corefile); ATF_TC_BODY(kvm_open2_negative_test_nonexistent_corefile, tc) { @@ -101,6 +153,20 @@ ATF_TC_BODY(kvm_open2_negative_test_invalid_execfile, tc) ATF_REQUIRE_MSG(kd == NULL, "kvm_open2 succeeded unexpectedly"); } +ATF_TC_WITHOUT_HEAD(kvm_open2_powerpc64le_minidump_probe); +ATF_TC_BODY(kvm_open2_powerpc64le_minidump_probe, tc) +{ + kvm_t *kd; + + create_powerpc64le_kernel("kernel"); + create_invalid_powerpc64_minidump("vmcore"); + errbuf_clear(); + kd = kvm_open2("kernel", "vmcore", O_RDONLY, errbuf, + unresolved_symbol); + ATF_REQUIRE_MSG(kd == NULL, "kvm_open2 succeeded unexpectedly"); + ATF_CHECK_MATCH("wrong minidump version", errbuf); +} + ATF_TP_ADD_TCS(tp) { @@ -108,6 +174,7 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, kvm_open2_negative_test_invalid_execfile); ATF_TP_ADD_TC(tp, kvm_open2_negative_test_nonexistent_corefile); ATF_TP_ADD_TC(tp, kvm_open2_negative_test_nonexistent_execfile); + ATF_TP_ADD_TC(tp, kvm_open2_powerpc64le_minidump_probe); return (atf_no_error()); }