| From aa420180cb6a5c87ea7a78431a620d04c523703b Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 4 Apr 2022 09:47:48 +1000 |
| Subject: sctp: count singleton chunks in assoc user stats |
| |
| From: Jamie Bainbridge <jamie.bainbridge@gmail.com> |
| |
| [ Upstream commit e3d37210df5c41c51147a2d5d465de1a4d77be7a ] |
| |
| 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> |
| Acked-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> |
| Link: https://lore.kernel.org/r/c9ba8785789880cf07923b8a5051e174442ea9ee.1649029663.git.jamie.bainbridge@gmail.com |
| Signed-off-by: Paolo Abeni <pabeni@redhat.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| net/sctp/outqueue.c | 6 +++++- |
| 1 file changed, 5 insertions(+), 1 deletion(-) |
| |
| diff --git a/net/sctp/outqueue.c b/net/sctp/outqueue.c |
| index ff47091c385e..b3950963fc8f 100644 |
| --- a/net/sctp/outqueue.c |
| +++ b/net/sctp/outqueue.c |
| @@ -911,6 +911,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: |
| @@ -935,7 +936,10 @@ 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); |
| + error = sctp_packet_singleton(ctx->transport, |
| + chunk, ctx->gfp); |
| + if (!error) |
| + ctx->asoc->stats.octrlchunks++; |
| break; |
| } |
| fallthrough; |
| -- |
| 2.35.1 |
| |
