svn commit: r282997 - head/sys/dev/sfxge
Andrew Rybchenko
arybchik at FreeBSD.org
Sat May 16 05:37:48 UTC 2015
Author: arybchik
Date: Sat May 16 05:37:47 2015
New Revision: 282997
URL: https://svnweb.freebsd.org/changeset/base/282997
Log:
sfxge: get rid of locked variable in sfxge_tx_packet_add()
Now each branch has one and only one possible TxQ lock state.
It simplifies understanding of the code.
Reviewed by: gnn
Sponsored by: Solarflare Communications, Inc.
MFC after: 2 days
Differential Revision: https://reviews.freebsd.org/D2551
Modified:
head/sys/dev/sfxge/sfxge_tx.c
Modified: head/sys/dev/sfxge/sfxge_tx.c
==============================================================================
--- head/sys/dev/sfxge/sfxge_tx.c Sat May 16 05:36:40 2015 (r282996)
+++ head/sys/dev/sfxge/sfxge_tx.c Sat May 16 05:37:47 2015 (r282997)
@@ -602,7 +602,6 @@ sfxge_tx_qdpl_put_unlocked(struct sfxge_
int
sfxge_tx_packet_add(struct sfxge_txq *txq, struct mbuf *m)
{
- int locked;
int rc;
if (!SFXGE_LINK_UP(txq->sc)) {
@@ -616,9 +615,7 @@ sfxge_tx_packet_add(struct sfxge_txq *tx
* the packet will be appended to the "get list" of the deferred
* packet list. Otherwise, it will be pushed on the "put list".
*/
- locked = SFXGE_TXQ_TRYLOCK(txq);
-
- if (locked) {
+ if (SFXGE_TXQ_TRYLOCK(txq)) {
/* First swizzle put-list to get-list to keep order */
sfxge_tx_qdpl_swizzle(txq);
@@ -627,6 +624,10 @@ sfxge_tx_packet_add(struct sfxge_txq *tx
SFXGE_TXQ_UNLOCK(txq);
goto fail;
}
+
+ /* Try to service the list. */
+ sfxge_tx_qdpl_service(txq);
+ /* Lock has been dropped. */
} else {
rc = sfxge_tx_qdpl_put_unlocked(txq, m);
if (rc != 0)
@@ -639,14 +640,13 @@ sfxge_tx_packet_add(struct sfxge_txq *tx
* the deferred packet list. If we are not able to get
* the lock, another thread is processing the list.
*/
- locked = SFXGE_TXQ_TRYLOCK(txq);
+ if (SFXGE_TXQ_TRYLOCK(txq)) {
+ sfxge_tx_qdpl_service(txq);
+ /* Lock has been dropped. */
+ }
}
- if (locked) {
- /* Try to service the list. */
- sfxge_tx_qdpl_service(txq);
- /* Lock has been dropped. */
- }
+ SFXGE_TXQ_LOCK_ASSERT_NOTOWNED(txq);
return (0);
More information about the svn-src-all
mailing list