From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx2.suse.de ([195.135.220.15]:45815 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751465AbbKNQpR (ORCPT ); Sat, 14 Nov 2015 11:45:17 -0500 From: Jiri Slaby To: stable@vger.kernel.org Cc: Jason Wang , Vlad Yasevich , "Michael S . Tsirkin" , "David S . Miller" , Jiri Slaby Subject: [patch added to the 3.12 stable tree] macvtap: unbreak receiving of gro skb with frag list Date: Sat, 14 Nov 2015 17:44:55 +0100 Message-Id: <1447519507-21042-10-git-send-email-jslaby@suse.cz> In-Reply-To: <1447519507-21042-1-git-send-email-jslaby@suse.cz> References: <1447519507-21042-1-git-send-email-jslaby@suse.cz> Sender: stable-owner@vger.kernel.org List-ID: From: Jason Wang This patch has been added to the 3.12 stable tree. If you have any objections, please let us know. =============== [ Upstream commit f23d538bc24a83c16127c2eb82c9cf1adc2b5149 ] We don't have fraglist support in TAP_FEATURES. This will lead software segmentation of gro skb with frag list. Fixes by having frag list support in TAP_FEATURES. With this patch single session of netperf receiving were restored from about 5Gb/s to about 12Gb/s on mlx4. Fixes a567dd6252 ("macvtap: simplify usage of tap_features") Cc: Vlad Yasevich Cc: Michael S. Tsirkin Signed-off-by: Jason Wang Signed-off-by: David S. Miller Signed-off-by: Jiri Slaby --- drivers/net/macvtap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c index 393873fb792e..ee53a9d06e8e 100644 --- a/drivers/net/macvtap.c +++ b/drivers/net/macvtap.c @@ -69,7 +69,7 @@ static const struct proto_ops macvtap_socket_ops; #define TUN_OFFLOADS (NETIF_F_HW_CSUM | NETIF_F_TSO_ECN | NETIF_F_TSO | \ NETIF_F_TSO6 | NETIF_F_UFO) #define RX_OFFLOADS (NETIF_F_GRO | NETIF_F_LRO) -#define TAP_FEATURES (NETIF_F_GSO | NETIF_F_SG) +#define TAP_FEATURES (NETIF_F_GSO | NETIF_F_SG | NETIF_F_FRAGLIST) /* * RCU usage: -- 2.6.3