1 // SPDX-License-Identifier: GPL-2.0-only 1 // SPDX-License-Identifier: GPL-2.0-only
2 /* 2 /*
3 * pcrypt - Parallel crypto wrapper. 3 * pcrypt - Parallel crypto wrapper.
4 * 4 *
5 * Copyright (C) 2009 secunet Security Network 5 * Copyright (C) 2009 secunet Security Networks AG
6 * Copyright (C) 2009 Steffen Klassert <steffe 6 * Copyright (C) 2009 Steffen Klassert <steffen.klassert@secunet.com>
7 */ 7 */
8 8
9 #include <crypto/algapi.h> 9 #include <crypto/algapi.h>
10 #include <crypto/internal/aead.h> 10 #include <crypto/internal/aead.h>
11 #include <linux/atomic.h> 11 #include <linux/atomic.h>
12 #include <linux/err.h> 12 #include <linux/err.h>
13 #include <linux/init.h> 13 #include <linux/init.h>
14 #include <linux/module.h> 14 #include <linux/module.h>
15 #include <linux/slab.h> 15 #include <linux/slab.h>
>> 16 #include <linux/notifier.h>
16 #include <linux/kobject.h> 17 #include <linux/kobject.h>
17 #include <linux/cpu.h> 18 #include <linux/cpu.h>
18 #include <crypto/pcrypt.h> 19 #include <crypto/pcrypt.h>
19 20
20 static struct padata_instance *pencrypt; !! 21 struct padata_pcrypt {
21 static struct padata_instance *pdecrypt; !! 22 struct padata_instance *pinst;
>> 23 struct workqueue_struct *wq;
>> 24
>> 25 /*
>> 26 * Cpumask for callback CPUs. It should be
>> 27 * equal to serial cpumask of corresponding padata instance,
>> 28 * so it is updated when padata notifies us about serial
>> 29 * cpumask change.
>> 30 *
>> 31 * cb_cpumask is protected by RCU. This fact prevents us from
>> 32 * using cpumask_var_t directly because the actual type of
>> 33 * cpumsak_var_t depends on kernel configuration(particularly on
>> 34 * CONFIG_CPUMASK_OFFSTACK macro). Depending on the configuration
>> 35 * cpumask_var_t may be either a pointer to the struct cpumask
>> 36 * or a variable allocated on the stack. Thus we can not safely use
>> 37 * cpumask_var_t with RCU operations such as rcu_assign_pointer or
>> 38 * rcu_dereference. So cpumask_var_t is wrapped with struct
>> 39 * pcrypt_cpumask which makes possible to use it with RCU.
>> 40 */
>> 41 struct pcrypt_cpumask {
>> 42 cpumask_var_t mask;
>> 43 } *cb_cpumask;
>> 44 struct notifier_block nblock;
>> 45 };
>> 46
>> 47 static struct padata_pcrypt pencrypt;
>> 48 static struct padata_pcrypt pdecrypt;
22 static struct kset *pcrypt_kset; 49 static struct kset *pcrypt_kset;
23 50
24 struct pcrypt_instance_ctx { 51 struct pcrypt_instance_ctx {
25 struct crypto_aead_spawn spawn; 52 struct crypto_aead_spawn spawn;
26 struct padata_shell *psenc; <<
27 struct padata_shell *psdec; <<
28 atomic_t tfm_count; 53 atomic_t tfm_count;
29 }; 54 };
30 55
31 struct pcrypt_aead_ctx { 56 struct pcrypt_aead_ctx {
32 struct crypto_aead *child; 57 struct crypto_aead *child;
33 unsigned int cb_cpu; 58 unsigned int cb_cpu;
34 }; 59 };
35 60
36 static inline struct pcrypt_instance_ctx *pcry !! 61 static int pcrypt_do_parallel(struct padata_priv *padata, unsigned int *cb_cpu,
37 struct crypto_aead *tfm) !! 62 struct padata_pcrypt *pcrypt)
38 { 63 {
39 return aead_instance_ctx(aead_alg_inst !! 64 unsigned int cpu_index, cpu, i;
>> 65 struct pcrypt_cpumask *cpumask;
>> 66
>> 67 cpu = *cb_cpu;
>> 68
>> 69 rcu_read_lock_bh();
>> 70 cpumask = rcu_dereference_bh(pcrypt->cb_cpumask);
>> 71 if (cpumask_test_cpu(cpu, cpumask->mask))
>> 72 goto out;
>> 73
>> 74 if (!cpumask_weight(cpumask->mask))
>> 75 goto out;
>> 76
>> 77 cpu_index = cpu % cpumask_weight(cpumask->mask);
>> 78
>> 79 cpu = cpumask_first(cpumask->mask);
>> 80 for (i = 0; i < cpu_index; i++)
>> 81 cpu = cpumask_next(cpu, cpumask->mask);
>> 82
>> 83 *cb_cpu = cpu;
>> 84
>> 85 out:
>> 86 rcu_read_unlock_bh();
>> 87 return padata_do_parallel(pcrypt->pinst, padata, cpu);
40 } 88 }
41 89
42 static int pcrypt_aead_setkey(struct crypto_ae 90 static int pcrypt_aead_setkey(struct crypto_aead *parent,
43 const u8 *key, u 91 const u8 *key, unsigned int keylen)
44 { 92 {
45 struct pcrypt_aead_ctx *ctx = crypto_a 93 struct pcrypt_aead_ctx *ctx = crypto_aead_ctx(parent);
46 94
47 return crypto_aead_setkey(ctx->child, 95 return crypto_aead_setkey(ctx->child, key, keylen);
48 } 96 }
49 97
50 static int pcrypt_aead_setauthsize(struct cryp 98 static int pcrypt_aead_setauthsize(struct crypto_aead *parent,
51 unsigned in 99 unsigned int authsize)
52 { 100 {
53 struct pcrypt_aead_ctx *ctx = crypto_a 101 struct pcrypt_aead_ctx *ctx = crypto_aead_ctx(parent);
54 102
55 return crypto_aead_setauthsize(ctx->ch 103 return crypto_aead_setauthsize(ctx->child, authsize);
56 } 104 }
57 105
58 static void pcrypt_aead_serial(struct padata_p 106 static void pcrypt_aead_serial(struct padata_priv *padata)
59 { 107 {
60 struct pcrypt_request *preq = pcrypt_p 108 struct pcrypt_request *preq = pcrypt_padata_request(padata);
61 struct aead_request *req = pcrypt_requ 109 struct aead_request *req = pcrypt_request_ctx(preq);
62 110
63 aead_request_complete(req->base.data, 111 aead_request_complete(req->base.data, padata->info);
64 } 112 }
65 113
66 static void pcrypt_aead_done(void *data, int e !! 114 static void pcrypt_aead_done(struct crypto_async_request *areq, int err)
67 { 115 {
68 struct aead_request *req = data; !! 116 struct aead_request *req = areq->data;
69 struct pcrypt_request *preq = aead_req 117 struct pcrypt_request *preq = aead_request_ctx(req);
70 struct padata_priv *padata = pcrypt_re 118 struct padata_priv *padata = pcrypt_request_padata(preq);
71 119
72 padata->info = err; 120 padata->info = err;
>> 121 req->base.flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP;
73 122
74 padata_do_serial(padata); 123 padata_do_serial(padata);
75 } 124 }
76 125
77 static void pcrypt_aead_enc(struct padata_priv 126 static void pcrypt_aead_enc(struct padata_priv *padata)
78 { 127 {
79 struct pcrypt_request *preq = pcrypt_p 128 struct pcrypt_request *preq = pcrypt_padata_request(padata);
80 struct aead_request *req = pcrypt_requ 129 struct aead_request *req = pcrypt_request_ctx(preq);
81 int ret; <<
82 130
83 ret = crypto_aead_encrypt(req); !! 131 padata->info = crypto_aead_encrypt(req);
84 132
85 if (ret == -EINPROGRESS) !! 133 if (padata->info == -EINPROGRESS)
86 return; 134 return;
87 135
88 padata->info = ret; <<
89 padata_do_serial(padata); 136 padata_do_serial(padata);
90 } 137 }
91 138
92 static int pcrypt_aead_encrypt(struct aead_req 139 static int pcrypt_aead_encrypt(struct aead_request *req)
93 { 140 {
94 int err; 141 int err;
95 struct pcrypt_request *preq = aead_req 142 struct pcrypt_request *preq = aead_request_ctx(req);
96 struct aead_request *creq = pcrypt_req 143 struct aead_request *creq = pcrypt_request_ctx(preq);
97 struct padata_priv *padata = pcrypt_re 144 struct padata_priv *padata = pcrypt_request_padata(preq);
98 struct crypto_aead *aead = crypto_aead 145 struct crypto_aead *aead = crypto_aead_reqtfm(req);
99 struct pcrypt_aead_ctx *ctx = crypto_a 146 struct pcrypt_aead_ctx *ctx = crypto_aead_ctx(aead);
100 u32 flags = aead_request_flags(req); 147 u32 flags = aead_request_flags(req);
101 struct pcrypt_instance_ctx *ictx; <<
102 <<
103 ictx = pcrypt_tfm_ictx(aead); <<
104 148
105 memset(padata, 0, sizeof(struct padata 149 memset(padata, 0, sizeof(struct padata_priv));
106 150
107 padata->parallel = pcrypt_aead_enc; 151 padata->parallel = pcrypt_aead_enc;
108 padata->serial = pcrypt_aead_serial; 152 padata->serial = pcrypt_aead_serial;
109 153
110 aead_request_set_tfm(creq, ctx->child) 154 aead_request_set_tfm(creq, ctx->child);
111 aead_request_set_callback(creq, flags 155 aead_request_set_callback(creq, flags & ~CRYPTO_TFM_REQ_MAY_SLEEP,
112 pcrypt_aead_ 156 pcrypt_aead_done, req);
113 aead_request_set_crypt(creq, req->src, 157 aead_request_set_crypt(creq, req->src, req->dst,
114 req->cryptlen, 158 req->cryptlen, req->iv);
115 aead_request_set_ad(creq, req->assocle 159 aead_request_set_ad(creq, req->assoclen);
116 160
117 err = padata_do_parallel(ictx->psenc, !! 161 err = pcrypt_do_parallel(padata, &ctx->cb_cpu, &pencrypt);
118 if (!err) 162 if (!err)
119 return -EINPROGRESS; 163 return -EINPROGRESS;
120 if (err == -EBUSY) <<
121 return -EAGAIN; <<
122 164
123 return err; 165 return err;
124 } 166 }
125 167
126 static void pcrypt_aead_dec(struct padata_priv 168 static void pcrypt_aead_dec(struct padata_priv *padata)
127 { 169 {
128 struct pcrypt_request *preq = pcrypt_p 170 struct pcrypt_request *preq = pcrypt_padata_request(padata);
129 struct aead_request *req = pcrypt_requ 171 struct aead_request *req = pcrypt_request_ctx(preq);
130 int ret; <<
131 172
132 ret = crypto_aead_decrypt(req); !! 173 padata->info = crypto_aead_decrypt(req);
133 174
134 if (ret == -EINPROGRESS) !! 175 if (padata->info == -EINPROGRESS)
135 return; 176 return;
136 177
137 padata->info = ret; <<
138 padata_do_serial(padata); 178 padata_do_serial(padata);
139 } 179 }
140 180
141 static int pcrypt_aead_decrypt(struct aead_req 181 static int pcrypt_aead_decrypt(struct aead_request *req)
142 { 182 {
143 int err; 183 int err;
144 struct pcrypt_request *preq = aead_req 184 struct pcrypt_request *preq = aead_request_ctx(req);
145 struct aead_request *creq = pcrypt_req 185 struct aead_request *creq = pcrypt_request_ctx(preq);
146 struct padata_priv *padata = pcrypt_re 186 struct padata_priv *padata = pcrypt_request_padata(preq);
147 struct crypto_aead *aead = crypto_aead 187 struct crypto_aead *aead = crypto_aead_reqtfm(req);
148 struct pcrypt_aead_ctx *ctx = crypto_a 188 struct pcrypt_aead_ctx *ctx = crypto_aead_ctx(aead);
149 u32 flags = aead_request_flags(req); 189 u32 flags = aead_request_flags(req);
150 struct pcrypt_instance_ctx *ictx; <<
151 <<
152 ictx = pcrypt_tfm_ictx(aead); <<
153 190
154 memset(padata, 0, sizeof(struct padata 191 memset(padata, 0, sizeof(struct padata_priv));
155 192
156 padata->parallel = pcrypt_aead_dec; 193 padata->parallel = pcrypt_aead_dec;
157 padata->serial = pcrypt_aead_serial; 194 padata->serial = pcrypt_aead_serial;
158 195
159 aead_request_set_tfm(creq, ctx->child) 196 aead_request_set_tfm(creq, ctx->child);
160 aead_request_set_callback(creq, flags 197 aead_request_set_callback(creq, flags & ~CRYPTO_TFM_REQ_MAY_SLEEP,
161 pcrypt_aead_ 198 pcrypt_aead_done, req);
162 aead_request_set_crypt(creq, req->src, 199 aead_request_set_crypt(creq, req->src, req->dst,
163 req->cryptlen, 200 req->cryptlen, req->iv);
164 aead_request_set_ad(creq, req->assocle 201 aead_request_set_ad(creq, req->assoclen);
165 202
166 err = padata_do_parallel(ictx->psdec, !! 203 err = pcrypt_do_parallel(padata, &ctx->cb_cpu, &pdecrypt);
167 if (!err) 204 if (!err)
168 return -EINPROGRESS; 205 return -EINPROGRESS;
169 if (err == -EBUSY) <<
170 return -EAGAIN; <<
171 206
172 return err; 207 return err;
173 } 208 }
174 209
175 static int pcrypt_aead_init_tfm(struct crypto_ 210 static int pcrypt_aead_init_tfm(struct crypto_aead *tfm)
176 { 211 {
177 int cpu, cpu_index; 212 int cpu, cpu_index;
178 struct aead_instance *inst = aead_alg_ 213 struct aead_instance *inst = aead_alg_instance(tfm);
179 struct pcrypt_instance_ctx *ictx = aea 214 struct pcrypt_instance_ctx *ictx = aead_instance_ctx(inst);
180 struct pcrypt_aead_ctx *ctx = crypto_a 215 struct pcrypt_aead_ctx *ctx = crypto_aead_ctx(tfm);
181 struct crypto_aead *cipher; 216 struct crypto_aead *cipher;
182 217
183 cpu_index = (unsigned int)atomic_inc_r 218 cpu_index = (unsigned int)atomic_inc_return(&ictx->tfm_count) %
184 cpumask_weight(cpu_online_ 219 cpumask_weight(cpu_online_mask);
185 220
186 ctx->cb_cpu = cpumask_first(cpu_online 221 ctx->cb_cpu = cpumask_first(cpu_online_mask);
187 for (cpu = 0; cpu < cpu_index; cpu++) 222 for (cpu = 0; cpu < cpu_index; cpu++)
188 ctx->cb_cpu = cpumask_next(ctx 223 ctx->cb_cpu = cpumask_next(ctx->cb_cpu, cpu_online_mask);
189 224
190 cipher = crypto_spawn_aead(&ictx->spaw 225 cipher = crypto_spawn_aead(&ictx->spawn);
191 226
192 if (IS_ERR(cipher)) 227 if (IS_ERR(cipher))
193 return PTR_ERR(cipher); 228 return PTR_ERR(cipher);
194 229
195 ctx->child = cipher; 230 ctx->child = cipher;
196 crypto_aead_set_reqsize(tfm, sizeof(st 231 crypto_aead_set_reqsize(tfm, sizeof(struct pcrypt_request) +
197 sizeof(st 232 sizeof(struct aead_request) +
198 crypto_ae 233 crypto_aead_reqsize(cipher));
199 234
200 return 0; 235 return 0;
201 } 236 }
202 237
203 static void pcrypt_aead_exit_tfm(struct crypto 238 static void pcrypt_aead_exit_tfm(struct crypto_aead *tfm)
204 { 239 {
205 struct pcrypt_aead_ctx *ctx = crypto_a 240 struct pcrypt_aead_ctx *ctx = crypto_aead_ctx(tfm);
206 241
207 crypto_free_aead(ctx->child); 242 crypto_free_aead(ctx->child);
208 } 243 }
209 244
210 static void pcrypt_free(struct aead_instance * 245 static void pcrypt_free(struct aead_instance *inst)
211 { 246 {
212 struct pcrypt_instance_ctx *ctx = aead 247 struct pcrypt_instance_ctx *ctx = aead_instance_ctx(inst);
213 248
214 crypto_drop_aead(&ctx->spawn); 249 crypto_drop_aead(&ctx->spawn);
215 padata_free_shell(ctx->psdec); <<
216 padata_free_shell(ctx->psenc); <<
217 kfree(inst); 250 kfree(inst);
218 } 251 }
219 252
220 static int pcrypt_init_instance(struct crypto_ 253 static int pcrypt_init_instance(struct crypto_instance *inst,
221 struct crypto_ 254 struct crypto_alg *alg)
222 { 255 {
223 if (snprintf(inst->alg.cra_driver_name 256 if (snprintf(inst->alg.cra_driver_name, CRYPTO_MAX_ALG_NAME,
224 "pcrypt(%s)", alg->cra_dr 257 "pcrypt(%s)", alg->cra_driver_name) >= CRYPTO_MAX_ALG_NAME)
225 return -ENAMETOOLONG; 258 return -ENAMETOOLONG;
226 259
227 memcpy(inst->alg.cra_name, alg->cra_na 260 memcpy(inst->alg.cra_name, alg->cra_name, CRYPTO_MAX_ALG_NAME);
228 261
229 inst->alg.cra_priority = alg->cra_prio 262 inst->alg.cra_priority = alg->cra_priority + 100;
230 inst->alg.cra_blocksize = alg->cra_blo 263 inst->alg.cra_blocksize = alg->cra_blocksize;
231 inst->alg.cra_alignmask = alg->cra_ali 264 inst->alg.cra_alignmask = alg->cra_alignmask;
232 265
233 return 0; 266 return 0;
234 } 267 }
235 268
236 static int pcrypt_create_aead(struct crypto_te 269 static int pcrypt_create_aead(struct crypto_template *tmpl, struct rtattr **tb,
237 struct crypto_at !! 270 u32 type, u32 mask)
238 { 271 {
239 struct pcrypt_instance_ctx *ctx; 272 struct pcrypt_instance_ctx *ctx;
>> 273 struct crypto_attr_type *algt;
240 struct aead_instance *inst; 274 struct aead_instance *inst;
241 struct aead_alg *alg; 275 struct aead_alg *alg;
242 u32 mask = crypto_algt_inherited_mask( !! 276 const char *name;
243 int err; 277 int err;
244 278
>> 279 algt = crypto_get_attr_type(tb);
>> 280 if (IS_ERR(algt))
>> 281 return PTR_ERR(algt);
>> 282
>> 283 name = crypto_attr_alg_name(tb[1]);
>> 284 if (IS_ERR(name))
>> 285 return PTR_ERR(name);
>> 286
245 inst = kzalloc(sizeof(*inst) + sizeof( 287 inst = kzalloc(sizeof(*inst) + sizeof(*ctx), GFP_KERNEL);
246 if (!inst) 288 if (!inst)
247 return -ENOMEM; 289 return -ENOMEM;
248 290
249 err = -ENOMEM; <<
250 <<
251 ctx = aead_instance_ctx(inst); 291 ctx = aead_instance_ctx(inst);
252 ctx->psenc = padata_alloc_shell(pencry !! 292 crypto_set_aead_spawn(&ctx->spawn, aead_crypto_instance(inst));
253 if (!ctx->psenc) <<
254 goto err_free_inst; <<
255 <<
256 ctx->psdec = padata_alloc_shell(pdecry <<
257 if (!ctx->psdec) <<
258 goto err_free_inst; <<
259 293
260 err = crypto_grab_aead(&ctx->spawn, ae !! 294 err = crypto_grab_aead(&ctx->spawn, name, 0, 0);
261 crypto_attr_alg <<
262 if (err) 295 if (err)
263 goto err_free_inst; !! 296 goto out_free_inst;
264 297
265 alg = crypto_spawn_aead_alg(&ctx->spaw 298 alg = crypto_spawn_aead_alg(&ctx->spawn);
266 err = pcrypt_init_instance(aead_crypto 299 err = pcrypt_init_instance(aead_crypto_instance(inst), &alg->base);
267 if (err) 300 if (err)
268 goto err_free_inst; !! 301 goto out_drop_aead;
269 302
270 inst->alg.base.cra_flags |= CRYPTO_ALG !! 303 inst->alg.base.cra_flags = CRYPTO_ALG_ASYNC;
271 304
272 inst->alg.ivsize = crypto_aead_alg_ivs 305 inst->alg.ivsize = crypto_aead_alg_ivsize(alg);
273 inst->alg.maxauthsize = crypto_aead_al 306 inst->alg.maxauthsize = crypto_aead_alg_maxauthsize(alg);
274 307
275 inst->alg.base.cra_ctxsize = sizeof(st 308 inst->alg.base.cra_ctxsize = sizeof(struct pcrypt_aead_ctx);
276 309
277 inst->alg.init = pcrypt_aead_init_tfm; 310 inst->alg.init = pcrypt_aead_init_tfm;
278 inst->alg.exit = pcrypt_aead_exit_tfm; 311 inst->alg.exit = pcrypt_aead_exit_tfm;
279 312
280 inst->alg.setkey = pcrypt_aead_setkey; 313 inst->alg.setkey = pcrypt_aead_setkey;
281 inst->alg.setauthsize = pcrypt_aead_se 314 inst->alg.setauthsize = pcrypt_aead_setauthsize;
282 inst->alg.encrypt = pcrypt_aead_encryp 315 inst->alg.encrypt = pcrypt_aead_encrypt;
283 inst->alg.decrypt = pcrypt_aead_decryp 316 inst->alg.decrypt = pcrypt_aead_decrypt;
284 317
285 inst->free = pcrypt_free; 318 inst->free = pcrypt_free;
286 319
287 err = aead_register_instance(tmpl, ins 320 err = aead_register_instance(tmpl, inst);
288 if (err) { !! 321 if (err)
289 err_free_inst: !! 322 goto out_drop_aead;
290 pcrypt_free(inst); !! 323
291 } !! 324 out:
292 return err; 325 return err;
>> 326
>> 327 out_drop_aead:
>> 328 crypto_drop_aead(&ctx->spawn);
>> 329 out_free_inst:
>> 330 kfree(inst);
>> 331 goto out;
293 } 332 }
294 333
295 static int pcrypt_create(struct crypto_templat 334 static int pcrypt_create(struct crypto_template *tmpl, struct rtattr **tb)
296 { 335 {
297 struct crypto_attr_type *algt; 336 struct crypto_attr_type *algt;
298 337
299 algt = crypto_get_attr_type(tb); 338 algt = crypto_get_attr_type(tb);
300 if (IS_ERR(algt)) 339 if (IS_ERR(algt))
301 return PTR_ERR(algt); 340 return PTR_ERR(algt);
302 341
303 switch (algt->type & algt->mask & CRYP 342 switch (algt->type & algt->mask & CRYPTO_ALG_TYPE_MASK) {
304 case CRYPTO_ALG_TYPE_AEAD: 343 case CRYPTO_ALG_TYPE_AEAD:
305 return pcrypt_create_aead(tmpl !! 344 return pcrypt_create_aead(tmpl, tb, algt->type, algt->mask);
306 } 345 }
307 346
308 return -EINVAL; 347 return -EINVAL;
309 } 348 }
310 349
>> 350 static int pcrypt_cpumask_change_notify(struct notifier_block *self,
>> 351 unsigned long val, void *data)
>> 352 {
>> 353 struct padata_pcrypt *pcrypt;
>> 354 struct pcrypt_cpumask *new_mask, *old_mask;
>> 355 struct padata_cpumask *cpumask = (struct padata_cpumask *)data;
>> 356
>> 357 if (!(val & PADATA_CPU_SERIAL))
>> 358 return 0;
>> 359
>> 360 pcrypt = container_of(self, struct padata_pcrypt, nblock);
>> 361 new_mask = kmalloc(sizeof(*new_mask), GFP_KERNEL);
>> 362 if (!new_mask)
>> 363 return -ENOMEM;
>> 364 if (!alloc_cpumask_var(&new_mask->mask, GFP_KERNEL)) {
>> 365 kfree(new_mask);
>> 366 return -ENOMEM;
>> 367 }
>> 368
>> 369 old_mask = pcrypt->cb_cpumask;
>> 370
>> 371 cpumask_copy(new_mask->mask, cpumask->cbcpu);
>> 372 rcu_assign_pointer(pcrypt->cb_cpumask, new_mask);
>> 373 synchronize_rcu();
>> 374
>> 375 free_cpumask_var(old_mask->mask);
>> 376 kfree(old_mask);
>> 377 return 0;
>> 378 }
>> 379
311 static int pcrypt_sysfs_add(struct padata_inst 380 static int pcrypt_sysfs_add(struct padata_instance *pinst, const char *name)
312 { 381 {
313 int ret; 382 int ret;
314 383
315 pinst->kobj.kset = pcrypt_kset; 384 pinst->kobj.kset = pcrypt_kset;
316 ret = kobject_add(&pinst->kobj, NULL, 385 ret = kobject_add(&pinst->kobj, NULL, "%s", name);
317 if (!ret) 386 if (!ret)
318 kobject_uevent(&pinst->kobj, K 387 kobject_uevent(&pinst->kobj, KOBJ_ADD);
319 388
320 return ret; 389 return ret;
321 } 390 }
322 391
323 static int pcrypt_init_padata(struct padata_in !! 392 static int pcrypt_init_padata(struct padata_pcrypt *pcrypt,
>> 393 const char *name)
324 { 394 {
325 int ret = -ENOMEM; 395 int ret = -ENOMEM;
>> 396 struct pcrypt_cpumask *mask;
>> 397
>> 398 get_online_cpus();
>> 399
>> 400 pcrypt->wq = alloc_workqueue("%s", WQ_MEM_RECLAIM | WQ_CPU_INTENSIVE,
>> 401 1, name);
>> 402 if (!pcrypt->wq)
>> 403 goto err;
>> 404
>> 405 pcrypt->pinst = padata_alloc_possible(pcrypt->wq);
>> 406 if (!pcrypt->pinst)
>> 407 goto err_destroy_workqueue;
>> 408
>> 409 mask = kmalloc(sizeof(*mask), GFP_KERNEL);
>> 410 if (!mask)
>> 411 goto err_free_padata;
>> 412 if (!alloc_cpumask_var(&mask->mask, GFP_KERNEL)) {
>> 413 kfree(mask);
>> 414 goto err_free_padata;
>> 415 }
>> 416
>> 417 cpumask_and(mask->mask, cpu_possible_mask, cpu_online_mask);
>> 418 rcu_assign_pointer(pcrypt->cb_cpumask, mask);
326 419
327 *pinst = padata_alloc(name); !! 420 pcrypt->nblock.notifier_call = pcrypt_cpumask_change_notify;
328 if (!*pinst) !! 421 ret = padata_register_cpumask_notifier(pcrypt->pinst, &pcrypt->nblock);
329 return ret; !! 422 if (ret)
>> 423 goto err_free_cpumask;
330 424
331 ret = pcrypt_sysfs_add(*pinst, name); !! 425 ret = pcrypt_sysfs_add(pcrypt->pinst, name);
332 if (ret) 426 if (ret)
333 padata_free(*pinst); !! 427 goto err_unregister_notifier;
>> 428
>> 429 put_online_cpus();
334 430
335 return ret; 431 return ret;
>> 432
>> 433 err_unregister_notifier:
>> 434 padata_unregister_cpumask_notifier(pcrypt->pinst, &pcrypt->nblock);
>> 435 err_free_cpumask:
>> 436 free_cpumask_var(mask->mask);
>> 437 kfree(mask);
>> 438 err_free_padata:
>> 439 padata_free(pcrypt->pinst);
>> 440 err_destroy_workqueue:
>> 441 destroy_workqueue(pcrypt->wq);
>> 442 err:
>> 443 put_online_cpus();
>> 444
>> 445 return ret;
>> 446 }
>> 447
>> 448 static void pcrypt_fini_padata(struct padata_pcrypt *pcrypt)
>> 449 {
>> 450 free_cpumask_var(pcrypt->cb_cpumask->mask);
>> 451 kfree(pcrypt->cb_cpumask);
>> 452
>> 453 padata_stop(pcrypt->pinst);
>> 454 padata_unregister_cpumask_notifier(pcrypt->pinst, &pcrypt->nblock);
>> 455 destroy_workqueue(pcrypt->wq);
>> 456 padata_free(pcrypt->pinst);
336 } 457 }
337 458
338 static struct crypto_template pcrypt_tmpl = { 459 static struct crypto_template pcrypt_tmpl = {
339 .name = "pcrypt", 460 .name = "pcrypt",
340 .create = pcrypt_create, 461 .create = pcrypt_create,
341 .module = THIS_MODULE, 462 .module = THIS_MODULE,
342 }; 463 };
343 464
344 static int __init pcrypt_init(void) 465 static int __init pcrypt_init(void)
345 { 466 {
346 int err = -ENOMEM; 467 int err = -ENOMEM;
347 468
348 pcrypt_kset = kset_create_and_add("pcr 469 pcrypt_kset = kset_create_and_add("pcrypt", NULL, kernel_kobj);
349 if (!pcrypt_kset) 470 if (!pcrypt_kset)
350 goto err; 471 goto err;
351 472
352 err = pcrypt_init_padata(&pencrypt, "p 473 err = pcrypt_init_padata(&pencrypt, "pencrypt");
353 if (err) 474 if (err)
354 goto err_unreg_kset; 475 goto err_unreg_kset;
355 476
356 err = pcrypt_init_padata(&pdecrypt, "p 477 err = pcrypt_init_padata(&pdecrypt, "pdecrypt");
357 if (err) 478 if (err)
358 goto err_deinit_pencrypt; 479 goto err_deinit_pencrypt;
359 480
>> 481 padata_start(pencrypt.pinst);
>> 482 padata_start(pdecrypt.pinst);
>> 483
360 return crypto_register_template(&pcryp 484 return crypto_register_template(&pcrypt_tmpl);
361 485
362 err_deinit_pencrypt: 486 err_deinit_pencrypt:
363 padata_free(pencrypt); !! 487 pcrypt_fini_padata(&pencrypt);
364 err_unreg_kset: 488 err_unreg_kset:
365 kset_unregister(pcrypt_kset); 489 kset_unregister(pcrypt_kset);
366 err: 490 err:
367 return err; 491 return err;
368 } 492 }
369 493
370 static void __exit pcrypt_exit(void) 494 static void __exit pcrypt_exit(void)
371 { 495 {
372 crypto_unregister_template(&pcrypt_tmp !! 496 pcrypt_fini_padata(&pencrypt);
373 !! 497 pcrypt_fini_padata(&pdecrypt);
374 padata_free(pencrypt); <<
375 padata_free(pdecrypt); <<
376 498
377 kset_unregister(pcrypt_kset); 499 kset_unregister(pcrypt_kset);
>> 500 crypto_unregister_template(&pcrypt_tmpl);
378 } 501 }
379 502
380 subsys_initcall(pcrypt_init); 503 subsys_initcall(pcrypt_init);
381 module_exit(pcrypt_exit); 504 module_exit(pcrypt_exit);
382 505
383 MODULE_LICENSE("GPL"); 506 MODULE_LICENSE("GPL");
384 MODULE_AUTHOR("Steffen Klassert <steffen.klass 507 MODULE_AUTHOR("Steffen Klassert <steffen.klassert@secunet.com>");
385 MODULE_DESCRIPTION("Parallel crypto wrapper"); 508 MODULE_DESCRIPTION("Parallel crypto wrapper");
386 MODULE_ALIAS_CRYPTO("pcrypt"); 509 MODULE_ALIAS_CRYPTO("pcrypt");
387 510
Linux® is a registered trademark of Linus Torvalds in the United States and other countries.
TOMOYO® is a registered trademark of NTT DATA CORPORATION.