From patchwork Thu Jan 29 19:42:44 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David L Stevens X-Patchwork-Id: 434643 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 CFA3D1402B0 for ; Fri, 30 Jan 2015 06:42:55 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756895AbbA2Tmv (ORCPT ); Thu, 29 Jan 2015 14:42:51 -0500 Received: from aserp1040.oracle.com ([141.146.126.69]:32723 "EHLO aserp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754582AbbA2Tmu (ORCPT ); Thu, 29 Jan 2015 14:42:50 -0500 Received: from ucsinet21.oracle.com (ucsinet21.oracle.com [156.151.31.93]) by aserp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id t0TJgkVK012939 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 29 Jan 2015 19:42:47 GMT Received: from userz7021.oracle.com (userz7021.oracle.com [156.151.31.85]) by ucsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id t0TJgj2X022744 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL); Thu, 29 Jan 2015 19:42:46 GMT Received: from abhmp0016.oracle.com (abhmp0016.oracle.com [141.146.116.22]) by userz7021.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id t0TJgjTG022718; Thu, 29 Jan 2015 19:42:45 GMT Received: from [10.154.105.53] (/10.154.105.53) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 29 Jan 2015 11:42:45 -0800 Message-ID: <54CA8D33.6020006@oracle.com> Date: Thu, 29 Jan 2015 14:42:44 -0500 From: David L Stevens Organization: Oracle Corporation User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.7.0 MIME-Version: 1.0 To: David Miller CC: netdev@vger.kernel.org, Sowmini Varadhan , Eric Dumazet Subject: [PATCHv2 net] sunvnet: set queue mapping when doing packet copies X-Source-IP: ucsinet21.oracle.com [156.151.31.93] Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch fixes a bug where vnet_skb_shape() didn't set the already-selected queue mapping when a packet copy was required. This results in using the wrong queue index for stops/starts, hung tx queues and watchdog timeouts under heavy load. It also transfers the destructor, truesize, and the owning socket for flow control (code adapted from skb_segment). Signed-off-by: David L Stevens Acked-by: Sowmini Varadhan --- Changes since v1: move truesize, destructor and socket per Eric Dumazet --- drivers/net/ethernet/sun/sunvnet.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/drivers/net/ethernet/sun/sunvnet.c b/drivers/net/ethernet/sun/sunvnet.c index 2b719cc..0a1d3eb 100644 --- a/drivers/net/ethernet/sun/sunvnet.c +++ b/drivers/net/ethernet/sun/sunvnet.c @@ -1123,6 +1123,16 @@ static inline struct sk_buff *vnet_skb_shape(struct sk_buff *skb, int ncookies) skb_shinfo(nskb)->gso_size = skb_shinfo(skb)->gso_size; skb_shinfo(nskb)->gso_type = skb_shinfo(skb)->gso_type; } + nskb->queue_mapping = skb->queue_mapping; + /* Following permits correct back-pressure, for protocols + * using skb_set_owner_w(). + * Idea is to transfer ownership from skb to nskb. + */ + if (skb->destructor == sock_wfree) { + swap(nskb->truesize, skb->truesize); + swap(nskb->destructor, skb->destructor); + swap(nskb->sk, skb->sk); + } dev_kfree_skb(skb); skb = nskb; }