Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 71ee0307 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'gtp-sgsn-side-tunnel' 



Jonas Bonn says:

====================
GTP SGSN-side tunnel

Changes since v4:

* Respin the series on top of net-next; the conflicts were trivial,
  amounting to just code having been shifted about
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 8c7314c6 91ed81f9

drivers/net/gtp.c

+41 −23
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ struct pdp_ctx { 
	u16			af;



	struct in_addr		ms_addr_ip4;

	struct in_addr		sgsn_addr_ip4;

	struct in_addr		peer_addr_ip4;



	struct sock		*sk;

	struct net_device       *dev;
@@ -74,6 +74,7 @@ struct gtp_dev { 


	struct net_device	*dev;



	unsigned int		role;

	unsigned int		hash_size;

	struct hlist_head	*tid_hash;

	struct hlist_head	*addr_hash;
@@ -154,8 +155,8 @@ static struct pdp_ctx *ipv4_pdp_find(struct gtp_dev *gtp, __be32 ms_addr) 
	return NULL;

}



static bool gtp_check_src_ms_ipv4(struct sk_buff *skb, struct pdp_ctx *pctx,

				  unsigned int hdrlen)

static bool gtp_check_ms_ipv4(struct sk_buff *skb, struct pdp_ctx *pctx,

				  unsigned int hdrlen, unsigned int role)

{

	struct iphdr *iph;
@@ -164,27 +165,31 @@ static bool gtp_check_src_ms_ipv4(struct sk_buff *skb, struct pdp_ctx *pctx, 


	iph = (struct iphdr *)(skb->data + hdrlen);



	if (role == GTP_ROLE_SGSN)

		return iph->daddr == pctx->ms_addr_ip4.s_addr;

	else

		return iph->saddr == pctx->ms_addr_ip4.s_addr;

}



/* Check if the inner IP source address in this packet is assigned to any

/* Check if the inner IP address in this packet is assigned to any

 * existing mobile subscriber.

 */

static bool gtp_check_src_ms(struct sk_buff *skb, struct pdp_ctx *pctx,

			     unsigned int hdrlen)

static bool gtp_check_ms(struct sk_buff *skb, struct pdp_ctx *pctx,

			     unsigned int hdrlen, unsigned int role)

{

	switch (ntohs(skb->protocol)) {

	case ETH_P_IP:

		return gtp_check_src_ms_ipv4(skb, pctx, hdrlen);

		return gtp_check_ms_ipv4(skb, pctx, hdrlen, role);

	}

	return false;

}



static int gtp_rx(struct pdp_ctx *pctx, struct sk_buff *skb, unsigned int hdrlen)

static int gtp_rx(struct pdp_ctx *pctx, struct sk_buff *skb,

			unsigned int hdrlen, unsigned int role)

{

	struct pcpu_sw_netstats *stats;



	if (!gtp_check_src_ms(skb, pctx, hdrlen)) {

	if (!gtp_check_ms(skb, pctx, hdrlen, role)) {

		netdev_dbg(pctx->dev, "No PDP ctx for this MS\n");

		return 1;

	}
@@ -239,7 +244,7 @@ static int gtp0_udp_encap_recv(struct gtp_dev *gtp, struct sk_buff *skb) 
		return 1;

	}



	return gtp_rx(pctx, skb, hdrlen);

	return gtp_rx(pctx, skb, hdrlen, gtp->role);

}



static int gtp1u_udp_encap_recv(struct gtp_dev *gtp, struct sk_buff *skb)
@@ -281,7 +286,7 @@ static int gtp1u_udp_encap_recv(struct gtp_dev *gtp, struct sk_buff *skb) 
		return 1;

	}



	return gtp_rx(pctx, skb, hdrlen);

	return gtp_rx(pctx, skb, hdrlen, gtp->role);

}



static void gtp_encap_destroy(struct sock *sk)
@@ -481,7 +486,11 @@ static int gtp_build_skb_ip4(struct sk_buff *skb, struct net_device *dev, 
	 * Prepend PDP header with TEI/TID from PDP ctx.

	 */

	iph = ip_hdr(skb);

	if (gtp->role == GTP_ROLE_SGSN)

		pctx = ipv4_pdp_find(gtp, iph->saddr);

	else

		pctx = ipv4_pdp_find(gtp, iph->daddr);



	if (!pctx) {

		netdev_dbg(dev, "no PDP ctx found for %pI4, skip\n",

			   &iph->daddr);
@@ -489,17 +498,17 @@ static int gtp_build_skb_ip4(struct sk_buff *skb, struct net_device *dev, 
	}

	netdev_dbg(dev, "found PDP context %p\n", pctx);



	rt = ip4_route_output_gtp(&fl4, pctx->sk, pctx->sgsn_addr_ip4.s_addr);

	rt = ip4_route_output_gtp(&fl4, pctx->sk, pctx->peer_addr_ip4.s_addr);

	if (IS_ERR(rt)) {

		netdev_dbg(dev, "no route to SSGN %pI4\n",

			   &pctx->sgsn_addr_ip4.s_addr);

			   &pctx->peer_addr_ip4.s_addr);

		dev->stats.tx_carrier_errors++;

		goto err;

	}



	if (rt->dst.dev == dev) {

		netdev_dbg(dev, "circular route to SSGN %pI4\n",

			   &pctx->sgsn_addr_ip4.s_addr);

			   &pctx->peer_addr_ip4.s_addr);

		dev->stats.collisions++;

		goto err_rt;

	}
@@ -685,6 +694,7 @@ static const struct nla_policy gtp_policy[IFLA_GTP_MAX + 1] = { 
	[IFLA_GTP_FD0]			= { .type = NLA_U32 },

	[IFLA_GTP_FD1]			= { .type = NLA_U32 },

	[IFLA_GTP_PDP_HASHSIZE]		= { .type = NLA_U32 },

	[IFLA_GTP_ROLE]			= { .type = NLA_U32 },

};



static int gtp_validate(struct nlattr *tb[], struct nlattr *data[])
@@ -810,6 +820,7 @@ static int gtp_encap_enable(struct gtp_dev *gtp, struct nlattr *data[]) 
{

	struct sock *sk1u = NULL;

	struct sock *sk0 = NULL;

	unsigned int role = GTP_ROLE_GGSN;



	if (data[IFLA_GTP_FD0]) {

		u32 fd0 = nla_get_u32(data[IFLA_GTP_FD0]);
@@ -830,8 +841,15 @@ static int gtp_encap_enable(struct gtp_dev *gtp, struct nlattr *data[]) 
		}

	}



	if (data[IFLA_GTP_ROLE]) {

		role = nla_get_u32(data[IFLA_GTP_ROLE]);

		if (role > GTP_ROLE_SGSN)

			return -EINVAL;

	}



	gtp->sk0 = sk0;

	gtp->sk1u = sk1u;

	gtp->role = role;



	return 0;

}
@@ -866,8 +884,8 @@ static void ipv4_pdp_fill(struct pdp_ctx *pctx, struct genl_info *info) 
{

	pctx->gtp_version = nla_get_u32(info->attrs[GTPA_VERSION]);

	pctx->af = AF_INET;

	pctx->sgsn_addr_ip4.s_addr =

		nla_get_be32(info->attrs[GTPA_SGSN_ADDRESS]);

	pctx->peer_addr_ip4.s_addr =

		nla_get_be32(info->attrs[GTPA_PEER_ADDRESS]);

	pctx->ms_addr_ip4.s_addr =

		nla_get_be32(info->attrs[GTPA_MS_ADDRESS]);
@@ -957,13 +975,13 @@ static int ipv4_pdp_add(struct gtp_dev *gtp, struct sock *sk, 
	switch (pctx->gtp_version) {

	case GTP_V0:

		netdev_dbg(dev, "GTPv0-U: new PDP ctx id=%llx ssgn=%pI4 ms=%pI4 (pdp=%p)\n",

			   pctx->u.v0.tid, &pctx->sgsn_addr_ip4,

			   pctx->u.v0.tid, &pctx->peer_addr_ip4,

			   &pctx->ms_addr_ip4, pctx);

		break;

	case GTP_V1:

		netdev_dbg(dev, "GTPv1-U: new PDP ctx id=%x/%x ssgn=%pI4 ms=%pI4 (pdp=%p)\n",

			   pctx->u.v1.i_tei, pctx->u.v1.o_tei,

			   &pctx->sgsn_addr_ip4, &pctx->ms_addr_ip4, pctx);

			   &pctx->peer_addr_ip4, &pctx->ms_addr_ip4, pctx);

		break;

	}
@@ -994,7 +1012,7 @@ static int gtp_genl_new_pdp(struct sk_buff *skb, struct genl_info *info) 


	if (!info->attrs[GTPA_VERSION] ||

	    !info->attrs[GTPA_LINK] ||

	    !info->attrs[GTPA_SGSN_ADDRESS] ||

	    !info->attrs[GTPA_PEER_ADDRESS] ||

	    !info->attrs[GTPA_MS_ADDRESS])

		return -EINVAL;
@@ -1126,7 +1144,7 @@ static int gtp_genl_fill_info(struct sk_buff *skb, u32 snd_portid, u32 snd_seq, 
		goto nlmsg_failure;



	if (nla_put_u32(skb, GTPA_VERSION, pctx->gtp_version) ||

	    nla_put_be32(skb, GTPA_SGSN_ADDRESS, pctx->sgsn_addr_ip4.s_addr) ||

	    nla_put_be32(skb, GTPA_PEER_ADDRESS, pctx->peer_addr_ip4.s_addr) ||

	    nla_put_be32(skb, GTPA_MS_ADDRESS, pctx->ms_addr_ip4.s_addr))

		goto nla_put_failure;
@@ -1237,7 +1255,7 @@ static struct nla_policy gtp_genl_policy[GTPA_MAX + 1] = { 
	[GTPA_LINK]		= { .type = NLA_U32, },

	[GTPA_VERSION]		= { .type = NLA_U32, },

	[GTPA_TID]		= { .type = NLA_U64, },

	[GTPA_SGSN_ADDRESS]	= { .type = NLA_U32, },

	[GTPA_PEER_ADDRESS]	= { .type = NLA_U32, },

	[GTPA_MS_ADDRESS]	= { .type = NLA_U32, },

	[GTPA_FLOW]		= { .type = NLA_U16, },

	[GTPA_NET_NS_FD]	= { .type = NLA_U32, },

include/uapi/linux/gtp.h

+2 −1
Original line number Diff line number Diff line
@@ -19,7 +19,8 @@ enum gtp_attrs { 
	GTPA_LINK,

	GTPA_VERSION,

	GTPA_TID,	/* for GTPv0 only */

	GTPA_SGSN_ADDRESS,

	GTPA_PEER_ADDRESS,	/* Remote GSN peer, either SGSN or GGSN */

#define GTPA_SGSN_ADDRESS GTPA_PEER_ADDRESS /* maintain legacy attr name */

	GTPA_MS_ADDRESS,

	GTPA_FLOW,

	GTPA_NET_NS_FD,

include/uapi/linux/if_link.h

+7 −0
Original line number Diff line number Diff line
@@ -538,11 +538,18 @@ enum { 
#define IFLA_PPP_MAX (__IFLA_PPP_MAX - 1)



/* GTP section */



enum ifla_gtp_role {

	GTP_ROLE_GGSN = 0,

	GTP_ROLE_SGSN,

};



enum {

	IFLA_GTP_UNSPEC,

	IFLA_GTP_FD0,

	IFLA_GTP_FD1,

	IFLA_GTP_PDP_HASHSIZE,

	IFLA_GTP_ROLE,

	__IFLA_GTP_MAX,

};

#define IFLA_GTP_MAX (__IFLA_GTP_MAX - 1)