From patchwork Fri Jun 4 12:43:06 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: jamal X-Patchwork-Id: 54574 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 7D905B7D20 for ; Fri, 4 Jun 2010 22:51:52 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754096Ab0FDMuo (ORCPT ); Fri, 4 Jun 2010 08:50:44 -0400 Received: from mail-yw0-f187.google.com ([209.85.211.187]:37115 "EHLO mail-yw0-f187.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753357Ab0FDMun (ORCPT ); Fri, 4 Jun 2010 08:50:43 -0400 X-Greylist: delayed 452 seconds by postgrey-1.27 at vger.kernel.org; Fri, 04 Jun 2010 08:50:43 EDT Received: by ywh17 with SMTP id 17so384836ywh.1 for ; Fri, 04 Jun 2010 05:50:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:subject:from:reply-to :to:cc:content-type:date:message-id:mime-version:x-mailer; bh=lLRZtCTG/LmNKL1aE6xZ8qVUZEryA91fj3YI/vLemhk=; b=rblr/he5Dhpme/egrbiXCRDP76pvntK26dqkyMrtN+pT45fQrE0lg9P0DJmHcKnv/m ytuZC9/LQXvaw1oEMMv5sZ2ydszZFUDwdgnCdiKZ9Z9MRbda/Jn0PCu6jNiN1GLts6F0 f8iGHLiYRICfaH8zJ6uVCTQDPXJ/MmARBXtwc= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:subject:from:reply-to:to:cc:content-type:date:message-id :mime-version:x-mailer; b=VbX0k0xN8F6wxljvvIL0bmnKy7yeDU8T7Nzkboz7EFWyMS4PxKMwHgUqtT4zG1hHgj HfKhBktJM8eSrxtdiQFbqt3Gv8q1Clr0DG6qylPUilEqABwcSia4Xq0Ex3fQdUf8y3qG buHhk8DQH68ytnh7sjM0EdWbeSO7KodH8+S4Q= Received: by 10.224.79.92 with SMTP id o28mr5788092qak.2.1275655390243; Fri, 04 Jun 2010 05:43:10 -0700 (PDT) Received: from [10.0.0.26] (CPE0030ab124d2f-CM001bd7a7f1a0.cpe.net.cable.rogers.com [99.240.66.42]) by mx.google.com with ESMTPS id 7sm2136067qwf.6.2010.06.04.05.43.08 (version=SSLv3 cipher=RC4-MD5); Fri, 04 Jun 2010 05:43:09 -0700 (PDT) Subject: [PATCH net-next-2.6] net sched: make pedit check for clones instead From: jamal Reply-To: hadi@cyberus.ca To: davem@davemloft.net Cc: Herbert Xu , Jiri Pirko , netdev@vger.kernel.org Date: Fri, 04 Jun 2010 08:43:06 -0400 Message-Id: <1275655386.3445.62.camel@bigi> Mime-Version: 1.0 X-Mailer: Evolution 2.26.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org And here's the second one. I noticed Changli's changes are not yet in net-next. I will wait for that change to propagate and then send the fix to pedit that i discussed with Herbert. cheers, jamal commit 0697bf778d48d155ef48f652cee8f103db3dcedb Author: Jamal Hadi Salim Date: Fri Jun 4 08:39:47 2010 -0400 net sched: make pedit check for clones instead Now that the core path doesnt set OK to munge we detect writable skbs by looking to see if they are cloned. Signed-off-by: Jamal Hadi Salim diff --git a/net/sched/act_pedit.c b/net/sched/act_pedit.c index fdbd0b7..8d15caf 100644 --- a/net/sched/act_pedit.c +++ b/net/sched/act_pedit.c @@ -127,8 +127,7 @@ static int tcf_pedit(struct sk_buff *skb, struct tc_action *a, int i, munged = 0; u8 *pptr; - if (!(skb->tc_verd & TC_OK2MUNGE)) { - /* should we set skb->cloned? */ + if (skb_cloned(skb)) { if (pskb_expand_head(skb, 0, 0, GFP_ATOMIC)) { return p->tcf_action; }