>From net-next commit 738314a084aae5f76ff760279034b39d52c42e8b. On tx, use hard_header_len while deciding whether to refragment or drop the packet. That way, all combinations are calculated correctly:
* L2 packet going to L2 interface (the L2 header len is subtracted), * L2 packet going to L3 interface (the L2 header is included in the packet lenght), * L3 packet going to L3 interface. Signed-off-by: Jiri Benc <[email protected]> Acked-by: Pravin B Shelar <[email protected]> Signed-off-by: David S. Miller <[email protected]> Signed-off-by: Yi Yang <[email protected]> --- datapath/actions.c | 3 ++- datapath/vport.c | 10 ++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/datapath/actions.c b/datapath/actions.c index 82833d0..2a932d5 100644 --- a/datapath/actions.c +++ b/datapath/actions.c @@ -769,7 +769,8 @@ static void do_output(struct datapath *dp, struct sk_buff *skb, int out_port, pskb_trim(skb, ETH_HLEN); } - if (likely(!mru || (skb->len <= mru + ETH_HLEN))) { + if (likely(!mru || + (skb->len <= mru + vport->dev->hard_header_len))) { ovs_vport_send(vport, skb); } else if (mru <= vport->dev->mtu) { struct net *net = ovs_dp_get_net(dp); diff --git a/datapath/vport.c b/datapath/vport.c index c29f0b0..7170066 100644 --- a/datapath/vport.c +++ b/datapath/vport.c @@ -525,9 +525,10 @@ void ovs_vport_deferred_free(struct vport *vport) } EXPORT_SYMBOL_GPL(ovs_vport_deferred_free); -static unsigned int packet_length(const struct sk_buff *skb) +static unsigned int packet_length(const struct sk_buff *skb, + struct net_device *dev) { - unsigned int length = skb->len - ETH_HLEN; + unsigned int length = skb->len - dev->hard_header_len; if (skb->protocol == htons(ETH_P_8021Q)) length -= VLAN_HLEN; @@ -539,10 +540,11 @@ void ovs_vport_send(struct vport *vport, struct sk_buff *skb) { int mtu = vport->dev->mtu; - if (unlikely(packet_length(skb) > mtu && !skb_is_gso(skb))) { + if (unlikely(packet_length(skb, vport->dev) > mtu && + !skb_is_gso(skb))) { net_warn_ratelimited("%s: dropped over-mtu packet: %d > %d\n", vport->dev->name, - packet_length(skb), mtu); + packet_length(skb, vport->dev), mtu); vport->dev->stats.tx_errors++; goto drop; } -- 2.1.0 _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
