From nobody Thu Feb 9 16:40:35 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 4PCN042F2Cz3ppGl; Thu, 9 Feb 2023 16:40:36 +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 4PCN041kTjz4N9T; Thu, 9 Feb 2023 16:40:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675960836; 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=QeNHEf0J57rwnS8N4Cdw+cphIk4pWd7r9Qwlp0WrU00=; b=eqFK0PZVm9YAs4Gv0py3czg3MnlXkamcAh6Q2ryiRSqUBra1LYwxv0OzknGR9m7yEPjP3g jQyI4StHrmyE/ezwDQCXaYCLMnIvstGJNM62sDSnKPqL0QF4RiUcnUX+Q2DjhZQdRfB3CS OOHERKf4XnAyaAunvBGG6S2DZjn9cXR2WTS7408Pb9VPjyS1YWdHN+ZORkgex+f5fIxkdz iqzQzz7Kgw0ZZqsMTqQ+tNTj2B7ILd1wqfdVQeH0r5xPgjVCNSox/vuLWP8ZjTNfuj+1ld ackjXxKphgkdR4ZXxDoJqHKu32mVBvy1ZlWgEuMAUGE5lX3ft/9vxHkfmi0/nA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675960836; 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=QeNHEf0J57rwnS8N4Cdw+cphIk4pWd7r9Qwlp0WrU00=; b=uCR9H3XvyG0mND8sB3rs5BNs65mnS8oRimH+1z9hP+m7DPMd5t+ePk+iYZ/MGfcEtxc9Ry 4tmRs7wGqjDV63bd1JVqJI5DKsp7MxP/LJRqM7SUrkCpraP8tFsoC/xM6ZZeA58lu4QUaj WsuQjcaeQX39uOte/fywim/YNwVJM4Q+R0cmjpwAPx0KJJ7Qpcdq0pu5Xx77vvzO2fBDeh l8oTF5i0ncI4ODI6SRg9tlkmF+pSBjd/djR1f9/MFetp0YWXwX/qyJTBqnWxAYquFSBkAw PqNiMHgr+ljeiCaYscKo9/Va5JuiFF6z+D4ZNRIFPY88CWFg41DOqBb3WZrUFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675960836; a=rsa-sha256; cv=none; b=HOqOJ0lbjFg86RI4c3BWADndACz7eajfl0+p4EO7w2rHyl2ij0iUjgKx8/eEvYDAkY4PyT 9kSJbgfA7BLHOguPMtR3sUSQ/PZR8Z37/xSIg/ZpgFSyNQMMxl+/wa10WCPn+R1N3r94Tf pgVgVdbiUB4uuQatR/MklSzUMhdQhEBRhp7HWsX2i1+WaicKWKKp0Wo7PAt6zEOXwm4U4m vWEOgAle0WSbBkwXNsskhnkNHpynlS+X2cC2Pl90rM66tRjPA+XpBiCOAVYBgszLUP0nKl /gYzhhGu5h4a8UHB/kjOszBqyXq80Wi4d8ntFcSFuriCcNp5fNrEGWR/T1AUEg== 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 4PCN040hwhzkHw; Thu, 9 Feb 2023 16:40:36 +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 319GeajX047583; Thu, 9 Feb 2023 16:40:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 319GeZO2047582; Thu, 9 Feb 2023 16:40:35 GMT (envelope-from git) Date: Thu, 9 Feb 2023 16:40:35 GMT Message-Id: <202302091640.319GeZO2047582@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: 23d017b8d4c2 - stable/13 - netlink: add "netlink" to the list of kernel features 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: 23d017b8d4c2a17bca15fe794dd0b2deb7e18f03 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=23d017b8d4c2a17bca15fe794dd0b2deb7e18f03 commit 23d017b8d4c2a17bca15fe794dd0b2deb7e18f03 Author: Alexander V. Chernikov AuthorDate: 2023-01-30 11:13:51 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-02-09 16:37:15 +0000 netlink: add "netlink" to the list of kernel features Reduce the amount of debug messages on module init/detach. MFC after: 1 week (cherry picked from commit 7fc9cfa57ccd4ee8ee71f8edfacfc26afab9cd2e) --- sys/netlink/netlink_module.c | 10 +++++----- sys/netlink/netlink_route.c | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/netlink/netlink_module.c b/sys/netlink/netlink_module.c index a433022b82b7..f820796a6028 100644 --- a/sys/netlink/netlink_module.c +++ b/sys/netlink/netlink_module.c @@ -45,6 +45,7 @@ __FBSDID("$FreeBSD$"); #include MALLOC_DEFINE(M_NETLINK, "netlink", "Memory used for netlink packets"); +FEATURE(netlink, "Netlink support"); #define DEBUG_MOD_NAME nl_mod #define DEBUG_MAX_LEVEL LOG_DEBUG3 @@ -156,7 +157,7 @@ netlink_register_proto(int proto, const char *proto_name, nl_handler_f handler) nl_handlers[proto].cb = handler; nl_handlers[proto].proto_name = proto_name; NL_GLOBAL_UNLOCK(); - NL_LOG(LOG_DEBUG, "Registered netlink %s(%d) handler", proto_name, proto); + NL_LOG(LOG_DEBUG2, "Registered netlink %s(%d) handler", proto_name, proto); return (true); } @@ -170,7 +171,7 @@ netlink_unregister_proto(int proto) nl_handlers[proto].cb = NULL; nl_handlers[proto].proto_name = NULL; NL_GLOBAL_UNLOCK(); - NL_LOG(LOG_DEBUG, "Unregistered netlink proto %d handler", proto); + NL_LOG(LOG_DEBUG2, "Unregistered netlink proto %d handler", proto); return (true); } @@ -203,12 +204,11 @@ netlink_modevent(module_t mod __unused, int what, void *priv __unused) switch (what) { case MOD_LOAD: - NL_LOG(LOG_DEBUG, "Loading"); - NL_LOG(LOG_NOTICE, "netlink support is in BETA stage"); + NL_LOG(LOG_DEBUG2, "Loading"); break; case MOD_UNLOAD: - NL_LOG(LOG_DEBUG, "Unload called"); + NL_LOG(LOG_DEBUG2, "Unload called"); if (can_unload()) { NL_LOG(LOG_WARNING, "unloading"); netlink_unloading = 1; diff --git a/sys/netlink/netlink_route.c b/sys/netlink/netlink_route.c index 42b0bc66666e..037fd2170c66 100644 --- a/sys/netlink/netlink_route.c +++ b/sys/netlink/netlink_route.c @@ -115,7 +115,7 @@ static struct rtbridge *nlbridge_orig_p; static void rtnl_load(void *u __unused) { - NL_LOG(LOG_NOTICE, "rtnl loading"); + NL_LOG(LOG_DEBUG2, "rtnl loading"); nlbridge_orig_p = netlink_callback_p; netlink_callback_p = &nlbridge; rtnl_neighs_init();