From nobody Thu Feb 13 16:46:10 2025 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 4Yv1KG5BW3z5my9F; Thu, 13 Feb 2025 16:46:10 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yv1KG4Y2Cz3NDh; Thu, 13 Feb 2025 16:46:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739465170; 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=oPwfTWzrymvhcr7JEOpQLodgntNqH8qys5r6WZWzKTM=; b=h0CXz7WPsKSW2VCP98ZncO4llPTzO2zitD1x5LCLy56HIUxLjqfLjbkUsxm8OQ0lqolNSI iAsOFc8MrSCI17l2PZiSFvOS0kyDJOcqkkbsm0kU7POlKFzY5Ik8EYS/iwdg30jPGEs8Pt iIHB1Ba9v7Ygx7QP/7AfU8+gkWMNT0xxgEqTGwKpl0FYsfUVrkg9iq6X2RPdqYzIt1jexJ HvkjLxSlkEoT0nu76nv8/4rPJkMv0I2r3OIfnH1mD1RYV33mMnu2HckPYSZBv2QgSRKP0d trNxGKlwOnYo9OhQEu8AM8oyxvSqLgh5LzHU9moU2UOtFMQrpq3C05TGg3wDxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739465170; 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=oPwfTWzrymvhcr7JEOpQLodgntNqH8qys5r6WZWzKTM=; b=JfwVAm3d9BhytxWyWbrYBGFdnIZc/hcMNT0W3jsSheXXZ+sbgU/44uY/QXa1k7X7mlrc0w d75fuqEFLcLASmaNJUHZkAPaLi8KfbD1IOW7hkaLnDhAqNbB5StUgkQncGydRBUrEf60ro hkQCXsCXZRwPA+zqygkddSscmiWGNkotYhom1Gmu4H7JZKAapP2MdW/zS5QI8ZcUISIUEM VL/ERhkSxiB9Pak1CeyI3g4rt/eIcK+tA8b78MZ8bBw8hCw00sNEVSzxteoZrGbvIdis1a EA6gOBokrKJbAntglKrlkhdsrVP3SzrNg6PMjLL7rwSDui1+pAW0Gw3stlEZRQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739465170; a=rsa-sha256; cv=none; b=rmYrbsDQ3Vw8s9nadi/6zz0L+Su+z+ufESDEDHDCxA09FfX19d8R0eFKbWCkuj1fIumbog WvmxfY8gDaBFkmHojuSvpNQB1YchlAlHY88k46/sp6RhxvOL3HzPlAgDbew4BPUJ8f3ewI H8fJHoYQMlX8N2L5zzvVCTIFXgl/m0BLI7i1ok5/L3XRIcpQdlI62fWZZUB4VSSYn199AV ZKvkDNqmjVBQgeuAWMzTjQQcJrAkxRxWmyz+DcMjhgK21X1v3N+O2KTtS8PeCOUKTOROVJ U3O993EtFrEBaj1kz2byvDQOtU9xZhCZ/U49xQ6Wmj6vBNPEb8Ob18TC1LCX2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Yv1KG3gbWztCg; Thu, 13 Feb 2025 16:46:10 +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 51DGkAAn041477; Thu, 13 Feb 2025 16:46:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51DGkADQ041474; Thu, 13 Feb 2025 16:46:10 GMT (envelope-from git) Date: Thu, 13 Feb 2025 16:46:10 GMT Message-Id: <202502131646.51DGkADQ041474@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: ebc96321e706 - releng/13.5 - icmp: do not store per-VNET identical array of strings 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.5 X-Git-Reftype: branch X-Git-Commit: ebc96321e706ee61f7eafcb77a44695d6faeeb52 Auto-Submitted: auto-generated The branch releng/13.5 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=ebc96321e706ee61f7eafcb77a44695d6faeeb52 commit ebc96321e706ee61f7eafcb77a44695d6faeeb52 Author: Gleb Smirnoff AuthorDate: 2024-03-24 16:13:23 +0000 Commit: Michael Tuexen CommitDate: 2025-02-13 13:56:10 +0000 icmp: do not store per-VNET identical array of strings We need per-VNET struct counter_rate, but we don't need per-VNET set of const char *. Also, identical word "response" can go into the format string instead of being stored 7 times. Reviewed by: kp, zlei, tuexen Differential Revision: https://reviews.freebsd.org/D44475 Approved by: re (cperciva) (cherry picked from commit 7142ab4790666022a2a3d85910e9cd8e241d9b87) (cherry picked from commit 0939f3a046533a2df1d2b10fd914c98755dacb0b) --- sys/netinet/ip_icmp.c | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c index f0e63d6c8b1a..54411d55f49c 100644 --- a/sys/netinet/ip_icmp.c +++ b/sys/netinet/ip_icmp.c @@ -1085,28 +1085,26 @@ ip_next_mtu(int mtu, int dir) * the 'final' error, but it doesn't make sense to solve the printing * delay with more complex code. */ -struct icmp_rate { - const char *descr; - struct counter_rate cr; -}; -VNET_DEFINE_STATIC(struct icmp_rate, icmp_rates[BANDLIM_MAX]) = { - { "icmp unreach response" }, - { "icmp ping response" }, - { "icmp tstamp response" }, - { "closed port RST response" }, - { "open port RST response" }, - { "icmp6 unreach response" }, - { "sctp ootb response" } -}; +VNET_DEFINE_STATIC(struct counter_rate, icmp_rates[BANDLIM_MAX]); #define V_icmp_rates VNET(icmp_rates) +static const char *icmp_rate_descrs[BANDLIM_MAX] = { + [BANDLIM_ICMP_UNREACH] = "icmp unreach", + [BANDLIM_ICMP_ECHO] = "icmp ping", + [BANDLIM_ICMP_TSTAMP] = "icmp tstamp", + [BANDLIM_RST_CLOSEDPORT] = "closed port RST", + [BANDLIM_RST_OPENPORT] = "open port RST", + [BANDLIM_ICMP6_UNREACH] = "icmp6 unreach", + [BANDLIM_SCTP_OOTB] = "sctp ootb", +}; + static void icmp_bandlimit_init(void) { for (int i = 0; i < BANDLIM_MAX; i++) { - V_icmp_rates[i].cr.cr_rate = counter_u64_alloc(M_WAITOK); - V_icmp_rates[i].cr.cr_ticks = ticks; + V_icmp_rates[i].cr_rate = counter_u64_alloc(M_WAITOK); + V_icmp_rates[i].cr_ticks = ticks; } } VNET_SYSINIT(icmp_bandlimit, SI_SUB_PROTO_DOMAIN, SI_ORDER_ANY, @@ -1117,7 +1115,7 @@ icmp_bandlimit_uninit(void) { for (int i = 0; i < BANDLIM_MAX; i++) - counter_u64_free(V_icmp_rates[i].cr.cr_rate); + counter_u64_free(V_icmp_rates[i].cr_rate); } VNET_SYSUNINIT(icmp_bandlimit, SI_SUB_PROTO_DOMAIN, SI_ORDER_THIRD, icmp_bandlimit_uninit, NULL); @@ -1136,7 +1134,7 @@ badport_bandlim(int which) if ((V_icmplim + V_icmplim_curr_jitter) <= 0) V_icmplim_curr_jitter = -V_icmplim + 1; - pps = counter_ratecheck(&V_icmp_rates[which].cr, V_icmplim + + pps = counter_ratecheck(&V_icmp_rates[which], V_icmplim + V_icmplim_curr_jitter); if (pps > 0) { /* @@ -1154,8 +1152,9 @@ badport_bandlim(int which) if (pps == -1) return (-1); if (pps > 0 && V_icmplim_output) - log(LOG_NOTICE, "Limiting %s from %jd to %d packets/sec\n", - V_icmp_rates[which].descr, (intmax_t )pps, V_icmplim + + log(LOG_NOTICE, + "Limiting %s response from %jd to %d packets/sec\n", + icmp_rate_descrs[which], (intmax_t )pps, V_icmplim + V_icmplim_curr_jitter); return (0); }