From nobody Tue Jul 15 12:53:06 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 4bhJyC2ZJPz62Mlm; Tue, 15 Jul 2025 12:53:07 +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 4bhJyB5lFtz3V1V; Tue, 15 Jul 2025 12:53:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752583986; 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=9nyLULf0LJElOSjDTUy2Yktt0gL3I1eL+MoKZLBxSZg=; b=LGgOnKSzZ0WIeNxZdW3qG3LjawX/LrQBmGjsi+bSRlhy6zlK9vsLUTx0oDLSxDdsJwzPGP 7zQ7c4fQ1+CP4EZUn1+OPvzpzMENPgOgrJoXa39F7app0n6zZ/5ttHtgD2h5uoweArOHiT ymmQ91UBNLJ10Gv4+jgYpJYSnJu6mJPYVW7Z3Z3CIho7ah6HMqAc4nX3uBuohariFjbPHf vG4LyEVKKc8QQlIjUFI3S2Obu+o/J+IEIaIVs4oIUYGlqNqq6wPVMKolWOnOov+xHg1OGT OdJiYspWTGf9GaLCDZvdYFKd1pJt/UbJLHh3lnAgortzJgYh7w1EpszgRD/WGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752583986; 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=9nyLULf0LJElOSjDTUy2Yktt0gL3I1eL+MoKZLBxSZg=; b=md5vI8lSmlhTgEI1ZqFyEBbV6URwLeILcMQUyP3hEcz2vj97mNtj9n/e9pLRN6pQyzG/vu uQemqDa7EtOmW7Izs4kbn4v0Ijwv3MYfCwgeysRIw6Cps3CyxPrIHIb7S3hPC/ir89xDpM IEYrsjlH6gIehDhLxmFNLtYSCqTsHkcMyH4NkMAzAW8KNx2GgujlfEQIygC9aB8uCIIRY2 4DZpjt6agVid5tkVMZGZcyc9vFMgBBwNTNX9/1hR0va6JB0OguZcg9dY0/qEvWLDvXpxP5 Z3+p9QQLRK+krL5n3y4O1JDTk1sRD+qGnKxH0n9G9m2wJN3vy75+jkpAZy/HeQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752583986; a=rsa-sha256; cv=none; b=iCZRMe2Nhb9jkD7+GpsAusz5zj+Owc1grmzCKLMWXhFe8j/PiqgKTrhDN8TJukRn+rAaSq Hckxbzs2Qq4ANYsN+P+f57jH+rZ63WTNknoIvtUvIyFm9L7fTNHBs0t3ih3rm3E0JGrlJ0 l3VAzlXDz3vlIhWQoe5X+Oz5TOcT/a0eQrUwzE+tj+qj9IWJ2GnigrY9GDUIvv9PVt2CDb YgajZv2QwsY0QcZbJxnMAZ9GrhACYur5WkTsOoe2uxrbcVQjmgPFqBVCE2SSZyqh9TL29B KQyGNpfDzVjWf6RQ9rXdf7jxh2U8IprFkqa0TBqQkhrCdDG+0kX+zXkVkAt3fw== 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 4bhJyB5LW5zhDZ; Tue, 15 Jul 2025 12:53:06 +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 56FCr6P0045443; Tue, 15 Jul 2025 12:53:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56FCr6wO045440; Tue, 15 Jul 2025 12:53:06 GMT (envelope-from git) Date: Tue, 15 Jul 2025 12:53:06 GMT Message-Id: <202507151253.56FCr6wO045440@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: c8a523690b1a - main - i386: Avoid calling kmem_alloc_contig(M_NEVERFREED) 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c8a523690b1a904344662c5834b713e5fc9e9aad Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=c8a523690b1a904344662c5834b713e5fc9e9aad commit c8a523690b1a904344662c5834b713e5fc9e9aad Author: Mark Johnston AuthorDate: 2025-07-15 00:19:51 +0000 Commit: Mark Johnston CommitDate: 2025-07-15 12:52:14 +0000 i386: Avoid calling kmem_alloc_contig(M_NEVERFREED) vm_page_alloc_contig* don't handle VM_ALLOC_NOFREE. After commit 07297aee35f2 ("vm_page: update comments and KASSERT()s concerning page allocation"), pmap_pdpt_allocf() triggers one of the added assertions, since pdptzone is a NOFREE zone. Simply clear the flag when allocating a slab. It is not worth trying to implement support for the NOFREE allocator here. Reported by: Jenkins Reviewed by: alc, kib Differential Revision: https://reviews.freebsd.org/D51311 --- sys/i386/i386/pmap.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c index 5065b7e61ee8..b44f5e08bbcf 100644 --- a/sys/i386/i386/pmap.c +++ b/sys/i386/i386/pmap.c @@ -876,14 +876,16 @@ __CONCAT(PMTYPE, init_pat)(void) #ifdef PMAP_PAE_COMP static void * -pmap_pdpt_allocf(uma_zone_t zone, vm_size_t bytes, int domain, uint8_t *flags, - int wait) +pmap_pdpt_allocf(uma_zone_t zone, vm_size_t bytes, int domain, uint8_t *sflagsp, + int flags) { /* Inform UMA that this allocator uses kernel_map/object. */ - *flags = UMA_SLAB_KERNEL; + *sflagsp = UMA_SLAB_KERNEL; + /* contig allocations cannot be NEVERFREED */ + flags &= ~M_NEVERFREED; return ((void *)kmem_alloc_contig_domainset(DOMAINSET_FIXED(domain), - bytes, wait, 0x0ULL, 0xffffffffULL, 1, 0, VM_MEMATTR_DEFAULT)); + bytes, flags, 0x0ULL, 0xffffffffULL, 1, 0, VM_MEMATTR_DEFAULT)); } #endif