From nobody Thu Apr 21 13:21:16 2022 X-Original-To: dev-commits-src-branches@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 89C44199EEEE; Thu, 21 Apr 2022 13:21:16 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KkdTm2Z7Fz4Y0j; Thu, 21 Apr 2022 13:21:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650547276; 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=w4AnFcOr7x+jR+J2uagyTVitgHnfY/BecoHYcIq3Ge4=; b=djAaIpWBTBSlgSP4j0LWTYiS5OxmkxxHh5oQ1cdKgwQJHQdMUP8deshOAsaglLuK5yTn9f Cu4TmMhxDZ1eYjwuWYIhWC6GLgmv+5EMb1kgbbzu0xp+SM5Apt8uSejiikaun486Mlwtva ZNZ181eR4u98VjP/oZDSBqipysD86dRsw9oeGFjaeXFhW3a+TVx/HtsNu3S8UT9wzXKuKi BagZmSX1kB0jexqAbO2CqzXpUIwPCHeWNd9CNK0wS61yxm1h26zK+XOQr07fIxa39zR1A8 lDhzp+c5aL2PW7kO3rAimWCQvuNC12kGocsjyCZ6sg6vT8zHl6ZLVOYLBatxzg== 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 205AA1519; Thu, 21 Apr 2022 13:21:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23LDLGAm070386; Thu, 21 Apr 2022 13:21:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23LDLGXr070385; Thu, 21 Apr 2022 13:21:16 GMT (envelope-from git) Date: Thu, 21 Apr 2022 13:21:16 GMT Message-Id: <202204211321.23LDLGXr070385@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 11eac05a40a5 - stable/13 - vm: Move the "vm_wait in early boot" assertion to the proper place List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 11eac05a40a5b14f65dad67a65aca39f28d969a6 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650547276; 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=w4AnFcOr7x+jR+J2uagyTVitgHnfY/BecoHYcIq3Ge4=; b=ub29erzCee9CqBnc97yhOVPR5cAo6bloHs/OeUDaPf+rl8tGIMP1feX3lT2HmuY9KthDPD YNzHk33Rc5qku0w2EqspM64N2nDqnw5hQe3ShcxXn23J5VRNRYOOGIuJegvai6+j7wYtbZ icx4obFbVQzNh/SeQgtIrrYXu+STqFK0j6o4E00Y4UI7S51DCZlpTlBR8OuOyIyekyROel 3Jfv++G+NArDTXaW1p2AxIZRbQD3C20Qag5lV3NUCyDSIDBJvy5LbpINyS1DADO1xezUTs cRIbDGM7aMYUXbY41+7MKHdLC8m/i8kOdQL6wLWMe9PzLwk2iBV/SXAcVbOxsg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650547276; a=rsa-sha256; cv=none; b=Q6GLUy0kqWYrIGqfjaCPyqJlabZNOIWtA9J/emuo3oXlD8jdF+3uE90PU5r7EcjvbcHROE lwiQYf90PaynbNPwkKuTNcVlNrRt3Q30kThgKWLDrUcusLpfwyJFf52mEdz9TDJR/e2dEp o89eRDK5eVkhV3Xp/QPI1lvgbrSCT718lBLRcvFuDmT+6BGefx0XUKx59LgxJR0VwwiH35 Psulh/SOpHSlKPEuFRUIhw/N8QIE+MLj0yirRHSj/235A9ZdowQqTBfP6EQhTmUXYAIEHD JpWjBUt2akl4lKu8eqggDK/sI9qM1A+BdYgPd96ub8Fo1Vddn1jkbXauz/jzTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=11eac05a40a5b14f65dad67a65aca39f28d969a6 commit 11eac05a40a5b14f65dad67a65aca39f28d969a6 Author: Mark Johnston AuthorDate: 2022-04-14 19:45:54 +0000 Commit: Mark Johnston CommitDate: 2022-04-21 13:18:14 +0000 vm: Move the "vm_wait in early boot" assertion to the proper place The assertion was added in commit 1771e987ca6a. After that, vm_wait() and friends were refactored such that the actual sleep happens elsewhere. Now the assertion condition is not checked when vm_wait_doms() is called directly, and it is checked even if we are not going to sleep (because vm_page_count_min_set(wdoms) is false). Reviewed by: alc, kib Sponsored by: The FreeBSD Foundation (cherry picked from commit 6fb7c42d593d13eba8b72f6cdf434a7cb23fa828) --- sys/vm/vm_page.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index 6cdde80bdb8b..d9feba6fe51a 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -3231,6 +3231,8 @@ vm_wait_doms(const domainset_t *wdoms, int mflags) */ mtx_lock(&vm_domainset_lock); if (vm_page_count_min_set(wdoms)) { + if (pageproc == NULL) + panic("vm_wait in early boot"); vm_min_waiters++; error = msleep(&vm_min_domains, &vm_domainset_lock, PVM | PDROP | mflags, "vmwait", 0); @@ -3264,8 +3266,6 @@ vm_wait_domain(int domain) } else mtx_unlock(&vm_domainset_lock); } else { - if (pageproc == NULL) - panic("vm_wait in early boot"); DOMAINSET_ZERO(&wdom); DOMAINSET_SET(vmd->vmd_domain, &wdom); vm_wait_doms(&wdom, 0);