From nobody Fri Nov 28 00:44:51 2025 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 4dHZM73vz7z6JWg2 for ; Fri, 28 Nov 2025 00:44:51 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dHZM73C5Rz45hh for ; Fri, 28 Nov 2025 00:44:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764290691; 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=yEaKhBjwCJLKeugK0xsYirmktfSnWEOLMOcAm6xvVgQ=; b=Vno2lOxS+DlaKm58I/wlQv4DXmz97KBCKi+gDWqXhQ9ralcbvkt5todhdPB2cYawvIMMgt prtrKzSc59E+BxgAeH4kx6uddtdoEbcmjvOz5Y687bNtfPxZh0qujhpUemfLLNNYSFXy/3 1ip2N5auS3bKJTfNfl8kLUAleMma0OL4Cmz3fd3DOOSVFfz6/qO/FGg3r3+yMc5JUpk2kV cEUur3Vj64lXJcTnRpb/gTEImXw1sjL8XU6Ds1cmyF+TdiFYKxqz/aeUUComi2TUrIpT5a RF8wAl9iEbDUGxcz/NAgqBPp6tpRnx6PgOAOk/Fa6juK4hkwjFc0wADx+C314A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764290691; 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=yEaKhBjwCJLKeugK0xsYirmktfSnWEOLMOcAm6xvVgQ=; b=agfDBbrkICbvu9PLcAH6WaRFY9khJe6D0s9XgGCwB7jBtHzuVK8psZpGEsggHXA5ieVM+U v7v0AsENDljc7VWh90PFBerxS6rOb6kRJBwMzHYz/Kz5g7kDuWh7uo527yL7IcYoWWZV54 dkkz46FA5g7eGzybc0195/tZoygxb+auQTjatXVSX+YLlrgdi7E1sHJjb1L5NQBOZBBq9I /4EiBAe/KgPA3Ng+kW2Z/nuMR6V+RVyDes5g6VqvI32hUK2/P6cqQh4UmFcN+0Uub9dMVc /yrt/mNcSXgk6z7EtKZJbZn9di6dzQSDsanNFp4v6eWgIf1iz8Zbv6f/rUU77A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764290691; a=rsa-sha256; cv=none; b=aauieTrUWYynEEgwMoU1DP80McyrVH+o2dHFpjfsOQ6ue8h396BX0k4rQ+bCeJ/Bd3vHXO LTwJcKnMLGwsMHR/Xe5YfdpGudQFukcNdreYk09ax9sCkw8rFyhyr5ZzToMctpGL9B66H1 LvziIw/GphFQyjhDX87Q4zzNpi6NYDaHtqHEKqNZP+GJ80+N7AUcFG3FHw/zMmyFLFxNNx 5VCpeMgoShKZdrNwYaOexENoXycECpjsz7w2uveNkyrB4D95ra4MlBeezEGDpTNsOTcYh+ SxHSSglDDxzGvwEQ4BtWY3Xx80WRenjLSwmx3cydvhq2Gah+kzne8Cv0lsNTvg== 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 4dHZM726vkzgPZ for ; Fri, 28 Nov 2025 00:44:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25e4f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 28 Nov 2025 00:44:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 452052e82708 - stable/15 - vm_page_free_prep(): convert PG_ZERO zeroed page check to use sf_buf List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/stable/15 X-Git-Reftype: branch X-Git-Commit: 452052e82708bf130bcd0d5a12af88abb7581a5a Auto-Submitted: auto-generated Date: Fri, 28 Nov 2025 00:44:51 +0000 Message-Id: <6928f083.25e4f.670caf11@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=452052e82708bf130bcd0d5a12af88abb7581a5a commit 452052e82708bf130bcd0d5a12af88abb7581a5a Author: Konstantin Belousov AuthorDate: 2025-11-21 08:57:17 +0000 Commit: Konstantin Belousov CommitDate: 2025-11-28 00:44:15 +0000 vm_page_free_prep(): convert PG_ZERO zeroed page check to use sf_buf (cherry picked from commit b9fc7628dbb24b55cbb8791c83bd69f73cfadf23) --- sys/vm/vm_extern.h | 3 +++ sys/vm/vm_page.c | 32 +++++++++++++++++++++++++------- 2 files changed, 28 insertions(+), 7 deletions(-) diff --git a/sys/vm/vm_extern.h b/sys/vm/vm_extern.h index 1fd6518cf4ed..d0e005088745 100644 --- a/sys/vm/vm_extern.h +++ b/sys/vm/vm_extern.h @@ -164,5 +164,8 @@ vm_addr_ok(vm_paddr_t pa, vm_paddr_t size, u_long alignment, return (vm_addr_align_ok(pa, alignment) && vm_addr_bound_ok(pa, size, boundary)); } + +extern bool vm_check_pg_zero; + #endif /* _KERNEL */ #endif /* !_VM_EXTERN_H_ */ diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index 16878604fa11..b39d665f9e0f 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -84,6 +84,7 @@ #include #include #include +#include #include #include #include @@ -145,6 +146,13 @@ SYSCTL_ULONG(_vm_stats_page, OID_AUTO, nofreeq_size, CTLFLAG_RD, &nofreeq_size, 0, "Size of the nofree queue"); +#ifdef INVARIANTS +bool vm_check_pg_zero = false; +SYSCTL_BOOL(_debug, OID_AUTO, vm_check_pg_zero, CTLFLAG_RWTUN, + &vm_check_pg_zero, 0, + "verify content of freed zero-filled pages"); +#endif + /* * bogus page -- for I/O to/from partially complete buffers, * or for paging into sparsely invalid regions. @@ -4050,14 +4058,24 @@ vm_page_free_prep(vm_page_t m) */ atomic_thread_fence_acq(); -#if defined(DIAGNOSTIC) && defined(PHYS_TO_DMAP) - if (PMAP_HAS_DMAP && (m->flags & PG_ZERO) != 0) { - uint64_t *p; +#ifdef INVARIANTS + if (vm_check_pg_zero && (m->flags & PG_ZERO) != 0) { + struct sf_buf *sf; + unsigned long *p; int i; - p = (uint64_t *)PHYS_TO_DMAP(VM_PAGE_TO_PHYS(m)); - for (i = 0; i < PAGE_SIZE / sizeof(uint64_t); i++, p++) - KASSERT(*p == 0, ("vm_page_free_prep %p PG_ZERO %d %jx", - m, i, (uintmax_t)*p)); + + sched_pin(); + sf = sf_buf_alloc(m, SFB_CPUPRIVATE | SFB_NOWAIT); + if (sf != NULL) { + p = (unsigned long *)sf_buf_kva(sf); + for (i = 0; i < PAGE_SIZE / sizeof(*p); i++, p++) { + KASSERT(*p == 0, + ("zerocheck failed page %p PG_ZERO %d %jx", + m, i, (uintmax_t)*p)); + } + sf_buf_free(sf); + } + sched_unpin(); } #endif if ((m->oflags & VPO_UNMANAGED) == 0) {