From nobody Fri Dec 19 09:19:01 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 4dXhmk3TxPz6LBBP for ; Fri, 19 Dec 2025 09:19:02 +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 4dXhmj6bcRz44bq for ; Fri, 19 Dec 2025 09:19:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766135942; 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=Z4t2LQ3iRCRp+49mSR97Kg3vYCioxG3wfSIadPiOyhA=; b=dhWh+BVLDsBZXkTfd4dTRHkE3/ssWQap1pNSui+CDy8HVaRCXDRsZPSTUP9fFzx1XmSa+U zzQVEUXTAbYWZZPaN6oK9rgDCnoJrDLDhuLcD72GzkjqPptfA6m90pLTis3yFgN93i1azu wfENSoF7am1e39+A3QD1c1Jf/MH9qGFG3JHLNK+jCSJ+uShErLhM+Vk0o4a17psIC0iJ8I j2Zmyhp3SM+iH8gjcAMGeEJl+JkGNHapOef+mc0Ld7IPAh/l3fj2wSxra8kyczTPtr+SLG Kre8v98Dsyjzk45iEb8njfae/QRnFCH8/OT5AkvLne3DxtezUZnp0nOv3ItTFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766135942; 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=Z4t2LQ3iRCRp+49mSR97Kg3vYCioxG3wfSIadPiOyhA=; b=IMvt/pmv/F+1wiFVBkK3sY/qynBTnPTUFeRVyBLaVQhIF79ySRVEs87V0TRXg68SIxtxvb L0QKNgMMS6sBtzgAQytWgFYjy0nVuI8YZJV3L2DOy4F/BDhXUAC3mZZeEsNx8+H/4Zm8n+ rpwv5m/2rb2SZEapMgKlnCB64y7ktzEy0KphDIAcIh1pTkiknLLZu6p4PE6TzQhvViSkU4 t5pQ/deHJHKcYmucx2kSPLrUMTgNzq99O1oR3839kOB2qYDbB+K4w6uegLKi9wiV+QPl+F svb8k4DKZqCVht5kcI6bb116C622tO8LuyDKYbPhF+dwW0K/skAVAupb3ry3Iw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766135942; a=rsa-sha256; cv=none; b=JqrD6fL8k0O9U8jZxUQnuYm7Fc+ZU+YJupTugfKgZSI/dij9RGVr1XuU8pfuDMiHsz4jFA JQ9gKXMoywA6p0b3Ox3EoB9dHRBOKL2Yyup34o3jf+l3AVC77NTx5aTs3RBexMxE3GpmVe l2BnziSr322gO++By87NmkBYwHxxSrAISnUxoVzZCmRobtcMa8r+psBj5styF8iExUTDcJ 71wRKvXfH7OM7QbDaTB6PLzkwRwi0vNS0k+sWjnvRnnMu/WEl/jynkkS3bn+ghlPnk8gV4 HPtEOmJWc8YbORR6iPIEkuTJJ4l8ZpqAnzzr14iLStLCIPTRng3RHJqXIjmk1w== 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 4dXhmj5ZPjz1GNK for ; Fri, 19 Dec 2025 09:19:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3de78 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 19 Dec 2025 09:19:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: b987035c2af7 - stable/14 - uma_core: Rely on domainset iterator to wait on M_WAITOK 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: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b987035c2af7adb56f8a89253e09a0f4ead1beb7 Auto-Submitted: auto-generated Date: Fri, 19 Dec 2025 09:19:01 +0000 Message-Id: <69451885.3de78.7a4e9eb3@gitrepo.freebsd.org> The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=b987035c2af7adb56f8a89253e09a0f4ead1beb7 commit b987035c2af7adb56f8a89253e09a0f4ead1beb7 Author: Olivier Certner AuthorDate: 2025-09-08 17:37:35 +0000 Commit: Olivier Certner CommitDate: 2025-12-19 09:16:43 +0000 uma_core: Rely on domainset iterator to wait on M_WAITOK Commit 8b987a77691d ("Use per-domain keg locks.") removed the need to lock the keg entirely, replacing it with per-domain keg locks. In particular, it removed the need to hold a lock over waiting for a domain to grow free memory. Simplify the code of keg_fetch_slab() and uma_prealloc() by removing the M_WAITOK -> M_NOWAIT downgrade and the local call to vm_wait_doms() (which used to necessitate temporary dropping the keg lock) which the iterator machinery already handles on M_WAITOK (and compatibly with vm_domainset_iter_ignore() at that, although that does not matter now). Reviewed by: bnovkov, markj Tested by: bnovkov MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D52441 (cherry picked from commit 781802df7a2bfe224ef17596d56cf83c49517655) --- sys/vm/uma_core.c | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/sys/vm/uma_core.c b/sys/vm/uma_core.c index dbac8cd3db27..4a6413fd1669 100644 --- a/sys/vm/uma_core.c +++ b/sys/vm/uma_core.c @@ -3976,21 +3976,15 @@ restart: /* * Use the keg's policy if upper layers haven't already specified a * domain (as happens with first-touch zones). - * - * To avoid races we run the iterator with the keg lock held, but that - * means that we cannot allow the vm_domainset layer to sleep. Thus, - * clear M_WAITOK and handle low memory conditions locally. */ rr = rdomain == UMA_ANYDOMAIN; + aflags = flags; if (rr) { - aflags = (flags & ~M_WAITOK) | M_NOWAIT; if (vm_domainset_iter_policy_ref_init(&di, &keg->uk_dr, &domain, &aflags) != 0) return (NULL); - } else { - aflags = flags; + } else domain = rdomain; - } for (;;) { slab = keg_fetch_free_slab(keg, domain, rr, flags); @@ -4020,13 +4014,8 @@ restart: if ((flags & M_WAITOK) == 0) break; vm_wait_domain(domain); - } else if (vm_domainset_iter_policy(&di, &domain) != 0) { - if ((flags & M_WAITOK) != 0) { - vm_wait_doms(&keg->uk_dr.dr_policy->ds_mask, 0); - goto restart; - } + } else if (vm_domainset_iter_policy(&di, &domain) != 0) break; - } } /* @@ -5212,7 +5201,7 @@ uma_prealloc(uma_zone_t zone, int items) KEG_GET(zone, keg); slabs = howmany(items, keg->uk_ipers); while (slabs-- > 0) { - aflags = M_NOWAIT; + aflags = M_WAITOK; if (vm_domainset_iter_policy_ref_init(&di, &keg->uk_dr, &domain, &aflags) != 0) panic("%s: Domainset is empty", __func__); @@ -5233,7 +5222,8 @@ uma_prealloc(uma_zone_t zone, int items) break; } if (vm_domainset_iter_policy(&di, &domain) != 0) - vm_wait_doms(&keg->uk_dr.dr_policy->ds_mask, 0); + panic("%s: Cannot allocate from any domain", + __func__); } } }