* [PATCH 1/5] ipvs: remove an annoying printk in netns init
2017-03-16 12:43 [GIT PULL 0/5] IPVS Updates for v4.12 Simon Horman
@ 2017-03-16 12:43 ` Simon Horman
2017-03-16 12:43 ` [PATCH 2/5] ipvs: fix sync_threshold description and add sync_refresh_period, sync_retries Simon Horman
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Simon Horman @ 2017-03-16 12:43 UTC (permalink / raw)
To: Pablo Neira Ayuso
Cc: lvs-devel, netdev, netfilter-devel, Wensong Zhang,
Julian Anastasov, Cong Wang, Simon Horman
From: Cong Wang <xiyou.wangcong@gmail.com>
At most it is used for debugging purpose, but I don't think
it is even useful for debugging, just remove it.
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
---
net/netfilter/ipvs/ip_vs_core.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
index db40050f8785..9aaa49025cdc 100644
--- a/net/netfilter/ipvs/ip_vs_core.c
+++ b/net/netfilter/ipvs/ip_vs_core.c
@@ -2231,8 +2231,6 @@ static int __net_init __ip_vs_init(struct net *net)
if (ip_vs_sync_net_init(ipvs) < 0)
goto sync_fail;
- printk(KERN_INFO "IPVS: Creating netns size=%zu id=%d\n",
- sizeof(struct netns_ipvs), ipvs->gen);
return 0;
/*
* Error handling
--
2.7.0.rc3.207.g0ac5344
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 2/5] ipvs: fix sync_threshold description and add sync_refresh_period, sync_retries
2017-03-16 12:43 [GIT PULL 0/5] IPVS Updates for v4.12 Simon Horman
2017-03-16 12:43 ` [PATCH 1/5] ipvs: remove an annoying printk in netns init Simon Horman
@ 2017-03-16 12:43 ` Simon Horman
2017-03-16 12:43 ` [PATCH 3/5] ipvs: Document sysctl sync_qlen_max and sync_sock_size Simon Horman
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Simon Horman @ 2017-03-16 12:43 UTC (permalink / raw)
To: Pablo Neira Ayuso
Cc: lvs-devel, netdev, netfilter-devel, Wensong Zhang,
Julian Anastasov, Hangbin Liu, Simon Horman
From: Hangbin Liu <liuhangbin@gmail.com>
Fix sync_threshold description which should have two values. Also add
sync_refresh_period and sync_retries based on commit 749c42b620a9
("ipvs: reduce sync rate with time thresholds").
Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
---
Documentation/networking/ipvs-sysctl.txt | 40 +++++++++++++++++++++++++-------
1 file changed, 31 insertions(+), 9 deletions(-)
diff --git a/Documentation/networking/ipvs-sysctl.txt b/Documentation/networking/ipvs-sysctl.txt
index e6b1c025fdd8..7acaaa65451e 100644
--- a/Documentation/networking/ipvs-sysctl.txt
+++ b/Documentation/networking/ipvs-sysctl.txt
@@ -185,15 +185,37 @@ secure_tcp - INTEGER
The value definition is the same as that of drop_entry and
drop_packet.
-sync_threshold - INTEGER
- default 3
-
- It sets synchronization threshold, which is the minimum number
- of incoming packets that a connection needs to receive before
- the connection will be synchronized. A connection will be
- synchronized, every time the number of its incoming packets
- modulus 50 equals the threshold. The range of the threshold is
- from 0 to 49.
+sync_threshold - vector of 2 INTEGERs: sync_threshold, sync_period
+ default 3 50
+
+ It sets synchronization threshold, which is the minimum number
+ of incoming packets that a connection needs to receive before
+ the connection will be synchronized. A connection will be
+ synchronized, every time the number of its incoming packets
+ modulus sync_period equals the threshold. The range of the
+ threshold is from 0 to sync_period.
+
+ When sync_period and sync_refresh_period are 0, send sync only
+ for state changes or only once when pkts matches sync_threshold
+
+sync_refresh_period - UNSIGNED INTEGER
+ default 0
+
+ In seconds, difference in reported connection timer that triggers
+ new sync message. It can be used to avoid sync messages for the
+ specified period (or half of the connection timeout if it is lower)
+ if connection state is not changed since last sync.
+
+ This is useful for normal connections with high traffic to reduce
+ sync rate. Additionally, retry sync_retries times with period of
+ sync_refresh_period/8.
+
+sync_retries - INTEGER
+ default 0
+
+ Defines sync retries with period of sync_refresh_period/8. Useful
+ to protect against loss of sync messages. The range of the
+ sync_retries is from 0 to 3.
snat_reroute - BOOLEAN
0 - disabled
--
2.7.0.rc3.207.g0ac5344
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 3/5] ipvs: Document sysctl sync_qlen_max and sync_sock_size
2017-03-16 12:43 [GIT PULL 0/5] IPVS Updates for v4.12 Simon Horman
2017-03-16 12:43 ` [PATCH 1/5] ipvs: remove an annoying printk in netns init Simon Horman
2017-03-16 12:43 ` [PATCH 2/5] ipvs: fix sync_threshold description and add sync_refresh_period, sync_retries Simon Horman
@ 2017-03-16 12:43 ` Simon Horman
2017-03-16 12:43 ` [PATCH 4/5] ipvs: Document sysctl sync_ports Simon Horman
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Simon Horman @ 2017-03-16 12:43 UTC (permalink / raw)
To: Pablo Neira Ayuso
Cc: lvs-devel, netdev, netfilter-devel, Wensong Zhang,
Julian Anastasov, Hangbin Liu, Simon Horman
From: Hangbin Liu <liuhangbin@gmail.com>
Document sysctl sync_qlen_max and sync_sock_size based on
commit 1c003b1580e2 ("ipvs: wakeup master thread").
Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
---
Documentation/networking/ipvs-sysctl.txt | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/Documentation/networking/ipvs-sysctl.txt b/Documentation/networking/ipvs-sysctl.txt
index 7acaaa65451e..159d70b6dff3 100644
--- a/Documentation/networking/ipvs-sysctl.txt
+++ b/Documentation/networking/ipvs-sysctl.txt
@@ -217,6 +217,20 @@ sync_retries - INTEGER
to protect against loss of sync messages. The range of the
sync_retries is from 0 to 3.
+sync_qlen_max - UNSIGNED LONG
+
+ Hard limit for queued sync messages that are not sent yet. It
+ defaults to 1/32 of the memory pages but actually represents
+ number of messages. It will protect us from allocating large
+ parts of memory when the sending rate is lower than the queuing
+ rate.
+
+sync_sock_size - INTEGER
+ default 0
+
+ Configuration of SNDBUF (master) or RCVBUF (slave) socket limit.
+ Default value is 0 (preserve system defaults).
+
snat_reroute - BOOLEAN
0 - disabled
not 0 - enabled (default)
--
2.7.0.rc3.207.g0ac5344
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 4/5] ipvs: Document sysctl sync_ports
2017-03-16 12:43 [GIT PULL 0/5] IPVS Updates for v4.12 Simon Horman
` (2 preceding siblings ...)
2017-03-16 12:43 ` [PATCH 3/5] ipvs: Document sysctl sync_qlen_max and sync_sock_size Simon Horman
@ 2017-03-16 12:43 ` Simon Horman
2017-03-16 12:43 ` [PATCH 5/5] ipvs: Document sysctl pmtu_disc Simon Horman
2017-03-17 11:39 ` [GIT PULL 0/5] IPVS Updates for v4.12 Pablo Neira Ayuso
5 siblings, 0 replies; 7+ messages in thread
From: Simon Horman @ 2017-03-16 12:43 UTC (permalink / raw)
To: Pablo Neira Ayuso
Cc: lvs-devel, netdev, netfilter-devel, Wensong Zhang,
Julian Anastasov, Hangbin Liu, Simon Horman
From: Hangbin Liu <liuhangbin@gmail.com>
Document sysctl sync_ports based on commit f73181c8288f ("ipvs: add support
for sync threads").
Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
---
Documentation/networking/ipvs-sysctl.txt | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/Documentation/networking/ipvs-sysctl.txt b/Documentation/networking/ipvs-sysctl.txt
index 159d70b6dff3..a6feecd467cd 100644
--- a/Documentation/networking/ipvs-sysctl.txt
+++ b/Documentation/networking/ipvs-sysctl.txt
@@ -231,6 +231,14 @@ sync_sock_size - INTEGER
Configuration of SNDBUF (master) or RCVBUF (slave) socket limit.
Default value is 0 (preserve system defaults).
+sync_ports - INTEGER
+ default 1
+
+ The number of threads that master and backup servers can use for
+ sync traffic. Every thread will use single UDP port, thread 0 will
+ use the default port 8848 while last thread will use port
+ 8848+sync_ports-1.
+
snat_reroute - BOOLEAN
0 - disabled
not 0 - enabled (default)
--
2.7.0.rc3.207.g0ac5344
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 5/5] ipvs: Document sysctl pmtu_disc
2017-03-16 12:43 [GIT PULL 0/5] IPVS Updates for v4.12 Simon Horman
` (3 preceding siblings ...)
2017-03-16 12:43 ` [PATCH 4/5] ipvs: Document sysctl sync_ports Simon Horman
@ 2017-03-16 12:43 ` Simon Horman
2017-03-17 11:39 ` [GIT PULL 0/5] IPVS Updates for v4.12 Pablo Neira Ayuso
5 siblings, 0 replies; 7+ messages in thread
From: Simon Horman @ 2017-03-16 12:43 UTC (permalink / raw)
To: Pablo Neira Ayuso
Cc: lvs-devel, netdev, netfilter-devel, Wensong Zhang,
Julian Anastasov, Hangbin Liu, Simon Horman
From: Hangbin Liu <liuhangbin@gmail.com>
Document sysctl pmtu_disc based on commit 3654e61137db ("ipvs: add
pmtu_disc option to disable IP DF for TUN packets").
Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
---
Documentation/networking/ipvs-sysctl.txt | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/Documentation/networking/ipvs-sysctl.txt b/Documentation/networking/ipvs-sysctl.txt
index a6feecd467cd..056898685d40 100644
--- a/Documentation/networking/ipvs-sysctl.txt
+++ b/Documentation/networking/ipvs-sysctl.txt
@@ -175,6 +175,14 @@ nat_icmp_send - BOOLEAN
for VS/NAT when the load balancer receives packets from real
servers but the connection entries don't exist.
+pmtu_disc - BOOLEAN
+ 0 - disabled
+ not 0 - enabled (default)
+
+ By default, reject with FRAG_NEEDED all DF packets that exceed
+ the PMTU, irrespective of the forwarding method. For TUN method
+ the flag can be disabled to fragment such packets.
+
secure_tcp - INTEGER
0 - disabled (default)
--
2.7.0.rc3.207.g0ac5344
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [GIT PULL 0/5] IPVS Updates for v4.12
2017-03-16 12:43 [GIT PULL 0/5] IPVS Updates for v4.12 Simon Horman
` (4 preceding siblings ...)
2017-03-16 12:43 ` [PATCH 5/5] ipvs: Document sysctl pmtu_disc Simon Horman
@ 2017-03-17 11:39 ` Pablo Neira Ayuso
5 siblings, 0 replies; 7+ messages in thread
From: Pablo Neira Ayuso @ 2017-03-17 11:39 UTC (permalink / raw)
To: Simon Horman
Cc: lvs-devel, netdev, netfilter-devel, Wensong Zhang, Julian Anastasov
On Thu, Mar 16, 2017 at 01:43:10PM +0100, Simon Horman wrote:
> Hi Pablo,
>
> please consider these enhancements to the IPVS for v4.12.
>
> * Update sysctl documentation
> * Remove unnecessary printk in __ip_vs_init
>
> The following changes since commit 03e5fd0e9bcc1f34b7a542786b34b8f771e7c260:
>
> netfilter: nft_set_rbtree: use per-set rwlock to improve the scalability (2017-03-13 19:30:43 +0100)
>
> are available in the git repository at:
>
> https://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git tags/ipvs-for-v4.12
Pulled, thanks Simon!
^ permalink raw reply [flat|nested] 7+ messages in thread