From nobody Sun Apr 2 15:27:51 2023 X-Original-To: dev-commits-src-main@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 4PqHw75Gl4z43nJ8; Sun, 2 Apr 2023 15:27:51 +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 4PqHw74hJ5z3py6; Sun, 2 Apr 2023 15:27:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680449271; 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=484MfaEs5jDdhBqnFNzsLpcSjQ9LKvLSN9fAjfrRs+M=; b=kKpsPgm8TLa0LYfs4CUFYDxFb4hiLOGlpkB2u8Mf0MlhQbgQDUkmbFwJBd359kpqE7XQ4r 4ptJEjk43iQctOahMkB9fvk3z93x2UiC9KfZIxzt/lfb6Qn8JHQUUXH7P8jGK21kEZCNUY M60W1ZMSjQVjoJUat8BZ4YJia86ZiYNVyCUbDHrgssw7MUXVLYpsYZT03F2+8j/trgmuQa spymNh4sL59vT4YmMkfc9DVwldWLGyXu/cNM234zrGvYTVKy+CGrS1IWmFWAou9ZIh1yB1 /60+uXlv4pmgHX7HCTwQ1LSXNjuXpYchEW4vqM+p4/hNNtwCSJnvcZ4Bjx3iEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680449271; 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=484MfaEs5jDdhBqnFNzsLpcSjQ9LKvLSN9fAjfrRs+M=; b=TEQI6dTsSvSEDUYuw9qS2o6ZQzZdz7VRaKhNHU533Y/tfeA4cGfO+ub19c2lbu//RUxUM9 l4NbdhvZAKyScju5VJy6f3uu9Yk2jF7aq2ENZqDOf0N0p05H3DdGImuoBmx9T65u4o5SJn wKAnWCAgjlxFbC367myT+/R07NiZbd16qlctxjTplKGTFyP9T4ij9lJOuM2jTahdixDTIw Q2TBCMpfTzAOC/xUYaMxZjcDmFaaQGTJEDnHdpbgjCvDdabVsLg7ZtkFV/h1yRHt7pfAnI XkKczQjROiwI+3TPLFwyKFEW7ig2meOOi523Fcz9F7Py+tDMlT+RbE0gnGewew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680449271; a=rsa-sha256; cv=none; b=kKhi3Kq9sEoYfGOv9o/nXn8o/MXPrN3gCJXOMiL97b8TG35hX37BKlEL+gd99iCblcZhXM Mh070D37P3G3XhKD5NIyDSC+Z9NQYb5YGD7Mpd3dEq1YDpaYg8C/2LLWvbCPgqNOr/jtJz VKqEMfGAaS8mzADUmcCpGa3cj3mMjXdMz0QoNynF1QNDa/UC1xBcDW5ax+8POTb7xcO3oo E/iyFje+E3XSg1PCmz8XeqSAdctCGfQxzjFksft7rtfDCVl0AberSm9XGNq9H5SjiFrc6N Ob2orYpZW+RFm3Vq2mf5Vp5ksDRdvM2ji0f3T+IVaHznT86qxa3U8E5jlM29tQ== 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 4PqHw73RV8zMd1; Sun, 2 Apr 2023 15:27:51 +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 332FRpxc065774; Sun, 2 Apr 2023 15:27:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 332FRpXp065773; Sun, 2 Apr 2023 15:27:51 GMT (envelope-from git) Date: Sun, 2 Apr 2023 15:27:51 GMT Message-Id: <202304021527.332FRpXp065773@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: 3091d980f581 - main - netlink: add NETLINK to the DEFAULTS for each architecture List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 3091d980f581753f86df4155057b4ef23eb3ad27 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=3091d980f581753f86df4155057b4ef23eb3ad27 commit 3091d980f581753f86df4155057b4ef23eb3ad27 Author: Alexander V. Chernikov AuthorDate: 2023-04-02 11:50:04 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-04-02 15:27:21 +0000 netlink: add NETLINK to the DEFAULTS for each architecture NETLINK is going to replace rtsock and a number of other ioctl/sysctl interfaces. In-base utilies such as route(8), netstat(8) and soon ifconfig(8) are being converted to use netlink sockets as a transport between kernel and userland. In the current configuration, it still possible have the kernel without NETLINK (`nooptions NETLINK`) and use the aforementioned utilies by buidling the world with `WITHOUT_NETLINK` src.conf knob. However, this approach does not cover the cases when person unintentionally builds a custom kernel without netlink and tries to use the standard userland. This change adds `option NETLINK` to the default options for each architecture, fixing the custom kernel issue. For arm, this change uses `std.armv6` and `std.armv7` (netlink already in) instead of DEFAULTS. Reviewed By: imp Differential Revision: https://reviews.freebsd.org/D39339 --- sys/amd64/conf/DEFAULTS | 2 ++ sys/amd64/conf/GENERIC | 1 - sys/arm/conf/std.armv6 | 1 + sys/arm64/conf/DEFAULTS | 2 ++ sys/arm64/conf/std.arm64 | 1 - sys/i386/conf/DEFAULTS | 2 ++ sys/i386/conf/GENERIC | 1 - sys/powerpc/conf/DEFAULTS | 2 ++ sys/powerpc/conf/GENERIC64 | 1 - sys/riscv/conf/DEFAULTS | 2 ++ sys/riscv/conf/GENERIC | 1 - 11 files changed, 11 insertions(+), 5 deletions(-) diff --git a/sys/amd64/conf/DEFAULTS b/sys/amd64/conf/DEFAULTS index 733823e931d6..bc8a268e1ea4 100644 --- a/sys/amd64/conf/DEFAULTS +++ b/sys/amd64/conf/DEFAULTS @@ -25,3 +25,5 @@ options GEOM_PART_GPT options CC_CUBIC # include CUBIC congestion control options NEW_PCIB + +options NETLINK # netlink(4) support diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index 46c901300371..67463e1013f8 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -31,7 +31,6 @@ options VIMAGE # Subsystem virtualization, e.g. VNET options INET # InterNETworking options INET6 # IPv6 communications protocols options IPSEC_SUPPORT # Allow kldload of ipsec and tcpmd5 -options NETLINK # netlink(4) support options ROUTE_MPATH # Multipath routing support options FIB_ALGO # Modular fib lookups options TCP_OFFLOAD # TCP offload diff --git a/sys/arm/conf/std.armv6 b/sys/arm/conf/std.armv6 index 17087f30f4f1..eb61ca42bf9d 100644 --- a/sys/arm/conf/std.armv6 +++ b/sys/arm/conf/std.armv6 @@ -11,6 +11,7 @@ options CC_CUBIC # include CUBIC congestion control options TCP_HHOOK # hhook(9) framework for TCP device crypto # core crypto support options IPSEC_SUPPORT # Allow kldload of ipsec and tcpmd5 +options NETLINK # netlink(4) support options SCTP_SUPPORT # Allow kldload of SCTP options FFS # Berkeley Fast Filesystem options SOFTUPDATES # Enable FFS soft updates support diff --git a/sys/arm64/conf/DEFAULTS b/sys/arm64/conf/DEFAULTS index db76185154e1..d55a957f4b5b 100644 --- a/sys/arm64/conf/DEFAULTS +++ b/sys/arm64/conf/DEFAULTS @@ -18,3 +18,5 @@ options CC_CUBIC # include CUBIC congestion control options NEW_PCIB options INTRNG + +options NETLINK # netlink(4) support diff --git a/sys/arm64/conf/std.arm64 b/sys/arm64/conf/std.arm64 index ff2acef22a4d..6480ca6530e4 100644 --- a/sys/arm64/conf/std.arm64 +++ b/sys/arm64/conf/std.arm64 @@ -13,7 +13,6 @@ options INET # InterNETworking options INET6 # IPv6 communications protocols options CC_CUBIC # include CUBIC congestion control options IPSEC_SUPPORT # Allow kldload of ipsec and tcpmd5 -options NETLINK # netlink(4) support options ROUTE_MPATH # Multipath routing support options FIB_ALGO # Modular fib lookups options TCP_OFFLOAD # TCP offload diff --git a/sys/i386/conf/DEFAULTS b/sys/i386/conf/DEFAULTS index 820ff0ff30f0..f4956183b85c 100644 --- a/sys/i386/conf/DEFAULTS +++ b/sys/i386/conf/DEFAULTS @@ -29,3 +29,5 @@ options CC_CUBIC # include CUBIC congestion control device atpic options NEW_PCIB + +options NETLINK # netlink(4) support diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index 8e688bd6581b..475b584f366b 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -32,7 +32,6 @@ options VIMAGE # Subsystem virtualization, e.g. VNET options INET # InterNETworking options INET6 # IPv6 communications protocols options IPSEC_SUPPORT # Allow kldload of ipsec and tcpmd5 -options NETLINK # netlink(4) support options ROUTE_MPATH # Multipath routing support options TCP_HHOOK # hhook(9) framework for TCP options TCP_OFFLOAD # TCP offload diff --git a/sys/powerpc/conf/DEFAULTS b/sys/powerpc/conf/DEFAULTS index 984283c5bf5f..b9ce3e41c123 100644 --- a/sys/powerpc/conf/DEFAULTS +++ b/sys/powerpc/conf/DEFAULTS @@ -16,3 +16,5 @@ options GEOM_PART_MBR options CC_CUBIC # include CUBIC congestion control options NEW_PCIB + +options NETLINK # netlink(4) support diff --git a/sys/powerpc/conf/GENERIC64 b/sys/powerpc/conf/GENERIC64 index 6c40b031bee6..c4277983b66a 100644 --- a/sys/powerpc/conf/GENERIC64 +++ b/sys/powerpc/conf/GENERIC64 @@ -42,7 +42,6 @@ options VIMAGE # Subsystem virtualization, e.g. VNET options INET # InterNETworking options INET6 # IPv6 communications protocols options IPSEC_SUPPORT # Allow kldload of ipsec and tcpmd5 -options NETLINK # netlink(4) support options ROUTE_MPATH # Multipath routing support options TCP_OFFLOAD # TCP offload options TCP_BLACKBOX # Enhanced TCP event logging diff --git a/sys/riscv/conf/DEFAULTS b/sys/riscv/conf/DEFAULTS index 363186d28904..dbf94f9e0335 100644 --- a/sys/riscv/conf/DEFAULTS +++ b/sys/riscv/conf/DEFAULTS @@ -18,3 +18,5 @@ options CC_CUBIC # include CUBIC congestion control options NEW_PCIB options INTRNG + +options NETLINK # netlink(4) support diff --git a/sys/riscv/conf/GENERIC b/sys/riscv/conf/GENERIC index df7d680ff3ff..49e3f07c0f96 100644 --- a/sys/riscv/conf/GENERIC +++ b/sys/riscv/conf/GENERIC @@ -31,7 +31,6 @@ options INET # InterNETworking options INET6 # IPv6 communications protocols options TCP_HHOOK # hhook(9) framework for TCP options IPSEC_SUPPORT # Allow kldload of ipsec and tcpmd5 -options NETLINK # netlink(4) support options ROUTE_MPATH # Multipath routing support options TCP_OFFLOAD # TCP offload options TCP_BLACKBOX # Enhanced TCP event logging