Skip site navigation (1)Skip section navigation (2) 
Date:      Sun, 22 Feb 2015 18:52:16 +0000 (UTC)
From:      Andrew Rybchenko <arybchik@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r279177 - head/sys/dev/sfxge
Message-ID:  <201502221852.t1MIqGGM097060@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: arybchik
Date: Sun Feb 22 18:52:15 2015
New Revision: 279177
URL: https://svnweb.freebsd.org/changeset/base/279177

Log:
  sfxge: assert event queue lock in event handlers
  
  It is useful to highlight lock context.
  
  Sponsored by:   Solarflare Communications, Inc.
  Approved by:    gnn (mentor)

Modified:
  head/sys/dev/sfxge/sfxge_ev.c

Modified: head/sys/dev/sfxge/sfxge_ev.c
==============================================================================
--- head/sys/dev/sfxge/sfxge_ev.c	Sun Feb 22 18:50:59 2015	(r279176)
+++ head/sys/dev/sfxge/sfxge_ev.c	Sun Feb 22 18:52:15 2015	(r279177)
@@ -50,6 +50,8 @@ sfxge_ev_qcomplete(struct sfxge_evq *evq
 	struct sfxge_rxq *rxq;
 	struct sfxge_txq *txq;
 
+	SFXGE_EVQ_LOCK_ASSERT_OWNED(evq);
+
 	sc = evq->sc;
 	index = evq->index;
 	rxq = sc->rxq[index];
@@ -89,6 +91,8 @@ sfxge_ev_rx(void *arg, uint32_t label, u
 	struct sfxge_rx_sw_desc *rx_desc;
 
 	evq = arg;
+	SFXGE_EVQ_LOCK_ASSERT_OWNED(evq);
+
 	sc = evq->sc;
 
 	if (evq->exception)
@@ -140,6 +144,8 @@ sfxge_ev_exception(void *arg, uint32_t c
 	struct sfxge_softc *sc;
 
 	evq = (struct sfxge_evq *)arg;
+	SFXGE_EVQ_LOCK_ASSERT_OWNED(evq);
+
 	sc = evq->sc;
 
 	evq->exception = B_TRUE;
@@ -165,6 +171,8 @@ sfxge_ev_rxq_flush_done(void *arg, uint3
 	uint16_t magic;
 
 	evq = (struct sfxge_evq *)arg;
+	SFXGE_EVQ_LOCK_ASSERT_OWNED(evq);
+
 	sc = evq->sc;
 	rxq = sc->rxq[rxq_index];
 
@@ -197,6 +205,8 @@ sfxge_ev_rxq_flush_failed(void *arg, uin
 	uint16_t magic;
 
 	evq = (struct sfxge_evq *)arg;
+	SFXGE_EVQ_LOCK_ASSERT_OWNED(evq);
+
 	sc = evq->sc;
 	rxq = sc->rxq[rxq_index];
 
@@ -238,6 +248,8 @@ sfxge_ev_tx(void *arg, uint32_t label, u
 	unsigned int delta;
 
 	evq = (struct sfxge_evq *)arg;
+	SFXGE_EVQ_LOCK_ASSERT_OWNED(evq);
+
 	txq = sfxge_get_txq_by_label(evq, label);
 
 	KASSERT(txq != NULL, ("txq == NULL"));
@@ -278,6 +290,8 @@ sfxge_ev_txq_flush_done(void *arg, uint3
 	uint16_t magic;
 
 	evq = (struct sfxge_evq *)arg;
+	SFXGE_EVQ_LOCK_ASSERT_OWNED(evq);
+
 	sc = evq->sc;
 	txq = sc->txq[txq_index];
 
@@ -308,6 +322,8 @@ sfxge_ev_software(void *arg, uint16_t ma
 	unsigned int label;
 
 	evq = (struct sfxge_evq *)arg;
+	SFXGE_EVQ_LOCK_ASSERT_OWNED(evq);
+
 	sc = evq->sc;
 
 	label = magic & SFXGE_MAGIC_DMAQ_LABEL_MASK;
@@ -533,6 +549,7 @@ sfxge_ev_initialized(void *arg)
 	struct sfxge_evq *evq;
 
 	evq = (struct sfxge_evq *)arg;
+	SFXGE_EVQ_LOCK_ASSERT_OWNED(evq);
 
 	KASSERT(evq->init_state == SFXGE_EVQ_STARTING,
 	    ("evq not starting"));
@@ -549,6 +566,8 @@ sfxge_ev_link_change(void *arg, efx_link
 	struct sfxge_softc *sc;
 
 	evq = (struct sfxge_evq *)arg;
+	SFXGE_EVQ_LOCK_ASSERT_OWNED(evq);
+
 	sc = evq->sc;
 
 	sfxge_mac_link_update(sc, link_mode);

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