Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp4302138pxk; Tue, 29 Sep 2020 22:11:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyXZVlp63cm7lnhIFunI5cHa88+tCJXp6BcvQqvPjOUmwjKa0rPnaSfWXZ2jCEEFfHNY2GT X-Received: by 2002:a05:6402:1641:: with SMTP id s1mr920068edx.66.1601442660240; Tue, 29 Sep 2020 22:11:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1601442660; cv=none; d=google.com; s=arc-20160816; b=DNdmjmZDopEpoHKS1fRmrau5aOdkPVYJg79VEmBkm9K5kQlUXW5cQlQY66ZeL8VCC0 Zx+sGEmWdsXe4Y5DPL/MNW0t/UGZB3rnC8IdhKy8bHBaw8H9INvcUr0DGsuRvUn2HsC3 uTNSqXrC7d2u7waHXZ5eccN3CKAIuORFuxWsR61QDBAd+uQFo5kwCkxmGbuqyvusT3/4 OcW3rhGGJiJLwCPDWMfDFeBOjbbYCxxvCOh6QO4mO+tpWl9cz8MIApbs6aaDtyL8hoJS YppjfohJtIcRhBSTwe3R6+DEvdY9KIvWyjILONZ/mFd1jlUSQRuFgXy1agLxCzqzzW75 dHOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:message-id:in-reply-to :subject:cc:to:from:date; bh=2HpKHMCYW65SzoTNYICbmwUUH5wO7qetj7MTf7kM+qg=; b=LIAviRKgXCtFUXcbx1yyAvt1QH0zfARTyzjb171aJJhKCOL5RDqaVb9qsB9fYUl/Cp xN/Z1DRTfH0V2zMnvuRQOPvLNsYa+Eg+mnvHBMOA8iB3haeH85aoxrK5+tf/mwac+hxn y2hRsjk/W4fhEaOVvxrRYp4eME3lV+fpIEd99S5pZ5lNxgOYehurj68mjcLFjaa2SmF2 bZrTOlWqWZQ/XFKjpJ3+2kc/XM+Wv4s3sLRrnv6R7izgWJSxRyiokw7eu1wInsH2KvKP OBvz61ZZt2pQuiwdpGyPMtMi0FXz0AhKQiU6oAFCayCz8b0X/J5j2h30Rul0l9lGYFoU mAaw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id e9si317913edl.154.2020.09.29.22.10.37; Tue, 29 Sep 2020 22:11:00 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725869AbgI3FIR (ORCPT + 99 others); Wed, 30 Sep 2020 01:08:17 -0400 Received: from mg.ssi.bg ([178.16.128.9]:53046 "EHLO mg.ssi.bg" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725776AbgI3FIQ (ORCPT ); Wed, 30 Sep 2020 01:08:16 -0400 Received: from mg.ssi.bg (localhost [127.0.0.1]) by mg.ssi.bg (Proxmox) with ESMTP id C6E5A2EE97; Wed, 30 Sep 2020 08:08:13 +0300 (EEST) Received: from ink.ssi.bg (ink.ssi.bg [178.16.128.7]) by mg.ssi.bg (Proxmox) with ESMTP id 4CBCC2EE90; Wed, 30 Sep 2020 08:08:12 +0300 (EEST) Received: from ja.ssi.bg (unknown [178.16.129.10]) by ink.ssi.bg (Postfix) with ESMTPS id 83E193C09BF; Wed, 30 Sep 2020 08:08:06 +0300 (EEST) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by ja.ssi.bg (8.15.2/8.15.2) with ESMTP id 08U5827H006449; Wed, 30 Sep 2020 08:08:03 +0300 Date: Wed, 30 Sep 2020 08:08:02 +0300 (EEST) From: Julian Anastasov To: "longguang.yue" cc: yuelongguang@gmail.com, Wensong Zhang , Simon Horman , Pablo Neira Ayuso , Jozsef Kadlecsik , Florian Westphal , "David S. Miller" , Jakub Kicinski , "open list:IPVS" , "open list:IPVS" , "open list:NETFILTER" , "open list:NETFILTER" , open list Subject: Re: [PATCH v5] ipvs: adjust the debug info in function set_tcp_state In-Reply-To: <20200928024938.97121-1-bigclouds@163.com> Message-ID: References: <20200928024938.97121-1-bigclouds@163.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hello, On Mon, 28 Sep 2020, longguang.yue wrote: > Outputting client,virtual,dst addresses info when tcp state changes, > which makes the connection debug more clear > > Signed-off-by: longguang.yue OK, v5 can be used instead of fixing v4. Acked-by: Julian Anastasov > --- longguang.yue, at this place after --- you can add info for changes between versions, eg: v5: fix indentation Use this for other patches, so that we know what is changed between versions. > net/netfilter/ipvs/ip_vs_proto_tcp.c | 10 ++++++---- > 1 file changed, 6 insertions(+), 4 deletions(-) > > diff --git a/net/netfilter/ipvs/ip_vs_proto_tcp.c b/net/netfilter/ipvs/ip_vs_proto_tcp.c > index dc2e7da2742a..7da51390cea6 100644 > --- a/net/netfilter/ipvs/ip_vs_proto_tcp.c > +++ b/net/netfilter/ipvs/ip_vs_proto_tcp.c > @@ -539,8 +539,8 @@ set_tcp_state(struct ip_vs_proto_data *pd, struct ip_vs_conn *cp, > if (new_state != cp->state) { > struct ip_vs_dest *dest = cp->dest; > > - IP_VS_DBG_BUF(8, "%s %s [%c%c%c%c] %s:%d->" > - "%s:%d state: %s->%s conn->refcnt:%d\n", > + IP_VS_DBG_BUF(8, "%s %s [%c%c%c%c] c:%s:%d v:%s:%d " > + "d:%s:%d state: %s->%s conn->refcnt:%d\n", > pd->pp->name, > ((state_off == TCP_DIR_OUTPUT) ? > "output " : "input "), > @@ -548,10 +548,12 @@ set_tcp_state(struct ip_vs_proto_data *pd, struct ip_vs_conn *cp, > th->fin ? 'F' : '.', > th->ack ? 'A' : '.', > th->rst ? 'R' : '.', > - IP_VS_DBG_ADDR(cp->daf, &cp->daddr), > - ntohs(cp->dport), > IP_VS_DBG_ADDR(cp->af, &cp->caddr), > ntohs(cp->cport), > + IP_VS_DBG_ADDR(cp->af, &cp->vaddr), > + ntohs(cp->vport), > + IP_VS_DBG_ADDR(cp->daf, &cp->daddr), > + ntohs(cp->dport), > tcp_state_name(cp->state), > tcp_state_name(new_state), > refcount_read(&cp->refcnt)); > -- > 2.20.1 (Apple Git-117) Regards -- Julian Anastasov