From patchwork Fri Oct 15 09:12:11 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xin, Xiaohui" X-Patchwork-Id: 255731 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o9F8uOod004100 for ; Fri, 15 Oct 2010 08:56:26 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754770Ab0JOIyz (ORCPT ); Fri, 15 Oct 2010 04:54:55 -0400 Received: from mga01.intel.com ([192.55.52.88]:60392 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754659Ab0JOIxB (ORCPT ); Fri, 15 Oct 2010 04:53:01 -0400 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP; 15 Oct 2010 01:53:01 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.57,335,1283756400"; d="scan'208";a="616995432" Received: from unknown (HELO localhost.localdomain.sh.intel.com) ([10.239.36.73]) by fmsmga002.fm.intel.com with ESMTP; 15 Oct 2010 01:53:00 -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, herbert@gondor.hengli.com.au, jdike@linux.intel.com Cc: Xin Xiaohui Subject: [PATCH v13 10/16] Add a hook to intercept external buffers from NIC driver. Date: Fri, 15 Oct 2010 17:12:11 +0800 Message-Id: <33f51c5eddec843260451eccbfa3c5fdea13b479.1287132437.git.xiaohui.xin@intel.com> X-Mailer: git-send-email 1.7.3 In-Reply-To: <1287133937-5538-1-git-send-email-xiaohui.xin@intel.com> References: <1287133937-5538-1-git-send-email-xiaohui.xin@intel.com> In-Reply-To: References: 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 (demeter1.kernel.org [140.211.167.41]); Fri, 15 Oct 2010 08:56:26 +0000 (UTC) diff --git a/net/core/dev.c b/net/core/dev.c index e48639d..235eaab 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -2814,6 +2814,37 @@ int __skb_bond_should_drop(struct sk_buff *skb, struct net_device *master) } EXPORT_SYMBOL(__skb_bond_should_drop); +#if defined(CONFIG_MEDIATE_PASSTHRU) || defined(CONFIG_MEDIATE_PASSTHRU_MODULE) +/* Add a hook to intercept mediate passthru(zero-copy) packets, + * and insert it to the socket queue owned by mp_port specially. + */ +static inline struct sk_buff *handle_mpassthru(struct sk_buff *skb, + struct packet_type **pt_prev, + int *ret, + struct net_device *orig_dev) +{ + struct mp_port *mp_port = NULL; + struct sock *sk = NULL; + + if (!dev_is_mpassthru(skb->dev)) + return skb; + mp_port = skb->dev->mp_port; + + if (*pt_prev) { + *ret = deliver_skb(skb, *pt_prev, orig_dev); + *pt_prev = NULL; + } + + sk = mp_port->sock->sk; + skb_queue_tail(&sk->sk_receive_queue, skb); + sk->sk_state_change(sk); + + return NULL; +} +#else +#define handle_mpassthru(skb, pt_prev, ret, orig_dev) (skb) +#endif + static int __netif_receive_skb(struct sk_buff *skb) { struct packet_type *ptype, *pt_prev; @@ -2891,6 +2922,11 @@ static int __netif_receive_skb(struct sk_buff *skb) ncls: #endif + /* To intercept mediate passthru(zero-copy) packets here */ + skb = handle_mpassthru(skb, &pt_prev, &ret, orig_dev); + if (!skb) + goto out; + /* Handle special case of bridge or macvlan */ rx_handler = rcu_dereference(skb->dev->rx_handler); if (rx_handler) { @@ -2991,6 +3027,7 @@ err: EXPORT_SYMBOL(netdev_mp_port_prep); #endif + /** * netif_receive_skb - process receive buffer from network * @skb: buffer to process