Skip to contentSkip to conversation

net: Fix delay in net_retry test

PATCH New Joe Hershberger 4 participants 5 messages Dec 21, 2015 – Jan 7, 2016

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net: Fix delay in net_retry test

Introduced in 45b4773 (net/arp: account for ARP delay, avoid duplicate packets on timeout)

Check the arp timeout and adjust the timeout start time before the call to eth_recv() so that the sandbox driver has the opportunity to adjust the sandbox timer after the new start time has been recorded.

Also, change the adjustment amount by 11 seconds instead of exactly the 10 seconds that the ping timout is expecting since the timeout check is looking for the time elapsed to be greater than but not equal to the specified delay.

---

 drivers/net/sandbox.c | 2 +-
 net/net.c             | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)
drivers/net/sandbox.c +1 -1
index 6763a24..d538d37 100644
@@ -157,7 +157,7 @@ static int sb_eth_recv(struct udevice *dev, int flags, uchar **packetp)
 	struct eth_sandbox_priv *priv = dev_get_priv(dev);
 
 	if (skip_timeout) {
-		sandbox_timer_add_offset(10000UL);
+		sandbox_timer_add_offset(11000UL);
 		skip_timeout = false;
 	}
 
net/net.c +3 -4
index 4d5746a..fba111e 100644
@@ -542,6 +542,9 @@ restart:
 #ifdef CONFIG_SHOW_ACTIVITY
 		show_activity(1);
 #endif
+		if (arp_timeout_check() > 0)
+			time_start = get_timer(0);
+
 		/*
 		 *	Check the ethernet for a new packet.  The ethernet
 		 *	receive routine will process it.
@@ -570,10 +573,6 @@ restart:
 			goto done;
 		}
 
-		if (arp_timeout_check() > 0) {
-		    time_start = get_timer(0);
-		}
-
 		/*
 		 *	Check for a timeout, and run the timeout handler
 		 *	if we have one.
Signature · 1 line
2.5.0
#1 lore raw

PATCH 1/1 net: Fix delay in net_retry test

Hi Stefan,

Quoted 5 lines · Joe Hershberger

Introduced in 45b4773 (net/arp: account for ARP delay, avoid duplicate packets on timeout)

Check the arp timeout and adjust the timeout start time before the call to eth_recv() so that the sandbox driver has the opportunity to adjust the sandbox timer after the new start time has been recorded.

This had to change to allow sandbox tests to work. Please verify that it does not impair the behavior you intended with your patch.

Quoted 58 lines

Also, change the adjustment amount by 11 seconds instead of exactly the 10 seconds that the ping timout is expecting since the timeout check is looking for the time elapsed to be greater than but not equal to the specified delay.

---

 drivers/net/sandbox.c | 2 +-
 net/net.c             | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)
drivers/net/sandbox.c +1 -1
index 6763a24..d538d37 100644
@@ -157,7 +157,7 @@ static int sb_eth_recv(struct udevice *dev, int flags, uchar **packetp)
        struct eth_sandbox_priv *priv = dev_get_priv(dev);
 
        if (skip_timeout) {
-               sandbox_timer_add_offset(10000UL);
+               sandbox_timer_add_offset(11000UL);
                skip_timeout = false;
        }
 
net/net.c +3 -5
index 4d5746a..fba111e 100644
@@ -542,6 +542,9 @@ restart:
 #ifdef CONFIG_SHOW_ACTIVITY
                show_activity(1);
 #endif
+               if (arp_timeout_check() > 0)
+                       time_start = get_timer(0);
+
                /*
                 *      Check the ethernet for a new packet.  The ethernet
                 *      receive routine will process it.
@@ -570,10 +573,6 @@ restart:
                        goto done;
                }
 
-               if (arp_timeout_check() > 0) {
-                   time_start = get_timer(0);
-               }
-
                /*
                 *      Check for a timeout, and run the timeout handler
                 *      if we have one.
--

2.5.0

_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

#2 lore raw

PATCH 1/1 net: Fix delay in net_retry test

Hi Joe,

Quoted 3 lines · On Monday 21 December 2015 16:50:52 Joe Hershberger wrote:

Hi Stefan,

On Mon, Dec 21, 2015 at 4:31 PM, Joe Hershberger <[email protected]>

Quoted 9 lines · wrote:
Quoted 6 lines

Introduced in 45b4773 (net/arp: account for ARP delay, avoid duplicate packets on timeout)

Check the arp timeout and adjust the timeout start time before the call to eth_recv() so that the sandbox driver has the opportunity to adjust the sandbox timer after the new start time has been recorded.

This had to change to allow sandbox tests to work. Please verify that it does not impair the behavior you intended with your patch.

I can't see any reason this change would impair the behaviour. The runtime of the eth_rx() function should be small compared to the request timeout.

I haven't actually tested your change and won't be able to do until after the holydays, but as I think it is fine:

Quoted 73 lines
Quoted 73 lines

Also, change the adjustment amount by 11 seconds instead of exactly the 10 seconds that the ping timout is expecting since the timeout check is looking for the time elapsed to be greater than but not equal to the specified delay.

---

 drivers/net/sandbox.c | 2 +-
 net/net.c             | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)
drivers/net/sandbox.c +0 -0
index 6763a24..d538d37 100644
@@ -157,7 +157,7 @@ static int sb_eth_recv(struct udevice *dev, int flags,

uchar **packetp)>

        struct eth_sandbox_priv *priv = dev_get_priv(dev);
        
        if (skip_timeout) {
drivers/net/sandbox.c +1 -1
-               sandbox_timer_add_offset(10000UL);
+               sandbox_timer_add_offset(11000UL);
 
                skip_timeout = false;
 
        }
net/net.c +3 -0
index 4d5746a..fba111e 100644
@@ -542,6 +542,9 @@ restart:
 #ifdef CONFIG_SHOW_ACTIVITY
 
                show_activity(1);
 
 #endif
 
+               if (arp_timeout_check() > 0)
+                       time_start = get_timer(0);
+

/*

* Check the ethernet for a new packet. The ethernet
* receive routine will process it.

net/net.c +0 -4
@@ -570,10 +573,6 @@ restart:
                        goto done;
 
                }
 
-               if (arp_timeout_check() > 0) {
-                   time_start = get_timer(0);
-               }
-
 
                /*

* Check for a timeout, and run the timeout handler
* if we have one.

--
2.5.0

_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Signature · 3 lines
Stefan Br?ns  /  Bergstra?e 21  /  52062 Aachen
home: +49 241 53809034     mobile: +49 151 50412019
work: +49 2405 49936-424
#3 lore raw

PATCH 1/1 net: Fix delay in net_retry test

In reply to Joe Hershberger
Quoted 11 lines · Joe Hershberger

Introduced in 45b4773 (net/arp: account for ARP delay, avoid duplicate packets on timeout)

Check the arp timeout and adjust the timeout start time before the call to eth_recv() so that the sandbox driver has the opportunity to adjust the sandbox timer after the new start time has been recorded.

Also, change the adjustment amount by 11 seconds instead of exactly the 10 seconds that the ping timout is expecting since the timeout check is looking for the time elapsed to be greater than but not equal to the specified delay.

Quoted 7 lines

---

 drivers/net/sandbox.c | 2 +-
 net/net.c             | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

I'm planning to pick this up for the release. Please let me know if you have any concerns.

- Simon

#4 lore raw

PATCH 1/1 net: Fix delay in net_retry test

Quoted 16 lines · Simon Glass
Quoted 15 lines · Joe Hershberger

Introduced in 45b4773 (net/arp: account for ARP delay, avoid duplicate packets on timeout)

Check the arp timeout and adjust the timeout start time before the call to eth_recv() so that the sandbox driver has the opportunity to adjust the sandbox timer after the new start time has been recorded.

Also, change the adjustment amount by 11 seconds instead of exactly the 10 seconds that the ping timout is expecting since the timeout check is looking for the time elapsed to be greater than but not equal to the specified delay.

---

Quoted 8 lines
Quoted 3 lines
 drivers/net/sandbox.c | 2 +-
 net/net.c             | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

I'm planning to pick this up for the release. Please let me know if you have any concerns.

Applied to u-boot-dm/master.