From patchwork Mon Dec 11 21:50:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Rose X-Patchwork-Id: 847259 X-Patchwork-Delegate: jpettit@nicira.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="UJYkyEMP"; dkim-atps=neutral Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3ywcK12lV4z9sxR for ; Tue, 12 Dec 2017 08:58:13 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id A6841DC8; Mon, 11 Dec 2017 21:51:17 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 0987EDA2 for ; Mon, 11 Dec 2017 21:51:16 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pg0-f65.google.com (mail-pg0-f65.google.com [74.125.83.65]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 996A750A for ; Mon, 11 Dec 2017 21:51:15 +0000 (UTC) Received: by mail-pg0-f65.google.com with SMTP id j4so11896434pgp.1 for ; Mon, 11 Dec 2017 13:51:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=lpfifrILEHH32ydV1Zc34Xfugup9U+HxlnCBt35mRcE=; b=UJYkyEMPKjgyUF87MzC/Don83LCLP2bRMljhtM1CoW3i6+MIFKQjdJRXMS0a/8KX3z 4XsQZ/8zlKGmNyNmNyH1Ov+CPWcqbmE9RGxt4XbU8e8NJBn56rDrjKh4nyHYkIbpb+LR 5e0UzFZt6HqbEaEMOAD4XYaPa7DC676IS/nZycd+Pj0iyuzot5rrjKuYOkPOL3cx6VWU m0xtUT7YtMdC4wE6JScbq9QiNB3Q3lOVZlPq5sP6FxsFFkpvsd9n/2xYIjCMbu+hA9Ov Ep9PHxll9ge1th9Ysz8Q3K3+AV5b5DLABuCE3ePDwhdgslYL6jv8g31bUlNzbiS9XSGO aQcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=lpfifrILEHH32ydV1Zc34Xfugup9U+HxlnCBt35mRcE=; b=fN4Qz0lVVjMR8+AK/OeNdrOXZXnBTQZOxy06aCoXwvyNLq4PpK98WB88jKnTG6s6UC 9z0tiISIZi53+h1YICblJZjVsF4nlTnghpatXO8fluZuDHbhOE7q41HQ1eGfi55RnQ9a gURefyIULZHh0HOBFoLX3iRoOLhPqgrw2Un9KbwAg6b0WqixHcm6PVNEWw3qTzPCPMds QfaL7HK35W+4Ek1mTLLbAnky5J/z4gTrs0SyYJc0/tKteu4TzZzPix4wK7U2+mGPP91n w7gKfZCJj88d+vTkxjzTrKack3TCNkxUqhBMlDwKHpf+CAq45YS5vS0yFgX20NAJorzn n/VA== X-Gm-Message-State: AKGB3mLuESLCzdQwZ5GMq7GZh4hKR4zWrDUaAxoIm+iF2XD85eSooyvR 6+mB0pQX7MFnMgHVJag0P6/CQxjZ X-Google-Smtp-Source: ACJfBovx9k6yQT5eR4QbjrZuzep94JutBlXu1XUFElKEo6QPOrfWBhgdrSrdE3Y1YqsrFnUhmlJVFA== X-Received: by 10.159.244.14 with SMTP id x14mr1680652plr.412.1513029074766; Mon, 11 Dec 2017 13:51:14 -0800 (PST) Received: from gizo.domain (67-5-143-47.ptld.qwest.net. [67.5.143.47]) by smtp.gmail.com with ESMTPSA id c185sm25572799pfb.48.2017.12.11.13.51.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 11 Dec 2017 13:51:13 -0800 (PST) From: Greg Rose To: dev@openvswitch.org Date: Mon, 11 Dec 2017 13:50:33 -0800 Message-Id: <1513029033-9087-13-git-send-email-gvrose8192@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1513029033-9087-1-git-send-email-gvrose8192@gmail.com> References: <1513029033-9087-1-git-send-email-gvrose8192@gmail.com> X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_ENVFROM_END_DIGIT,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE autolearn=no version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Cc: Paolo Abeni Subject: [ovs-dev] [PATCH 12/12] datapath: do not propagate headroom updates to internal port X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org From: Paolo Abeni Upstream commit: commit 183dea5818315c0a172d21ecbcd2554894bf01e3 Author: Paolo Abeni Date: Thu Nov 30 15:35:33 2017 +0100 openvswitch: do not propagate headroom updates to internal port After commit 3a927bc7cf9d ("ovs: propagate per dp max headroom to all vports") the need_headroom for the internal vport is updated accordingly to the max needed headroom in its datapath. That avoids the pskb_expand_head() costs when sending/forwarding packets towards tunnel devices, at least for some scenarios. We still require such copy when using the ovs-preferred configuration for vxlan tunnels: br_int / \ tap vxlan (remote_ip:X) br_phy \ NIC where the route towards the IP 'X' is via 'br_phy'. When forwarding traffic from the tap towards the vxlan device, we will call pskb_expand_head() in vxlan_build_skb() because br-phy->needed_headroom is equal to tun->needed_headroom. With this change we avoid updating the internal vport needed_headroom, so that in the above scenario no head copy is needed, giving 5% performance improvement in UDP throughput test. As a trade-off, packets sent from the internal port towards a tunnel device will now experience the head copy overhead. The rationale is that the latter use-case is less relevant performance-wise. Signed-off-by: Paolo Abeni Acked-by: Pravin B Shelar Signed-off-by: David S. Miller Also removed related compat layer changes. Cc: Paolo Abeni Signed-off-by: Greg Rose --- acinclude.m4 | 1 - datapath/linux/compat/include/linux/netdevice.h | 19 ------------------- datapath/vport-internal_dev.c | 19 +------------------ 3 files changed, 1 insertion(+), 38 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 30a2103..0cf41d3 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -553,7 +553,6 @@ AC_DEFUN([OVS_CHECK_LINUX_COMPAT], [ OVS_GREP_IFELSE([$KSRC/include/linux/netdevice.h], [udp_offload.*uoff], [OVS_DEFINE([HAVE_UDP_OFFLOAD_ARG_UOFF])]) OVS_GREP_IFELSE([$KSRC/include/linux/netdevice.h], [gro_remcsum]) - OVS_GREP_IFELSE([$KSRC/include/linux/netdevice.h], [IFF_PHONY_HEADROOM]) OVS_FIND_FIELD_IFELSE([$KSRC/include/linux/netdevice.h], [net_device_ops], [extended]) OVS_FIND_PARAM_IFELSE([$KSRC/include/linux/netdevice.h], diff --git a/datapath/linux/compat/include/linux/netdevice.h b/datapath/linux/compat/include/linux/netdevice.h index 3c3cf42..87f8469 100644 --- a/datapath/linux/compat/include/linux/netdevice.h +++ b/datapath/linux/compat/include/linux/netdevice.h @@ -244,25 +244,6 @@ int ovs_dev_fill_metadata_dst(struct net_device *dev, struct sk_buff *skb); #define NETDEV_OFFLOAD_PUSH_GENEVE 0x001D #endif -#ifndef HAVE_IFF_PHONY_HEADROOM - -#define IFF_PHONY_HEADROOM 0 -static inline unsigned netdev_get_fwd_headroom(struct net_device *dev) -{ - return 0; -} - -static inline void netdev_set_rx_headroom(struct net_device *dev, int new_hr) -{ -} - -/* set the device rx headroom to the dev's default */ -static inline void netdev_reset_rx_headroom(struct net_device *dev) -{ -} - -#endif - #ifdef IFF_NO_QUEUE #define HAVE_IFF_NO_QUEUE #else diff --git a/datapath/vport-internal_dev.c b/datapath/vport-internal_dev.c index 0aa331a..9bb8751 100644 --- a/datapath/vport-internal_dev.c +++ b/datapath/vport-internal_dev.c @@ -149,13 +149,6 @@ internal_get_stats(struct net_device *dev, struct rtnl_link_stats64 *stats) } } -#ifdef HAVE_IFF_PHONY_HEADROOM -static void internal_set_rx_headroom(struct net_device *dev, int new_hr) -{ - dev->needed_headroom = new_hr < 0 ? 0 : new_hr; -} -#endif - static const struct net_device_ops internal_dev_netdev_ops = { .ndo_open = internal_dev_open, .ndo_stop = internal_dev_stop, @@ -165,13 +158,6 @@ static const struct net_device_ops internal_dev_netdev_ops = { .ndo_change_mtu = internal_dev_change_mtu, #endif .ndo_get_stats64 = (void *)internal_get_stats, -#ifdef HAVE_IFF_PHONY_HEADROOM -#ifndef HAVE_NET_DEVICE_OPS_WITH_EXTENDED - .ndo_set_rx_headroom = internal_set_rx_headroom, -#else - .extended.ndo_set_rx_headroom = internal_set_rx_headroom, -#endif -#endif }; static struct rtnl_link_ops internal_dev_link_ops __read_mostly = { @@ -189,7 +175,7 @@ static void do_setup(struct net_device *netdev) netdev->priv_flags &= ~IFF_TX_SKB_SHARING; netdev->priv_flags |= IFF_LIVE_ADDR_CHANGE | IFF_OPENVSWITCH | - IFF_PHONY_HEADROOM | IFF_NO_QUEUE; + IFF_NO_QUEUE; #ifndef HAVE_NEEDS_FREE_NETDEV netdev->destructor = internal_dev_destructor; #else @@ -239,9 +225,6 @@ static struct vport *internal_dev_create(const struct vport_parms *parms) goto error_free_netdev; } -#ifdef HAVE_IFF_PHONY_HEADROOM - vport->dev->needed_headroom = vport->dp->max_headroom; -#endif dev_net_set(vport->dev, ovs_dp_get_net(vport->dp)); internal_dev = internal_dev_priv(vport->dev); internal_dev->vport = vport;