From patchwork Tue Nov 29 23:30:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarno Rajahalme X-Patchwork-Id: 700769 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3tT0Dm6l4dz9t17 for ; Wed, 30 Nov 2016 10:31:36 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755146AbcK2XbU (ORCPT ); Tue, 29 Nov 2016 18:31:20 -0500 Received: from relay4-d.mail.gandi.net ([217.70.183.196]:49912 "EHLO relay4-d.mail.gandi.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754554AbcK2XbM (ORCPT ); Tue, 29 Nov 2016 18:31:12 -0500 Received: from mfilter33-d.gandi.net (mfilter33-d.gandi.net [217.70.178.164]) by relay4-d.mail.gandi.net (Postfix) with ESMTP id E2F261720A1; Wed, 30 Nov 2016 00:31:10 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mfilter33-d.gandi.net Received: from relay4-d.mail.gandi.net ([IPv6:::ffff:217.70.183.196]) by mfilter33-d.gandi.net (mfilter33-d.gandi.net [::ffff:10.0.15.180]) (amavisd-new, port 10024) with ESMTP id Ublfv1I0vcVo; Wed, 30 Nov 2016 00:31:09 +0100 (CET) X-Originating-IP: 208.91.1.34 Received: from sc9-mailhost3.vmware.com (unknown [208.91.1.34]) (Authenticated sender: jarno@ovn.org) by relay4-d.mail.gandi.net (Postfix) with ESMTPSA id C46FD1720B2; Wed, 30 Nov 2016 00:31:07 +0100 (CET) From: Jarno Rajahalme To: netdev@vger.kernel.org Cc: jarno@ovn.org, jbenc@redhat.com, pshelar@ovn.org, e@erig.me Subject: [PATCH v3 net-next 2/3] openvswitch: Use is_skb_forwardable() for length check. Date: Tue, 29 Nov 2016 15:30:52 -0800 Message-Id: <1480462253-114713-2-git-send-email-jarno@ovn.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1480462253-114713-1-git-send-email-jarno@ovn.org> References: <1480462253-114713-1-git-send-email-jarno@ovn.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Use is_skb_forwardable() instead of an explicit length check. This gets around the apparent MTU check failure in OVS test cases when skb->protocol is not properly set in case of non-accelerated VLAN skbs. Suggested-by: Pravin Shelar Fixes: 5108bbaddc ("openvswitch: add processing of L3 packets") Signed-off-by: Jarno Rajahalme --- v3: New patch suggested by Pravin. net/openvswitch/vport.c | 38 ++++++++++++++------------------------ 1 file changed, 14 insertions(+), 24 deletions(-) diff --git a/net/openvswitch/vport.c b/net/openvswitch/vport.c index b6c8524..076b39f 100644 --- a/net/openvswitch/vport.c +++ b/net/openvswitch/vport.c @@ -464,27 +464,8 @@ int ovs_vport_receive(struct vport *vport, struct sk_buff *skb, return 0; } -static unsigned int packet_length(const struct sk_buff *skb, - struct net_device *dev) -{ - unsigned int length = skb->len - dev->hard_header_len; - - if (!skb_vlan_tag_present(skb) && - eth_type_vlan(skb->protocol)) - length -= VLAN_HLEN; - - /* Don't subtract for multiple VLAN tags. Most (all?) drivers allow - * (ETH_LEN + VLAN_HLEN) in addition to the mtu value, but almost none - * account for 802.1ad. e.g. is_skb_forwardable(). - */ - - return length; -} - void ovs_vport_send(struct vport *vport, struct sk_buff *skb, u8 mac_proto) { - int mtu = vport->dev->mtu; - switch (vport->dev->type) { case ARPHRD_NONE: if (mac_proto == MAC_PROTO_ETHERNET) { @@ -504,11 +485,20 @@ void ovs_vport_send(struct vport *vport, struct sk_buff *skb, u8 mac_proto) goto drop; } - 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, vport->dev), mtu); + if (unlikely(!is_skb_forwardable(vport->dev, skb))) { + /* Log only if the device is up. */ + if (vport->dev->flags & IFF_UP) { + unsigned int length = skb->len + - vport->dev->hard_header_len; + + if (!skb_vlan_tag_present(skb) + && eth_type_vlan(skb->protocol)) + length -= VLAN_HLEN; + + net_warn_ratelimited("%s: dropped over-mtu packet %d > %d\n", + vport->dev->name, length, + vport->dev->mtu); + } vport->dev->stats.tx_errors++; goto drop; }