From: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
To: 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>, Paolo Abeni <pabeni@redhat.com>,
linux-sctp@vger.kernel.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH v3 net] sctp: count singleton chunks in assoc user stats
Date: Thu, 31 Mar 2022 21:22:17 -0300 [thread overview]
Message-ID: <YkZFuWQOEh5webSr@t14s.localdomain> (raw)
In-Reply-To: <CAAvyFNgL1_YsnkGdJM8t9L1zT60AEfUMeReVx=2DTtLZ_WLScQ@mail.gmail.com>
On Fri, Apr 01, 2022 at 10:09:56AM +1000, Jamie Bainbridge wrote:
> On Thu, 31 Mar 2022 at 05:44, Marcelo Ricardo Leitner
> <marcelo.leitner@gmail.com> wrote:
> >
> > On Wed, Mar 30, 2022 at 01:06:02PM +1000, Jamie Bainbridge wrote:
> > > Singleton chunks (INIT, HEARTBEAT PMTU probes, and SHUTDOWN-
> > > COMPLETE) are not counted in SCTP_GET_ASOC_STATS "sas_octrlchunks"
> > > counter available to the assoc owner.
> > >
> > > These are all control chunks so they should be counted as such.
> > >
> > > Add counting of singleton chunks so they are properly accounted for.
> > >
> > > Fixes: 196d67593439 ("sctp: Add support to per-association statistics via a new SCTP_GET_ASSOC_STATS call")
> > > Signed-off-by: Jamie Bainbridge <jamie.bainbridge@gmail.com>
> > > ---
> > > net/sctp/outqueue.c | 2 ++
> > > 1 file changed, 2 insertions(+)
> > >
> > > diff --git a/net/sctp/outqueue.c b/net/sctp/outqueue.c
> > > index a18609f608fb786b2532a4febbd72a9737ab906c..bed34918b41f24810677adc0cd4fbd0859396a02 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:
> > > @@ -939,6 +940,7 @@ static void sctp_outq_flush_ctrl(struct sctp_flush_ctx *ctx)
> > > case SCTP_CID_HEARTBEAT:
> > > if (chunk->pmtu_probe) {
> > > sctp_packet_singleton(ctx->transport, chunk, ctx->gfp);
> > > + ctx->asoc->stats.octrlchunks++;
> >
> > sctp_packet_singleton can fail. It shouldn't be propagated to the
> > socket but octrlchunks shouldn't be incremented then. Not too diferent
> > from the one above.
>
> Ah, thanks for the catch! Is this syntax assigning to error okay?
>
> error = sctp_packet_singleton(ctx->transport, chunk, ctx->gfp);
> if (!error)
> ctx->asoc->stats.octrlchunks++;
> break;
Yes. :-)
>
> > > break;
> > > }
> > > fallthrough;
> > > --
> > > 2.35.1
> > >
prev parent reply other threads:[~2022-04-01 0:22 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-30 3:06 [PATCH v3 net] sctp: count singleton chunks in assoc user stats Jamie Bainbridge
2022-03-30 19:44 ` Marcelo Ricardo Leitner
2022-04-01 0:09 ` Jamie Bainbridge
2022-04-01 0:22 ` Marcelo Ricardo Leitner [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YkZFuWQOEh5webSr@t14s.localdomain \
--to=marcelo.leitner@gmail.com \
--cc=davem@davemloft.net \
--cc=jamie.bainbridge@gmail.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sctp@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=nhorman@tuxdriver.com \
--cc=pabeni@redhat.com \
--cc=vyasevich@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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 read-only IMAP folder(s) and NNTP newsgroup(s).