crypto:chelsio: Update ntx queue received from cxgb4
Subsystems (5)
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 1/1 crypto:chelsio: Update ntx queue received from cxgb4
Update cxgb4 to send No. of Tx Queue created in lldinfo struct and use the same ntxq in chcr driver.
This patch depends on following commit
commit add92a817e60e308a419693413a38d9d1e663aff
"Fix memory corruption in DMA Mapped buffers"
--- drivers/crypto/chelsio/chcr_algo.c | 3 +-- drivers/crypto/chelsio/chcr_core.c | 2 +- drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.c | 19 +++++++++++++++---- 3 files changed, 17 insertions(+), 7 deletions(-)
drivers/crypto/chelsio/chcr_algo.c +1 -2
@@ -1337,8 +1337,7 @@ static int chcr_device_init(struct chcr_context *ctx) } ctx->dev = u_ctx->dev; adap =padap (ctx->dev); - ntxq =min_not_zero ((unsigned int )u_ctx->lldi.nrxq, - adap->vres.ncrypto_fc); + ntxq = u_ctx->lldi.ntxq; rxq_perchan = u_ctx->lldi.nrxq / u_ctx->lldi.nchan; txq_perchan = ntxq / u_ctx->lldi.nchan;spin_lock (&ctx->dev->lock_chcr_dev);
drivers/crypto/chelsio/chcr_core.c +1 -1
@@ -43,7 +43,7 @@ static chcr_handler_func work_handlers[NUM_CPL_CMDS] = {static struct cxgb4_uld_info chcr_uld_info = { .name =DRV_MODULE_NAME , .nrxq =MAX_ULD_QSETS , - .ntxq =MAX_ULD_QSETS , +/* Max ntxq will be derived from fw config file*/ .rxq_size =1024 , .add = chcr_uld_add, .state_change = chcr_uld_state_change,
drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.c +15 -4
@@ -520,10 +520,19 @@ setup_sge_txq_uld(struct adapter *adap, unsigned int uld_type, txq_info =kzalloc (sizeof (*txq_info),GFP_KERNEL );if (!txq_info)return -ENOMEM ; +if (uld_type ==CXGB4_ULD_CRYPTO ) { + i =min_t (int, adap->vres.ncrypto_fc, +num_online_cpus ()); + txq_info->ntxq =rounddown (i, adap->params.nports); +if (txq_info->ntxq <=0 ) { +dev_warn (adap->pdev_dev,"Crypto Tx Queues can't be zero\n" ); +return -EINVAL ; + } - i =min_t (int, uld_info->ntxq,num_online_cpus ()); - txq_info->ntxq =roundup (i, adap->params.nports); - + }else { + i =min_t (int, uld_info->ntxq,num_online_cpus ()); + txq_info->ntxq =roundup (i, adap->params.nports); + } txq_info->uldtxq =kcalloc (txq_info->ntxq,sizeof (struct sge_uld_txq ),GFP_KERNEL );if (!txq_info->uldtxq) {
@@ -546,11 +555,14 @@ static void uld_queue_init(struct adapter *adap, unsigned int uld_type, struct cxgb4_lld_info *lli) {struct sge_uld_rxq_info *rxq_info = adap->sge.uld_rxq_info[uld_type]; +int tx_uld_type =TX_ULD (uld_type); +struct sge_uld_txq_info *txq_info = adap->sge.uld_txq_info[tx_uld_type]; lli->rxq_ids = rxq_info->rspq_id; lli->nrxq = rxq_info->nrxq; lli->ciq_ids = rxq_info->rspq_id + rxq_info->nrxq; lli->nciq = rxq_info->nciq; + lli->ntxq = txq_info->ntxq; }int t4_uld_mem_alloc (struct adapter *adap)
@@ -634,7 +646,6 @@ static void uld_init(struct adapter *adap, struct cxgb4_lld_info *lld) lld->ports = adap->port; lld->vr = &adap->vres; lld->mtus = adap->params.mtus; - lld->ntxq = adap->sge.ofldqsets; lld->nchan = adap->params.nports; lld->nports = adap->params.nports; lld->wr_cred = adap->params.ofldq_wr_cred;
Signature · 1 line
2.1.4
Hi,
drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.c setup_sge_txq_uld(struct adapter *adap, unsigned int uld_type, · line 530
Quoted 8 lines
drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.c +8
-0+if (uld_type ==CXGB4_ULD_CRYPTO ) { + i =min_t (int, adap->vres.ncrypto_fc, +num_online_cpus ()); + txq_info->ntxq =rounddown (i, adap->params.nports); +if (txq_info->ntxq <=0 ) { +dev_warn (adap->pdev_dev,"Crypto Tx Queues can't be zero\n" ); +return -EINVAL ; + }
Shouldn't we free txq_info in the error case?
Regards,
Lino
Quoted 11 lines · Lino Sanfilippo
Hi,
drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.c setup_sge_txq_uld(struct adapter *adap, unsigned int uld_type, · line 530
Quoted 8 lines
drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.c +8
-0+if (uld_type ==CXGB4_ULD_CRYPTO ) { + i =min_t (int, adap->vres.ncrypto_fc, +num_online_cpus ()); + txq_info->ntxq =rounddown (i, adap->params.nports); +if (txq_info->ntxq <=0 ) { +dev_warn (adap->pdev_dev,"Crypto Tx Queues can't be zero\n" ); +return -EINVAL ; + }Shouldn't we free
txq_infoin the error case?
Yes, Will fix this in V2. Thanks.
Quoted 3 lines
Regards,
Lino