From patchwork Sat Oct 28 00:09:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Herbert X-Patchwork-Id: 831561 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=quantonium-net.20150623.gappssmtp.com header.i=@quantonium-net.20150623.gappssmtp.com header.b="tHkdvKDf"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yP1P14RTcz9t5C for ; Sat, 28 Oct 2017 11:11:01 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751975AbdJ1AK7 (ORCPT ); Fri, 27 Oct 2017 20:10:59 -0400 Received: from mail-pf0-f195.google.com ([209.85.192.195]:56563 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751486AbdJ1AKP (ORCPT ); Fri, 27 Oct 2017 20:10:15 -0400 Received: by mail-pf0-f195.google.com with SMTP id b85so5996501pfj.13 for ; Fri, 27 Oct 2017 17:10:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quantonium-net.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=wuq3bDb3erCooDmo140kAxbmG1UYyscgKF8vLIHDcvM=; b=tHkdvKDfYzC5D0YWzI9Gg7tlLB4nV8zuK3ZncIkBabF2HSYmleFBdQYXv0LAf4fd5q n9N3LRGHOGWfRjmtT4rnoFME++yxX/JeNlP+s9VBKh+uRql/H+JJ50klWv8kJso35tZU iM2EaTZJqIhwVJxnUetjz2Yxksd08wQ+W6wr4cXe5ni2owKfnG27HbTHkxDWGsbLGkBK GbB14Tzjw7INq/rFEpV0QbqX5lCfbSnW10T9orGsBbZB7j9Mx86m6tCL5WU8QSeNRlZv nWJYo9yY4R/NuHrOB93ppz2JPT6+64dVZmSFsQX9gQpoPi7iX7ERSC4UQL2/nRZrzJVy iLJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=wuq3bDb3erCooDmo140kAxbmG1UYyscgKF8vLIHDcvM=; b=dQ/FmbX+9/LtwwyFuI+acgqILqHyZ7XA8QBzc0Ysyotw5SpI78awPzRGF5XZnohBzV xN8F3QmfChJP9rdOKiHhEX92vbG1GNQeSt4IFOwx5WB0rvP5rHG3PnGsKPsF2XGSjNsS rksh1oduePkiJaRis5lkDgwoUWPzfiN+p6DkY2uzYKIM8QaqubC1JYjVAmVGt4Zee0U7 UT/vLxq6ea2mcJz28TOZJ6wpXk9Tda792ArjDwCxiSg0z5UThU1lQSYobSLRq3P8G+bE sDiX/VEPUesoDhwzRucWPe8+JjCQjmoVBM8/S4qYVYyb+7vShR9n6SebncUnTG8YcEgn mT1A== X-Gm-Message-State: AMCzsaVoKgtyr+EnqaTg+bUjF5rQ2wFc/yKjtbLBICRA6a9XhW1cnhfT VtKXier5cPJlCDhdcGFx64Q+miG5 X-Google-Smtp-Source: ABhQp+QVuegJcE0rv6DT487HFEtDywpus8L2vnUlkNU3KG8XyqWmGSJghCgboGjT9q1IPWKbU2H3Ag== X-Received: by 10.98.66.206 with SMTP id h75mr1939934pfd.76.1509149415240; Fri, 27 Oct 2017 17:10:15 -0700 (PDT) Received: from localhost.localdomain (c-73-162-13-107.hsd1.ca.comcast.net. [73.162.13.107]) by smtp.gmail.com with ESMTPSA id 2sm9068398pgb.30.2017.10.27.17.10.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 27 Oct 2017 17:10:14 -0700 (PDT) From: Tom Herbert To: davem@davemloft.net Cc: pablo@netfilter.org, laforge@gnumonks.org, aschultz@tpip.net, netdev@vger.kernel.org, rohit@quantonium.net, Tom Herbert Subject: [PATCH v7 net-next 06/13] gtp: Change to use gro_cells Date: Fri, 27 Oct 2017 17:09:30 -0700 Message-Id: <20171028000937.2631-7-tom@quantonium.net> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171028000937.2631-1-tom@quantonium.net> References: <20171028000937.2631-1-tom@quantonium.net> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Call gro_cells_receive instead of netif_rx. Signed-off-by: Tom Herbert --- drivers/net/Kconfig | 1 + drivers/net/gtp.c | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 0936da592e12..720c2af0bb88 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -214,6 +214,7 @@ config GTP tristate "GPRS Tunneling Protocol datapath (GTP-U)" depends on INET && NET_UDP_TUNNEL select NET_IP_TUNNEL + select GRO_CELLS ---help--- This allows one to create gtp virtual interfaces that provide the GPRS Tunneling Protocol datapath (GTP-U). This tunneling protocol diff --git a/drivers/net/gtp.c b/drivers/net/gtp.c index 6dabd605607c..265fa9fdbf3d 100644 --- a/drivers/net/gtp.c +++ b/drivers/net/gtp.c @@ -80,6 +80,8 @@ struct gtp_dev { unsigned int hash_size; struct hlist_head *tid_hash; struct hlist_head *addr_hash; + + struct gro_cells gro_cells; }; static unsigned int gtp_net_id __read_mostly; @@ -189,6 +191,7 @@ static bool gtp_check_ms(struct sk_buff *skb, struct pdp_ctx *pctx, static int gtp_rx(struct pdp_ctx *pctx, struct sk_buff *skb, unsigned int hdrlen, unsigned int role) { + struct gtp_dev *gtp = netdev_priv(pctx->dev); struct pcpu_sw_netstats *stats; if (!gtp_check_ms(skb, pctx, hdrlen, role)) { @@ -217,7 +220,8 @@ static int gtp_rx(struct pdp_ctx *pctx, struct sk_buff *skb, stats->rx_bytes += skb->len; u64_stats_update_end(&stats->syncp); - netif_rx(skb); + gro_cells_receive(>p->gro_cells, skb); + return 0; } @@ -363,6 +367,7 @@ static int gtp_encap_recv(struct sock *sk, struct sk_buff *skb) static int gtp_dev_init(struct net_device *dev) { struct gtp_dev *gtp = netdev_priv(dev); + int err; gtp->dev = dev; @@ -370,6 +375,12 @@ static int gtp_dev_init(struct net_device *dev) if (!dev->tstats) return -ENOMEM; + err = gro_cells_init(>p->gro_cells, dev); + if (err) { + free_percpu(dev->tstats); + return err; + } + return 0; } @@ -611,6 +622,8 @@ static const struct net_device_ops gtp_netdev_ops = { static void gtp_link_setup(struct net_device *dev) { + struct gtp_dev *gtp = netdev_priv(dev); + dev->netdev_ops = >p_netdev_ops; dev->needs_free_netdev = true; @@ -630,6 +643,8 @@ static void gtp_link_setup(struct net_device *dev) sizeof(struct iphdr) + sizeof(struct udphdr) + sizeof(struct gtp0_header); + + gro_cells_init(>p->gro_cells, dev); } static int gtp_hashtable_new(struct gtp_dev *gtp, int hsize); @@ -686,6 +701,7 @@ static void gtp_dellink(struct net_device *dev, struct list_head *head) { struct gtp_dev *gtp = netdev_priv(dev); + gro_cells_destroy(>p->gro_cells); gtp_encap_disable(gtp); gtp_hashtable_free(gtp); list_del_rcu(>p->list);