From nobody Sun Jan 09 01:27:44 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 5E957193E4ED; Sun, 9 Jan 2022 01:27:46 +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 4JWfTX4bBMz3LSf; Sun, 9 Jan 2022 01:27:44 +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 69ADA1301; Sun, 9 Jan 2022 01:27:44 +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 2091Ri8I001818; Sun, 9 Jan 2022 01:27:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2091Riuw001817; Sun, 9 Jan 2022 01:27:44 GMT (envelope-from git) Date: Sun, 9 Jan 2022 01:27:44 GMT Message-Id: <202201090127.2091Riuw001817@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Motin Subject: git: 5ec6907c0a90 - stable/13 - kern: Remove CTLFLAG_NEEDGIANT from some sysctls. 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: mav X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 5ec6907c0a908335cd5390d66e75b51c80e9ef10 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641691665; 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=dJD9Rz408VdGW+t8hycVgKpZ5v2pFVdh+382tEqydDE=; b=ROG7SiUYvtSypWvx2hHGZz4ccATXLIYhZFmdmW2UNGx97fg/7fftQwe57Vvm4ztNYnYsUx foFNB2+jfSV52ITnrTS51wmbaQ85Oh5oq0KcpCDavBMEfG5wXRe1iMPNxzSDS0Q8dK8pu4 PjdxKW+p5XTIBudxs1Eo+p97SHWHW6rqm5UCDoN/Lvelt2+sdM/E4g72cT7x3Q0kmcxuJs +tdhbMxVACPGpDseJjzLb8ZB5I5a/JrSAk2NIggaGXaLTxFF+/3LCL7lQNnw5xRt8JMlPG 6LD0WzdB57bM4GFDaKxgOn+Eb4F6d06GUXBU2qvVNs/bSxQVO3LoWK0UcO5rDg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641691665; a=rsa-sha256; cv=none; b=KLt+KBUxYsXoP6cw/fkb6gfftf7FwBpKVzPg7DdNckobV950Vp5UeXKqik2aMS3qNNKUNM 5tTjFWsZJ0sLS9NmdEFqbmm4j2pd7d4fxzTiRxF2lgGkMENKzG9C6P3Uw8HZ7NGaEdiXBC cHD8zIzY78WKWrAlhkBrfMCCyXbJcYnAkj5kzUIgrjeu2eIh8AF1ua/zaG0OF47419fn5r FGhf+t7llAadMEEW7LTtTb8PbQzwssdR+o9R9OvBqqyOsTDqWK9B98245AX85C8l1lTRru epIs/NHh63Y5p1WmaqBvWk7h5e0NLZXYNMLO23rlYK1yDVO6y/J7xiomSmkc0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=5ec6907c0a908335cd5390d66e75b51c80e9ef10 commit 5ec6907c0a908335cd5390d66e75b51c80e9ef10 Author: Alexander Motin AuthorDate: 2021-12-26 17:02:28 +0000 Commit: Alexander Motin CommitDate: 2022-01-09 01:24:10 +0000 kern: Remove CTLFLAG_NEEDGIANT from some sysctls. MFC after: 2 weeks (cherry picked from commit fe27f1db5f0b67ad2681a35253f7c1a4dc9874f8) --- sys/kern/kern_acct.c | 2 +- sys/kern/kern_sendfile.c | 2 +- sys/kern/kern_sig.c | 2 +- sys/kern/uipc_sockbuf.c | 2 +- sys/kern/uipc_socket.c | 6 +++--- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/kern/kern_acct.c b/sys/kern/kern_acct.c index ad272676083e..2a8d2f892807 100644 --- a/sys/kern/kern_acct.c +++ b/sys/kern/kern_acct.c @@ -187,7 +187,7 @@ sysctl_acct_chkfreq(SYSCTL_HANDLER_ARGS) return (0); } SYSCTL_PROC(_kern, OID_AUTO, acct_chkfreq, - CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_NEEDGIANT, &acctchkfreq, 0, + CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE, &acctchkfreq, 0, sysctl_acct_chkfreq, "I", "frequency for checking the free space"); diff --git a/sys/kern/kern_sendfile.c b/sys/kern/kern_sendfile.c index d3043d16f4ec..e724a28487d6 100644 --- a/sys/kern/kern_sendfile.c +++ b/sys/kern/kern_sendfile.c @@ -158,7 +158,7 @@ sfstat_sysctl(SYSCTL_HANDLER_ARGS) return (SYSCTL_OUT(req, &s, sizeof(s))); } SYSCTL_PROC(_kern_ipc, OID_AUTO, sfstat, - CTLTYPE_OPAQUE | CTLFLAG_RW | CTLFLAG_NEEDGIANT, NULL, 0, + CTLTYPE_OPAQUE | CTLFLAG_RW | CTLFLAG_MPSAFE, NULL, 0, sfstat_sysctl, "I", "sendfile statistics"); diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c index 0c5e9f41f153..6f656ba92107 100644 --- a/sys/kern/kern_sig.c +++ b/sys/kern/kern_sig.c @@ -3577,7 +3577,7 @@ sysctl_debug_num_cores_check (SYSCTL_HANDLER_ARGS) return (0); } SYSCTL_PROC(_debug, OID_AUTO, ncores, - CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_NEEDGIANT, 0, sizeof(int), + CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE, 0, sizeof(int), sysctl_debug_num_cores_check, "I", "Maximum number of generated process corefiles while using index format"); diff --git a/sys/kern/uipc_sockbuf.c b/sys/kern/uipc_sockbuf.c index bb179043682e..d4db19598392 100644 --- a/sys/kern/uipc_sockbuf.c +++ b/sys/kern/uipc_sockbuf.c @@ -1784,7 +1784,7 @@ sbtoxsockbuf(struct sockbuf *sb, struct xsockbuf *xsb) static int dummy; SYSCTL_INT(_kern, KERN_DUMMY, dummy, CTLFLAG_RW | CTLFLAG_SKIP, &dummy, 0, ""); SYSCTL_OID(_kern_ipc, KIPC_MAXSOCKBUF, maxsockbuf, - CTLTYPE_ULONG | CTLFLAG_RW | CTLFLAG_NEEDGIANT, &sb_max, 0, + CTLTYPE_ULONG | CTLFLAG_RW | CTLFLAG_MPSAFE, &sb_max, 0, sysctl_handle_sb_max, "LU", "Maximum socket buffer size"); SYSCTL_ULONG(_kern_ipc, KIPC_SOCKBUF_WASTE, sockbuf_waste_factor, CTLFLAG_RW, diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index 5d2139cb4a31..1fd63640988b 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -238,11 +238,11 @@ sysctl_somaxconn(SYSCTL_HANDLER_ARGS) return (0); } SYSCTL_PROC(_kern_ipc, OID_AUTO, soacceptqueue, - CTLTYPE_UINT | CTLFLAG_RW | CTLFLAG_NEEDGIANT, 0, sizeof(int), + CTLTYPE_UINT | CTLFLAG_RW | CTLFLAG_MPSAFE, 0, sizeof(int), sysctl_somaxconn, "I", "Maximum listen socket pending connection accept queue size"); SYSCTL_PROC(_kern_ipc, KIPC_SOMAXCONN, somaxconn, - CTLTYPE_UINT | CTLFLAG_RW | CTLFLAG_SKIP | CTLFLAG_NEEDGIANT, 0, + CTLTYPE_UINT | CTLFLAG_RW | CTLFLAG_SKIP | CTLFLAG_MPSAFE, 0, sizeof(int), sysctl_somaxconn, "I", "Maximum listen socket pending connection accept queue size (compat)"); @@ -374,7 +374,7 @@ sysctl_maxsockets(SYSCTL_HANDLER_ARGS) return (error); } SYSCTL_PROC(_kern_ipc, OID_AUTO, maxsockets, - CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_NEEDGIANT, &maxsockets, 0, + CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE, &maxsockets, 0, sysctl_maxsockets, "IU", "Maximum number of sockets available");