Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <21f0fb45d30a1a2fa98a370e3e8ef303e1f79846.camel@redhat.com>
Subject: Re: [PATCH net] sctp: count singleton chunks in assoc user stats
From:   Paolo Abeni <pabeni@redhat.com>
To:     Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>,
        Jamie Bainbridge <jamie.bainbridge@gmail.com>
Cc:     Vlad Yasevich <vyasevich@gmail.com>,
        Neil Horman <nhorman@tuxdriver.com>,
        "David S. Miller" <davem@davemloft.net>,
        Jakub Kicinski <kuba@kernel.org>, linux-sctp@vger.kernel.org,
        netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Date:   Tue, 29 Mar 2022 15:21:38 +0200
In-Reply-To: <20220329130050.vwo5zcbgr7z2qpg5@t14s.localdomain>
References: <3369a5f0a632571d7439377175051039db29f91d.1648522807.git.jamie.bainbridge@gmail.com>
         <20220329130050.vwo5zcbgr7z2qpg5@t14s.localdomain>
Content-Type: text/plain; charset="UTF-8"
User-Agent: Evolution 3.42.4 (3.42.4-1.fc35) 
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Precedence: bulk

On Tue, 2022-03-29 at 10:00 -0300, Marcelo Ricardo Leitner wrote:
> On Tue, Mar 29, 2022 at 01:13:36PM +1000, Jamie Bainbridge wrote:
> > singleton chunks (INIT, and less importantly SHUTDOWN and SHUTDOWN-
> > COMPLETE) are not counted in SCTP_GET_ASOC_STATS "sas_octrlchunks"
> > counter available to the assoc owner.
> > 
> > INIT (and the SHUTDOWN chunks) are control chunks so they should be
> > counted as such.
> > 
> > Add counting of singleton chunks so they are properly accounted for.
> > 
> > Signed-off-by: Jamie Bainbridge <jamie.bainbridge@gmail.com>
> > ---
> >  net/sctp/outqueue.c | 1 +
> >  1 file changed, 1 insertion(+)
> > 
> > diff --git a/net/sctp/outqueue.c b/net/sctp/outqueue.c
> > index a18609f608fb786b2532a4febbd72a9737ab906c..e2d7c955f07c80da17c7525159aaf8a053432ae3 100644
> > --- a/net/sctp/outqueue.c
> > +++ b/net/sctp/outqueue.c
> > @@ -914,6 +914,7 @@ static void sctp_outq_flush_ctrl(struct sctp_flush_ctx *ctx)
> >  				ctx->asoc->base.sk->sk_err = -error;
> >  				return;
> >  			}
> > +			ctx->asoc->stats.octrlchunks++;
> >  			break;
> >  
> >  		case SCTP_CID_ABORT:
> 
> Please also fix it for pmtu probes a bit below. They are heartbeats
> being handled specially as singletons as well.

Since a v2 is needed, please add also a suitable fixes tag - possibly:

Fixes: 196d67593439 ("sctp: Add support to per-association statistics via a new SCTP_GET_ASSOC_STATS call")

Thanks!

Paolo