From nobody Fri Feb 10 16:19:14 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 4PCzSy30PRz3pDp6; Fri, 10 Feb 2023 16:19:14 +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 4PCzSy2H4bz4XH8; Fri, 10 Feb 2023 16:19:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676045954; 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=TSfGU4PbfHmhSP5ueO919xSO85v3dC2DFymBp6Fl0zo=; b=UErHN6hsRCtGTiawydVssVVHnYTgj0+UrZif6JrKV9ZZp9hOfG7KJk+xKMOF3lQYOnFj2T KDRhvZ4HCbT7ydwvQlzrwQQV1yrc6haqDOBfyX+9fyTgbJP4lITOZnAvIDXriWw4bpV8F2 JqFmRiLDmHK7awE6+SeAZK4GA0hZ7eayr/dVM4wdd/bDaTN73aBkIIwe0jqnzgbmgmgg0a HpfeEc7AA4AyEv01mvsDnR1UGl0QpJfVEAZvquUCf3KFW2pQ9Gw6INKX+5IW79Q8RYCv38 jUFnO5N5ozwZb0+keQTHQtqq0wbZcswUr9sJVb91T0zKmhTb3DSKxUkO/hcP+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676045954; 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=TSfGU4PbfHmhSP5ueO919xSO85v3dC2DFymBp6Fl0zo=; b=B3+5B9aEG7Shg3eotYry7GWOt9M5Mq69wpWQX9ZDVovq4oFSq+AUZOO3Lagz17qtvSiphb mVw6/rA51HlA8bLHOXDidhUWx8ZA8kmObXtMCso6nnkuy3QV9CXMi9cbFsQaLvdfGXcjfZ TfK/PjBeilo1fBDnliBZTPKGdUNn2owIu3lXQLbODKV4nkQpaq63EhU83IPkQKRa15e6M/ QYvNjAIKQ+3Bcgp6Y/mGisdpyI1/BjpYQAjMW9wVTg9BKkVok+Lz9piQNIU0m5CNAEqvCW /K7FPv8bBrkL31rsdwjIVho8vsbLGTDXcMSCsAt09+jBvAXkVablkyROnYhnSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676045954; a=rsa-sha256; cv=none; b=SSH0bi8c3q+f3sgg9ONxcXHZq79IkQnLCIgvbzsy8pbqm1pPhrj31amaAG0VdYT1EayV24 7ukLMS+FYH6PdNlvfPh/h1y2a7UX41ww8cQlHzbjaaPnZhnNZlTgqQYpf6W1k1dquPF7Uh G5M6FrEIep8E4ZpklGvNN+m4jtMCoPOELfADSzadWbVoXLfUtElZt3vdnAEvvoc/DINKas j2bOHXqZpVQmUKLqxyQUyr7nlqpxqlGIU9y4v5pRhoR+dccGMHOnPugGdHndhf4xzGK3rh 91NAxKvAdk+Iu1t55OW9mcJtNirr5Gzfq8jihRviORksZF55CbTu50J5o9mO5Q== 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 4PCzSy1LWQzPjc; Fri, 10 Feb 2023 16:19:14 +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 31AGJErr073292; Fri, 10 Feb 2023 16:19:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31AGJESZ073291; Fri, 10 Feb 2023 16:19:14 GMT (envelope-from git) Date: Fri, 10 Feb 2023 16:19:14 GMT Message-Id: <202302101619.31AGJESZ073291@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: c3d3f3594fdf - stable/13 - netlink: allow to override sb_max for netlink sockets. 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/stable/13 X-Git-Reftype: branch X-Git-Commit: c3d3f3594fdf653392936594b75ec330af12d7fa Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=c3d3f3594fdf653392936594b75ec330af12d7fa commit c3d3f3594fdf653392936594b75ec330af12d7fa Author: Alexander V. Chernikov AuthorDate: 2023-02-10 16:07:17 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-02-10 16:07:22 +0000 netlink: allow to override sb_max for netlink sockets. Netlink sockets sometimes require larger buffers than other sockets. For example, full-view IPv4 dump sent via netlink may consume 50+ megabytes. The desired buffer may be bigger than the system maximum `sb_max`. FreeBSD HEAD has a mechanism for overriding protocol `setsockopt()` handler, which netlink uses to permit buffer reservations beyond `sb_max`. This behaviour is handy as it doesn't require system administrator to lift the limits for other sockets. Stable/13 lack such muchanism, so a different approach has to be used. This diff is a direct commit to stable/13 and it simply copies the logic from Netlink in -HEAD for checking if the larger buffer size should be permitted. Differential Revision: https://reviews.freebsd.org/D38472 --- sys/kern/uipc_sockbuf.c | 3 ++- sys/kern/uipc_socket.c | 10 ++++++++++ sys/sys/sockopt.h | 1 + 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/sys/kern/uipc_sockbuf.c b/sys/kern/uipc_sockbuf.c index cbfcc0e5fe95..277965412779 100644 --- a/sys/kern/uipc_sockbuf.c +++ b/sys/kern/uipc_sockbuf.c @@ -693,7 +693,8 @@ sbsetopt(struct socket *so, int cmd, u_long cc) if (*lowat > *hiwat) *lowat = *hiwat; } else { - if (!sbreserve_locked(sb, cc, so, curthread)) + u_long limit = sogetmaxbuf(so); + if (!sbreserve_locked_limit(sb, cc, so, limit, curthread)) error = ENOBUFS; } if (error == 0) diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index f8931b653a4d..fdf718de2483 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -128,6 +128,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -2975,6 +2976,15 @@ sooptcopyin(struct sockopt *sopt, void *buf, size_t len, size_t minlen) return (0); } +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); +} + /* * Kernel version of setsockopt(2). * diff --git a/sys/sys/sockopt.h b/sys/sys/sockopt.h index cb7fc3ffca27..d01d62f21680 100644 --- a/sys/sys/sockopt.h +++ b/sys/sys/sockopt.h @@ -68,5 +68,6 @@ int accept_filt_getopt(struct socket *, struct sockopt *); int accept_filt_setopt(struct socket *, struct sockopt *); int so_setsockopt(struct socket *so, int level, int optname, void *optval, size_t optlen); +u_long sogetmaxbuf(struct socket *so); #endif /* _SYS_SOCKOPT_H_ */