From nobody Wed Nov 20 09:09:58 2024 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 4XtbD716qZz5dTvJ; Wed, 20 Nov 2024 09:09:59 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XtbD70SGzz4ZSS; Wed, 20 Nov 2024 09:09:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732093799; 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=S+BhRNno5fN8d32vK5gpFxwEqe+POm3gnxjqchrrJbg=; b=WnLdTVR0ipPFNQveDC+37518mtBg1WT1GunCdgWWwdc+wQAYuYCUnQV3q5DbaXJrpwJVZd AVy6thkhBQ+cdhgUQhmP15NXgvi5QXccHSZ8Awc1cT/pLV7/HqYcTST6GeEP7BGY8U82vv CD8B7RdM+HCiLX62iT+WBhWoEEyS0BSQJjdu0c0FzEPxWVDH6Ei+YfNHtgs+1zemrL95iT h+VmjLu66QLfStLSoTo7uY3zFKv4aPHdIWMxi5R5P5eZ5nE+//2e9kkgW+NtqbW0Paptwc aJIt0+SxgQOjtV1eLw1OEU9YTlfn/u8z31xvyXTzVkwgU7pQynD1qB4ckDd2BQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732093799; 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=S+BhRNno5fN8d32vK5gpFxwEqe+POm3gnxjqchrrJbg=; b=ShRRi/8Oh5x254cLFwENsvpudlcxBKVaOJPApycEkqR77X6unASE3o6Qhg7j4GULemJkII VtGA6TNvCC6j7/cLIs4qo20AXimqldKv99naRtSZadyWPRlh32VkpdEcYlDsfq8pI24flu BKlH2rHZTqMCjobcXnHyLF3mybiGPcYt5eYrPC5ET28kr7qMgHad9xGuhg3SzdkYpzxWRC gpmt81Knx/68+234E1P22XEB6E9p3JVyWj7N/H/hyCc1QeLCeRyNfcBY8AttMA6HENtu9V NJhMel/9O41SnAjwo1oaKfxVpo+014LiLtnKDb+oyaO2FapyfTwIvz5PHHt9Tw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1732093799; a=rsa-sha256; cv=none; b=vqL0uF54Z/BAICcPQMjiIVDmLc/QswvcjcI7HkVo/HoWvEjp0V3FWb2TL4K9JB+XOal9AH 816O6c35fZBnYPrYsigyrYA5s9Wpb7IStwd78yGOAkaxgmwP9WevhM76zOCR6JK9GhgXXD I2KQDwPR+n26XKvAY+3JeDIHJZxioqAbo5gvXnKb4JZN+LtsdfR1D7YWFL6i+rb30Vpyts 6Zb2CLq2lKmGhjS/CZg+k2zn8x/jkXh3Vnfv9p/QNjWFN8nj1Z8rLmGRV5UgSIdcWLqZDi KkF37CPaHTwX9spyS+wWzQSj23r2KvrqmJrImMZHTXyJYAJUrbC2kz7YsHPo1Q== 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 4XtbD703wqznsk; Wed, 20 Nov 2024 09:09:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4AK99wgW012708; Wed, 20 Nov 2024 09:09:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AK99wIi012705; Wed, 20 Nov 2024 09:09:58 GMT (envelope-from git) Date: Wed, 20 Nov 2024 09:09:58 GMT Message-Id: <202411200909.4AK99wIi012705@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 438ca68cef3c - main - netinet: default mib counter probe points off 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 438ca68cef3c678de1c01630266831a59818e208 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=438ca68cef3c678de1c01630266831a59818e208 commit 438ca68cef3c678de1c01630266831a59818e208 Author: Kristof Provost AuthorDate: 2024-11-18 09:43:46 +0000 Commit: Kristof Provost CommitDate: 2024-11-20 08:52:48 +0000 netinet: default mib counter probe points off Disable the IP/IP6/ICMP/... counter probe points by default. They are kept enabled in debug builds, and can be enabled with 'options KDTRACE_MIB_SDT'. Requested by: glebius Reviewed by: glebius Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D47657 --- sys/conf/options | 2 +- sys/conf/std.debug | 1 + sys/conf/std.nodebug | 1 + sys/netinet/in_kdtrace.c | 2 +- sys/netinet/in_kdtrace.h | 2 +- sys/sys/sdt.h | 2 +- 6 files changed, 6 insertions(+), 4 deletions(-) diff --git a/sys/conf/options b/sys/conf/options index 0e959c3b9828..61d29a2b74fa 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -143,7 +143,7 @@ GEOM_ZERO opt_geom.h IFLIB opt_iflib.h KDTRACE_HOOKS opt_global.h KDTRACE_FRAME opt_kdtrace.h -KDTRACE_NO_MIB_SDT opt_global.h +KDTRACE_MIB_SDT opt_global.h KN_HASHSIZE opt_kqueue.h KSTACK_MAX_PAGES KSTACK_PAGES diff --git a/sys/conf/std.debug b/sys/conf/std.debug index 53789f269b80..f5ed5582c78d 100644 --- a/sys/conf/std.debug +++ b/sys/conf/std.debug @@ -15,3 +15,4 @@ options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed options MALLOC_DEBUG_MAXZONES=8 # Separate malloc(9) zones options VERBOSE_SYSINIT=0 # Support debug.verbose_sysinit, off by default options ALT_BREAK_TO_DEBUGGER # Enter debugger on keyboard escape sequence +options KDTRACE_MIB_SDT # Add SDT probes to network counters diff --git a/sys/conf/std.nodebug b/sys/conf/std.nodebug index 38eb77c8d3a7..4035e28d2a62 100644 --- a/sys/conf/std.nodebug +++ b/sys/conf/std.nodebug @@ -15,6 +15,7 @@ nooptions COVERAGE nooptions KCOV nooptions MALLOC_DEBUG_MAXZONES nooptions QUEUE_MACRO_DEBUG_TRASH +nooptions KDTRACE_MIB_SDT # Net80211 debugging nooptions IEEE80211_DEBUG diff --git a/sys/netinet/in_kdtrace.c b/sys/netinet/in_kdtrace.c index bfa57bd8bf1e..7e0b9a6a9373 100644 --- a/sys/netinet/in_kdtrace.c +++ b/sys/netinet/in_kdtrace.c @@ -36,7 +36,7 @@ SDT_PROVIDER_DEFINE(tcp); SDT_PROVIDER_DEFINE(udp); SDT_PROVIDER_DEFINE(udplite); -#ifndef KDTRACE_NO_MIB_SDT +#ifdef KDTRACE_MIB_SDT #define MIB_PROBE_IP(name) \ SDT_PROBE_DEFINE1(mib, ip, count, name, \ "int") diff --git a/sys/netinet/in_kdtrace.h b/sys/netinet/in_kdtrace.h index 3fb82ad961dd..7b0d433c60d8 100644 --- a/sys/netinet/in_kdtrace.h +++ b/sys/netinet/in_kdtrace.h @@ -54,7 +54,7 @@ SDT_PROVIDER_DECLARE(tcp); SDT_PROVIDER_DECLARE(udp); SDT_PROVIDER_DECLARE(udplite); -#ifndef KDTRACE_NO_MIB_SDT +#ifdef KDTRACE_MIB_SDT SDT_PROVIDER_DECLARE(mib); SDT_PROBE_DECLARE(mib, ip, count, ips_total); diff --git a/sys/sys/sdt.h b/sys/sys/sdt.h index 5fa612fcf632..cd45bc1a1ffd 100644 --- a/sys/sys/sdt.h +++ b/sys/sys/sdt.h @@ -357,7 +357,7 @@ __sdt_probe##uniq:; \ (uintptr_t)arg0, (uintptr_t)arg1, (uintptr_t)arg2, \ (uintptr_t)arg3, (uintptr_t)arg4, (uintptr_t)arg5) -#ifndef KDTRACE_NO_MIB_SDT +#ifdef KDTRACE_MIB_SDT #define MIB_SDT_PROBE1(...) SDT_PROBE1(mib, __VA_ARGS__) #define MIB_SDT_PROBE2(...) SDT_PROBE2(mib, __VA_ARGS__) #else