ipvlan: decouple l3s mode dependencies from other modes
Subsystems (2)
PATCH 1/1 ipvlan: decouple l3s mode dependencies from other modes
Right now ipvlan has a hard dependency on CONFIG_NETFILTER and otherwise it cannot be built. However, the only ipvlan operation mode that actually depends on netfilter is l3s, everything else is independent of it. Break this hard dependency such that users are able to use ipvlan l3 mode on systems where netfilter is not compiled in.
Therefore, this adds a hidden CONFIG_IPVLAN_L3S bool which is defaulting to y when CONFIG_NETFILTER is set in order to retain existing behavior for l3s. All l3s related code is refactored into ipvlan_l3s.c that is compiled in when enabled.
--- drivers/net/Kconfig | 6 +- drivers/net/ipvlan/Makefile | 3 +- drivers/net/ipvlan/ipvlan.h | 37 ++++++- drivers/net/ipvlan/ipvlan_core.c | 105 ++---------------- drivers/net/ipvlan/ipvlan_l3s.c | 227 +++++++++++++++++++++++++++++++++++++++ drivers/net/ipvlan/ipvlan_main.c | 117 +++----------------- 6 files changed, 287 insertions(+), 208 deletions(-) create mode 100644 drivers/net/ipvlan/ipvlan_l3s.c
drivers/net/Kconfig +4 -2
@@ -145,13 +145,15 @@ config MACVTAP To compile this driver as a module, choose M here: the module will be called macvtap. +config IPVLAN_L3S + depends on NETFILTER + def_bool y + select NET_L3_MASTER_DEV config IPVLAN tristate "IP-VLAN support" depends on INET depends on IPV6 || !IPV6 - depends on NETFILTER - select NET_L3_MASTER_DEV ---help--- This allows one to create virtual devices off of a main interface and packets will be delivered based on the dest L3 (IPv6/IPv4 addr)
drivers/net/ipvlan/Makefile +2 -1
@@ -5,4 +5,5 @@ obj-$(CONFIG_IPVLAN) += ipvlan.o obj-$(CONFIG_IPVTAP) += ipvtap.o -ipvlan-objs := ipvlan_core.o ipvlan_main.o +ipvlan-objs-$(CONFIG_IPVLAN_L3S) += ipvlan_l3s.o +ipvlan-objs := ipvlan_core.o ipvlan_main.o $(ipvlan-objs-y)
drivers/net/ipvlan/ipvlan.h +33 -4
@@ -165,10 +165,9 @@ struct ipvl_addr *ipvlan_find_addr(const struct ipvl_dev *ipvlan, const void *iaddr, bool is_v6);bool ipvlan_addr_busy (struct ipvl_port *port,void *iaddr,bool is_v6);void ipvlan_ht_addr_del (struct ipvl_addr *addr); -struct sk_buff *ipvlan_l3_rcv (struct net_device *dev,struct sk_buff *skb, -u16 proto); -unsigned int ipvlan_nf_input (void *priv,struct sk_buff *skb, -const struct nf_hook_state *state); +struct ipvl_addr *ipvlan_addr_lookup (struct ipvl_port *port,void *lyr3h, +int addr_type,bool use_dest); +void *ipvlan_get_L3_hdr (struct ipvl_port *port,struct sk_buff *skb,int *type);void ipvlan_count_rx (const struct ipvl_dev *ipvlan,unsigned int len,bool success,bool mcast); int ipvlan_link_new(struct net *src_net, struct net_device *dev,
@@ -177,6 +176,36 @@ int ipvlan_link_new(struct net *src_net, struct net_device *dev,void ipvlan_link_delete (struct net_device *dev,struct list_head *head);void ipvlan_link_setup (struct net_device *dev);int ipvlan_link_register (struct rtnl_link_ops *ops); +#ifdef CONFIG_IPVLAN_L3S +int ipvlan_l3s_register (struct ipvl_port *port); +void ipvlan_l3s_unregister (struct ipvl_port *port); +void ipvlan_migrate_l3s_hook (struct net *oldnet,struct net *newnet); +int ipvlan_l3s_init (void ); +void ipvlan_l3s_cleanup (void ); +#else +static inline int ipvlan_l3s_register (struct ipvl_port *port) +{ +return -ENOTSUPP ; +} + +static inline void ipvlan_l3s_unregister (struct ipvl_port *port) +{ +} + +static inline void ipvlan_migrate_l3s_hook (struct net *oldnet, +struct net *newnet) +{ +} + +static inline int ipvlan_l3s_init (void ) +{ +return 0 ; +} + +static inline void ipvlan_l3s_cleanup (void ) +{ +} +#endif /* CONFIG_IPVLAN_L3S */ static inline bool netif_is_ipvlan_port (const struct net_device *dev) {
drivers/net/ipvlan/ipvlan_core.c +7 -98
135 lines not on this page · raw message
drivers/net/ipvlan/ipvlan_l3s.c new file +227 -0
227 lines not on this page · raw message
drivers/net/ipvlan/ipvlan_main.c +14 -103
183 lines not on this page · raw message
Signature · 1 line
2.9.5
Quoted 11 lines · Daniel Borkmann
Right now ipvlan has a hard dependency on
CONFIG_NETFILTERand otherwise it cannot be built. However, the only ipvlan operation mode that actually depends on netfilter is l3s, everything else is independent of it. Break this hard dependency such that users are able to use ipvlan l3 mode on systems where netfilter is not compiled in.Therefore, this adds a hidden
CONFIG_IPVLAN_L3Sbool which is defaulting to y whenCONFIG_NETFILTERis set in order to retain existing behavior for l3s. All l3s related code is refactored intoipvlan_l3s.cthat is compiled in when enabled.
IIRC L3S is only meaningful with netfilter anyway, so this looks like a good thing to do.
Quoted 8 lines · Florian Westphal
Quoted 7 lines · Daniel Borkmann
Right now ipvlan has a hard dependency on
CONFIG_NETFILTERand otherwise it cannot be built. However, the only ipvlan operation mode that actually depends on netfilter is l3s, everything else is independent of it. Break this hard dependency such that users are able to use ipvlan l3 mode on systems where netfilter is not compiled in.
Quoted 7 lines
Quoted 4 lines
Therefore, this adds a hidden
CONFIG_IPVLAN_L3Sbool which is defaulting to y whenCONFIG_NETFILTERis set in order to retain existing behavior for l3s. All l3s related code is refactored intoipvlan_l3s.cthat is compiled in when enabled.IIRC L3S is only meaningful with netfilter anyway, so this looks like a good thing to do.
Yep, agree, it doesn't work without it since inside ipvlan's nfhook there is the final switch to the target ipvlan slave device. :)
Quoted 1 line
Acked-by Florian Westphal <[email protected]>
Thanks!
From: Daniel Borkmann <[email protected]>
Date: Fri, 8 Feb 2019 13:55:31 +0100
Quoted 7 lines
Right now ipvlan has a hard dependency on
CONFIG_NETFILTERand otherwise it cannot be built. However, the only ipvlan operation mode that actually depends on netfilter is l3s, everything else is independent of it. Break this hard dependency such that users are able to use ipvlan l3 mode on systems where netfilter is not compiled in.
Quoted 6 lines
Therefore, this adds a hidden
CONFIG_IPVLAN_L3Sbool which is defaulting to y whenCONFIG_NETFILTERis set in order to retain existing behavior for l3s. All l3s related code is refactored intoipvlan_l3s.cthat is compiled in when enabled.Signed-off-by Daniel Borkmann <[email protected]>
Applied, thanks Daniel.