[prev in list] [next in list] [prev in thread] [next in thread] 

List:       linux-sctp
Subject:    Re: [PATCH v3 net] sctp: count singleton chunks in assoc user stats
From:       Marcelo Ricardo Leitner <marcelo.leitner () gmail ! com>
Date:       2022-03-30 19:44:44
Message-ID: YkSzLJ72M5f5EL2L () t14s ! localdomain
[Download RAW message or body]

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.

> 				break;
> 			}
> 			fallthrough;
> -- 
> 2.35.1
> 


[prev in list] [next in list] [prev in thread] [next in thread]