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