From nobody Mon Jul 29 01:50:04 2024 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 4WXLs93CbHz5S7PG; Mon, 29 Jul 2024 01:50:05 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WXLs91B3Hz4nkZ; Mon, 29 Jul 2024 01:50:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722217805; 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=56BoOxuvRUmgKrCbHw15j3kkWpWdHXjV8XTv7mKIvbA=; b=CR6/D9iLBEAJ+2DMOXU+z9Sris+s/g2U/PQB6UITx/QQPZFDEKMYOR2N2qZadaRhY+rjrD Yy7/c67VRzAexbI9byHY+9eE+E/doLX3ucGX231wGjGcf9qnCKv8UIPwAJlp+xubqOHKsq JdkpUpHLgV1dUKndwhngbc1zAUztj+7DpMvPny8L7ZOluTTebrPG9Xzf7B3iKQgAcRBQC8 ls1+dmGBRuTWSGu5PtzdSSnFZZUgvQopN1h3TqR2TF8xN4/3+jWhTXtbLwQL/y0SqjqveM yZI5gy+StLk/3f+QIuxpRrh/r05wiurRKoCH6F/FRs8MVO8r9L68paz4ZfS+wQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722217805; a=rsa-sha256; cv=none; b=ZTGvM5yiNsvbXCszjQj0aPe1YX6ZElwyDPb5sp6W9qC9Nby1aQdZXJg6Ev3M8y51E07B7k 1tEKkSEDI1gdKY3AquG7iwfilsFc62UL/Hptfy2wwyWH13WtqCskVFuEDTjGbkiClawTES ApfpGoCSCz4Ihity8xh0s6NRwoBFTxcJPh8ACMc/sclfm3SSmo6vvgv0Kb8dcua6u0Cq55 fI1Svv7GE1DYq8hrG8FE58Ob9QfK+yaR6YIMD0k0AGZXN36Zr4W0Ax4c2aFyCkw8E1Mm+Z CW2J5MWKt3I2J7XfXp30x+ovGTxIf+Ihkz63+b0flsnsPBKN/bLFXo7cdtJVZQ== 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=1722217805; 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=56BoOxuvRUmgKrCbHw15j3kkWpWdHXjV8XTv7mKIvbA=; b=Hwj7IYa7tRcqmJS91HxkINdDH/t7c/ZvcyOqACJFkZ1Dr24oChqVG3kRIYGrkLZUv/fEV6 9cnEzQ3fboYIHHQCm9GItYEYq+ayjzKX5Lw4L5XXgRfKCtn0x++rZvTSSIFxWQn7mXmDPe uUGjGtnPTX+akioV4QaqHw92uKZWMAACovMTBp7yarqU7deonxwDihColkk+pbVKGAO6J5 CQuHfXuOE4E5+xoWFwxkX1zrwu57cy+OVMtAkjErcOoJc/NW7k5PexnKuRgKIGBlQZ4EXW xRIWQGeMCVNYQ9+jaXu6DBrRP8rN+1upqHw56yZJZzqdJXu4v4IpU1eV6P5RMA== 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 4WXLs90KYpzF8N; Mon, 29 Jul 2024 01:50:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46T1o4HQ094903; Mon, 29 Jul 2024 01:50:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46T1o4fH094897; Mon, 29 Jul 2024 01:50:04 GMT (envelope-from git) Date: Mon, 29 Jul 2024 01:50:04 GMT Message-Id: <202407290150.46T1o4fH094897@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 6aa98f78cc6e - main - conf: Remove kernel stack swapping support, part 12 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: 6aa98f78cc6e527b801cabddf6881ab5c9256934 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=6aa98f78cc6e527b801cabddf6881ab5c9256934 commit 6aa98f78cc6e527b801cabddf6881ab5c9256934 Author: Mark Johnston AuthorDate: 2024-07-29 01:42:54 +0000 Commit: Mark Johnston CommitDate: 2024-07-29 01:43:59 +0000 conf: Remove kernel stack swapping support, part 12 Remove the NO_SWAPPING option. There is still some code in vm_swapout.c, but it relates to RACCT handling. Remove the option and make compilation of vm_swapout.c conditional on RACCT. Tested by: pho Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D46130 --- sys/arm/conf/ARMADAXP | 1 - sys/conf/NOTES | 10 ---------- sys/conf/files | 2 +- sys/conf/options | 1 - sys/powerpc/conf/dpaa/DPAA | 1 - sys/vm/vm_swapout.c | 5 ----- 6 files changed, 1 insertion(+), 19 deletions(-) diff --git a/sys/arm/conf/ARMADAXP b/sys/arm/conf/ARMADAXP index e198651e69b3..9c045e65e752 100644 --- a/sys/arm/conf/ARMADAXP +++ b/sys/arm/conf/ARMADAXP @@ -40,7 +40,6 @@ options ROOTDEVNAME=\"ufs:/dev/da0p1\" options MUTEX_NOINLINE options RWLOCK_NOINLINE options NO_FFS_SNAPSHOT -options NO_SWAPPING # Pseudo devices device pty diff --git a/sys/conf/NOTES b/sys/conf/NOTES index 685125b782ca..555bae187271 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -2390,16 +2390,6 @@ options SW_WATCHDOG # options DEADLKRES -# -# Disable swapping of stack pages. This option removes all -# code which actually performs swapping, so it's not possible to turn -# it back on at run-time. -# -# This is sometimes usable for systems which don't have any swap space -# (see also sysctl "vm.disable_swapspace_pageouts") -# -#options NO_SWAPPING - # Set the number of sf_bufs to allocate. sf_bufs are virtual buffers # for sendfile(2) that are used to map file VM pages, and normally # default to a quantity that is roughly 16*MAXUSERS+512. You would diff --git a/sys/conf/files b/sys/conf/files index 08b8dbed43b0..5250b65135e6 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -5266,7 +5266,7 @@ vm/vm_pager.c standard vm/vm_phys.c standard vm/vm_radix.c standard vm/vm_reserv.c standard -vm/vm_swapout.c optional !NO_SWAPPING +vm/vm_swapout.c optional racct vm/vm_unix.c standard vm/vnode_pager.c standard xen/features.c optional xenhvm diff --git a/sys/conf/options b/sys/conf/options index 8464fd919ff0..899fd7869a5e 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -630,7 +630,6 @@ VM_KMEM_SIZE_SCALE opt_vm.h VM_KMEM_SIZE_MAX opt_vm.h VM_NRESERVLEVEL opt_vm.h VM_LEVEL_0_ORDER opt_vm.h -NO_SWAPPING opt_vm.h MALLOC_MAKE_FAILURES opt_vm.h MALLOC_PROFILE opt_vm.h MALLOC_DEBUG_MAXZONES opt_vm.h diff --git a/sys/powerpc/conf/dpaa/DPAA b/sys/powerpc/conf/dpaa/DPAA index 742fdc9da325..323c71048c12 100644 --- a/sys/powerpc/conf/dpaa/DPAA +++ b/sys/powerpc/conf/dpaa/DPAA @@ -34,7 +34,6 @@ options SYSVSHM #SYSV-style shared memory options SYSVMSG #SYSV-style message queues options SYSVSEM #SYSV-style semaphores options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions -options NO_SWAPPING options KDB #Enable the kernel debugger options DDB #Support DDB diff --git a/sys/vm/vm_swapout.c b/sys/vm/vm_swapout.c index 016cdf2a2cc8..6f7f584ac25f 100644 --- a/sys/vm/vm_swapout.c +++ b/sys/vm/vm_swapout.c @@ -68,7 +68,6 @@ * rights to redistribute these changes. */ -#include #include "opt_kstack_pages.h" #include "opt_kstack_max_pages.h" #include "opt_vm.h" @@ -293,12 +292,10 @@ vm_daemon(void) struct thread *td; struct vmspace *vm; int breakout, 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); @@ -371,7 +368,6 @@ again: &vm->vm_map, limit); size = vmspace_resident_count(vm); } -#ifdef RACCT if (racct_enable) { rsize = IDX_TO_OFF(size); PROC_LOCK(p); @@ -409,7 +405,6 @@ again: tryagain = 1; } } -#endif vmspace_free(vm); sx_slock(&allproc_lock); PRELE(p);