From: Petr Machata <petrm@nvidia.com> To: "David S. Miller" <davem@davemloft.net>, Eric Dumazet <edumazet@google.com>, Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>, Roopa Prabhu <roopa@nvidia.com>, Nikolay Aleksandrov <razor@blackwall.org>, <netdev@vger.kernel.org> Cc: <bridge@lists.linux-foundation.org>, Petr Machata <petrm@nvidia.com>, "Ido Schimmel" <idosch@nvidia.com>, Steven Rostedt <rostedt@goodmis.org>, <linux-trace-kernel@vger.kernel.org> Subject: [PATCH net-next mlxsw v2 06/16] net: bridge: Add a tracepoint for MDB overflows Date: Wed, 1 Feb 2023 18:28:39 +0100 [thread overview] Message-ID: <008620de41985a3a757c7099bc712ae75739db27.1675271084.git.petrm@nvidia.com> (raw) In-Reply-To: <cover.1675271084.git.petrm@nvidia.com> The following patch will add two more maximum MDB allowances to the global one, mcast_hash_max, that exists today. In all these cases, attempts to add MDB entries above the configured maximums through netlink, fail noisily and obviously. Such visibility is missing when adding entries through the control plane traffic, by IGMP or MLD packets. To improve visibility in those cases, add a trace point that reports the violation, including the relevant netdevice (be it a slave or the bridge itself), and the MDB entry parameters: # perf record -e bridge:br_mdb_full & # [...] # perf script | cut -d: -f4- dev v2 af 2 src ::ffff:0.0.0.0 grp ::ffff:239.1.1.112/00:00:00:00:00:00 vid 0 dev v2 af 10 src :: grp ff0e::112/00:00:00:00:00:00 vid 0 dev v2 af 2 src ::ffff:0.0.0.0 grp ::ffff:239.1.1.112/00:00:00:00:00:00 vid 10 dev v2 af 10 src 2001:db8:1::1 grp ff0e::1/00:00:00:00:00:00 vid 10 dev v2 af 2 src ::ffff:192.0.2.1 grp ::ffff:239.1.1.1/00:00:00:00:00:00 vid 10 CC: Steven Rostedt <rostedt@goodmis.org> CC: linux-trace-kernel@vger.kernel.org Signed-off-by: Petr Machata <petrm@nvidia.com> --- Notes: v2: - Report IPv4 as an IPv6-mapped address through the IPv6 buffer as well, to save ring buffer space. include/trace/events/bridge.h | 58 +++++++++++++++++++++++++++++++++++ net/core/net-traces.c | 1 + 2 files changed, 59 insertions(+) diff --git a/include/trace/events/bridge.h b/include/trace/events/bridge.h index 6b200059c2c5..a6b3a4e409f0 100644 --- a/include/trace/events/bridge.h +++ b/include/trace/events/bridge.h @@ -122,6 +122,64 @@ TRACE_EVENT(br_fdb_update, __entry->flags) ); +TRACE_EVENT(br_mdb_full, + + TP_PROTO(const struct net_device *dev, + const struct br_ip *group), + + TP_ARGS(dev, group), + + TP_STRUCT__entry( + __string(dev, dev->name) + __field(int, af) + __field(u16, vid) + __array(__u8, src, 16) + __array(__u8, grp, 16) + __array(__u8, grpmac, ETH_ALEN) /* For af == 0. */ + ), + + TP_fast_assign( + struct in6_addr *in6; + + __assign_str(dev, dev->name); + __entry->vid = group->vid; + + if (!group->proto) { + __entry->af = 0; + + memset(__entry->src, 0, sizeof(__entry->src)); + memset(__entry->grp, 0, sizeof(__entry->grp)); + memcpy(__entry->grpmac, group->dst.mac_addr, ETH_ALEN); + } else if (group->proto == htons(ETH_P_IP)) { + __entry->af = AF_INET; + + in6 = (struct in6_addr *)__entry->src; + ipv6_addr_set_v4mapped(group->src.ip4, in6); + + in6 = (struct in6_addr *)__entry->grp; + ipv6_addr_set_v4mapped(group->dst.ip4, in6); + + memset(__entry->grpmac, 0, ETH_ALEN); + +#if IS_ENABLED(CONFIG_IPV6) + } else { + __entry->af = AF_INET6; + + in6 = (struct in6_addr *)__entry->src; + *in6 = group->src.ip6; + + in6 = (struct in6_addr *)__entry->grp; + *in6 = group->dst.ip6; + + memset(__entry->grpmac, 0, ETH_ALEN); +#endif + } + ), + + TP_printk("dev %s af %u src %pI6c grp %pI6c/%pM vid %u", + __get_str(dev), __entry->af, __entry->src, __entry->grp, + __entry->grpmac, __entry->vid) +); #endif /* _TRACE_BRIDGE_H */ diff --git a/net/core/net-traces.c b/net/core/net-traces.c index c40cd8dd75c7..c6820ad2183f 100644 --- a/net/core/net-traces.c +++ b/net/core/net-traces.c @@ -41,6 +41,7 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(br_fdb_add); EXPORT_TRACEPOINT_SYMBOL_GPL(br_fdb_external_learn_add); EXPORT_TRACEPOINT_SYMBOL_GPL(fdb_delete); EXPORT_TRACEPOINT_SYMBOL_GPL(br_fdb_update); +EXPORT_TRACEPOINT_SYMBOL_GPL(br_mdb_full); #endif #if IS_ENABLED(CONFIG_PAGE_POOL) -- 2.39.0
WARNING: multiple messages have this Message-ID (diff)
From: Petr Machata <petrm@nvidia.com> To: "David S. Miller" <davem@davemloft.net>, Eric Dumazet <edumazet@google.com>, Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>, Roopa Prabhu <roopa@nvidia.com>, Nikolay Aleksandrov <razor@blackwall.org>, netdev@vger.kernel.org Cc: Petr Machata <petrm@nvidia.com>, Ido Schimmel <idosch@nvidia.com>, bridge@lists.linux-foundation.org, Steven Rostedt <rostedt@goodmis.org>, linux-trace-kernel@vger.kernel.org Subject: [Bridge] [PATCH net-next mlxsw v2 06/16] net: bridge: Add a tracepoint for MDB overflows Date: Wed, 1 Feb 2023 18:28:39 +0100 [thread overview] Message-ID: <008620de41985a3a757c7099bc712ae75739db27.1675271084.git.petrm@nvidia.com> (raw) In-Reply-To: <cover.1675271084.git.petrm@nvidia.com> The following patch will add two more maximum MDB allowances to the global one, mcast_hash_max, that exists today. In all these cases, attempts to add MDB entries above the configured maximums through netlink, fail noisily and obviously. Such visibility is missing when adding entries through the control plane traffic, by IGMP or MLD packets. To improve visibility in those cases, add a trace point that reports the violation, including the relevant netdevice (be it a slave or the bridge itself), and the MDB entry parameters: # perf record -e bridge:br_mdb_full & # [...] # perf script | cut -d: -f4- dev v2 af 2 src ::ffff:0.0.0.0 grp ::ffff:239.1.1.112/00:00:00:00:00:00 vid 0 dev v2 af 10 src :: grp ff0e::112/00:00:00:00:00:00 vid 0 dev v2 af 2 src ::ffff:0.0.0.0 grp ::ffff:239.1.1.112/00:00:00:00:00:00 vid 10 dev v2 af 10 src 2001:db8:1::1 grp ff0e::1/00:00:00:00:00:00 vid 10 dev v2 af 2 src ::ffff:192.0.2.1 grp ::ffff:239.1.1.1/00:00:00:00:00:00 vid 10 CC: Steven Rostedt <rostedt@goodmis.org> CC: linux-trace-kernel@vger.kernel.org Signed-off-by: Petr Machata <petrm@nvidia.com> --- Notes: v2: - Report IPv4 as an IPv6-mapped address through the IPv6 buffer as well, to save ring buffer space. include/trace/events/bridge.h | 58 +++++++++++++++++++++++++++++++++++ net/core/net-traces.c | 1 + 2 files changed, 59 insertions(+) diff --git a/include/trace/events/bridge.h b/include/trace/events/bridge.h index 6b200059c2c5..a6b3a4e409f0 100644 --- a/include/trace/events/bridge.h +++ b/include/trace/events/bridge.h @@ -122,6 +122,64 @@ TRACE_EVENT(br_fdb_update, __entry->flags) ); +TRACE_EVENT(br_mdb_full, + + TP_PROTO(const struct net_device *dev, + const struct br_ip *group), + + TP_ARGS(dev, group), + + TP_STRUCT__entry( + __string(dev, dev->name) + __field(int, af) + __field(u16, vid) + __array(__u8, src, 16) + __array(__u8, grp, 16) + __array(__u8, grpmac, ETH_ALEN) /* For af == 0. */ + ), + + TP_fast_assign( + struct in6_addr *in6; + + __assign_str(dev, dev->name); + __entry->vid = group->vid; + + if (!group->proto) { + __entry->af = 0; + + memset(__entry->src, 0, sizeof(__entry->src)); + memset(__entry->grp, 0, sizeof(__entry->grp)); + memcpy(__entry->grpmac, group->dst.mac_addr, ETH_ALEN); + } else if (group->proto == htons(ETH_P_IP)) { + __entry->af = AF_INET; + + in6 = (struct in6_addr *)__entry->src; + ipv6_addr_set_v4mapped(group->src.ip4, in6); + + in6 = (struct in6_addr *)__entry->grp; + ipv6_addr_set_v4mapped(group->dst.ip4, in6); + + memset(__entry->grpmac, 0, ETH_ALEN); + +#if IS_ENABLED(CONFIG_IPV6) + } else { + __entry->af = AF_INET6; + + in6 = (struct in6_addr *)__entry->src; + *in6 = group->src.ip6; + + in6 = (struct in6_addr *)__entry->grp; + *in6 = group->dst.ip6; + + memset(__entry->grpmac, 0, ETH_ALEN); +#endif + } + ), + + TP_printk("dev %s af %u src %pI6c grp %pI6c/%pM vid %u", + __get_str(dev), __entry->af, __entry->src, __entry->grp, + __entry->grpmac, __entry->vid) +); #endif /* _TRACE_BRIDGE_H */ diff --git a/net/core/net-traces.c b/net/core/net-traces.c index c40cd8dd75c7..c6820ad2183f 100644 --- a/net/core/net-traces.c +++ b/net/core/net-traces.c @@ -41,6 +41,7 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(br_fdb_add); EXPORT_TRACEPOINT_SYMBOL_GPL(br_fdb_external_learn_add); EXPORT_TRACEPOINT_SYMBOL_GPL(fdb_delete); EXPORT_TRACEPOINT_SYMBOL_GPL(br_fdb_update); +EXPORT_TRACEPOINT_SYMBOL_GPL(br_mdb_full); #endif #if IS_ENABLED(CONFIG_PAGE_POOL) -- 2.39.0
next prev parent reply other threads:[~2023-02-01 17:30 UTC|newest] Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-02-01 17:28 [PATCH net-next mlxsw v2 00/16] bridge: Limit number of MDB entries per port, port-vlan Petr Machata 2023-02-01 17:28 ` [Bridge] " Petr Machata 2023-02-01 17:28 ` [PATCH net-next mlxsw v2 01/16] net: bridge: Set strict_start_type at two policies Petr Machata 2023-02-01 17:28 ` [Bridge] " Petr Machata 2023-02-01 17:28 ` [PATCH net-next mlxsw v2 02/16] net: bridge: Add extack to br_multicast_new_port_group() Petr Machata 2023-02-01 17:28 ` [Bridge] " Petr Machata 2023-02-01 17:28 ` [PATCH net-next mlxsw v2 03/16] net: bridge: Move extack-setting " Petr Machata 2023-02-01 17:28 ` [Bridge] " Petr Machata 2023-02-01 17:28 ` [PATCH net-next mlxsw v2 04/16] net: bridge: Add br_multicast_del_port_group() Petr Machata 2023-02-01 17:28 ` [Bridge] " Petr Machata 2023-02-01 17:28 ` [PATCH net-next mlxsw v2 05/16] net: bridge: Change a cleanup in br_multicast_new_port_group() to goto Petr Machata 2023-02-01 17:28 ` [Bridge] " Petr Machata 2023-02-01 17:28 ` Petr Machata [this message] 2023-02-01 17:28 ` [Bridge] [PATCH net-next mlxsw v2 06/16] net: bridge: Add a tracepoint for MDB overflows Petr Machata 2023-02-02 16:22 ` Steven Rostedt 2023-02-02 16:22 ` [Bridge] " Steven Rostedt 2023-02-01 17:28 ` [PATCH net-next mlxsw v2 07/16] net: bridge: Maintain number of MDB entries in net_bridge_mcast_port Petr Machata 2023-02-01 17:28 ` [Bridge] " Petr Machata 2023-02-02 8:56 ` Nikolay Aleksandrov 2023-02-02 8:56 ` [Bridge] " Nikolay Aleksandrov 2023-02-02 8:57 ` Nikolay Aleksandrov 2023-02-02 8:57 ` [Bridge] " Nikolay Aleksandrov 2023-02-02 10:09 ` Petr Machata 2023-02-02 10:09 ` [Bridge] " Petr Machata 2023-02-01 17:28 ` [PATCH net-next mlxsw v2 08/16] net: bridge: Add netlink knobs for number / maximum MDB entries Petr Machata 2023-02-01 17:28 ` [Bridge] " Petr Machata 2023-02-02 8:52 ` Nikolay Aleksandrov 2023-02-02 8:52 ` [Bridge] " Nikolay Aleksandrov 2023-02-02 9:02 ` Nikolay Aleksandrov 2023-02-02 9:02 ` [Bridge] " Nikolay Aleksandrov 2023-02-02 15:02 ` Petr Machata 2023-02-02 15:02 ` [Bridge] " Petr Machata 2023-02-01 17:28 ` [PATCH net-next mlxsw v2 09/16] selftests: forwarding: Move IGMP- and MLD-related functions to lib Petr Machata 2023-02-01 17:28 ` [Bridge] " Petr Machata 2023-02-01 17:28 ` [PATCH net-next mlxsw v2 10/16] selftests: forwarding: bridge_mdb: Fix a typo Petr Machata 2023-02-01 17:28 ` [Bridge] " Petr Machata 2023-02-01 17:28 ` [PATCH net-next mlxsw v2 11/16] selftests: forwarding: lib: Add helpers for IP address handling Petr Machata 2023-02-01 17:28 ` [Bridge] " Petr Machata 2023-02-01 17:28 ` [PATCH net-next mlxsw v2 12/16] selftests: forwarding: lib: Add helpers for checksum handling Petr Machata 2023-02-01 17:28 ` [Bridge] " Petr Machata 2023-02-01 17:28 ` [PATCH net-next mlxsw v2 13/16] selftests: forwarding: lib: Parameterize IGMPv3/MLDv2 generation Petr Machata 2023-02-01 17:28 ` [Bridge] " Petr Machata 2023-02-01 17:28 ` [PATCH net-next mlxsw v2 14/16] selftests: forwarding: lib: Allow list of IPs for IGMPv3/MLDv2 Petr Machata 2023-02-01 17:28 ` [Bridge] " Petr Machata 2023-02-01 17:28 ` [PATCH net-next mlxsw v2 15/16] selftests: forwarding: lib: Add helpers to build IGMP/MLD leave packets Petr Machata 2023-02-01 17:28 ` [Bridge] " Petr Machata 2023-02-01 17:28 ` [PATCH net-next mlxsw v2 16/16] selftests: forwarding: bridge_mdb_max: Add a new selftest Petr Machata 2023-02-01 17:28 ` [Bridge] " Petr Machata 2023-02-01 18:25 ` [PATCH net-next mlxsw v2 00/16] bridge: Limit number of MDB entries per port, port-vlan Jakub Kicinski 2023-02-01 18:25 ` [Bridge] " Jakub Kicinski 2023-02-02 10:07 ` Petr Machata 2023-02-02 10:07 ` [Bridge] " Petr Machata
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=008620de41985a3a757c7099bc712ae75739db27.1675271084.git.petrm@nvidia.com \ --to=petrm@nvidia.com \ --cc=bridge@lists.linux-foundation.org \ --cc=davem@davemloft.net \ --cc=edumazet@google.com \ --cc=idosch@nvidia.com \ --cc=kuba@kernel.org \ --cc=linux-trace-kernel@vger.kernel.org \ --cc=netdev@vger.kernel.org \ --cc=pabeni@redhat.com \ --cc=razor@blackwall.org \ --cc=roopa@nvidia.com \ --cc=rostedt@goodmis.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.