{"id":818923,"url":"http://patchwork.ozlabs.org/api/patches/818923/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20170927045803.2477-6-tom@quantonium.net/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170927045803.2477-6-tom@quantonium.net>","list_archive_url":null,"date":"2017-09-27T04:57:56","name":"[v4,net-next,05/12] gtp: Change to use gro_cells","commit_ref":null,"pull_url":null,"state":"deferred","archived":true,"hash":"9beb5aa46e24c29642f8129304c1ac96f99bdfd1","submitter":{"id":72064,"url":"http://patchwork.ozlabs.org/api/people/72064/?format=json","name":"Tom Herbert","email":"tom@quantonium.net"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/20170927045803.2477-6-tom@quantonium.net/mbox/","series":[{"id":5279,"url":"http://patchwork.ozlabs.org/api/series/5279/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=5279","date":"2017-09-27T04:57:51","name":"gtp: Additional feature support - Part I","version":4,"mbox":"http://patchwork.ozlabs.org/series/5279/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/818923/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/818923/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=)","ozlabs.org; dkim=pass (2048-bit key;\n\tunprotected) header.d=quantonium-net.20150623.gappssmtp.com\n\theader.i=@quantonium-net.20150623.gappssmtp.com\n\theader.b=\"wT6VXei6\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3y25FW3HSsz9t3F\n\tfor ;\n\tWed, 27 Sep 2017 14:58:55 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1161065AbdI0E6x (ORCPT );\n\tWed, 27 Sep 2017 00:58:53 -0400","from mail-pf0-f177.google.com ([209.85.192.177]:46273 \"EHLO\n\tmail-pf0-f177.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1033415AbdI0E6w (ORCPT\n\t); Wed, 27 Sep 2017 00:58:52 -0400","by mail-pf0-f177.google.com with SMTP id r68so6667154pfj.3\n\tfor ; Tue, 26 Sep 2017 21:58:51 -0700 (PDT)","from localhost.localdomain (c-73-162-13-107.hsd1.ca.comcast.net.\n\t[73.162.13.107]) by smtp.gmail.com with ESMTPSA id\n\ty16sm16502728pfe.68.2017.09.26.21.58.49\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tTue, 26 Sep 2017 21:58:50 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=quantonium-net.20150623.gappssmtp.com; s=20150623;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=dlZNvIjfx6k5kKuvnTDttcVxKGVgR0igXGGNd8dU3EE=;\n\tb=wT6VXei63KclyyRvTuoj+ilG2oITgBuFqybWbrUBpFMOLrMi2ktDW5ckfZrA3oXBGm\n\tSciFPEMSxO8yN35C7LXxmrdfFTTlRbG9ZttUgS1+e2kAQfhcTQ0zkEX8RyhXiKk0g+sY\n\tRlUDeJum1Jmcl1QkG0Fbs/wWN8TShp/CndskEgN+sElgQLRZnSD+cFPpC5+UFPzwuezF\n\tncNPPX561ru8tS1yOH+CCG2TnuV7utZmG4wK6S1Brh5lcCBkv7FvPJLKNkwdnUYiEV6p\n\tkKT8N5CTCBhvc6Lo7OX7zLqUQgdOKd0CtHU1HEtMIXaWdnVzeWVSJDQn1nQo3EoRmo65\n\tyOCw==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=dlZNvIjfx6k5kKuvnTDttcVxKGVgR0igXGGNd8dU3EE=;\n\tb=tmAor5djpJwlKR31XgwKFaw5RwoTc/o3j+081RsAIOVK1tVQQtTj5tNxzE9WsMKs/z\n\tn2EHx90e/E2ZANs4yfAqncPEWT/YUyVMrs6oSkAO/lPLItJVfi8sEXj1tbw6ExlJDYwO\n\tSKAlDcBcGAxIO0s9ScThjDjsuFGV3uXXMzjx4Z0FiFargjN2uwpi70Hr47HFxiQnqyao\n\tSqaQQ0Xtw7yYG5wM3/IlevRG7nU0KvRDJzBb9jlTXEuP3I9e5oAC+cxwDELwkSICMLq8\n\temxeYbmp9BWy+lYPWRqjd46B4sA7gJeQm1JvKkrNqjC1QNWN0iqJSD+dNfsl6v4m1Xqb\n\thANg==","X-Gm-Message-State":"AHPjjUhP0m5hNuKTKTqPM8YkcR8JfyE/x/fO/tMBlscSY+wyzXNQZEPq\n\t8P2sWHo2cveh4C2QxgXFtTjNvw==","X-Google-Smtp-Source":"AOwi7QDbHjgU/hDzEU7vkkS95AbL+Bog/2HcXYWi5z1mkwV9O+HZQWiyUuEO6T/nlq/ZvHd/LNeWxw==","X-Received":"by 10.99.6.76 with SMTP id 73mr194832pgg.105.1506488331494;\n\tTue, 26 Sep 2017 21:58:51 -0700 (PDT)","From":"Tom Herbert ","To":"davem@davemloft.net","Cc":"pablo@netfilter.org, laforge@gnumonks.org, aschultz@tpip.net,\n\tnetdev@vger.kernel.org, rohit@quantonium.net,\n\tTom Herbert ","Subject":"[PATCH v4 net-next 05/12] gtp: Change to use gro_cells","Date":"Tue, 26 Sep 2017 21:57:56 -0700","Message-Id":"<20170927045803.2477-6-tom@quantonium.net>","X-Mailer":"git-send-email 2.11.0","In-Reply-To":"<20170927045803.2477-1-tom@quantonium.net>","References":"<20170927045803.2477-1-tom@quantonium.net>","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"Call gro_cells_receive instead of netif_rx.\n\nSigned-off-by: Tom Herbert \n---\n drivers/net/Kconfig | 1 +\n drivers/net/gtp.c | 11 ++++++++++-\n 2 files changed, 11 insertions(+), 1 deletion(-)","diff":"diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig\nindex aba0d652095b..d4292d56bb02 100644\n--- a/drivers/net/Kconfig\n+++ b/drivers/net/Kconfig\n@@ -214,6 +214,7 @@ config GTP\n \ttristate \"GPRS Tunneling Protocol datapath (GTP-U)\"\n \tdepends on INET && NET_UDP_TUNNEL\n \tselect NET_IP_TUNNEL\n+\tselect GRO_CELLS\n \t---help---\n \t This allows one to create gtp virtual interfaces that provide\n \t the GPRS Tunneling Protocol datapath (GTP-U). This tunneling protocol\ndiff --git a/drivers/net/gtp.c b/drivers/net/gtp.c\nindex 6dabd605607c..f2aac5d01143 100644\n--- a/drivers/net/gtp.c\n+++ b/drivers/net/gtp.c\n@@ -80,6 +80,8 @@ struct gtp_dev {\n \tunsigned int\t\thash_size;\n \tstruct hlist_head\t*tid_hash;\n \tstruct hlist_head\t*addr_hash;\n+\n+\tstruct gro_cells\tgro_cells;\n };\n \n static unsigned int gtp_net_id __read_mostly;\n@@ -189,6 +191,7 @@ static bool gtp_check_ms(struct sk_buff *skb, struct pdp_ctx *pctx,\n static int gtp_rx(struct pdp_ctx *pctx, struct sk_buff *skb,\n \t\t\tunsigned int hdrlen, unsigned int role)\n {\n+\tstruct gtp_dev *gtp = netdev_priv(pctx->dev);\n \tstruct pcpu_sw_netstats *stats;\n \n \tif (!gtp_check_ms(skb, pctx, hdrlen, role)) {\n@@ -217,7 +220,8 @@ static int gtp_rx(struct pdp_ctx *pctx, struct sk_buff *skb,\n \tstats->rx_bytes += skb->len;\n \tu64_stats_update_end(&stats->syncp);\n \n-\tnetif_rx(skb);\n+\tgro_cells_receive(>p->gro_cells, skb);\n+\n \treturn 0;\n }\n \n@@ -611,6 +615,8 @@ static const struct net_device_ops gtp_netdev_ops = {\n \n static void gtp_link_setup(struct net_device *dev)\n {\n+\tstruct gtp_dev *gtp = netdev_priv(dev);\n+\n \tdev->netdev_ops\t\t= >p_netdev_ops;\n \tdev->needs_free_netdev\t= true;\n \n@@ -630,6 +636,8 @@ static void gtp_link_setup(struct net_device *dev)\n \t\t\t\t sizeof(struct iphdr) +\n \t\t\t\t sizeof(struct udphdr) +\n \t\t\t\t sizeof(struct gtp0_header);\n+\n+\tgro_cells_init(>p->gro_cells, dev);\n }\n \n static int gtp_hashtable_new(struct gtp_dev *gtp, int hsize);\n@@ -686,6 +694,7 @@ static void gtp_dellink(struct net_device *dev, struct list_head *head)\n {\n \tstruct gtp_dev *gtp = netdev_priv(dev);\n \n+\tgro_cells_destroy(>p->gro_cells);\n \tgtp_encap_disable(gtp);\n \tgtp_hashtable_free(gtp);\n \tlist_del_rcu(>p->list);\n","prefixes":["v4","net-next","05/12"]}