From nobody Sun Jun 16 15:37:43 2024 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 4W2HFz59Fnz5P0yx; Sun, 16 Jun 2024 15:37:43 +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 4W2HFz4gf7z4Jt6; Sun, 16 Jun 2024 15:37:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718552263; 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=jUn77Q4g0uV6gxadftMew6+wcXqy5q0wfg1lUBrPwSQ=; b=P83XoiJkqQHEvXkLCvzV/+pjbuEkaw/vBAbJGjruoomaFPyYmPJJglznunc02QDBxA5nCV J5M2NfyYcTnSb/jSUUZDGvW9aA1CrA+2+/9Ulrw/PzH8/BlE/RaZoz0ya7l9rtPzEapGCY 82ZS/eimEqK2hNTEdCtGJWFmj5Iz9bssFoecSkuHqIA8ZYG2YcZMQjNzl88y4v1lK3tqGf SdNsR7zFhKeax44+d1CI/Uuq+oZQKOd59pPLEMn0g32V0YHK+J658ksSb1fYujBf8Tl+aL 8QujTAoNQYJwGBFG1e8oO9CCRe7I6Je4e/WIif3UpVC/Gc6l3XBlpdKsclGi/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718552263; a=rsa-sha256; cv=none; b=rd80SVABOCwg9wVDsxFYbXLjupLBVlEAxMDk/K3cfcrOj9Jaf8jS/vFhvAmMIVvxxcWiry cJu+AfOksziKuZ0a0zDrbruGKEwnssKBqFFe4V/AnZUcQ2+N5oiWx0kjzwdpMElxp1e1bt f8ZGUR1jOD7C48QYxndwOhmwzrd5XgQ1aX7VXsbrHiZ5vTUhWe6Dsjzxq9w7h9ZjoB2dQ7 Y5ILxWJzKA5AM7oSzKi8yuvTc453u3UrAQViMNU3Dncc01DwljS3HCTB2ujlagmSg6bLMT nzokj/I1DyoH5Ggwds9zGGkacXgAamH5SF4d2GD9P6kNij8HtnvFS7L/4YeRiA== 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=1718552263; 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=jUn77Q4g0uV6gxadftMew6+wcXqy5q0wfg1lUBrPwSQ=; b=friufQqE3ClJp5H/kCdofvvJMXy92H2885mo4Vn7h3nI405rvS0xuw0JJ2Fm8JRzqTkS2S GqbDDBUbgz07V2ckgdT1pzGT49s0SycqFY3uVDvRaTEXcH5sh43crTHFYwg8rAseC4o7R7 nrULQ8v12eWBCRzz4qKJW4oU7qwjp34Q1azU0erMxJ4zjKOXKy00lXlqPW+ZwOgJqTUgmS 2U14BRbAXumQ8xdlNinjvZCSK7VgNoD3JQUBXtNWT41Rj7Vogq9mjtBuTaCB+8P3gYQU/0 ohFISDlUMOie8mO52XNLFlPQRQ8dFIOBHHXIYs0YFYn0D51ZRG4VEu3yZBcDBg== 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 4W2HFz4HC3zsVQ; Sun, 16 Jun 2024 15:37:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45GFbhxt070203; Sun, 16 Jun 2024 15:37:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45GFbhc1070200; Sun, 16 Jun 2024 15:37:43 GMT (envelope-from git) Date: Sun, 16 Jun 2024 15:37:43 GMT Message-Id: <202406161537.45GFbhc1070200@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Moore Subject: git: 28af3eb62b73 - main - Revert "swap_pager: small improvement to find_least" 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 28af3eb62b733ce4d7e01e9ba30b7a18c8cf5369 Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=28af3eb62b733ce4d7e01e9ba30b7a18c8cf5369 commit 28af3eb62b733ce4d7e01e9ba30b7a18c8cf5369 Author: Doug Moore AuthorDate: 2024-06-16 15:37:16 +0000 Commit: Doug Moore CommitDate: 2024-06-16 15:37:16 +0000 Revert "swap_pager: small improvement to find_least" This reverts commit dd0e5c02ab13b9eb240d42a71a8f41a8b036bd33. --- sys/vm/swap_pager.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c index 455c39ab6fd7..8d9236a2eb1a 100644 --- a/sys/vm/swap_pager.c +++ b/sys/vm/swap_pager.c @@ -2298,17 +2298,22 @@ swap_pager_find_least(vm_object_t object, vm_pindex_t pindex) VM_OBJECT_ASSERT_LOCKED(object); MPASS((object->flags & OBJ_SWAP) != 0); + if (pctrie_is_empty(&object->un_pager.swp.swp_blks)) + return (object->size); sb = SWAP_PCTRIE_LOOKUP_GE(&object->un_pager.swp.swp_blks, rounddown(pindex, SWAP_META_PAGES)); if (sb == NULL) return (object->size); - for (i = pindex - sb->p; i < SWAP_META_PAGES; i++) { - if (sb->d[i] != SWAPBLK_NONE) - return (sb->p + i); + if (sb->p < pindex) { + for (i = pindex % SWAP_META_PAGES; i < SWAP_META_PAGES; i++) { + if (sb->d[i] != SWAPBLK_NONE) + return (sb->p + i); + } + sb = SWAP_PCTRIE_LOOKUP_GE(&object->un_pager.swp.swp_blks, + roundup(pindex, SWAP_META_PAGES)); + if (sb == NULL) + return (object->size); } - sb = SWAP_PCTRIE_LOOKUP_GE(&object->un_pager.swp.swp_blks, pindex); - if (sb == NULL) - return (object->size); for (i = 0; i < SWAP_META_PAGES; i++) { if (sb->d[i] != SWAPBLK_NONE) return (sb->p + i); @@ -2318,7 +2323,7 @@ swap_pager_find_least(vm_object_t object, vm_pindex_t pindex) * We get here if a swblk is present in the trie but it * doesn't map any blocks. */ - __unreachable(); + MPASS(0); return (object->size); }