| Message ID | 20211024201423.1367844-1-cyril.strejc@skoda.cz (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 9122a70a6333705c0c35614ddc51c274ed1d3637 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [v2] net: multicast: calculate csum of looped-back and forwarded packets | expand |
On Sun, Oct 24, 2021 at 4:17 PM Cyril Strejc <cyril.strejc@skoda.cz> wrote: > > During a testing of an user-space application which transmits UDP > multicast datagrams and utilizes multicast routing to send the UDP > datagrams out of defined network interfaces, I've found a multicast > router does not fill-in UDP checksum into locally produced, looped-back > and forwarded UDP datagrams, if an original output NIC the datagrams > are sent to has UDP TX checksum offload enabled. > > The datagrams are sent malformed out of the NIC the datagrams have been > forwarded to. > > It is because: > > 1. If TX checksum offload is enabled on the output NIC, UDP checksum > is not calculated by kernel and is not filled into skb data. > > 2. dev_loopback_xmit(), which is called solely by > ip_mc_finish_output(), sets skb->ip_summed = CHECKSUM_UNNECESSARY > unconditionally. > > 3. Since 35fc92a9 ("[NET]: Allow forwarding of ip_summed except > CHECKSUM_COMPLETE"), the ip_summed value is preserved during > forwarding. > > 4. If ip_summed != CHECKSUM_PARTIAL, checksum is not calculated during > a packet egress. > > The minimum fix in dev_loopback_xmit(): > > 1. Preserves skb->ip_summed CHECKSUM_PARTIAL. This is the > case when the original output NIC has TX checksum offload enabled. > The effects are: > > a) If the forwarding destination interface supports TX checksum > offloading, the NIC driver is responsible to fill-in the > checksum. > > b) If the forwarding destination interface does NOT support TX > checksum offloading, checksums are filled-in by kernel before > skb is submitted to the NIC driver. > > c) For local delivery, checksum validation is skipped as in the > case of CHECKSUM_UNNECESSARY, thanks to skb_csum_unnecessary(). > > 2. Translates ip_summed CHECKSUM_NONE to CHECKSUM_UNNECESSARY. It > means, for CHECKSUM_NONE, the behavior is unmodified and is there > to skip a looped-back packet local delivery checksum validation. > > Signed-off-by: Cyril Strejc <cyril.strejc@skoda.cz> Reviewed-by: Willem de Bruijn <willemb@google.com>
Hello: This patch was applied to netdev/net.git (master) by David S. Miller <davem@davemloft.net>: On Sun, 24 Oct 2021 22:14:25 +0200 you wrote: > During a testing of an user-space application which transmits UDP > multicast datagrams and utilizes multicast routing to send the UDP > datagrams out of defined network interfaces, I've found a multicast > router does not fill-in UDP checksum into locally produced, looped-back > and forwarded UDP datagrams, if an original output NIC the datagrams > are sent to has UDP TX checksum offload enabled. > > [...] Here is the summary with links: - [v2] net: multicast: calculate csum of looped-back and forwarded packets https://git.kernel.org/netdev/net/c/9122a70a6333 You are awesome, thank you!
diff --git a/include/net/udp.h b/include/net/udp.h index 360df454356c..909ecf447e0f 100644 --- a/include/net/udp.h +++ b/include/net/udp.h @@ -494,8 +494,9 @@ static inline struct sk_buff *udp_rcv_segment(struct sock *sk, * CHECKSUM_NONE in __udp_gso_segment. UDP GRO indeed builds partial * packets in udp_gro_complete_segment. As does UDP GSO, verified by * udp_send_skb. But when those packets are looped in dev_loopback_xmit - * their ip_summed is set to CHECKSUM_UNNECESSARY. Reset in this - * specific case, where PARTIAL is both correct and required. + * their ip_summed CHECKSUM_NONE is changed to CHECKSUM_UNNECESSARY. + * Reset in this specific case, where PARTIAL is both correct and + * required. */ if (skb->pkt_type == PACKET_LOOPBACK) skb->ip_summed = CHECKSUM_PARTIAL; diff --git a/net/core/dev.c b/net/core/dev.c index 7ee9fecd3aff..c0009c3f88a0 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -3906,7 +3906,8 @@ int dev_loopback_xmit(struct net *net, struct sock *sk, struct sk_buff *skb) skb_reset_mac_header(skb); __skb_pull(skb, skb_network_offset(skb)); skb->pkt_type = PACKET_LOOPBACK; - skb->ip_summed = CHECKSUM_UNNECESSARY; + if (skb->ip_summed == CHECKSUM_NONE) + skb->ip_summed = CHECKSUM_UNNECESSARY; WARN_ON(!skb_dst(skb)); skb_dst_force(skb); netif_rx_ni(skb);
During a testing of an user-space application which transmits UDP multicast datagrams and utilizes multicast routing to send the UDP datagrams out of defined network interfaces, I've found a multicast router does not fill-in UDP checksum into locally produced, looped-back and forwarded UDP datagrams, if an original output NIC the datagrams are sent to has UDP TX checksum offload enabled. The datagrams are sent malformed out of the NIC the datagrams have been forwarded to. It is because: 1. If TX checksum offload is enabled on the output NIC, UDP checksum is not calculated by kernel and is not filled into skb data. 2. dev_loopback_xmit(), which is called solely by ip_mc_finish_output(), sets skb->ip_summed = CHECKSUM_UNNECESSARY unconditionally. 3. Since 35fc92a9 ("[NET]: Allow forwarding of ip_summed except CHECKSUM_COMPLETE"), the ip_summed value is preserved during forwarding. 4. If ip_summed != CHECKSUM_PARTIAL, checksum is not calculated during a packet egress. The minimum fix in dev_loopback_xmit(): 1. Preserves skb->ip_summed CHECKSUM_PARTIAL. This is the case when the original output NIC has TX checksum offload enabled. The effects are: a) If the forwarding destination interface supports TX checksum offloading, the NIC driver is responsible to fill-in the checksum. b) If the forwarding destination interface does NOT support TX checksum offloading, checksums are filled-in by kernel before skb is submitted to the NIC driver. c) For local delivery, checksum validation is skipped as in the case of CHECKSUM_UNNECESSARY, thanks to skb_csum_unnecessary(). 2. Translates ip_summed CHECKSUM_NONE to CHECKSUM_UNNECESSARY. It means, for CHECKSUM_NONE, the behavior is unmodified and is there to skip a looped-back packet local delivery checksum validation. Signed-off-by: Cyril Strejc <cyril.strejc@skoda.cz> --- include/net/udp.h | 5 +++-- net/core/dev.c | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-)