tipc: convert legacy nl link stat to nl compat

Add functionality for safely appending string data to a TLV without
keeping write count in the caller.

Convert TIPC_CMD_SHOW_LINK_STATS to compat dumpit.

Signed-off-by: Richard Alpe <richard.alpe@ericsson.com>
Reviewed-by: Erik Hugne <erik.hugne@ericsson.com>
Reviewed-by: Ying Xue <ying.xue@windriver.com>
Reviewed-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 0 insertions, 141 deletions

diff --git a/net/tipc/link.c b/net/tipc/link.c
index 466f28fcf215..2622fb99344a 100644
--- a/net/tipc/link.c
+++ b/net/tipc/link.c
@@ -2146,147 +2146,6 @@ struct sk_buff *tipc_link_cmd_reset_stats(struct net *net,
         return tipc_cfg_reply_none();
 }
 
-/**
- * percent - convert count to a percentage of total (rounding up or down)
- */
-static u32 percent(u32 count, u32 total)
-{
-        return (count * 100 + (total / 2)) / total;
-}
-
-/**
- * tipc_link_stats - print link statistics
- * @net: the applicable net namespace
- * @name: link name
- * @buf: print buffer area
- * @buf_size: size of print buffer area
- *
- * Returns length of print buffer data string (or 0 if error)
- */
-static int tipc_link_stats(struct net *net, const char *name, char *buf,
-                           const u32 buf_size)
-{
-        struct tipc_link *l;
-        struct tipc_stats *s;
-        struct tipc_node *node;
-        char *status;
-        u32 profile_total = 0;
-        unsigned int bearer_id;
-        int ret;
-
-        if (!strcmp(name, tipc_bclink_name))
-                return tipc_bclink_stats(net, buf, buf_size);
-
-        node = tipc_link_find_owner(net, name, &bearer_id);
-        if (!node)
-                return 0;
-
-        tipc_node_lock(node);
-
-        l = node->links[bearer_id];
-        if (!l) {
-                tipc_node_unlock(node);
-                return 0;
-        }
-
-        s = &l->stats;
-
-        if (tipc_link_is_active(l))
-                status = "ACTIVE";
-        else if (tipc_link_is_up(l))
-                status = "STANDBY";
-        else
-                status = "DEFUNCT";
-
-        ret = tipc_snprintf(buf, buf_size, "Link <%s>\n"
-                            "  %s  MTU:%u  Priority:%u  Tolerance:%u ms"
-                            "  Window:%u packets\n",
-                            l->name, status, l->max_pkt, l->priority,
-                            l->tolerance, l->queue_limit[0]);
-
-        ret += tipc_snprintf(buf + ret, buf_size - ret,
-                             "  RX packets:%u fragments:%u/%u bundles:%u/%u\n",
-                             l->next_in_no - s->recv_info, s->recv_fragments,
-                             s->recv_fragmented, s->recv_bundles,
-                             s->recv_bundled);
-
-        ret += tipc_snprintf(buf + ret, buf_size - ret,
-                             "  TX packets:%u fragments:%u/%u bundles:%u/%u\n",
-                             l->next_out_no - s->sent_info, s->sent_fragments,
-                             s->sent_fragmented, s->sent_bundles,
-                             s->sent_bundled);
-
-        profile_total = s->msg_length_counts;
-        if (!profile_total)
-                profile_total = 1;
-
-        ret += tipc_snprintf(buf + ret, buf_size - ret,
-                             "  TX profile sample:%u packets  average:%u octets\n"
-                             "  0-64:%u%% -256:%u%% -1024:%u%% -4096:%u%% "
-                             "-16384:%u%% -32768:%u%% -66000:%u%%\n",
-                             s->msg_length_counts,
-                             s->msg_lengths_total / profile_total,
-                             percent(s->msg_length_profile[0], profile_total),
-                             percent(s->msg_length_profile[1], profile_total),
-                             percent(s->msg_length_profile[2], profile_total),
-                             percent(s->msg_length_profile[3], profile_total),
-                             percent(s->msg_length_profile[4], profile_total),
-                             percent(s->msg_length_profile[5], profile_total),
-                             percent(s->msg_length_profile[6], profile_total));
-
-        ret += tipc_snprintf(buf + ret, buf_size - ret,
-                             "  RX states:%u probes:%u naks:%u defs:%u"
-                             " dups:%u\n", s->recv_states, s->recv_probes,
-                             s->recv_nacks, s->deferred_recv, s->duplicates);
-
-        ret += tipc_snprintf(buf + ret, buf_size - ret,
-                             "  TX states:%u probes:%u naks:%u acks:%u"
-                             " dups:%u\n", s->sent_states, s->sent_probes,
-                             s->sent_nacks, s->sent_acks, s->retransmitted);
-
-        ret += tipc_snprintf(buf + ret, buf_size - ret,
-                             "  Congestion link:%u  Send queue"
-                             " max:%u avg:%u\n", s->link_congs,
-                             s->max_queue_sz, s->queue_sz_counts ?
-                             (s->accu_queue_sz / s->queue_sz_counts) : 0);
-
-        tipc_node_unlock(node);
-        return ret;
-}
-
-struct sk_buff *tipc_link_cmd_show_stats(struct net *net,
-                                         const void *req_tlv_area,
-                                         int req_tlv_space)
-{
-        struct sk_buff *buf;
-        struct tlv_desc *rep_tlv;
-        int str_len;
-        int pb_len;
-        char *pb;
-
-        if (!TLV_CHECK(req_tlv_area, req_tlv_space, TIPC_TLV_LINK_NAME))
-                return tipc_cfg_reply_error_string(TIPC_CFG_TLV_ERROR);
-
-        buf = tipc_cfg_reply_alloc(TLV_SPACE(ULTRA_STRING_MAX_LEN));
-        if (!buf)
-                return NULL;
-
-        rep_tlv = (struct tlv_desc *)buf->data;
-        pb = TLV_DATA(rep_tlv);
-        pb_len = ULTRA_STRING_MAX_LEN;
-        str_len = tipc_link_stats(net, (char *)TLV_DATA(req_tlv_area),
-                                  pb, pb_len);
-        if (!str_len) {
-                kfree_skb(buf);
-                return tipc_cfg_reply_error_string("link not found");
-        }
-        str_len += 1;   /* for "\0" */
-        skb_put(buf, TLV_SPACE(str_len));
-        TLV_SET(rep_tlv, TIPC_TLV_ULTRA_STRING, NULL, str_len);
-
-        return buf;
-}
-
 static void link_print(struct tipc_link *l_ptr, const char *str)
 {
         struct tipc_net *tn = net_generic(l_ptr->owner->net, tipc_net_id);