From nobody Wed Apr 15 18:06:19 2026 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 4fwpx735Fsz6ZDXy for ; Wed, 15 Apr 2026 18:06:19 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fwpx72X3yz3GDQ for ; Wed, 15 Apr 2026 18:06:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776276379; 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=GS38al3LWKQklntPzqB4T+FwTwYhApASO4XZckJxyZ8=; b=Y5Uf3YiEw5fnA2dmAeLgIJL/MyZ7akf3d5bMQFedQlVeFiDhjQ63ZzwZ+s5UqeHSFlrYFa TWLGMZqJ2W8EYC+YSk+SnKoAdhU8Iv46hQmtGPt8S/95ZEYs5EYZOjpbej7bftS1OB7WT8 WkXEVksMlJHENyB7ISAPt6jJZO4sZm6jTNEs4oUk4wrwxbyU0arnSX4gz8hDC+qcDer6a4 1ZjFbCkQa8lTSt2Sd+I6f3WfbSd+8ohzleWc5agbHkSroH9WiGhAvFMdUJaYlvGXz/5PN2 vXGlFF5xeiJzdLqcihFq9KobAJeE1Rmgj3l3bow7J8g/EZ05iACSUahAXpfohw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776276379; a=rsa-sha256; cv=none; b=gW4DrVhSSuKx8Z05MQV+dDnBWPFv44Xt4Gt3gOnhLvRjKEhNPaIdFH6JR+SNJr0bdOGFVZ 1Xn3qTcdKlVtMyhiEamDQvslh/swqKvRzMkmMV0uFyX4xLaF22TaqR3ggsj37ukNLGN9l4 3ewxysrjfbT679c00eK58Y6MeePE4bEGnpA8Lth2mvXMUNbEFYX5JEIh+6Qx1i8BJVvBJq MDbXK+CnhNcd3ynhgeSKjboBsIBDH9BVNjBEgLjK2LQkml9g8c5FFY5nQdm7ytTGsVd/j7 P7oASeoJu0zoeuH0iumtt7/p/ePVOXZnSD4HLJxOZeYH7FWlOa3tK7GEYhjYpw== 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=1776276379; 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=GS38al3LWKQklntPzqB4T+FwTwYhApASO4XZckJxyZ8=; b=iq7QJmRp74tfVxkNW3ujt1/WHhhcZ/e87Sn2tZUmb0B4OoDfjZWjnWpv7nAwXJwbTwib2n ys4bUUsdSAuKu88ZlZEorRTQXuz1vMcyPb8jjgWXd0YqBKB8hwWSKX3Rbl1awOsFuJ7+gz w+PfdWGkKqZYvK6nwoCoNvBzLoPwJwO9QXbJM5si2THAjRboCr5tGSpulCn5f7JqXDSSiO 7wEAyqzTIhX1LRObp2vUoff51wkTOK/dHztH41LL7aZFs42x3SzRLQaEM/aD9ynVaGz8Jf RfWMhstCaO4iVj6wqUUYM0hLal/JBvZSjZW5kM/ViFQLEcCg88BkJvbu1dCAOA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fwpx71NW1zXMy for ; Wed, 15 Apr 2026 18:06:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3890a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 15 Apr 2026 18:06:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: b6b0afefec47 - main - vm_swapout: Remove a special case from vm_swapout_map_deactivate_pages() 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: b6b0afefec4739923897d984448704ce34a21e6b Auto-Submitted: auto-generated Date: Wed, 15 Apr 2026 18:06:19 +0000 Message-Id: <69dfd39b.3890a.7b191608@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b6b0afefec4739923897d984448704ce34a21e6b commit b6b0afefec4739923897d984448704ce34a21e6b Author: Mark Johnston AuthorDate: 2026-04-15 18:00:38 +0000 Commit: Mark Johnston CommitDate: 2026-04-15 18:00:38 +0000 vm_swapout: Remove a special case from vm_swapout_map_deactivate_pages() John points out that this probably should have been removed in commit 472888018ce, which removed a special case where we'd set desired=0 if the target process has P_INMEM clear. It's not obvious to me that the desired=0 case can't arise by setting an RSS limit to 0, but I'm not sure why we'd try to go the extra mile in that case anyway. Reported by: jhb Reviewed by: kib MFC after: 2 weeks Fixes: 472888018ce1 ("proc: Remove kernel stack swapping support, part 6") Differential Revision: https://reviews.freebsd.org/D56140 --- sys/vm/vm_swapout.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/sys/vm/vm_swapout.c b/sys/vm/vm_swapout.c index f510189d24be..e85a049f46fe 100644 --- a/sys/vm/vm_swapout.c +++ b/sys/vm/vm_swapout.c @@ -222,13 +222,11 @@ vm_swapout_map_deactivate_pages(vm_map_t map, long desired) { vm_map_entry_t tmpe; vm_object_t obj, bigobj; - int nothingwired; if (!vm_map_trylock_read(map)) return; bigobj = NULL; - nothingwired = TRUE; /* * first, search out the biggest object, and try to free pages from @@ -249,8 +247,6 @@ vm_swapout_map_deactivate_pages(vm_map_t map, long desired) VM_OBJECT_RUNLOCK(obj); } } - if (tmpe->wired_count > 0) - nothingwired = FALSE; } if (bigobj != NULL) { @@ -275,15 +271,6 @@ vm_swapout_map_deactivate_pages(vm_map_t map, long desired) } } - /* - * Remove all mappings if a process is swapped out, this will free page - * table pages. - */ - if (desired == 0 && nothingwired) { - pmap_remove(vm_map_pmap(map), vm_map_min(map), - vm_map_max(map)); - } - vm_map_unlock_read(map); }