From patchwork Sat Oct 28 00:09:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Herbert X-Patchwork-Id: 831560 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="GWtW9plb"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yP1Nr5lYpz9t4X for ; Sat, 28 Oct 2017 11:10:52 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751942AbdJ1AKu (ORCPT ); Fri, 27 Oct 2017 20:10:50 -0400 Received: from mail-pf0-f195.google.com ([209.85.192.195]:48828 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751619AbdJ1AKU (ORCPT ); Fri, 27 Oct 2017 20:10:20 -0400 Received: by mail-pf0-f195.google.com with SMTP id b79so6013880pfk.5 for ; Fri, 27 Oct 2017 17:10:20 -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=qoCGDf3ctS2CDmiVBF+2MRogivB+qCk+Rv/eD7ptuh0=; b=GWtW9plbveOxeIUZul5h3jbn+5t/G69hsKqJd4xMNZURBK5oDqpKnuC52lQre7XvpT LRi77/ycIYJ9CgaL4p4PbSR9CGL1TlnRkUw2OEBiHDnjgP6uOvgqJq4j8GAKLB2hvPXD KinTI/njk4qKONZXwD52yv/oYD/oTR6nNF3q1LbLUPgzPgFNeiiWvwi6irpb80u7ryca GQrCvGQL4G7Jvl2/XzvR6E2xjtA086m96e1i/NdqQx47mkFZJIHZIK9OvYspFEJ+Efr1 dURAR1RTPRjWREWcoAckc141S/Q51To0R67IMIGey2cFlayMfbYAhKDg2VuybhD4qFzw 3gxQ== 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=qoCGDf3ctS2CDmiVBF+2MRogivB+qCk+Rv/eD7ptuh0=; b=NDht06ypWrtVKriPkZnwyr5pGcBaFLLtlXWND1M5eAAqmZgrRKN71RO9awvD1iqh7/ GGT0pkf2L+KIx7RTaxPXw9MdkP+c6O+mGwEZHHkv9OClaYHyGl09ULafdh/M6I7xfo5X C9WalGEwXgtkVSC0hM74sMRVzpMOQfKt14XUZ9n0FqHNp7OGclwajWoMP+59O2KqdxNs iO1zyEyDx3emxFJ+bzl7aKts+xiB0vWSx0iBK1mgMtBU54vyw9WXovrg8bq+VYKnhT74 T3qakvKBhKaUYQLrZu1ZLKLlx44u8oWoALxAF3JyIKjmqNFBBHYNugoD6JxT3YugvlKQ 6O3Q== X-Gm-Message-State: AMCzsaVey2Mf6wpfkCE7rloE8zo7seKqQ3lDx7kGjrEBhxYsz7cMWght BNqBxec17S7Z1p3pW3xUYju5Q29x X-Google-Smtp-Source: ABhQp+SdXdhJFLB+ZetJobtQReaqnCLUtOaSkUPw4N9RgmNAiy/Y5fCh9Gmeo1F3kJPjebC/8UviXg== X-Received: by 10.98.192.6 with SMTP id x6mr1903815pff.170.1509149420006; Fri, 27 Oct 2017 17:10:20 -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.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 27 Oct 2017 17:10:19 -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 08/13] gtp: udp recv clean up Date: Fri, 27 Oct 2017 17:09:32 -0700 Message-Id: <20171028000937.2631-9-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 Create separate UDP receive functions for GTP version 0 and version 1. Set encap_rcv appropriately when configuring a socket. Signed-off-by: Tom Herbert --- drivers/net/gtp.c | 100 ++++++++++++++++++++++++++---------------------------- 1 file changed, 49 insertions(+), 51 deletions(-) diff --git a/drivers/net/gtp.c b/drivers/net/gtp.c index 2daf434ae543..8b7014aa45c2 100644 --- a/drivers/net/gtp.c +++ b/drivers/net/gtp.c @@ -225,14 +225,20 @@ static int gtp_rx(struct pdp_ctx *pctx, struct sk_buff *skb, return 0; } -/* 1 means pass up to the stack, -1 means drop and 0 means decapsulated. */ -static int gtp0_udp_encap_recv(struct gtp_dev *gtp, struct sk_buff *skb) +/* UDP encapsulation receive handler for GTPv0-U . See net/ipv4/udp.c. + * Return codes: 0: success, <0: error, >0: pass up to userspace UDP socket. + */ +static int gtp0_udp_encap_recv(struct sock *sk, struct sk_buff *skb) { + struct gtp_dev *gtp = rcu_dereference_sk_user_data(sk); unsigned int hdrlen = sizeof(struct udphdr) + sizeof(struct gtp0_header); struct gtp0_header *gtp0; struct pdp_ctx *pctx; + if (!gtp) + goto pass; + if (!pskb_may_pull(skb, hdrlen)) goto drop; @@ -244,26 +250,41 @@ static int gtp0_udp_encap_recv(struct gtp_dev *gtp, struct sk_buff *skb) if (gtp0->type != GTP_TPDU) goto pass; + netdev_dbg(gtp->dev, "received GTP0 packet\n"); + pctx = gtp0_pdp_find(gtp, be64_to_cpu(gtp0->tid)); if (!pctx) { netdev_dbg(gtp->dev, "No PDP ctx to decap skb=%p\n", skb); goto pass; } - return gtp_rx(pctx, skb, hdrlen, gtp->role); + if (!gtp_rx(pctx, skb, hdrlen, gtp->role)) { + /* Successfully received */ + return 0; + } + drop: - return -1; + kfree_skb(skb); + return 0; + pass: return 1; } -static int gtp1u_udp_encap_recv(struct gtp_dev *gtp, struct sk_buff *skb) +/* UDP encapsulation receive handler for GTPv0-U . See net/ipv4/udp.c. + * Return codes: 0: success, <0: error, >0: pass up to userspace UDP socket. + */ +static int gtp1u_udp_encap_recv(struct sock *sk, struct sk_buff *skb) { + struct gtp_dev *gtp = rcu_dereference_sk_user_data(sk); unsigned int hdrlen = sizeof(struct udphdr) + sizeof(struct gtp1_header); struct gtp1_header *gtp1; struct pdp_ctx *pctx; + if (!gtp) + goto pass; + if (!pskb_may_pull(skb, hdrlen)) goto drop; @@ -275,6 +296,8 @@ static int gtp1u_udp_encap_recv(struct gtp_dev *gtp, struct sk_buff *skb) if (gtp1->type != GTP_TPDU) goto pass; + netdev_dbg(gtp->dev, "received GTP1 packet\n"); + /* From 29.060: "This field shall be present if and only if any one or * more of the S, PN and E flags are set.". * @@ -296,9 +319,15 @@ static int gtp1u_udp_encap_recv(struct gtp_dev *gtp, struct sk_buff *skb) goto drop; } - return gtp_rx(pctx, skb, hdrlen, gtp->role); + if (!gtp_rx(pctx, skb, hdrlen, gtp->role)) { + /* Successfully received */ + return 0; + } + drop: - return -1; + kfree_skb(skb); + return 0; + pass: return 1; } @@ -329,49 +358,6 @@ static void gtp_encap_disable(struct gtp_dev *gtp) gtp_encap_disable_sock(gtp->sk1u); } -/* UDP encapsulation receive handler. See net/ipv4/udp.c. - * Return codes: 0: success, <0: error, >0: pass up to userspace UDP socket. - */ -static int gtp_encap_recv(struct sock *sk, struct sk_buff *skb) -{ - struct gtp_dev *gtp; - int ret = 0; - - gtp = rcu_dereference_sk_user_data(sk); - if (!gtp) - return 1; - - netdev_dbg(gtp->dev, "encap_recv sk=%p\n", sk); - - switch (udp_sk(sk)->encap_type) { - case UDP_ENCAP_GTP0: - netdev_dbg(gtp->dev, "received GTP0 packet\n"); - ret = gtp0_udp_encap_recv(gtp, skb); - break; - case UDP_ENCAP_GTP1U: - netdev_dbg(gtp->dev, "received GTP1U packet\n"); - ret = gtp1u_udp_encap_recv(gtp, skb); - break; - default: - ret = -1; /* Shouldn't happen. */ - } - - switch (ret) { - case 1: - netdev_dbg(gtp->dev, "pass up to the process\n"); - break; - case 0: - break; - case -1: - netdev_dbg(gtp->dev, "GTP packet has been dropped\n"); - kfree_skb(skb); - ret = 0; - break; - } - - return ret; -} - static int gtp_dev_init(struct net_device *dev) { struct gtp_dev *gtp = netdev_priv(dev); @@ -831,9 +817,21 @@ static struct sock *gtp_encap_enable_socket(int fd, int type, sk = sock->sk; sock_hold(sk); + switch (type) { + case UDP_ENCAP_GTP0: + tuncfg.encap_rcv = gtp0_udp_encap_recv; + break; + case UDP_ENCAP_GTP1U: + tuncfg.encap_rcv = gtp1u_udp_encap_recv; + break; + default: + pr_debug("Unknown encap type %u\n", type); + sk = ERR_PTR(-EINVAL); + goto out_sock; + } + tuncfg.sk_user_data = gtp; tuncfg.encap_type = type; - tuncfg.encap_rcv = gtp_encap_recv; tuncfg.encap_destroy = gtp_encap_destroy; setup_udp_tunnel_sock(sock_net(sock->sk), sock, &tuncfg);