lkml.org 
[lkml]   [2022]   [Apr]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.17 231/343] sctp: count singleton chunks in assoc user stats
    Date
    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 a18609f608fb..e213aaf45d67 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:
    @@ -938,7 +939,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


    \
     
     \ /
      Last update: 2022-04-12 10:57    [W:4.021 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site