From patchwork Mon Dec 20 14:35:30 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Changli Gao X-Patchwork-Id: 76208 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 88BA4B7080 for ; Tue, 21 Dec 2010 01:36:22 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757725Ab0LTOgR (ORCPT ); Mon, 20 Dec 2010 09:36:17 -0500 Received: from mail-gy0-f174.google.com ([209.85.160.174]:62392 "EHLO mail-gy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752945Ab0LTOgQ (ORCPT ); Mon, 20 Dec 2010 09:36:16 -0500 Received: by gyb11 with SMTP id 11so1213324gyb.19 for ; Mon, 20 Dec 2010 06:36:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer; bh=z1SorYlkA1UljzD1/ktvWpHHcuf1jGnhRGbTekOn4l0=; b=uzQmdGHNxzAqsVitir0C0O+rNLq3zoAv5Dc6v///U7NQH5IOhKKZ/9lYtT8BqZ57T/ maJQKeF0Pboou0TnkQEyuJVRX3kMPI51CRzm5boAQE/s0vVUw2LR2X81pegDEjffpDcs qKB330nOB71794VKisViazVPk6jS/y7GUcdWc= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=YQliV1Xq/oyerQYEQnGp5xogjVX7kF7iUauhKqzgHbh7Nq3AYLzuvPkttydYY+MEMc jQvphS2gh8OTnsRQVI+fIpQ/NrLS3albMed37pkvnR3TANIaiCucMbDru8yaR/h9lBJF 3lzFIVKb75LqnYmELKL9GiZg49b4/84XGmRXE= Received: by 10.150.205.11 with SMTP id c11mr6553273ybg.304.1292855775604; Mon, 20 Dec 2010 06:36:15 -0800 (PST) Received: from localhost.localdomain ([221.239.34.230]) by mx.google.com with ESMTPS id v8sm4289249yba.2.2010.12.20.06.36.04 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 20 Dec 2010 06:36:14 -0800 (PST) From: Changli Gao To: "David S. Miller" Cc: Jarek Poplawski , Eric Dumazet , netdev@vger.kernel.org, Jamal Hadi Salim , Pawel Staszewski , Changli Gao Subject: [PATCH net-2.6] net_sched: always clone skbs Date: Mon, 20 Dec 2010 22:35:30 +0800 Message-Id: <1292855730-19265-1-git-send-email-xiaosuo@gmail.com> X-Mailer: git-send-email 1.7.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Pawel reported a panic related to handling shared skbs in ixgbe incorrectly. So we need to revert my previous patch to work around this bug. Instead of reverting the patch completely, I just revert the essential lines, so we can add the previous optimization back more easily in future. commit 3511c9132f8b1e1b5634e41a3331c44b0c13be70 Author: Changli Gao Date: Sat Oct 16 13:04:08 2010 +0000 net_sched: remove the unused parameter of qdisc_create_dflt() Reported-by: Pawel Staszewski Signed-off-by: Changli Gao Acked-by: Eric Dumazet --- include/net/sch_generic.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h index 786cc39..0af57eb 100644 --- a/include/net/sch_generic.h +++ b/include/net/sch_generic.h @@ -611,11 +611,7 @@ static inline struct sk_buff *skb_act_clone(struct sk_buff *skb, gfp_t gfp_mask, { struct sk_buff *n; - if ((action == TC_ACT_STOLEN || action == TC_ACT_QUEUED) && - !skb_shared(skb)) - n = skb_get(skb); - else - n = skb_clone(skb, gfp_mask); + n = skb_clone(skb, gfp_mask); if (n) { n->tc_verd = SET_TC_VERD(n->tc_verd, 0);