Commit dc1aed37 authored by Erik Hugne's avatar Erik Hugne Committed by Paul Gortmaker
Browse files

tipc: phase out most of the struct print_buf usage 



The tipc_printf is renamed to tipc_snprintf, as the new name
describes more what the function actually does.  It is also
changed to take a buffer and length parameter and return
number of characters written to the buffer.  All callers of
this function that used to pass a print_buf are updated.

Final removal of the struct print_buf itself will be done
synchronously with the pending removal of the deprecated
logging code that also was using it.

Functions that build up a response message with a list of
ports, nametable contents etc. are changed to return the number
of characters written to the output buffer. This information
was previously hidden in a field of the print_buf struct, and
the number of chars written was fetched with a call to
tipc_printbuf_validate.  This function is removed since it
is no longer referenced nor needed.

A generic max size ULTRA_STRING_MAX_LEN is defined, named
in keeping with the existing TIPC_TLV_ULTRA_STRING, and the
various definitions in port, link and nametable code that
largely duplicated this information are removed.  This means
that amount of link statistics that can be returned is now
increased from 2k to 32k.

The buffer overflow check is now done just before the reply
message is passed over netlink or TIPC to a remote node and
the message indicating a truncated buffer is changed to a less
dramatic one (less CAPS), placed at the end of the message.

Signed-off-by: default avatarErik Hugne <erik.hugne@ericsson.com>
Signed-off-by: default avatarJon Maloy <jon.maloy@ericsson.com>
Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
parent e2dbd601

net/tipc/bcast.c

+29 −34
Original line number Diff line number Diff line
@@ -701,48 +701,43 @@ void tipc_bcbearer_sort(void) 


int tipc_bclink_stats(char *buf, const u32 buf_size)

{

	struct print_buf pb;

	int ret;

	struct tipc_stats *s;



	if (!bcl)

		return 0;



	tipc_printbuf_init(&pb, buf, buf_size);



	spin_lock_bh(&bc_lock);



	tipc_printf(&pb, "Link <%s>\n"

	s = &bcl->stats;



	ret = tipc_snprintf(buf, buf_size, "Link <%s>\n"

			    "  Window:%u packets\n",

			    bcl->name, bcl->queue_limit[0]);

	tipc_printf(&pb, "  RX packets:%u fragments:%u/%u bundles:%u/%u\n",

		    bcl->stats.recv_info,

		    bcl->stats.recv_fragments,

		    bcl->stats.recv_fragmented,

		    bcl->stats.recv_bundles,

		    bcl->stats.recv_bundled);

	tipc_printf(&pb, "  TX packets:%u fragments:%u/%u bundles:%u/%u\n",

		    bcl->stats.sent_info,

		    bcl->stats.sent_fragments,

		    bcl->stats.sent_fragmented,

		    bcl->stats.sent_bundles,

		    bcl->stats.sent_bundled);

	tipc_printf(&pb, "  RX naks:%u defs:%u dups:%u\n",

		    bcl->stats.recv_nacks,

		    bcl->stats.deferred_recv,

		    bcl->stats.duplicates);

	tipc_printf(&pb, "  TX naks:%u acks:%u dups:%u\n",

		    bcl->stats.sent_nacks,

		    bcl->stats.sent_acks,

		    bcl->stats.retransmitted);

	tipc_printf(&pb, "  Congestion bearer:%u link:%u  Send queue max:%u avg:%u\n",

		    bcl->stats.bearer_congs,

		    bcl->stats.link_congs,

		    bcl->stats.max_queue_sz,

		    bcl->stats.queue_sz_counts

		    ? (bcl->stats.accu_queue_sz / bcl->stats.queue_sz_counts)

		    : 0);

	ret += tipc_snprintf(buf + ret, buf_size - ret,

			     "  RX packets:%u fragments:%u/%u bundles:%u/%u\n",

			     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",

			     s->sent_info, s->sent_fragments,

			     s->sent_fragmented, s->sent_bundles,

			     s->sent_bundled);

	ret += tipc_snprintf(buf + ret, buf_size - ret,

			     "  RX naks:%u defs:%u dups:%u\n",

			     s->recv_nacks, s->deferred_recv, s->duplicates);

	ret += tipc_snprintf(buf + ret, buf_size - ret,

			     "  TX naks:%u acks:%u dups:%u\n",

			     s->sent_nacks, s->sent_acks, s->retransmitted);

	ret += tipc_snprintf(buf + ret, buf_size - ret,

			     "  Congestion bearer:%u link:%u  Send queue max:%u avg:%u\n",

			     s->bearer_congs, s->link_congs, s->max_queue_sz,

			     s->queue_sz_counts ?

			     (s->accu_queue_sz / s->queue_sz_counts) : 0);



	spin_unlock_bh(&bc_lock);

	return tipc_printbuf_validate(&pb);

	return ret;

}



int tipc_bclink_reset_stats(void)

net/tipc/bearer.c

+6 −4
Original line number Diff line number Diff line
@@ -130,21 +130,23 @@ exit: 
/**

 * tipc_media_addr_printf - record media address in print buffer

 */

void tipc_media_addr_printf(struct print_buf *pb, struct tipc_media_addr *a)

void tipc_media_addr_printf(char *buf, int len, struct tipc_media_addr *a)

{

	char addr_str[MAX_ADDR_STR];

	struct tipc_media *m_ptr;

	int ret;



	m_ptr = media_find_id(a->media_id);



	if (m_ptr && !m_ptr->addr2str(a, addr_str, sizeof(addr_str)))

		tipc_printf(pb, "%s(%s)", m_ptr->name, addr_str);

		ret = tipc_snprintf(buf, len, "%s(%s)", m_ptr->name, addr_str);

	else {

		u32 i;



		tipc_printf(pb, "UNKNOWN(%u)", a->media_id);

		ret = tipc_snprintf(buf, len, "UNKNOWN(%u)", a->media_id);

		for (i = 0; i < sizeof(a->value); i++)

			tipc_printf(pb, "-%02x", a->value[i]);

			ret += tipc_snprintf(buf - ret, len + ret,

					    "-%02x", a->value[i]);

	}

}

net/tipc/bearer.h

+1 −1
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ void tipc_eth_media_stop(void); 


int tipc_media_set_priority(const char *name, u32 new_value);

int tipc_media_set_window(const char *name, u32 new_value);

void tipc_media_addr_printf(struct print_buf *pb, struct tipc_media_addr *a);

void tipc_media_addr_printf(char *buf, int len, struct tipc_media_addr *a);

struct sk_buff *tipc_media_get_names(void);



struct sk_buff *tipc_bearer_get_names(void);

net/tipc/config.c

+18 −9
Original line number Diff line number Diff line
@@ -39,6 +39,8 @@ 
#include "name_table.h"

#include "config.h"



#define REPLY_TRUNCATED "<truncated>\n"



static u32 config_port_ref;



static DEFINE_SPINLOCK(config_lock);
@@ -104,13 +106,12 @@ struct sk_buff *tipc_cfg_reply_string_type(u16 tlv_type, char *string) 
	return buf;

}



#define MAX_STATS_INFO 2000



static struct sk_buff *tipc_show_stats(void)

{

	struct sk_buff *buf;

	struct tlv_desc *rep_tlv;

	struct print_buf pb;

	char *pb;

	int pb_len;

	int str_len;

	u32 value;
@@ -121,17 +122,16 @@ static struct sk_buff *tipc_show_stats(void) 
	if (value != 0)

		return tipc_cfg_reply_error_string("unsupported argument");



	buf = tipc_cfg_reply_alloc(TLV_SPACE(MAX_STATS_INFO));

	buf = tipc_cfg_reply_alloc(TLV_SPACE(ULTRA_STRING_MAX_LEN));

	if (buf == NULL)

		return NULL;



	rep_tlv = (struct tlv_desc *)buf->data;

	tipc_printbuf_init(&pb, (char *)TLV_DATA(rep_tlv), MAX_STATS_INFO);



	tipc_printf(&pb, "TIPC version " TIPC_MOD_VER "\n");

	pb = TLV_DATA(rep_tlv);

	pb_len = ULTRA_STRING_MAX_LEN;



	/* Use additional tipc_printf()'s to return more info ... */

	str_len = tipc_printbuf_validate(&pb);

	str_len = tipc_snprintf(pb, pb_len, "TIPC version " TIPC_MOD_VER "\n");

	str_len += 1;	/* for "\0" */

	skb_put(buf, TLV_SPACE(str_len));

	TLV_SET(rep_tlv, TIPC_TLV_ULTRA_STRING, NULL, str_len);
@@ -408,6 +408,15 @@ struct sk_buff *tipc_cfg_do_cmd(u32 orig_node, u16 cmd, const void *request_area 
		break;

	}



	WARN_ON(rep_tlv_buf->len > TLV_SPACE(ULTRA_STRING_MAX_LEN));



	/* Append an error message if we cannot return all requested data */

	if (rep_tlv_buf->len == TLV_SPACE(ULTRA_STRING_MAX_LEN)) {

		if (*(rep_tlv_buf->data + ULTRA_STRING_MAX_LEN) != '\0')

			sprintf(rep_tlv_buf->data + rep_tlv_buf->len -

				sizeof(REPLY_TRUNCATED) - 1, REPLY_TRUNCATED);

	}



	/* Return reply buffer */

exit:

	spin_unlock_bh(&config_lock);

net/tipc/core.h

+3 −1
Original line number Diff line number Diff line
@@ -60,6 +60,8 @@ 


#define TIPC_MOD_VER "2.0.0"



#define ULTRA_STRING_MAX_LEN 32768



struct tipc_msg;	/* msg.h */

struct print_buf;	/* log.h */
@@ -82,7 +84,7 @@ extern struct print_buf *const TIPC_NULL; 
extern struct print_buf *const TIPC_CONS;

extern struct print_buf *const TIPC_LOG;



void tipc_printf(struct print_buf *, const char *fmt, ...);

int tipc_snprintf(char *buf, int len, const char *fmt, ...);



/*

 * TIPC_OUTPUT is the destination print buffer for system messages.

CRA Git | Maintained and supported by SUSTech CRA and CCSE