chcr - Add debug counters

Count types of operation done by HW.

Signed-off-by: Harsh Jain <harsh@chelsio.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/chelsio/chcr_algo.c b/drivers/crypto/chelsio/chcr_algo.c
index 03b817f185dd1a7c619241fc57d2c10af3247ddd..2f388af232ee9464aae731a4f21a55d9ec360e4d 100644 (file)
--- a/drivers/crypto/chelsio/chcr_algo.c
+++ b/drivers/crypto/chelsio/chcr_algo.c
@@ -154,6 +154,7 @@ int chcr_handle_resp(struct crypto_async_request *req, unsigned char *input,
        struct uld_ctx *u_ctx = ULD_CTX(ctx);
        struct chcr_req_ctx ctx_req;
        unsigned int digestsize, updated_digestsize;
+       struct adapter *adap = padap(ctx->dev);
 
        switch (tfm->__crt_alg->cra_flags & CRYPTO_ALG_TYPE_MASK) {
        case CRYPTO_ALG_TYPE_AEAD:
@@ -207,6 +208,7 @@ int chcr_handle_resp(struct crypto_async_request *req, unsigned char *input,
                ctx_req.req.ahash_req->base.complete(req, err);
                break;
        }
+       atomic_inc(&adap->chcr_stats.complete);
        return err;
 }
 
@@ -639,6 +641,7 @@ static struct sk_buff *create_cipher_wr(struct cipher_wr_param *wrparam)
        unsigned int ivsize = AES_BLOCK_SIZE, kctx_len;
        gfp_t flags = wrparam->req->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP ?
                        GFP_KERNEL : GFP_ATOMIC;
+       struct adapter *adap = padap(ctx->dev);
 
        phys_dsgl = get_space_for_phys_dsgl(reqctx->dst_nents);
 
@@ -701,6 +704,7 @@ static struct sk_buff *create_cipher_wr(struct cipher_wr_param *wrparam)
        skb_set_transport_header(skb, transhdr_len);
        write_buffer_to_skb(skb, &frags, reqctx->iv, ivsize);
        write_sg_to_skb(skb, &frags, wrparam->srcsg, wrparam->bytes);
+       atomic_inc(&adap->chcr_stats.cipher_rqst);
        create_wreq(ctx, chcr_req, &(wrparam->req->base), skb, kctx_len, 0, 1,
                        sizeof(struct cpl_rx_phys_dsgl) + phys_dsgl,
                        ablkctx->ciph_mode == CHCR_SCMD_CIPHER_MODE_AES_CBC);
@@ -1337,6 +1341,7 @@ static struct sk_buff *create_hash_wr(struct ahash_request *req,
        u8 hash_size_in_response = 0;
        gfp_t flags = req->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP ? GFP_KERNEL :
                GFP_ATOMIC;
+       struct adapter *adap = padap(ctx->dev);
 
        iopad_alignment = KEYCTX_ALIGN_PAD(digestsize);
        kctx_len = param->alg_prm.result_size + iopad_alignment;
@@ -1393,7 +1398,7 @@ static struct sk_buff *create_hash_wr(struct ahash_request *req,
                                    param->bfr_len);
        if (param->sg_len != 0)
                write_sg_to_skb(skb, &frags, req->src, param->sg_len);
-
+       atomic_inc(&adap->chcr_stats.digest_rqst);
        create_wreq(ctx, chcr_req, &req->base, skb, kctx_len,
                    hash_size_in_response, 0, DUMMY_BYTES, 0);
        req_ctx->skb = skb;
@@ -1873,6 +1878,7 @@ static struct sk_buff *create_authenc_wr(struct aead_request *req,
        int null = 0;
        gfp_t flags = req->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP ? GFP_KERNEL :
                GFP_ATOMIC;
+       struct adapter *adap = padap(ctx->dev);
 
        if (aeadctx->enckey_len == 0 || (req->cryptlen == 0))
                goto err;
@@ -1911,6 +1917,7 @@ static struct sk_buff *create_authenc_wr(struct aead_request *req,
                        T6_MAX_AAD_SIZE,
                        transhdr_len + (sgl_len(src_nent + MIN_AUTH_SG) * 8),
                                op_type)) {
+               atomic_inc(&adap->chcr_stats.fallback);
                return ERR_PTR(chcr_aead_fallback(req, op_type));
        }
        skb = alloc_skb((transhdr_len + sizeof(struct sge_opaque_hdr)), flags);
@@ -1983,6 +1990,7 @@ static struct sk_buff *create_authenc_wr(struct aead_request *req,
        }
        write_buffer_to_skb(skb, &frags, req->iv, ivsize);
        write_sg_to_skb(skb, &frags, src, req->cryptlen);
+       atomic_inc(&adap->chcr_stats.cipher_rqst);
        create_wreq(ctx, chcr_req, &req->base, skb, kctx_len, size, 1,
                   sizeof(struct cpl_rx_phys_dsgl) + dst_size, 0);
        reqctx->skb = skb;
@@ -2206,6 +2214,7 @@ static struct sk_buff *create_aead_ccm_wr(struct aead_request *req,
        int error = -EINVAL, src_nent;
        gfp_t flags = req->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP ? GFP_KERNEL :
                GFP_ATOMIC;
+       struct adapter *adap = padap(ctx->dev);
 
 
        if (op_type && req->cryptlen < crypto_aead_authsize(tfm))
@@ -2245,6 +2254,7 @@ static struct sk_buff *create_aead_ccm_wr(struct aead_request *req,
                            T6_MAX_AAD_SIZE - 18,
                            transhdr_len + (sgl_len(src_nent + MIN_CCM_SG) * 8),
                            op_type)) {
+               atomic_inc(&adap->chcr_stats.fallback);
                return ERR_PTR(chcr_aead_fallback(req, op_type));
        }
 
@@ -2282,6 +2292,7 @@ static struct sk_buff *create_aead_ccm_wr(struct aead_request *req,
 
        skb_set_transport_header(skb, transhdr_len);
        frags = fill_aead_req_fields(skb, req, src, ivsize, aeadctx);
+       atomic_inc(&adap->chcr_stats.aead_rqst);
        create_wreq(ctx, chcr_req, &req->base, skb, kctx_len, 0, 1,
                    sizeof(struct cpl_rx_phys_dsgl) + dst_size, 0);
        reqctx->skb = skb;
@@ -2316,6 +2327,7 @@ static struct sk_buff *create_gcm_wr(struct aead_request *req,
        int error = -EINVAL, src_nent;
        gfp_t flags = req->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP ? GFP_KERNEL :
                GFP_ATOMIC;
+       struct adapter *adap = padap(ctx->dev);
 
        /* validate key size */
        if (aeadctx->enckey_len == 0)
@@ -2355,6 +2367,7 @@ static struct sk_buff *create_gcm_wr(struct aead_request *req,
                            T6_MAX_AAD_SIZE,
                            transhdr_len + (sgl_len(src_nent + MIN_GCM_SG) * 8),
                            op_type)) {
+               atomic_inc(&adap->chcr_stats.fallback);
                return ERR_PTR(chcr_aead_fallback(req, op_type));
        }
        skb = alloc_skb((transhdr_len + sizeof(struct sge_opaque_hdr)), flags);
@@ -2421,6 +2434,7 @@ static struct sk_buff *create_gcm_wr(struct aead_request *req,
        write_sg_to_skb(skb, &frags, req->src, assoclen);
        write_buffer_to_skb(skb, &frags, reqctx->iv, ivsize);
        write_sg_to_skb(skb, &frags, src, req->cryptlen);
+       atomic_inc(&adap->chcr_stats.aead_rqst);
        create_wreq(ctx, chcr_req, &req->base, skb, kctx_len, size, 1,
                        sizeof(struct cpl_rx_phys_dsgl) + dst_size,
                        reqctx->verify);

diff --git a/drivers/crypto/chelsio/chcr_core.c b/drivers/crypto/chelsio/chcr_core.c
index a6c938a913c799ba28ee667d6b6ac227046e33d7..5ae659af6a901eaebaa4d9fe4853497162c593df 100644 (file)
--- a/drivers/crypto/chelsio/chcr_core.c
+++ b/drivers/crypto/chelsio/chcr_core.c
@@ -100,6 +100,7 @@ static int cpl_fw6_pld_handler(struct chcr_dev *dev,
        struct cpl_fw6_pld *fw6_pld;
        u32 ack_err_status = 0;
        int error_status = 0;
+       struct adapter *adap = padap(dev);
 
        fw6_pld = (struct cpl_fw6_pld *)input;
        req = (struct crypto_async_request *)(uintptr_t)be64_to_cpu(
@@ -111,6 +112,7 @@ static int cpl_fw6_pld_handler(struct chcr_dev *dev,
                if (CHK_MAC_ERR_BIT(ack_err_status) ||
                    CHK_PAD_ERR_BIT(ack_err_status))
                        error_status = -EBADMSG;
+               atomic_inc(&adap->chcr_stats.error);
        }
        /* call completion callback with failure status */
        if (req) {

diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h b/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
index e88c1808e46f06e77671224d3a6a5edeb18ebc0d..b32eb8c7c1e3f31a75a4fd7dba48c44640059ac1 100644 (file)
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
@@ -868,6 +868,7 @@ struct adapter {
 
        /* TC u32 offload */
        struct cxgb4_tc_u32_table *tc_u32;
+       struct chcr_stats_debug chcr_stats;
 };
 
 /* Support for "sched-class" command to allow a TX Scheduling Class to be

diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c
index 1fa34b009891ba93269c27da4c48a55f4b150b68..77a59d7db7f5add39918d8cb1c4af51bd74d30bc 100644 (file)
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c
@@ -3069,6 +3069,40 @@ static const struct file_operations meminfo_fops = {
        .llseek  = seq_lseek,
        .release = single_release,
 };
+
+static int chcr_show(struct seq_file *seq, void *v)
+{
+       struct adapter *adap = seq->private;
+
+       seq_puts(seq, "Chelsio Crypto Accelerator Stats \n");
+       seq_printf(seq, "Cipher Ops: %10u \n",
+                  atomic_read(&adap->chcr_stats.cipher_rqst));
+       seq_printf(seq, "Digest Ops: %10u \n",
+                  atomic_read(&adap->chcr_stats.digest_rqst));
+       seq_printf(seq, "Aead Ops: %10u \n",
+                  atomic_read(&adap->chcr_stats.aead_rqst));
+       seq_printf(seq, "Completion: %10u \n",
+                  atomic_read(&adap->chcr_stats.complete));
+       seq_printf(seq, "Error: %10u \n",
+                  atomic_read(&adap->chcr_stats.error));
+       seq_printf(seq, "Fallback: %10u \n",
+                  atomic_read(&adap->chcr_stats.fallback));
+       return 0;
+}
+
+
+static int chcr_stats_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, chcr_show, inode->i_private);
+}
+
+static const struct file_operations chcr_stats_debugfs_fops = {
+        .owner   = THIS_MODULE,
+        .open    = chcr_stats_open,
+        .read    = seq_read,
+        .llseek  = seq_lseek,
+        .release = single_release,
+};
 /* Add an array of Debug FS files.
  */
 void add_debugfs_files(struct adapter *adap,
@@ -3143,6 +3177,7 @@ int t4_setup_debugfs(struct adapter *adap)
                { "tids", &tid_info_debugfs_fops, S_IRUSR, 0},
                { "blocked_fl", &blocked_fl_fops, S_IRUSR | S_IWUSR, 0 },
                { "meminfo", &meminfo_fops, S_IRUSR, 0 },
+               { "crypto", &chcr_stats_debugfs_fops, S_IRUSR, 0 },
        };
 
        /* Debug FS nodes common to all T5 and later adapters.

diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h
index 6e74040af49af41fb9aa4065cc2152983f9c7ae5..35f4d9f6382be402146046f3d7f5dd5946154b74 100644 (file)
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h
@@ -275,6 +275,15 @@ struct cxgb4_virt_res {                      /* virtualized HW resources */
        unsigned int ncrypto_fc;
 };
 
+struct chcr_stats_debug {
+       atomic_t cipher_rqst;
+       atomic_t digest_rqst;
+       atomic_t aead_rqst;
+       atomic_t complete;
+       atomic_t error;
+       atomic_t fallback;
+};
+
 #define OCQ_WIN_OFFSET(pdev, vres) \
        (pci_resource_len((pdev), 2) - roundup_pow_of_two((vres)->ocq.size))