diff options
| author | Zhenlei Huang <zlei@FreeBSD.org> | 2023-04-02 17:01:51 +0000 |
|---|---|---|
| committer | Zhenlei Huang <zlei@FreeBSD.org> | 2023-04-10 04:15:04 +0000 |
| commit | ed44ba413c544c0aa05b3456bc430c816a0e3168 (patch) | |
| tree | 21f4aa5a9818a4b4974d18ebc2a49d4c349f01dc | |
| parent | d1d5d8f69659c4d3573e64a62a9306ee944d9e4d (diff) | |
| download | src-ed44ba413c544c0aa05b3456bc430c816a0e3168.tar.gz src-ed44ba413c544c0aa05b3456bc430c816a0e3168.zip | |
lagg(4): Tap traffic after protocol processing
Different lagg protocols have different means and policies to process incoming
traffic. For example, for failover protocol, by default received traffic is only
accepted when they are received through the active port. For lacp protocol, LACP
control messages are tapped off, also traffic will be dropped if they are
received through the port which is not in collecting state or is not joined to
the active aggregator. It confuses if user dump and see inbound traffic on
lagg(4) interfaces but they are actually silently dropped and not passed into
the net stack.
Tap traffic after protocol processing so that user will have consistent view of
the inbound traffic, meanwhile mbuf is set with correct receiving interface and
bpf(4) will diagnose the right direction of inbound packets.
PR: 270417
Reviewed by: melifaro (previous version)
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D39225
(cherry picked from commit 5f3d0399e903573e9648385ea6585e54af4d573f)
| -rw-r--r-- | sys/net/if_lagg.c | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/sys/net/if_lagg.c b/sys/net/if_lagg.c index 74f8c41a125e..3bbcb4f8e4cd 100644 --- a/sys/net/if_lagg.c +++ b/sys/net/if_lagg.c @@ -2070,12 +2070,14 @@ lagg_input_ethernet(struct ifnet *ifp, struct mbuf *m) return (NULL); } - ETHER_BPF_MTAP(scifp, m); - m = lagg_proto_input(sc, lp, m); - if (m != NULL && (scifp->if_flags & IFF_MONITOR) != 0) { - m_freem(m); - m = NULL; + if (m != NULL) { + ETHER_BPF_MTAP(scifp, m); + + if ((scifp->if_flags & IFF_MONITOR) != 0) { + m_freem(m); + m = NULL; + } } return (m); @@ -2098,12 +2100,14 @@ lagg_input_infiniband(struct ifnet *ifp, struct mbuf *m) return (NULL); } - INFINIBAND_BPF_MTAP(scifp, m); - m = lagg_proto_input(sc, lp, m); - if (m != NULL && (scifp->if_flags & IFF_MONITOR) != 0) { - m_freem(m); - m = NULL; + if (m != NULL) { + INFINIBAND_BPF_MTAP(scifp, m); + + if ((scifp->if_flags & IFF_MONITOR) != 0) { + m_freem(m); + m = NULL; + } } NET_EPOCH_EXIT(et); |