From patchwork Sat Jun 5 10:14:51 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xin, Xiaohui" X-Patchwork-Id: 104408 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 o55AAnuS004020 for ; Sat, 5 Jun 2010 10:10:53 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932917Ab0FEKK0 (ORCPT ); Sat, 5 Jun 2010 06:10:26 -0400 Received: from mga01.intel.com ([192.55.52.88]:65455 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932893Ab0FEKHL (ORCPT ); Sat, 5 Jun 2010 06:07:11 -0400 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP; 05 Jun 2010 03:03:07 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.53,366,1272870000"; d="scan'208";a="804988070" Received: from unknown (HELO localhost.localdomain) ([10.239.36.142]) by fmsmga001.fm.intel.com with ESMTP; 05 Jun 2010 03:06:50 -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: [RFC PATCH v7 12/19] Add a hook to intercept external buffers from NIC driver. Date: Sat, 5 Jun 2010 18:14:51 +0800 Message-Id: <1275732899-5423-12-git-send-email-xiaohui.xin@intel.com> X-Mailer: git-send-email 1.5.4.4 In-Reply-To: <1275732899-5423-11-git-send-email-xiaohui.xin@intel.com> References: <1275732899-5423-1-git-send-email-xiaohui.xin@intel.com> <1275732899-5423-2-git-send-email-xiaohui.xin@intel.com> <1275732899-5423-3-git-send-email-xiaohui.xin@intel.com> <1275732899-5423-4-git-send-email-xiaohui.xin@intel.com> <1275732899-5423-5-git-send-email-xiaohui.xin@intel.com> <1275732899-5423-6-git-send-email-xiaohui.xin@intel.com> <1275732899-5423-7-git-send-email-xiaohui.xin@intel.com> <1275732899-5423-8-git-send-email-xiaohui.xin@intel.com> <1275732899-5423-9-git-send-email-xiaohui.xin@intel.com> <1275732899-5423-10-git-send-email-xiaohui.xin@intel.com> <1275732899-5423-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]); Sat, 05 Jun 2010 10:10:53 +0000 (UTC) diff --git a/net/core/dev.c b/net/core/dev.c index 37b389a..dc2f225 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -2548,6 +2548,37 @@ err: EXPORT_SYMBOL(netdev_mp_port_prep); #endif +#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 mpassthru_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 + /** * netif_receive_skb - process receive buffer from network * @skb: buffer to process @@ -2629,6 +2660,10 @@ 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; skb = handle_bridge(skb, &pt_prev, &ret, orig_dev); if (!skb) goto out;