From nobody Sat Apr 19 16:35:34 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 4Zfy123jKzz5t8SB; Sat, 19 Apr 2025 16:35:34 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zfy122pj2z3hyd; Sat, 19 Apr 2025 16:35:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745080534; 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=tK+6FlIlBfSxodCnGsDNXU34Op8/Q4pjyr653b6U9V4=; b=CkU39MqXwbAH/mn6nqeQyEWxshyIjmy9efO/QFo+xr41AuqsUsZ8ZuyK9ESFYRSz4/NLwh Rc/GmEgMTMDIVqVH7JMavfCghDOzYqaql64Guu3q7GtXBA8Tc4Mn4qxyaT592UytvXvNqc wg9jOtdtXmJFSZadqisT/VpEvdUmDiSOx6vgISjaN4hHX2HmFOGy5ZZ1FPvhQiwqnDgyBU VqIGaaJ7xi3BgfiS5LBS5xMrYDjnOW8kpWyeUN4j/CEoOP6A0rL/Palg6f7olv0a21i2yn PSVFQXv4qs6y1NTYuLGQgyXQmUbVHtFGWLMfHXrMwzDnWWPo8icadmDSdxckfw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745080534; a=rsa-sha256; cv=none; b=yJNLgEMh+lTiEpZ6MB21DtyP380WE+ABrKoTgNBX4ne3tws3JHq86jQdS6UXyze8qYL1LG LEpacnteQDZy1JjgwWktoob2NXI6cL7lDqcnEnxjyy5yEsxKwamkOgrOLq6eH+uTFoNSb2 je8oKgWuR7aULLQFEhBMVF1GLaB8k79VmFKHTBUHLwYza/iyw4xv9qzpjYVnBBJP9VJ4DG tSPkq6GU1dCGoDkS8u2CVDVX3dYaj+9p+aI+h4br2A7dujS8kJzw+mZawHkArwL4eb9KK6 YZ9MqQ6Q6f9GvQO0W6+0JPhZeL18taiAf2NCEL6691TiTdj6JxXXOOjO3MPZpA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745080534; 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=tK+6FlIlBfSxodCnGsDNXU34Op8/Q4pjyr653b6U9V4=; b=CrqUKSJecVuf8K9LP9BfHQvMqUdcHmG8vadAt1PkAJRYIHuW7z1c4bhK24aVxPBFSufHnn N6ewyzFWTBmluRPH1Zode2r6jtu0S5N8bSJajejujYNQRjz5x7fExhYKpYuqSRO6iqoiQA xN+puGth6E8Ac/vxLpNR/RQybS0/wkmGWGMHOMS6DlagWBNMSyJvyyktvcptKGt0MG70KW BYBvaFnmIueRJaFqW5XNZcjjLvF1v4M6UQcjVqyFRdgYuQmrpm581nuhfaA4MeTAkOAKEC RgcWAurqrh4rABW0TRzG+In2gfkc8E/fQ3zagiF0mFsBfZUIX9l0jkJM1ydKXQ== 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 4Zfy122QJFzBkw; Sat, 19 Apr 2025 16:35:34 +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 53JGZYw5009878; Sat, 19 Apr 2025 16:35:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53JGZYh3009875; Sat, 19 Apr 2025 16:35:34 GMT (envelope-from git) Date: Sat, 19 Apr 2025 16:35:34 GMT Message-Id: <202504191635.53JGZYh3009875@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Moore Subject: git: bcd96c3180d6 - main - vm_object: reset iter in page_clean 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: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bcd96c3180d640d57e7a7e372457b085d0c9862e Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=bcd96c3180d640d57e7a7e372457b085d0c9862e commit bcd96c3180d640d57e7a7e372457b085d0c9862e Author: Doug Moore AuthorDate: 2025-04-19 16:32:50 +0000 Commit: Doug Moore CommitDate: 2025-04-19 16:32:50 +0000 vm_object: reset iter in page_clean Reset the page iterator unconditionally after busy_acquire(WAITFAIL) fails. Reported by: pho Reported-by: syzbot+b5f9ebf4c2c63a5db681@syzkaller.appspotmail.com Fixes: 9cc73397534e ("vm_page: use iterators in page allocaction") Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D49904 --- sys/vm/vm_object.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c index c696408def20..a1cd01d9fec6 100644 --- a/sys/vm/vm_object.c +++ b/sys/vm/vm_object.c @@ -1065,11 +1065,10 @@ rescan: continue; } if (!vm_page_busy_acquire(p, VM_ALLOC_WAITFAIL)) { + pctrie_iter_reset(&pages); if (object->generation != curgeneration && - (flags & OBJPC_SYNC) != 0) { - pctrie_iter_reset(&pages); + (flags & OBJPC_SYNC) != 0) goto rescan; - } np = vm_radix_iter_lookup_ge(&pages, pi); continue; }