Skip site navigation (1)Skip section navigation (2) 
Date:      Wed, 25 Mar 2015 10:29:09 +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: r280523 - stable/10/sys/dev/sfxge
Message-ID:  <201503251029.t2PAT9fB084075@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: arybchik
Date: Wed Mar 25 10:29:08 2015
New Revision: 280523
URL: https://svnweb.freebsd.org/changeset/base/280523

Log:
  MFC: 278248
  
  sfxge: access statistics buffers under port lock
  
  Allow access to statistics data not only from sysctl handlers.
  
  Submitted by:   Boris Misenov <Boris.Misenov at oktetlabs.ru>
  Sponsored by:   Solarflare Communications, Inc.
  Approved by:    gnn (mentor)

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

Modified: stable/10/sys/dev/sfxge/sfxge_port.c
==============================================================================
--- stable/10/sys/dev/sfxge/sfxge_port.c	Wed Mar 25 10:27:54 2015	(r280522)
+++ stable/10/sys/dev/sfxge/sfxge_port.c	Wed Mar 25 10:29:08 2015	(r280523)
@@ -48,7 +48,7 @@ sfxge_mac_stat_update(struct sfxge_softc
 	unsigned int count;
 	int rc;
 
-	SFXGE_PORT_LOCK(port);
+	SFXGE_PORT_LOCK_ASSERT_OWNED(port);
 
 	if (port->init_state != SFXGE_PORT_STARTED) {
 		rc = 0;
@@ -82,7 +82,6 @@ sfxge_mac_stat_update(struct sfxge_softc
 
 	rc = ETIMEDOUT;
 out:
-	SFXGE_PORT_UNLOCK(port);
 	return (rc);
 }
 
@@ -93,12 +92,16 @@ sfxge_mac_stat_handler(SYSCTL_HANDLER_AR
 	unsigned int id = arg2;
 	int rc;
 
+	SFXGE_PORT_LOCK(&sc->port);
 	if ((rc = sfxge_mac_stat_update(sc)) != 0)
-		return (rc);
+		goto out;
 
-	return (SYSCTL_OUT(req,
-			  (uint64_t *)sc->port.mac_stats.decode_buf + id,
-			  sizeof(uint64_t)));
+	rc = SYSCTL_OUT(req,
+			(uint64_t *)sc->port.mac_stats.decode_buf + id,
+			sizeof(uint64_t));
+out:
+	SFXGE_PORT_UNLOCK(&sc->port);
+	return (rc);
 }
 
 static void
@@ -453,7 +456,7 @@ sfxge_phy_stat_update(struct sfxge_softc
 	unsigned int count;
 	int rc;
 
-	SFXGE_PORT_LOCK(port);
+	SFXGE_PORT_LOCK_ASSERT_OWNED(port);
 
 	if (port->init_state != SFXGE_PORT_STARTED) {
 		rc = 0;
@@ -487,7 +490,6 @@ sfxge_phy_stat_update(struct sfxge_softc
 
 	rc = ETIMEDOUT;
 out:
-	SFXGE_PORT_UNLOCK(port);
 	return (rc);
 }
 
@@ -498,12 +500,16 @@ sfxge_phy_stat_handler(SYSCTL_HANDLER_AR
 	unsigned int id = arg2;
 	int rc;
 
+	SFXGE_PORT_LOCK(&sc->port);
 	if ((rc = sfxge_phy_stat_update(sc)) != 0)
-		return (rc);
+		goto out;
 
-	return (SYSCTL_OUT(req,
-			  (uint32_t *)sc->port.phy_stats.decode_buf + id,
-			  sizeof(uint32_t)));
+	rc = SYSCTL_OUT(req,
+			(uint32_t *)sc->port.phy_stats.decode_buf + id,
+			sizeof(uint32_t));
+out:
+	SFXGE_PORT_UNLOCK(&sc->port);
+	return (rc);
 }
 
 static void

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