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

Commit 99cb99aa authored by David S. Miller's avatar David S. Miller
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next 



Pablo Neira Ayuso says:

====================
Netfilter/IPVS updates for net-next

The following patchset contains Netfilter/IPVS updates for your net-next tree
in this 4.4 development cycle, they are:

1) Schedule ICMP traffic to IPVS instances, this introduces a new schedule_icmp
   proc knob to enable/disable it. By default is off to retain the old
   behaviour. Patchset from Alex Gartrell.

I'm also including what Alex originally said for the record:

"The configuration of ipvs at Facebook is relatively straightforward.  All
ipvs instances bgp advertise a set of VIPs and the network prefers the
nearest one or uses ECMP in the event of a tie.  For the uninitiated, ECMP
deterministically and statelessly load balances by hashing the packet
(usually a 5-tuple of protocol, saddr, daddr, sport, and dport) and using
that number as an index (basic hash table type logic).

The problem is that ICMP packets (which contain really important
information like whether or not an MTU has been exceeded) will get a
different hash value and may end up at a different ipvs instance.  With no
information about where to route these packets, they are dropped, creating
ICMP black holes and breaking Path MTU discovery.  Suddenly, my mom's
pictures can't load and I'm fielding midday calls that I want nothing to do
with.

To address this, this patch set introduces the ability to schedule icmp
packets which is gated by a sysctl net.ipv4.vs.schedule_icmp.  If set to 0,
the old behavior is maintained -- otherwise ICMP packets are scheduled."

2) Add another proc entry to ignore tunneled packets to avoid routing loops
   from IPVS, also from Alex.

3) Fifteen patches from Eric Biederman to:

* Stop passing nf_hook_ops as parameter to the hook and use the state hook
  object instead all around the netfilter code, so only the private data
  pointer is passed to the registered hook function.

* Now that we've got state->net, propagate the netns pointer to netfilter hook
  clients to avoid its computation over and over again. A good example of how
  this has been simplified is the former TEE target (now nf_dup infrastructure)
  since it has killed the ugly pick_net() function.

There's another round of netns updates from Eric Biederman making the line. To
avoid the patchbomb again to almost all the networking mailing list (that is 84
patches) I'd suggest we send you a pull request with no patches or let me know
if you prefer a better way.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 97170ea1 0a031ac5

Documentation/networking/ipvs-sysctl.txt

+10 −0
Original line number Diff line number Diff line
@@ -157,6 +157,16 @@ expire_quiescent_template - BOOLEAN 
	persistence template if it is to be used to schedule a new

	connection and the destination server is quiescent.



ignore_tunneled - BOOLEAN

	0 - disabled (default)

	not 0 - enabled



	If set, ipvs will set the ipvs_property on all packets which are of

	unrecognized protocols.  This prevents us from routing tunneled

	protocols like ipip, which is useful to prevent rescheduling

	packets that have been tunneled to the ipvs host (i.e. to prevent

	ipvs routing loops when ipvs is also acting as a real server).



nat_icmp_send - BOOLEAN

        0 - disabled (default)

        not 0 - enabled

include/linux/netfilter.h

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ static inline void nf_hook_state_init(struct nf_hook_state *p, 
	p->okfn = okfn;

}



typedef unsigned int nf_hookfn(const struct nf_hook_ops *ops,

typedef unsigned int nf_hookfn(void *priv,

			       struct sk_buff *skb,

			       const struct nf_hook_state *state);

include/linux/netfilter/x_tables.h

+2 −1
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
 * @target:	the target extension

 * @matchinfo:	per-match data

 * @targetinfo:	per-target data

 * @net		network namespace through which the action was invoked

 * @in:		input netdevice

 * @out:	output netdevice

 * @fragoff:	packet is a fragment, this is the data offset
@@ -24,7 +25,6 @@ 
 * Fields written to by extensions:

 *

 * @hotdrop:	drop packet if we had inspection problems

 * Network namespace obtainable using dev_net(in/out)

 */

struct xt_action_param {

	union {
@@ -34,6 +34,7 @@ struct xt_action_param { 
	union {

		const void *matchinfo, *targinfo;

	};

	struct net *net;

	const struct net_device *in, *out;

	int fragoff;

	unsigned int thoff;

include/linux/netfilter_arp/arp_tables.h

+0 −1
Original line number Diff line number Diff line
@@ -53,7 +53,6 @@ extern struct xt_table *arpt_register_table(struct net *net, 
					    const struct arpt_replace *repl);

extern void arpt_unregister_table(struct xt_table *table);

extern unsigned int arpt_do_table(struct sk_buff *skb,

				  unsigned int hook,

				  const struct nf_hook_state *state,

				  struct xt_table *table);

include/linux/netfilter_bridge/ebtables.h

+3 −3
Original line number Diff line number Diff line
@@ -111,8 +111,8 @@ struct ebt_table { 
extern struct ebt_table *ebt_register_table(struct net *net,

					    const struct ebt_table *table);

extern void ebt_unregister_table(struct net *net, struct ebt_table *table);

extern unsigned int ebt_do_table(unsigned int hook, struct sk_buff *skb,

   const struct net_device *in, const struct net_device *out,

extern unsigned int ebt_do_table(struct sk_buff *skb,

				 const struct nf_hook_state *state,

				 struct ebt_table *table);



/* Used in the kernel match() functions */