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

Commit 6a019c5c authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'mpls-ttl-propagation' 



Robert Shearman says:

====================
mpls: allow TTL propagation from IP packets to be configured

Allow TTL propagation from IP packets to MPLS packets to be
configured. Add a new optional LWT attribute, MPLS_IPTUNNEL_TTL, which
allows the TTL to be set in the resulting MPLS packet, with the value
of 0 having the semantics of enabling propagation of the TTL from the
IP header (i.e. non-zero values disable propagation).

Also allow the configuration to be overridden globally by reusing the
same sysctl to control whether the TTL is propagated from IP packets
into the MPLS header. If the per-LWT attribute is set then it
overrides the global configuration. If the TTL isn't propagated then a
default TTL value is used which can be configured via a new sysctl,
"net.mpls.default_ttl". This is kept separate from the configuration
of whether IP TTL propagation is enabled as it can be used in the
future when non-IP payloads are supported (i.e. where there is no
payload TTL that can be propagated).
====================

Signed-off-by: default avatarRobert Shearman <rshearma@brocade.com>
Acked-by: default avatarRoopa Prabhu <roopa@cumulusnetworks.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents b66239b6 a59166e4

Documentation/networking/mpls-sysctl.txt

+19 −0
Original line number Diff line number Diff line
@@ -19,6 +19,25 @@ platform_labels - INTEGER 
	Possible values: 0 - 1048575

	Default: 0



ip_ttl_propagate - BOOL

	Control whether TTL is propagated from the IPv4/IPv6 header to

	the MPLS header on imposing labels and propagated from the

	MPLS header to the IPv4/IPv6 header on popping the last label.



	If disabled, the MPLS transport network will appear as a

	single hop to transit traffic.



	0 - disabled / RFC 3443 [Short] Pipe Model

	1 - enabled / RFC 3443 Uniform Model (default)



default_ttl - BOOL

	Default TTL value to use for MPLS packets where it cannot be

	propagated from an IP header, either because one isn't present

	or ip_ttl_propagate has been disabled.



	Possible values: 1 - 255

	Default: 255



conf/<interface>/input - BOOL

	Control whether packets can be input on this interface.

include/net/mpls_iptunnel.h

+2 −0
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ 
struct mpls_iptunnel_encap {

	u32	label[MAX_NEW_LABELS];

	u8	labels;

	u8	ttl_propagate;

	u8	default_ttl;

};



static inline struct mpls_iptunnel_encap *mpls_lwtunnel_encap(struct lwtunnel_state *lwtstate)

include/net/netns/mpls.h

+3 −0
Original line number Diff line number Diff line
@@ -9,8 +9,11 @@ struct mpls_route; 
struct ctl_table_header;



struct netns_mpls {

	int ip_ttl_propagate;

	int default_ttl;

	size_t platform_labels;

	struct mpls_route __rcu * __rcu *platform_label;



	struct ctl_table_header *ctl;

};

include/uapi/linux/mpls_iptunnel.h

+2 −0
Original line number Diff line number Diff line
@@ -16,11 +16,13 @@ 
/* MPLS tunnel attributes

 * [RTA_ENCAP] = {

 *     [MPLS_IPTUNNEL_DST]

 *     [MPLS_IPTUNNEL_TTL]

 * }

 */

enum {

	MPLS_IPTUNNEL_UNSPEC,

	MPLS_IPTUNNEL_DST,

	MPLS_IPTUNNEL_TTL,

	__MPLS_IPTUNNEL_MAX,

};

#define MPLS_IPTUNNEL_MAX (__MPLS_IPTUNNEL_MAX - 1)

include/uapi/linux/rtnetlink.h

+1 −0
Original line number Diff line number Diff line
@@ -319,6 +319,7 @@ enum rtattr_type_t { 
	RTA_EXPIRES,

	RTA_PAD,

	RTA_UID,

	RTA_TTL_PROPAGATE,

	__RTA_MAX

};