code.ossystems Code Review - meta-freescale.git/blob

   1 From d60b9dbf53d63092fd292c00bb03c250c26703cf Mon Sep 17 00:00:00 2001
   2 From: Yashpal Dutta <yashpal.dutta@freescale.com>
   3 Date: Fri, 7 Mar 2014 08:49:15 +0545
   4 Subject: [PATCH 7/9] RCU stall fixed in PKC asynchronous interface
   5
   6 Upstream-status: Pending
   7
   8 Signed-off-by: Yashpal Dutta <yashpal.dutta@freescale.com>
   9 ---
  10  ioctl.c | 23 +++++++++++------------
  11  main.c  | 43 +++++++++++++++++++++++++++----------------
  12  2 files changed, 38 insertions(+), 28 deletions(-)
  13
  14 diff --git a/ioctl.c b/ioctl.c
  15 index c813c8c..7e4c671 100644
  16 --- a/ioctl.c
  17 +++ b/ioctl.c
  18 @@ -108,10 +108,9 @@ void cryptodev_complete_asym(struct crypto_async_request *req, int err)
  19                 complete(&res->completion);
  20         } else {
  21                 struct crypt_priv *pcr = pkc->priv;
  22 -               unsigned long flags;
  23 -               spin_lock_irqsave(&pcr->completion_lock, flags);
  24 +               spin_lock_bh(&pcr->completion_lock);
  25                 list_add_tail(&pkc->list, &pcr->asym_completed_list);
  26 -               spin_unlock_irqrestore(&pcr->completion_lock, flags);
  27 +               spin_unlock_bh(&pcr->completion_lock);
  28                 /* wake for POLLIN */
  29                 wake_up_interruptible(&pcr->user_waiter);
  30         }
  31 @@ -958,7 +957,7 @@ cryptodev_ioctl(struct file *filp, unsigned int cmd, unsigned long arg_)
  32         case CIOCASYMFEAT:
  33                 return put_user(CRF_MOD_EXP_CRT |  CRF_MOD_EXP | CRF_DSA_SIGN |
  34                         CRF_DSA_VERIFY | CRF_DH_COMPUTE_KEY |
  35 -                       CRF_DSA_GENERATE_KEY, p);
  36 +                       CRF_DSA_GENERATE_KEY | CRF_DH_GENERATE_KEY, p);
  37         case CRIOGET:
  38                 fd = clonefd(filp);
  39                 ret = put_user(fd, p);
  40 @@ -997,7 +996,7 @@ cryptodev_ioctl(struct file *filp, unsigned int cmd, unsigned long arg_)
  41         case CIOCKEY:
  42         {
  43                 struct cryptodev_pkc *pkc =
  44 -                       kzalloc(sizeof(struct cryptodev_pkc), GFP_KERNEL);
  45 +                       kmalloc(sizeof(struct cryptodev_pkc), GFP_KERNEL);
  46
  47                 if (!pkc)
  48                         return -ENOMEM;
  49 @@ -1053,7 +1052,7 @@ cryptodev_ioctl(struct file *filp, unsigned int cmd, unsigned long arg_)
  50         case CIOCASYMASYNCRYPT:
  51         {
  52                 struct cryptodev_pkc *pkc =
  53 -                       kzalloc(sizeof(struct cryptodev_pkc), GFP_KERNEL);
  54 +                       kmalloc(sizeof(struct cryptodev_pkc), GFP_KERNEL);
  55                 ret = kop_from_user(&pkc->kop, arg);
  56
  57                 if (unlikely(ret))
  58 @@ -1070,13 +1069,12 @@ cryptodev_ioctl(struct file *filp, unsigned int cmd, unsigned long arg_)
  59         case CIOCASYMFETCHCOOKIE:
  60         {
  61                 struct cryptodev_pkc *pkc;
  62 -               unsigned long flags;
  63                 int i;
  64                 struct pkc_cookie_list_s cookie_list;
  65
  66 -               spin_lock_irqsave(&pcr->completion_lock, flags);
  67                 cookie_list.cookie_available = 0;
  68                 for (i = 0; i < MAX_COOKIES; i++) {
  69 +                       spin_lock_bh(&pcr->completion_lock);
  70                         if (!list_empty(&pcr->asym_completed_list)) {
  71                                 /* Run a loop in the list for upto  elements
  72                                  and copy their response back */
  73 @@ -1084,6 +1082,7 @@ cryptodev_ioctl(struct file *filp, unsigned int cmd, unsigned long arg_)
  74                                  list_first_entry(&pcr->asym_completed_list,
  75                                                 struct cryptodev_pkc, list);
  76                                 list_del(&pkc->list);
  77 +                               spin_unlock_bh(&pcr->completion_lock);
  78                                 ret = crypto_async_fetch_asym(pkc);
  79                                 if (!ret) {
  80                                         cookie_list.cookie_available++;
  81 @@ -1093,10 +1092,10 @@ cryptodev_ioctl(struct file *filp, unsigned int cmd, unsigned long arg_)
  82                                 }
  83                                 kfree(pkc);
  84                         } else {
  85 +                               spin_unlock_bh(&pcr->completion_lock);
  86                                 break;
  87                         }
  88                 }
  89 -               spin_unlock_irqrestore(&pcr->completion_lock, flags);
  90
  91                 /* Reflect the updated request to user-space */
  92                 if (cookie_list.cookie_available)
  93 @@ -1386,14 +1385,13 @@ cryptodev_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg_)
  94         case COMPAT_CIOCASYMFETCHCOOKIE:
  95         {
  96                 struct cryptodev_pkc *pkc;
  97 -               unsigned long flags;
  98                 int i = 0;
  99                 struct compat_pkc_cookie_list_s cookie_list;
 100
 101 -               spin_lock_irqsave(&pcr->completion_lock, flags);
 102                 cookie_list.cookie_available = 0;
 103
 104                 for (i = 0; i < MAX_COOKIES; i++) {
 105 +                       spin_lock_bh(&pcr->completion_lock);
 106                         if (!list_empty(&pcr->asym_completed_list)) {
 107                                 /* Run a loop in the list for upto  elements
 108                                  and copy their response back */
 109 @@ -1401,6 +1399,7 @@ cryptodev_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg_)
 110                                  list_first_entry(&pcr->asym_completed_list,
 111                                                 struct cryptodev_pkc, list);
 112                                 list_del(&pkc->list);
 113 +                               spin_unlock_bh(&pcr->completion_lock);
 114                                 ret = crypto_async_fetch_asym(pkc);
 115                                 if (!ret) {
 116                                         cookie_list.cookie_available++;
 117 @@ -1409,10 +1408,10 @@ cryptodev_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg_)
 118                                 }
 119                                 kfree(pkc);
 120                         } else {
 121 +                               spin_unlock_bh(&pcr->completion_lock);
 122                                 break;
 123                         }
 124                 }
 125 -               spin_unlock_irqrestore(&pcr->completion_lock, flags);
 126
 127                 /* Reflect the updated request to user-space */
 128                 if (cookie_list.cookie_available)
 129 diff --git a/main.c b/main.c
 130 index c901bc7..2747706 100644
 131 --- a/main.c
 132 +++ b/main.c
 133 @@ -215,7 +215,9 @@ int crypto_kop_dsasign(struct cryptodev_pkc *pkc)
 134                 pkc_req->type = DSA_SIGN;
 135         }
 136
 137 -       buf = kzalloc(buf_size, GFP_DMA);
 138 +       buf = kmalloc(buf_size, GFP_DMA);
 139 +       if (!buf)
 140 +               return -ENOMEM;
 141
 142         dsa_req->q = buf;
 143         dsa_req->r = dsa_req->q + dsa_req->q_len;
 144 @@ -298,7 +300,9 @@ int crypto_kop_dsaverify(struct cryptodev_pkc *pkc)
 145                 pkc_req->type = DSA_VERIFY;
 146         }
 147
 148 -       buf = kzalloc(buf_size, GFP_DMA);
 149 +       buf = kmalloc(buf_size, GFP_DMA);
 150 +       if (!buf)
 151 +               return -ENOMEM;
 152
 153         dsa_req->q = buf;
 154         dsa_req->r = dsa_req->q + dsa_req->q_len;
 155 @@ -378,7 +382,7 @@ int crypto_kop_keygen(struct cryptodev_pkc *pkc)
 156                 pkc_req->curve_type = cop->curve_type;
 157         }
 158
 159 -       buf = kzalloc(buf_size, GFP_DMA);
 160 +       buf = kmalloc(buf_size, GFP_DMA);
 161         if (!buf)
 162                 return -ENOMEM;
 163
 164 @@ -390,25 +394,28 @@ int crypto_kop_keygen(struct cryptodev_pkc *pkc)
 165         copy_from_user(key_req->q, cop->crk_param[0].crp_p, key_req->q_len);
 166         copy_from_user(key_req->r, cop->crk_param[1].crp_p, key_req->r_len);
 167         copy_from_user(key_req->g, cop->crk_param[2].crp_p, key_req->g_len);
 168 -       if (cop->crk_iparams == 3) {
 169 -               copy_from_user(key_req->pub_key, cop->crk_param[3].crp_p,
 170 -                              key_req->pub_key_len);
 171 -               copy_from_user(key_req->priv_key, cop->crk_param[4].crp_p,
 172 -                              key_req->priv_key_len);
 173 -       } else {
 174 +       if (cop->crk_iparams == 4) {
 175                 key_req->ab = key_req->priv_key + key_req->priv_key_len;
 176                 copy_from_user(key_req->ab, cop->crk_param[3].crp_p,
 177                                key_req->ab_len);
 178 -               copy_from_user(key_req->pub_key, cop->crk_param[4].crp_p,
 179 -                              key_req->pub_key_len);
 180 -               copy_from_user(key_req->priv_key, cop->crk_param[5].crp_p,
 181 -                              key_req->priv_key_len);
 182         }
 183
 184         rc = cryptodev_pkc_offload(pkc);
 185         if (pkc->type == SYNCHRONOUS) {
 186                 if (rc)
 187                         goto err;
 188 +
 189 +               if (cop->crk_iparams == 4) {
 190 +                       copy_to_user(cop->crk_param[4].crp_p, key_req->pub_key,
 191 +                                    key_req->pub_key_len);
 192 +                       copy_to_user(cop->crk_param[5].crp_p, key_req->priv_key,
 193 +                                    key_req->priv_key_len);
 194 +               } else {
 195 +                       copy_to_user(cop->crk_param[3].crp_p, key_req->pub_key,
 196 +                                    key_req->pub_key_len);
 197 +                       copy_to_user(cop->crk_param[4].crp_p,
 198 +                                    key_req->priv_key, key_req->priv_key_len);
 199 +               }
 200         } else {
 201                 if (rc != -EINPROGRESS && !rc)
 202                         goto err;
 203 @@ -447,7 +454,9 @@ int crypto_kop_dh_key(struct cryptodev_pkc *pkc)
 204                 pkc_req->type = DH_COMPUTE_KEY;
 205         }
 206         buf_size += dh_req->z_len;
 207 -       buf = kzalloc(buf_size, GFP_DMA);
 208 +       buf = kmalloc(buf_size, GFP_DMA);
 209 +       if (!buf)
 210 +               return -ENOMEM;
 211         dh_req->q = buf;
 212         dh_req->s = dh_req->q + dh_req->q_len;
 213         dh_req->pub_key = dh_req->s + dh_req->s_len;
 214 @@ -508,9 +517,11 @@ int crypto_modexp_crt(struct cryptodev_pkc *pkc)
 215         rsa_req->dq_len = (cop->crk_param[4].crp_nbits + 7)/8;
 216         rsa_req->c_len = (cop->crk_param[5].crp_nbits + 7)/8;
 217         rsa_req->f_len = (cop->crk_param[6].crp_nbits + 7)/8;
 218 -       buf = kzalloc(rsa_req->p_len + rsa_req->q_len + rsa_req->f_len +
 219 +       buf = kmalloc(rsa_req->p_len + rsa_req->q_len + rsa_req->f_len +
 220                       rsa_req->dp_len + rsa_req->dp_len + rsa_req->c_len +
 221                       rsa_req->g_len, GFP_DMA);
 222 +       if (!buf)
 223 +               return -ENOMEM;
 224         rsa_req->p = buf;
 225         rsa_req->q = rsa_req->p + rsa_req->p_len;
 226         rsa_req->g = rsa_req->q + rsa_req->q_len;
 227 @@ -563,7 +574,7 @@ int crypto_bn_modexp(struct cryptodev_pkc *pkc)
 228         rsa_req->e_len = (cop->crk_param[1].crp_nbits + 7)/8;
 229         rsa_req->n_len = (cop->crk_param[2].crp_nbits + 7)/8;
 230         rsa_req->g_len = (cop->crk_param[3].crp_nbits + 7)/8;
 231 -       buf = kzalloc(rsa_req->f_len + rsa_req->e_len + rsa_req->n_len
 232 +       buf = kmalloc(rsa_req->f_len + rsa_req->e_len + rsa_req->n_len
 233                         + rsa_req->g_len, GFP_DMA);
 234         if (!buf)
 235                 return -ENOMEM;
 236 --
 237 1.8.3.1
 238