From nobody Fri Feb 10 16:19:12 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 4PCzSx1ZMRz3pDj3; Fri, 10 Feb 2023 16:19:13 +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 4PCzSx15RFz4X5t; Fri, 10 Feb 2023 16:19:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676045953; 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=9dnk+juVg06zepFqqAwcc5vMxt0OX2pRqsuf+bcjuWc=; b=iO5hIq7VNRWUEaGzLm3bTQ11u4O29xGulZNpzi4jUE8eNNsgDrNfhDHs+pGL+3lT0gQ2iy dEXqMARc+EmDfxosO309QHUehPsQdullk+JoOs/NIkd6+pt0raf8Ky3HyjiGqkGjK5M7MZ qDG7NVyXprn6eEnSt8JR55NqeHO5A3qx8khwHOgbn4LkdY1NVQeSL34DyFCVRMsTgKLQtE JnfAxDCJ49uPqhtuBD9rdIacy9G0UPPnyUIKV+p0aNaBfaDuQr/jYduXhzypfq/aRe7D+Y 6D4CM3PsZ3+NZ9z5Nq5BW31L1JzTeCeZfUu/3tlwmPu7ovMMDH+7OaFn1kd0gA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676045953; 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=9dnk+juVg06zepFqqAwcc5vMxt0OX2pRqsuf+bcjuWc=; b=wExn0uAeIPl7IwO7cu88B09n6EBL6Zis+iWlWIewWOeffE6jvUIJ4rIsYfJb/dVna5rYHc 7nqcYS0nZrOEZAYTTzlMu14kCuwoLAe8LKerg6TOi2rbm8lb/8jJaOHPCq18GHBgZiM1wy 3UIdLdu8BGyonAcdZtz+BB94vi0WmODNIjwuqi02XltOdNyVlMSWc9vDy29WIzPIbRFEy4 RJHQ3jaEOQKScV27XjFY/3nIw5MqMOMskr3BTPyQV5grQh4nE6V5eLv2G4sNmDOchOnBCM n1PlpIfdzHuM+z2AeA7VH3TH0RPzfFZX9c4xOQffdwGDPS85d/Bn25Ale7dE2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676045953; a=rsa-sha256; cv=none; b=FgcwXFvW0t/lupOe5uhM0ixugAuNwdMN95rx5Zp8rwPTQdqIWyxaG5LCaaNWNj4DOqLKdG eBQsg7pVsPpw9M3jJ96xdA153fBxB5IVTBIDDwQm20nkrvKdNmxRTTz3fsGQmF2/XbaM/Z Mdq+1VmuiGAfX+ruOK2fPNiQV77VG+OqkXHpsQOEOH5D4M4lbHJxzk2cUo5rxx0r5yOime 3071xdcF5HwvImoFYJ+cefzrnJ7xtQfktJHxSJR6HCsFsV+xdIQdvFuzIZbVSH1CHueznJ WKv/0UzE5fnXs6+3ZmsriKMcacLWhjkC5S0nB9HRK6rHbEshGtFlWbY6I+WKKw== 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 4PCzSx07qtzPJX; Fri, 10 Feb 2023 16:19:13 +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 31AGJCFq073268; Fri, 10 Feb 2023 16:19:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31AGJClv073267; Fri, 10 Feb 2023 16:19:12 GMT (envelope-from git) Date: Fri, 10 Feb 2023 16:19:12 GMT Message-Id: <202302101619.31AGJClv073267@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: 3a4b31e1f496 - stable/13 - Revert "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: 3a4b31e1f49668dc4facfcfa60e6b8c8e625eff4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=3a4b31e1f49668dc4facfcfa60e6b8c8e625eff4 commit 3a4b31e1f49668dc4facfcfa60e6b8c8e625eff4 Author: Alexander V. Chernikov AuthorDate: 2023-02-10 16:05:52 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-02-10 16:05:52 +0000 Revert "netlink: allow to override sb_max for netlink sockets" This reverts commit 4f81fdc0886f623043767866ebe4339bd12edf18. --- sys/kern/uipc_sockbuf.c | 3 +-- sys/kern/uipc_socket.c | 10 ---------- sys/sys/sockopt.h | 1 - 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/sys/kern/uipc_sockbuf.c b/sys/kern/uipc_sockbuf.c index 277965412779..cbfcc0e5fe95 100644 --- a/sys/kern/uipc_sockbuf.c +++ b/sys/kern/uipc_sockbuf.c @@ -693,8 +693,7 @@ sbsetopt(struct socket *so, int cmd, u_long cc) if (*lowat > *hiwat) *lowat = *hiwat; } else { - u_long limit = sogetmaxbuf(so); - if (!sbreserve_locked_limit(sb, cc, so, limit, curthread)) + if (!sbreserve_locked(sb, cc, so, curthread)) error = ENOBUFS; } if (error == 0) diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index fdf718de2483..f8931b653a4d 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -128,7 +128,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include #include @@ -2976,15 +2975,6 @@ 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 d01d62f21680..cb7fc3ffca27 100644 --- a/sys/sys/sockopt.h +++ b/sys/sys/sockopt.h @@ -68,6 +68,5 @@ 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_ */