From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Michael S. Tsirkin" Subject: Re: [PATCH v2 net 2/2] Revert "macvlan : fix checksums error when we are in bridge mode" Date: Tue, 29 Apr 2014 16:22:24 +0300 Message-ID: <20140429132224.GB18119@redhat.com> References: <1398780591-10644-1-git-send-email-vyasevic@redhat.com> <1398780591-10644-3-git-send-email-vyasevic@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: netdev@vger.kernel.org, daniel.lezcano@free.fr, nightnord@gmail.com, kaber@trash.net, eric.dumazet@gmail.com, jasowang@redhat.com To: Vlad Yasevich Return-path: Received: from mx1.redhat.com ([209.132.183.28]:10134 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752160AbaD2OV2 (ORCPT ); Tue, 29 Apr 2014 10:21:28 -0400 Content-Disposition: inline In-Reply-To: <1398780591-10644-3-git-send-email-vyasevic@redhat.com> Sender: netdev-owner@vger.kernel.org List-ID: On Tue, Apr 29, 2014 at 10:09:51AM -0400, Vlad Yasevich wrote: > This reverts commit 12a2856b604476c27d85a5f9a57ae1661fc46019. > The commit above doesn't appear to be necessary any more as the > checksums appear to be correctly computed/validated. > > Additionally the above commit breaks kvm configurations where > one VM is using a device that support checksum offload (virtio) and > the other VM does not. > In this case, packets leaving virtio device will have CHECKSUM_PARTIAL > set. The packets is forwarded to a macvtap that has offload features > turned off. Since we use CHECKSUM_UNNECESSARY, the host does does not > update the checksum and thus a bad checksum is passed up to > the guest. > > CC: Daniel Lezcano > CC: Patrick McHardy > CC: Andrian Nord > CC: Eric Dumazet > CC: Michael S. Tsirkin > CC: Jason Wang > Signed-off-by: Vlad Yasevich Acked-by: Michael S. Tsirkin > --- > drivers/net/macvlan.c | 3 --- > 1 file changed, 3 deletions(-) > > diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c > index 1831fb7..33b6cf8 100644 > --- a/drivers/net/macvlan.c > +++ b/drivers/net/macvlan.c > @@ -263,11 +263,9 @@ static int macvlan_queue_xmit(struct sk_buff *skb, struct net_device *dev) > const struct macvlan_dev *vlan = netdev_priv(dev); > const struct macvlan_port *port = vlan->port; > const struct macvlan_dev *dest; > - __u8 ip_summed = skb->ip_summed; > > if (vlan->mode == MACVLAN_MODE_BRIDGE) { > const struct ethhdr *eth = (void *)skb->data; > - skb->ip_summed = CHECKSUM_UNNECESSARY; > > /* send to other bridge ports directly */ > if (is_multicast_ether_addr(eth->h_dest)) { > @@ -285,7 +283,6 @@ static int macvlan_queue_xmit(struct sk_buff *skb, struct net_device *dev) > } > > xmit_world: > - skb->ip_summed = ip_summed; > skb->dev = vlan->lowerdev; > return dev_queue_xmit(skb); > } > -- > 1.9.0