d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reject new sessions if the necessary queues aren't initialized.

Browse Source 
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.

PR:		233851
MFC after:	1 week
Sponsored by:	Chelsio Communications
Differential Revision:	https://reviews.freebsd.org/D18478
This commit is contained in:
John Baldwin 2019-01-15 18:53:45 +00:00
parent e7e4bcd856
commit 475d54fac3
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/dev/cxgbe/crypto/t4_crypto.c
View File

@ -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, struct cryptoini *cri)
}
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);