From nobody Mon Sep 28 15:39:57 2026 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 4htlqd1nx8z6WqGm for ; Mon, 28 Sep 2026 15:39:57 +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 4htlqd166hz4NFN for ; Mon, 28 Sep 2026 15:39:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790609997; 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=Zv0RLmi2UuPyQ3SK6QpiguvtlPfO4PGov4q8TJmlu+g=; b=BANREMdkdshLvAUJk+5aiUHNejxY75yQhnT3UT63f1dWyiDmmySKuQdfvk5dnywC4VIpUv kW9SRwgDOJynVIrjKCVd4hR9bqXjQS/aPFmvplOEGIC4KNyCZCX6lr7O4noFLMQKUUf3q+ SaH+KwAqugrBqm76pc6yN3GB2u0go48Nlx5KZD7O8eL+0Gtx3bNkslbr+w/43EThG9Mn86 vlhqdy7voP7jEDyHOIHYun3ZLJGJtqPBhGnGCUfl1ivQqRf8O2Kar8mJTYoK4ofInpKMaf S2oooNfCOHqWBskF1RFQKGihDbrW3I4VLr1ZgFRogkSc5CTPO7UCYG1ZmVPEQA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790609997; b=LaaOG0NIdaYShBBqcv+xJPoGI5QU1XC5rC2beyAnScER2cVrd45kXEfJZL2DDe0YZSWlVI kc3yLAZlx28Oc1vIBOWb41UTdfvWqljOfpHqdy7LKpdcMeIzFim5XaABmwMuZOvnGfhQqz az8KkQ9SqbaQmzn9DKCgCdBnKshK4u4FGkQgPKp7UP3bbTTurBRS4coRWfLN1dJsbhipNZ 3HSNF0FRvjxFf39cilpnW0WP8WhIlR3I7g8HB4zB446/NbsOHzM25JeH9B/VCp99GLTdbs LaUkzd6LkHpYPHgRW2iBTNzG/XV2edHjYyo7uHRbFd4ke0DkuKmXRSHEFHVSHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790609997; 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=Zv0RLmi2UuPyQ3SK6QpiguvtlPfO4PGov4q8TJmlu+g=; b=OtmfT1GuUN+zxk1AeaiL4kYUWl6fvEX0UEdgoCv08gX48drTD84pEE3aPApLVExFQ1tyob 306jELvsOhBpie8KVGGW0JXS6xw/l3Oq+3E9FylJOgFsRww3JlEXCdNW8EuyCd9LtuoXJn hpA7+oIrOWizhTyxOEKgBv3l+8Cs9alvO57U+XI911vP74t89VAgGKceHioB8pJs9Q3NfM xQJolk+KoCHqaVrQLFCml72kUCsw5Xi0fzNSbM48nZLGBIcHH7ehGqc+N23O3IeD/IFdDr 9QMeru/Fgm8fFVw/PnYz5mIfq4kYVkpg2CEth3wZglgUBNJAIAQQNjr2v0PyFw== 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 4htlqd063fzYs0 for ; Mon, 28 Sep 2026 15:39:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 23a98 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 28 Sep 2026 15:39:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Minsoo Choo Subject: git: 51b1272fca66 - main - libkvm: route powerpc64 minidumps to minidump backend 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 List-Id: 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/main X-Git-Reftype: branch X-Git-Commit: 51b1272fca667ad4c57d94ca24600bf68f29ebd2 Auto-Submitted: auto-generated Date: Mon, 28 Sep 2026 15:39:57 +0000 Message-Id: <6aba8a4d.23a98.6b0c5885@gitrepo.freebsd.org> The branch main has been updated by mchoo: URL: https://cgit.FreeBSD.org/src/commit/?id=51b1272fca667ad4c57d94ca24600bf68f29ebd2 commit 51b1272fca667ad4c57d94ca24600bf68f29ebd2 Author: Minsoo Choo AuthorDate: 2026-09-16 03:26:34 +0000 Commit: Minsoo Choo CommitDate: 2026-09-28 15:39:46 +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 --- 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()); }