Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

openvswitch: use hard_header_len instead of hardcoded ETH_HLEN

Browse source 
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 <jbenc@redhat.com>
Acked-by: Pravin B Shelar <pshelar@ovn.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jiri Benc 2016-11-10 16:28:17 +01:00 committed by David S. Miller
parent c540594f86
commit 738314a084
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
net/openvswitch/actions.c
View file

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

10
net/openvswitch/vport.c
View file

@ -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;
} }