From nobody Wed Nov 09 20:30:41 2022 X-Original-To: dev-commits-src-main@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 4N6xS21BS2z4XKQN; Wed, 9 Nov 2022 20:30:42 +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 4N6xS20mf3z44pX; Wed, 9 Nov 2022 20:30:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668025842; 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=Zit2Xikflh/W2EGU92IUNnKXw+1GFpCi46iQJ14NU1c=; b=NPWPBmb+4yVHBMHZp3tdnBNwajrfatetYU01fVu6cb+tJIzLVLQCGF2AQsTVnXL38fAgmz LxOklvuJedTglWGeauk947QZfvWmBS4z35tzEhhQTMHLqNuoK1b28s7qz2cNVhV0s27UAt azbKGfrFfm9ebIGQc9HVtab4T4z506Vl0Gg8mdbXnuQZi8mr5MdpG8SutuYU26+EtmZwQp 2Ay9NTsBwCcegZqAPrtbTLsOomfQu0o/LfGtfMkqgwAuvqNWPO0qmV/BMGvGv51EoJiDjx rhme8v50yPlaKKLSKT0jUPb5LxU50OoEYJcRL2Q0M8/hpCwv613fclOURdBbiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668025842; 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=Zit2Xikflh/W2EGU92IUNnKXw+1GFpCi46iQJ14NU1c=; b=QQBidavOkvmyXVSesexRin688fv/2eu9vXRQUDQtLuczhaKwEfEFUz9fX0ahwttlGptIki fKEs+WXPNgq43VULRsaPvMniemgquFWq27MLf59uRxRh04U0wtEWARal/0obX9kiyOmB9c irU+WOG40d6vcnhHzbV32UwaLvzLTnzOeT8jr/nrE/wfxuuDGWzV0T8k1h5++E/JVE5XTW D0MitrRCR009LZvYAoDMm/k6rZeyRILYbMZKtDGX5qVAdT9huvR1Ei4Scp8e9SrcndB6m+ 5+ymS5rsXWPgJV4hCnvE+7y+O4rR9mH8rY/pyu32UprHZxd8gyk8B3Ipm2QH6A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668025842; a=rsa-sha256; cv=none; b=csSwccCTCr3j48zUr/d28kkV1lNln8K7YKShqlH1XLsg2yYyMyhEqk6GsxzuXA9tQWq00F CqlktWaU04//mEjsf5dOZ1kzxfk+7bMsHnlu02t9W85YIP18VVl4+4QaGYAVXEEY1u7V0h 5XZ+zWBgVM31UtE93wOQirut7lu4LqcO6i08I8tdHwmQwziCzEQdPq7TPFw6tzxj2cnFEV +HMXb9Cnx6gC5lVlSMpw/f+fNuJ3zgqnxvXp8w24MUxsIkGs4jYB99H9gEVNyJyxWcQ6Ld m1TQzb1BoYuSjElUq/5o73uPC/2YFIFUgJb6uHHnAV71IzPjhJBSGWx4swkbTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4N6xS16xXnzZNP; Wed, 9 Nov 2022 20:30:41 +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 2A9KUfMi064286; Wed, 9 Nov 2022 20:30:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A9KUfHO064285; Wed, 9 Nov 2022 20:30:41 GMT (envelope-from git) Date: Wed, 9 Nov 2022 20:30:41 GMT Message-Id: <202211092030.2A9KUfHO064285@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Eric van Gyzen Subject: git: cfbf1da0deed - main - vm_page_unswappable: remove wrong assertion List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vangyzen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cfbf1da0deede6b82ac197471b6cd439706a2dea Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by vangyzen: URL: https://cgit.FreeBSD.org/src/commit/?id=cfbf1da0deede6b82ac197471b6cd439706a2dea commit cfbf1da0deede6b82ac197471b6cd439706a2dea Author: Anton Rang AuthorDate: 2022-11-09 20:13:01 +0000 Commit: Eric van Gyzen CommitDate: 2022-11-09 20:28:03 +0000 vm_page_unswappable: remove wrong assertion markj says: ...the assertion is incorrect and should simply be removed. It has been racy since we removed the use of the page hash lock to synchronize wiring of pages. PR: 267621 Reviewed by: markj, Anton Rang MFC after: 1 week Sponsored by: Dell Inc. Differential Revision: https://reviews.freebsd.org/D37320 --- sys/vm/vm_page.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index 8895b0f1da5a..4f97b84ee205 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -4200,7 +4200,8 @@ void vm_page_unswappable(vm_page_t m) { - KASSERT(!vm_page_wired(m) && (m->oflags & VPO_UNMANAGED) == 0, + VM_OBJECT_ASSERT_LOCKED(m->object); + KASSERT((m->oflags & VPO_UNMANAGED) == 0, ("page %p already unswappable", m)); vm_page_dequeue(m);