Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 738314a0 authored by Jiri Benc's avatar Jiri Benc Committed by David S. Miller
Browse files

openvswitch: use hard_header_len instead of hardcoded ETH_HLEN 



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: default avatarJiri Benc <jbenc@redhat.com>
Acked-by: default avatarPravin B Shelar <pshelar@ovn.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c540594f

net/openvswitch/actions.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -791,7 +791,8 @@ static void do_output(struct datapath *dp, struct sk_buff *skb, int out_port, 
				pskb_trim(skb, ETH_HLEN);

				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);

			ovs_vport_send(vport, skb);

		} else if (mru <= vport->dev->mtu) {

		} else if (mru <= vport->dev->mtu) {

			struct net *net = read_pnet(&dp->net);

			struct net *net = read_pnet(&dp->net);

net/openvswitch/vport.c

+6 −4
Original line number Original line Diff line number Diff line
@@ -464,9 +464,10 @@ int ovs_vport_receive(struct vport *vport, struct sk_buff *skb, 
	return 0;

	return 0;

}

}





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_vlan_tag_present(skb) &&

	if (!skb_vlan_tag_present(skb) &&

	    eth_type_vlan(skb->protocol))

	    eth_type_vlan(skb->protocol))
@@ -484,10 +485,11 @@ void ovs_vport_send(struct vport *vport, struct sk_buff *skb) 
{

{

	int mtu = vport->dev->mtu;

	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",

		net_warn_ratelimited("%s: dropped over-mtu packet: %d > %d\n",

				     vport->dev->name,

				     vport->dev->name,

				     packet_length(skb), mtu);

				     packet_length(skb, vport->dev), mtu);

		vport->dev->stats.tx_errors++;

		vport->dev->stats.tx_errors++;

		goto drop;

		goto drop;

	}

	}