{"id":818034,"url":"http://patchwork.ozlabs.org/api/patches/818034/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20170925032941.14586-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":"<20170925032941.14586-6-tom@quantonium.net>","list_archive_url":null,"date":"2017-09-25T03:29:34","name":"[v3,net-next,05/12] gtp: Change to use gro_cells","commit_ref":null,"pull_url":null,"state":"changes-requested","archived":true,"hash":"0cc782e549d524946c90d8140a84c19f86fd6240","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/20170925032941.14586-6-tom@quantonium.net/mbox/","series":[{"id":4865,"url":"http://patchwork.ozlabs.org/api/series/4865/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=4865","date":"2017-09-25T03:29:29","name":"gtp: Additional feature support - Part I","version":3,"mbox":"http://patchwork.ozlabs.org/series/4865/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/818034/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/818034/checks/","tags":{},"related":[],"headers":{"Return-Path":"<netdev-owner@vger.kernel.org>","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=<UNKNOWN>)","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=\"ylVwd0sq\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3y0qN82r3Vz9t3t\n\tfor <patchwork-incoming@ozlabs.org>;\n\tMon, 25 Sep 2017 13:30:16 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S932992AbdIYDaO (ORCPT <rfc822;patchwork-incoming@ozlabs.org>);\n\tSun, 24 Sep 2017 23:30:14 -0400","from mail-pf0-f180.google.com ([209.85.192.180]:52098 \"EHLO\n\tmail-pf0-f180.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S932947AbdIYDaM (ORCPT\n\t<rfc822;netdev@vger.kernel.org>); Sun, 24 Sep 2017 23:30:12 -0400","by mail-pf0-f180.google.com with SMTP id b70so3138692pfl.8\n\tfor <netdev@vger.kernel.org>; Sun, 24 Sep 2017 20:30:12 -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\tj2sm9112907pgn.26.2017.09.24.20.30.10\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tSun, 24 Sep 2017 20:30:10 -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=ptyq9wQpaDalqO+2nGacNTdjmcEZaMvikI4fAhqHJTQ=;\n\tb=ylVwd0sqJj+RGKAvY4BYSIWhMWJzW0qsEGc4Q/OrQlMnQ7xuvLFipyNE4FAyTwfLsr\n\t/sn7XSuhsllVZutMmBHlZlxcOWOY/ADQwxilmsw/zyTOte6KuD8gCPRW4ppyZq9v8pnI\n\twGkSOEv732rqkuVjrMI3oF+kGrsyOh1/th1i63s3zPawUtlj4naeIAgaW5qxJ4u1Mmiv\n\tZ1nJtQIFB8xNovvnnNKqRZgsauN5sN9XswvxQQsPof0M3PCYhYQcVV/2AQo7e98ji4Fk\n\tfpCIY/JRQmi7ucPQqfxsgoK+SrNDyyAKXNkxm3FztRUOpLAPSf7O3yp90ImKO4c6nY5G\n\tGTvw==","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=ptyq9wQpaDalqO+2nGacNTdjmcEZaMvikI4fAhqHJTQ=;\n\tb=Xtla5KB9JVCrj8RRvEBiyUZetMFyEFkmbdAxHifJI9oVKMKga5AQK+Cg2CmiEZNM01\n\titIFuLE2HLtFkeU7Put8lZrPpqZoCrPkp8OPOsWX7XhqyPlHOtMoDkTjNrCXCB/p0p/2\n\tlsVBAQMBj7X5gHqiKmuZYIRl/ZRt6k4eFvjNOhlSSAI9mxyd7PJ3BEcYQ4Tlx5ePdumQ\n\tfZvvNd5P8+RORYmSpEmyEJY4xIjEW+piFiZLtSvMAJv9R/WO8H0iaXrDxzhQKhXDlKCh\n\tx7mDRJkizZ+e8mOXc1zrvAj2sBvyUI2jHYn0LEFTrHeP+YGV6X9g2wS5vX0ZeMOzLrnv\n\t0eVA==","X-Gm-Message-State":"AHPjjUg+gIjiR6tTOoJShTOsBkCR4c1LmIdB+WQH97yc0X5xHH8lk4KU\n\tRIxU26RWwOLS3I1DnImv8K0wAg==","X-Google-Smtp-Source":"AOwi7QCrzyp/tFNY8bhepq1Es9TX3HMYd2iDfeeDrGi5L788zczkmfQ0HJseJ2q5pZvQsVzaj4UGpQ==","X-Received":"by 10.84.224.75 with SMTP id a11mr6322814plt.106.1506310211862; \n\tSun, 24 Sep 2017 20:30:11 -0700 (PDT)","From":"Tom Herbert <tom@quantonium.net>","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 <tom@quantonium.net>","Subject":"[PATCH v3 net-next 05/12] gtp: Change to use gro_cells","Date":"Sun, 24 Sep 2017 20:29:34 -0700","Message-Id":"<20170925032941.14586-6-tom@quantonium.net>","X-Mailer":"git-send-email 2.11.0","In-Reply-To":"<20170925032941.14586-1-tom@quantonium.net>","References":"<20170925032941.14586-1-tom@quantonium.net>","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"<netdev.vger.kernel.org>","X-Mailing-List":"netdev@vger.kernel.org"},"content":"Call gro_cells_receive instead of netif_rx.\n\nSigned-off-by: Tom Herbert <tom@quantonium.net>\n---\n drivers/net/gtp.c | 11 ++++++++++-\n 1 file changed, 10 insertions(+), 1 deletion(-)","diff":"diff --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(&gtp->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= &gtp_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(&gtp->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(&gtp->gro_cells);\n \tgtp_encap_disable(gtp);\n \tgtp_hashtable_free(gtp);\n \tlist_del_rcu(&gtp->list);\n","prefixes":["v3","net-next","05/12"]}