svn commit: r344929 - stable/12/sys/dev/cxgbe/crypto

[John Baldwin]

Author: jhb
Date: Fri Mar  8 18:59:37 2019
New Revision: 344929
URL: https://svnweb.freebsd.org/changeset/base/344929

Log:
  MFC 343056: Reject new sessions if the necessary queues aren't initialized.
  
  ccr reuses the control queue and first rx queue from the first port on
  each adapter.  The driver cannot send requests until those queues are
  initialized.  Refuse to create sessions for now if the queues aren't
  ready.  This is a workaround until cxgbe allocates one or more
  dedicated queues for ccr.

Modified:
  stable/12/sys/dev/cxgbe/crypto/t4_crypto.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/dev/cxgbe/crypto/t4_crypto.c
==============================================================================
--- stable/12/sys/dev/cxgbe/crypto/t4_crypto.c	Fri Mar  8 18:58:41 2019	(r344928)
+++ stable/12/sys/dev/cxgbe/crypto/t4_crypto.c	Fri Mar  8 18:59:37 2019	(r344929)
@@ -1652,12 +1652,6 @@ ccr_attach(device_t dev)
 	struct ccr_softc *sc;
 	int32_t cid;
 
-	/*
-	 * TODO: Crypto requests will panic if the parent device isn't
-	 * initialized so that the queues are up and running.  Need to
-	 * figure out how to handle that correctly, maybe just reject
-	 * requests if the adapter isn't fully initialized?
-	 */
 	sc = device_get_softc(dev);
 	sc->dev = dev;
 	sc->adapter = device_get_softc(device_get_parent(dev));
@@ -2058,6 +2052,16 @@ ccr_newsession(device_t dev, crypto_session_t cses, st
 	}
 
 	sc = device_get_softc(dev);
+
+	/*
+	 * XXX: Don't create a session if the queues aren't
+	 * initialized.  This is racy as the rxq can be destroyed by
+	 * the associated VI detaching.  Eventually ccr should use
+	 * dedicated queues.
+	 */
+	if (sc->rxq->iq.adapter == NULL || sc->txq->adapter == NULL)
+		return (ENXIO);
+	
 	mtx_lock(&sc->lock);
 	if (sc->detaching) {
 		mtx_unlock(&sc->lock);