From patchwork Sat Sep 11 09:53:03 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xin, Xiaohui" X-Patchwork-Id: 171552 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 o8B9eBOQ005795 for ; Sat, 11 Sep 2010 09:40:12 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752628Ab0IKJg6 (ORCPT ); Sat, 11 Sep 2010 05:36:58 -0400 Received: from mga11.intel.com ([192.55.52.93]:50447 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752537Ab0IKJg4 (ORCPT ); Sat, 11 Sep 2010 05:36:56 -0400 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP; 11 Sep 2010 02:36:55 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.56,351,1280732400"; d="scan'208";a="605970633" Received: from unknown (HELO localhost.localdomain) ([10.239.36.37]) by fmsmga002.fm.intel.com with ESMTP; 11 Sep 2010 02:36:54 -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 v10 10/16] Add a hook to intercept external buffers from NIC driver. Date: Sat, 11 Sep 2010 17:53:03 +0800 Message-Id: <1284198789-5358-11-git-send-email-xiaohui.xin@intel.com> X-Mailer: git-send-email 1.5.4.4 In-Reply-To: <1284198789-5358-10-git-send-email-xiaohui.xin@intel.com> References: <1284198789-5358-1-git-send-email-xiaohui.xin@intel.com> <1284198789-5358-2-git-send-email-xiaohui.xin@intel.com> <1284198789-5358-3-git-send-email-xiaohui.xin@intel.com> <1284198789-5358-4-git-send-email-xiaohui.xin@intel.com> <1284198789-5358-5-git-send-email-xiaohui.xin@intel.com> <1284198789-5358-6-git-send-email-xiaohui.xin@intel.com> <1284198789-5358-7-git-send-email-xiaohui.xin@intel.com> <1284198789-5358-8-git-send-email-xiaohui.xin@intel.com> <1284198789-5358-9-git-send-email-xiaohui.xin@intel.com> <1284198789-5358-10-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 (demeter1.kernel.org [140.211.167.41]); Sat, 11 Sep 2010 09:40:12 +0000 (UTC) diff --git a/net/core/dev.c b/net/core/dev.c index 636f11b..4b379b1 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -2517,6 +2517,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 @@ -2598,6 +2629,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;