Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef01d631 authored by wujianguo's avatar wujianguo Committed by Greg Kroah-Hartman
Browse files

selftests/net: udpgso_bench_tx: fix dst ip argument 



[ Upstream commit 9c1952aeaa98b3cfc49e2a79cb2c7d6a674213e9 ]

udpgso_bench_tx call setup_sockaddr() for dest address before
parsing all arguments, if we specify "-p ${dst_port}" after "-D ${dst_ip}",
then ${dst_port} will be ignored, and using default cfg_port 8000.

This will cause test case "multiple GRO socks" failed in udpgro.sh.

Setup sockaddr after parsing all arguments.

Fixes: 3a687bef ("selftests: udp gso benchmark")
Signed-off-by: default avatarJianguo Wu <wujianguo@chinatelecom.cn>
Reviewed-by: default avatarWillem de Bruijn <willemb@google.com>
Link: https://lore.kernel.org/r/ff620d9f-5b52-06ab-5286-44b945453002@163.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 20f68967

tools/testing/selftests/net/udpgso_bench_tx.c

+7 −1
Original line number Original line Diff line number Diff line
@@ -419,6 +419,7 @@ static void usage(const char *filepath) 




static void parse_opts(int argc, char **argv)

static void parse_opts(int argc, char **argv)

{

{

	const char *bind_addr = NULL;

	int max_len, hdrlen;

	int max_len, hdrlen;

	int c;

	int c;
@@ -446,7 +447,7 @@ static void parse_opts(int argc, char **argv) 
			cfg_cpu = strtol(optarg, NULL, 0);

			cfg_cpu = strtol(optarg, NULL, 0);

			break;

			break;

		case 'D':

		case 'D':

			setup_sockaddr(cfg_family, optarg, &cfg_dst_addr);

			bind_addr = optarg;

			break;

			break;

		case 'l':

		case 'l':

			cfg_runtime_ms = strtoul(optarg, NULL, 10) * 1000;

			cfg_runtime_ms = strtoul(optarg, NULL, 10) * 1000;
@@ -492,6 +493,11 @@ static void parse_opts(int argc, char **argv) 
		}

		}

	}

	}





	if (!bind_addr)

		bind_addr = cfg_family == PF_INET6 ? "::" : "0.0.0.0";



	setup_sockaddr(cfg_family, bind_addr, &cfg_dst_addr);



	if (optind != argc)

	if (optind != argc)

		usage(argv[0]);

		usage(argv[0]);