[GIT PULL net-next] IPVS

[GIT PULL net-next] IPVS

[Simon Horman]

Hi,

with all the excitement of kernel.org being offline and a bunch of trees
likewise being offline I am a little unsure who should take this pull
request which is based on the current net-next tree. But I guess it should
be Patrick, Pablo or Dave.

The following changes since commit 7777de9af54a1402c79bf7663b38ff5ba308dd45:

  qlcnic: Change CDRP function (2011-09-23 14:23:59 -0400)

are available in the git repository at:
  git://github.com/horms/ipvs-next.git master

Krzysztof Wilczynski (1):
      ipvs: Expose ip_vs_ftp module parameters via sysfs.

Simon Horman (4):
      IPVS: Add documentation for new sysctl entries
      IPVS: Remove unused parameter from ip_vs_confirm_conntrack()
      IPVS: Remove unused return value of protocol state transitions
      IPVS: Removed unused variables

 Documentation/networking/ipvs-sysctl.txt |   52 +++++++++++++++++++++++++++++-
 include/net/ip_vs.h                      |   11 +++---
 net/netfilter/ipvs/ip_vs_core.c          |   13 +++----
 net/netfilter/ipvs/ip_vs_ctl.c           |    4 --
 net/netfilter/ipvs/ip_vs_ftp.c           |    5 ++-
 net/netfilter/ipvs/ip_vs_nfct.c          |    2 +-
 net/netfilter/ipvs/ip_vs_proto_sctp.c    |   14 ++------
 net/netfilter/ipvs/ip_vs_proto_tcp.c     |    6 +--
 net/netfilter/ipvs/ip_vs_proto_udp.c     |    5 +--
 net/netfilter/ipvs/ip_vs_xmit.c          |    2 +-
 10 files changed, 75 insertions(+), 39 deletions(-)

Re: [GIT PULL net-next] IPVS

[Pablo Neira Ayuso]

On Mon, Sep 26, 2011 at 06:05:33PM +0900, Simon Horman wrote:
> Hi,
> 
> with all the excitement of kernel.org being offline and a bunch of trees
> likewise being offline I am a little unsure who should take this pull
> request which is based on the current net-next tree. But I guess it should
> be Patrick, Pablo or Dave.

I'll try to set up one tree in one of my servers along today, I'll
send you the URI. We can use it until kernel.org comes back.

@Patrick: Contact me and I'll create one account for you so we can
access the same tree.

Re: [GIT PULL net-next] IPVS

[Simon Horman]

On Tue, Sep 27, 2011 at 10:16:18AM +0200, Pablo Neira Ayuso wrote:
> On Mon, Sep 26, 2011 at 06:05:33PM +0900, Simon Horman wrote:
> > Hi,
> > 
> > with all the excitement of kernel.org being offline and a bunch of trees
> > likewise being offline I am a little unsure who should take this pull
> > request which is based on the current net-next tree. But I guess it should
> > be Patrick, Pablo or Dave.
> 
> I'll try to set up one tree in one of my servers along today, I'll
> send you the URI. We can use it until kernel.org comes back.

Thanks. Would you like me to rebase my tree on yours?

Re: [GIT PULL net-next] IPVS

[Pablo Neira Ayuso]

On Wed, Sep 28, 2011 at 10:28:03PM +0900, Simon Horman wrote:
> On Tue, Sep 27, 2011 at 10:16:18AM +0200, Pablo Neira Ayuso wrote:
> > On Mon, Sep 26, 2011 at 06:05:33PM +0900, Simon Horman wrote:
> > > Hi,
> > > 
> > > with all the excitement of kernel.org being offline and a bunch of trees
> > > likewise being offline I am a little unsure who should take this pull
> > > request which is based on the current net-next tree. But I guess it should
> > > be Patrick, Pablo or Dave.
> > 
> > I'll try to set up one tree in one of my servers along today, I'll
> > send you the URI. We can use it until kernel.org comes back.
> 
> Thanks. Would you like me to rebase my tree on yours?

For your patches, I put them in one branch and will cherrypick them
into master.

BTW, the trees are here:

http://1984.lsi.us.es/git/?p=net/.git;a=summary
http://1984.lsi.us.es/git/?p=net-next/.git;a=summary

I'll start iterating over the list collecting patches along today.

Re: [GIT PULL net-next] IPVS

[Pablo Neira Ayuso]

On Wed, Sep 28, 2011 at 10:28:03PM +0900, Simon Horman wrote:
> On Tue, Sep 27, 2011 at 10:16:18AM +0200, Pablo Neira Ayuso wrote:
> > On Mon, Sep 26, 2011 at 06:05:33PM +0900, Simon Horman wrote:
> > > Hi,
> > > 
> > > with all the excitement of kernel.org being offline and a bunch of trees
> > > likewise being offline I am a little unsure who should take this pull
> > > request which is based on the current net-next tree. But I guess it should
> > > be Patrick, Pablo or Dave.
> > 
> > I'll try to set up one tree in one of my servers along today, I'll
> > send you the URI. We can use it until kernel.org comes back.
> 
> Thanks. Would you like me to rebase my tree on yours?

http://1984.lsi.us.es/git/?p=net-next/.git;a=shortlog;h=refs/heads/nf-next

I have added these five patches to the nf-next branch of our temporary
tree.

Re: [GIT PULL net-next] IPVS

[Pablo Neira Ayuso]

On Wed, Sep 28, 2011 at 10:28:03PM +0900, Simon Horman wrote:
> On Tue, Sep 27, 2011 at 10:16:18AM +0200, Pablo Neira Ayuso wrote:
> > On Mon, Sep 26, 2011 at 06:05:33PM +0900, Simon Horman wrote:
> > > Hi,
> > > 
> > > with all the excitement of kernel.org being offline and a bunch of trees
> > > likewise being offline I am a little unsure who should take this pull
> > > request which is based on the current net-next tree. But I guess it should
> > > be Patrick, Pablo or Dave.
> > 
> > I'll try to set up one tree in one of my servers along today, I'll
> > send you the URI. We can use it until kernel.org comes back.
> 
> Thanks. Would you like me to rebase my tree on yours?

Thinking it well, and given that you'll have to send me more patches,
I think it's a good idea if you rebase.

BTW, please no need to Cc netfilter@vger.kernel.org, that list is for
netfilter users, not for developers.

Re: [GIT PULL net-next] IPVS

[Simon Horman]

On Wed, Sep 28, 2011 at 11:45:16PM +0200, Pablo Neira Ayuso wrote:
> On Wed, Sep 28, 2011 at 10:28:03PM +0900, Simon Horman wrote:
> > On Tue, Sep 27, 2011 at 10:16:18AM +0200, Pablo Neira Ayuso wrote:
> > > On Mon, Sep 26, 2011 at 06:05:33PM +0900, Simon Horman wrote:
> > > > Hi,
> > > > 
> > > > with all the excitement of kernel.org being offline and a bunch of trees
> > > > likewise being offline I am a little unsure who should take this pull
> > > > request which is based on the current net-next tree. But I guess it should
> > > > be Patrick, Pablo or Dave.
> > > 
> > > I'll try to set up one tree in one of my servers along today, I'll
> > > send you the URI. We can use it until kernel.org comes back.
> > 
> > Thanks. Would you like me to rebase my tree on yours?
> 
> Thinking it well, and given that you'll have to send me more patches,
> I think it's a good idea if you rebase.

Good thinking. I have rebased my ipvs-next tree on your nf-next branch.

> BTW, please no need to Cc netfilter@vger.kernel.org, that list is for
> netfilter users, not for developers.

Thanks, notied.

[GIT PULL net-next] IPVS

[Simon Horman]

Hi Pablo,

please consider pulling
  git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next master

To get the following fix from Julian

Julian Anastasov (1):
      ipvs: try also real server with port 0 in backup server

 include/net/ip_vs.h             |    2 +-
 net/netfilter/ipvs/ip_vs_conn.c |    2 +-
 net/netfilter/ipvs/ip_vs_ctl.c  |   10 ++++++++--
 net/netfilter/ipvs/ip_vs_sync.c |    2 +-
 4 files changed, 11 insertions(+), 5 deletions(-)

[PATCH] ipvs: try also real server with port 0 in backup server

[Simon Horman]

From: Julian Anastasov <ja@ssi.bg>

	We should not forget to try for real server with port 0
in the backup server when processing the sync message. We should
do it in all cases because the backup server can use different
forwarding method.

Signed-off-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>
---
 include/net/ip_vs.h             |    2 +-
 net/netfilter/ipvs/ip_vs_conn.c |    2 +-
 net/netfilter/ipvs/ip_vs_ctl.c  |   10 ++++++++--
 net/netfilter/ipvs/ip_vs_sync.c |    2 +-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
index 48fd12e..ebe517f 100644
--- a/include/net/ip_vs.h
+++ b/include/net/ip_vs.h
@@ -1207,7 +1207,7 @@ extern void ip_vs_control_cleanup(void);
 extern struct ip_vs_dest *
 ip_vs_find_dest(struct net *net, int af, const union nf_inet_addr *daddr,
 		__be16 dport, const union nf_inet_addr *vaddr, __be16 vport,
-		__u16 protocol, __u32 fwmark);
+		__u16 protocol, __u32 fwmark, __u32 flags);
 extern struct ip_vs_dest *ip_vs_try_bind_dest(struct ip_vs_conn *cp);
 
 
diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c
index 12571fb..29fa5ba 100644
--- a/net/netfilter/ipvs/ip_vs_conn.c
+++ b/net/netfilter/ipvs/ip_vs_conn.c
@@ -616,7 +616,7 @@ struct ip_vs_dest *ip_vs_try_bind_dest(struct ip_vs_conn *cp)
 	if ((cp) && (!cp->dest)) {
 		dest = ip_vs_find_dest(ip_vs_conn_net(cp), cp->af, &cp->daddr,
 				       cp->dport, &cp->vaddr, cp->vport,
-				       cp->protocol, cp->fwmark);
+				       cp->protocol, cp->fwmark, cp->flags);
 		ip_vs_bind_dest(cp, dest);
 		return dest;
 	} else
diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
index 008bf97..e1a66cf 100644
--- a/net/netfilter/ipvs/ip_vs_ctl.c
+++ b/net/netfilter/ipvs/ip_vs_ctl.c
@@ -619,15 +619,21 @@ struct ip_vs_dest *ip_vs_find_dest(struct net  *net, int af,
 				   const union nf_inet_addr *daddr,
 				   __be16 dport,
 				   const union nf_inet_addr *vaddr,
-				   __be16 vport, __u16 protocol, __u32 fwmark)
+				   __be16 vport, __u16 protocol, __u32 fwmark,
+				   __u32 flags)
 {
 	struct ip_vs_dest *dest;
 	struct ip_vs_service *svc;
+	__be16 port = dport;
 
 	svc = ip_vs_service_get(net, af, fwmark, protocol, vaddr, vport);
 	if (!svc)
 		return NULL;
-	dest = ip_vs_lookup_dest(svc, daddr, dport);
+	if (fwmark && (flags & IP_VS_CONN_F_FWD_MASK) != IP_VS_CONN_F_MASQ)
+		port = 0;
+	dest = ip_vs_lookup_dest(svc, daddr, port);
+	if (!dest)
+		dest = ip_vs_lookup_dest(svc, daddr, port ^ dport);
 	if (dest)
 		atomic_inc(&dest->refcnt);
 	ip_vs_service_put(svc);
diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c
index bcf5563..8a0d6d6 100644
--- a/net/netfilter/ipvs/ip_vs_sync.c
+++ b/net/netfilter/ipvs/ip_vs_sync.c
@@ -740,7 +740,7 @@ static void ip_vs_proc_conn(struct net *net, struct ip_vs_conn_param *param,
 		 * but still handled.
 		 */
 		dest = ip_vs_find_dest(net, type, daddr, dport, param->vaddr,
-				       param->vport, protocol, fwmark);
+				       param->vport, protocol, fwmark, flags);
 
 		/*  Set the approprite ativity flag */
 		if (protocol == IPPROTO_TCP) {
-- 
1.7.6.3

Re: [GIT PULL net-next] IPVS

[Pablo Neira Ayuso]

Hi Simon,

On Fri, Dec 30, 2011 at 02:19:01PM +0900, Simon Horman wrote:
> Hi Pablo,
> 
> please consider pulling
>   git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next
>   master

Since this is a fix, I can try to pass this for 3.2-rc7 to davem. I
read Linus will release 3.2 by new year, so we can still try to see if
we can get it in time.

Let me know what you prefer.

Re: [GIT PULL net-next] IPVS

[Julian Anastasov]

	Hello,

On Fri, 30 Dec 2011, Pablo Neira Ayuso wrote:

> Hi Simon,
> 
> On Fri, Dec 30, 2011 at 02:19:01PM +0900, Simon Horman wrote:
> > Hi Pablo,
> > 
> > please consider pulling
> >   git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next
> >   master
> 
> Since this is a fix, I can try to pass this for 3.2-rc7 to davem. I
> read Linus will release 3.2 by new year, so we can still try to see if
> we can get it in time.
> 
> Let me know what you prefer.

	It is a good idea, if it is not too late.

Regards

--
Julian Anastasov <ja@ssi.bg>

Re: [GIT PULL net-next] IPVS

[Simon Horman]

On Fri, Dec 30, 2011 at 12:24:19PM +0100, Pablo Neira Ayuso wrote:
> Hi Simon,
> 
> On Fri, Dec 30, 2011 at 02:19:01PM +0900, Simon Horman wrote:
> > Hi Pablo,
> > 
> > please consider pulling
> >   git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next
> >   master
> 
> Since this is a fix, I can try to pass this for 3.2-rc7 to davem. I
> read Linus will release 3.2 by new year, so we can still try to see if
> we can get it in time.
> 
> Let me know what you prefer.

Hi Pablo,

please try for 3.2-rc7 if possible.

Re: [GIT PULL net-next] IPVS

[Pablo Neira Ayuso]

On Sat, Dec 31, 2011 at 06:06:25PM +0900, Simon Horman wrote:
> On Fri, Dec 30, 2011 at 12:24:19PM +0100, Pablo Neira Ayuso wrote:
> > Hi Simon,
> > 
> > On Fri, Dec 30, 2011 at 02:19:01PM +0900, Simon Horman wrote:
> > > Hi Pablo,
> > > 
> > > please consider pulling
> > >   git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next
> > >   master
> > 
> > Since this is a fix, I can try to pass this for 3.2-rc7 to davem. I
> > read Linus will release 3.2 by new year, so we can still try to see if
> > we can get it in time.
> > 
> > Let me know what you prefer.
> 
> Hi Pablo,
> 
> please try for 3.2-rc7 if possible.

OK, let's try!

Re: [PATCH] ipvs: try also real server with port 0 in backup server

[Pablo Neira Ayuso]

On Fri, Dec 30, 2011 at 02:19:02PM +0900, Simon Horman wrote:
> From: Julian Anastasov <ja@ssi.bg>
> 
> 	We should not forget to try for real server with port 0
> in the backup server when processing the sync message. We should
> do it in all cases because the backup server can use different
> forwarding method.
> 
> Signed-off-by: Julian Anastasov <ja@ssi.bg>
> Signed-off-by: Simon Horman <horms@verge.net.au>

Applied, thanks!