Commit 6dd514f4 authored by Michal Swiatkowski's avatar Michal Swiatkowski Committed by David S. Miller
Browse files

pfcp: always set pfcp metadata 



In PFCP receive path set metadata needed by flower code to do correct
classification based on this metadata.

Signed-off-by: default avatarMichal Swiatkowski <michal.swiatkowski@linux.intel.com>
Signed-off-by: default avatarMarcin Szycik <marcin.szycik@linux.intel.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Signed-off-by: default avatarAlexander Lobakin <aleksander.lobakin@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 76c8764e

drivers/net/pfcp.c

+80 −1
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ struct pfcp_dev { 
	struct socket		*sock;

	struct net_device	*dev;

	struct net		*net;



	struct gro_cells	gro_cells;

};



static unsigned int pfcp_net_id __read_mostly;
@@ -29,6 +31,78 @@ struct pfcp_net { 
	struct list_head	pfcp_dev_list;

};



static void

pfcp_session_recv(struct pfcp_dev *pfcp, struct sk_buff *skb,

		  struct pfcp_metadata *md)

{

	struct pfcphdr_session *unparsed = pfcp_hdr_session(skb);



	md->seid = unparsed->seid;

	md->type = PFCP_TYPE_SESSION;

}



static void

pfcp_node_recv(struct pfcp_dev *pfcp, struct sk_buff *skb,

	       struct pfcp_metadata *md)

{

	md->type = PFCP_TYPE_NODE;

}



static int pfcp_encap_recv(struct sock *sk, struct sk_buff *skb)

{

	IP_TUNNEL_DECLARE_FLAGS(flags) = { };

	struct metadata_dst *tun_dst;

	struct pfcp_metadata *md;

	struct pfcphdr *unparsed;

	struct pfcp_dev *pfcp;



	if (unlikely(!pskb_may_pull(skb, PFCP_HLEN)))

		goto drop;



	pfcp = rcu_dereference_sk_user_data(sk);

	if (unlikely(!pfcp))

		goto drop;



	unparsed = pfcp_hdr(skb);



	ip_tunnel_flags_zero(flags);

	tun_dst = udp_tun_rx_dst(skb, sk->sk_family, flags, 0,

				 sizeof(*md));

	if (unlikely(!tun_dst))

		goto drop;



	md = ip_tunnel_info_opts(&tun_dst->u.tun_info);

	if (unlikely(!md))

		goto drop;



	if (unparsed->flags & PFCP_SEID_FLAG)

		pfcp_session_recv(pfcp, skb, md);

	else

		pfcp_node_recv(pfcp, skb, md);



	__set_bit(IP_TUNNEL_PFCP_OPT_BIT, flags);

	ip_tunnel_info_opts_set(&tun_dst->u.tun_info, md, sizeof(*md),

				flags);



	if (unlikely(iptunnel_pull_header(skb, PFCP_HLEN, skb->protocol,

					  !net_eq(sock_net(sk),

					  dev_net(pfcp->dev)))))

		goto drop;



	skb_dst_set(skb, (struct dst_entry *)tun_dst);



	skb_reset_network_header(skb);

	skb_reset_mac_header(skb);

	skb->dev = pfcp->dev;



	gro_cells_receive(&pfcp->gro_cells, skb);



	return 0;

drop:

	kfree_skb(skb);

	return 0;

}



static void pfcp_del_sock(struct pfcp_dev *pfcp)

{

	udp_tunnel_sock_release(pfcp->sock);
@@ -39,6 +113,7 @@ static void pfcp_dev_uninit(struct net_device *dev) 
{

	struct pfcp_dev *pfcp = netdev_priv(dev);



	gro_cells_destroy(&pfcp->gro_cells);

	pfcp_del_sock(pfcp);

}
@@ -48,7 +123,7 @@ static int pfcp_dev_init(struct net_device *dev) 


	pfcp->dev = dev;



	return 0;

	return gro_cells_init(&pfcp->gro_cells, dev);

}



static const struct net_device_ops pfcp_netdev_ops = {
@@ -94,6 +169,10 @@ static struct socket *pfcp_create_sock(struct pfcp_dev *pfcp) 
	if (err)

		return ERR_PTR(err);



	tuncfg.sk_user_data = pfcp;

	tuncfg.encap_rcv = pfcp_encap_recv;

	tuncfg.encap_type = 1;



	setup_udp_tunnel_sock(net, sock, &tuncfg);



	return sock;

include/net/ip_tunnels.h

+3 −0
Original line number Diff line number Diff line
@@ -216,6 +216,7 @@ static inline void ip_tunnel_set_options_present(unsigned long *flags) 
	__set_bit(IP_TUNNEL_VXLAN_OPT_BIT, present);

	__set_bit(IP_TUNNEL_ERSPAN_OPT_BIT, present);

	__set_bit(IP_TUNNEL_GTP_OPT_BIT, present);

	__set_bit(IP_TUNNEL_PFCP_OPT_BIT, present);



	ip_tunnel_flags_or(flags, flags, present);

}
@@ -228,6 +229,7 @@ static inline void ip_tunnel_clear_options_present(unsigned long *flags) 
	__set_bit(IP_TUNNEL_VXLAN_OPT_BIT, present);

	__set_bit(IP_TUNNEL_ERSPAN_OPT_BIT, present);

	__set_bit(IP_TUNNEL_GTP_OPT_BIT, present);

	__set_bit(IP_TUNNEL_PFCP_OPT_BIT, present);



	__ipt_flag_op(bitmap_andnot, flags, flags, present);

}
@@ -240,6 +242,7 @@ static inline bool ip_tunnel_is_options_present(const unsigned long *flags) 
	__set_bit(IP_TUNNEL_VXLAN_OPT_BIT, present);

	__set_bit(IP_TUNNEL_ERSPAN_OPT_BIT, present);

	__set_bit(IP_TUNNEL_GTP_OPT_BIT, present);

	__set_bit(IP_TUNNEL_PFCP_OPT_BIT, present);



	return ip_tunnel_flags_intersect(flags, present);

}

include/net/pfcp.h

+73 −0
Original line number Diff line number Diff line
@@ -2,12 +2,85 @@ 
#ifndef _PFCP_H_

#define _PFCP_H_



#include <uapi/linux/if_ether.h>

#include <net/dst_metadata.h>

#include <linux/netdevice.h>

#include <uapi/linux/ipv6.h>

#include <net/udp_tunnel.h>

#include <uapi/linux/udp.h>

#include <uapi/linux/ip.h>

#include <linux/string.h>

#include <linux/types.h>

#include <linux/bits.h>



#define PFCP_PORT 8805



/* PFCP protocol header */

struct pfcphdr {

	u8	flags;

	u8	message_type;

	__be16	message_length;

};



/* PFCP header flags */

#define PFCP_SEID_FLAG		BIT(0)

#define PFCP_MP_FLAG		BIT(1)



#define PFCP_VERSION_MASK	GENMASK(4, 0)



#define PFCP_HLEN (sizeof(struct udphdr) + sizeof(struct pfcphdr))



/* PFCP node related messages */

struct pfcphdr_node {

	u8	seq_number[3];

	u8	reserved;

};



/* PFCP session related messages */

struct pfcphdr_session {

	__be64	seid;

	u8	seq_number[3];

#ifdef __LITTLE_ENDIAN_BITFIELD

	u8	message_priority:4,

		reserved:4;

#elif defined(__BIG_ENDIAN_BITFIELD)

	u8	reserved:4,

		message_priprity:4;

#else

#error "Please fix <asm/byteorder>"

#endif

};



struct pfcp_metadata {

	u8 type;

	__be64 seid;

} __packed;



enum {

	PFCP_TYPE_NODE		= 0,

	PFCP_TYPE_SESSION	= 1,

};



#define PFCP_HEADROOM (sizeof(struct iphdr) + sizeof(struct udphdr) + \

		       sizeof(struct pfcphdr) + sizeof(struct ethhdr))

#define PFCP6_HEADROOM (sizeof(struct ipv6hdr) + sizeof(struct udphdr) + \

			sizeof(struct pfcphdr) + sizeof(struct ethhdr))



static inline struct pfcphdr *pfcp_hdr(struct sk_buff *skb)

{

	return (struct pfcphdr *)(udp_hdr(skb) + 1);

}



static inline struct pfcphdr_node *pfcp_hdr_node(struct sk_buff *skb)

{

	return (struct pfcphdr_node *)(pfcp_hdr(skb) + 1);

}



static inline struct pfcphdr_session *pfcp_hdr_session(struct sk_buff *skb)

{

	return (struct pfcphdr_session *)(pfcp_hdr(skb) + 1);

}



static inline bool netif_is_pfcp(const struct net_device *dev)

{

	return dev->rtnl_link_ops &&

include/uapi/linux/if_tunnel.h

+3 −0
Original line number Diff line number Diff line
@@ -212,6 +212,9 @@ enum { 
	IP_TUNNEL_VTI_BIT,

	IP_TUNNEL_SIT_ISATAP_BIT	= IP_TUNNEL_VTI_BIT,



	/* Flags starting from here are not available via the old UAPI */

	IP_TUNNEL_PFCP_OPT_BIT,		/* OPTIONS_PRESENT */



	__IP_TUNNEL_FLAG_NUM,

};

include/uapi/linux/pkt_cls.h

+14 −0
Original line number Diff line number Diff line
@@ -587,6 +587,10 @@ enum { 
					 * TCA_FLOWER_KEY_ENC_OPT_GTP_

					 * attributes

					 */

	TCA_FLOWER_KEY_ENC_OPTS_PFCP,	/* Nested

					 * TCA_FLOWER_KEY_ENC_IPT_PFCP

					 * attributes

					 */

	__TCA_FLOWER_KEY_ENC_OPTS_MAX,

};
@@ -636,6 +640,16 @@ enum { 
#define TCA_FLOWER_KEY_ENC_OPT_GTP_MAX \

		(__TCA_FLOWER_KEY_ENC_OPT_GTP_MAX - 1)



enum {

	TCA_FLOWER_KEY_ENC_OPT_PFCP_UNSPEC,

	TCA_FLOWER_KEY_ENC_OPT_PFCP_TYPE,		/* u8 */

	TCA_FLOWER_KEY_ENC_OPT_PFCP_SEID,		/* be64 */

	__TCA_FLOWER_KEY_ENC_OPT_PFCP_MAX,

};



#define TCA_FLOWER_KEY_ENC_OPT_PFCP_MAX \

		(__TCA_FLOWER_KEY_ENC_OPT_PFCP_MAX - 1)



enum {

	TCA_FLOWER_KEY_MPLS_OPTS_UNSPEC,

	TCA_FLOWER_KEY_MPLS_OPTS_LSE,