From nobody Mon Dec 20 00:38:09 2021 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 AA27E18F064A; Mon, 20 Dec 2021 00:38:10 +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 4JHLKY6bZVz3rTB; Mon, 20 Dec 2021 00:38:09 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 897524C80; Mon, 20 Dec 2021 00:38:09 +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 1BK0c9Lq059925; Mon, 20 Dec 2021 00:38:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BK0c9rj059924; Mon, 20 Dec 2021 00:38:09 GMT (envelope-from git) Date: Mon, 20 Dec 2021 00:38:09 GMT Message-Id: <202112200038.1BK0c9rj059924@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: 79f9a41be058 - stable/13 - swapoff(8): add -f flag 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: 79f9a41be058d268d6f1c0c5245a0a37fa25c678 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639960690; 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=bQmb5hJoRXbkFE3rac891tGVt62n0kuZFKYPWlMOUSE=; b=dORPy3IFageGY/LQZGcdYoajgkA38nEwLbytt5FVh3Z/VUDbGS+/TMDSH1zVvS+6WEw2ep sDfmz0fJdCGD95xqcknZ2ehD+UwNAaSI5Nhb7cRWctzya53QDdVfhfWU0YmMd8S3R4uycV y02l1gX7A6ciXb4COHOny2LMnPxRVKUfTqDQoJ8M6r6f8dMG1uG0TrW4/W9LWgQe2+H3Nj C+WQHAjlyybNRb+BXcp5ZYvPSFKDzWXNhPBvn4FicjEnF58M/aKdsOhm4O03uuNsns6VkI C72ADrMsVjlLCYyMKyLYxM4zb6x/D5dTJiqab4eLN0HjlHirqUh3ZiATFINXPg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639960690; a=rsa-sha256; cv=none; b=b5QTeXWnVYkDjrmoMgR8f5M3MnzD645j9TKUXwR7QsWhkjVQulQFpmO76gWl5ZagWLyhkT LN7uZfQ5ICTjRQRJTS6HWeh3exQhPHP8dCdkJUWgavho8ZgzMMG0vUfJDsFPrST6RB/M4c NtFtgqrIfiPbuxYs/aWAJxOo7Tk3J0hQe3vV76zQJE6AkDw0VqbeatIXLTvz4IQJtnaRwZ Pd3PM2+AA+lp7rMG2gdXgGS0IlmjVBU8PKOFJoWnyBRns/XwCREjVXzvSFjTBz6JlEW1Nb XfM4z5t9Ypi8F21shqzvdo8i4zORdqqZreosJW+YHYrTctsm//pMsC/He8o5jg== 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=79f9a41be058d268d6f1c0c5245a0a37fa25c678 commit 79f9a41be058d268d6f1c0c5245a0a37fa25c678 Author: Konstantin Belousov AuthorDate: 2021-11-29 16:30:09 +0000 Commit: Konstantin Belousov CommitDate: 2021-12-20 00:29:11 +0000 swapoff(8): add -f flag (cherry picked from commit 1aa249c935884d4c0c096c00facbb22f214128cc) --- sbin/swapon/swapon.8 | 16 +++++++++++----- sbin/swapon/swapon.c | 23 ++++++++++++++++++----- 2 files changed, 29 insertions(+), 10 deletions(-) diff --git a/sbin/swapon/swapon.8 b/sbin/swapon/swapon.8 index 7ae28031dc1e..0146a7750e12 100644 --- a/sbin/swapon/swapon.8 +++ b/sbin/swapon/swapon.8 @@ -28,7 +28,7 @@ .\" @(#)swapon.8 8.1 (Berkeley) 6/5/93 .\" $FreeBSD$ .\" -.Dd May 19, 2020 +.Dd November 29, 2021 .Dt SWAPON 8 .Os .Sh NAME @@ -42,9 +42,9 @@ .Nm swapoff .Oo Fl F Ar fstab .Oc -.Fl aLq | Ar +.Fl afLq | Ar .Nm swapctl -.Op Fl AghklmsU +.Op Fl AfghklmsU .Oo .Fl a Ar | @@ -125,8 +125,14 @@ informational messages will not be written to standard output when a swap device is removed. Note that .Nm swapoff -will fail and refuse to remove a swap device if there is insufficient -VM (memory + remaining swap devices) to run the system. +will fail and refuse to remove a swap device if a very conservative +check does not conclude that there is sufficient VM (memory + +remaining swap devices) to run the system. +The +.Fl f +option turns off this check, which could deadlock the system +if there is insufficient swap space remaining. +.Pp The .Nm swapoff utility diff --git a/sbin/swapon/swapon.c b/sbin/swapon/swapon.c index 5adc870adf59..d644d99e7913 100644 --- a/sbin/swapon/swapon.c +++ b/sbin/swapon/swapon.c @@ -51,6 +51,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include @@ -78,7 +79,7 @@ static int run_cmd(int *, const char *, ...) __printflike(2, 3); static enum { SWAPON, SWAPOFF, SWAPCTL } orig_prog, which_prog = SWAPCTL; -static int Eflag, qflag; +static int Eflag, fflag, qflag; int main(int argc, char **argv) @@ -101,7 +102,7 @@ main(int argc, char **argv) doall = 0; etc_fstab = NULL; - while ((ch = getopt(argc, argv, "AadEghklLmqsUF:")) != -1) { + while ((ch = getopt(argc, argv, "AadEfghklLmqsUF:")) != -1) { switch(ch) { case 'A': if (which_prog == SWAPCTL) { @@ -128,6 +129,12 @@ main(int argc, char **argv) else usage(); break; + case 'f': + if (which_prog == SWAPOFF) + fflag = 1; + else + usage(); + break; case 'g': hflag = 'G'; break; @@ -782,12 +789,18 @@ swapon_trim(const char *name) static const char * swap_on_off_sfile(const char *name, int doingall) { + struct swapoff_new_args sa; int error; if (which_prog == SWAPON) error = Eflag ? swapon_trim(name) : swapon(name); - else /* SWAPOFF */ - error = swapoff(name); + else { /* SWAPOFF */ + bzero(&sa, sizeof(sa)); + sa.name = name; + if (fflag) + sa.flags |= SWAPOFF_FORCE; + error = swapoff((const char *)&sa); + } if (error == -1) { switch (errno) { @@ -820,7 +833,7 @@ usage(void) fprintf(stderr, "[-F fstab] -aLq | [-E] file ...\n"); break; case SWAPOFF: - fprintf(stderr, "[-F fstab] -aLq | file ...\n"); + fprintf(stderr, "[-F fstab] -afLq | file ...\n"); break; case SWAPCTL: fprintf(stderr, "[-AghklmsU] [-a file ... | -d file ...]\n");