From nobody Fri Feb 18 15:10:22 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 AFB7F19DBA62; Fri, 18 Feb 2022 15:10:23 +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 4K0ZrH2MKRz3KXM; Fri, 18 Feb 2022 15:10:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645197023; 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=z/NIZGgF96sdvsIxmg+0FX+hElrqqHBR5yT1V03MIAs=; b=YsryB6nBN05YL0cDTD2wEu7c5WOTYPRQeO+Vs0Ihj6lb6iEJzwJ+5rNLxyu4fS658oXV5w BrghfQlenpG+h6ylxTn5TaDh4wkXjahxqkmFBpds4WgIL4bUIVW7/EPPg38cviG7qvPLPW xhpmkd3thLuYH7FiDWpEnedFKtDqabr9DJCo7nAF/iu4vKUIwqSj31Szlc75oe4WYaGpni hQEe/FKn/ngN1x7u5bWrN6EHnqBpQoXwTZ/J89+VWzpMugE/AM9/ed567hChD/3ntiODqs 4+f2o4m5aQ1SZECQtHNn/7FN2DXYWd5dZWLy4qFZRc5rt006Tf8P98sFMrlj0Q== 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 F254B1F82B; Fri, 18 Feb 2022 15:10:22 +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 21IFAMxE000544; Fri, 18 Feb 2022 15:10:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21IFAMQW000543; Fri, 18 Feb 2022 15:10:22 GMT (envelope-from git) Date: Fri, 18 Feb 2022 15:10:22 GMT Message-Id: <202202181510.21IFAMQW000543@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Edward Tomasz Napierala Subject: git: b2db87294ab5 - stable/13 - Make vmdaemon timeout configurable 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: trasz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b2db87294ab5e6b27f35a12627fe92520724a06f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645197023; 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=z/NIZGgF96sdvsIxmg+0FX+hElrqqHBR5yT1V03MIAs=; b=I8uSGSC3idqR/2jmhuojuAKTl2hudqYoCuJFDcR1LzifdhpMMC/Iw1rBByl5o361g/+rbP G4xx/J3sCobEhzWzRte7bOwUdK7Cbx77N4f5RIdaGGmmgvzPHex3ke/7R5ovRn9xCa1DIb LYVDkdNUj/2KqWM9TBJAr8GjcJEw+fyaYTkVWtyXp3KamSCIVKQfNTIWTwsbgWDDLYLAvh zJU7MOmQSdUwoA9K7erDwDY2lXJLAOss/OCzDezgmhGQHUFZSS+ys+gJaRMVx2bdGXzy/j YQn9TvtmHQR6SKLt/TPn3CvhfK3OVQGFJm1bBxZ3rAmCE1uq9ZrqFVwsGbbsPA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645197023; a=rsa-sha256; cv=none; b=JNp5uEDU7Cl6+d45WYAQ2z3ZLTeIzd5EIYpptFI2iRjSVB+jM7bsQ6b9sxNq0K0zPUxIBm 96M3ZpxaXGhF3ncjIRgKej40JQY3/UGpfMTLsaiUBauWH9DP/IdRIiHMkN4kgYdq6vUuJB TuVl0vb4h6oD/c98zswf7K+74CjDs8hhZ6YCNCKiVMuBAJWNGqJeYc9eKS0xHEnuDOKt1d Gl+VQLpkXSsf3NT2HWMK70bZg0GxRvUyXpcH0IArAVe6QsFZyqLYdrGWR1QcO7+8PkU/nc slZuy+roEXplLNGzL7HL9/gRQuCLRc0+FyTUzpaK9ruMNQe9gS84tEXQY1k66A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by trasz: URL: https://cgit.FreeBSD.org/src/commit/?id=b2db87294ab5e6b27f35a12627fe92520724a06f commit b2db87294ab5e6b27f35a12627fe92520724a06f Author: Edward Tomasz Napierala AuthorDate: 2021-10-17 12:48:50 +0000 Commit: Edward Tomasz Napierala CommitDate: 2022-02-14 19:28:56 +0000 Make vmdaemon timeout configurable Make vmdaemon timeout configurable, so that one can adjust how often it runs. Here's a trick: set this to 1, then run 'limits -m 0 sh', then run whatever you want with 'ktrace -it XXX', and observe how the working set changes over time. Reviewed By: kib Sponsored By: EPSRC Differential Revision: https://reviews.freebsd.org/D22038 (cherry picked from commit 0f559a9f097b9eea318e970155fb23e37af07c4e) --- sys/vm/vm_swapout.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/sys/vm/vm_swapout.c b/sys/vm/vm_swapout.c index eaa6b9618426..008dd6f00cbc 100644 --- a/sys/vm/vm_swapout.c +++ b/sys/vm/vm_swapout.c @@ -153,6 +153,11 @@ SYSCTL_INT(_vm, OID_AUTO, swap_idle_threshold2, CTLFLAG_RW, &swap_idle_threshold2, 0, "Time before a process will be swapped out"); +static int vm_daemon_timeout = 0; +SYSCTL_INT(_vm, OID_AUTO, vmdaemon_timeout, CTLFLAG_RW, + &vm_daemon_timeout, 0, + "Time between vmdaemon runs"); + static int vm_pageout_req_swapout; /* XXX */ static int vm_daemon_needed; static struct mtx vm_daemon_mtx; @@ -374,17 +379,15 @@ vm_daemon(void) int breakout, swapout_flags, tryagain, attempts; #ifdef RACCT uint64_t rsize, ravailable; + + if (racct_enable && vm_daemon_timeout == 0) + vm_daemon_timeout = hz; #endif while (TRUE) { mtx_lock(&vm_daemon_mtx); msleep(&vm_daemon_needed, &vm_daemon_mtx, PPAUSE, "psleep", -#ifdef RACCT - racct_enable ? hz : 0 -#else - 0 -#endif - ); + vm_daemon_timeout); swapout_flags = vm_pageout_req_swapout; vm_pageout_req_swapout = 0; mtx_unlock(&vm_daemon_mtx);