Skip site navigation (1)Skip section navigation (2) 
Date:      Tue, 23 Aug 2016 13:51:55 +0000 (UTC)
From:      Andrew Rybchenko <arybchik@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject:   svn commit: r304679 - stable/10/sys/dev/sfxge
Message-ID:  <201608231351.u7NDptpP092918@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: arybchik
Date: Tue Aug 23 13:51:55 2016
New Revision: 304679
URL: https://svnweb.freebsd.org/changeset/base/304679

Log:
  MFC r301724
  
  sfxge(4): handle negative ticks difference correctly
  
  ticks are signed int and if statistics is not updated for a long time
  (more than INT_MAX ticks, but less than UINT_MAX) difference becomes
  negative and less than hz for a long time.
  
  Other option to repeat is simply load driver (which initializes
  timestamps to 0) when ticks are negative.
  
  Sponsored by:   Solarflare Communications, Inc.

Modified:
  stable/10/sys/dev/sfxge/sfxge_ev.c
  stable/10/sys/dev/sfxge/sfxge_port.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/sfxge/sfxge_ev.c
==============================================================================
--- stable/10/sys/dev/sfxge/sfxge_ev.c	Tue Aug 23 13:43:43 2016	(r304678)
+++ stable/10/sys/dev/sfxge/sfxge_ev.c	Tue Aug 23 13:51:55 2016	(r304679)
@@ -448,7 +448,7 @@ sfxge_ev_stat_update(struct sfxge_softc 
 		goto out;
 
 	now = ticks;
-	if (now - sc->ev_stats_update_time < hz)
+	if ((unsigned int)(now - sc->ev_stats_update_time) < (unsigned int)hz)
 		goto out;
 
 	sc->ev_stats_update_time = now;

Modified: stable/10/sys/dev/sfxge/sfxge_port.c
==============================================================================
--- stable/10/sys/dev/sfxge/sfxge_port.c	Tue Aug 23 13:43:43 2016	(r304678)
+++ stable/10/sys/dev/sfxge/sfxge_port.c	Tue Aug 23 13:51:55 2016	(r304679)
@@ -62,7 +62,7 @@ sfxge_mac_stat_update(struct sfxge_softc
 	}
 
 	now = ticks;
-	if (now - port->mac_stats.update_time < hz) {
+	if ((unsigned int)(now - port->mac_stats.update_time) < (unsigned int)hz) {
 		rc = 0;
 		goto out;
 	}
@@ -543,7 +543,7 @@ sfxge_phy_stat_update(struct sfxge_softc
 	}
 
 	now = ticks;
-	if (now - port->phy_stats.update_time < hz) {
+	if ((unsigned int)(now - port->phy_stats.update_time) < (unsigned int)hz) {
 		rc = 0;
 		goto out;
 	}

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201608231351.u7NDptpP092918>