From nobody Sat Nov 14 15:49:00 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 4jRdpN4JXhz71J5P for ; Sat, 14 Nov 2026 15:49:00 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jRdpN3pTDz4XCm for ; Sat, 14 Nov 2026 15:49:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794671340; 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=LjfURNENXrm0QeDHnmRewt3oyCWLW1ZaDagFQ5KraJc=; b=UxBEfOOvPb+kNi2+ywWWC5awZk6cWZJ6h3Z36fxcEIcbibIyR9rCrkx5ypXh1Oxhxo8luy ZqTrQ33K25PBDu5g51yvbzA+C6vHFlDcaSRxVzwuG6Xp31NVWPVkJU+qTf2vPaGWkLaPWo v0t1vgzoXaKpI+zoDuRwDasSKggrx+6s/bzEmJESKshbO1M2/TyzKn+DheeDMFoQi7wgAr 92+DjC875s9K35jZ5RWYFUaEu86EHXCfze52PmnVdd9JUXZMmpldHcvd1IQv08jdqoqmJz 4CaPcPvhtivDW50iFhxZ6kCVj0GDge0yyyJNhGsZ8dh3tffjT/5gKPy7+mmSNA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794671340; b=FsXK/JTB4zAk0Tqr0cCnyCpYRQxM7eyyutC8/cZ4MtJpBsNk+1y075V9XbPbiGscdnXt2+ xryD6nG6MYWaFR8wpsfTH+N9IIUzKrSg13yIQ3V7dfx09qqKxvWxBcx8885obpzfxEvQti dgXjKFhDm0B8pHjz7k3YN+ILubjnww0q5JZNmKdsqPSVBZZS+01YemfX1kWpkwhGnpuvOI I9PjsbMBIsDyQumF66RuK4jVoX3Bo2ZaxUD0YY4O+xncwXj/INy6tyIGLl+CCoRKhi2P8S RMI800xVDkijkOeG3iAGYQTWjKYHCDnPf6wQNe4qzhdoUIGtxhlyaCWG3dwdXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794671340; 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=LjfURNENXrm0QeDHnmRewt3oyCWLW1ZaDagFQ5KraJc=; b=HJ78crABA6obG3zwVWDvOCNP+nDqlcXyW43lusYsDovCTGLMApgGcfxv7YeGOiXE8bM72E cbqh+WfXaFVTNfvYQPr49rtP2bE73mBagr1hTvv3gFaMFIQlVXMrToEChMGPD0ZDOwDX9R 26jHXcgvmJCAmERYftRuS7g6g8Mm2gxy3DGUFpbGm7xSBJmdMQuSv9yD9JMVaO4lRDCgVh la3dMtd6rdmwNVzCsr1eNWvaGbCybHbYvUlL+38F3LlUJ975J7sz/z9SsZ0KadTkaG3peT BAT/e0VwnAYg8woYOaHA833Qh4lFQXaeoLpIcS0I+VdJYiojbDax+NAgtVNdfg== 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 4jRdpN394PzR9P for ; Sat, 14 Nov 2026 15:49:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 14111 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 14 Nov 2026 15:49:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: a904bf4a0e7a - stable/15 - tests: Add test for vn_io_fault1 bug List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: a904bf4a0e7a847f885f308fbe096416dff6ab70 Auto-Submitted: auto-generated Date: Sat, 14 Nov 2026 15:49:00 +0000 Message-Id: <6af882ec.14111.460abe9f@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=a904bf4a0e7a847f885f308fbe096416dff6ab70 commit a904bf4a0e7a847f885f308fbe096416dff6ab70 Author: Dag-Erling Smørgrav AuthorDate: 2026-11-13 00:46:50 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-11-14 15:46:27 +0000 tests: Add test for vn_io_fault1 bug This bug was fixed in b487aca48535, but I did not have a regression test ready for it at the time. The test allocates a large buffer, faults part of it in and leaves the rest unmapped, then tries to read a 3 GiB file into it. If the bug is present, the read succeeds, but the return value exceeds the requested amount by exactly one page less than the amount that was prefaulted. PR: 298159 MFC after: 1 week Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D61475 (cherry picked from commit ba02bbbe86aeca0c95c8e7d12c1be357ebb3ddeb) tests: Improve vn_io_fault1 test * Declare that the test needs 4 GB of memory so it can be automatically skipped on systems with low memory. * Switch back to mmap() as in my initial prototype. Using malloc() is simpler, but on systems with malloc debugging enabled, malloc() will prefault the entire buffer, resulting in a false positive. Using mmap() also guarantees that the buffer is page-aligned, which renders the test determinstic: we now only need to prefault exactly 2 GB, and the difference between ret and len will be exactly the amount that we prefaulted. * To prefault the buffer, instead of a simple loop that writes zeroes to it, which a compiler might recognize as dead stores and eliminate, read the first INT_MAX bytes from the file into it. PR: 298159 Fixes: ba02bbbe86ae ("tests: Add test for vn_io_fault1 bug") Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D61508 (cherry picked from commit c5cff3df96c35aa3613c083f151e853b532d88cb) --- tests/sys/kern/Makefile | 3 ++ tests/sys/kern/vn_io_fault1.c | 66 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+) diff --git a/tests/sys/kern/Makefile b/tests/sys/kern/Makefile index 0221c5c56c0a..f337327c4d67 100644 --- a/tests/sys/kern/Makefile +++ b/tests/sys/kern/Makefile @@ -81,6 +81,9 @@ ATF_TESTS_C+= waitpid_nohang ATF_TESTS_C+= pdeathsig ATF_TESTS_C+= sigsys TEST_METADATA.sigsys+= is_exclusive="true" +.if ${MACHINE_ARCH:M*64*} +ATF_TESTS_C+= vn_io_fault1 +.endif ATF_TESTS_SH+= coredump_phnum_test ATF_TESTS_SH+= logsigexit_test diff --git a/tests/sys/kern/vn_io_fault1.c b/tests/sys/kern/vn_io_fault1.c new file mode 100644 index 000000000000..eabb35d2c9be --- /dev/null +++ b/tests/sys/kern/vn_io_fault1.c @@ -0,0 +1,66 @@ +/*- + * Copyright (c) 2026 Dag-Erling Smørgrav + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#include + +#include +#include +#include +#include +#include +#include + +ATF_TC(big_unmapped_read); +ATF_TC_HEAD(big_unmapped_read, tc) +{ + atf_tc_set_md_var(tc, "descr", "Read a large amount of data " + "into a partially unmapped buffer"); + atf_tc_set_md_var(tc, "require.memory", "4G"); +} +ATF_TC_BODY(big_unmapped_read, tc) +{ + char *buf; + size_t len = 3LU << 30; + ssize_t ret; + int fd; + + /* allocate a large buffer */ + buf = mmap(NULL, len, PROT_READ | PROT_WRITE, MAP_ANON, -1, 0); + if (buf == MAP_FAILED) + atf_tc_skip("failed to allocate buffer"); + + /* create a large file */ + fd = open("big", O_RDWR | O_CREAT | O_TRUNC, 0600); + ATF_REQUIRE(fd >= 0); + ATF_REQUIRE_EQ_MSG(0, ftruncate(fd, len), + "failed to extend file: %m"); + + /* read part of the file into the buffer */ + ATF_REQUIRE_EQ(0, lseek(fd, 0, SEEK_SET)); + ret = read(fd, buf, INT_MAX); + ATF_REQUIRE_MSG(ret >= 0, + "failed to read from file: %m"); + ATF_REQUIRE_EQ_MSG(INT_MAX, (size_t)ret, + "requested %zu bytes, got %zd", (size_t)INT_MAX, ret); + + /* read the entire file into the buffer */ + ATF_REQUIRE_EQ(0, lseek(fd, 0, SEEK_SET)); + ret = read(fd, buf, len); + ATF_REQUIRE_MSG(ret >= 0, + "failed to read from file: %m"); + ATF_REQUIRE_EQ_MSG(len, (size_t)ret, + "requested %zu bytes, got %zd", len, ret); + + /* done */ + ATF_CHECK_EQ(0, close(fd)); + ATF_CHECK_EQ(0, munmap(buf, len)); +} + +ATF_TP_ADD_TCS(tp) +{ + ATF_TP_ADD_TC(tp, big_unmapped_read); + return (atf_no_error()); +}