| Message ID | 20190930051455.GA20692@toolchain |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | David Miller |
| Headers | show |
| Series | ipvs: no need to update skb route entry for local destination packets. | expand |
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>
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.
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;
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(-)