From nobody Wed Feb 09 00:43:35 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 3204419B1C06; Wed, 9 Feb 2022 00:43:36 +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 4Jth2H5wxPz4q3N; Wed, 9 Feb 2022 00:43:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644367416; 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=NDj9up2w/KDlEZzJzi0iuguWhFmibN36I4gDs8cARIg=; b=ZIJ+Lp7xgBduNvS1d91Vv1CDoF6HKhggMeGOFgcCpSzi3EGcYFDMASbOfPB8jmEkyG4CvG PK27EP/Ljb8Qjrk/qoN5/zOtJB8N5fMIF6UucsEb/p1NEpAlvfId4G+KNdsafUQ1CNrU1p SxGtRw7uiKHdFJDQp+ZsxidgdF40dIzcradpWqlxm8sVwK4FXzyRX30lLvImDtMmTAi/aA Jyif1SpNtX90vhweygc5QgJOT/hMEwm5sETrKbEQEmWmUWvRJhaP3+/CN1NhjpwJ7NIQfc 8nUcYoLd5WTzPecb7hHDejVF+iMPvAqbYoy+pxJFYW6GXyjI5cu9SdnPTblbPw== 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 9696B237D1; Wed, 9 Feb 2022 00:43:35 +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 2190hZp7083101; Wed, 9 Feb 2022 00:43:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2190hZPe083100; Wed, 9 Feb 2022 00:43:35 GMT (envelope-from git) Date: Wed, 9 Feb 2022 00:43:35 GMT Message-Id: <202202090043.2190hZPe083100@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: c383935d0058 - stable/13 - vmmeter(): Fix detection of the named swap objects 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c383935d00581bf52363b82ff2e6b275aad11d65 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644367416; 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=NDj9up2w/KDlEZzJzi0iuguWhFmibN36I4gDs8cARIg=; b=OOUUrmFM1O/6bv7cTtS7jaid7sRObpm69HKh2PilPQGTqlge6ADzpsh00k5NzAw6VvdkTa lfP8ghEWgtSME+5z6ZT+Q3AMLluQ07N5jf9O2isEAAobjny+s6IwlHqrEHhohIIZX9wlvR NtRdZWkfdem1oEGRjLpxqrHx25DdDDE9Ct3N9G928POjleO75ywB668/CdMU6ZtjDoFwHV eTsXe5zeKy2sMZG8zVJdR1qxoU2ClSxkFjIj8DlGxfRwKr6r9KPtSH+iKJ8b9UiSLGZe97 bKpHmHYymEuBRRYioOPcobPd7pHx9bj6qLIRcDVhhD2x1MssSFac6PPPsh47Tw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644367416; a=rsa-sha256; cv=none; b=js/sE+VpA5URaRGaohjZsiwNw373MIRuU/pt19wFsDtN3bi99f9diwkGahRbjv6x//9ZHO iSqf8gxLRNjbysE4gJQq28pgIS2Yrc3YkKUAN7GgIGqv9Ve5qD9VRGig+yWgpGpzWgYN01 en3wCho0reip4xk3w7EhhS4J/hrNwFFjCCBCFnSI0GQj3eLBiseCBbzpZ75laTw0VbMlFv qqeKqKx+rUQzcdWM5fsKuoD4Flt68/m3zSMe6f0d+F6UDMqWM9k4lkOt82Ipi8lXOP0k+4 UcpWvL+p2nErYylaUWnxean0KBl9b3GlkyOyG1jtuG8Kbe1QGDz8hCy1WFZIXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c383935d00581bf52363b82ff2e6b275aad11d65 commit c383935d00581bf52363b82ff2e6b275aad11d65 Author: Konstantin Belousov AuthorDate: 2022-01-25 21:03:23 +0000 Commit: Konstantin Belousov CommitDate: 2022-02-09 00:42:44 +0000 vmmeter(): Fix detection of the named swap objects (cherry picked from commit 0b8643eaf6e787bac9c33c2ff03d5524cdfd7239) --- sys/vm/vm_meter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/vm/vm_meter.c b/sys/vm/vm_meter.c index 15afd1f23649..31a23f975b0c 100644 --- a/sys/vm/vm_meter.c +++ b/sys/vm/vm_meter.c @@ -243,7 +243,7 @@ vmtotal(SYSCTL_HANDLER_ARGS) continue; } if (object->ref_count == 1 && - (object->flags & OBJ_ANON) == 0) { + (object->flags & (OBJ_ANON | OBJ_SWAP)) == OBJ_SWAP) { /* * Also skip otherwise unreferenced swap * objects backing tmpfs vnodes, and POSIX or