* [PATCH] ipvs: no need to update skb route entry for local destination packets.
@ 2019-09-30 5:14 zhang kai
2019-09-30 18:49 ` Julian Anastasov
0 siblings, 1 reply; 3+ messages in thread
From: zhang kai @ 2019-09-30 5:14 UTC (permalink / raw)
To: wensong, horms, lvs-devel, netdev
In the end of function __ip_vs_get_out_rt/__ip_vs_get_out_rt_v6,the
'local' variable is always zero.
Signed-off-by: zhang kai <zhangkaiheb@126.com>
---
net/netfilter/ipvs/ip_vs_xmit.c | 18 ++++++------------
1 file changed, 6 insertions(+), 12 deletions(-)
diff --git a/net/netfilter/ipvs/ip_vs_xmit.c b/net/netfilter/ipvs/ip_vs_xmit.c
index 9c464d24beec..037c7c91044e 100644
--- a/net/netfilter/ipvs/ip_vs_xmit.c
+++ b/net/netfilter/ipvs/ip_vs_xmit.c
@@ -407,12 +407,9 @@ __ip_vs_get_out_rt(struct netns_ipvs *ipvs, int skb_af, struct sk_buff *skb,
goto err_put;
skb_dst_drop(skb);
- if (noref) {
- if (!local)
- skb_dst_set_noref(skb, &rt->dst);
- else
- skb_dst_set(skb, dst_clone(&rt->dst));
- } else
+ if (noref)
+ skb_dst_set_noref(skb, &rt->dst);
+ else
skb_dst_set(skb, &rt->dst);
return local;
@@ -574,12 +571,9 @@ __ip_vs_get_out_rt_v6(struct netns_ipvs *ipvs, int skb_af, struct sk_buff *skb,
goto err_put;
skb_dst_drop(skb);
- if (noref) {
- if (!local)
- skb_dst_set_noref(skb, &rt->dst);
- else
- skb_dst_set(skb, dst_clone(&rt->dst));
- } else
+ if (noref)
+ skb_dst_set_noref(skb, &rt->dst);
+ else
skb_dst_set(skb, &rt->dst);
return local;
--
2.17.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] ipvs: no need to update skb route entry for local destination packets.
2019-09-30 5:14 [PATCH] ipvs: no need to update skb route entry for local destination packets zhang kai
@ 2019-09-30 18:49 ` Julian Anastasov
2019-10-01 9:54 ` Simon Horman
0 siblings, 1 reply; 3+ messages in thread
From: Julian Anastasov @ 2019-09-30 18:49 UTC (permalink / raw)
To: zhang kai; +Cc: Wensong Zhang, Simon Horman, lvs-devel, netdev, netfilter-devel
Hello,
On Mon, 30 Sep 2019, zhang kai wrote:
> In the end of function __ip_vs_get_out_rt/__ip_vs_get_out_rt_v6,the
> 'local' variable is always zero.
>
> Signed-off-by: zhang kai <zhangkaiheb@126.com>
Looks good to me, thanks!
Acked-by: Julian Anastasov <ja@ssi.bg>
Simon, this is for -next kernels...
> ---
> net/netfilter/ipvs/ip_vs_xmit.c | 18 ++++++------------
> 1 file changed, 6 insertions(+), 12 deletions(-)
>
> diff --git a/net/netfilter/ipvs/ip_vs_xmit.c b/net/netfilter/ipvs/ip_vs_xmit.c
> index 9c464d24beec..037c7c91044e 100644
> --- a/net/netfilter/ipvs/ip_vs_xmit.c
> +++ b/net/netfilter/ipvs/ip_vs_xmit.c
> @@ -407,12 +407,9 @@ __ip_vs_get_out_rt(struct netns_ipvs *ipvs, int skb_af, struct sk_buff *skb,
> goto err_put;
>
> skb_dst_drop(skb);
> - if (noref) {
> - if (!local)
> - skb_dst_set_noref(skb, &rt->dst);
> - else
> - skb_dst_set(skb, dst_clone(&rt->dst));
> - } else
> + if (noref)
> + skb_dst_set_noref(skb, &rt->dst);
> + else
> skb_dst_set(skb, &rt->dst);
>
> return local;
> @@ -574,12 +571,9 @@ __ip_vs_get_out_rt_v6(struct netns_ipvs *ipvs, int skb_af, struct sk_buff *skb,
> goto err_put;
>
> skb_dst_drop(skb);
> - if (noref) {
> - if (!local)
> - skb_dst_set_noref(skb, &rt->dst);
> - else
> - skb_dst_set(skb, dst_clone(&rt->dst));
> - } else
> + if (noref)
> + skb_dst_set_noref(skb, &rt->dst);
> + else
> skb_dst_set(skb, &rt->dst);
>
> return local;
> --
> 2.17.1
Regards
--
Julian Anastasov <ja@ssi.bg>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] ipvs: no need to update skb route entry for local destination packets.
2019-09-30 18:49 ` Julian Anastasov
@ 2019-10-01 9:54 ` Simon Horman
0 siblings, 0 replies; 3+ messages in thread
From: Simon Horman @ 2019-10-01 9:54 UTC (permalink / raw)
To: Julian Anastasov
Cc: zhang kai, Wensong Zhang, lvs-devel, netdev, netfilter-devel
On Mon, Sep 30, 2019 at 09:49:38PM +0300, Julian Anastasov wrote:
>
> Hello,
>
> On Mon, 30 Sep 2019, zhang kai wrote:
>
> > In the end of function __ip_vs_get_out_rt/__ip_vs_get_out_rt_v6,the
> > 'local' variable is always zero.
> >
> > Signed-off-by: zhang kai <zhangkaiheb@126.com>
>
> Looks good to me, thanks!
>
> Acked-by: Julian Anastasov <ja@ssi.bg>
>
> Simon, this is for -next kernels...
Thanks, applied to ipvs-next.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-10-01 9:54 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-30 5:14 [PATCH] ipvs: no need to update skb route entry for local destination packets zhang kai
2019-09-30 18:49 ` Julian Anastasov
2019-10-01 9:54 ` Simon Horman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).