From patchwork Thu Oct 26 19:09:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Herbert X-Patchwork-Id: 830902 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="BJEVthTa"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yNGnF3phzz9t69 for ; Fri, 27 Oct 2017 06:10:57 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752061AbdJZTKz (ORCPT ); Thu, 26 Oct 2017 15:10:55 -0400 Received: from mail-pf0-f194.google.com ([209.85.192.194]:50055 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751774AbdJZTKN (ORCPT ); Thu, 26 Oct 2017 15:10:13 -0400 Received: by mail-pf0-f194.google.com with SMTP id i5so3182763pfe.6 for ; Thu, 26 Oct 2017 12:10:12 -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=G5gS2YcdNOL7PfeoOGrAzI2uDXz5s6P1cpqdBXFzg9c=; b=BJEVthTaG9YWg9K3WjZhyQS8YzVXJf9BR0u9pMK9WFzsNqOS0vdwIzdtNoAX0A+EwL QNGNNCw0HcikmiQ/irGTAzjslSm2ox/sBsYtjTktzdChBgvLpROTwoR+Yq25Yod/jc9X Bl7XAFSoYyJ1QEz88TGlgUmgnjlRwEypyST6loaF1xROmbD2km+Ey4idIS0yhwUpO8zH VEosRvG5sseL4AIV00mQngn5N8hb+S1ZD9j/g5/wgqFFcpIt0QcuRf7x7yktLfcip+Ei uvEyaSMStcgRJUnJRNIu1IO6JCIFHzgvGlFdeVM2nwxSQ1SYSZEzr8WCFGH/ncdmRNbB d1Fg== 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=G5gS2YcdNOL7PfeoOGrAzI2uDXz5s6P1cpqdBXFzg9c=; b=RFof10xjxUWhnhD1NlIibTBEqqeIXzN4xSHSsPytR/RJTK9Wir5E2mQtIcq4Aq1+a5 NQRASh2Bxt9dKN0QlLmY524CHiGf7DnfInFEcj/d6XAQ9FuKn70CbJcOg56yC7IIT1DW CkTEygW6Qey/cNl4R43Tf9LIsNurOtJQXOzRo9ZN+pNEEmBXbwRf+ce9v3IepJNtvZZx dGgjBBK8EA964U9c+J1S1AgiyIbta6Mp1WJIadgBT8JnKu9ytBNASMwa0llU0OAtaSNF ETYCsNlD8wfgb5tnnSBNqP/JrVaNHoAgHeWXvwrpVW/wouOfP8W2K2R+8azpJnaanUpT neDA== X-Gm-Message-State: AMCzsaUGbqLraMInwi2FmpB5JPDXlqTD+srxMy4ruQtZp+sHmWWisY13 opdDfy/Qag/vdzF44iCHiMwvXg== X-Google-Smtp-Source: ABhQp+TiGtepUy5AaBUfvDb3PrLKv7J9PxC23b+iYlzgXa7Is+JT9scV178CGDAkT+RuEsqgX+YsQg== X-Received: by 10.101.80.195 with SMTP id s3mr5791963pgp.19.1509045012468; Thu, 26 Oct 2017 12:10:12 -0700 (PDT) Received: from localhost.localdomain (67-207-98-108.static.wiline.com. [67.207.98.108]) by smtp.gmail.com with ESMTPSA id j1sm11071502pfc.169.2017.10.26.12.10.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Oct 2017 12:10:11 -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 v6 net-next 07/12] gtp: udp recv clean up Date: Thu, 26 Oct 2017 12:09:24 -0700 Message-Id: <20171026190929.11619-8-tom@quantonium.net> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171026190929.11619-1-tom@quantonium.net> References: <20171026190929.11619-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 00e5ea5cb935..a6e2e0a1f424 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); @@ -824,9 +810,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);