From nobody Mon Dec 20 00:38:08 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 3985E18F05F0; Mon, 20 Dec 2021 00:38:09 +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 4JHLKX4xkXz3rT4; Mon, 20 Dec 2021 00:38:08 +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 7EF2D47D2; Mon, 20 Dec 2021 00:38:08 +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 1BK0c8PN059901; Mon, 20 Dec 2021 00:38:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BK0c852059900; Mon, 20 Dec 2021 00:38:08 GMT (envelope-from git) Date: Mon, 20 Dec 2021 00:38:08 GMT Message-Id: <202112200038.1BK0c852059900@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: 0c747a70c85e - stable/13 - swapoff(2): document extended syscall arguments 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: 0c747a70c85e13f63b4545a8ec6b9856c211f9d8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639960688; 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=THQfnaw6DMOqPjbVbTKCwLJGqMomiHolfqVUqz7XAlA=; b=XnTz+An1A/mY1l4ZGRzrnJYgSAyZFeTSJtX3qj1iDihfeeeh9v6d+OSZgjvpwnwNWkOevH 0NLO5e+m+drWApIGYa9rPbfKsEARkLlLINbTRFt2WM1Ky8v7DBEfp5k7DpnvRX9pcFjy/j oic8ZH9zXFszhcFajPqMHocC0OyPf8eReCkUiYFzIaG5tOhKCwGaT+jpqDOV08BFP8ylz6 ceqowz1MlCEnaoxn1U47WSQPYnLj4m9Zm5JMB/eo+qVR6NsQ/7fo85JlniebeSQJUZpsYc 7I4t/djhi+Hx9ORJfrYhPC8A2QXZ/N76UHujdXgFN8Xgc1MyKTyleLZae69nSw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639960688; a=rsa-sha256; cv=none; b=ggfYLFKjHZkxe3IHYGdYAacaGqR4tqYk2OQX+d78e8p8zA1Bn309ZBIzbjZDB2F7qIk/eM bSUkiOCIimNQuQ51+6RPzP3vmMKjk0QhluNHEd6xgicpafyK4PCZWSqWaFG9zGhqkrBBq9 KkKrSgdEzqaFhqSsRjwH9gpBRnIgwL+u+Gvo4Lj0rt9Bl0kOocdDWGO5CUuoEcmF1SXqRr JyOhNqxX11m4mZV7/2PB+cgp7+HG36jhv7DT6+O/manDr1OT0FrI4OpBH73XYA5gFQ/NJA Q4kbcYEoymi1SIgOmPgsP1Beg3erwU2D3FxBCazbvTaqXbANHAisguRbihK11w== 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=0c747a70c85e13f63b4545a8ec6b9856c211f9d8 commit 0c747a70c85e13f63b4545a8ec6b9856c211f9d8 Author: Konstantin Belousov AuthorDate: 2021-12-02 03:17:40 +0000 Commit: Konstantin Belousov CommitDate: 2021-12-20 00:29:11 +0000 swapoff(2): document extended syscall arguments (cherry picked from commit 79d650f26277b364be45c598dd498bff600bb4a6) --- lib/libc/sys/swapon.2 | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/lib/libc/sys/swapon.2 b/lib/libc/sys/swapon.2 index 47acbc2dc178..3a8da8f4f363 100644 --- a/lib/libc/sys/swapon.2 +++ b/lib/libc/sys/swapon.2 @@ -28,7 +28,7 @@ .\" @(#)swapon.2 8.1 (Berkeley) 6/4/93 .\" $FreeBSD$ .\" -.Dd March 30, 2020 +.Dd December 2, 2021 .Dt SWAPON 2 .Os .Sh NAME @@ -37,6 +37,8 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS +.It vm/vm_param.h +.It vm/swap_pager.h .In unistd.h .Ft int .Fn swapon "const char *special" @@ -63,6 +65,40 @@ The system call disables paging and swapping on the given device. All associated swap metadata are deallocated, and the device is made available for other purposes. +.Pp +The +.Fa special +argument points to either the string that names the special device +used for swapping or the following structure +.Bd -literal +struct swapoff_new_args { + const char *name_old_syscall; + const char *name; + u_int flags; +}; +.Ed +that extends swapoff's interface to include optional flags. +The +.Va name_old_syscall +member must be initialized to +.Dv NULL +for the system to recognize the extended interface. +It is recommended that the whole structure be zeroed for future +compatibility, due to padding. +.Pp +The +.Va name +string is the special device name, same as legacy syscall argument. +.The +.Va flags +argument takes the following flags: +.Bl -tag -width SWAPOFF_FORCE +.It Dv SWAPOFF_FORCE +Overrides a very conservative check that prevents swapoff +if the total amount of free memory and remaining swap +devices space might be unsufficient for the system to continue +operating. +.El .Sh RETURN VALUES If an error has occurred, a value of -1 is returned and .Va errno