From patchwork Fri May 21 09:30:27 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xin, Xiaohui" X-Patchwork-Id: 101357 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o4L9RSph010050 for ; Fri, 21 May 2010 09:27:28 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755433Ab0EUJYA (ORCPT ); Fri, 21 May 2010 05:24:00 -0400 Received: from mga01.intel.com ([192.55.52.88]:16449 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755331Ab0EUJX6 (ORCPT ); Fri, 21 May 2010 05:23:58 -0400 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP; 21 May 2010 02:20:50 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.53,277,1272870000"; d="scan'208";a="569306389" Received: from unknown (HELO localhost.localdomain) ([10.239.36.106]) by fmsmga002.fm.intel.com with ESMTP; 21 May 2010 02:23:01 -0700 From: xiaohui.xin@intel.com To: netdev@vger.kernel.org, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, mst@redhat.com, mingo@elte.hu, davem@davemloft.net, jdike@linux.intel.com Cc: Xin Xiaohui Subject: [RFC][PATCH v6 11/19] Use callback to deal with skb_release_data() specially. Date: Fri, 21 May 2010 17:30:27 +0800 Message-Id: <1274434235-5929-12-git-send-email-xiaohui.xin@intel.com> X-Mailer: git-send-email 1.5.4.4 In-Reply-To: <1274434235-5929-11-git-send-email-xiaohui.xin@intel.com> References: <1274434235-5929-1-git-send-email-xiaohui.xin@intel.com> <1274434235-5929-2-git-send-email-xiaohui.xin@intel.com> <1274434235-5929-3-git-send-email-xiaohui.xin@intel.com> <1274434235-5929-4-git-send-email-xiaohui.xin@intel.com> <1274434235-5929-5-git-send-email-xiaohui.xin@intel.com> <1274434235-5929-6-git-send-email-xiaohui.xin@intel.com> <1274434235-5929-7-git-send-email-xiaohui.xin@intel.com> <1274434235-5929-8-git-send-email-xiaohui.xin@intel.com> <1274434235-5929-9-git-send-email-xiaohui.xin@intel.com> <1274434235-5929-10-git-send-email-xiaohui.xin@intel.com> <1274434235-5929-11-git-send-email-xiaohui.xin@intel.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Fri, 21 May 2010 09:27:28 +0000 (UTC) diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 37587f0..418457c 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -385,6 +385,11 @@ static void skb_clone_fraglist(struct sk_buff *skb) static void skb_release_data(struct sk_buff *skb) { + /* check if the skb has external buffers, we have use destructor_arg + * here to indicate + */ + struct skb_external_page *ext_page = skb_shinfo(skb)->destructor_arg; + if (!skb->cloned || !atomic_sub_return(skb->nohdr ? (1 << SKB_DATAREF_SHIFT) + 1 : 1, &skb_shinfo(skb)->dataref)) { @@ -397,6 +402,12 @@ static void skb_release_data(struct sk_buff *skb) if (skb_has_frags(skb)) skb_drop_fraglist(skb); + /* if the skb has external buffers, use destructor here, + * since after that skb->head will be kfree, in case skb->head + * from external buffer cannot use kfree to destroy. + */ + if (dev_is_mpassthru(skb->dev) && ext_page && ext_page->dtor) + ext_page->dtor(ext_page); kfree(skb->head); } }