From patchwork Fri May 7 09:34:59 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xin, Xiaohui" X-Patchwork-Id: 51898 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 77BD3B7D48 for ; Fri, 7 May 2010 19:36:33 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755933Ab0EGJck (ORCPT ); Fri, 7 May 2010 05:32:40 -0400 Received: from mga09.intel.com ([134.134.136.24]:55769 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755596Ab0EGJaK (ORCPT ); Fri, 7 May 2010 05:30:10 -0400 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP; 07 May 2010 02:28:42 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.52,347,1270450800"; d="scan'208";a="515915101" Received: from unknown (HELO localhost.localdomain) ([10.239.36.200]) by orsmga002.jf.intel.com with ESMTP; 07 May 2010 02:29:39 -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 v5 12/19] Add a hook to intercept external buffers from NIC driver. Date: Fri, 7 May 2010 17:34:59 +0800 Message-Id: <1273224906-4874-13-git-send-email-xiaohui.xin@intel.com> X-Mailer: git-send-email 1.5.4.4 In-Reply-To: <1273224906-4874-12-git-send-email-xiaohui.xin@intel.com> References: <1273224906-4874-1-git-send-email-xiaohui.xin@intel.com> <1273224906-4874-2-git-send-email-xiaohui.xin@intel.com> <1273224906-4874-3-git-send-email-xiaohui.xin@intel.com> <1273224906-4874-4-git-send-email-xiaohui.xin@intel.com> <1273224906-4874-5-git-send-email-xiaohui.xin@intel.com> <1273224906-4874-6-git-send-email-xiaohui.xin@intel.com> <1273224906-4874-7-git-send-email-xiaohui.xin@intel.com> <1273224906-4874-8-git-send-email-xiaohui.xin@intel.com> <1273224906-4874-9-git-send-email-xiaohui.xin@intel.com> <1273224906-4874-10-git-send-email-xiaohui.xin@intel.com> <1273224906-4874-11-git-send-email-xiaohui.xin@intel.com> <1273224906-4874-12-git-send-email-xiaohui.xin@intel.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Xin Xiaohui The hook is called in netif_receive_skb(). Signed-off-by: Xin Xiaohui Signed-off-by: Zhao Yu Reviewed-by: Jeff Dike --- net/core/dev.c | 35 +++++++++++++++++++++++++++++++++++ 1 files changed, 35 insertions(+), 0 deletions(-) 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;