From 5281a9029ea56f397a37ea1cf478ac526882770a Mon Sep 17 00:00:00 2001 From: Neale Ranns Date: Tue, 23 Jul 2019 08:16:19 -0700 Subject: qos: QoS dump APIs Type: feature Change-Id: I514b40026986f3828c8727453456b20a0a45f3af Signed-off-by: Neale Ranns --- src/vnet/qos/qos_api.c | 168 ++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 154 insertions(+), 14 deletions(-) (limited to 'src/vnet/qos/qos_api.c') diff --git a/src/vnet/qos/qos_api.c b/src/vnet/qos/qos_api.c index 6297c24a843..966ffcce395 100644 --- a/src/vnet/qos/qos_api.c +++ b/src/vnet/qos/qos_api.c @@ -44,15 +44,16 @@ #define foreach_qos_api_msg \ _(QOS_RECORD_ENABLE_DISABLE, qos_record_enable_disable) \ + _(QOS_RECORD_DUMP, qos_record_dump) \ _(QOS_EGRESS_MAP_DELETE, qos_egress_map_delete) \ _(QOS_EGRESS_MAP_UPDATE, qos_egress_map_update) \ - _(QOS_MARK_ENABLE_DISABLE, qos_mark_enable_disable) + _(QOS_EGRESS_MAP_DUMP, qos_egress_map_dump) \ + _(QOS_MARK_ENABLE_DISABLE, qos_mark_enable_disable) \ + _(QOS_MARK_DUMP, qos_mark_dump) static int qos_source_decode (vl_api_qos_source_t v, qos_source_t * q) { - v = ntohl (v); - switch (v) { case QOS_API_SOURCE_EXT: @@ -72,6 +73,12 @@ qos_source_decode (vl_api_qos_source_t v, qos_source_t * q) return (VNET_API_ERROR_INVALID_VALUE); } +static vl_api_qos_source_t +qos_source_encode (qos_source_t q) +{ + return ((vl_api_qos_source_t) q); +} + void vl_api_qos_record_enable_disable_t_handler (vl_api_qos_record_enable_disable_t * mp) @@ -80,19 +87,63 @@ vl_api_qos_record_enable_disable_t_handler (vl_api_qos_record_enable_disable_t qos_source_t qs; int rv = 0; - rv = qos_source_decode (mp->input_source, &qs); + VALIDATE_SW_IF_INDEX (&(mp->record)); + + rv = qos_source_decode (mp->record.input_source, &qs); if (0 == rv) { if (mp->enable) - rv = qos_record_enable (ntohl (mp->sw_if_index), qs); + rv = qos_record_enable (ntohl (mp->record.sw_if_index), qs); else - rv = qos_record_disable (ntohl (mp->sw_if_index), qs); + rv = qos_record_disable (ntohl (mp->record.sw_if_index), qs); } + BAD_SW_IF_INDEX_LABEL; REPLY_MACRO (VL_API_QOS_RECORD_ENABLE_DISABLE_REPLY); } +typedef struct qos_record_send_walk_ctx_t_ +{ + vl_api_registration_t *reg; + u32 context; +} qos_record_send_walk_ctx_t; + +static walk_rc_t +send_qos_record_details (u32 sw_if_index, qos_source_t input_source, void *c) +{ + qos_record_send_walk_ctx_t *ctx; + vl_api_qos_record_details_t *mp; + + ctx = c; + mp = vl_msg_api_alloc_zero (sizeof (*mp)); + + mp->_vl_msg_id = ntohs (VL_API_QOS_RECORD_DETAILS); + mp->context = ctx->context; + mp->record.sw_if_index = htonl (sw_if_index); + mp->record.input_source = qos_source_encode (input_source); + + vl_api_send_msg (ctx->reg, (u8 *) mp); + + return (WALK_CONTINUE); +} + +static void +vl_api_qos_record_dump_t_handler (vl_api_qos_record_dump_t * mp) +{ + vl_api_registration_t *reg; + + reg = vl_api_client_index_to_registration (mp->client_index); + if (!reg) + return; + + qos_record_send_walk_ctx_t ctx = { + .reg = reg, + .context = mp->context, + }; + qos_record_walk (send_qos_record_details, &ctx); +} + void vl_api_qos_egress_map_update_t_handler (vl_api_qos_egress_map_update_t * mp) { @@ -102,7 +153,8 @@ vl_api_qos_egress_map_update_t_handler (vl_api_qos_egress_map_update_t * mp) FOR_EACH_QOS_SOURCE (qs) { - qos_egress_map_update (ntohl (mp->map_id), qs, &mp->rows[qs].outputs[0]); + qos_egress_map_update (ntohl (mp->map.id), qs, + &mp->map.rows[qs].outputs[0]); } REPLY_MACRO (VL_API_QOS_EGRESS_MAP_UPDATE_REPLY); @@ -114,33 +166,121 @@ vl_api_qos_egress_map_delete_t_handler (vl_api_qos_egress_map_delete_t * mp) vl_api_qos_egress_map_delete_reply_t *rmp; int rv = 0; - qos_egress_map_delete (ntohl (mp->map_id)); + qos_egress_map_delete (ntohl (mp->id)); REPLY_MACRO (VL_API_QOS_EGRESS_MAP_DELETE_REPLY); } +typedef struct qos_egress_map_send_walk_ctx_t_ +{ + vl_api_registration_t *reg; + u32 context; +} qos_egress_map_send_walk_ctx_t; + +static walk_rc_t +send_qos_egress_map_details (qos_egress_map_id_t id, + const qos_egress_map_t * m, void *c) +{ + qos_egress_map_send_walk_ctx_t *ctx; + vl_api_qos_egress_map_details_t *mp; + u8 ii; + + ctx = c; + mp = vl_msg_api_alloc_zero (sizeof (*mp)); + + mp->_vl_msg_id = ntohs (VL_API_QOS_EGRESS_MAP_DETAILS); + mp->context = ctx->context; + mp->map.id = htonl (id); + + for (ii = 0; ii < 4; ii++) + clib_memcpy (mp->map.rows[ii].outputs, m->qem_output[ii], 256); + + vl_api_send_msg (ctx->reg, (u8 *) mp); + + return (WALK_CONTINUE); +} + +static void +vl_api_qos_egress_map_dump_t_handler (vl_api_qos_egress_map_dump_t * mp) +{ + vl_api_registration_t *reg; + + reg = vl_api_client_index_to_registration (mp->client_index); + if (!reg) + return; + + qos_egress_map_send_walk_ctx_t ctx = { + .reg = reg, + .context = mp->context, + }; + qos_egress_map_walk (send_qos_egress_map_details, &ctx); +} + void - vl_api_qos_mark_enable_disable_t_handler - (vl_api_qos_mark_enable_disable_t * mp) +vl_api_qos_mark_enable_disable_t_handler (vl_api_qos_mark_enable_disable_t * + mp) { vl_api_qos_mark_enable_disable_reply_t *rmp; qos_source_t qs; int rv = 0; - rv = qos_source_decode (mp->output_source, &qs); + rv = qos_source_decode (mp->mark.output_source, &qs); if (0 == rv) { if (mp->enable) - rv = - qos_mark_enable (ntohl (mp->sw_if_index), qs, ntohl (mp->map_id)); + rv = qos_mark_enable (ntohl (mp->mark.sw_if_index), + qs, ntohl (mp->mark.map_id)); else - rv = qos_mark_disable (ntohl (mp->sw_if_index), qs); + rv = qos_mark_disable (ntohl (mp->mark.sw_if_index), qs); } REPLY_MACRO (VL_API_QOS_MARK_ENABLE_DISABLE_REPLY); } +typedef struct qos_mark_send_walk_ctx_t_ +{ + vl_api_registration_t *reg; + u32 context; +} qos_mark_send_walk_ctx_t; + +static walk_rc_t +send_qos_mark_details (u32 sw_if_index, + u32 map_id, qos_source_t output_source, void *c) +{ + qos_mark_send_walk_ctx_t *ctx; + vl_api_qos_mark_details_t *mp; + + ctx = c; + mp = vl_msg_api_alloc_zero (sizeof (*mp)); + + mp->_vl_msg_id = ntohs (VL_API_QOS_MARK_DETAILS); + mp->context = ctx->context; + mp->mark.sw_if_index = htonl (sw_if_index); + mp->mark.output_source = qos_source_encode (output_source); + mp->mark.map_id = htonl (map_id); + + vl_api_send_msg (ctx->reg, (u8 *) mp); + + return (WALK_CONTINUE); +} + +static void +vl_api_qos_mark_dump_t_handler (vl_api_qos_mark_dump_t * mp) +{ + vl_api_registration_t *reg; + + reg = vl_api_client_index_to_registration (mp->client_index); + if (!reg) + return; + + qos_mark_send_walk_ctx_t ctx = { + .reg = reg, + .context = mp->context, + }; + qos_mark_walk (send_qos_mark_details, &ctx); +} + #define vl_msg_name_crc_list #include #undef vl_msg_name_crc_list -- cgit 1.2.3-korg