Commit eda7dd14 authored by Maochen Wang's avatar Maochen Wang Committed by Fabio Baltieri
Browse files

net: zperf: Fix wrong throughput in long-duration traffic test 



The zperf received or sent bytes length and duration are in 32bits,
if running long-duration zperf test more than 20min, the value will
overflow, and the test result is wrong. Change it to 64bits can fix
this issue.

Signed-off-by: default avatarMaochen Wang <maochen.wang@nxp.com>
parent e7444dcf

doc/releases/migration-guide-3.7.rst

+5 −0
Original line number Diff line number Diff line
@@ -81,6 +81,11 @@ Bluetooth Audio 
Networking

**********



* The zperf zperf_results struct is changed to support 64 bits transferred bytes (total_len)

  and test duration (time_in_us and client_time_in_us), instead of 32 bits. This will make

  the long-duration zperf test show with correct throughput result.

  (:github:`69500`)



Other Subsystems

****************

include/zephyr/net/zperf.h

+3 −3
Original line number Diff line number Diff line
@@ -51,10 +51,10 @@ struct zperf_results { 
	uint32_t nb_packets_rcvd;

	uint32_t nb_packets_lost;

	uint32_t nb_packets_outorder;

	uint32_t total_len;

	uint32_t time_in_us;

	uint64_t total_len;

	uint64_t time_in_us;

	uint32_t jitter_in_us;

	uint32_t client_time_in_us;

	uint64_t client_time_in_us;

	uint32_t packet_size;

	uint32_t nb_packets_errors;

};

subsys/net/lib/zperf/zperf_shell.c

+40 −17
Original line number Diff line number Diff line
@@ -106,6 +106,32 @@ static void print_number(const struct shell *sh, uint32_t value, 
	}

}



static void print_number_64(const struct shell *sh, uint64_t value,

			 const uint32_t *divisor_arr, const char **units)

{

	const char **unit;

	const uint32_t *divisor;

	uint32_t dec;

	uint64_t radix;



	unit = units;

	divisor = divisor_arr;



	while (value < *divisor) {

		divisor++;

		unit++;

	}



	if (*divisor != 0U) {

		radix = value / *divisor;

		dec = (value % *divisor) * 100U / *divisor;

		shell_fprintf(sh, SHELL_NORMAL, "%llu.%s%u %s", radix,

			      (dec < 10) ? "0" : "", dec, *unit);

	} else {

		shell_fprintf(sh, SHELL_NORMAL, "%llu %s", value, *unit);

	}

}



static long parse_number(const char *string, const uint32_t *divisor_arr,

			 const char **units)

{
@@ -306,9 +332,8 @@ static void udp_session_cb(enum zperf_status status, 
		/* Compute baud rate */

		if (result->time_in_us != 0U) {

			rate_in_kbps = (uint32_t)

				(((uint64_t)result->total_len * 8ULL *

				  (uint64_t)USEC_PER_SEC) /

				 ((uint64_t)result->time_in_us * 1000ULL));

				((result->total_len * 8ULL * USEC_PER_SEC) /

				 (result->time_in_us * 1000ULL));

		} else {

			rate_in_kbps = 0U;

		}
@@ -316,7 +341,7 @@ static void udp_session_cb(enum zperf_status status, 
		shell_fprintf(sh, SHELL_NORMAL, "End of session!\n");



		shell_fprintf(sh, SHELL_NORMAL, " duration:\t\t");

		print_number(sh, result->time_in_us, TIME_US, TIME_US_UNIT);

		print_number_64(sh, result->time_in_us, TIME_US, TIME_US_UNIT);

		shell_fprintf(sh, SHELL_NORMAL, "\n");



		shell_fprintf(sh, SHELL_NORMAL, " received packets:\t%u\n",
@@ -406,9 +431,8 @@ static void shell_udp_upload_print_stats(const struct shell *sh, 


		if (results->time_in_us != 0U) {

			rate_in_kbps = (uint32_t)

				(((uint64_t)results->total_len *

				  (uint64_t)8 * (uint64_t)USEC_PER_SEC) /

				 ((uint64_t)results->time_in_us * 1000U));

				((results->total_len * 8 * USEC_PER_SEC) /

				 (results->time_in_us * 1000U));

		} else {

			rate_in_kbps = 0U;

		}
@@ -418,7 +442,7 @@ static void shell_udp_upload_print_stats(const struct shell *sh, 
				(((uint64_t)results->nb_packets_sent *

				  (uint64_t)results->packet_size * (uint64_t)8 *

				  (uint64_t)USEC_PER_SEC) /

				 ((uint64_t)results->client_time_in_us * 1000U));

				 (results->client_time_in_us * 1000U));

		} else {

			client_rate_in_kbps = 0U;

		}
@@ -431,10 +455,10 @@ static void shell_udp_upload_print_stats(const struct shell *sh, 
		shell_fprintf(sh, SHELL_NORMAL,

			      "Statistics:\t\tserver\t(client)\n");

		shell_fprintf(sh, SHELL_NORMAL, "Duration:\t\t");

		print_number(sh, results->time_in_us, TIME_US,

		print_number_64(sh, results->time_in_us, TIME_US,

			     TIME_US_UNIT);

		shell_fprintf(sh, SHELL_NORMAL, "\t(");

		print_number(sh, results->client_time_in_us, TIME_US,

		print_number_64(sh, results->client_time_in_us, TIME_US,

			     TIME_US_UNIT);

		shell_fprintf(sh, SHELL_NORMAL, ")\n");
@@ -474,13 +498,13 @@ static void shell_tcp_upload_print_stats(const struct shell *sh, 
				(((uint64_t)results->nb_packets_sent *

				  (uint64_t)results->packet_size * (uint64_t)8 *

				  (uint64_t)USEC_PER_SEC) /

				 ((uint64_t)results->client_time_in_us * 1000U));

				 (results->client_time_in_us * 1000U));

		} else {

			client_rate_in_kbps = 0U;

		}



		shell_fprintf(sh, SHELL_NORMAL, "Duration:\t");

		print_number(sh, results->client_time_in_us,

		print_number_64(sh, results->client_time_in_us,

			     TIME_US, TIME_US_UNIT);

		shell_fprintf(sh, SHELL_NORMAL, "\n");

		shell_fprintf(sh, SHELL_NORMAL, "Num packets:\t%u\n",
@@ -595,7 +619,7 @@ static int execute_upload(const struct shell *sh, 
	int ret;



	shell_fprintf(sh, SHELL_NORMAL, "Duration:\t");

	print_number(sh, param->duration_ms * USEC_PER_MSEC, TIME_US,

	print_number_64(sh, (uint64_t)param->duration_ms * USEC_PER_MSEC, TIME_US,

		     TIME_US_UNIT);

	shell_fprintf(sh, SHELL_NORMAL, "\n");

	shell_fprintf(sh, SHELL_NORMAL, "Packet size:\t%u bytes\n",
@@ -1106,9 +1130,8 @@ static void tcp_session_cb(enum zperf_status status, 
		/* Compute baud rate */

		if (result->time_in_us != 0U) {

			rate_in_kbps = (uint32_t)

				(((uint64_t)result->total_len * 8ULL *

				  (uint64_t)USEC_PER_SEC) /

				 ((uint64_t)result->time_in_us * 1000ULL));

				((result->total_len * 8ULL * USEC_PER_SEC) /

				 (result->time_in_us * 1000ULL));

		} else {

			rate_in_kbps = 0U;

		}
@@ -1116,7 +1139,7 @@ static void tcp_session_cb(enum zperf_status status, 
		shell_fprintf(sh, SHELL_NORMAL, "TCP session ended\n");



		shell_fprintf(sh, SHELL_NORMAL, " Duration:\t\t");

		print_number(sh, result->time_in_us, TIME_US, TIME_US_UNIT);

		print_number_64(sh, result->time_in_us, TIME_US, TIME_US_UNIT);

		shell_fprintf(sh, SHELL_NORMAL, "\n");



		shell_fprintf(sh, SHELL_NORMAL, " rate:\t\t\t");

subsys/net/lib/zperf/zperf_tcp_receiver.c

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ static void tcp_received(const struct sockaddr *addr, size_t datalen) 
			session->state = STATE_COMPLETED;



			results.total_len = session->length;

			results.time_in_us = k_ticks_to_us_ceil32(

			results.time_in_us = k_ticks_to_us_ceil64(

						time - session->start_time);



			if (tcp_session_cb != NULL) {

subsys/net/lib/zperf/zperf_tcp_uploader.c

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ static int tcp_upload(int sock, 
	/* Add result coming from the client */

	results->nb_packets_sent = nb_packets;

	results->client_time_in_us =

				k_ticks_to_us_ceil32(end_time - start_time);

				k_ticks_to_us_ceil64(end_time - start_time);

	results->packet_size = packet_size;

	results->nb_packets_errors = nb_errors;

CRA Git | Maintained and supported by SUSTech CRA and CCSE