aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Washburn <development@efficientek.com>2022-03-18 01:51:33 -0500
committerDaniel Kiper <daniel.kiper@oracle.com>2022-04-04 19:59:49 +0200
commitc2e5dc6916cbdd97d1c10f42fed2c4ba15c32736 (patch)
treebaff135425500155844b32fb45691bb5f65853a4
parent848724273e4c3bac7ff88b21a8abd764ada57b9c (diff)
downloadgrub-c2e5dc6916cbdd97d1c10f42fed2c4ba15c32736.tar.gz
net/tcp: Only call grub_get_time_ms() when there are sockets to potentially retransmit for
If the machine has network cards found, but there are no tcp open sockets (because the user doesn't use the network to boot), then grub_net_tcp_retransmit() should be a noop. Thus GRUB doesn't need to call grub_get_time_ms(), which does a call into firmware on powerpc-ieee1275, and probably other targets. So only call grub_get_time_ms() if there are tcp sockets. Aside from improving performance, its also useful to stay out of the firmware as much as possible when debugging via QEMU because its a pain to get back in to GRUB execution. grub_net_tcp_retransmit() can get called very frequently via grub_net_poll_cards_idle() when GRUB is waiting for a keypress (grub_getkey_noblock() calls grub_net_poll_cards_idle()). This can be annoying when debugging an issue in GRUB on PowerPC in QEMU with GDB when GRUB is waiting for a keypress because interrupting via GDB nearly always lands in the OpenBIOS firmware's milliseconds call. Signed-off-by: Glenn Washburn <development@efficientek.com> Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
-rw-r--r--grub-core/net/tcp.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/grub-core/net/tcp.c b/grub-core/net/tcp.c
index 200460121..93dee0caa 100644
--- a/grub-core/net/tcp.c
+++ b/grub-core/net/tcp.c
@@ -362,8 +362,13 @@ void
grub_net_tcp_retransmit (void)
{
grub_net_tcp_socket_t sock;
- grub_uint64_t ctime = grub_get_time_ms ();
- grub_uint64_t limit_time = ctime - TCP_RETRANSMISSION_TIMEOUT;
+ grub_uint64_t ctime = 0, limit_time = 0;
+
+ if (tcp_sockets != NULL)
+ {
+ ctime = grub_get_time_ms ();
+ limit_time = ctime - TCP_RETRANSMISSION_TIMEOUT;
+ }
FOR_TCP_SOCKETS (sock)
{