aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-kernel/cryptodev/files/0014-remove-redundant-data-copy-for-pkc-operations.patch
blob: b9e9d2bd0302ad7eaf215cf4f41e11b5de360115 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
From 34e765977633b5f81845c0183af6d388d8225f00 Mon Sep 17 00:00:00 2001
From: Cristian Stoica <cristian.stoica@freescale.com>
Date: Mon, 23 Feb 2015 12:14:07 +0200
Subject: [PATCH 14/15] remove redundant data copy for pkc operations

This patch removes a copy of a pkc request that was
allocated on the hot-path. The copy was not necessary
and was just slowing things down.

Change-Id: I3ad85f78c188f100ab9fc03a5777bb704a9dcb63
Signed-off-by: Cristian Stoica <cristian.stoica@freescale.com>
Reviewed-on: http://git.am.freescale.net:8181/34223
---
 cryptlib.c |  49 +++----------------
 cryptlib.h |   3 +-
 ioctl.c    |  17 +++----
 main.c     | 162 +++++++++++++++++++++++++++++++++++++------------------------
 4 files changed, 113 insertions(+), 118 deletions(-)

diff --git a/cryptlib.c b/cryptlib.c
index 21e691b..5882a30 100644
--- a/cryptlib.c
+++ b/cryptlib.c
@@ -436,59 +436,22 @@ int cryptodev_hash_final(struct hash_data *hdata, void *output)
 
 int cryptodev_pkc_offload(struct cryptodev_pkc *pkc)
 {
-	int ret = 0;
-	struct pkc_request *pkc_req = &pkc->req, *pkc_requested;
-
-	switch (pkc_req->type) {
-	case RSA_KEYGEN:
-	case RSA_PUB:
-	case RSA_PRIV_FORM1:
-	case RSA_PRIV_FORM2:
-	case RSA_PRIV_FORM3:
-		pkc->s = crypto_alloc_pkc("pkc(rsa)", CRYPTO_ALG_TYPE_PKC_RSA, 0);
-		break;
-	case DSA_SIGN:
-	case DSA_VERIFY:
-	case ECDSA_SIGN:
-	case ECDSA_VERIFY:
-	case DLC_KEYGEN:
-	case ECC_KEYGEN:
-		pkc->s = crypto_alloc_pkc("pkc(dsa)", CRYPTO_ALG_TYPE_PKC_DSA, 0);
-		break;
-	case DH_COMPUTE_KEY:
-	case ECDH_COMPUTE_KEY:
-		pkc->s = crypto_alloc_pkc("pkc(dh)", CRYPTO_ALG_TYPE_PKC_DH, 0);
-		break;
-	default:
-		return -EINVAL;
-	}
-
-	if (IS_ERR_OR_NULL(pkc->s))
-		return -EINVAL;
+	int ret;
 
 	init_completion(&pkc->result.completion);
-	pkc_requested = pkc_request_alloc(pkc->s, GFP_KERNEL);
-
-	if (unlikely(IS_ERR_OR_NULL(pkc_requested))) {
-		ret = -ENOMEM;
-		goto error;
-	}
-	pkc_requested->type = pkc_req->type;
-	pkc_requested->curve_type = pkc_req->curve_type;
-	memcpy(&pkc_requested->req_u, &pkc_req->req_u, sizeof(pkc_req->req_u));
-	pkc_request_set_callback(pkc_requested, CRYPTO_TFM_REQ_MAY_BACKLOG,
+	pkc_request_set_callback(pkc->req, CRYPTO_TFM_REQ_MAY_BACKLOG,
 				 cryptodev_complete_asym, pkc);
-	ret = crypto_pkc_op(pkc_requested);
+	ret = crypto_pkc_op(pkc->req);
 	if (ret != -EINPROGRESS && ret != 0)
-		goto error2;
+		goto error;
 
 	if (pkc->type == SYNCHRONOUS)
 		ret = waitfor(&pkc->result, ret);
 
 	return ret;
-error2:
-	kfree(pkc_requested);
+
 error:
+	kfree(pkc->req);
 	crypto_free_pkc(pkc->s);
 	return ret;
 }
diff --git a/cryptlib.h b/cryptlib.h
index 7ffa54c..4fac0c8 100644
--- a/cryptlib.h
+++ b/cryptlib.h
@@ -110,8 +110,7 @@ struct cryptodev_pkc {
 	struct crypto_pkc *s;    /* Transform pointer from CryptoAPI */
 	struct cryptodev_result result;	/* Result to be updated by
 					 completion handler */
-	struct pkc_request req; /* PKC request structure allocated
-				 from CryptoAPI */
+	struct pkc_request *req; /* PKC request allocated from CryptoAPI */
 	enum offload_type type; /* Synchronous Vs Asynchronous request */
 	/*
 	 * cookie used for transfering tranparent information from async
diff --git a/ioctl.c b/ioctl.c
index ee0486c..797b73c 100644
--- a/ioctl.c
+++ b/ioctl.c
@@ -708,26 +708,25 @@ static int crypto_async_fetch_asym(struct cryptodev_pkc *pkc)
 	int ret = 0;
 	struct kernel_crypt_kop *kop = &pkc->kop;
 	struct crypt_kop *ckop = &kop->kop;
-	struct pkc_request *pkc_req = &pkc->req;
 
 	switch (ckop->crk_op) {
 	case CRK_MOD_EXP:
 	{
-		struct rsa_pub_req_s *rsa_req = &pkc_req->req_u.rsa_pub_req;
+		struct rsa_pub_req_s *rsa_req = &pkc->req->req_u.rsa_pub_req;
 		copy_to_user(ckop->crk_param[3].crp_p, rsa_req->g, rsa_req->g_len);
 	}
 	break;
 	case CRK_MOD_EXP_CRT:
 	{
-		struct rsa_priv_frm3_req_s *rsa_req = &pkc_req->req_u.rsa_priv_f3;
+		struct rsa_priv_frm3_req_s *rsa_req = &pkc->req->req_u.rsa_priv_f3;
 		copy_to_user(ckop->crk_param[6].crp_p, rsa_req->f, rsa_req->f_len);
 	}
 	break;
 	case CRK_DSA_SIGN:
 	{
-		struct dsa_sign_req_s *dsa_req = &pkc_req->req_u.dsa_sign;
+		struct dsa_sign_req_s *dsa_req = &pkc->req->req_u.dsa_sign;
 
-		if (pkc_req->type == ECDSA_SIGN) {
+		if (pkc->req->type == ECDSA_SIGN) {
 			copy_to_user(ckop->crk_param[6].crp_p, dsa_req->c, dsa_req->d_len);
 			copy_to_user(ckop->crk_param[7].crp_p, dsa_req->d, dsa_req->d_len);
 		} else {
@@ -740,8 +739,8 @@ static int crypto_async_fetch_asym(struct cryptodev_pkc *pkc)
 		break;
 	case CRK_DH_COMPUTE_KEY:
 	{
-		struct dh_key_req_s *dh_req = &pkc_req->req_u.dh_req;
-		if (pkc_req->type == ECDH_COMPUTE_KEY)
+		struct dh_key_req_s *dh_req = &pkc->req->req_u.dh_req;
+		if (pkc->req->type == ECDH_COMPUTE_KEY)
 			copy_to_user(ckop->crk_param[4].crp_p, dh_req->z, dh_req->z_len);
 		else
 			copy_to_user(ckop->crk_param[3].crp_p, dh_req->z, dh_req->z_len);
@@ -750,9 +749,9 @@ static int crypto_async_fetch_asym(struct cryptodev_pkc *pkc)
 	case CRK_DSA_GENERATE_KEY:
 	case CRK_DH_GENERATE_KEY:
 	{
-		struct keygen_req_s *key_req = &pkc_req->req_u.keygen;
+		struct keygen_req_s *key_req = &pkc->req->req_u.keygen;
 
-		if (pkc_req->type == ECC_KEYGEN) {
+		if (pkc->req->type == ECC_KEYGEN) {
 			copy_to_user(ckop->crk_param[4].crp_p, key_req->pub_key,
 					key_req->pub_key_len);
 			copy_to_user(ckop->crk_param[5].crp_p, key_req->priv_key,
diff --git a/main.c b/main.c
index af66553..ed1c69a 100644
--- a/main.c
+++ b/main.c
@@ -186,8 +186,7 @@ int crypto_kop_dsasign(struct cryptodev_pkc *pkc)
 {
 	struct kernel_crypt_kop *kop = &pkc->kop;
 	struct crypt_kop *cop = &kop->kop;
-	struct pkc_request *pkc_req = &pkc->req;
-	struct dsa_sign_req_s *dsa_req = &pkc_req->req_u.dsa_sign;
+	struct dsa_sign_req_s *dsa_req = &pkc->req->req_u.dsa_sign;
 	int rc, buf_size;
 	uint8_t *buf;
 
@@ -210,10 +209,7 @@ int crypto_kop_dsasign(struct cryptodev_pkc *pkc)
 	if (cop->crk_iparams == 6) {
 		dsa_req->ab_len = (cop->crk_param[5].crp_nbits + 7)/8;
 		buf_size += dsa_req->ab_len;
-		pkc_req->type = ECDSA_SIGN;
-		pkc_req->curve_type = cop->curve_type;
-	} else {
-		pkc_req->type = DSA_SIGN;
+		pkc->req->curve_type = cop->curve_type;
 	}
 
 	buf = kmalloc(buf_size, GFP_DMA);
@@ -269,7 +265,6 @@ int crypto_kop_dsaverify(struct cryptodev_pkc *pkc)
 {
 	struct kernel_crypt_kop *kop = &pkc->kop;
 	struct crypt_kop *cop = &kop->kop;
-	struct pkc_request *pkc_req;
 	struct dsa_verify_req_s *dsa_req;
 	int rc, buf_size;
 	uint8_t *buf;
@@ -281,8 +276,7 @@ int crypto_kop_dsaverify(struct cryptodev_pkc *pkc)
 	    !cop->crk_param[7].crp_nbits))
 		return -EINVAL;
 
-	pkc_req = &pkc->req;
-	dsa_req = &pkc_req->req_u.dsa_verify;
+	dsa_req = &pkc->req->req_u.dsa_verify;
 	dsa_req->m_len = (cop->crk_param[0].crp_nbits + 7)/8;
 	dsa_req->q_len = (cop->crk_param[1].crp_nbits + 7)/8;
 	dsa_req->r_len = (cop->crk_param[2].crp_nbits + 7)/8;
@@ -295,10 +289,7 @@ int crypto_kop_dsaverify(struct cryptodev_pkc *pkc)
 	if (cop->crk_iparams == 8) {
 		dsa_req->ab_len = (cop->crk_param[5].crp_nbits + 7)/8;
 		buf_size += dsa_req->ab_len;
-		pkc_req->type = ECDSA_VERIFY;
-		pkc_req->curve_type = cop->curve_type;
-	} else {
-		pkc_req->type = DSA_VERIFY;
+		pkc->req->curve_type = cop->curve_type;
 	}
 
 	buf = kmalloc(buf_size, GFP_DMA);
@@ -351,7 +342,6 @@ int crypto_kop_rsa_keygen(struct cryptodev_pkc *pkc)
 {
 	struct kernel_crypt_kop *kop = &pkc->kop;
 	struct crypt_kop *cop = &kop->kop;
-	struct pkc_request *pkc_req;
 	struct rsa_keygen_req_s *key_req;
 	int rc, buf_size;
 	uint8_t *buf;
@@ -362,9 +352,7 @@ int crypto_kop_rsa_keygen(struct cryptodev_pkc *pkc)
 		!cop->crk_param[6].crp_nbits)
 		return -EINVAL;
 
-	pkc_req = &pkc->req;
-	pkc_req->type = RSA_KEYGEN;
-	key_req = &pkc_req->req_u.rsa_keygen;
+	key_req = &pkc->req->req_u.rsa_keygen;
 	key_req->n_len = (cop->crk_param[2].crp_nbits + 7)/8;
 	key_req->p_len = (cop->crk_param[0].crp_nbits + 7) / 8;
 	key_req->q_len = (cop->crk_param[1].crp_nbits + 7) / 8;
@@ -427,7 +415,6 @@ int crypto_kop_keygen(struct cryptodev_pkc *pkc)
 {
 	struct kernel_crypt_kop *kop = &pkc->kop;
 	struct crypt_kop *cop = &kop->kop;
-	struct pkc_request *pkc_req;
 	struct keygen_req_s *key_req;
 	int rc, buf_size;
 	uint8_t *buf;
@@ -437,8 +424,7 @@ int crypto_kop_keygen(struct cryptodev_pkc *pkc)
 	    !cop->crk_param[4].crp_nbits)
 		return -EINVAL;
 
-	pkc_req = &pkc->req;
-	key_req = &pkc_req->req_u.keygen;
+	key_req = &pkc->req->req_u.keygen;
 	key_req->q_len = (cop->crk_param[0].crp_nbits + 7)/8;
 	key_req->r_len = (cop->crk_param[1].crp_nbits + 7)/8;
 	key_req->g_len = (cop->crk_param[2].crp_nbits + 7)/8;
@@ -447,7 +433,6 @@ int crypto_kop_keygen(struct cryptodev_pkc *pkc)
 		key_req->priv_key_len = (cop->crk_param[4].crp_nbits + 7)/8;
 		buf_size = key_req->q_len + key_req->r_len + key_req->g_len +
 			key_req->pub_key_len + key_req->priv_key_len;
-		pkc_req->type = DLC_KEYGEN;
 	} else {
 		key_req->ab_len = (cop->crk_param[3].crp_nbits + 7)/8;
 		key_req->pub_key_len = (cop->crk_param[4].crp_nbits + 7)/8;
@@ -455,8 +440,7 @@ int crypto_kop_keygen(struct cryptodev_pkc *pkc)
 		buf_size = key_req->q_len + key_req->r_len + key_req->g_len +
 			key_req->pub_key_len + key_req->priv_key_len +
 			key_req->ab_len;
-		pkc_req->type = ECC_KEYGEN;
-		pkc_req->curve_type = cop->curve_type;
+		pkc->req->curve_type = cop->curve_type;
 	}
 
 	buf = kmalloc(buf_size, GFP_DMA);
@@ -508,26 +492,22 @@ int crypto_kop_dh_key(struct cryptodev_pkc *pkc)
 {
 	struct kernel_crypt_kop *kop = &pkc->kop;
 	struct crypt_kop *cop = &kop->kop;
-	struct pkc_request *pkc_req;
 	struct dh_key_req_s *dh_req;
 	int buf_size;
 	uint8_t *buf;
 	int rc = -EINVAL;
 
-	pkc_req = &pkc->req;
-	dh_req = &pkc_req->req_u.dh_req;
+	dh_req = &pkc->req->req_u.dh_req;
 	dh_req->s_len = (cop->crk_param[0].crp_nbits + 7)/8;
 	dh_req->pub_key_len = (cop->crk_param[1].crp_nbits + 7)/8;
 	dh_req->q_len = (cop->crk_param[2].crp_nbits + 7)/8;
 	buf_size = dh_req->q_len + dh_req->pub_key_len + dh_req->s_len;
 	if (cop->crk_iparams == 4) {
-		pkc_req->type = ECDH_COMPUTE_KEY;
 		dh_req->ab_len = (cop->crk_param[3].crp_nbits + 7)/8;
 		dh_req->z_len = (cop->crk_param[4].crp_nbits + 7)/8;
 		buf_size += dh_req->ab_len;
 	} else {
 		dh_req->z_len = (cop->crk_param[3].crp_nbits + 7)/8;
-		pkc_req->type = DH_COMPUTE_KEY;
 	}
 	buf_size += dh_req->z_len;
 	buf = kmalloc(buf_size, GFP_DMA);
@@ -539,7 +519,7 @@ int crypto_kop_dh_key(struct cryptodev_pkc *pkc)
 	dh_req->z = dh_req->pub_key + dh_req->pub_key_len;
 	if (cop->crk_iparams == 4) {
 		dh_req->ab = dh_req->z + dh_req->z_len;
-		pkc_req->curve_type = cop->curve_type;
+		pkc->req->curve_type = cop->curve_type;
 		copy_from_user(dh_req->ab, cop->crk_param[3].crp_p,
 			       dh_req->ab_len);
 	}
@@ -573,7 +553,6 @@ int crypto_modexp_crt(struct cryptodev_pkc *pkc)
 {
 	struct kernel_crypt_kop *kop = &pkc->kop;
 	struct crypt_kop *cop = &kop->kop;
-	struct pkc_request *pkc_req;
 	struct rsa_priv_frm3_req_s *rsa_req;
 	int rc;
 	uint8_t *buf;
@@ -583,9 +562,7 @@ int crypto_modexp_crt(struct cryptodev_pkc *pkc)
 	    !cop->crk_param[4].crp_nbits || !cop->crk_param[5].crp_nbits)
 		return -EINVAL;
 
-	pkc_req = &pkc->req;
-	pkc_req->type = RSA_PRIV_FORM3;
-	rsa_req = &pkc_req->req_u.rsa_priv_f3;
+	rsa_req = &pkc->req->req_u.rsa_priv_f3;
 	rsa_req->p_len = (cop->crk_param[0].crp_nbits + 7)/8;
 	rsa_req->q_len = (cop->crk_param[1].crp_nbits + 7)/8;
 	rsa_req->g_len = (cop->crk_param[2].crp_nbits + 7)/8;
@@ -632,7 +609,6 @@ err:
 
 int crypto_bn_modexp(struct cryptodev_pkc *pkc)
 {
-	struct pkc_request *pkc_req;
 	struct rsa_pub_req_s *rsa_req;
 	int rc;
 	struct kernel_crypt_kop *kop = &pkc->kop;
@@ -643,9 +619,7 @@ int crypto_bn_modexp(struct cryptodev_pkc *pkc)
 	    !cop->crk_param[2].crp_nbits || !cop->crk_param[3].crp_nbits)
 		return -EINVAL;
 
-	pkc_req = &pkc->req;
-	pkc_req->type = RSA_PUB;
-	rsa_req = &pkc_req->req_u.rsa_pub_req;
+	rsa_req = &pkc->req->req_u.rsa_pub_req;
 	rsa_req->f_len = (cop->crk_param[0].crp_nbits + 7)/8;
 	rsa_req->e_len = (cop->crk_param[1].crp_nbits + 7)/8;
 	rsa_req->n_len = (cop->crk_param[2].crp_nbits + 7)/8;
@@ -680,56 +654,116 @@ err:
 	return rc;
 }
 
+static struct {
+	char *alg_name;
+	u32 type;
+	u32 mask;
+} pkc_alg_list[] = {
+		{"pkc(rsa)", CRYPTO_ALG_TYPE_PKC_RSA, 0},
+		{"pkc(dsa)", CRYPTO_ALG_TYPE_PKC_DSA, 0},
+		{"pkc(dh)", CRYPTO_ALG_TYPE_PKC_DH, 0},
+};
+
 int crypto_run_asym(struct cryptodev_pkc *pkc)
 {
-	int ret = -EINVAL;
+	int err = -EINVAL;
+	int id;
 	struct kernel_crypt_kop *kop = &pkc->kop;
+	enum pkc_req_type pkc_req_type;
+	int (*call_next_action)(struct cryptodev_pkc *pkc);
 
 	switch (kop->kop.crk_op) {
 	case CRK_MOD_EXP:
 		if (kop->kop.crk_iparams != 3 && kop->kop.crk_oparams != 1)
-			goto err;
-
-		ret = crypto_bn_modexp(pkc);
+			return err;
+		pkc_req_type = RSA_PUB;
+		id = 0;
+		call_next_action = crypto_bn_modexp;
 		break;
 	case CRK_MOD_EXP_CRT:
 		if (kop->kop.crk_iparams != 6 && kop->kop.crk_oparams != 1)
-			goto err;
-
-		ret = crypto_modexp_crt(pkc);
+			return err;
+		pkc_req_type = RSA_PRIV_FORM3;
+		id = 0;
+		call_next_action = crypto_modexp_crt;
 		break;
 	case CRK_DSA_SIGN:
-		if ((kop->kop.crk_iparams != 5 && kop->kop.crk_iparams != 6) ||
-		    kop->kop.crk_oparams != 2)
-			goto err;
-
-		ret = crypto_kop_dsasign(pkc);
+		if (kop->kop.crk_oparams != 2)
+			return err;
+		else if (kop->kop.crk_iparams == 5)
+			pkc_req_type = DSA_SIGN;
+		else if (kop->kop.crk_iparams == 6)
+			pkc_req_type = ECDSA_SIGN;
+		else
+			return err;
+		id = 1;
+		call_next_action = crypto_kop_dsasign;
 		break;
 	case CRK_DSA_VERIFY:
-		if ((kop->kop.crk_iparams != 7 && kop->kop.crk_iparams != 8) ||
-		    kop->kop.crk_oparams != 0)
-			goto err;
-
-		ret = crypto_kop_dsaverify(pkc);
+		if (kop->kop.crk_oparams != 0)
+			return err;
+		else if (kop->kop.crk_iparams == 7)
+			pkc_req_type = DSA_VERIFY;
+		else if (kop->kop.crk_iparams == 8)
+			pkc_req_type = ECDSA_VERIFY;
+		else
+			return err;
+		id = 1;
+		call_next_action = crypto_kop_dsaverify;
 		break;
 	case CRK_DH_COMPUTE_KEY:
-		if ((kop->kop.crk_iparams != 3 && kop->kop.crk_iparams != 4) ||
-		    kop->kop.crk_oparams != 1)
-			goto err;
-		ret = crypto_kop_dh_key(pkc);
+		if (kop->kop.crk_oparams != 1)
+			return err;
+		else if (kop->kop.crk_iparams == 3)
+			pkc_req_type =  DH_COMPUTE_KEY;
+		else if (kop->kop.crk_iparams == 4)
+			pkc_req_type =  ECDH_COMPUTE_KEY;
+		else
+			return err;
+		id = 2;
+		call_next_action = crypto_kop_dh_key;
 		break;
 	case CRK_DH_GENERATE_KEY:
 	case CRK_DSA_GENERATE_KEY:
-		if ((kop->kop.crk_iparams != 3 && kop->kop.crk_iparams != 4))
-			goto err;
-		ret = crypto_kop_keygen(pkc);
+		if (kop->kop.crk_iparams == 3)
+			pkc_req_type = DLC_KEYGEN;
+		else if (kop->kop.crk_iparams == 4)
+			pkc_req_type = ECC_KEYGEN;
+		else
+			return err;
+		id = 1;
+		call_next_action = crypto_kop_keygen;
 		break;
 	case CRK_RSA_GENERATE_KEY:
-		ret = crypto_kop_rsa_keygen(pkc);
+		pkc_req_type = RSA_KEYGEN;
+		id = 0;
+		call_next_action = crypto_kop_rsa_keygen;
 		break;
+	default:
+		return err;
 	}
-err:
-	return ret;
+	err = -ENOMEM;
+	pkc->s = crypto_alloc_pkc(pkc_alg_list[id].alg_name,
+					pkc_alg_list[id].type,
+					pkc_alg_list[id].mask);
+	if (IS_ERR_OR_NULL(pkc->s))
+		return err;
+
+	pkc->req = pkc_request_alloc(pkc->s, GFP_KERNEL);
+	if (IS_ERR_OR_NULL(pkc->req))
+		goto out_free_tfm;
+
+	/* todo - fix alloc-free on error path */
+	pkc->req->type = pkc_req_type;
+	err = call_next_action(pkc);
+	if (pkc->type == SYNCHRONOUS)
+		kfree(pkc->req);
+
+	return err;
+
+out_free_tfm:
+	crypto_free_pkc(pkc->s);
+	return err;
 }
 
 int crypto_run(struct fcrypt *fcr, struct kernel_crypt_op *kcop)
-- 
2.3.5