diff mbox

[GIT,PULL,nf-next,00/21] Second Round of IPVS Updates for v3.18

Message ID alpine.LFD.2.11.1409170013440.3254@ja.home.ssi.bg
State Awaiting Upstream, archived
Delegated to: David Miller
Headers show

Commit Message

Julian Anastasov Sept. 16, 2014, 9:27 p.m. UTC 
Hello,

On Tue, 16 Sep 2014, Pablo Neira Ayuso wrote:

> Hi Simon,
> 
> On Tue, Sep 16, 2014 at 09:34:14AM +0900, Simon Horman wrote:
> > Hi Pablo,
> > 
> > please consider these IPVS updates for v3.18.
> > 
> > * Add simple weighted failover scheduler
> >   - Thanks to Kenny Mathis
> > * Support v6 real servers in v4 pools and vice versa
> >   - Thanks to Alex Gartrell and Julian Anastasov
> 
> I need a slightly larger description of this series.
> 
> I think you can merge patches 13-19 too. They are mostly two liners
> with a similar description, so they naturally belong to the same
> logical change. I would like to reduce the patchbomb pull request for
> David.

	Good idea, done.

	Simon, I'm attaching such patch that replaces all
these "ipvs: use correct address family in * logs".
It additionally changes the new ip_vs_fo.c scheduler
and ip_vs_wrr.c which was missed.

Regards

--
Julian Anastasov <ja@ssi.bg>
From 18e7e92c9972ff98dc5547b9ffdfbd45420631c2 Mon Sep 17 00:00:00 2001
From: Julian Anastasov <ja@ssi.bg>

Date: Wed, 17 Sep 2014 00:09:00 +0300
Subject: [PATCH net-next] ipvs: use correct address family in scheduler logs

Needed to support svc->af != dest->af.

Signed-off-by: Julian Anastasov <ja@ssi.bg>

Signed-off-by: Alex Gartrell <agartrell@fb.com>

---
 net/netfilter/ipvs/ip_vs_dh.c  | 2 +-
 net/netfilter/ipvs/ip_vs_fo.c  | 2 +-
 net/netfilter/ipvs/ip_vs_lc.c  | 2 +-
 net/netfilter/ipvs/ip_vs_nq.c  | 3 ++-
 net/netfilter/ipvs/ip_vs_rr.c  | 2 +-
 net/netfilter/ipvs/ip_vs_sed.c | 3 ++-
 net/netfilter/ipvs/ip_vs_sh.c  | 8 ++++----
 net/netfilter/ipvs/ip_vs_wlc.c | 3 ++-
 net/netfilter/ipvs/ip_vs_wrr.c | 2 +-
 9 files changed, 15 insertions(+), 12 deletions(-)

-- 
1.9.3

Comments

Pablo Neira Ayuso Sept. 17, 2014, 8:30 a.m. UTC | #1 
On Wed, Sep 17, 2014 at 12:27:03AM +0300, Julian Anastasov wrote:
> 
> 	Hello,
> 
> On Tue, 16 Sep 2014, Pablo Neira Ayuso wrote:
> 
> > Hi Simon,
> > 
> > On Tue, Sep 16, 2014 at 09:34:14AM +0900, Simon Horman wrote:
> > > Hi Pablo,
> > > 
> > > please consider these IPVS updates for v3.18.
> > > 
> > > * Add simple weighted failover scheduler
> > >   - Thanks to Kenny Mathis
> > > * Support v6 real servers in v4 pools and vice versa
> > >   - Thanks to Alex Gartrell and Julian Anastasov
> > 
> > I need a slightly larger description of this series.
> > 
> > I think you can merge patches 13-19 too. They are mostly two liners
> > with a similar description, so they naturally belong to the same
> > logical change. I would like to reduce the patchbomb pull request for
> > David.
> 
> 	Good idea, done.
> 
> 	Simon, I'm attaching such patch that replaces all
> these "ipvs: use correct address family in * logs".
> It additionally changes the new ip_vs_fo.c scheduler
> and ip_vs_wrr.c which was missed.

Thanks Julian.

@Simon, I can manually apply this batch if that reduces your workload.
Please let me know what you prefer.

Still I'd really appreciate a longer series description that I can
include in the pull-request for David.

Thanks.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Simon Horman Sept. 17, 2014, 11:56 p.m. UTC | #2 
On Wed, Sep 17, 2014 at 10:30:41AM +0200, Pablo Neira Ayuso wrote:
> On Wed, Sep 17, 2014 at 12:27:03AM +0300, Julian Anastasov wrote:
> > 
> > 	Hello,
> > 
> > On Tue, 16 Sep 2014, Pablo Neira Ayuso wrote:
> > 
> > > Hi Simon,
> > > 
> > > On Tue, Sep 16, 2014 at 09:34:14AM +0900, Simon Horman wrote:
> > > > Hi Pablo,
> > > > 
> > > > please consider these IPVS updates for v3.18.
> > > > 
> > > > * Add simple weighted failover scheduler
> > > >   - Thanks to Kenny Mathis
> > > > * Support v6 real servers in v4 pools and vice versa
> > > >   - Thanks to Alex Gartrell and Julian Anastasov
> > > 
> > > I need a slightly larger description of this series.
> > > 
> > > I think you can merge patches 13-19 too. They are mostly two liners
> > > with a similar description, so they naturally belong to the same
> > > logical change. I would like to reduce the patchbomb pull request for
> > > David.
> > 
> > 	Good idea, done.
> > 
> > 	Simon, I'm attaching such patch that replaces all
> > these "ipvs: use correct address family in * logs".
> > It additionally changes the new ip_vs_fo.c scheduler
> > and ip_vs_wrr.c which was missed.
> 
> Thanks Julian.
> 
> @Simon, I can manually apply this batch if that reduces your workload.
> Please let me know what you prefer.
> 
> Still I'd really appreciate a longer series description that I can
> include in the pull-request for David.

Hi Pablo,

I should be able to prepare and send a revised pull-request today.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Simon Horman Sept. 18, 2014, 12:27 a.m. UTC | #3 
On Thu, Sep 18, 2014 at 08:56:29AM +0900, Simon Horman wrote:
> On Wed, Sep 17, 2014 at 10:30:41AM +0200, Pablo Neira Ayuso wrote:
> > On Wed, Sep 17, 2014 at 12:27:03AM +0300, Julian Anastasov wrote:
> > > 
> > > 	Hello,
> > > 
> > > On Tue, 16 Sep 2014, Pablo Neira Ayuso wrote:
> > > 
> > > > Hi Simon,
> > > > 
> > > > On Tue, Sep 16, 2014 at 09:34:14AM +0900, Simon Horman wrote:
> > > > > Hi Pablo,
> > > > > 
> > > > > please consider these IPVS updates for v3.18.
> > > > > 
> > > > > * Add simple weighted failover scheduler
> > > > >   - Thanks to Kenny Mathis
> > > > > * Support v6 real servers in v4 pools and vice versa
> > > > >   - Thanks to Alex Gartrell and Julian Anastasov
> > > > 
> > > > I need a slightly larger description of this series.
> > > > 
> > > > I think you can merge patches 13-19 too. They are mostly two liners
> > > > with a similar description, so they naturally belong to the same
> > > > logical change. I would like to reduce the patchbomb pull request for
> > > > David.
> > > 
> > > 	Good idea, done.
> > > 
> > > 	Simon, I'm attaching such patch that replaces all
> > > these "ipvs: use correct address family in * logs".
> > > It additionally changes the new ip_vs_fo.c scheduler
> > > and ip_vs_wrr.c which was missed.
> > 
> > Thanks Julian.
> > 
> > @Simon, I can manually apply this batch if that reduces your workload.
> > Please let me know what you prefer.
> > 
> > Still I'd really appreciate a longer series description that I can
> > include in the pull-request for David.
> 
> Hi Pablo,
> 
> I should be able to prepare and send a revised pull-request today.

I have now done so.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/net/netfilter/ipvs/ip_vs_dh.c b/net/netfilter/ipvs/ip_vs_dh.c
index c3b8454..6be5c53 100644
--- a/net/netfilter/ipvs/ip_vs_dh.c
+++ b/net/netfilter/ipvs/ip_vs_dh.c
@@ -234,7 +234,7 @@  ip_vs_dh_schedule(struct ip_vs_service *svc, const struct sk_buff *skb,
 
 	IP_VS_DBG_BUF(6, "DH: destination IP address %s --> server %s:%d\n",
 		      IP_VS_DBG_ADDR(svc->af, &iph->daddr),
-		      IP_VS_DBG_ADDR(svc->af, &dest->addr),
+		      IP_VS_DBG_ADDR(dest->af, &dest->addr),
 		      ntohs(dest->port));
 
 	return dest;
diff --git a/net/netfilter/ipvs/ip_vs_fo.c b/net/netfilter/ipvs/ip_vs_fo.c
index 6a2647d..e09874d 100644
--- a/net/netfilter/ipvs/ip_vs_fo.c
+++ b/net/netfilter/ipvs/ip_vs_fo.c
@@ -44,7 +44,7 @@  ip_vs_fo_schedule(struct ip_vs_service *svc, const struct sk_buff *skb,
 
 	if (hweight) {
 		IP_VS_DBG_BUF(6, "FO: server %s:%u activeconns %d weight %d\n",
-			      IP_VS_DBG_ADDR(svc->af, &hweight->addr),
+			      IP_VS_DBG_ADDR(hweight->af, &hweight->addr),
 			      ntohs(hweight->port),
 			      atomic_read(&hweight->activeconns),
 			      atomic_read(&hweight->weight));
diff --git a/net/netfilter/ipvs/ip_vs_lc.c b/net/netfilter/ipvs/ip_vs_lc.c
index 2bdcb1c..19a0769 100644
--- a/net/netfilter/ipvs/ip_vs_lc.c
+++ b/net/netfilter/ipvs/ip_vs_lc.c
@@ -59,7 +59,7 @@  ip_vs_lc_schedule(struct ip_vs_service *svc, const struct sk_buff *skb,
 	else
 		IP_VS_DBG_BUF(6, "LC: server %s:%u activeconns %d "
 			      "inactconns %d\n",
-			      IP_VS_DBG_ADDR(svc->af, &least->addr),
+			      IP_VS_DBG_ADDR(least->af, &least->addr),
 			      ntohs(least->port),
 			      atomic_read(&least->activeconns),
 			      atomic_read(&least->inactconns));
diff --git a/net/netfilter/ipvs/ip_vs_nq.c b/net/netfilter/ipvs/ip_vs_nq.c
index 961a6de..a8b6340 100644
--- a/net/netfilter/ipvs/ip_vs_nq.c
+++ b/net/netfilter/ipvs/ip_vs_nq.c
@@ -107,7 +107,8 @@  ip_vs_nq_schedule(struct ip_vs_service *svc, const struct sk_buff *skb,
   out:
 	IP_VS_DBG_BUF(6, "NQ: server %s:%u "
 		      "activeconns %d refcnt %d weight %d overhead %d\n",
-		      IP_VS_DBG_ADDR(svc->af, &least->addr), ntohs(least->port),
+		      IP_VS_DBG_ADDR(least->af, &least->addr),
+		      ntohs(least->port),
 		      atomic_read(&least->activeconns),
 		      atomic_read(&least->refcnt),
 		      atomic_read(&least->weight), loh);
diff --git a/net/netfilter/ipvs/ip_vs_rr.c b/net/netfilter/ipvs/ip_vs_rr.c
index 176b87c..58bacfc 100644
--- a/net/netfilter/ipvs/ip_vs_rr.c
+++ b/net/netfilter/ipvs/ip_vs_rr.c
@@ -95,7 +95,7 @@  stop:
 	spin_unlock_bh(&svc->sched_lock);
 	IP_VS_DBG_BUF(6, "RR: server %s:%u "
 		      "activeconns %d refcnt %d weight %d\n",
-		      IP_VS_DBG_ADDR(svc->af, &dest->addr), ntohs(dest->port),
+		      IP_VS_DBG_ADDR(dest->af, &dest->addr), ntohs(dest->port),
 		      atomic_read(&dest->activeconns),
 		      atomic_read(&dest->refcnt), atomic_read(&dest->weight));
 
diff --git a/net/netfilter/ipvs/ip_vs_sed.c b/net/netfilter/ipvs/ip_vs_sed.c
index e446b9f..f8e2d00 100644
--- a/net/netfilter/ipvs/ip_vs_sed.c
+++ b/net/netfilter/ipvs/ip_vs_sed.c
@@ -108,7 +108,8 @@  ip_vs_sed_schedule(struct ip_vs_service *svc, const struct sk_buff *skb,
 
 	IP_VS_DBG_BUF(6, "SED: server %s:%u "
 		      "activeconns %d refcnt %d weight %d overhead %d\n",
-		      IP_VS_DBG_ADDR(svc->af, &least->addr), ntohs(least->port),
+		      IP_VS_DBG_ADDR(least->af, &least->addr),
+		      ntohs(least->port),
 		      atomic_read(&least->activeconns),
 		      atomic_read(&least->refcnt),
 		      atomic_read(&least->weight), loh);
diff --git a/net/netfilter/ipvs/ip_vs_sh.c b/net/netfilter/ipvs/ip_vs_sh.c
index cc65b2f..98a1343 100644
--- a/net/netfilter/ipvs/ip_vs_sh.c
+++ b/net/netfilter/ipvs/ip_vs_sh.c
@@ -138,7 +138,7 @@  ip_vs_sh_get_fallback(struct ip_vs_service *svc, struct ip_vs_sh_state *s,
 		return dest;
 
 	IP_VS_DBG_BUF(6, "SH: selected unavailable server %s:%d, reselecting",
-		      IP_VS_DBG_ADDR(svc->af, &dest->addr), ntohs(dest->port));
+		      IP_VS_DBG_ADDR(dest->af, &dest->addr), ntohs(dest->port));
 
 	/* if the original dest is unavailable, loop around the table
 	 * starting from ihash to find a new dest
@@ -153,7 +153,7 @@  ip_vs_sh_get_fallback(struct ip_vs_service *svc, struct ip_vs_sh_state *s,
 			return dest;
 		IP_VS_DBG_BUF(6, "SH: selected unavailable "
 			      "server %s:%d (offset %d), reselecting",
-			      IP_VS_DBG_ADDR(svc->af, &dest->addr),
+			      IP_VS_DBG_ADDR(dest->af, &dest->addr),
 			      ntohs(dest->port), roffset);
 	}
 
@@ -192,7 +192,7 @@  ip_vs_sh_reassign(struct ip_vs_sh_state *s, struct ip_vs_service *svc)
 			RCU_INIT_POINTER(b->dest, dest);
 
 			IP_VS_DBG_BUF(6, "assigned i: %d dest: %s weight: %d\n",
-				      i, IP_VS_DBG_ADDR(svc->af, &dest->addr),
+				      i, IP_VS_DBG_ADDR(dest->af, &dest->addr),
 				      atomic_read(&dest->weight));
 
 			/* Don't move to next dest until filling weight */
@@ -342,7 +342,7 @@  ip_vs_sh_schedule(struct ip_vs_service *svc, const struct sk_buff *skb,
 
 	IP_VS_DBG_BUF(6, "SH: source IP address %s --> server %s:%d\n",
 		      IP_VS_DBG_ADDR(svc->af, &iph->saddr),
-		      IP_VS_DBG_ADDR(svc->af, &dest->addr),
+		      IP_VS_DBG_ADDR(dest->af, &dest->addr),
 		      ntohs(dest->port));
 
 	return dest;
diff --git a/net/netfilter/ipvs/ip_vs_wlc.c b/net/netfilter/ipvs/ip_vs_wlc.c
index b5b4650..6b366fd 100644
--- a/net/netfilter/ipvs/ip_vs_wlc.c
+++ b/net/netfilter/ipvs/ip_vs_wlc.c
@@ -80,7 +80,8 @@  ip_vs_wlc_schedule(struct ip_vs_service *svc, const struct sk_buff *skb,
 
 	IP_VS_DBG_BUF(6, "WLC: server %s:%u "
 		      "activeconns %d refcnt %d weight %d overhead %d\n",
-		      IP_VS_DBG_ADDR(svc->af, &least->addr), ntohs(least->port),
+		      IP_VS_DBG_ADDR(least->af, &least->addr),
+		      ntohs(least->port),
 		      atomic_read(&least->activeconns),
 		      atomic_read(&least->refcnt),
 		      atomic_read(&least->weight), loh);
diff --git a/net/netfilter/ipvs/ip_vs_wrr.c b/net/netfilter/ipvs/ip_vs_wrr.c
index 0546cd5..17e6d44 100644
--- a/net/netfilter/ipvs/ip_vs_wrr.c
+++ b/net/netfilter/ipvs/ip_vs_wrr.c
@@ -216,7 +216,7 @@  ip_vs_wrr_schedule(struct ip_vs_service *svc, const struct sk_buff *skb,
 found:
 	IP_VS_DBG_BUF(6, "WRR: server %s:%u "
 		      "activeconns %d refcnt %d weight %d\n",
-		      IP_VS_DBG_ADDR(svc->af, &dest->addr), ntohs(dest->port),
+		      IP_VS_DBG_ADDR(dest->af, &dest->addr), ntohs(dest->port),
 		      atomic_read(&dest->activeconns),
 		      atomic_read(&dest->refcnt),
 		      atomic_read(&dest->weight));