Re: [PATCH v3] ipvs: Fix reuse connection if real server is dead

[Julian Anastasov <ja@xxxxxx>]

        Hello,

On Mon, 13 May 2013, Grzegorz Łyczba wrote:

> From: Grzegorz Lyczba <grzegorz.lyczba@xxxxxxxxx>
> 
> Expire cached connection for new TCP/SCTP connection if real server is down
> 
> Signed-off-by: Grzegorz Lyczba <grzegorz.lyczba@xxxxxxxxx>

        Looks good to me, thanks!

Acked-by: Julian Anastasov <ja@xxxxxx>

> ---
>  net/netfilter/ipvs/ip_vs_core.c |   36 ++++++++++++++++++++++++++++++++++++
>  1 files changed, 36 insertions(+), 0 deletions(-)
> 
> diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
> index 47edf5a..2e349ca 100644
> --- a/net/netfilter/ipvs/ip_vs_core.c
> +++ b/net/netfilter/ipvs/ip_vs_core.c
> @@ -1002,6 +1002,33 @@ static inline int is_tcp_reset(const struct sk_buff 
> *skb, int nh_len)
>       return th->rst;
>  }
>  
> +static inline bool is_new_conn(const struct sk_buff *skb,
> +                            struct ip_vs_iphdr *iph)
> +{
> +     switch (iph->protocol) {
> +     case IPPROTO_TCP: {
> +             struct tcphdr _tcph, *th;
> +
> +             th = skb_header_pointer(skb, iph->len, sizeof(_tcph), &_tcph);
> +             if (th == NULL)
> +                     return false;
> +             return th->syn;
> +     }
> +     case IPPROTO_SCTP: {
> +             sctp_chunkhdr_t *sch, schunk;
> +
> +             sch = skb_header_pointer(skb, iph->len + sizeof(sctp_sctphdr_t),
> +                             sizeof(schunk), &schunk);
> +             if (sch == NULL)
> +                     return false;
> +             return (sch->type == SCTP_CID_INIT);
> +     }
> +     default:
> +             return false;
> +     }
> +}
> +
> +
>  /* Handle response packets: rewrite addresses and send away...
>   */
>  static unsigned int
> @@ -1627,6 +1654,15 @@ ip_vs_in(unsigned int hooknum, struct sk_buff *skb, 
> int af)
>        * Check if the packet belongs to an existing connection entry
>        */
>       cp = pp->conn_in_get(af, skb, &iph, 0);
> +
> +     if (unlikely(sysctl_expire_nodest_conn(ipvs)) && cp && cp->dest &&
> +         unlikely(!atomic_read(&cp->dest->weight)) && !iph.fragoffs &&
> +         is_new_conn(skb, &iph)) {
> +             ip_vs_conn_expire_now(cp);
> +             __ip_vs_conn_put(cp);
> +             cp = NULL;
> +     }
> +
>       if (unlikely(!cp) && !iph.fragoffs) {
>               /* No (second) fragments need to enter here, as nf_defrag_ipv6
>                * replayed fragment zero will already have created the cp
> -- 
> 1.7.5.4

Regards

--
Julian Anastasov <ja@xxxxxx>