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

Commit 417b7ca4 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'lwt-autoload' 



Robert Shearman says:

====================
lwtunnel: autoload of lwt modules

Changes since v1:
 - remove "LWTUNNEL_ENCAP_" prefix for the string form of the encaps
   used when requesting the module to reduce duplication, and don't
   bother returning strings for lwt modules using netdevices, both
   suggested by Jiri.
 - update commit message of first patch to clarify security
   implications, in response to Eric's comments.

The lwt implementations using net devices can autoload using the
existing mechanism using IFLA_INFO_KIND. However, there's no mechanism
that lwt modules not using net devices can use.

Therefore, these patches add the ability to autoload modules
registering lwt operations for lwt implementations not using a net
device so that users don't have to manually load the modules.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents e817af27 84a8cbe4

include/net/lwtunnel.h

+3 −1
Original line number Original line Diff line number Diff line
@@ -170,6 +170,8 @@ static inline int lwtunnel_input(struct sk_buff *skb) 
	return -EOPNOTSUPP;

	return -EOPNOTSUPP;

}

}





#endif

#endif /* CONFIG_LWTUNNEL */



#define MODULE_ALIAS_RTNL_LWT(encap_type) MODULE_ALIAS("rtnl-lwt-" __stringify(encap_type))





#endif /* __NET_LWTUNNEL_H */
 
#endif /* __NET_LWTUNNEL_H */

net/core/lwtunnel.c

+37 −0
Original line number Original line Diff line number Diff line
@@ -27,6 +27,31 @@ 
#include <net/rtnetlink.h>

#include <net/rtnetlink.h>

#include <net/ip6_fib.h>

#include <net/ip6_fib.h>





#ifdef CONFIG_MODULES



static const char *lwtunnel_encap_str(enum lwtunnel_encap_types encap_type)

{

	/* Only lwt encaps implemented without using an interface for

	 * the encap need to return a string here.

	 */

	switch (encap_type) {

	case LWTUNNEL_ENCAP_MPLS:

		return "MPLS";

	case LWTUNNEL_ENCAP_ILA:

		return "ILA";

	case LWTUNNEL_ENCAP_IP6:

	case LWTUNNEL_ENCAP_IP:

	case LWTUNNEL_ENCAP_NONE:

	case __LWTUNNEL_ENCAP_MAX:

		/* should not have got here */

		WARN_ON(1);

		break;

	}

	return NULL;

}



#endif /* CONFIG_MODULES */



struct lwtunnel_state *lwtunnel_state_alloc(int encap_len)

struct lwtunnel_state *lwtunnel_state_alloc(int encap_len)

{

{

	struct lwtunnel_state *lws;

	struct lwtunnel_state *lws;
@@ -85,6 +110,18 @@ int lwtunnel_build_state(struct net_device *dev, u16 encap_type, 
	ret = -EOPNOTSUPP;

	ret = -EOPNOTSUPP;

	rcu_read_lock();

	rcu_read_lock();

	ops = rcu_dereference(lwtun_encaps[encap_type]);

	ops = rcu_dereference(lwtun_encaps[encap_type]);

#ifdef CONFIG_MODULES

	if (!ops) {

		const char *encap_type_str = lwtunnel_encap_str(encap_type);



		if (encap_type_str) {

			rcu_read_unlock();

			request_module("rtnl-lwt-%s", encap_type_str);

			rcu_read_lock();

			ops = rcu_dereference(lwtun_encaps[encap_type]);

		}

	}

#endif

	if (likely(ops && ops->build_state))

	if (likely(ops && ops->build_state))

		ret = ops->build_state(dev, encap, family, cfg, lws);

		ret = ops->build_state(dev, encap, family, cfg, lws);

	rcu_read_unlock();

	rcu_read_unlock();

net/ipv6/ila/ila_common.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -99,5 +99,6 @@ static void __exit ila_fini(void) 




module_init(ila_init);

module_init(ila_init);

module_exit(ila_fini);

module_exit(ila_fini);

MODULE_ALIAS_RTNL_LWT(ILA);

MODULE_AUTHOR("Tom Herbert <tom@herbertland.com>");

MODULE_AUTHOR("Tom Herbert <tom@herbertland.com>");

MODULE_LICENSE("GPL");
 
MODULE_LICENSE("GPL");

net/mpls/mpls_iptunnel.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -227,5 +227,6 @@ static void __exit mpls_iptunnel_exit(void) 
}

}

module_exit(mpls_iptunnel_exit);

module_exit(mpls_iptunnel_exit);





MODULE_ALIAS_RTNL_LWT(MPLS);

MODULE_DESCRIPTION("MultiProtocol Label Switching IP Tunnels");

MODULE_DESCRIPTION("MultiProtocol Label Switching IP Tunnels");

MODULE_LICENSE("GPL v2");
 
MODULE_LICENSE("GPL v2");