From nobody Wed Mar 1 16:53:53 2023 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 4PRgL93d15z3v5hf; Wed, 1 Mar 2023 16:53:53 +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 4PRgL935hYz3wWm; Wed, 1 Mar 2023 16:53:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677689633; 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=LGiJeoQ+V7sknwT7S/MTish5okJVlRDsh9QM/e7/ciA=; b=dNI18l6K86aBdvSr8jU0O8nvetk769QdTflX40VUkWXWBHEqg+RK1lWL7Cs3qmk2t0de3s ey7CQeA4VTtS1cXcbZNY4Cr/UmCAkG7+e1WP5Mx/ShdOhsNcGg4O/0ppcwBBQkDb8UtJda r0+NkI8kcFb7bFVyCh4xULqf5U0wES+3h3tk0/OZgF+uOhb7R9W7bVUKEU4aVPkaJxh5Vc o+qc++qrJHVUDQslzKUJVS6TfyEWiD3IM84t3k8kIhHXGK5LYRaYO3HIRhRqALytp8pHdp mfvG+Tl9PQcrVll9j05XP+TTeXfv5B42FgEYcdvNMcRY78M9W/qTIFRojtUh5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677689633; 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=LGiJeoQ+V7sknwT7S/MTish5okJVlRDsh9QM/e7/ciA=; b=SU6NIbPtBjQGyQdqYRmemEQo+HMC7PvAI3A4XfWcQaP6Qbjdr2DwF0x4taz4NQkvFCqLZc f0Bj7WDDqAHNXwsGCJFpD1Bq9cKULWy3kXM2fAau3jEwC/8d7QvWntzTZgi1orj6YjP9tS /coAVO9COse6nLg8lvqlTkbvo1beVM9JdryY5ugN6mL90yoDfhBgJpwM9VT95DrrbE9XtS nf4P8TgMo/D7xjQn7bv+HrlHauq1nLKBgMnDnukmvLXrVkRI8pnqmMWwmsXRI/T/QiRKDn s7uTwLgCco5qEbzEVczh3gMUwcmlq+/vptsNNRcymjZraAW/vCojHhw9l95TLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677689633; a=rsa-sha256; cv=none; b=w2tJii5yL7vfGCAV/eRbIrpAfID3PqK6BySP1uox3Kuy76S2inrHcBQ67Juspt8t2wp3gN dUS6/ohZmrLrNqBZjXJLFwgN+01mTGUJ3Mi5LJTCMXaEjUyDKV8PF6hZuw9C2b9kk+nmy4 MyqxrE/2IKBFztWq6m2D1zxCnQtcJq+rJyUxSVcqe3nqU7YbLl8M207mdI9+Nm6xiXne6a YzW97EQLx3HWjHikYPgkJgvc8VeCQ/Sgaej8Jt+al2DfOM7TLjSHbtjL8JWGdf3X8gRyyo +AdG6nNcf0vNUDKL4ByZs9v0SCCEMH9ZSmSqrtcrni+qTAjyhlCpnLZooGvzJw== 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 4PRgL929skzhx4; Wed, 1 Mar 2023 16:53:53 +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 321GrrMC034245; Wed, 1 Mar 2023 16:53:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 321Grrcl034244; Wed, 1 Mar 2023 16:53:53 GMT (envelope-from git) Date: Wed, 1 Mar 2023 16:53:53 GMT Message-Id: <202303011653.321Grrcl034244@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: aa330214cf1d - releng/13.2 - netlink: make the maximum allowed netlink socket buffer runtime tunable. 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: aa330214cf1daacfdf706d12c01a34dc2f862693 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=aa330214cf1daacfdf706d12c01a34dc2f862693 commit aa330214cf1daacfdf706d12c01a34dc2f862693 Author: Alexander V. Chernikov AuthorDate: 2023-02-27 10:44:54 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-03-01 16:53:36 +0000 netlink: make the maximum allowed netlink socket buffer runtime tunable. Dumping large routng tables (>1M paths with multipath) require the socket buffer which is larger than the currently defined limit. Allow the limit to be set in runtime, similar to kern.ipc.maxsockbuf. Reported by: Marek Zarychta MFC after: 1 day Approved by: re(cperciva) (cherry picked from commit 28a5d88f7091d1fc72f4f1bd8562d3c8b15883f5) (cherry picked from commit b656161b84dce0322ab00d7958267fa47cda6318) --- share/man/man4/netlink.4 | 6 ++++++ sys/kern/uipc_socket.c | 3 ++- sys/netlink/netlink_domain.c | 25 ++++++++++++++++++++++--- 3 files changed, 30 insertions(+), 4 deletions(-) diff --git a/share/man/man4/netlink.4 b/share/man/man4/netlink.4 index 1894de5841fe..c0d9b5a88ade 100644 --- a/share/man/man4/netlink.4 +++ b/share/man/man4/netlink.4 @@ -276,6 +276,12 @@ Default receive buffer for the netlink socket. Note that the socket recvspace has to be least as long as the longest message that can be received from this socket. .El +.Bl -tag -width indent +.It Va net.netlink.nl_maxsockbuf +Maximum receive buffer for the netlink socket that can be set via +.Dv SO_RCVBUF +socket option. +.El .Sh DEBUGGING Netlink implements per-functional-unit debugging, with different severities controllable via the diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index fdf718de2483..5b1e572d786f 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -2976,12 +2976,13 @@ sooptcopyin(struct sockopt *sopt, void *buf, size_t len, size_t minlen) return (0); } +u_long nl_maxsockbuf = 512 * 1024 * 1024; /* 512M, XXX: init based on physmem */ + u_long sogetmaxbuf(struct socket *so) { if (so->so_proto->pr_domain->dom_family != PF_NETLINK) return (sb_max); - u_long nl_maxsockbuf = 512 * 1024 * 1024; /* 512M, XXX: init based on physmem */ return ((priv_check(curthread, PRIV_NET_ROUTE) == 0) ? nl_maxsockbuf : sb_max); } diff --git a/sys/netlink/netlink_domain.c b/sys/netlink/netlink_domain.c index c451274b1e63..348788434175 100644 --- a/sys/netlink/netlink_domain.c +++ b/sys/netlink/netlink_domain.c @@ -76,9 +76,12 @@ SYSCTL_ULONG(_net_netlink, OID_AUTO, recvspace, CTLFLAG_RW, &nl_recvspace, 0, "Default netlink socket receive space"); extern u_long sb_max_adj; -#if 0 -static u_long nl_maxsockbuf = 512 * 1024 * 1024; /* 512M, XXX: init based on physmem */ -#endif +extern u_long nl_maxsockbuf; +static int sysctl_handle_nl_maxsockbuf(SYSCTL_HANDLER_ARGS); +SYSCTL_OID(_net_netlink, OID_AUTO, nl_maxsockbuf, + CTLTYPE_ULONG | CTLFLAG_RW | CTLFLAG_MPSAFE, &nl_maxsockbuf, 0, + sysctl_handle_nl_maxsockbuf, "LU", + "Maximum Netlink socket buffer size"); uint32_t nlp_get_pid(const struct nlpcb *nlp) @@ -673,6 +676,22 @@ nl_ctloutput(struct socket *so, struct sockopt *sopt) return (error); } +static int +sysctl_handle_nl_maxsockbuf(SYSCTL_HANDLER_ARGS) +{ + int error = 0; + u_long tmp_maxsockbuf = nl_maxsockbuf; + + error = sysctl_handle_long(oidp, &tmp_maxsockbuf, arg2, req); + if (error || !req->newptr) + return (error); + if (tmp_maxsockbuf < MSIZE + MCLBYTES) + return (EINVAL); + nl_maxsockbuf = tmp_maxsockbuf; + + return (0); +} + #if 0 static int nl_setsbopt(struct socket *so, struct sockopt *sopt)