Skip to contentSkip to conversation

AP bus/zcrypt/pkey/paes no-mem-alloc patches

PATCH Superseded Harald Freudenberger 2 participants 55 messages Mar 4, 2025 – Mar 25, 2025

Subsystems (4)

v2 of 8 Superseded Latest is v8 →

lore
Share & tools
lore

Harald Freudenberger

author maintainer
#0 lore raw

v2 cover AP bus/zcrypt/pkey/paes no-mem-alloc patches

This series of patches has the goal to open up a do-not-allocate memory path from the callers of the pkey in-kernel api down to the crypto cards and back.

The asynch in-kernel cipher implementations (and the s390 PAES cipher implementations are one of them) may be called in a context where memory allocations which trigger IO is not acceptable.

So this patch series reworks the AP bus code, the zcrypt layer, the pkey layer and the pkey handlers to respect this situation by processing a new parameter xflags (execution hints flags). There is a flag PKEY_XFLAG_NOMEMALLOC which tells the code to not allocate memory which may lead to IO operations.

To reach this goal, the actual code changes have been differed. The zcrypt misc functions which need memory for cprb build use a pre allocated memory pool for this purpose. The findcard() functions have one temp memory area preallocated and protected with a mutex. Some smaller data is not allocated any more but went to the stack instead. The AP bus also uses a pre-allocated memory pool for building AP message requests.

Note that the PAES implementation still needs to get reworked to run the protected key derivation in a real asynchronous way. However, this rework of AP bus, zcrypt and pkey is the base work required before reconsidering the PAES implementation.

The patch series starts bottom (AP bus) and goes up the call chain (PKEY). At any time in the patch stack it should compile. For easier review I tried to have one logic code change by each patch and thus keep the patches "small". For the upstream version I intend to fold them together into only a few commits.

Changelog:
v1: initial version
v2: - Rework on patch 0001 and 0002 based on feedback from Holger.
Also there was one place in zcrypt_msgtype50.c where still an ap msg buffer was alloacated.
- Rework on patch 0003 - fixed feedback from Holger. Also the min poolitems is now a module parameter and defaults to 8.
- Rework on patch 0004 - as suggested by Holger the "userspace" parameter is now included into the ap msg flags.
- Rework on patch 0005 - nr of cca cprbs in the mempool is now a module parameter.
- Rework on patch 0006 - nr of ep11 cprbs in the mempool is now a module parameter.
- Rework on patch 0007 - as suggested by Holger instead of implementing a copy-and-pasted new function zcrypt_device_status_mask_ext2() use and extend the existing the existing function to avoid code duplication.
- The rest of the patch series needed adaptions but there is no functional change compared to v1.

Harald Freudenberger (20):
s390/ap: Move response_type struct into ap_msg struct s390/ap/zcrypt: Rework AP message buffer allocation s390/ap: Introduce ap message buffer pool
s390/ap/zcrypt: New xflag parameter and extension of the ap msg flags s390/zcrypt: Introduce cprb mempool for cca misc functions s390/zcrypt: Introduce cprb mempool for ep11 misc functions s390/zcrypt: Rework zcrypt function zcrypt_device_status_mask_ext s390/zcrypt: Introduce pre-allocated device status array for cca misc s390/zcrypt: Introduce pre-allocated device status array for ep11 misc s390/zcrypt/pkey: Rework cca findcard() implementation and callers s390/zcrypt/pkey: Rework ep11 findcard() implementation and callers s390/zcrypt: Rework cca misc functions kmallocs to use the cprb
mempool
s390/zcrypt: Add small mempool for cca info list entries s390/zcrypt: Locate ep11_domain_query_info onto the stack instead of
kmalloc
s390/zcrypt: Rework ep11 misc functions to use cprb mempool s390/zcrypt: Add small mempool for ep11 card info list entries s390/pkey: Rework CCA pkey handler to use stack for small memory
allocs
s390/pkey: Rework EP11 pkey handler to use stack for small memory
allocs
s390/zcrypt/pkey: Provide and pass xflags within pkey and zcrypt
layers
s390/pkey/crypto: Introduce xflags param for pkey in-kernel API

 arch/s390/crypto/paes_s390.c           |   2 +-
 arch/s390/include/asm/pkey.h           |  15 +-
 drivers/s390/crypto/ap_bus.c           |  73 +++++
 drivers/s390/crypto/ap_bus.h           |  37 +--
 drivers/s390/crypto/pkey_api.c         |  54 ++--
 drivers/s390/crypto/pkey_base.c        |  34 ++-
 drivers/s390/crypto/pkey_base.h        |  37 ++-
 drivers/s390/crypto/pkey_cca.c         | 121 ++++----
 drivers/s390/crypto/pkey_ep11.c        | 106 +++----
 drivers/s390/crypto/pkey_pckmo.c       |   9 +-
 drivers/s390/crypto/pkey_sysfs.c       |   4 +-
 drivers/s390/crypto/pkey_uv.c          |  16 +-
 drivers/s390/crypto/zcrypt_api.c       | 172 +++++++----
 drivers/s390/crypto/zcrypt_api.h       |  42 ++-
 drivers/s390/crypto/zcrypt_ccamisc.c   | 350 +++++++++++++++-------
 drivers/s390/crypto/zcrypt_ccamisc.h   |  41 +--
 drivers/s390/crypto/zcrypt_cex4.c      |  16 +-
 drivers/s390/crypto/zcrypt_ep11misc.c  | 387 ++++++++++++++++---------
 drivers/s390/crypto/zcrypt_ep11misc.h  |  28 +-
 drivers/s390/crypto/zcrypt_msgtype50.c |  36 ++-
 drivers/s390/crypto/zcrypt_msgtype6.c  | 121 ++++----
 drivers/s390/crypto/zcrypt_msgtype6.h  |   4 +-
 22 files changed, 1032 insertions(+), 673 deletions(-)

--
2.43.0

author maintainer
#1 lore raw

PATCH v2 1/20 s390/ap: Move response_type struct into ap_msg struct

Move the very small response_type struct into struct ap_msg. So there is no need to kmalloc this tiny struct with each ap message preparation.

---
 drivers/s390/crypto/ap_bus.h           |  8 ++-
 drivers/s390/crypto/zcrypt_msgtype50.c | 16 ++----
 drivers/s390/crypto/zcrypt_msgtype6.c  | 74 ++++++++++----------------
 3 files changed, 38 insertions(+), 60 deletions(-)
drivers/s390/crypto/ap_bus.h +6 -2
index f4622ee4d894..7fd24c207bdf 100644
@@ -214,6 +214,11 @@ struct ap_queue {
 
 typedef enum ap_sm_wait (ap_func_t)(struct ap_queue *queue);
 
+struct ap_response_type {
+	struct completion work;
+	int type;
+};
+
 struct ap_message {
 	struct list_head list;		/* Request queueing. */
 	unsigned long psmid;		/* Message id. */
@@ -222,7 +227,7 @@ struct ap_message {
 	size_t bufsize;			/* allocated msg buffer size */
 	u16 flags;			/* Flags, see AP_MSG_FLAG_xxx */
 	int rc;				/* Return code for this message */
-	void *private;			/* ap driver private pointer. */
+	struct ap_response_type response;
 	/* receive is called from tasklet context */
 	void (*receive)(struct ap_queue *, struct ap_message *,
 			struct ap_message *);
@@ -250,7 +255,6 @@ static inline void ap_init_message(struct ap_message *ap_msg)
 static inline void ap_release_message(struct ap_message *ap_msg)
 {
 	kfree_sensitive(ap_msg->msg);
-	kfree_sensitive(ap_msg->private);
 }
 
 enum ap_sm_wait ap_sm_event(struct ap_queue *aq, enum ap_sm_event event);
drivers/s390/crypto/zcrypt_msgtype50.c +5 -11
index adc65eddaa1e..47c401f5409b 100644
@@ -438,7 +438,7 @@ static void zcrypt_msgtype50_receive(struct ap_queue *aq,
 		msg->len = sizeof(error_reply);
 	}
 out:
-	complete((struct completion *)msg->private);
+	complete(&msg->response.work);
 }
 
 static atomic_t zcrypt_step = ATOMIC_INIT(0);
@@ -454,7 +454,6 @@ static long zcrypt_msgtype50_modexpo(struct zcrypt_queue *zq,
 				     struct ica_rsa_modexpo *mex,
 				     struct ap_message *ap_msg)
 {
-	struct completion work;
 	int rc;
 
 	ap_msg->bufsize = MSGTYPE50_CRB3_MAX_MSG_SIZE;
@@ -464,15 +463,14 @@ static long zcrypt_msgtype50_modexpo(struct zcrypt_queue *zq,
 	ap_msg->receive = zcrypt_msgtype50_receive;
 	ap_msg->psmid = (((unsigned long)current->pid) << 32) +
 		atomic_inc_return(&zcrypt_step);
-	ap_msg->private = &work;
 	rc = ICAMEX_msg_to_type50MEX_msg(zq, ap_msg, mex);
 	if (rc)
 		goto out;
-	init_completion(&work);
+	init_completion(&ap_msg->response.work);
 	rc = ap_queue_message(zq->queue, ap_msg);
 	if (rc)
 		goto out;
-	rc = wait_for_completion_interruptible(&work);
+	rc = wait_for_completion_interruptible(&ap_msg->response.work);
 	if (rc == 0) {
 		rc = ap_msg->rc;
 		if (rc == 0)
@@ -485,7 +483,6 @@ static long zcrypt_msgtype50_modexpo(struct zcrypt_queue *zq,
 	}
 
 out:
-	ap_msg->private = NULL;
 	if (rc)
 		pr_debug("send me cprb at dev=%02x.%04x rc=%d\n",
 			 AP_QID_CARD(zq->queue->qid),
@@ -504,7 +501,6 @@ static long zcrypt_msgtype50_modexpo_crt(struct zcrypt_queue *zq,
 					 struct ica_rsa_modexpo_crt *crt,
 					 struct ap_message *ap_msg)
 {
-	struct completion work;
 	int rc;
 
 	ap_msg->bufsize = MSGTYPE50_CRB3_MAX_MSG_SIZE;
@@ -514,15 +510,14 @@ static long zcrypt_msgtype50_modexpo_crt(struct zcrypt_queue *zq,
 	ap_msg->receive = zcrypt_msgtype50_receive;
 	ap_msg->psmid = (((unsigned long)current->pid) << 32) +
 		atomic_inc_return(&zcrypt_step);
-	ap_msg->private = &work;
 	rc = ICACRT_msg_to_type50CRT_msg(zq, ap_msg, crt);
 	if (rc)
 		goto out;
-	init_completion(&work);
+	init_completion(&ap_msg->response.work);
 	rc = ap_queue_message(zq->queue, ap_msg);
 	if (rc)
 		goto out;
-	rc = wait_for_completion_interruptible(&work);
+	rc = wait_for_completion_interruptible(&ap_msg->response.work);
 	if (rc == 0) {
 		rc = ap_msg->rc;
 		if (rc == 0)
@@ -535,7 +530,6 @@ static long zcrypt_msgtype50_modexpo_crt(struct zcrypt_queue *zq,
 	}
 
 out:
-	ap_msg->private = NULL;
 	if (rc)
 		pr_debug("send crt cprb at dev=%02x.%04x rc=%d\n",
 			 AP_QID_CARD(zq->queue->qid),
drivers/s390/crypto/zcrypt_msgtype6.c +27 -47

219 lines not on this page · raw message

Signature · 1 line
2.43.0
author maintainer
#4 lore raw

PATCH v2 2/20 s390/ap/zcrypt: Rework AP message buffer allocation

In reply to Harald Freudenberger

Slight rework on the way how AP message buffers are allocated. Instead of having multiple places with kmalloc() calls all the AP message buffers are now allocated and freed on exactly one place: ap_init_apmsg() allocates the current AP bus max limit of ap_max_msg_size (defaults to 12KB). The AP message buffer is then freed in ap_release_apmsg().

---
 drivers/s390/crypto/ap_bus.c           | 30 ++++++++++++++++
 drivers/s390/crypto/ap_bus.h           | 21 ++---------
 drivers/s390/crypto/zcrypt_api.c       | 49 +++++++++++++++-----------
 drivers/s390/crypto/zcrypt_msgtype50.c | 20 ++++++-----
 drivers/s390/crypto/zcrypt_msgtype6.c  | 35 +++++++++---------
 5 files changed, 90 insertions(+), 65 deletions(-)
drivers/s390/crypto/ap_bus.c +30 -0
index 26e1ea1940ec..4940eaf538e9 100644
@@ -546,6 +546,36 @@ static void ap_poll_thread_stop(void)
 #define is_card_dev(x) ((x)->parent == ap_root_device)
 #define is_queue_dev(x) ((x)->parent != ap_root_device)
 
+/**
+ * ap_init_apmsg() - Initialize ap_message.
+ * Initialize a message before using. Otherwise this might result in
+ * unexpected behaviour.
+ */
+int ap_init_apmsg(struct ap_message *ap_msg)
+{
+	unsigned int maxmsgsize = atomic_read(&ap_max_msg_size);
+
+	memset(ap_msg, 0, sizeof(*ap_msg));
+	ap_msg->msg = kmalloc(maxmsgsize, GFP_KERNEL);
+	if (!ap_msg->msg)
+		return -ENOMEM;
+	ap_msg->bufsize = maxmsgsize;
+
+	return 0;
+}
+EXPORT_SYMBOL(ap_init_apmsg);
+
+/**
+ * ap_release_apmsg() - Release ap_message.
+ * Releases all memory used internal within the ap_message struct
+ * Currently this is the message and private field.
+ */
+void ap_release_apmsg(struct ap_message *ap_msg)
+{
+	kfree_sensitive(ap_msg->msg);
+}
+EXPORT_SYMBOL(ap_release_apmsg);
+
 /**
  * ap_bus_match()
  * @dev: Pointer to device
drivers/s390/crypto/ap_bus.h +2 -19
index 7fd24c207bdf..483231bcdea6 100644
@@ -237,25 +237,8 @@ struct ap_message {
 #define AP_MSG_FLAG_USAGE    0x0002	/* CCA, EP11: usage (no admin) msg */
 #define AP_MSG_FLAG_ADMIN    0x0004	/* CCA, EP11: admin (=control) msg */
 
-/**
- * ap_init_message() - Initialize ap_message.
- * Initialize a message before using. Otherwise this might result in
- * unexpected behaviour.
- */
-static inline void ap_init_message(struct ap_message *ap_msg)
-{
-	memset(ap_msg, 0, sizeof(*ap_msg));
-}
-
-/**
- * ap_release_message() - Release ap_message.
- * Releases all memory used internal within the ap_message struct
- * Currently this is the message and private field.
- */
-static inline void ap_release_message(struct ap_message *ap_msg)
-{
-	kfree_sensitive(ap_msg->msg);
-}
+int ap_init_apmsg(struct ap_message *ap_msg);
+void ap_release_apmsg(struct ap_message *ap_msg);
 
 enum ap_sm_wait ap_sm_event(struct ap_queue *aq, enum ap_sm_event event);
 enum ap_sm_wait ap_sm_event_loop(struct ap_queue *aq, enum ap_sm_event event);
drivers/s390/crypto/zcrypt_api.c +29 -20

132 lines not on this page · raw message

drivers/s390/crypto/zcrypt_msgtype50.c +12 -8
index 47c401f5409b..fc0a2a053dc2 100644
@@ -449,6 +449,10 @@ static atomic_t zcrypt_step = ATOMIC_INIT(0);
  * @zq: pointer to zcrypt_queue structure that identifies the
  *	CEXxA device to the request distributor
  * @mex: pointer to the modexpo request buffer
+ * This function assumes that ap_msg has been initialized with
+ * ap_init_apmsg() and thus a valid buffer with the size of
+ * ap_msg->bufsize is available within ap_msg. Also the caller has
+ * to make sure ap_release_apmsg() is always called even on failure.
  */
 static long zcrypt_msgtype50_modexpo(struct zcrypt_queue *zq,
 				     struct ica_rsa_modexpo *mex,
@@ -456,10 +460,8 @@ static long zcrypt_msgtype50_modexpo(struct zcrypt_queue *zq,
 {
 	int rc;
 
-	ap_msg->bufsize = MSGTYPE50_CRB3_MAX_MSG_SIZE;
-	ap_msg->msg = kmalloc(ap_msg->bufsize, GFP_KERNEL);
-	if (!ap_msg->msg)
-		return -ENOMEM;
+	if (ap_msg->bufsize < MSGTYPE50_CRB3_MAX_MSG_SIZE)
+		return -EMSGSIZE;
 	ap_msg->receive = zcrypt_msgtype50_receive;
 	ap_msg->psmid = (((unsigned long)current->pid) << 32) +
 		atomic_inc_return(&zcrypt_step);
@@ -496,6 +498,10 @@ static long zcrypt_msgtype50_modexpo(struct zcrypt_queue *zq,
  * @zq: pointer to zcrypt_queue structure that identifies the
  *	CEXxA device to the request distributor
  * @crt: pointer to the modexpoc_crt request buffer
+ * This function assumes that ap_msg has been initialized with
+ * ap_init_apmsg() and thus a valid buffer with the size of
+ * ap_msg->bufsize is available within ap_msg. Also the caller has
+ * to make sure ap_release_apmsg() is always called even on failure.
  */
 static long zcrypt_msgtype50_modexpo_crt(struct zcrypt_queue *zq,
 					 struct ica_rsa_modexpo_crt *crt,
@@ -503,10 +509,8 @@ static long zcrypt_msgtype50_modexpo_crt(struct zcrypt_queue *zq,
 {
 	int rc;
 
-	ap_msg->bufsize = MSGTYPE50_CRB3_MAX_MSG_SIZE;
-	ap_msg->msg = kmalloc(ap_msg->bufsize, GFP_KERNEL);
-	if (!ap_msg->msg)
-		return -ENOMEM;
+	if (ap_msg->bufsize < MSGTYPE50_CRB3_MAX_MSG_SIZE)
+		return -EMSGSIZE;
 	ap_msg->receive = zcrypt_msgtype50_receive;
 	ap_msg->psmid = (((unsigned long)current->pid) << 32) +
 		atomic_inc_return(&zcrypt_step);
drivers/s390/crypto/zcrypt_msgtype6.c +17 -18
index 521cc0b39990..76972027edfd 100644
@@ -1052,9 +1052,10 @@ static long zcrypt_msgtype6_modexpo_crt(struct zcrypt_queue *zq,
  * Prepare a CCA AP msg: fetch the required data from userspace,
  * prepare the AP msg, fill some info into the ap_message struct,
  * extract some data from the CPRB and give back to the caller.
- * This function allocates memory and needs an ap_msg prepared
- * by the caller with ap_init_message(). Also the caller has to
- * make sure ap_release_message() is always called even on failure.
+ * This function assumes that ap_msg has been initialized with
+ * ap_init_apmsg() and thus a valid buffer with the size of
+ * ap_msg->bufsize is available within ap_msg. Also the caller has
+ * to make sure ap_release_apmsg() is always called even on failure.
  */
 int prep_cca_ap_msg(bool userspace, struct ica_xcRB *xcrb,
 		    struct ap_message *ap_msg,
@@ -1062,10 +1063,6 @@ int prep_cca_ap_msg(bool userspace, struct ica_xcRB *xcrb,
 {
 	struct ap_response_type *resp_type = &ap_msg->response;
 
-	ap_msg->bufsize = atomic_read(&ap_max_msg_size);
-	ap_msg->msg = kmalloc(ap_msg->bufsize, GFP_KERNEL);
-	if (!ap_msg->msg)
-		return -ENOMEM;
 	ap_msg->receive = zcrypt_msgtype6_receive;
 	ap_msg->psmid = (((unsigned long)current->pid) << 32) +
 				atomic_inc_return(&zcrypt_step);
@@ -1145,9 +1142,10 @@ static long zcrypt_msgtype6_send_cprb(bool userspace, struct zcrypt_queue *zq,
  * Prepare an EP11 AP msg: fetch the required data from userspace,
  * prepare the AP msg, fill some info into the ap_message struct,
  * extract some data from the CPRB and give back to the caller.
- * This function allocates memory and needs an ap_msg prepared
- * by the caller with ap_init_message(). Also the caller has to
- * make sure ap_release_message() is always called even on failure.
+ * This function assumes that ap_msg has been initialized with
+ * ap_init_apmsg() and thus a valid buffer with the size of
+ * ap_msg->bufsize is available within ap_msg. Also the caller has
+ * to make sure ap_release_apmsg() is always called even on failure.
  */
 int prep_ep11_ap_msg(bool userspace, struct ep11_urb *xcrb,
 		     struct ap_message *ap_msg,
@@ -1155,10 +1153,6 @@ int prep_ep11_ap_msg(bool userspace, struct ep11_urb *xcrb,
 {
 	struct ap_response_type *resp_type = &ap_msg->response;
 
-	ap_msg->bufsize = atomic_read(&ap_max_msg_size);
-	ap_msg->msg = kmalloc(ap_msg->bufsize, GFP_KERNEL);
-	if (!ap_msg->msg)
-		return -ENOMEM;
 	ap_msg->receive = zcrypt_msgtype6_receive_ep11;
 	ap_msg->psmid = (((unsigned long)current->pid) << 32) +
 				atomic_inc_return(&zcrypt_step);
@@ -1259,15 +1253,20 @@ static long zcrypt_msgtype6_send_ep11_cprb(bool userspace, struct zcrypt_queue *
 	return rc;
 }
 
+/*
+ * Prepare a CEXXC get random request ap message.
+ * This function assumes that ap_msg has been initialized with
+ * ap_init_apmsg() and thus a valid buffer with the size of
+ * ap_max_msg_size is available within ap_msg. Also the caller has
+ * to make sure ap_release_apmsg() is always called even on failure.
+ */
 int prep_rng_ap_msg(struct ap_message *ap_msg, int *func_code,
 		    unsigned int *domain)
 {
 	struct ap_response_type *resp_type = &ap_msg->response;
 
-	ap_msg->bufsize = AP_DEFAULT_MAX_MSG_SIZE;
-	ap_msg->msg = kmalloc(ap_msg->bufsize, GFP_KERNEL);
-	if (!ap_msg->msg)
-		return -ENOMEM;
+	if (ap_msg->bufsize < AP_DEFAULT_MAX_MSG_SIZE)
+		return -EMSGSIZE;
 	ap_msg->receive = zcrypt_msgtype6_receive;
 	ap_msg->psmid = (((unsigned long)current->pid) << 32) +
 				atomic_inc_return(&zcrypt_step);
Signature · 1 line
2.43.0
author maintainer
#6 lore raw

PATCH v2 3/20 s390/ap: Introduce ap message buffer pool

In reply to Harald Freudenberger

There is a need for a do-not-allocate-memory path through the ap bus layer. When ap_init_apmsg() with use_mempool set to true is called, instead of kmalloc() the ap message buffer is allocated from the ap_msg_pool. This pool only holds a limited amount of buffers: ap_msg_pool_min_items with the item size AP_DEFAULT_MAX_MSG_SIZE and exactly one of these items (if available) is returned if ap_init_apmsg() with the use_mempool arg set to true is called. When this pool is exhausted and use_mempool is set true, ap_init_apmsg() returns -ENOMEM without any attempt to allocate memory.

Default values for this mempool of ap messages is:
* Each buffer is 12KB (that is the default AP bus size and all the urgend messages should fit into this space).
* Minimum items held in the pool is 8. This value is adjustable via module parameter ap.msgpool_min_items.

The zcrypt layer may use this flag to indicate to the ap bus that the processing path for this message should not allocate memory but should use pre-allocated memory buffer instead. This is to prevent deadlocks with crypto and io for example with encrypted swap volumes.

---
 drivers/s390/crypto/ap_bus.c     | 57 ++++++++++++++++++++++++++++----
 drivers/s390/crypto/ap_bus.h     |  9 ++---
 drivers/s390/crypto/zcrypt_api.c | 10 +++---
 3 files changed, 60 insertions(+), 16 deletions(-)
drivers/s390/crypto/ap_bus.c +50 -7
index 4940eaf538e9..75dbab9dff4a 100644
@@ -40,6 +40,7 @@
 #include <linux/module.h>
 #include <asm/uv.h>
 #include <asm/chsc.h>
+#include <linux/mempool.h>
 
 #include "ap_bus.h"
 #include "ap_debug.h"
@@ -101,6 +102,23 @@ static struct ap_config_info *const ap_qci_info_old = &qci[1];
  */
 debug_info_t *ap_dbf_info;
 
+/*
+ * There is a need for a do-not-allocate-memory path through the
+ * ap bus layer. When ap_init_apmsg() with use_mempool set to true
+ * is called, instead of kmalloc() the ap message buffer is
+ * allocated from the ap_msg_pool. This pool only holds a limited
+ * amount of buffers: ap_msg_pool_min_items with the item size
+ * AP_DEFAULT_MAX_MSG_SIZE and exactly one of these items (if available)
+ * is returned if ap_init_apmsg() with the use_mempool arg set to true
+ * is called. When this pool is exhausted and use_mempool is set true,
+ * ap_init_apmsg() returns -ENOMEM without any attempt to allocate
+ * memory.
+ */
+static mempool_t *ap_msg_pool;
+static unsigned int ap_msg_pool_min_items = 8;
+module_param_named(msgpool_min_items, ap_msg_pool_min_items, uint, 0440);
+MODULE_PARM_DESC(msgpool_min_items, "AP message pool minimal items.");
+
 /*
  * AP bus rescan related things.
  */
@@ -548,14 +566,25 @@ static void ap_poll_thread_stop(void)
 
 /**
  * ap_init_apmsg() - Initialize ap_message.
- * Initialize a message before using. Otherwise this might result in
- * unexpected behaviour.
+ * Initialize struct ap_message and allocate buffer to construct
+ * the ap message.
  */
-int ap_init_apmsg(struct ap_message *ap_msg)
+int ap_init_apmsg(struct ap_message *ap_msg, bool use_mempool)
 {
-	unsigned int maxmsgsize = atomic_read(&ap_max_msg_size);
+	unsigned int maxmsgsize;
 
 	memset(ap_msg, 0, sizeof(*ap_msg));
+
+	if (use_mempool) {
+		ap_msg->msg = mempool_alloc_preallocated(ap_msg_pool);
+		if (!ap_msg->msg)
+			return -ENOMEM;
+		ap_msg->bufsize = AP_DEFAULT_MAX_MSG_SIZE;
+		ap_msg->flags |= AP_MSG_FLAG_MEMPOOL;
+		return 0;
+	}
+
+	maxmsgsize = atomic_read(&ap_max_msg_size);
 	ap_msg->msg = kmalloc(maxmsgsize, GFP_KERNEL);
 	if (!ap_msg->msg)
 		return -ENOMEM;
@@ -567,12 +596,16 @@ EXPORT_SYMBOL(ap_init_apmsg);
 
 /**
  * ap_release_apmsg() - Release ap_message.
- * Releases all memory used internal within the ap_message struct
- * Currently this is the message and private field.
+ * Cleanup struct ap_message and release all memory held.
  */
 void ap_release_apmsg(struct ap_message *ap_msg)
 {
-	kfree_sensitive(ap_msg->msg);
+	if (ap_msg->flags & AP_MSG_FLAG_MEMPOOL) {
+		memzero_explicit(ap_msg->msg, ap_msg->bufsize);
+		mempool_free(ap_msg->msg, ap_msg_pool);
+	} else {
+		kfree_sensitive(ap_msg->msg);
+	}
 }
 EXPORT_SYMBOL(ap_release_apmsg);
 
@@ -2461,6 +2494,14 @@ static int __init ap_module_init(void)
 	/* init ap_queue hashtable */
 	hash_init(ap_queues);
 
+	/* create ap msg buffer memory pool */
+	ap_msg_pool = mempool_create_kmalloc_pool(ap_msg_pool_min_items,
+						  AP_DEFAULT_MAX_MSG_SIZE);
+	if (IS_ERR(ap_msg_pool)) {
+		ap_msg_pool = NULL;
+		goto out;
+	}
+
 	/* set up the AP permissions (ioctls, ap and aq masks) */
 	ap_perms_init();
 
@@ -2507,6 +2548,7 @@ static int __init ap_module_init(void)
 out_bus:
 	bus_unregister(&ap_bus_type);
 out:
+	mempool_destroy(ap_msg_pool);
 	ap_debug_exit();
 	return rc;
 }
@@ -2517,6 +2559,7 @@ static void __exit ap_module_exit(void)
 	ap_irq_exit();
 	root_device_unregister(ap_root_device);
 	bus_unregister(&ap_bus_type);
+	mempool_destroy(ap_msg_pool);
 	ap_debug_exit();
 }
 
drivers/s390/crypto/ap_bus.h +5 -4
index 483231bcdea6..a7bd44e5cc76 100644
@@ -233,11 +233,12 @@ struct ap_message {
 			struct ap_message *);
 };
 
-#define AP_MSG_FLAG_SPECIAL  0x0001	/* flag msg as 'special' with NQAP */
-#define AP_MSG_FLAG_USAGE    0x0002	/* CCA, EP11: usage (no admin) msg */
-#define AP_MSG_FLAG_ADMIN    0x0004	/* CCA, EP11: admin (=control) msg */
+#define AP_MSG_FLAG_SPECIAL  0x0001   /* flag msg as 'special' with NQAP */
+#define AP_MSG_FLAG_USAGE    0x0002   /* CCA, EP11: usage (no admin) msg */
+#define AP_MSG_FLAG_ADMIN    0x0004   /* CCA, EP11: admin (=control) msg */
+#define AP_MSG_FLAG_MEMPOOL  0x0008   /* ap msg buffer allocated from mempool */
 
-int ap_init_apmsg(struct ap_message *ap_msg);
+int ap_init_apmsg(struct ap_message *ap_msg, bool use_mempool);
 void ap_release_apmsg(struct ap_message *ap_msg);
 
 enum ap_sm_wait ap_sm_event(struct ap_queue *aq, enum ap_sm_event event);
drivers/s390/crypto/zcrypt_api.c +5 -5
index 78df25da0b95..ad09c5306e28 100644
@@ -648,7 +648,7 @@ static long zcrypt_rsa_modexpo(struct ap_perms *perms,
 
 	trace_s390_zcrypt_req(mex, TP_ICARSAMODEXPO);
 
-	rc = ap_init_apmsg(&ap_msg);
+	rc = ap_init_apmsg(&ap_msg, false);
 	if (rc)
 		goto out;
 
@@ -753,7 +753,7 @@ static long zcrypt_rsa_crt(struct ap_perms *perms,
 
 	trace_s390_zcrypt_req(crt, TP_ICARSACRT);
 
-	rc = ap_init_apmsg(&ap_msg);
+	rc = ap_init_apmsg(&ap_msg, false);
 	if (rc)
 		goto out;
 
@@ -861,7 +861,7 @@ static long _zcrypt_send_cprb(bool userspace, struct ap_perms *perms,
 
 	xcrb->status = 0;
 
-	rc = ap_init_apmsg(&ap_msg);
+	rc = ap_init_apmsg(&ap_msg, false);
 	if (rc)
 		goto out;
 
@@ -1045,7 +1045,7 @@ static long _zcrypt_send_ep11_cprb(bool userspace, struct ap_perms *perms,
 
 	trace_s390_zcrypt_req(xcrb, TP_ZSENDEP11CPRB);
 
-	rc = ap_init_apmsg(&ap_msg);
+	rc = ap_init_apmsg(&ap_msg, false);
 	if (rc)
 		goto out;
 
@@ -1219,7 +1219,7 @@ static long zcrypt_rng(char *buffer)
 
 	trace_s390_zcrypt_req(buffer, TP_HWRNGCPRB);
 
-	rc = ap_init_apmsg(&ap_msg);
+	rc = ap_init_apmsg(&ap_msg, false);
 	if (rc)
 		goto out;
 	rc = prep_rng_ap_msg(&ap_msg, &func_code, &domain);
Signature · 1 line
2.43.0
author maintainer
#9 lore raw

PATCH v2 4/20 s390/ap/zcrypt: New xflag parameter and extension of the ap msg flags

In reply to Harald Freudenberger

Introduce a new flag parameter for the both cprb send functions zcrypt_send_cprb() and zcrypt_send_ep11_cprb(). This new xflags parameter ("execution flags") shall be used to provide execution hints and flags for this crypto request.

There are two flags implemented to be used with these functions:
* ZCRYPT_XFLAG_USERSPACE - indicates to the lower layers that all the ptrs address userspace. So when construction the ap msg copy_from_user() is to be used. If this flag is NOT set, the ptrs address kernel memory and thus memcpy() is to be used.
* ZCRYPT_XFLAG_NOMEMALLOC - indicates that this task must not allocate memory which may be allocated with io operations. For the zcrypt layer this limits the number of EP11 targets to 16 APQNs. But as this flag is passed down the stack, it may induce further restrictions.

For the AP bus and zcrypt message layer this means:
* The ZCRYPT_XFLAG_USERSPACE is mapped to the AP flag AP_MSG_FLAG_USERSPACE stored into the flags field of each ap message in the ap_message struct. This replaces the extra function parameter "userspace" and makes some function invocations simpler.
* The ZCRYPT_XFLAG_NOMEMALLOC causes the AP message buffer to use buffer space from the AP message mempool instead of allocating memory via kmalloc. Note that the buffer space from the AP message mem pool is limited to 12KB per item.

---
 drivers/s390/crypto/ap_bus.c          |  6 +-
 drivers/s390/crypto/ap_bus.h          | 11 ++--
 drivers/s390/crypto/zcrypt_api.c      | 90 +++++++++++++++------------
 drivers/s390/crypto/zcrypt_api.h      | 36 +++++++----
 drivers/s390/crypto/zcrypt_ccamisc.c  | 16 ++---
 drivers/s390/crypto/zcrypt_ep11misc.c | 10 +--
 drivers/s390/crypto/zcrypt_msgtype6.c | 12 ++--
 drivers/s390/crypto/zcrypt_msgtype6.h |  4 +-
 8 files changed, 107 insertions(+), 78 deletions(-)
drivers/s390/crypto/ap_bus.c +3 -3
index 75dbab9dff4a..7b092fb82ac3 100644
@@ -569,18 +569,18 @@ static void ap_poll_thread_stop(void)
  * Initialize struct ap_message and allocate buffer to construct
  * the ap message.
  */
-int ap_init_apmsg(struct ap_message *ap_msg, bool use_mempool)
+int ap_init_apmsg(struct ap_message *ap_msg, u32 flags)
 {
 	unsigned int maxmsgsize;
 
 	memset(ap_msg, 0, sizeof(*ap_msg));
+	ap_msg->flags = flags;
 
-	if (use_mempool) {
+	if (flags & AP_MSG_FLAG_MEMPOOL) {
 		ap_msg->msg = mempool_alloc_preallocated(ap_msg_pool);
 		if (!ap_msg->msg)
 			return -ENOMEM;
 		ap_msg->bufsize = AP_DEFAULT_MAX_MSG_SIZE;
-		ap_msg->flags |= AP_MSG_FLAG_MEMPOOL;
 		return 0;
 	}
 
drivers/s390/crypto/ap_bus.h +6 -5
index a7bd44e5cc76..5581fb13af73 100644
@@ -233,12 +233,13 @@ struct ap_message {
 			struct ap_message *);
 };
 
-#define AP_MSG_FLAG_SPECIAL  0x0001   /* flag msg as 'special' with NQAP */
-#define AP_MSG_FLAG_USAGE    0x0002   /* CCA, EP11: usage (no admin) msg */
-#define AP_MSG_FLAG_ADMIN    0x0004   /* CCA, EP11: admin (=control) msg */
-#define AP_MSG_FLAG_MEMPOOL  0x0008   /* ap msg buffer allocated from mempool */
+#define AP_MSG_FLAG_SPECIAL    0x0001  /* flag msg as 'special' with NQAP */
+#define AP_MSG_FLAG_USAGE      0x0002  /* CCA, EP11: usage (no admin) msg */
+#define AP_MSG_FLAG_ADMIN      0x0004  /* CCA, EP11: admin (=control) msg */
+#define AP_MSG_FLAG_MEMPOOL    0x0008  /* ap msg buffer allocated from mempool */
+#define AP_MSG_FLAG_USERSPACE  0x0010  /* pointers address userspace memory */
 
-int ap_init_apmsg(struct ap_message *ap_msg, bool use_mempool);
+int ap_init_apmsg(struct ap_message *ap_msg, u32 flags);
 void ap_release_apmsg(struct ap_message *ap_msg);
 
 enum ap_sm_wait ap_sm_event(struct ap_queue *aq, enum ap_sm_event event);
drivers/s390/crypto/zcrypt_api.c +51 -39

282 lines not on this page · raw message

drivers/s390/crypto/zcrypt_api.h +24 -12
index 4ed481df57ca..8550a1eceb05 100644
@@ -76,17 +76,29 @@ struct zcrypt_track {
 #define TRACK_AGAIN_CARD_WEIGHT_PENALTY  1000
 #define TRACK_AGAIN_QUEUE_WEIGHT_PENALTY 10000
 
+/*
+ * xflags - to be used with zcrypt_send_cprb() and
+ * zcrypt_send_ep11_cprb() for the xflags parameter.
+ */
+#define ZCRYPT_XFLAG_USERSPACE  0x0001  /* data ptrs address userspace */
+#define ZCRYPT_XFLAG_NOMEMALLOC 0x0002  /* do not allocate fresh memory */
+
 struct zcrypt_ops {
-	long (*rsa_modexpo)(struct zcrypt_queue *, struct ica_rsa_modexpo *,
-			    struct ap_message *);
-	long (*rsa_modexpo_crt)(struct zcrypt_queue *,
-				struct ica_rsa_modexpo_crt *,
-				struct ap_message *);
-	long (*send_cprb)(bool userspace, struct zcrypt_queue *, struct ica_xcRB *,
-			  struct ap_message *);
-	long (*send_ep11_cprb)(bool userspace, struct zcrypt_queue *, struct ep11_urb *,
-			       struct ap_message *);
-	long (*rng)(struct zcrypt_queue *, char *, struct ap_message *);
+	long (*rsa_modexpo)(struct zcrypt_queue *zq,
+			    struct ica_rsa_modexpo *icamodexp,
+			    struct ap_message *apmsg);
+	long (*rsa_modexpo_crt)(struct zcrypt_queue *zq,
+				struct ica_rsa_modexpo_crt *icacrt,
+				struct ap_message *apmsg);
+	long (*send_cprb)(struct zcrypt_queue *zq,
+			  struct ica_xcRB *icaxcrb,
+			  struct ap_message *apmsg);
+	long (*send_ep11_cprb)(struct zcrypt_queue *zq,
+			       struct ep11_urb *ep11urb,
+			       struct ap_message *apmsg);
+	long (*rng)(struct zcrypt_queue *zq,
+		    char *buffer,
+		    struct ap_message *apmsg);
 	struct list_head list;		/* zcrypt ops list. */
 	struct module *owner;
 	int variant;
@@ -161,8 +173,8 @@ void zcrypt_msgtype_unregister(struct zcrypt_ops *);
 struct zcrypt_ops *zcrypt_msgtype(unsigned char *, int);
 int zcrypt_api_init(void);
 void zcrypt_api_exit(void);
-long zcrypt_send_cprb(struct ica_xcRB *xcRB);
-long zcrypt_send_ep11_cprb(struct ep11_urb *urb);
+long zcrypt_send_cprb(struct ica_xcRB *xcRB, u32 xflags);
+long zcrypt_send_ep11_cprb(struct ep11_urb *urb, u32 xflags);
 void zcrypt_device_status_mask_ext(struct zcrypt_device_status_ext *devstatus);
 int zcrypt_device_status_ext(int card, int queue,
 			     struct zcrypt_device_status_ext *devstatus);
drivers/s390/crypto/zcrypt_ccamisc.c +8 -8
index 43a27cb3db84..521baaea06ff 100644
@@ -379,7 +379,7 @@ int cca_genseckey(u16 cardnr, u16 domain,
 	prep_xcrb(&xcrb, cardnr, preqcblk, prepcblk);
 
 	/* forward xcrb with request CPRB and reply CPRB to zcrypt dd */
-	rc = zcrypt_send_cprb(&xcrb);
+	rc = zcrypt_send_cprb(&xcrb, 0);
 	if (rc) {
 		ZCRYPT_DBF_ERR("%s zcrypt_send_cprb (cardnr=%d domain=%d) failed, errno %d\n",
 			       __func__, (int)cardnr, (int)domain, rc);
@@ -517,7 +517,7 @@ int cca_clr2seckey(u16 cardnr, u16 domain, u32 keybitsize,
 	prep_xcrb(&xcrb, cardnr, preqcblk, prepcblk);
 
 	/* forward xcrb with request CPRB and reply CPRB to zcrypt dd */
-	rc = zcrypt_send_cprb(&xcrb);
+	rc = zcrypt_send_cprb(&xcrb, 0);
 	if (rc) {
 		ZCRYPT_DBF_ERR("%s zcrypt_send_cprb (cardnr=%d domain=%d) failed, rc=%d\n",
 			       __func__, (int)cardnr, (int)domain, rc);
@@ -644,7 +644,7 @@ int cca_sec2protkey(u16 cardnr, u16 domain,
 	prep_xcrb(&xcrb, cardnr, preqcblk, prepcblk);
 
 	/* forward xcrb with request CPRB and reply CPRB to zcrypt dd */
-	rc = zcrypt_send_cprb(&xcrb);
+	rc = zcrypt_send_cprb(&xcrb, 0);
 	if (rc) {
 		ZCRYPT_DBF_ERR("%s zcrypt_send_cprb (cardnr=%d domain=%d) failed, rc=%d\n",
 			       __func__, (int)cardnr, (int)domain, rc);
@@ -872,7 +872,7 @@ int cca_gencipherkey(u16 cardnr, u16 domain, u32 keybitsize, u32 keygenflags,
 	prep_xcrb(&xcrb, cardnr, preqcblk, prepcblk);
 
 	/* forward xcrb with request CPRB and reply CPRB to zcrypt dd */
-	rc = zcrypt_send_cprb(&xcrb);
+	rc = zcrypt_send_cprb(&xcrb, 0);
 	if (rc) {
 		ZCRYPT_DBF_ERR("%s zcrypt_send_cprb (cardnr=%d domain=%d) failed, rc=%d\n",
 			       __func__, (int)cardnr, (int)domain, rc);
@@ -1038,7 +1038,7 @@ static int _ip_cprb_helper(u16 cardnr, u16 domain,
 	prep_xcrb(&xcrb, cardnr, preqcblk, prepcblk);
 
 	/* forward xcrb with request CPRB and reply CPRB to zcrypt dd */
-	rc = zcrypt_send_cprb(&xcrb);
+	rc = zcrypt_send_cprb(&xcrb, 0);
 	if (rc) {
 		ZCRYPT_DBF_ERR("%s zcrypt_send_cprb (cardnr=%d domain=%d) failed, rc=%d\n",
 			       __func__, (int)cardnr, (int)domain, rc);
@@ -1249,7 +1249,7 @@ int cca_cipher2protkey(u16 cardnr, u16 domain, const u8 *ckey,
 	prep_xcrb(&xcrb, cardnr, preqcblk, prepcblk);
 
 	/* forward xcrb with request CPRB and reply CPRB to zcrypt dd */
-	rc = zcrypt_send_cprb(&xcrb);
+	rc = zcrypt_send_cprb(&xcrb, 0);
 	if (rc) {
 		ZCRYPT_DBF_ERR("%s zcrypt_send_cprb (cardnr=%d domain=%d) failed, rc=%d\n",
 			       __func__, (int)cardnr, (int)domain, rc);
@@ -1412,7 +1412,7 @@ int cca_ecc2protkey(u16 cardnr, u16 domain, const u8 *key,
 	prep_xcrb(&xcrb, cardnr, preqcblk, prepcblk);
 
 	/* forward xcrb with request CPRB and reply CPRB to zcrypt dd */
-	rc = zcrypt_send_cprb(&xcrb);
+	rc = zcrypt_send_cprb(&xcrb, 0);
 	if (rc) {
 		ZCRYPT_DBF_ERR("%s zcrypt_send_cprb (cardnr=%d domain=%d) failed, rc=%d\n",
 			       __func__, (int)cardnr, (int)domain, rc);
@@ -1526,7 +1526,7 @@ int cca_query_crypto_facility(u16 cardnr, u16 domain,
 	prep_xcrb(&xcrb, cardnr, preqcblk, prepcblk);
 
 	/* forward xcrb with request CPRB and reply CPRB to zcrypt dd */
-	rc = zcrypt_send_cprb(&xcrb);
+	rc = zcrypt_send_cprb(&xcrb, 0);
 	if (rc) {
 		ZCRYPT_DBF_ERR("%s zcrypt_send_cprb (cardnr=%d domain=%d) failed, rc=%d\n",
 			       __func__, (int)cardnr, (int)domain, rc);
drivers/s390/crypto/zcrypt_ep11misc.c +5 -5
index cb7e6da43602..b60e262bcaa3 100644
@@ -636,7 +636,7 @@ static int ep11_query_info(u16 cardnr, u16 domain, u32 query_type,
 		 req, sizeof(*req) + sizeof(*req_pl),
 		 rep, sizeof(*rep) + sizeof(*rep_pl) + buflen);
 
-	rc = zcrypt_send_ep11_cprb(urb);
+	rc = zcrypt_send_ep11_cprb(urb, 0);
 	if (rc) {
 		ZCRYPT_DBF_ERR("%s zcrypt_send_ep11_cprb(card=%d dom=%d) failed, rc=%d\n",
 			       __func__, (int)cardnr, (int)domain, rc);
@@ -892,7 +892,7 @@ static int _ep11_genaeskey(u16 card, u16 domain,
 		 req, sizeof(*req) + req_pl_size,
 		 rep, sizeof(*rep) + sizeof(*rep_pl));
 
-	rc = zcrypt_send_ep11_cprb(urb);
+	rc = zcrypt_send_ep11_cprb(urb, 0);
 	if (rc) {
 		ZCRYPT_DBF_ERR("%s zcrypt_send_ep11_cprb(card=%d dom=%d) failed, rc=%d\n",
 			       __func__, (int)card, (int)domain, rc);
@@ -1049,7 +1049,7 @@ static int ep11_cryptsingle(u16 card, u16 domain,
 		 req, sizeof(*req) + req_pl_size,
 		 rep, sizeof(*rep) + rep_pl_size);
 
-	rc = zcrypt_send_ep11_cprb(urb);
+	rc = zcrypt_send_ep11_cprb(urb, 0);
 	if (rc) {
 		ZCRYPT_DBF_ERR("%s zcrypt_send_ep11_cprb(card=%d dom=%d) failed, rc=%d\n",
 			       __func__, (int)card, (int)domain, rc);
@@ -1212,7 +1212,7 @@ static int _ep11_unwrapkey(u16 card, u16 domain,
 		 req, sizeof(*req) + req_pl_size,
 		 rep, sizeof(*rep) + sizeof(*rep_pl));
 
-	rc = zcrypt_send_ep11_cprb(urb);
+	rc = zcrypt_send_ep11_cprb(urb, 0);
 	if (rc) {
 		ZCRYPT_DBF_ERR("%s zcrypt_send_ep11_cprb(card=%d dom=%d) failed, rc=%d\n",
 			       __func__, (int)card, (int)domain, rc);
@@ -1372,7 +1372,7 @@ static int _ep11_wrapkey(u16 card, u16 domain,
 		 req, sizeof(*req) + req_pl_size,
 		 rep, sizeof(*rep) + sizeof(*rep_pl));
 
-	rc = zcrypt_send_ep11_cprb(urb);
+	rc = zcrypt_send_ep11_cprb(urb, 0);
 	if (rc) {
 		ZCRYPT_DBF_ERR("%s zcrypt_send_ep11_cprb(card=%d dom=%d) failed, rc=%d\n",
 			       __func__, (int)card, (int)domain, rc);
drivers/s390/crypto/zcrypt_msgtype6.c +8 -4
index 76972027edfd..8ffe7505b994 100644
@@ -1057,11 +1057,12 @@ static long zcrypt_msgtype6_modexpo_crt(struct zcrypt_queue *zq,
  * ap_msg->bufsize is available within ap_msg. Also the caller has
  * to make sure ap_release_apmsg() is always called even on failure.
  */
-int prep_cca_ap_msg(bool userspace, struct ica_xcRB *xcrb,
+int prep_cca_ap_msg(struct ica_xcRB *xcrb,
 		    struct ap_message *ap_msg,
 		    unsigned int *func_code, unsigned short **dom)
 {
 	struct ap_response_type *resp_type = &ap_msg->response;
+	bool userspace = ap_msg->flags & AP_MSG_FLAG_USERSPACE;
 
 	ap_msg->receive = zcrypt_msgtype6_receive;
 	ap_msg->psmid = (((unsigned long)current->pid) << 32) +
@@ -1077,11 +1078,12 @@ int prep_cca_ap_msg(bool userspace, struct ica_xcRB *xcrb,
  *	CEXxC device to the request distributor
  * @xcrb: pointer to the send_cprb request buffer
  */
-static long zcrypt_msgtype6_send_cprb(bool userspace, struct zcrypt_queue *zq,
+static long zcrypt_msgtype6_send_cprb(struct zcrypt_queue *zq,
 				      struct ica_xcRB *xcrb,
 				      struct ap_message *ap_msg)
 {
 	struct ap_response_type *resp_type = &ap_msg->response;
+	bool userspace = ap_msg->flags & AP_MSG_FLAG_USERSPACE;
 	struct {
 		struct type6_hdr hdr;
 		struct CPRBX cprbx;
@@ -1147,11 +1149,12 @@ static long zcrypt_msgtype6_send_cprb(bool userspace, struct zcrypt_queue *zq,
  * ap_msg->bufsize is available within ap_msg. Also the caller has
  * to make sure ap_release_apmsg() is always called even on failure.
  */
-int prep_ep11_ap_msg(bool userspace, struct ep11_urb *xcrb,
+int prep_ep11_ap_msg(struct ep11_urb *xcrb,
 		     struct ap_message *ap_msg,
 		     unsigned int *func_code, unsigned int *domain)
 {
 	struct ap_response_type *resp_type = &ap_msg->response;
+	bool userspace = ap_msg->flags & AP_MSG_FLAG_USERSPACE;
 
 	ap_msg->receive = zcrypt_msgtype6_receive_ep11;
 	ap_msg->psmid = (((unsigned long)current->pid) << 32) +
@@ -1168,12 +1171,13 @@ int prep_ep11_ap_msg(bool userspace, struct ep11_urb *xcrb,
  *	  CEX4P device to the request distributor
  * @xcrb: pointer to the ep11 user request block
  */
-static long zcrypt_msgtype6_send_ep11_cprb(bool userspace, struct zcrypt_queue *zq,
+static long zcrypt_msgtype6_send_ep11_cprb(struct zcrypt_queue *zq,
 					   struct ep11_urb *xcrb,
 					   struct ap_message *ap_msg)
 {
 	int rc;
 	unsigned int lfmt;
+	bool userspace = ap_msg->flags & AP_MSG_FLAG_USERSPACE;
 	struct ap_response_type *resp_type = &ap_msg->response;
 	struct {
 		struct type6_hdr hdr;
drivers/s390/crypto/zcrypt_msgtype6.h +2 -2
index 6f5ced8d6cda..b2944f5b2d18 100644
@@ -94,10 +94,10 @@ struct type86_fmt2_ext {
 	unsigned int	  offset4;	/* 0x00000000			*/
 } __packed;
 
-int prep_cca_ap_msg(bool userspace, struct ica_xcRB *xcrb,
+int prep_cca_ap_msg(struct ica_xcRB *xcrb,
 		    struct ap_message *ap_msg,
 		    unsigned int *fc, unsigned short **dom);
-int prep_ep11_ap_msg(bool userspace, struct ep11_urb *xcrb,
+int prep_ep11_ap_msg(struct ep11_urb *xcrb,
 		     struct ap_message *ap_msg,
 		     unsigned int *fc, unsigned int *dom);
 int prep_rng_ap_msg(struct ap_message *ap_msg,
Signature · 1 line
2.43.0
author maintainer
#12 lore raw

PATCH v2 5/20 s390/zcrypt: Introduce cprb mempool for cca misc functions

In reply to Harald Freudenberger

Introduce a cprb mempool for the zcrypt cca misc functions (zcrypt_ccamisc.*) do some preparation rework to support a do-not-allocate path through some zcrypt cca misc functions.

The mempool is by default space for 4 cprbs with each 16KB. For CCA a CPRB needs to hold the request and the reply, so the pool items only support requests/replies with a limit of about 8KB. The minimal number of items in the mempool can get adjusted via module parameter zcrypt.cca_cprbpool_min_items on module load.

This is only part of an rework to support a new xflag ZCRYPT_XFLAG_NOMEMALLOC but not yet complete.

---
 drivers/s390/crypto/zcrypt_api.c     |  13 ++-
 drivers/s390/crypto/zcrypt_api.h     |   2 +
 drivers/s390/crypto/zcrypt_ccamisc.c | 116 ++++++++++++++++++++-------
 drivers/s390/crypto/zcrypt_ccamisc.h |   1 +
 4 files changed, 101 insertions(+), 31 deletions(-)
drivers/s390/crypto/zcrypt_api.c +12 -1
index 659fe7afb67e..d7915c3fe3c0 100644
@@ -50,6 +50,10 @@ MODULE_DESCRIPTION("Cryptographic Coprocessor interface, " \
 		   "Copyright IBM Corp. 2001, 2012");
 MODULE_LICENSE("GPL");
 
+unsigned int zcrypt_cca_cprbpool_min_items = 4;
+module_param_named(cca_cprbpool_min_items, zcrypt_cca_cprbpool_min_items, uint, 0440);
+MODULE_PARM_DESC(cca_cprbpool_min_items, "CCA CPRB pool minimal items.");
+
 /*
  * zcrypt tracepoint functions
  */
@@ -2159,7 +2163,11 @@ int __init zcrypt_api_init(void)
 
 	rc = zcdn_init();
 	if (rc)
-		goto out;
+		goto out_zcdn_init_failed;
+
+	rc = zcrypt_ccamisc_init();
+	if (rc)
+		goto out_ccamisc_init_failed;
 
 	/* Register the request sprayer. */
 	rc = misc_register(&zcrypt_misc_device);
@@ -2172,7 +2180,10 @@ int __init zcrypt_api_init(void)
 	return 0;
 
 out_misc_register_failed:
+	zcrypt_ccamisc_exit();
+out_ccamisc_init_failed:
 	zcdn_exit();
+out_zcdn_init_failed:
 	zcrypt_debug_exit();
 out:
 	return rc;
drivers/s390/crypto/zcrypt_api.h +2 -0
index 8550a1eceb05..d2640ea5d080 100644
@@ -144,6 +144,8 @@ extern atomic_t zcrypt_rescan_req;
 extern spinlock_t zcrypt_list_lock;
 extern struct list_head zcrypt_card_list;
 
+extern unsigned int zcrypt_cca_cprbpool_min_items;
+
 #define for_each_zcrypt_card(_zc) \
 	list_for_each_entry(_zc, &zcrypt_card_list, list)
 
drivers/s390/crypto/zcrypt_ccamisc.c +86 -30

316 lines not on this page · raw message

drivers/s390/crypto/zcrypt_ccamisc.h +1 -0
index 26bdca702523..273edf2bb036 100644
@@ -272,6 +272,7 @@ struct cca_info {
  */
 int cca_get_info(u16 card, u16 dom, struct cca_info *ci, int verify);
 
+int zcrypt_ccamisc_init(void);
 void zcrypt_ccamisc_exit(void);
 
 #endif /* _ZCRYPT_CCAMISC_H_ */
Signature · 1 line
2.43.0
author maintainer
#15 lore raw

PATCH v2 6/20 s390/zcrypt: Introduce cprb mempool for ep11 misc functions

In reply to Harald Freudenberger

Introduce a cprb mempool for the zcrypt ep11 misc functions (zcrypt_ep11misc.*) do some preparation rework to support a do-not-allocate path through some zcrypt cca misc functions.

The mempool is by default space for 8 cprbs with each 8KB. For EP11 a CPRB either holds the request or the reply. So for a request/reply there is always a couple of cprb buffers needed. The minimal number of items in the mempool can get adjusted via module parameter zcrypt.ep11_cprbpool_min_items on module load.

This is only part of an rework to support a new xflag ZCRYPT_XFLAG_NOMEMALLOC but not yet complete.

---
 drivers/s390/crypto/zcrypt_api.c      |  10 ++
 drivers/s390/crypto/zcrypt_api.h      |   1 +
 drivers/s390/crypto/zcrypt_ep11misc.c | 158 ++++++++++++++++----------
 drivers/s390/crypto/zcrypt_ep11misc.h |   1 +
 4 files changed, 109 insertions(+), 61 deletions(-)
drivers/s390/crypto/zcrypt_api.c +10 -0
index d7915c3fe3c0..62cc05881b13 100644
@@ -54,6 +54,10 @@ unsigned int zcrypt_cca_cprbpool_min_items = 4;
 module_param_named(cca_cprbpool_min_items, zcrypt_cca_cprbpool_min_items, uint, 0440);
 MODULE_PARM_DESC(cca_cprbpool_min_items, "CCA CPRB pool minimal items.");
 
+unsigned int zcrypt_ep11_cprbpool_min_items = 8;
+module_param_named(ep11_cprbpool_min_items, zcrypt_ep11_cprbpool_min_items, uint, 0440);
+MODULE_PARM_DESC(ep11_cprbpool_min_items, "EP11 CPRB pool minimal items.");
+
 /*
  * zcrypt tracepoint functions
  */
@@ -2169,6 +2173,10 @@ int __init zcrypt_api_init(void)
 	if (rc)
 		goto out_ccamisc_init_failed;
 
+	rc = zcrypt_ep11misc_init();
+	if (rc)
+		goto out_ep11misc_init_failed;
+
 	/* Register the request sprayer. */
 	rc = misc_register(&zcrypt_misc_device);
 	if (rc < 0)
@@ -2180,6 +2188,8 @@ int __init zcrypt_api_init(void)
 	return 0;
 
 out_misc_register_failed:
+	zcrypt_ep11misc_exit();
+out_ep11misc_init_failed:
 	zcrypt_ccamisc_exit();
 out_ccamisc_init_failed:
 	zcdn_exit();
drivers/s390/crypto/zcrypt_api.h +1 -0
index d2640ea5d080..25a339ef52c3 100644
@@ -145,6 +145,7 @@ extern spinlock_t zcrypt_list_lock;
 extern struct list_head zcrypt_card_list;
 
 extern unsigned int zcrypt_cca_cprbpool_min_items;
+extern unsigned int zcrypt_ep11_cprbpool_min_items;
 
 #define for_each_zcrypt_card(_zc) \
 	list_for_each_entry(_zc, &zcrypt_card_list, list)
drivers/s390/crypto/zcrypt_ep11misc.c +97 -61

374 lines not on this page · raw message

drivers/s390/crypto/zcrypt_ep11misc.h +1 -0
index 9f1bdffdec68..a4b98eca8431 100644
@@ -152,6 +152,7 @@ int ep11_findcard2(u32 **apqns, u32 *nr_apqns, u16 cardnr, u16 domain,
 int ep11_kblob2protkey(u16 card, u16 dom, const u8 *key, u32 keylen,
 		       u8 *protkey, u32 *protkeylen, u32 *protkeytype);
 
+int zcrypt_ep11misc_init(void);
 void zcrypt_ep11misc_exit(void);
 
 #endif /* _ZCRYPT_EP11MISC_H_ */
Signature · 1 line
2.43.0
author maintainer
#18 lore raw

PATCH v2 7/20 s390/zcrypt: Rework zcrypt function zcrypt_device_status_mask_ext

In reply to Harald Freudenberger

Rework the existing function zcrypt_device_status_mask_ext():
* Add two new parameters to provide upper limits for cards and queues. The existing implementation needed an array of 256 * 256 * 4 = 256 KB which is really huge. The reworked function is more flexible in the sense that the caller can decide the upper limit for cards and domains to be stored into the status array. So for example a caller may decide to only query for cards 0...127 and queues 0...127 and thus only an array of size 128 * 128 * 4 = 64 KB is needed.
* Instead of void the reworked function now returns an int. The currently only way to have the function return != 0 is by providing card or domains limits beyond 256.

---
 drivers/s390/crypto/zcrypt_api.c      | 20 +++++++++++++++-----
 drivers/s390/crypto/zcrypt_api.h      |  3 ++-
 drivers/s390/crypto/zcrypt_ccamisc.c  | 22 +++++++++++++++++-----
 drivers/s390/crypto/zcrypt_ep11misc.c | 14 ++++++++++----
 4 files changed, 44 insertions(+), 15 deletions(-)
drivers/s390/crypto/zcrypt_api.c +15 -5
index 62cc05881b13..bd2738e3792a 100644
@@ -1317,19 +1317,25 @@ static void zcrypt_device_status_mask(struct zcrypt_device_status *devstatus)
 	spin_unlock(&zcrypt_list_lock);
 }
 
-void zcrypt_device_status_mask_ext(struct zcrypt_device_status_ext *devstatus)
+int zcrypt_device_status_mask_ext(struct zcrypt_device_status_ext *devstatus,
+				  int maxcard, int maxqueue)
 {
 	struct zcrypt_card *zc;
 	struct zcrypt_queue *zq;
 	struct zcrypt_device_status_ext *stat;
 	int card, queue;
 
+	if (maxcard > MAX_ZDEV_CARDIDS_EXT || maxqueue > MAX_ZDEV_DOMAINS_EXT)
+		return -EINVAL;
+
 	spin_lock(&zcrypt_list_lock);
 	for_each_zcrypt_card(zc) {
 		for_each_zcrypt_queue(zq, zc) {
 			card = AP_QID_CARD(zq->queue->qid);
 			queue = AP_QID_QUEUE(zq->queue->qid);
-			stat = &devstatus[card * AP_DOMAINS + queue];
+			if (card >= maxcard || queue >= maxqueue)
+				continue;
+			stat = &devstatus[card * maxqueue + queue];
 			stat->hwtype = zc->card->ap_dev.device_type;
 			stat->functions = zc->card->hwinfo.fac >> 26;
 			stat->qid = zq->queue->qid;
@@ -1337,6 +1343,8 @@ void zcrypt_device_status_mask_ext(struct zcrypt_device_status_ext *devstatus)
 		}
 	}
 	spin_unlock(&zcrypt_list_lock);
+
+	return 0;
 }
 EXPORT_SYMBOL(zcrypt_device_status_mask_ext);
 
@@ -1635,9 +1643,11 @@ static long zcrypt_unlocked_ioctl(struct file *filp, unsigned int cmd,
 					 GFP_KERNEL);
 		if (!device_status)
 			return -ENOMEM;
-		zcrypt_device_status_mask_ext(device_status);
-		if (copy_to_user((char __user *)arg, device_status,
-				 total_size))
+		rc = zcrypt_device_status_mask_ext(device_status,
+						   MAX_ZDEV_CARDIDS_EXT,
+						   MAX_ZDEV_DOMAINS_EXT);
+		if (!rc && copy_to_user((char __user *)arg, device_status,
+					total_size))
 			rc = -EFAULT;
 		kvfree(device_status);
 		return rc;
drivers/s390/crypto/zcrypt_api.h +2 -1
index 25a339ef52c3..3b57e7437f3d 100644
@@ -178,7 +178,8 @@ int zcrypt_api_init(void);
 void zcrypt_api_exit(void);
 long zcrypt_send_cprb(struct ica_xcRB *xcRB, u32 xflags);
 long zcrypt_send_ep11_cprb(struct ep11_urb *urb, u32 xflags);
-void zcrypt_device_status_mask_ext(struct zcrypt_device_status_ext *devstatus);
+int zcrypt_device_status_mask_ext(struct zcrypt_device_status_ext *devstatus,
+				  int maxcard, int maxqueue);
 int zcrypt_device_status_ext(int card, int queue,
 			     struct zcrypt_device_status_ext *devstatus);
 
drivers/s390/crypto/zcrypt_ccamisc.c +17 -5
index 2c2ca2d67e2d..420895df70f0 100644
@@ -1807,7 +1807,12 @@ static int findcard(u64 mkvp, u16 *pcardnr, u16 *pdomain,
 				 GFP_KERNEL);
 	if (!device_status)
 		return -ENOMEM;
-	zcrypt_device_status_mask_ext(device_status);
+
+	rc = zcrypt_device_status_mask_ext(device_status,
+					   MAX_ZDEV_CARDIDS_EXT,
+					   MAX_ZDEV_DOMAINS_EXT);
+	if (rc)
+		goto out;
 
 	/* walk through all crypto cards */
 	for (i = 0; i < MAX_ZDEV_ENTRIES_EXT; i++) {
@@ -1875,6 +1880,7 @@ static int findcard(u64 mkvp, u16 *pcardnr, u16 *pdomain,
 		rc = -ENODEV;
 	}
 
+out:
 	kvfree(device_status);
 	return rc;
 }
@@ -1914,7 +1920,7 @@ int cca_findcard2(u32 **apqns, u32 *nr_apqns, u16 cardnr, u16 domain,
 {
 	struct zcrypt_device_status_ext *device_status;
 	u32 *_apqns = NULL, _nr_apqns = 0;
-	int i, card, dom, curmatch, oldmatch, rc = 0;
+	int i, card, dom, curmatch, oldmatch, rc;
 	struct cca_info ci;
 
 	/* fetch status of all crypto cards */
@@ -1923,13 +1929,18 @@ int cca_findcard2(u32 **apqns, u32 *nr_apqns, u16 cardnr, u16 domain,
 				 GFP_KERNEL);
 	if (!device_status)
 		return -ENOMEM;
-	zcrypt_device_status_mask_ext(device_status);
+
+	rc = zcrypt_device_status_mask_ext(device_status,
+					   MAX_ZDEV_CARDIDS_EXT,
+					   MAX_ZDEV_DOMAINS_EXT);
+	if (rc)
+		goto out;
 
 	/* allocate 1k space for up to 256 apqns */
 	_apqns = kmalloc_array(256, sizeof(u32), GFP_KERNEL);
 	if (!_apqns) {
-		kvfree(device_status);
-		return -ENOMEM;
+		rc = -ENOMEM;
+		goto out;
 	}
 
 	/* walk through all the crypto apqnss */
@@ -1994,6 +2005,7 @@ int cca_findcard2(u32 **apqns, u32 *nr_apqns, u16 cardnr, u16 domain,
 		rc = 0;
 	}
 
+out:
 	kvfree(device_status);
 	return rc;
 }
drivers/s390/crypto/zcrypt_ep11misc.c +10 -4
index 86578a95b140..df16294eff9e 100644
@@ -1603,7 +1603,7 @@ int ep11_findcard2(u32 **apqns, u32 *nr_apqns, u16 cardnr, u16 domain,
 {
 	struct zcrypt_device_status_ext *device_status;
 	u32 *_apqns = NULL, _nr_apqns = 0;
-	int i, card, dom, rc = -ENOMEM;
+	int i, card, dom, rc;
 	struct ep11_domain_info edi;
 	struct ep11_card_info eci;
 
@@ -1613,13 +1613,18 @@ int ep11_findcard2(u32 **apqns, u32 *nr_apqns, u16 cardnr, u16 domain,
 				 GFP_KERNEL);
 	if (!device_status)
 		return -ENOMEM;
-	zcrypt_device_status_mask_ext(device_status);
+
+	rc = zcrypt_device_status_mask_ext(device_status,
+					   MAX_ZDEV_CARDIDS_EXT,
+					   MAX_ZDEV_DOMAINS_EXT);
+	if (rc)
+		goto out;
 
 	/* allocate 1k space for up to 256 apqns */
 	_apqns = kmalloc_array(256, sizeof(u32), GFP_KERNEL);
 	if (!_apqns) {
-		kvfree(device_status);
-		return -ENOMEM;
+		rc = -ENOMEM;
+		goto out;
 	}
 
 	/* walk through all the crypto apqnss */
@@ -1673,6 +1678,7 @@ int ep11_findcard2(u32 **apqns, u32 *nr_apqns, u16 cardnr, u16 domain,
 		rc = 0;
 	}
 
+out:
 	kvfree(device_status);
 	return rc;
 }
Signature · 1 line
2.43.0
author maintainer
#21 lore raw

PATCH v2 8/20 s390/zcrypt: Introduce pre-allocated device status array for cca misc

In reply to Harald Freudenberger

Introduce a pre-allocated device status array memory together with a mutex controlling the occupation to be used by the two findcard() functions. Limit the device status array to max 128 cards and max 128 domains to reduce the size of this pre-allocated memory to 64 KB.

---
 drivers/s390/crypto/zcrypt_ccamisc.c | 78 +++++++++++++++++++---------
 1 file changed, 53 insertions(+), 25 deletions(-)
drivers/s390/crypto/zcrypt_ccamisc.c +53 -25
index 420895df70f0..65b4cdb9b478 100644
@@ -51,6 +51,22 @@ static DEFINE_SPINLOCK(cca_info_list_lock);
 #define CPRB_MEMPOOL_ITEM_SIZE (16 * 1024)
 static mempool_t *cprb_mempool;
 
+/*
+ * This is a pre-allocated memory for the device status array
+ * used within the findcard() functions. It is currently
+ * 128 * 128 * 4 bytes = 64 KB big. Usage of this memory is
+ * controlled via dev_status_mem_mutex. Needs adaption if more
+ * than 128 cards or domains to be are supported.
+ */
+#define ZCRYPT_DEV_STATUS_CARD_MAX 128
+#define ZCRYPT_DEV_STATUS_QUEUE_MAX 128
+#define ZCRYPT_DEV_STATUS_ENTRIES (ZCRYPT_DEV_STATUS_CARD_MAX * \
+				   ZCRYPT_DEV_STATUS_QUEUE_MAX)
+#define ZCRYPT_DEV_STATUS_EXT_SIZE (ZCRYPT_DEV_STATUS_ENTRIES * \
+		sizeof(struct zcrypt_device_status_ext))
+static void *dev_status_mem;
+static DEFINE_MUTEX(dev_status_mem_mutex);
+
 /*
  * Simple check if the token is a valid CCA secure AES data key
  * token. If keybitsize is given, the bitsize of the key is
@@ -1801,21 +1817,20 @@ static int findcard(u64 mkvp, u16 *pcardnr, u16 *pdomain,
 	if (mkvp == 0 || minhwtype < 0)
 		return -EINVAL;
 
-	/* fetch status of all crypto cards */
-	device_status = kvcalloc(MAX_ZDEV_ENTRIES_EXT,
-				 sizeof(struct zcrypt_device_status_ext),
-				 GFP_KERNEL);
-	if (!device_status)
-		return -ENOMEM;
+	/* occupy the device status memory */
+	mutex_lock(&dev_status_mem_mutex);
+	memset(dev_status_mem, 0, ZCRYPT_DEV_STATUS_EXT_SIZE);
+	device_status = (struct zcrypt_device_status_ext *)dev_status_mem;
 
+	/* fetch crypto device status into this struct */
 	rc = zcrypt_device_status_mask_ext(device_status,
-					   MAX_ZDEV_CARDIDS_EXT,
-					   MAX_ZDEV_DOMAINS_EXT);
+					   ZCRYPT_DEV_STATUS_CARD_MAX,
+					   ZCRYPT_DEV_STATUS_QUEUE_MAX);
 	if (rc)
 		goto out;
 
 	/* walk through all crypto cards */
-	for (i = 0; i < MAX_ZDEV_ENTRIES_EXT; i++) {
+	for (i = 0; i < ZCRYPT_DEV_STATUS_ENTRIES; i++) {
 		card = AP_QID_CARD(device_status[i].qid);
 		dom = AP_QID_QUEUE(device_status[i].qid);
 		if (device_status[i].online &&
@@ -1842,9 +1857,9 @@ static int findcard(u64 mkvp, u16 *pcardnr, u16 *pdomain,
 			cca_info_cache_scrub(card, dom);
 		}
 	}
-	if (i >= MAX_ZDEV_ENTRIES_EXT) {
+	if (i >= ZCRYPT_DEV_STATUS_ENTRIES) {
 		/* nothing found, so this time without cache */
-		for (i = 0; i < MAX_ZDEV_ENTRIES_EXT; i++) {
+		for (i = 0; i < ZCRYPT_DEV_STATUS_ENTRIES; i++) {
 			if (!(device_status[i].online &&
 			      device_status[i].functions & 0x04))
 				continue;
@@ -1864,24 +1879,26 @@ static int findcard(u64 mkvp, u16 *pcardnr, u16 *pdomain,
 					oi = i;
 			}
 		}
-		if (i >= MAX_ZDEV_ENTRIES_EXT && oi >= 0) {
+		if (i >= ZCRYPT_DEV_STATUS_ENTRIES && oi >= 0) {
 			/* old mkvp matched, use this card then */
 			card = AP_QID_CARD(device_status[oi].qid);
 			dom = AP_QID_QUEUE(device_status[oi].qid);
 		}
 	}
-	if (i < MAX_ZDEV_ENTRIES_EXT || oi >= 0) {
+	if (i < ZCRYPT_DEV_STATUS_ENTRIES || oi >= 0) {
 		if (pcardnr)
 			*pcardnr = card;
 		if (pdomain)
 			*pdomain = dom;
-		rc = (i < MAX_ZDEV_ENTRIES_EXT ? 0 : 1);
+		rc = (i < ZCRYPT_DEV_STATUS_ENTRIES ? 0 : 1);
 	} else {
 		rc = -ENODEV;
 	}
 
 out:
-	kvfree(device_status);
+	/* release the device status memory */
+	mutex_unlock(&dev_status_mem_mutex);
+
 	return rc;
 }
 
@@ -1923,16 +1940,15 @@ int cca_findcard2(u32 **apqns, u32 *nr_apqns, u16 cardnr, u16 domain,
 	int i, card, dom, curmatch, oldmatch, rc;
 	struct cca_info ci;
 
-	/* fetch status of all crypto cards */
-	device_status = kvcalloc(MAX_ZDEV_ENTRIES_EXT,
-				 sizeof(struct zcrypt_device_status_ext),
-				 GFP_KERNEL);
-	if (!device_status)
-		return -ENOMEM;
+	/* occupy the device status memory */
+	mutex_lock(&dev_status_mem_mutex);
+	memset(dev_status_mem, 0, ZCRYPT_DEV_STATUS_EXT_SIZE);
+	device_status = (struct zcrypt_device_status_ext *)dev_status_mem;
 
+	/* fetch crypto device status into this struct */
 	rc = zcrypt_device_status_mask_ext(device_status,
-					   MAX_ZDEV_CARDIDS_EXT,
-					   MAX_ZDEV_DOMAINS_EXT);
+					   ZCRYPT_DEV_STATUS_CARD_MAX,
+					   ZCRYPT_DEV_STATUS_QUEUE_MAX);
 	if (rc)
 		goto out;
 
@@ -1944,7 +1960,7 @@ int cca_findcard2(u32 **apqns, u32 *nr_apqns, u16 cardnr, u16 domain,
 	}
 
 	/* walk through all the crypto apqnss */
-	for (i = 0; i < MAX_ZDEV_ENTRIES_EXT; i++) {
+	for (i = 0; i < ZCRYPT_DEV_STATUS_ENTRIES; i++) {
 		card = AP_QID_CARD(device_status[i].qid);
 		dom = AP_QID_QUEUE(device_status[i].qid);
 		/* check online state */
@@ -2006,7 +2022,9 @@ int cca_findcard2(u32 **apqns, u32 *nr_apqns, u16 cardnr, u16 domain,
 	}
 
 out:
-	kvfree(device_status);
+	/* release the device status memory */
+	mutex_unlock(&dev_status_mem_mutex);
+
 	return rc;
 }
 EXPORT_SYMBOL(cca_findcard2);
@@ -2023,11 +2041,21 @@ int __init zcrypt_ccamisc_init(void)
 		cprb_mempool = NULL;
 		return -ENOMEM;
 	}
+
+	/* Pre-allocate one crypto status card struct used in findcard() */
+	dev_status_mem = kvmalloc(ZCRYPT_DEV_STATUS_EXT_SIZE, GFP_KERNEL);
+	if (!dev_status_mem) {
+		ZCRYPT_DBF_ERR("%s allocation of dev_status_mem failed\n", __func__);
+		mempool_destroy(cprb_mempool);
+		return -ENOMEM;
+	}
+
 	return 0;
 }
 
 void zcrypt_ccamisc_exit(void)
 {
 	mkvp_cache_free();
+	kvfree(dev_status_mem);
 	mempool_destroy(cprb_mempool);
 }
Signature · 1 line
2.43.0
author maintainer
#24 lore raw

PATCH v2 9/20 s390/zcrypt: Introduce pre-allocated device status array for ep11 misc

In reply to Harald Freudenberger

Introduce a pre-allocated device status array memory together with a mutex controlling the occupation to be used by the findcard() function. Limit the device status array to max 128 cards and max 128 domains to reduce the size of this pre-allocated memory to 64 KB.

---
 drivers/s390/crypto/zcrypt_ep11misc.c | 46 +++++++++++++++++++++------
 1 file changed, 36 insertions(+), 10 deletions(-)
drivers/s390/crypto/zcrypt_ep11misc.c +36 -10
index df16294eff9e..04153b476168 100644
@@ -39,6 +39,22 @@ static const u8 def_iv[16] = { 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77,
 #define CPRB_MEMPOOL_ITEM_SIZE (8 * 1024)
 static mempool_t *cprb_mempool;
 
+/*
+ * This is a pre-allocated memory for the device status array
+ * used within the findcard() functions. It is currently
+ * 128 * 128 * 4 bytes = 64 KB big. Usage of this memory is
+ * controlled via dev_status_mem_mutex. Needs adaption if more
+ * than 128 cards or domains to be are supported.
+ */
+#define ZCRYPT_DEV_STATUS_CARD_MAX 128
+#define ZCRYPT_DEV_STATUS_QUEUE_MAX 128
+#define ZCRYPT_DEV_STATUS_ENTRIES (ZCRYPT_DEV_STATUS_CARD_MAX * \
+				   ZCRYPT_DEV_STATUS_QUEUE_MAX)
+#define ZCRYPT_DEV_STATUS_EXT_SIZE (ZCRYPT_DEV_STATUS_ENTRIES * \
+		sizeof(struct zcrypt_device_status_ext))
+static void *dev_status_mem;
+static DEFINE_MUTEX(dev_status_mem_mutex);
+
 /* ep11 card info cache */
 struct card_list_entry {
 	struct list_head list;
@@ -1607,16 +1623,15 @@ int ep11_findcard2(u32 **apqns, u32 *nr_apqns, u16 cardnr, u16 domain,
 	struct ep11_domain_info edi;
 	struct ep11_card_info eci;
 
-	/* fetch status of all crypto cards */
-	device_status = kvcalloc(MAX_ZDEV_ENTRIES_EXT,
-				 sizeof(struct zcrypt_device_status_ext),
-				 GFP_KERNEL);
-	if (!device_status)
-		return -ENOMEM;
+	/* occupy the device status memory */
+	mutex_lock(&dev_status_mem_mutex);
+	memset(dev_status_mem, 0, ZCRYPT_DEV_STATUS_EXT_SIZE);
+	device_status = (struct zcrypt_device_status_ext *)dev_status_mem;
 
+	/* fetch crypto device status into this struct */
 	rc = zcrypt_device_status_mask_ext(device_status,
-					   MAX_ZDEV_CARDIDS_EXT,
-					   MAX_ZDEV_DOMAINS_EXT);
+					   ZCRYPT_DEV_STATUS_CARD_MAX,
+					   ZCRYPT_DEV_STATUS_QUEUE_MAX);
 	if (rc)
 		goto out;
 
@@ -1628,7 +1643,7 @@ int ep11_findcard2(u32 **apqns, u32 *nr_apqns, u16 cardnr, u16 domain,
 	}
 
 	/* walk through all the crypto apqnss */
-	for (i = 0; i < MAX_ZDEV_ENTRIES_EXT; i++) {
+	for (i = 0; i < ZCRYPT_DEV_STATUS_ENTRIES; i++) {
 		card = AP_QID_CARD(device_status[i].qid);
 		dom = AP_QID_QUEUE(device_status[i].qid);
 		/* check online state */
@@ -1679,7 +1694,8 @@ int ep11_findcard2(u32 **apqns, u32 *nr_apqns, u16 cardnr, u16 domain,
 	}
 
 out:
-	kvfree(device_status);
+	mutex_unlock(&dev_status_mem_mutex);
+
 	return rc;
 }
 EXPORT_SYMBOL(ep11_findcard2);
@@ -1696,11 +1712,21 @@ int __init zcrypt_ep11misc_init(void)
 		cprb_mempool = NULL;
 		return -ENOMEM;
 	}
+
+	/* Pre-allocate one crypto status card struct used in findcard() */
+	dev_status_mem = kvmalloc(ZCRYPT_DEV_STATUS_EXT_SIZE, GFP_KERNEL);
+	if (!dev_status_mem) {
+		ZCRYPT_DBF_ERR("%s allocation of dev_status_mem failed\n", __func__);
+		mempool_destroy(cprb_mempool);
+		return -ENOMEM;
+	}
+
 	return 0;
 }
 
 void zcrypt_ep11misc_exit(void)
 {
 	card_cache_free();
+	kvfree(dev_status_mem);
 	mempool_destroy(cprb_mempool);
 }
Signature · 1 line
2.43.0
author maintainer
#27 lore raw

PATCH v2 10/20 s390/zcrypt/pkey: Rework cca findcard() implementation and callers

In reply to Harald Freudenberger

Rework the memory usage of the cca findcard() implementation:
- findcard does not allocate memory for the list of apqns any more.
- the callers are now responsible to provide an array of apqns to store the matching apqns into.

---
 drivers/s390/crypto/pkey_cca.c       | 25 +++++++++++--------------
 drivers/s390/crypto/zcrypt_ccamisc.c | 18 ++++--------------
 drivers/s390/crypto/zcrypt_ccamisc.h | 12 +++++-------
 3 files changed, 20 insertions(+), 35 deletions(-)
drivers/s390/crypto/pkey_cca.c +11 -14
index cda22db31f6c..8c9a0c5ca630 100644
@@ -73,7 +73,7 @@ static int cca_apqns4key(const u8 *key, u32 keylen, u32 flags,
 			 struct pkey_apqn *apqns, size_t *nr_apqns)
 {
 	struct keytoken_header *hdr = (struct keytoken_header *)key;
-	u32 _nr_apqns, *_apqns = NULL;
+	u32 _apqns[MAXAPQNSINLIST], _nr_apqns = ARRAY_SIZE(_apqns);
 	int rc;
 
 	if (!flags)
@@ -107,7 +107,7 @@ static int cca_apqns4key(const u8 *key, u32 keylen, u32 flags,
 			/* unknown CCA internal token type */
 			return -EINVAL;
 		}
-		rc = cca_findcard2(&_apqns, &_nr_apqns, 0xFFFF, 0xFFFF,
+		rc = cca_findcard2(_apqns, &_nr_apqns, 0xFFFF, 0xFFFF,
 				   minhwtype, AES_MK_SET,
 				   cur_mkvp, old_mkvp, 1);
 		if (rc)
@@ -126,7 +126,7 @@ static int cca_apqns4key(const u8 *key, u32 keylen, u32 flags,
 			/* unknown CCA internal 2 token type */
 			return -EINVAL;
 		}
-		rc = cca_findcard2(&_apqns, &_nr_apqns, 0xFFFF, 0xFFFF,
+		rc = cca_findcard2(_apqns, &_nr_apqns, 0xFFFF, 0xFFFF,
 				   ZCRYPT_CEX7, APKA_MK_SET,
 				   cur_mkvp, old_mkvp, 1);
 		if (rc)
@@ -147,7 +147,6 @@ static int cca_apqns4key(const u8 *key, u32 keylen, u32 flags,
 	*nr_apqns = _nr_apqns;
 
 out:
-	kfree(_apqns);
 	pr_debug("rc=%d\n", rc);
 	return rc;
 }
@@ -156,7 +155,7 @@ static int cca_apqns4type(enum pkey_key_type ktype,
 			  u8 cur_mkvp[32], u8 alt_mkvp[32], u32 flags,
 			  struct pkey_apqn *apqns, size_t *nr_apqns)
 {
-	u32 _nr_apqns, *_apqns = NULL;
+	u32 _apqns[MAXAPQNSINLIST], _nr_apqns = ARRAY_SIZE(_apqns);
 	int rc;
 
 	zcrypt_wait_api_operational();
@@ -171,7 +170,7 @@ static int cca_apqns4type(enum pkey_key_type ktype,
 			old_mkvp = *((u64 *)alt_mkvp);
 		if (ktype == PKEY_TYPE_CCA_CIPHER)
 			minhwtype = ZCRYPT_CEX6;
-		rc = cca_findcard2(&_apqns, &_nr_apqns, 0xFFFF, 0xFFFF,
+		rc = cca_findcard2(_apqns, &_nr_apqns, 0xFFFF, 0xFFFF,
 				   minhwtype, AES_MK_SET,
 				   cur_mkvp, old_mkvp, 1);
 		if (rc)
@@ -184,7 +183,7 @@ static int cca_apqns4type(enum pkey_key_type ktype,
 			cur_mkvp = *((u64 *)cur_mkvp);
 		if (flags & PKEY_FLAGS_MATCH_ALT_MKVP)
 			old_mkvp = *((u64 *)alt_mkvp);
-		rc = cca_findcard2(&_apqns, &_nr_apqns, 0xFFFF, 0xFFFF,
+		rc = cca_findcard2(_apqns, &_nr_apqns, 0xFFFF, 0xFFFF,
 				   ZCRYPT_CEX7, APKA_MK_SET,
 				   cur_mkvp, old_mkvp, 1);
 		if (rc)
@@ -205,7 +204,6 @@ static int cca_apqns4type(enum pkey_key_type ktype,
 	*nr_apqns = _nr_apqns;
 
 out:
-	kfree(_apqns);
 	pr_debug("rc=%d\n", rc);
 	return rc;
 }
@@ -461,7 +459,7 @@ static int cca_verifykey(const u8 *key, u32 keylen,
 			 u32 *keytype, u32 *keybitsize, u32 *flags)
 {
 	struct keytoken_header *hdr = (struct keytoken_header *)key;
-	u32 nr_apqns, *apqns = NULL;
+	u32 apqns[MAXAPQNSINLIST], nr_apqns = ARRAY_SIZE(apqns);
 	int rc;
 
 	if (keylen < sizeof(*hdr))
@@ -478,13 +476,13 @@ static int cca_verifykey(const u8 *key, u32 keylen,
 			goto out;
 		*keytype = PKEY_TYPE_CCA_DATA;
 		*keybitsize = t->bitsize;
-		rc = cca_findcard2(&apqns, &nr_apqns, *card, *dom,
+		rc = cca_findcard2(apqns, &nr_apqns, *card, *dom,
 				   ZCRYPT_CEX3C, AES_MK_SET,
 				   t->mkvp, 0, 1);
 		if (!rc)
 			*flags = PKEY_FLAGS_MATCH_CUR_MKVP;
 		if (rc == -ENODEV) {
-			rc = cca_findcard2(&apqns, &nr_apqns, *card, *dom,
+			rc = cca_findcard2(apqns, &nr_apqns, *card, *dom,
 					   ZCRYPT_CEX3C, AES_MK_SET,
 					   0, t->mkvp, 1);
 			if (!rc)
@@ -511,13 +509,13 @@ static int cca_verifykey(const u8 *key, u32 keylen,
 			*keybitsize = PKEY_SIZE_AES_192;
 		else if (!t->plfver && t->wpllen == 640)
 			*keybitsize = PKEY_SIZE_AES_256;
-		rc = cca_findcard2(&apqns, &nr_apqns, *card, *dom,
+		rc = cca_findcard2(apqns, &nr_apqns, *card, *dom,
 				   ZCRYPT_CEX6, AES_MK_SET,
 				   t->mkvp0, 0, 1);
 		if (!rc)
 			*flags = PKEY_FLAGS_MATCH_CUR_MKVP;
 		if (rc == -ENODEV) {
-			rc = cca_findcard2(&apqns, &nr_apqns, *card, *dom,
+			rc = cca_findcard2(apqns, &nr_apqns, *card, *dom,
 					   ZCRYPT_CEX6, AES_MK_SET,
 					   0, t->mkvp0, 1);
 			if (!rc)
@@ -535,7 +533,6 @@ static int cca_verifykey(const u8 *key, u32 keylen,
 	}
 
 out:
-	kfree(apqns);
 	pr_debug("rc=%d\n", rc);
 	return rc;
 }
drivers/s390/crypto/zcrypt_ccamisc.c +4 -14
index 65b4cdb9b478..d3b093dcdf30 100644
@@ -1931,14 +1931,14 @@ int cca_findcard(const u8 *key, u16 *pcardnr, u16 *pdomain, int verify)
 }
 EXPORT_SYMBOL(cca_findcard);
 
-int cca_findcard2(u32 **apqns, u32 *nr_apqns, u16 cardnr, u16 domain,
+int cca_findcard2(u32 *apqns, u32 *nr_apqns, u16 cardnr, u16 domain,
 		  int minhwtype, int mktype, u64 cur_mkvp, u64 old_mkvp,
 		  int verify)
 {
 	struct zcrypt_device_status_ext *device_status;
-	u32 *_apqns = NULL, _nr_apqns = 0;
 	int i, card, dom, curmatch, oldmatch, rc;
 	struct cca_info ci;
+	u32 _nr_apqns = 0;
 
 	/* occupy the device status memory */
 	mutex_lock(&dev_status_mem_mutex);
@@ -1952,13 +1952,6 @@ int cca_findcard2(u32 **apqns, u32 *nr_apqns, u16 cardnr, u16 domain,
 	if (rc)
 		goto out;
 
-	/* allocate 1k space for up to 256 apqns */
-	_apqns = kmalloc_array(256, sizeof(u32), GFP_KERNEL);
-	if (!_apqns) {
-		rc = -ENOMEM;
-		goto out;
-	}
-
 	/* walk through all the crypto apqnss */
 	for (i = 0; i < ZCRYPT_DEV_STATUS_ENTRIES; i++) {
 		card = AP_QID_CARD(device_status[i].qid);
@@ -2006,17 +1999,14 @@ int cca_findcard2(u32 **apqns, u32 *nr_apqns, u16 cardnr, u16 domain,
 				continue;
 		}
 		/* apqn passed all filtering criterons, add to the array */
-		if (_nr_apqns < 256)
-			_apqns[_nr_apqns++] = (((u16)card) << 16) | ((u16)dom);
+		if (_nr_apqns < *nr_apqns)
+			apqns[_nr_apqns++] = (((u16)card) << 16) | ((u16)dom);
 	}
 
 	/* nothing found ? */
 	if (!_nr_apqns) {
-		kfree(_apqns);
 		rc = -ENODEV;
 	} else {
-		/* no re-allocation, simple return the _apqns array */
-		*apqns = _apqns;
 		*nr_apqns = _nr_apqns;
 		rc = 0;
 	}
drivers/s390/crypto/zcrypt_ccamisc.h +5 -7
index 273edf2bb036..bed647a42eb2 100644
@@ -229,14 +229,12 @@ int cca_findcard(const u8 *key, u16 *pcardnr, u16 *pdomain, int verify);
  *   cur_mkvp or old_mkvp values of the apqn are used.
  * The mktype determines which set of master keys to use:
  *   0 = AES_MK_SET - AES MK set, 1 = APKA MK_SET - APKA MK set
- * The array of apqn entries is allocated with kmalloc and returned in *apqns;
- * the number of apqns stored into the list is returned in *nr_apqns. One apqn
- * entry is simple a 32 bit value with 16 bit cardnr and 16 bit domain nr and
- * may be casted to struct pkey_apqn. The return value is either 0 for success
- * or a negative errno value. If no apqn meeting the criteria is found,
- * -ENODEV is returned.
+ * The caller should set *nr_apqns to the nr of elements available in *apqns.
+ * On return *nr_apqns is then updated with the nr of apqns filled into *apqns.
+ * The return value is either 0 for success or a negative errno value.
+ * If no apqn meeting the criteria is found, -ENODEV is returned.
  */
-int cca_findcard2(u32 **apqns, u32 *nr_apqns, u16 cardnr, u16 domain,
+int cca_findcard2(u32 *apqns, u32 *nr_apqns, u16 cardnr, u16 domain,
 		  int minhwtype, int mktype, u64 cur_mkvp, u64 old_mkvp,
 		  int verify);
 
Signature · 1 line
2.43.0
author maintainer
#30 lore raw

PATCH v2 11/20 s390/zcrypt/pkey: Rework ep11 findcard() implementation and callers

In reply to Harald Freudenberger

Rework the memory usage of the ep11 findcard() implementation:
- findcard does not allocate memory for the list of apqns any more.
- the callers are now responsible to provide an array of apqns to store the matching apqns into.

---
 drivers/s390/crypto/pkey_ep11.c       | 19 ++++++++-----------
 drivers/s390/crypto/zcrypt_ep11misc.c | 18 ++++--------------
 drivers/s390/crypto/zcrypt_ep11misc.h | 12 +++++-------
 3 files changed, 17 insertions(+), 32 deletions(-)
drivers/s390/crypto/pkey_ep11.c +8 -11
index 5b033ca3e828..b970f0be84be 100644
@@ -73,7 +73,7 @@ static int ep11_apqns4key(const u8 *key, u32 keylen, u32 flags,
 			  struct pkey_apqn *apqns, size_t *nr_apqns)
 {
 	struct keytoken_header *hdr = (struct keytoken_header *)key;
-	u32 _nr_apqns, *_apqns = NULL;
+	u32 _apqns[MAXAPQNSINLIST], _nr_apqns = ARRAY_SIZE(_apqns);
 	int rc;
 
 	if (!flags)
@@ -98,7 +98,7 @@ static int ep11_apqns4key(const u8 *key, u32 keylen, u32 flags,
 			minhwtype = ZCRYPT_CEX7;
 			api = ap_is_se_guest() ? EP11_API_V6 : EP11_API_V4;
 		}
-		rc = ep11_findcard2(&_apqns, &_nr_apqns, 0xFFFF, 0xFFFF,
+		rc = ep11_findcard2(_apqns, &_nr_apqns, 0xFFFF, 0xFFFF,
 				    minhwtype, api, kb->wkvp);
 		if (rc)
 			goto out;
@@ -115,7 +115,7 @@ static int ep11_apqns4key(const u8 *key, u32 keylen, u32 flags,
 			minhwtype = ZCRYPT_CEX7;
 			api = ap_is_se_guest() ? EP11_API_V6 : EP11_API_V4;
 		}
-		rc = ep11_findcard2(&_apqns, &_nr_apqns, 0xFFFF, 0xFFFF,
+		rc = ep11_findcard2(_apqns, &_nr_apqns, 0xFFFF, 0xFFFF,
 				    minhwtype, api, kb->wkvp);
 		if (rc)
 			goto out;
@@ -135,7 +135,6 @@ static int ep11_apqns4key(const u8 *key, u32 keylen, u32 flags,
 	*nr_apqns = _nr_apqns;
 
 out:
-	kfree(_apqns);
 	pr_debug("rc=%d\n", rc);
 	return rc;
 }
@@ -144,7 +143,7 @@ static int ep11_apqns4type(enum pkey_key_type ktype,
 			   u8 cur_mkvp[32], u8 alt_mkvp[32], u32 flags,
 			   struct pkey_apqn *apqns, size_t *nr_apqns)
 {
-	u32 _nr_apqns, *_apqns = NULL;
+	u32 _apqns[MAXAPQNSINLIST], _nr_apqns = ARRAY_SIZE(_apqns);
 	int rc;
 
 	zcrypt_wait_api_operational();
@@ -158,7 +157,7 @@ static int ep11_apqns4type(enum pkey_key_type ktype,
 		if (flags & PKEY_FLAGS_MATCH_CUR_MKVP)
 			wkvp = cur_mkvp;
 		api = ap_is_se_guest() ? EP11_API_V6 : EP11_API_V4;
-		rc = ep11_findcard2(&_apqns, &_nr_apqns, 0xFFFF, 0xFFFF,
+		rc = ep11_findcard2(_apqns, &_nr_apqns, 0xFFFF, 0xFFFF,
 				    ZCRYPT_CEX7, api, wkvp);
 		if (rc)
 			goto out;
@@ -178,7 +177,6 @@ static int ep11_apqns4type(enum pkey_key_type ktype,
 	*nr_apqns = _nr_apqns;
 
 out:
-	kfree(_apqns);
 	pr_debug("rc=%d\n", rc);
 	return rc;
 }
@@ -423,7 +421,7 @@ static int ep11_verifykey(const u8 *key, u32 keylen,
 			  u32 *keytype, u32 *keybitsize, u32 *flags)
 {
 	struct keytoken_header *hdr = (struct keytoken_header *)key;
-	u32 nr_apqns, *apqns = NULL;
+	u32 apqns[MAXAPQNSINLIST], nr_apqns = ARRAY_SIZE(apqns);
 	int rc;
 
 	if (keylen < sizeof(*hdr))
@@ -443,7 +441,7 @@ static int ep11_verifykey(const u8 *key, u32 keylen,
 		*keybitsize = kb->head.bitlen;
 
 		api = ap_is_se_guest() ? EP11_API_V6 : EP11_API_V4;
-		rc = ep11_findcard2(&apqns, &nr_apqns, *card, *dom,
+		rc = ep11_findcard2(apqns, &nr_apqns, *card, *dom,
 				    ZCRYPT_CEX7, api,
 				    ep11_kb_wkvp(key, keylen));
 		if (rc)
@@ -467,7 +465,7 @@ static int ep11_verifykey(const u8 *key, u32 keylen,
 		*keybitsize = kh->bitlen;
 
 		api = ap_is_se_guest() ? EP11_API_V6 : EP11_API_V4;
-		rc = ep11_findcard2(&apqns, &nr_apqns, *card, *dom,
+		rc = ep11_findcard2(apqns, &nr_apqns, *card, *dom,
 				    ZCRYPT_CEX7, api,
 				    ep11_kb_wkvp(key, keylen));
 		if (rc)
@@ -484,7 +482,6 @@ static int ep11_verifykey(const u8 *key, u32 keylen,
 	}
 
 out:
-	kfree(apqns);
 	pr_debug("rc=%d\n", rc);
 	return rc;
 }
drivers/s390/crypto/zcrypt_ep11misc.c +4 -14
index 04153b476168..6005ef79c001 100644
@@ -1614,14 +1614,14 @@ int ep11_kblob2protkey(u16 card, u16 dom,
 }
 EXPORT_SYMBOL(ep11_kblob2protkey);
 
-int ep11_findcard2(u32 **apqns, u32 *nr_apqns, u16 cardnr, u16 domain,
+int ep11_findcard2(u32 *apqns, u32 *nr_apqns, u16 cardnr, u16 domain,
 		   int minhwtype, int minapi, const u8 *wkvp)
 {
 	struct zcrypt_device_status_ext *device_status;
-	u32 *_apqns = NULL, _nr_apqns = 0;
 	int i, card, dom, rc;
 	struct ep11_domain_info edi;
 	struct ep11_card_info eci;
+	u32 _nr_apqns = 0;
 
 	/* occupy the device status memory */
 	mutex_lock(&dev_status_mem_mutex);
@@ -1635,13 +1635,6 @@ int ep11_findcard2(u32 **apqns, u32 *nr_apqns, u16 cardnr, u16 domain,
 	if (rc)
 		goto out;
 
-	/* allocate 1k space for up to 256 apqns */
-	_apqns = kmalloc_array(256, sizeof(u32), GFP_KERNEL);
-	if (!_apqns) {
-		rc = -ENOMEM;
-		goto out;
-	}
-
 	/* walk through all the crypto apqnss */
 	for (i = 0; i < ZCRYPT_DEV_STATUS_ENTRIES; i++) {
 		card = AP_QID_CARD(device_status[i].qid);
@@ -1678,17 +1671,14 @@ int ep11_findcard2(u32 **apqns, u32 *nr_apqns, u16 cardnr, u16 domain,
 				continue;
 		}
 		/* apqn passed all filtering criterons, add to the array */
-		if (_nr_apqns < 256)
-			_apqns[_nr_apqns++] = (((u16)card) << 16) | ((u16)dom);
+		if (_nr_apqns < *nr_apqns)
+			apqns[_nr_apqns++] = (((u16)card) << 16) | ((u16)dom);
 	}
 
 	/* nothing found ? */
 	if (!_nr_apqns) {
-		kfree(_apqns);
 		rc = -ENODEV;
 	} else {
-		/* no re-allocation, simple return the _apqns array */
-		*apqns = _apqns;
 		*nr_apqns = _nr_apqns;
 		rc = 0;
 	}
drivers/s390/crypto/zcrypt_ep11misc.h +5 -7
index a4b98eca8431..cbd615547bc2 100644
@@ -136,14 +136,12 @@ int ep11_clr2keyblob(u16 cardnr, u16 domain, u32 keybitsize, u32 keygenflags,
  *   key for this domain. When a wkvp is given there will always be a re-fetch
  *   of the domain info for the potential apqn - so this triggers an request
  *   reply to each apqn eligible.
- * The array of apqn entries is allocated with kmalloc and returned in *apqns;
- * the number of apqns stored into the list is returned in *nr_apqns. One apqn
- * entry is simple a 32 bit value with 16 bit cardnr and 16 bit domain nr and
- * may be casted to struct pkey_apqn. The return value is either 0 for success
- * or a negative errno value. If no apqn meeting the criteria is found,
- * -ENODEV is returned.
+ * The caller should set *nr_apqns to the nr of elements available in *apqns.
+ * On return *nr_apqns is then updated with the nr of apqns filled into *apqns.
+ * The return value is either 0 for success or a negative errno value.
+ * If no apqn meeting the criteria is found, -ENODEV is returned.
  */
-int ep11_findcard2(u32 **apqns, u32 *nr_apqns, u16 cardnr, u16 domain,
+int ep11_findcard2(u32 *apqns, u32 *nr_apqns, u16 cardnr, u16 domain,
 		   int minhwtype, int minapi, const u8 *wkvp);
 
 /*
Signature · 1 line
2.43.0
author maintainer
#33 lore raw

PATCH v2 12/20 s390/zcrypt: Rework cca misc functions kmallocs to use the cprb mempool

In reply to Harald Freudenberger

Rework two places in the zcrypt cca misc code using kmalloc() for ephemeral memory allocation. As there is anyway now a cprb mempool let's use this pool instead to satisfy these short term memory allocations.

---
 drivers/s390/crypto/zcrypt_api.c     |  2 +-
 drivers/s390/crypto/zcrypt_ccamisc.c | 42 +++++++++++++++++++---------
 2 files changed, 30 insertions(+), 14 deletions(-)
drivers/s390/crypto/zcrypt_api.c +1 -1
index bd2738e3792a..d4e60d89cdce 100644
@@ -50,7 +50,7 @@ MODULE_DESCRIPTION("Cryptographic Coprocessor interface, " \
 		   "Copyright IBM Corp. 2001, 2012");
 MODULE_LICENSE("GPL");
 
-unsigned int zcrypt_cca_cprbpool_min_items = 4;
+unsigned int zcrypt_cca_cprbpool_min_items = 6;
 module_param_named(cca_cprbpool_min_items, zcrypt_cca_cprbpool_min_items, uint, 0440);
 MODULE_PARM_DESC(cca_cprbpool_min_items, "CCA CPRB pool minimal items.");
 
drivers/s390/crypto/zcrypt_ccamisc.c +29 -13

85 lines not on this page · raw message

Signature · 1 line
2.43.0
author maintainer
#35 lore raw

PATCH v2 13/20 s390/zcrypt: Add small mempool for cca info list entries

In reply to Harald Freudenberger

Add a small memory pool for (pre-)allocating cca info list entries. These entries are rather small and the pool is a simple way to support the xflag ZCRYPT_XFLAG_NOMEMALLOC to avoid mallocs.

---
 drivers/s390/crypto/zcrypt_ccamisc.c | 67 ++++++++++++++++++++--------
 drivers/s390/crypto/zcrypt_ccamisc.h |  3 +-
 drivers/s390/crypto/zcrypt_cex4.c    |  4 +-
 3 files changed, 53 insertions(+), 21 deletions(-)
drivers/s390/crypto/zcrypt_ccamisc.c +49 -18
index ff7ba2622484..e4ec922aae0d 100644
@@ -41,6 +41,10 @@ struct cca_info_list_entry {
 static LIST_HEAD(cca_info_list);
 static DEFINE_SPINLOCK(cca_info_list_lock);
 
+/* memory pool for cca_info_list entries */
+#define INFO_ENTRY_MEMPOOL_MIN_ITEMS 8
+static mempool_t *info_mempool;
+
 /*
  * Cprb memory pool held for urgent cases where no memory
  * can be allocated via kmalloc. This pool is only used
@@ -1662,7 +1666,7 @@ static int cca_info_cache_fetch(u16 cardnr, u16 domain, struct cca_info *ci)
 }
 
 static void cca_info_cache_update(u16 cardnr, u16 domain,
-				  const struct cca_info *ci)
+				  const struct cca_info *ci, u32 xflags)
 {
 	int found = 0;
 	struct cca_info_list_entry *ptr;
@@ -1677,7 +1681,9 @@ static void cca_info_cache_update(u16 cardnr, u16 domain,
 		}
 	}
 	if (!found) {
-		ptr = kmalloc(sizeof(*ptr), GFP_ATOMIC);
+		ptr = (xflags & ZCRYPT_XFLAG_NOMEMALLOC) ?
+			mempool_alloc_preallocated(info_mempool) :
+			mempool_alloc(info_mempool, GFP_ATOMIC);
 		if (!ptr) {
 			spin_unlock_bh(&cca_info_list_lock);
 			return;
@@ -1699,7 +1705,7 @@ static void cca_info_cache_scrub(u16 cardnr, u16 domain)
 		if (ptr->cardnr == cardnr &&
 		    ptr->domain == domain) {
 			list_del(&ptr->list);
-			kfree(ptr);
+			mempool_free(ptr, info_mempool);
 			break;
 		}
 	}
@@ -1713,7 +1719,7 @@ static void __exit mkvp_cache_free(void)
 	spin_lock_bh(&cca_info_list_lock);
 	list_for_each_entry_safe(ptr, pnext, &cca_info_list, list) {
 		list_del(&ptr->list);
-		kfree(ptr);
+		mempool_free(ptr, info_mempool);
 	}
 	spin_unlock_bh(&cca_info_list_lock);
 }
@@ -1721,14 +1727,14 @@ static void __exit mkvp_cache_free(void)
 /*
  * Fetch cca_info values via query_crypto_facility from adapter.
  */
-static int fetch_cca_info(u16 cardnr, u16 domain, struct cca_info *ci)
+static int fetch_cca_info(u16 cardnr, u16 domain,
+			  struct cca_info *ci, u32 xflags)
 {
 	void *mem;
 	int rc, found = 0;
 	size_t rlen, vlen;
 	u8 *rarray, *varray;
 	struct zcrypt_device_status_ext devstat;
-	u32 xflags = 0;
 
 	memset(ci, 0, sizeof(*ci));
 
@@ -1802,15 +1808,15 @@ static int fetch_cca_info(u16 cardnr, u16 domain, struct cca_info *ci)
 /*
  * Fetch cca information about a CCA queue.
  */
-int cca_get_info(u16 card, u16 dom, struct cca_info *ci, int verify)
+int cca_get_info(u16 card, u16 dom, struct cca_info *ci, int verify, u32 xflags)
 {
 	int rc;
 
 	rc = cca_info_cache_fetch(card, dom, ci);
 	if (rc || verify) {
-		rc = fetch_cca_info(card, dom, ci);
+		rc = fetch_cca_info(card, dom, ci, xflags);
 		if (rc == 0)
-			cca_info_cache_update(card, dom, ci);
+			cca_info_cache_update(card, dom, ci, xflags);
 	}
 
 	return rc;
@@ -1828,6 +1834,7 @@ static int findcard(u64 mkvp, u16 *pcardnr, u16 *pdomain,
 	u16 card, dom;
 	struct cca_info ci;
 	int i, rc, oi = -1;
+	u32 xflg = 0; /* xflags */
 
 	/* mkvp must not be zero, minhwtype needs to be >= 0 */
 	if (mkvp == 0 || minhwtype < 0)
@@ -1859,8 +1866,8 @@ static int findcard(u64 mkvp, u16 *pcardnr, u16 *pdomain,
 				if (!verify)
 					break;
 				/* verify: refresh card info */
-				if (fetch_cca_info(card, dom, &ci) == 0) {
-					cca_info_cache_update(card, dom, &ci);
+				if (fetch_cca_info(card, dom, &ci, xflg) == 0) {
+					cca_info_cache_update(card, dom, &ci, xflg);
 					if (ci.hwtype >= minhwtype &&
 					    ci.cur_aes_mk_state == '2' &&
 					    ci.cur_aes_mkvp == mkvp)
@@ -1882,8 +1889,8 @@ static int findcard(u64 mkvp, u16 *pcardnr, u16 *pdomain,
 			card = AP_QID_CARD(device_status[i].qid);
 			dom = AP_QID_QUEUE(device_status[i].qid);
 			/* fresh fetch mkvp from adapter */
-			if (fetch_cca_info(card, dom, &ci) == 0) {
-				cca_info_cache_update(card, dom, &ci);
+			if (fetch_cca_info(card, dom, &ci, xflg) == 0) {
+				cca_info_cache_update(card, dom, &ci, xflg);
 				if (ci.hwtype >= minhwtype &&
 				    ci.cur_aes_mk_state == '2' &&
 				    ci.cur_aes_mkvp == mkvp)
@@ -1955,6 +1962,7 @@ int cca_findcard2(u32 *apqns, u32 *nr_apqns, u16 cardnr, u16 domain,
 	int i, card, dom, curmatch, oldmatch, rc;
 	struct cca_info ci;
 	u32 _nr_apqns = 0;
+	u32 xflags = 0;
 
 	/* occupy the device status memory */
 	mutex_lock(&dev_status_mem_mutex);
@@ -1985,7 +1993,7 @@ int cca_findcard2(u32 *apqns, u32 *nr_apqns, u16 cardnr, u16 domain,
 		if (domain != 0xFFFF && dom != domain)
 			continue;
 		/* get cca info on this apqn */
-		if (cca_get_info(card, dom, &ci, verify))
+		if (cca_get_info(card, dom, &ci, verify, xflags))
 			continue;
 		/* current master key needs to be valid */
 		if (mktype == AES_MK_SET && ci.cur_aes_mk_state != '2')
@@ -2037,6 +2045,8 @@ EXPORT_SYMBOL(cca_findcard2);
 
 int __init zcrypt_ccamisc_init(void)
 {
+	int rc = -ENOMEM;
+
 	/* Pre-allocate a small memory pool for cca cprbs. */
 	cprb_mempool = mempool_create_kmalloc_pool(zcrypt_cca_cprbpool_min_items,
 						   CPRB_MEMPOOL_ITEM_SIZE);
@@ -2044,19 +2054,39 @@ int __init zcrypt_ccamisc_init(void)
 		ZCRYPT_DBF_ERR("%s mempool_create(%d,%d) failed: %ld\n",
 			       __func__, zcrypt_cca_cprbpool_min_items,
 			       CPRB_MEMPOOL_ITEM_SIZE, PTR_ERR(cprb_mempool));
+		rc = PTR_ERR(cprb_mempool);
 		cprb_mempool = NULL;
-		return -ENOMEM;
+		goto out;
+	}
+
+	/* Pre-allocate a small memory pool for cca info list entries */
+	info_mempool = mempool_create_kmalloc_pool(INFO_ENTRY_MEMPOOL_MIN_ITEMS,
+						   sizeof(struct cca_info_list_entry));
+	if (IS_ERR(info_mempool)) {
+		ZCRYPT_DBF_ERR("%s info entry mempool_create(%d,%d) failed: %ld\n",
+			       __func__, INFO_ENTRY_MEMPOOL_MIN_ITEMS,
+			       (int)sizeof(struct cca_info_list_entry),
+			       PTR_ERR(info_mempool));
+		rc = PTR_ERR(info_mempool);
+		info_mempool = NULL;
+		goto out;
 	}
 
 	/* Pre-allocate one crypto status card struct used in findcard() */
 	dev_status_mem = kvmalloc(ZCRYPT_DEV_STATUS_EXT_SIZE, GFP_KERNEL);
 	if (!dev_status_mem) {
 		ZCRYPT_DBF_ERR("%s allocation of dev_status_mem failed\n", __func__);
-		mempool_destroy(cprb_mempool);
-		return -ENOMEM;
+		goto out;
 	}
 
-	return 0;
+	rc = 0;
+
+out:
+	if (rc) {
+		mempool_destroy(cprb_mempool);
+		mempool_destroy(info_mempool);
+	}
+	return rc;
 }
 
 void zcrypt_ccamisc_exit(void)
@@ -2064,4 +2094,5 @@ void zcrypt_ccamisc_exit(void)
 	mkvp_cache_free();
 	kvfree(dev_status_mem);
 	mempool_destroy(cprb_mempool);
+	mempool_destroy(info_mempool);
 }
drivers/s390/crypto/zcrypt_ccamisc.h +2 -1
index bed647a42eb2..966f0eaf3c4c 100644
@@ -268,7 +268,8 @@ struct cca_info {
 /*
  * Fetch cca information about an CCA queue.
  */
-int cca_get_info(u16 card, u16 dom, struct cca_info *ci, int verify);
+int cca_get_info(u16 card, u16 dom, struct cca_info *ci,
+		 int verify, u32 xflags);
 
 int zcrypt_ccamisc_init(void);
 void zcrypt_ccamisc_exit(void);
drivers/s390/crypto/zcrypt_cex4.c +2 -2
index 64df7d2f6266..49a638d373fa 100644
@@ -86,7 +86,7 @@ static ssize_t cca_serialnr_show(struct device *dev,
 	memset(&ci, 0, sizeof(ci));
 
 	if (ap_domain_index >= 0)
-		cca_get_info(ac->id, ap_domain_index, &ci, zc->online);
+		cca_get_info(ac->id, ap_domain_index, &ci, zc->online, 0);
 
 	return sysfs_emit(buf, "%s\n", ci.serial);
 }
@@ -120,7 +120,7 @@ static ssize_t cca_mkvps_show(struct device *dev,
 
 	cca_get_info(AP_QID_CARD(zq->queue->qid),
 		     AP_QID_QUEUE(zq->queue->qid),
-		     &ci, zq->online);
+		     &ci, zq->online, 0);
 
 	if (ci.new_aes_mk_state >= '1' && ci.new_aes_mk_state <= '3')
 		n += sysfs_emit_at(buf, n, "AES NEW: %s 0x%016llx\n",
Signature · 1 line
2.43.0
author maintainer
#39 lore raw

PATCH v2 14/20 s390/zcrypt: Locate ep11_domain_query_info onto the stack instead of kmalloc

In reply to Harald Freudenberger

Locate the relative small struct ep11_domain_query_info variable onto the stack instead of kmalloc()/kfree().

---
 drivers/s390/crypto/zcrypt_ep11misc.c | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)
drivers/s390/crypto/zcrypt_ep11misc.c +10 -15
index 6005ef79c001..7fb55be3e943 100644
@@ -790,36 +790,31 @@ int ep11_get_domain_info(u16 card, u16 domain, struct ep11_domain_info *info)
 		u8  new_WK_VP[32];
 		u32 dom_flags;
 		u64 op_mode;
-	} __packed * p_dom_info;
-
-	p_dom_info = kmalloc(sizeof(*p_dom_info), GFP_KERNEL);
-	if (!p_dom_info)
-		return -ENOMEM;
+	} __packed dom_query_info;
 
 	rc = ep11_query_info(card, domain, 0x03 /* domain info query */,
-			     sizeof(*p_dom_info), (u8 *)p_dom_info);
+			     sizeof(dom_query_info), (u8 *)&dom_query_info);
 	if (rc)
 		goto out;
 
 	memset(info, 0, sizeof(*info));
 	info->cur_wk_state = '0';
 	info->new_wk_state = '0';
-	if (p_dom_info->dom_flags & 0x10 /* left imprint mode */) {
-		if (p_dom_info->dom_flags & 0x02 /* cur wk valid */) {
+	if (dom_query_info.dom_flags & 0x10 /* left imprint mode */) {
+		if (dom_query_info.dom_flags & 0x02 /* cur wk valid */) {
 			info->cur_wk_state = '1';
-			memcpy(info->cur_wkvp, p_dom_info->cur_WK_VP, 32);
+			memcpy(info->cur_wkvp, dom_query_info.cur_WK_VP, 32);
 		}
-		if (p_dom_info->dom_flags & 0x04 || /* new wk present */
-		    p_dom_info->dom_flags & 0x08 /* new wk committed */) {
+		if (dom_query_info.dom_flags & 0x04 || /* new wk present */
+		    dom_query_info.dom_flags & 0x08 /* new wk committed */) {
 			info->new_wk_state =
-				p_dom_info->dom_flags & 0x08 ? '2' : '1';
-			memcpy(info->new_wkvp, p_dom_info->new_WK_VP, 32);
+				dom_query_info.dom_flags & 0x08 ? '2' : '1';
+			memcpy(info->new_wkvp, dom_query_info.new_WK_VP, 32);
 		}
 	}
-	info->op_mode = p_dom_info->op_mode;
+	info->op_mode = dom_query_info.op_mode;
 
 out:
-	kfree(p_dom_info);
 	return rc;
 }
 EXPORT_SYMBOL(ep11_get_domain_info);
Signature · 1 line
2.43.0
author maintainer
#42 lore raw

PATCH v2 15/20 s390/zcrypt: Rework ep11 misc functions to use cprb mempool

In reply to Harald Freudenberger

There are two places in the ep11 misc code where a short term memory buffer is needed. Rework this code to use the cprb mempool to satisfy this ephemeral memory requirements.

---
 drivers/s390/crypto/pkey_ep11.c       |   3 +-
 drivers/s390/crypto/zcrypt_cex4.c     |  12 +--
 drivers/s390/crypto/zcrypt_ep11misc.c | 104 ++++++++++++++++----------
 drivers/s390/crypto/zcrypt_ep11misc.h |   8 +-
 4 files changed, 78 insertions(+), 49 deletions(-)
drivers/s390/crypto/pkey_ep11.c +2 -1
index b970f0be84be..38aa0c7807c2 100644
@@ -280,6 +280,7 @@ static int ep11_gen_key(const struct pkey_apqn *apqns, size_t nr_apqns,
 {
 	struct pkey_apqn *local_apqns = NULL;
 	int i, len, rc;
+	const u32 xflags = 0;
 
 	/* check keytype, subtype, keybitsize */
 	switch (keytype) {
@@ -328,7 +329,7 @@ static int ep11_gen_key(const struct pkey_apqn *apqns, size_t nr_apqns,
 	for (rc = -ENODEV, i = 0; rc && i < nr_apqns; i++) {
 		rc = ep11_genaeskey(apqns[i].card, apqns[i].domain,
 				    keybitsize, flags,
-				    keybuf, keybuflen, subtype);
+				    keybuf, keybuflen, subtype, xflags);
 	}
 
 out:
drivers/s390/crypto/zcrypt_cex4.c +6 -6
index 49a638d373fa..83e277d18844 100644
@@ -216,7 +216,7 @@ static ssize_t ep11_api_ordinalnr_show(struct device *dev,
 
 	memset(&ci, 0, sizeof(ci));
 
-	ep11_get_card_info(ac->id, &ci, zc->online);
+	ep11_get_card_info(ac->id, &ci, zc->online, 0);
 
 	if (ci.API_ord_nr > 0)
 		return sysfs_emit(buf, "%u\n", ci.API_ord_nr);
@@ -237,7 +237,7 @@ static ssize_t ep11_fw_version_show(struct device *dev,
 
 	memset(&ci, 0, sizeof(ci));
 
-	ep11_get_card_info(ac->id, &ci, zc->online);
+	ep11_get_card_info(ac->id, &ci, zc->online, 0);
 
 	if (ci.FW_version > 0)
 		return sysfs_emit(buf, "%d.%d\n",
@@ -260,7 +260,7 @@ static ssize_t ep11_serialnr_show(struct device *dev,
 
 	memset(&ci, 0, sizeof(ci));
 
-	ep11_get_card_info(ac->id, &ci, zc->online);
+	ep11_get_card_info(ac->id, &ci, zc->online, 0);
 
 	if (ci.serial[0])
 		return sysfs_emit(buf, "%16.16s\n", ci.serial);
@@ -298,7 +298,7 @@ static ssize_t ep11_card_op_modes_show(struct device *dev,
 
 	memset(&ci, 0, sizeof(ci));
 
-	ep11_get_card_info(ac->id, &ci, zc->online);
+	ep11_get_card_info(ac->id, &ci, zc->online, 0);
 
 	for (i = 0; ep11_op_modes[i].mode_txt; i++) {
 		if (ci.op_mode & (1ULL << ep11_op_modes[i].mode_bit)) {
@@ -348,7 +348,7 @@ static ssize_t ep11_mkvps_show(struct device *dev,
 	if (zq->online)
 		ep11_get_domain_info(AP_QID_CARD(zq->queue->qid),
 				     AP_QID_QUEUE(zq->queue->qid),
-				     &di);
+				     &di, 0);
 
 	if (di.cur_wk_state == '0') {
 		n = sysfs_emit(buf, "WK CUR: %s -\n",
@@ -395,7 +395,7 @@ static ssize_t ep11_queue_op_modes_show(struct device *dev,
 	if (zq->online)
 		ep11_get_domain_info(AP_QID_CARD(zq->queue->qid),
 				     AP_QID_QUEUE(zq->queue->qid),
-				     &di);
+				     &di, 0);
 
 	for (i = 0; ep11_op_modes[i].mode_txt; i++) {
 		if (di.op_mode & (1ULL << ep11_op_modes[i].mode_bit)) {
drivers/s390/crypto/zcrypt_ep11misc.c +65 -39

298 lines not on this page · raw message

drivers/s390/crypto/zcrypt_ep11misc.h +5 -3
index cbd615547bc2..7ef036759dc8 100644
@@ -104,18 +104,20 @@ struct ep11_domain_info {
 /*
  * Provide information about an EP11 card.
  */
-int ep11_get_card_info(u16 card, struct ep11_card_info *info, int verify);
+int ep11_get_card_info(u16 card, struct ep11_card_info *info,
+		       int verify, u32 xflags);
 
 /*
  * Provide information about a domain within an EP11 card.
  */
-int ep11_get_domain_info(u16 card, u16 domain, struct ep11_domain_info *info);
+int ep11_get_domain_info(u16 card, u16 domain,
+			 struct ep11_domain_info *info, u32 xflags);
 
 /*
  * Generate (random) EP11 AES secure key.
  */
 int ep11_genaeskey(u16 card, u16 domain, u32 keybitsize, u32 keygenflags,
-		   u8 *keybuf, u32 *keybufsize, u32 keybufver);
+		   u8 *keybuf, u32 *keybufsize, u32 keybufver, u32 xflags);
 
 /*
  * Generate EP11 AES secure key with given clear key value.
Signature · 1 line
2.43.0
author maintainer
#44 lore raw

PATCH v2 16/20 s390/zcrypt: Add small mempool for ep11 card info list entries

In reply to Harald Freudenberger

Add a small memory pool for (pre-)allocating ep11 card info list entries. These entries are rather small and the pool is a simple way to support the xflag ZCRYPT_XFLAG_NOMEMALLOC to avoid mallocs.

---
 drivers/s390/crypto/zcrypt_ep11misc.c | 48 ++++++++++++++++++++++-----
 1 file changed, 39 insertions(+), 9 deletions(-)
drivers/s390/crypto/zcrypt_ep11misc.c +39 -9
index af59d66bff33..a9a6fdc32464 100644
@@ -64,6 +64,10 @@ struct card_list_entry {
 static LIST_HEAD(card_list);
 static DEFINE_SPINLOCK(card_list_lock);
 
+/* memory pool for card_list_entry entries */
+#define INFO_ENTRY_MEMPOOL_MIN_ITEMS 4
+static mempool_t *info_mempool;
+
 static int card_cache_fetch(u16 cardnr, struct ep11_card_info *ci)
 {
 	int rc = -ENOENT;
@@ -82,7 +86,8 @@ static int card_cache_fetch(u16 cardnr, struct ep11_card_info *ci)
 	return rc;
 }
 
-static void card_cache_update(u16 cardnr, const struct ep11_card_info *ci)
+static void card_cache_update(u16 cardnr, const struct ep11_card_info *ci,
+			      u32 xflags)
 {
 	int found = 0;
 	struct card_list_entry *ptr;
@@ -96,7 +101,9 @@ static void card_cache_update(u16 cardnr, const struct ep11_card_info *ci)
 		}
 	}
 	if (!found) {
-		ptr = kmalloc(sizeof(*ptr), GFP_ATOMIC);
+		ptr = (xflags & ZCRYPT_XFLAG_NOMEMALLOC) ?
+			mempool_alloc_preallocated(info_mempool) :
+			mempool_alloc(info_mempool, GFP_ATOMIC);
 		if (!ptr) {
 			spin_unlock_bh(&card_list_lock);
 			return;
@@ -116,7 +123,7 @@ static void card_cache_scrub(u16 cardnr)
 	list_for_each_entry(ptr, &card_list, list) {
 		if (ptr->cardnr == cardnr) {
 			list_del(&ptr->list);
-			kfree(ptr);
+			mempool_free(ptr, info_mempool);
 			break;
 		}
 	}
@@ -130,7 +137,7 @@ static void __exit card_cache_free(void)
 	spin_lock_bh(&card_list_lock);
 	list_for_each_entry_safe(ptr, pnext, &card_list, list) {
 		list_del(&ptr->list);
-		kfree(ptr);
+		mempool_free(ptr, info_mempool);
 	}
 	spin_unlock_bh(&card_list_lock);
 }
@@ -772,7 +779,7 @@ int ep11_get_card_info(u16 card, struct ep11_card_info *info,
 			(pmqi->FW_major_vers << 8) + pmqi->FW_minor_vers;
 		memcpy(info->serial, pmqi->serial, sizeof(info->serial));
 		info->op_mode = pmqi->op_mode;
-		card_cache_update(card, info);
+		card_cache_update(card, info, xflags);
 	}
 
 out:
@@ -1713,6 +1720,8 @@ EXPORT_SYMBOL(ep11_findcard2);
 
 int __init zcrypt_ep11misc_init(void)
 {
+	int rc = -ENOMEM;
+
 	/* Pre-allocate a small memory pool for ep11 cprbs. */
 	cprb_mempool = mempool_create_kmalloc_pool(zcrypt_ep11_cprbpool_min_items,
 						   CPRB_MEMPOOL_ITEM_SIZE);
@@ -1720,19 +1729,39 @@ int __init zcrypt_ep11misc_init(void)
 		ZCRYPT_DBF_ERR("%s mempool_create(%d,%d) failed: %ld\n",
 			       __func__, zcrypt_ep11_cprbpool_min_items,
 			       CPRB_MEMPOOL_ITEM_SIZE, PTR_ERR(cprb_mempool));
+		rc = PTR_ERR(cprb_mempool);
 		cprb_mempool = NULL;
-		return -ENOMEM;
+		goto out;
+	}
+
+	/* Pre-allocate a very small memory pool for card info entries */
+	info_mempool = mempool_create_kmalloc_pool(INFO_ENTRY_MEMPOOL_MIN_ITEMS,
+						   sizeof(struct card_list_entry));
+	if (IS_ERR(info_mempool)) {
+		ZCRYPT_DBF_ERR("%s card info entry mempool_create(%d,%d) failed: %ld\n",
+			       __func__, INFO_ENTRY_MEMPOOL_MIN_ITEMS,
+			       (int)sizeof(struct card_list_entry),
+			       PTR_ERR(info_mempool));
+		rc = PTR_ERR(info_mempool);
+		info_mempool = NULL;
+		goto out;
 	}
 
 	/* Pre-allocate one crypto status card struct used in findcard() */
 	dev_status_mem = kvmalloc(ZCRYPT_DEV_STATUS_EXT_SIZE, GFP_KERNEL);
 	if (!dev_status_mem) {
 		ZCRYPT_DBF_ERR("%s allocation of dev_status_mem failed\n", __func__);
-		mempool_destroy(cprb_mempool);
-		return -ENOMEM;
+		goto out;
 	}
 
-	return 0;
+	rc = 0;
+
+out:
+	if (rc) {
+		mempool_destroy(cprb_mempool);
+		mempool_destroy(info_mempool);
+	}
+	return rc;
 }
 
 void zcrypt_ep11misc_exit(void)
@@ -1740,4 +1769,5 @@ void zcrypt_ep11misc_exit(void)
 	card_cache_free();
 	kvfree(dev_status_mem);
 	mempool_destroy(cprb_mempool);
+	mempool_destroy(info_mempool);
 }
Signature · 1 line
2.43.0
author maintainer
#46 lore raw

PATCH v2 17/20 s390/pkey: Rework CCA pkey handler to use stack for small memory allocs

In reply to Harald Freudenberger

There have been some places in the CCA handler code where relatively small amounts of memory have been allocated an freed at the end of the function. This code has been reworked to use the stack instead.

---
 drivers/s390/crypto/pkey_cca.c | 43 ++++++++--------------------------
 1 file changed, 10 insertions(+), 33 deletions(-)
drivers/s390/crypto/pkey_cca.c +10 -33
index 8c9a0c5ca630..619d134b028d 100644
@@ -213,7 +213,7 @@ static int cca_key2protkey(const struct pkey_apqn *apqns, size_t nr_apqns,
 			   u8 *protkey, u32 *protkeylen, u32 *protkeytype)
 {
 	struct keytoken_header *hdr = (struct keytoken_header *)key;
-	struct pkey_apqn *local_apqns = NULL;
+	struct pkey_apqn _apqns[MAXAPQNSINLIST];
 	int i, rc;
 
 	if (keylen < sizeof(*hdr))
@@ -251,14 +251,10 @@ static int cca_key2protkey(const struct pkey_apqn *apqns, size_t nr_apqns,
 	if (!apqns || (nr_apqns == 1 &&
 		       apqns[0].card == 0xFFFF && apqns[0].domain == 0xFFFF)) {
 		nr_apqns = MAXAPQNSINLIST;
-		local_apqns = kmalloc_array(nr_apqns, sizeof(struct pkey_apqn),
-					    GFP_KERNEL);
-		if (!local_apqns)
-			return -ENOMEM;
-		rc = cca_apqns4key(key, keylen, 0, local_apqns, &nr_apqns);
+		rc = cca_apqns4key(key, keylen, 0, _apqns, &nr_apqns);
 		if (rc)
 			goto out;
-		apqns = local_apqns;
+		apqns = _apqns;
 	}
 
 	for (rc = -ENODEV, i = 0; rc && i < nr_apqns; i++) {
@@ -283,7 +279,6 @@ static int cca_key2protkey(const struct pkey_apqn *apqns, size_t nr_apqns,
 	}
 
 out:
-	kfree(local_apqns);
 	pr_debug("rc=%d\n", rc);
 	return rc;
 }
@@ -302,7 +297,7 @@ static int cca_gen_key(const struct pkey_apqn *apqns, size_t nr_apqns,
 		       u32 keybitsize, u32 flags,
 		       u8 *keybuf, u32 *keybuflen, u32 *_keyinfo)
 {
-	struct pkey_apqn *local_apqns = NULL;
+	struct pkey_apqn _apqns[MAXAPQNSINLIST];
 	int i, len, rc;
 
 	/* check keytype, subtype, keybitsize */
@@ -338,15 +333,10 @@ static int cca_gen_key(const struct pkey_apqn *apqns, size_t nr_apqns,
 	if (!apqns || (nr_apqns == 1 &&
 		       apqns[0].card == 0xFFFF && apqns[0].domain == 0xFFFF)) {
 		nr_apqns = MAXAPQNSINLIST;
-		local_apqns = kmalloc_array(nr_apqns, sizeof(struct pkey_apqn),
-					    GFP_KERNEL);
-		if (!local_apqns)
-			return -ENOMEM;
-		rc = cca_apqns4type(subtype, NULL, NULL, 0,
-				    local_apqns, &nr_apqns);
+		rc = cca_apqns4type(subtype, NULL, NULL, 0, _apqns, &nr_apqns);
 		if (rc)
 			goto out;
-		apqns = local_apqns;
+		apqns = _apqns;
 	}
 
 	for (rc = -ENODEV, i = 0; rc && i < nr_apqns; i++) {
@@ -363,7 +353,6 @@ static int cca_gen_key(const struct pkey_apqn *apqns, size_t nr_apqns,
 	}
 
 out:
-	kfree(local_apqns);
 	pr_debug("rc=%d\n", rc);
 	return rc;
 }
@@ -383,7 +372,7 @@ static int cca_clr2key(const struct pkey_apqn *apqns, size_t nr_apqns,
 		       const u8 *clrkey, u32 clrkeylen,
 		       u8 *keybuf, u32 *keybuflen, u32 *_keyinfo)
 {
-	struct pkey_apqn *local_apqns = NULL;
+	struct pkey_apqn _apqns[MAXAPQNSINLIST];
 	int i, len, rc;
 
 	/* check keytype, subtype, clrkeylen, keybitsize */
@@ -424,15 +413,10 @@ static int cca_clr2key(const struct pkey_apqn *apqns, size_t nr_apqns,
 	if (!apqns || (nr_apqns == 1 &&
 		       apqns[0].card == 0xFFFF && apqns[0].domain == 0xFFFF)) {
 		nr_apqns = MAXAPQNSINLIST;
-		local_apqns = kmalloc_array(nr_apqns, sizeof(struct pkey_apqn),
-					    GFP_KERNEL);
-		if (!local_apqns)
-			return -ENOMEM;
-		rc = cca_apqns4type(subtype, NULL, NULL, 0,
-				    local_apqns, &nr_apqns);
+		rc = cca_apqns4type(subtype, NULL, NULL, 0, _apqns, &nr_apqns);
 		if (rc)
 			goto out;
-		apqns = local_apqns;
+		apqns = _apqns;
 	}
 
 	for (rc = -ENODEV, i = 0; rc && i < nr_apqns; i++) {
@@ -449,7 +433,6 @@ static int cca_clr2key(const struct pkey_apqn *apqns, size_t nr_apqns,
 	}
 
 out:
-	kfree(local_apqns);
 	pr_debug("rc=%d\n", rc);
 	return rc;
 }
@@ -552,8 +535,8 @@ static int cca_slowpath_key2protkey(const struct pkey_apqn *apqns,
 {
 	const struct keytoken_header *hdr = (const struct keytoken_header *)key;
 	const struct clearkeytoken *t = (const struct clearkeytoken *)key;
+	u8 tmpbuf[SECKEYBLOBSIZE]; /* 64 bytes */
 	u32 tmplen, keysize = 0;
-	u8 *tmpbuf;
 	int i, rc;
 
 	if (keylen < sizeof(*hdr))
@@ -565,11 +548,6 @@ static int cca_slowpath_key2protkey(const struct pkey_apqn *apqns,
 	if (!keysize || t->len != keysize)
 		return -EINVAL;
 
-	/* alloc tmp key buffer */
-	tmpbuf = kmalloc(SECKEYBLOBSIZE, GFP_ATOMIC);
-	if (!tmpbuf)
-		return -ENOMEM;
-
 	/* try two times in case of failure */
 	for (i = 0, rc = -ENODEV; i < 2 && rc; i++) {
 		tmplen = SECKEYBLOBSIZE;
@@ -584,7 +562,6 @@ static int cca_slowpath_key2protkey(const struct pkey_apqn *apqns,
 		pr_debug("cca_key2protkey()=%d\n", rc);
 	}
 
-	kfree(tmpbuf);
 	pr_debug("rc=%d\n", rc);
 	return rc;
 }
Signature · 1 line
2.43.0
author maintainer
#48 lore raw

PATCH v2 18/20 s390/pkey: Rework EP11 pkey handler to use stack for small memory allocs

In reply to Harald Freudenberger

There have been some places in the EP11 handler code where relatively small amounts of memory have been allocated an freed at the end of the function. This code has been reworked to use the stack instead.

---
 drivers/s390/crypto/pkey_ep11.c | 43 ++++++++-------------------------
 1 file changed, 10 insertions(+), 33 deletions(-)
drivers/s390/crypto/pkey_ep11.c +10 -33
index 38aa0c7807c2..429c08facbfe 100644
@@ -186,7 +186,7 @@ static int ep11_key2protkey(const struct pkey_apqn *apqns, size_t nr_apqns,
 			    u8 *protkey, u32 *protkeylen, u32 *protkeytype)
 {
 	struct keytoken_header *hdr = (struct keytoken_header *)key;
-	struct pkey_apqn *local_apqns = NULL;
+	struct pkey_apqn _apqns[MAXAPQNSINLIST];
 	int i, rc;
 
 	if (keylen < sizeof(*hdr))
@@ -223,14 +223,10 @@ static int ep11_key2protkey(const struct pkey_apqn *apqns, size_t nr_apqns,
 	if (!apqns || (nr_apqns == 1 &&
 		       apqns[0].card == 0xFFFF && apqns[0].domain == 0xFFFF)) {
 		nr_apqns = MAXAPQNSINLIST;
-		local_apqns = kmalloc_array(nr_apqns, sizeof(struct pkey_apqn),
-					    GFP_KERNEL);
-		if (!local_apqns)
-			return -ENOMEM;
-		rc = ep11_apqns4key(key, keylen, 0, local_apqns, &nr_apqns);
+		rc = ep11_apqns4key(key, keylen, 0, _apqns, &nr_apqns);
 		if (rc)
 			goto out;
-		apqns = local_apqns;
+		apqns = _apqns;
 	}
 
 	for (rc = -ENODEV, i = 0; rc && i < nr_apqns; i++) {
@@ -259,7 +255,6 @@ static int ep11_key2protkey(const struct pkey_apqn *apqns, size_t nr_apqns,
 	}
 
 out:
-	kfree(local_apqns);
 	pr_debug("rc=%d\n", rc);
 	return rc;
 }
@@ -278,7 +273,7 @@ static int ep11_gen_key(const struct pkey_apqn *apqns, size_t nr_apqns,
 			u32 keybitsize, u32 flags,
 			u8 *keybuf, u32 *keybuflen, u32 *_keyinfo)
 {
-	struct pkey_apqn *local_apqns = NULL;
+	struct pkey_apqn _apqns[MAXAPQNSINLIST];
 	int i, len, rc;
 	const u32 xflags = 0;
 
@@ -315,15 +310,10 @@ static int ep11_gen_key(const struct pkey_apqn *apqns, size_t nr_apqns,
 	if (!apqns || (nr_apqns == 1 &&
 		       apqns[0].card == 0xFFFF && apqns[0].domain == 0xFFFF)) {
 		nr_apqns = MAXAPQNSINLIST;
-		local_apqns = kmalloc_array(nr_apqns, sizeof(struct pkey_apqn),
-					    GFP_KERNEL);
-		if (!local_apqns)
-			return -ENOMEM;
-		rc = ep11_apqns4type(subtype, NULL, NULL, 0,
-				     local_apqns, &nr_apqns);
+		rc = ep11_apqns4type(subtype, NULL, NULL, 0, _apqns, &nr_apqns);
 		if (rc)
 			goto out;
-		apqns = local_apqns;
+		apqns = _apqns;
 	}
 
 	for (rc = -ENODEV, i = 0; rc && i < nr_apqns; i++) {
@@ -333,7 +323,6 @@ static int ep11_gen_key(const struct pkey_apqn *apqns, size_t nr_apqns,
 	}
 
 out:
-	kfree(local_apqns);
 	pr_debug("rc=%d\n", rc);
 	return rc;
 }
@@ -353,7 +342,7 @@ static int ep11_clr2key(const struct pkey_apqn *apqns, size_t nr_apqns,
 			const u8 *clrkey, u32 clrkeylen,
 			u8 *keybuf, u32 *keybuflen, u32 *_keyinfo)
 {
-	struct pkey_apqn *local_apqns = NULL;
+	struct pkey_apqn _apqns[MAXAPQNSINLIST];
 	int i, len, rc;
 
 	/* check keytype, subtype, clrkeylen, keybitsize */
@@ -394,15 +383,10 @@ static int ep11_clr2key(const struct pkey_apqn *apqns, size_t nr_apqns,
 	if (!apqns || (nr_apqns == 1 &&
 		       apqns[0].card == 0xFFFF && apqns[0].domain == 0xFFFF)) {
 		nr_apqns = MAXAPQNSINLIST;
-		local_apqns = kmalloc_array(nr_apqns, sizeof(struct pkey_apqn),
-					    GFP_KERNEL);
-		if (!local_apqns)
-			return -ENOMEM;
-		rc = ep11_apqns4type(subtype, NULL, NULL, 0,
-				     local_apqns, &nr_apqns);
+		rc = ep11_apqns4type(subtype, NULL, NULL, 0, _apqns, &nr_apqns);
 		if (rc)
 			goto out;
-		apqns = local_apqns;
+		apqns = _apqns;
 	}
 
 	for (rc = -ENODEV, i = 0; rc && i < nr_apqns; i++) {
@@ -412,7 +396,6 @@ static int ep11_clr2key(const struct pkey_apqn *apqns, size_t nr_apqns,
 	}
 
 out:
-	kfree(local_apqns);
 	pr_debug("rc=%d\n", rc);
 	return rc;
 }
@@ -502,8 +485,8 @@ static int ep11_slowpath_key2protkey(const struct pkey_apqn *apqns,
 {
 	const struct keytoken_header *hdr = (const struct keytoken_header *)key;
 	const struct clearkeytoken *t = (const struct clearkeytoken *)key;
+	u8 tmpbuf[MAXEP11AESKEYBLOBSIZE]; /* 336 bytes */
 	u32 tmplen, keysize = 0;
-	u8 *tmpbuf;
 	int i, rc;
 
 	if (keylen < sizeof(*hdr))
@@ -515,11 +498,6 @@ static int ep11_slowpath_key2protkey(const struct pkey_apqn *apqns,
 	if (!keysize || t->len != keysize)
 		return -EINVAL;
 
-	/* alloc tmp key buffer */
-	tmpbuf = kmalloc(MAXEP11AESKEYBLOBSIZE, GFP_ATOMIC);
-	if (!tmpbuf)
-		return -ENOMEM;
-
 	/* try two times in case of failure */
 	for (i = 0, rc = -ENODEV; i < 2 && rc; i++) {
 		tmplen = MAXEP11AESKEYBLOBSIZE;
@@ -534,7 +512,6 @@ static int ep11_slowpath_key2protkey(const struct pkey_apqn *apqns,
 		pr_debug("ep11_key2protkey()=%d\n", rc);
 	}
 
-	kfree(tmpbuf);
 	pr_debug("rc=%d\n", rc);
 	return rc;
 }
Signature · 1 line
2.43.0
author maintainer
#50 lore raw

PATCH v2 19/20 s390/zcrypt/pkey: Provide and pass xflags within pkey and zcrypt layers

In reply to Harald Freudenberger

Provide and pass the xflag parameter from pkey ioctls through the pkey handler and further down to the implementations (CCA, EP11, PCKMO and UV). So all the code is now prepared and ready to support the currently only xflag ("execution flag"):

* ZCRYPT_XFLAG_NOMEMALLOC - If this flag is set, no memory allocations which may trigger any IO operations are done.

The in-kernel pkey API still does not provide this xflag param. That's intended to come with another patch which more or less only enables this functionality.

---
 drivers/s390/crypto/pkey_api.c        | 49 +++++++++++-----------
 drivers/s390/crypto/pkey_base.c       | 34 ++++++++-------
 drivers/s390/crypto/pkey_base.h       | 37 ++++++++++-------
 drivers/s390/crypto/pkey_cca.c        | 59 +++++++++++++++------------
 drivers/s390/crypto/pkey_ep11.c       | 49 ++++++++++++----------
 drivers/s390/crypto/pkey_pckmo.c      |  9 ++--
 drivers/s390/crypto/pkey_sysfs.c      |  4 +-
 drivers/s390/crypto/pkey_uv.c         | 16 +++++++-
 drivers/s390/crypto/zcrypt_ccamisc.c  | 53 +++++++++++-------------
 drivers/s390/crypto/zcrypt_ccamisc.h  | 25 +++++++-----
 drivers/s390/crypto/zcrypt_ep11misc.c | 10 ++---
 drivers/s390/crypto/zcrypt_ep11misc.h |  7 ++--
 12 files changed, 196 insertions(+), 156 deletions(-)
drivers/s390/crypto/pkey_api.c +26 -23
index 3a39e167bdbf..55a4e70b866b 100644
@@ -24,7 +24,8 @@
  */
 static int key2protkey(const struct pkey_apqn *apqns, size_t nr_apqns,
 		       const u8 *key, size_t keylen,
-		       u8 *protkey, u32 *protkeylen, u32 *protkeytype)
+		       u8 *protkey, u32 *protkeylen, u32 *protkeytype,
+		       u32 xflags)
 {
 	int rc;
 
@@ -32,14 +33,14 @@ static int key2protkey(const struct pkey_apqn *apqns, size_t nr_apqns,
 	rc = pkey_handler_key_to_protkey(apqns, nr_apqns,
 					 key, keylen,
 					 protkey, protkeylen,
-					 protkeytype);
+					 protkeytype, xflags);
 
 	/* if this did not work, try the slowpath way */
 	if (rc == -ENODEV) {
 		rc = pkey_handler_slowpath_key_to_protkey(apqns, nr_apqns,
 							  key, keylen,
 							  protkey, protkeylen,
-							  protkeytype);
+							  protkeytype, xflags);
 		if (rc)
 			rc = -ENODEV;
 	}
@@ -55,13 +56,14 @@ int pkey_key2protkey(const u8 *key, u32 keylen,
 		     u8 *protkey, u32 *protkeylen, u32 *protkeytype)
 {
 	int rc;
+	const u32 xflags = 0;
 
 	rc = key2protkey(NULL, 0, key, keylen,
-			 protkey, protkeylen, protkeytype);
+			 protkey, protkeylen, protkeytype, xflags);
 	if (rc == -ENODEV) {
 		pkey_handler_request_modules();
 		rc = key2protkey(NULL, 0, key, keylen,
-				 protkey, protkeylen, protkeytype);
+				 protkey, protkeylen, protkeytype, xflags);
 	}
 
 	return rc;
@@ -103,7 +105,7 @@ static int pkey_ioctl_genseck(struct pkey_genseck __user *ugs)
 	keybuflen = sizeof(kgs.seckey.seckey);
 	rc = pkey_handler_gen_key(&apqn, 1,
 				  kgs.keytype, PKEY_TYPE_CCA_DATA, 0, 0,
-				  kgs.seckey.seckey, &keybuflen, NULL);
+				  kgs.seckey.seckey, &keybuflen, NULL, 0);
 	pr_debug("gen_key()=%d\n", rc);
 	if (!rc && copy_to_user(ugs, &kgs, sizeof(kgs)))
 		rc = -EFAULT;
@@ -129,7 +131,7 @@ static int pkey_ioctl_clr2seck(struct pkey_clr2seck __user *ucs)
 				     kcs.keytype, PKEY_TYPE_CCA_DATA, 0, 0,
 				     kcs.clrkey.clrkey,
 				     pkey_keytype_aes_to_size(kcs.keytype),
-				     kcs.seckey.seckey, &keybuflen, NULL);
+				     kcs.seckey.seckey, &keybuflen, NULL, 0);
 	pr_debug("clr_to_key()=%d\n", rc);
 	if (!rc && copy_to_user(ucs, &kcs, sizeof(kcs)))
 		rc = -EFAULT;
@@ -154,7 +156,8 @@ static int pkey_ioctl_sec2protk(struct pkey_sec2protk __user *usp)
 					 ksp.seckey.seckey,
 					 sizeof(ksp.seckey.seckey),
 					 ksp.protkey.protkey,
-					 &ksp.protkey.len, &ksp.protkey.type);
+					 &ksp.protkey.len, &ksp.protkey.type,
+					 0);
 	pr_debug("key_to_protkey()=%d\n", rc);
 	if (!rc && copy_to_user(usp, &ksp, sizeof(ksp)))
 		rc = -EFAULT;
@@ -198,7 +201,7 @@ static int pkey_ioctl_clr2protk(struct pkey_clr2protk __user *ucp)
 	rc = key2protkey(NULL, 0,
 			 tmpbuf, sizeof(*t) + keylen,
 			 kcp.protkey.protkey,
-			 &kcp.protkey.len, &kcp.protkey.type);
+			 &kcp.protkey.len, &kcp.protkey.type, 0);
 	pr_debug("key2protkey()=%d\n", rc);
 
 	kfree_sensitive(tmpbuf);
@@ -228,12 +231,12 @@ static int pkey_ioctl_findcard(struct pkey_findcard __user *ufc)
 	rc = pkey_handler_apqns_for_key(kfc.seckey.seckey,
 					sizeof(kfc.seckey.seckey),
 					PKEY_FLAGS_MATCH_CUR_MKVP,
-					apqns, &nr_apqns);
+					apqns, &nr_apqns, 0);
 	if (rc == -ENODEV)
 		rc = pkey_handler_apqns_for_key(kfc.seckey.seckey,
 						sizeof(kfc.seckey.seckey),
 						PKEY_FLAGS_MATCH_ALT_MKVP,
-						apqns, &nr_apqns);
+						apqns, &nr_apqns, 0);
 	pr_debug("apqns_for_key()=%d\n", rc);
 	if (rc) {
 		kfree(apqns);
@@ -262,7 +265,7 @@ static int pkey_ioctl_skey2pkey(struct pkey_skey2pkey __user *usp)
 					 sizeof(ksp.seckey.seckey),
 					 ksp.protkey.protkey,
 					 &ksp.protkey.len,
-					 &ksp.protkey.type);
+					 &ksp.protkey.type, 0);
 	pr_debug("key_to_protkey()=%d\n", rc);
 	if (!rc && copy_to_user(usp, &ksp, sizeof(ksp)))
 		rc = -EFAULT;
@@ -285,7 +288,7 @@ static int pkey_ioctl_verifykey(struct pkey_verifykey __user *uvk)
 	rc = pkey_handler_verify_key(kvk.seckey.seckey,
 				     sizeof(kvk.seckey.seckey),
 				     &kvk.cardnr, &kvk.domain,
-				     &keytype, &keybitsize, &flags);
+				     &keytype, &keybitsize, &flags, 0);
 	pr_debug("verify_key()=%d\n", rc);
 	if (!rc && keytype != PKEY_TYPE_CCA_DATA)
 		rc = -EINVAL;
@@ -312,7 +315,7 @@ static int pkey_ioctl_genprotk(struct pkey_genprotk __user *ugp)
 	rc = pkey_handler_gen_key(NULL, 0, kgp.keytype,
 				  PKEY_TYPE_PROTKEY, 0, 0,
 				  kgp.protkey.protkey, &kgp.protkey.len,
-				  &kgp.protkey.type);
+				  &kgp.protkey.type, 0);
 	pr_debug("gen_key()=%d\n", rc);
 	if (!rc && copy_to_user(ugp, &kgp, sizeof(kgp)))
 		rc = -EFAULT;
@@ -354,7 +357,7 @@ static int pkey_ioctl_verifyprotk(struct pkey_verifyprotk __user *uvp)
 	memcpy(t->protkey, kvp.protkey.protkey, kvp.protkey.len);
 
 	rc = pkey_handler_verify_key(tmpbuf, sizeof(*t),
-				     NULL, NULL, NULL, NULL, NULL);
+				     NULL, NULL, NULL, NULL, NULL, 0);
 	pr_debug("verify_key()=%d\n", rc);
 
 	kfree_sensitive(tmpbuf);
@@ -377,7 +380,7 @@ static int pkey_ioctl_kblob2protk(struct pkey_kblob2pkey __user *utp)
 	ktp.protkey.len = sizeof(ktp.protkey.protkey);
 	rc = key2protkey(NULL, 0, kkey, ktp.keylen,
 			 ktp.protkey.protkey, &ktp.protkey.len,
-			 &ktp.protkey.type);
+			 &ktp.protkey.type, 0);
 	pr_debug("key2protkey()=%d\n", rc);
 	kfree_sensitive(kkey);
 	if (!rc && copy_to_user(utp, &ktp, sizeof(ktp)))
@@ -414,7 +417,7 @@ static int pkey_ioctl_genseck2(struct pkey_genseck2 __user *ugs)
 	}
 	rc = pkey_handler_gen_key(apqns, kgs.apqn_entries,
 				  u, kgs.type, kgs.size, kgs.keygenflags,
-				  kkey, &klen, NULL);
+				  kkey, &klen, NULL, 0);
 	pr_debug("gen_key()=%d\n", rc);
 	kfree(apqns);
 	if (rc) {
@@ -471,7 +474,7 @@ static int pkey_ioctl_clr2seck2(struct pkey_clr2seck2 __user *ucs)
 	rc = pkey_handler_clr_to_key(apqns, kcs.apqn_entries,
 				     u, kcs.type, kcs.size, kcs.keygenflags,
 				     kcs.clrkey.clrkey, kcs.size / 8,
-				     kkey, &klen, NULL);
+				     kkey, &klen, NULL, 0);
 	pr_debug("clr_to_key()=%d\n", rc);
 	kfree(apqns);
 	if (rc) {
@@ -514,7 +517,7 @@ static int pkey_ioctl_verifykey2(struct pkey_verifykey2 __user *uvk)
 
 	rc = pkey_handler_verify_key(kkey, kvk.keylen,
 				     &kvk.cardnr, &kvk.domain,
-				     &kvk.type, &kvk.size, &kvk.flags);
+				     &kvk.type, &kvk.size, &kvk.flags, 0);
 	pr_debug("verify_key()=%d\n", rc);
 
 	kfree_sensitive(kkey);
@@ -544,7 +547,7 @@ static int pkey_ioctl_kblob2protk2(struct pkey_kblob2pkey2 __user *utp)
 	ktp.protkey.len = sizeof(ktp.protkey.protkey);
 	rc = key2protkey(apqns, ktp.apqn_entries, kkey, ktp.keylen,
 			 ktp.protkey.protkey, &ktp.protkey.len,
-			 &ktp.protkey.type);
+			 &ktp.protkey.type, 0);
 	pr_debug("key2protkey()=%d\n", rc);
 	kfree(apqns);
 	kfree_sensitive(kkey);
@@ -579,7 +582,7 @@ static int pkey_ioctl_apqns4k(struct pkey_apqns4key __user *uak)
 		return PTR_ERR(kkey);
 	}
 	rc = pkey_handler_apqns_for_key(kkey, kak.keylen, kak.flags,
-					apqns, &nr_apqns);
+					apqns, &nr_apqns, 0);
 	pr_debug("apqns_for_key()=%d\n", rc);
 	kfree_sensitive(kkey);
 	if (rc && rc != -ENOSPC) {
@@ -626,7 +629,7 @@ static int pkey_ioctl_apqns4kt(struct pkey_apqns4keytype __user *uat)
 	}
 	rc = pkey_handler_apqns_for_keytype(kat.type,
 					    kat.cur_mkvp, kat.alt_mkvp,
-					    kat.flags, apqns, &nr_apqns);
+					    kat.flags, apqns, &nr_apqns, 0);
 	pr_debug("apqns_for_keytype()=%d\n", rc);
 	if (rc && rc != -ENOSPC) {
 		kfree(apqns);
@@ -678,7 +681,7 @@ static int pkey_ioctl_kblob2protk3(struct pkey_kblob2pkey3 __user *utp)
 		return -ENOMEM;
 	}
 	rc = key2protkey(apqns, ktp.apqn_entries, kkey, ktp.keylen,
-			 protkey, &protkeylen, &ktp.pkeytype);
+			 protkey, &protkeylen, &ktp.pkeytype, 0);
 	pr_debug("key2protkey()=%d\n", rc);
 	kfree(apqns);
 	kfree_sensitive(kkey);
drivers/s390/crypto/pkey_base.c +20 -14
index 64a376501d26..9e6f319acc63 100644
@@ -150,7 +150,8 @@ EXPORT_SYMBOL(pkey_handler_put);
 
 int pkey_handler_key_to_protkey(const struct pkey_apqn *apqns, size_t nr_apqns,
 				const u8 *key, u32 keylen,
-				u8 *protkey, u32 *protkeylen, u32 *protkeytype)
+				u8 *protkey, u32 *protkeylen, u32 *protkeytype,
+				u32 xflags)
 {
 	const struct pkey_handler *h;
 	int rc = -ENODEV;
@@ -159,7 +160,7 @@ int pkey_handler_key_to_protkey(const struct pkey_apqn *apqns, size_t nr_apqns,
 	if (h && h->key_to_protkey) {
 		rc = h->key_to_protkey(apqns, nr_apqns, key, keylen,
 				       protkey, protkeylen,
-				       protkeytype);
+				       protkeytype, xflags);
 	}
 	pkey_handler_put(h);
 
@@ -177,7 +178,7 @@ int pkey_handler_slowpath_key_to_protkey(const struct pkey_apqn *apqns,
 					 size_t nr_apqns,
 					 const u8 *key, u32 keylen,
 					 u8 *protkey, u32 *protkeylen,
-					 u32 *protkeytype)
+					 u32 *protkeytype, u32 xflags)
 {
 	const struct pkey_handler *h, *htmp[10];
 	int i, n = 0, rc = -ENODEV;
@@ -199,7 +200,7 @@ int pkey_handler_slowpath_key_to_protkey(const struct pkey_apqn *apqns,
 			rc = h->slowpath_key_to_protkey(apqns, nr_apqns,
 							key, keylen,
 							protkey, protkeylen,
-							protkeytype);
+							protkeytype, xflags);
 		module_put(h->module);
 	}
 
@@ -210,7 +211,7 @@ EXPORT_SYMBOL(pkey_handler_slowpath_key_to_protkey);
 int pkey_handler_gen_key(const struct pkey_apqn *apqns, size_t nr_apqns,
 			 u32 keytype, u32 keysubtype,
 			 u32 keybitsize, u32 flags,
-			 u8 *keybuf, u32 *keybuflen, u32 *keyinfo)
+			 u8 *keybuf, u32 *keybuflen, u32 *keyinfo, u32 xflags)
 {
 	const struct pkey_handler *h;
 	int rc = -ENODEV;
@@ -219,7 +220,7 @@ int pkey_handler_gen_key(const struct pkey_apqn *apqns, size_t nr_apqns,
 	if (h && h->gen_key) {
 		rc = h->gen_key(apqns, nr_apqns, keytype, keysubtype,
 				keybitsize, flags,
-				keybuf, keybuflen, keyinfo);
+				keybuf, keybuflen, keyinfo, xflags);
 	}
 	pkey_handler_put(h);
 
@@ -231,7 +232,8 @@ int pkey_handler_clr_to_key(const struct pkey_apqn *apqns, size_t nr_apqns,
 			    u32 keytype, u32 keysubtype,
 			    u32 keybitsize, u32 flags,
 			    const u8 *clrkey, u32 clrkeylen,
-			    u8 *keybuf, u32 *keybuflen, u32 *keyinfo)
+			    u8 *keybuf, u32 *keybuflen, u32 *keyinfo,
+			    u32 xflags)
 {
 	const struct pkey_handler *h;
 	int rc = -ENODEV;
@@ -240,7 +242,7 @@ int pkey_handler_clr_to_key(const struct pkey_apqn *apqns, size_t nr_apqns,
 	if (h && h->clr_to_key) {
 		rc = h->clr_to_key(apqns, nr_apqns, keytype, keysubtype,
 				   keybitsize, flags, clrkey, clrkeylen,
-				   keybuf, keybuflen, keyinfo);
+				   keybuf, keybuflen, keyinfo, xflags);
 	}
 	pkey_handler_put(h);
 
@@ -250,7 +252,8 @@ EXPORT_SYMBOL(pkey_handler_clr_to_key);
 
 int pkey_handler_verify_key(const u8 *key, u32 keylen,
 			    u16 *card, u16 *dom,
-			    u32 *keytype, u32 *keybitsize, u32 *flags)
+			    u32 *keytype, u32 *keybitsize, u32 *flags,
+			    u32 xflags)
 {
 	const struct pkey_handler *h;
 	int rc = -ENODEV;
@@ -258,7 +261,7 @@ int pkey_handler_verify_key(const u8 *key, u32 keylen,
 	h = pkey_handler_get_keybased(key, keylen);
 	if (h && h->verify_key) {
 		rc = h->verify_key(key, keylen, card, dom,
-				   keytype, keybitsize, flags);
+				   keytype, keybitsize, flags, xflags);
 	}
 	pkey_handler_put(h);
 
@@ -267,14 +270,16 @@ int pkey_handler_verify_key(const u8 *key, u32 keylen,
 EXPORT_SYMBOL(pkey_handler_verify_key);
 
 int pkey_handler_apqns_for_key(const u8 *key, u32 keylen, u32 flags,
-			       struct pkey_apqn *apqns, size_t *nr_apqns)
+			       struct pkey_apqn *apqns, size_t *nr_apqns,
+			       u32 xflags)
 {
 	const struct pkey_handler *h;
 	int rc = -ENODEV;
 
 	h = pkey_handler_get_keybased(key, keylen);
 	if (h && h->apqns_for_key)
-		rc = h->apqns_for_key(key, keylen, flags, apqns, nr_apqns);
+		rc = h->apqns_for_key(key, keylen, flags, apqns, nr_apqns,
+				      xflags);
 	pkey_handler_put(h);
 
 	return rc;
@@ -283,7 +288,8 @@ EXPORT_SYMBOL(pkey_handler_apqns_for_key);
 
 int pkey_handler_apqns_for_keytype(enum pkey_key_type keysubtype,
 				   u8 cur_mkvp[32], u8 alt_mkvp[32], u32 flags,
-				   struct pkey_apqn *apqns, size_t *nr_apqns)
+				   struct pkey_apqn *apqns, size_t *nr_apqns,
+				   u32 xflags)
 {
 	const struct pkey_handler *h;
 	int rc = -ENODEV;
@@ -292,7 +298,7 @@ int pkey_handler_apqns_for_keytype(enum pkey_key_type keysubtype,
 	if (h && h->apqns_for_keytype) {
 		rc = h->apqns_for_keytype(keysubtype,
 					  cur_mkvp, alt_mkvp, flags,
-					  apqns, nr_apqns);
+					  apqns, nr_apqns, xflags);
 	}
 	pkey_handler_put(h);
 
drivers/s390/crypto/pkey_base.h +23 -14
index 7347647dfaa7..9cdb3e74477f 100644
@@ -159,29 +159,33 @@ struct pkey_handler {
 	bool (*is_supported_keytype)(enum pkey_key_type);
 	int (*key_to_protkey)(const struct pkey_apqn *apqns, size_t nr_apqns,
 			      const u8 *key, u32 keylen,
-			      u8 *protkey, u32 *protkeylen, u32 *protkeytype);
+			      u8 *protkey, u32 *protkeylen, u32 *protkeytype,
+			      u32 xflags);
 	int (*slowpath_key_to_protkey)(const struct pkey_apqn *apqns,
 				       size_t nr_apqns,
 				       const u8 *key, u32 keylen,
 				       u8 *protkey, u32 *protkeylen,
-				       u32 *protkeytype);
+				       u32 *protkeytype, u32 xflags);
 	int (*gen_key)(const struct pkey_apqn *apqns, size_t nr_apqns,
 		       u32 keytype, u32 keysubtype,
 		       u32 keybitsize, u32 flags,
-		       u8 *keybuf, u32 *keybuflen, u32 *keyinfo);
+		       u8 *keybuf, u32 *keybuflen, u32 *keyinfo, u32 xflags);
 	int (*clr_to_key)(const struct pkey_apqn *apqns, size_t nr_apqns,
 			  u32 keytype, u32 keysubtype,
 			  u32 keybitsize, u32 flags,
 			  const u8 *clrkey, u32 clrkeylen,
-			  u8 *keybuf, u32 *keybuflen, u32 *keyinfo);
+			  u8 *keybuf, u32 *keybuflen, u32 *keyinfo, u32 xflags);
 	int (*verify_key)(const u8 *key, u32 keylen,
 			  u16 *card, u16 *dom,
-			  u32 *keytype, u32 *keybitsize, u32 *flags);
+			  u32 *keytype, u32 *keybitsize, u32 *flags,
+			  u32 xflags);
 	int (*apqns_for_key)(const u8 *key, u32 keylen, u32 flags,
-			     struct pkey_apqn *apqns, size_t *nr_apqns);
+			     struct pkey_apqn *apqns, size_t *nr_apqns,
+			     u32 xflags);
 	int (*apqns_for_keytype)(enum pkey_key_type ktype,
 				 u8 cur_mkvp[32], u8 alt_mkvp[32], u32 flags,
-				 struct pkey_apqn *apqns, size_t *nr_apqns);
+				 struct pkey_apqn *apqns, size_t *nr_apqns,
+				 u32 xflags);
 	/* used internal by pkey base */
 	struct list_head list;
 };
@@ -199,29 +203,34 @@ void pkey_handler_put(const struct pkey_handler *handler);
 
 int pkey_handler_key_to_protkey(const struct pkey_apqn *apqns, size_t nr_apqns,
 				const u8 *key, u32 keylen,
-				u8 *protkey, u32 *protkeylen, u32 *protkeytype);
+				u8 *protkey, u32 *protkeylen, u32 *protkeytype,
+				u32 xflags);
 int pkey_handler_slowpath_key_to_protkey(const struct pkey_apqn *apqns,
 					 size_t nr_apqns,
 					 const u8 *key, u32 keylen,
 					 u8 *protkey, u32 *protkeylen,
-					 u32 *protkeytype);
+					 u32 *protkeytype, u32 xflags);
 int pkey_handler_gen_key(const struct pkey_apqn *apqns, size_t nr_apqns,
 			 u32 keytype, u32 keysubtype,
 			 u32 keybitsize, u32 flags,
-			 u8 *keybuf, u32 *keybuflen, u32 *keyinfo);
+			 u8 *keybuf, u32 *keybuflen, u32 *keyinfo, u32 xflags);
 int pkey_handler_clr_to_key(const struct pkey_apqn *apqns, size_t nr_apqns,
 			    u32 keytype, u32 keysubtype,
 			    u32 keybitsize, u32 flags,
 			    const u8 *clrkey, u32 clrkeylen,
-			    u8 *keybuf, u32 *keybuflen, u32 *keyinfo);
+			    u8 *keybuf, u32 *keybuflen, u32 *keyinfo,
+			    u32 xflags);
 int pkey_handler_verify_key(const u8 *key, u32 keylen,
 			    u16 *card, u16 *dom,
-			    u32 *keytype, u32 *keybitsize, u32 *flags);
+			    u32 *keytype, u32 *keybitsize, u32 *flags,
+			    u32 xflags);
 int pkey_handler_apqns_for_key(const u8 *key, u32 keylen, u32 flags,
-			       struct pkey_apqn *apqns, size_t *nr_apqns);
+			       struct pkey_apqn *apqns, size_t *nr_apqns,
+			       u32 xflags);
 int pkey_handler_apqns_for_keytype(enum pkey_key_type ktype,
 				   u8 cur_mkvp[32], u8 alt_mkvp[32], u32 flags,
-				   struct pkey_apqn *apqns, size_t *nr_apqns);
+				   struct pkey_apqn *apqns, size_t *nr_apqns,
+				   u32 xflags);
 
 /*
  * Unconditional try to load all handler modules
drivers/s390/crypto/pkey_cca.c +32 -27

206 lines not on this page · raw message

drivers/s390/crypto/pkey_ep11.c +27 -22

174 lines not on this page · raw message

drivers/s390/crypto/pkey_pckmo.c +6 -3
index 835d59f4fbc5..00aabb1b3e18 100644
@@ -406,7 +406,8 @@ static int pckmo_verify_key(const u8 *key, u32 keylen)
 static int pkey_pckmo_key2protkey(const struct pkey_apqn *_apqns,
 				  size_t _nr_apqns,
 				  const u8 *key, u32 keylen,
-				  u8 *protkey, u32 *protkeylen, u32 *keyinfo)
+				  u8 *protkey, u32 *protkeylen, u32 *keyinfo,
+				  u32 _xflags)
 {
 	return pckmo_key2protkey(key, keylen,
 				 protkey, protkeylen, keyinfo);
@@ -415,7 +416,8 @@ static int pkey_pckmo_key2protkey(const struct pkey_apqn *_apqns,
 static int pkey_pckmo_gen_key(const struct pkey_apqn *_apqns, size_t _nr_apqns,
 			      u32 keytype, u32 keysubtype,
 			      u32 _keybitsize, u32 _flags,
-			      u8 *keybuf, u32 *keybuflen, u32 *keyinfo)
+			      u8 *keybuf, u32 *keybuflen, u32 *keyinfo,
+			      u32 _xflags)
 {
 	return pckmo_gen_protkey(keytype, keysubtype,
 				 keybuf, keybuflen, keyinfo);
@@ -423,7 +425,8 @@ static int pkey_pckmo_gen_key(const struct pkey_apqn *_apqns, size_t _nr_apqns,
 
 static int pkey_pckmo_verifykey(const u8 *key, u32 keylen,
 				u16 *_card, u16 *_dom,
-				u32 *_keytype, u32 *_keybitsize, u32 *_flags)
+				u32 *_keytype, u32 *_keybitsize,
+				u32 *_flags, u32 _xflags)
 {
 	return pckmo_verify_key(key, keylen);
 }
drivers/s390/crypto/pkey_sysfs.c +2 -2
index 57edc97bafd2..cea772973649 100644
@@ -29,13 +29,13 @@ static int sys_pkey_handler_gen_key(u32 keytype, u32 keysubtype,
 	rc = pkey_handler_gen_key(NULL, 0,
 				  keytype, keysubtype,
 				  keybitsize, flags,
-				  keybuf, keybuflen, keyinfo);
+				  keybuf, keybuflen, keyinfo, 0);
 	if (rc == -ENODEV) {
 		pkey_handler_request_modules();
 		rc = pkey_handler_gen_key(NULL, 0,
 					  keytype, keysubtype,
 					  keybitsize, flags,
-					  keybuf, keybuflen, keyinfo);
+					  keybuf, keybuflen, keyinfo, 0);
 	}
 
 	return rc;
drivers/s390/crypto/pkey_uv.c +14 -2
index 805817b14354..f36ff7531213 100644
@@ -172,13 +172,19 @@ static int uv_get_size_and_type(u16 secret_type, u32 *pkeysize, u32 *pkeytype)
 static int uv_key2protkey(const struct pkey_apqn *_apqns __always_unused,
 			  size_t _nr_apqns __always_unused,
 			  const u8 *key, u32 keylen,
-			  u8 *protkey, u32 *protkeylen, u32 *keyinfo)
+			  u8 *protkey, u32 *protkeylen, u32 *keyinfo,
+			  u32 xflags)
 {
 	struct uvsecrettoken *t = (struct uvsecrettoken *)key;
 	u32 pkeysize, pkeytype;
 	u16 secret_type;
 	int rc;
 
+	if (xflags & ZCRYPT_XFLAG_NOMEMALLOC) {
+		rc = -EOPNOTSUPP;
+		goto out;
+	}
+
 	rc = uv_get_size_and_type(t->secret_type, &pkeysize, &pkeytype);
 	if (rc)
 		goto out;
@@ -214,13 +220,19 @@ static int uv_key2protkey(const struct pkey_apqn *_apqns __always_unused,
 static int uv_verifykey(const u8 *key, u32 keylen,
 			u16 *_card __always_unused,
 			u16 *_dom __always_unused,
-			u32 *keytype, u32 *keybitsize, u32 *flags)
+			u32 *keytype, u32 *keybitsize, u32 *flags,
+			u32 xflags)
 {
 	struct uvsecrettoken *t = (struct uvsecrettoken *)key;
 	struct uv_secret_list_item_hdr secret_meta_data;
 	u32 pkeysize, pkeytype, bitsize;
 	int rc;
 
+	if (xflags & ZCRYPT_XFLAG_NOMEMALLOC) {
+		rc = -EOPNOTSUPP;
+		goto out;
+	}
+
 	rc = uv_get_size_and_type(t->secret_type, &pkeysize, &pkeytype);
 	if (rc)
 		goto out;
drivers/s390/crypto/zcrypt_ccamisc.c +23 -30

230 lines not on this page · raw message

drivers/s390/crypto/zcrypt_ccamisc.h +15 -10
index 966f0eaf3c4c..0dd4c336abab 100644
@@ -160,44 +160,47 @@ int cca_check_sececckeytoken(debug_info_t *dbg, int dbflvl,
 /*
  * Generate (random) CCA AES DATA secure key.
  */
-int cca_genseckey(u16 cardnr, u16 domain, u32 keybitsize, u8 *seckey);
+int cca_genseckey(u16 cardnr, u16 domain, u32 keybitsize, u8 *seckey,
+		  u32 xflags);
 
 /*
  * Generate CCA AES DATA secure key with given clear key value.
  */
 int cca_clr2seckey(u16 cardnr, u16 domain, u32 keybitsize,
-		   const u8 *clrkey, u8 *seckey);
+		   const u8 *clrkey, u8 *seckey, u32 xflags);
 
 /*
  * Derive proteced key from an CCA AES DATA secure key.
  */
 int cca_sec2protkey(u16 cardnr, u16 domain,
 		    const u8 *seckey, u8 *protkey, u32 *protkeylen,
-		    u32 *protkeytype);
+		    u32 *protkeytype, u32 xflags);
 
 /*
  * Generate (random) CCA AES CIPHER secure key.
  */
 int cca_gencipherkey(u16 cardnr, u16 domain, u32 keybitsize, u32 keygenflags,
-		     u8 *keybuf, u32 *keybufsize);
+		     u8 *keybuf, u32 *keybufsize, u32 xflags);
 
 /*
  * Derive proteced key from CCA AES cipher secure key.
  */
 int cca_cipher2protkey(u16 cardnr, u16 domain, const u8 *ckey,
-		       u8 *protkey, u32 *protkeylen, u32 *protkeytype);
+		       u8 *protkey, u32 *protkeylen, u32 *protkeytype,
+		       u32 xflags);
 
 /*
  * Build CCA AES CIPHER secure key with a given clear key value.
  */
 int cca_clr2cipherkey(u16 cardnr, u16 domain, u32 keybitsize, u32 keygenflags,
-		      const u8 *clrkey, u8 *keybuf, u32 *keybufsize);
+		      const u8 *clrkey, u8 *keybuf, u32 *keybufsize,
+		      u32 xflags);
 
 /*
  * Derive proteced key from CCA ECC secure private key.
  */
 int cca_ecc2protkey(u16 cardnr, u16 domain, const u8 *key,
-		    u8 *protkey, u32 *protkeylen, u32 *protkeytype);
+		    u8 *protkey, u32 *protkeylen, u32 *protkeytype, u32 xflags);
 
 /*
  * Query cryptographic facility from CCA adapter
@@ -205,7 +208,8 @@ int cca_ecc2protkey(u16 cardnr, u16 domain, const u8 *key,
 int cca_query_crypto_facility(u16 cardnr, u16 domain,
 			      const char *keyword,
 			      u8 *rarray, size_t *rarraylen,
-			      u8 *varray, size_t *varraylen);
+			      u8 *varray, size_t *varraylen,
+			      u32 xflags);
 
 /*
  * Search for a matching crypto card based on the Master Key
@@ -214,7 +218,8 @@ int cca_query_crypto_facility(u16 cardnr, u16 domain,
  * Returns < 0 on failure, 0 if CURRENT MKVP matches and
  * 1 if OLD MKVP matches.
  */
-int cca_findcard(const u8 *key, u16 *pcardnr, u16 *pdomain, int verify);
+int cca_findcard(const u8 *key, u16 *pcardnr, u16 *pdomain,
+		 int verify, u32 xflags);
 
 /*
  * Build a list of cca apqns meeting the following constrains:
@@ -236,7 +241,7 @@ int cca_findcard(const u8 *key, u16 *pcardnr, u16 *pdomain, int verify);
  */
 int cca_findcard2(u32 *apqns, u32 *nr_apqns, u16 cardnr, u16 domain,
 		  int minhwtype, int mktype, u64 cur_mkvp, u64 old_mkvp,
-		  int verify);
+		  int verify, u32 xflags);
 
 #define AES_MK_SET  0
 #define APKA_MK_SET 1
drivers/s390/crypto/zcrypt_ep11misc.c +4 -6
index a9a6fdc32464..fd87cb1c266b 100644
@@ -1453,13 +1453,12 @@ static int _ep11_wrapkey(u16 card, u16 domain,
 
 int ep11_clr2keyblob(u16 card, u16 domain, u32 keybitsize, u32 keygenflags,
 		     const u8 *clrkey, u8 *keybuf, u32 *keybufsize,
-		     u32 keytype)
+		     u32 keytype, u32 xflags)
 {
 	int rc;
 	void *mem;
 	u8 encbuf[64], *kek;
 	size_t clrkeylen, keklen, encbuflen = sizeof(encbuf);
-	const u32 xflags = 0;
 
 	if (keybitsize == 128 || keybitsize == 192 || keybitsize == 256) {
 		clrkeylen = keybitsize / 8;
@@ -1520,7 +1519,8 @@ EXPORT_SYMBOL(ep11_clr2keyblob);
 
 int ep11_kblob2protkey(u16 card, u16 dom,
 		       const u8 *keyblob, u32 keybloblen,
-		       u8 *protkey, u32 *protkeylen, u32 *protkeytype)
+		       u8 *protkey, u32 *protkeylen, u32 *protkeytype,
+		       u32 xflags)
 {
 	struct ep11kblob_header *hdr;
 	struct ep11keyblob *key;
@@ -1536,7 +1536,6 @@ int ep11_kblob2protkey(u16 card, u16 dom,
 	} __packed * wki;
 	u8 *wkbuf = NULL;
 	int rc = -EIO;
-	const u32 xflags = 0;
 
 	if (ep11_kb_decode((u8 *)keyblob, keybloblen, &hdr, NULL, &key, &keylen))
 		return -EINVAL;
@@ -1642,14 +1641,13 @@ int ep11_kblob2protkey(u16 card, u16 dom,
 EXPORT_SYMBOL(ep11_kblob2protkey);
 
 int ep11_findcard2(u32 *apqns, u32 *nr_apqns, u16 cardnr, u16 domain,
-		   int minhwtype, int minapi, const u8 *wkvp)
+		   int minhwtype, int minapi, const u8 *wkvp, u32 xflags)
 {
 	struct zcrypt_device_status_ext *device_status;
 	int i, card, dom, rc;
 	struct ep11_domain_info edi;
 	struct ep11_card_info eci;
 	u32 _nr_apqns = 0;
-	const u32 xflags = 0;
 
 	/* occupy the device status memory */
 	mutex_lock(&dev_status_mem_mutex);
drivers/s390/crypto/zcrypt_ep11misc.h +4 -3
index 7ef036759dc8..34b47522a893 100644
@@ -124,7 +124,7 @@ int ep11_genaeskey(u16 card, u16 domain, u32 keybitsize, u32 keygenflags,
  */
 int ep11_clr2keyblob(u16 cardnr, u16 domain, u32 keybitsize, u32 keygenflags,
 		     const u8 *clrkey, u8 *keybuf, u32 *keybufsize,
-		     u32 keytype);
+		     u32 keytype, u32 xflags);
 
 /*
  * Build a list of ep11 apqns meeting the following constrains:
@@ -144,13 +144,14 @@ int ep11_clr2keyblob(u16 cardnr, u16 domain, u32 keybitsize, u32 keygenflags,
  * If no apqn meeting the criteria is found, -ENODEV is returned.
  */
 int ep11_findcard2(u32 *apqns, u32 *nr_apqns, u16 cardnr, u16 domain,
-		   int minhwtype, int minapi, const u8 *wkvp);
+		   int minhwtype, int minapi, const u8 *wkvp, u32 xflags);
 
 /*
  * Derive proteced key from EP11 key blob (AES and ECC keys).
  */
 int ep11_kblob2protkey(u16 card, u16 dom, const u8 *key, u32 keylen,
-		       u8 *protkey, u32 *protkeylen, u32 *protkeytype);
+		       u8 *protkey, u32 *protkeylen, u32 *protkeytype,
+		       u32 xflags);
 
 int zcrypt_ep11misc_init(void);
 void zcrypt_ep11misc_exit(void);
Signature · 1 line
2.43.0
author maintainer
#52 lore raw

PATCH v2 20/20 s390/pkey/crypto: Introduce xflags param for pkey in-kernel API

In reply to Harald Freudenberger

Add a new parameter xflags to the in-kernel API function pkey_key2protkey(). Currently there is only one flag supported:

* PKEY_XFLAG_NOMEMALLOC:
If this flag is given in the xflags parameter, the pkey implementation is not allowed to allocate memory but instead should fall back to use preallocated memory or simple fail with -ENOMEM.
This flag is for protected key derive within a cipher or similar which must not allocate memory which would cause io operations - see also the CRYPTO_ALG_ALLOCATES_MEMORY flag in crypto.h.

The one and only user of this in-kernel API - the skcipher implementations PAES in paes_s390.c set this flag upon request to derive a protected key from the given raw key material.

---
 arch/s390/crypto/paes_s390.c   |  2 +-
 arch/s390/include/asm/pkey.h   | 15 ++++++++++++++-
 drivers/s390/crypto/pkey_api.c | 11 +++++++----
 3 files changed, 22 insertions(+), 6 deletions(-)
arch/s390/crypto/paes_s390.c +1 -1
index 511093713a6f..646cbbf0678d 100644
@@ -189,7 +189,7 @@ static inline int __paes_keyblob2pkey(const u8 *key, unsigned int keylen,
 				return -EINTR;
 		}
 		rc = pkey_key2protkey(key, keylen, pk->protkey, &pk->len,
-				      &pk->type);
+				      &pk->type, PKEY_XFLAG_NOMEMALLOC);
 	}
 
 	return rc;
arch/s390/include/asm/pkey.h +14 -1
index 5dca1a46a9f6..c0e7f8c25e9f 100644
@@ -20,9 +20,22 @@
  * @param key pointer to a buffer containing the key blob
  * @param keylen size of the key blob in bytes
  * @param protkey pointer to buffer receiving the protected key
+ * @param xflags additional execution flags (see PKEY_XFLAG_* definitions below)
+ *        As of now the only supported flag is PKEY_XFLAG_NOMEMALLOC.
  * @return 0 on success, negative errno value on failure
  */
 int pkey_key2protkey(const u8 *key, u32 keylen,
-		     u8 *protkey, u32 *protkeylen, u32 *protkeytype);
+		     u8 *protkey, u32 *protkeylen, u32 *protkeytype,
+		     u32 xflags);
+
+/*
+ * If this flag is given in the xflags parameter, the pkey implementation
+ * is not allowed to allocate memory but instead should fall back to use
+ * preallocated memory or simple fail with -ENOMEM.
+ * This flag is for protected key derive within a cipher or similar
+ * which must not allocate memory which would cause io operations - see
+ * also the CRYPTO_ALG_ALLOCATES_MEMORY flag in crypto.h.
+ */
+#define PKEY_XFLAG_NOMEMALLOC 0x0001
 
 #endif /* _KAPI_PKEY_H */
drivers/s390/crypto/pkey_api.c +7 -4
index 55a4e70b866b..c46b57001550 100644
@@ -53,17 +53,20 @@ static int key2protkey(const struct pkey_apqn *apqns, size_t nr_apqns,
  * In-Kernel function: Transform a key blob (of any type) into a protected key
  */
 int pkey_key2protkey(const u8 *key, u32 keylen,
-		     u8 *protkey, u32 *protkeylen, u32 *protkeytype)
+		     u8 *protkey, u32 *protkeylen, u32 *protkeytype, u32 xflags)
 {
+	u32 flags;
 	int rc;
-	const u32 xflags = 0;
+
+	/* as of now only the NOMEMALLOC flag is supported */
+	flags = xflags & PKEY_XFLAG_NOMEMALLOC ? ZCRYPT_XFLAG_NOMEMALLOC : 0;
 
 	rc = key2protkey(NULL, 0, key, keylen,
-			 protkey, protkeylen, protkeytype, xflags);
+			 protkey, protkeylen, protkeytype, flags);
 	if (rc == -ENODEV) {
 		pkey_handler_request_modules();
 		rc = key2protkey(NULL, 0, key, keylen,
-				 protkey, protkeylen, protkeytype, xflags);
+				 protkey, protkeylen, protkeytype, flags);
 	}
 
 	return rc;
Signature · 1 line
2.43.0
maintainer Reviewed-by on v2 1/20
#2 lore raw

Re: [PATCH v2 01/20] s390/ap: Move response_type struct into ap_msg struct

In reply to Harald Freudenberger
Quoted 5 lines · Harald Freudenberger

Move the very small response_type struct into struct ap_msg. So there is no need to kmalloc this tiny struct with each ap message preparation.

See my comment below. Beside that

Quoted 5 lines
---
 drivers/s390/crypto/ap_bus.h           |  8 ++-
 drivers/s390/crypto/zcrypt_msgtype50.c | 16 ++----
 drivers/s390/crypto/zcrypt_msgtype6.c  | 74 ++++++++++----------------
 3 files changed, 38 insertions(+), 60 deletions(-)

[...]

drivers/s390/crypto/zcrypt_msgtype6.c line 34

Quoted 13 lines
drivers/s390/crypto/zcrypt_msgtype6.c +1 -4
index b64c9d9fc613..521cc0b39990 100644
@@ -31,10 +31,7 @@
 
 #define CEIL4(x) ((((x) + 3) / 4) * 4)
 
-struct response_type {
-	struct completion work;
-	int type;
-};
+struct response_type;

This struct is only defined, but not used. Remove it.

Quoted 3 lines
drivers/s390/crypto/zcrypt_msgtype6.c +0 -0
 #define CEXXC_RESPONSE_TYPE_ICA  0
 #define CEXXC_RESPONSE_TYPE_XCRB 1

[...]

Signature · 5 lines
Mit freundlichen Grüßen / Kind regards
Holger Dengler
--
IBM Systems, Linux on IBM Z Development
[email protected]
maintainer Reviewed-by on v2 2/20
#5 lore raw

Re: [PATCH v2 02/20] s390/ap/zcrypt: Rework AP message buffer allocation

In reply to Harald Freudenberger
Quoted 8 lines · Harald Freudenberger

Slight rework on the way how AP message buffers are allocated. Instead of having multiple places with kmalloc() calls all the AP message buffers are now allocated and freed on exactly one place: ap_init_apmsg() allocates the current AP bus max limit of ap_max_msg_size (defaults to 12KB). The AP message buffer is then freed in ap_release_apmsg().

Quoted 7 lines
---
 drivers/s390/crypto/ap_bus.c           | 30 ++++++++++++++++
 drivers/s390/crypto/ap_bus.h           | 21 ++---------
 drivers/s390/crypto/zcrypt_api.c       | 49 +++++++++++++++-----------
 drivers/s390/crypto/zcrypt_msgtype50.c | 20 ++++++-----
 drivers/s390/crypto/zcrypt_msgtype6.c  | 35 +++++++++---------
 5 files changed, 90 insertions(+), 65 deletions(-)
Signature · 5 lines
Mit freundlichen Grüßen / Kind regards
Holger Dengler
--
IBM Systems, Linux on IBM Z Development
[email protected]
maintainer Reviewed-by on v2 3/20
#7 lore raw

Re: [PATCH v2 03/20] s390/ap: Introduce ap message buffer pool

In reply to Harald Freudenberger
Quoted 11 lines · Harald Freudenberger

There is a need for a do-not-allocate-memory path through the ap bus layer. When ap_init_apmsg() with use_mempool set to true is called, instead of kmalloc() the ap message buffer is allocated from the ap_msg_pool. This pool only holds a limited amount of buffers: ap_msg_pool_min_items with the item size AP_DEFAULT_MAX_MSG_SIZE and exactly one of these items (if available) is returned if ap_init_apmsg() with the use_mempool arg set to true is called. When this pool is exhausted and use_mempool is set true, ap_init_apmsg() returns -ENOMEM without any attempt to allocate memory.

Quoted 3 lines

Default values for this mempool of ap messages is:
* Each buffer is 12KB (that is the default AP bus size and all the urgend messages should fit into this space).

typo: urgent

Quoted 10 lines

* Minimum items held in the pool is 8. This value is adjustable via module parameter ap.msgpool_min_items.

The zcrypt layer may use this flag to indicate to the ap bus that the processing path for this message should not allocate memory but should use pre-allocated memory buffer instead. This is to prevent deadlocks with crypto and io for example with encrypted swap volumes.

With the typo and the changed indent (see comment below)

Quoted 6 lines
---
 drivers/s390/crypto/ap_bus.c     | 57 ++++++++++++++++++++++++++++----
 drivers/s390/crypto/ap_bus.h     |  9 ++---
 drivers/s390/crypto/zcrypt_api.c | 10 +++---
 3 files changed, 60 insertions(+), 16 deletions(-)

[...]

Quoted 5 lines
drivers/s390/crypto/ap_bus.h +0 -0
index 483231bcdea6..a7bd44e5cc76 100644

drivers/s390/crypto/ap_bus.h struct ap_message { · line 239

Quoted 10 lines
drivers/s390/crypto/ap_bus.h +4 -3
@@ -233,11 +233,12 @@ struct ap_message {
 			struct ap_message *);
 };
 
-#define AP_MSG_FLAG_SPECIAL  0x0001	/* flag msg as 'special' with NQAP */
-#define AP_MSG_FLAG_USAGE    0x0002	/* CCA, EP11: usage (no admin) msg */
-#define AP_MSG_FLAG_ADMIN    0x0004	/* CCA, EP11: admin (=control) msg */
+#define AP_MSG_FLAG_SPECIAL  0x0001   /* flag msg as 'special' with NQAP */
+#define AP_MSG_FLAG_USAGE    0x0002   /* CCA, EP11: usage (no admin) msg */
+#define AP_MSG_FLAG_ADMIN    0x0004   /* CCA, EP11: admin (=control) msg */
+#define AP_MSG_FLAG_MEMPOOL  0x0008   /* ap msg buffer allocated from mempool */

Please do not change the indent here. The change is not required, but it makes the life of reviewers much harder.

Quoted 6 lines
drivers/s390/crypto/ap_bus.h +1 -1
-int ap_init_apmsg(struct ap_message *ap_msg);
+int ap_init_apmsg(struct ap_message *ap_msg, bool use_mempool);
 void ap_release_apmsg(struct ap_message *ap_msg);
 
 enum ap_sm_wait ap_sm_event(struct ap_queue *aq, enum ap_sm_event event);

[...]

Signature · 5 lines
Mit freundlichen Grüßen / Kind regards
Holger Dengler
--
IBM Systems, Linux on IBM Z Development
[email protected]
maintainer
#10 lore raw

Re: [PATCH v2 04/20] s390/ap/zcrypt: New xflag parameter and extension of the ap msg flags

In reply to Harald Freudenberger
Quoted 27 lines · Harald Freudenberger

Introduce a new flag parameter for the both cprb send functions zcrypt_send_cprb() and zcrypt_send_ep11_cprb(). This new xflags parameter ("execution flags") shall be used to provide execution hints and flags for this crypto request.

There are two flags implemented to be used with these functions:
* ZCRYPT_XFLAG_USERSPACE - indicates to the lower layers that all the ptrs address userspace. So when construction the ap msg copy_from_user() is to be used. If this flag is NOT set, the ptrs address kernel memory and thus memcpy() is to be used.
* ZCRYPT_XFLAG_NOMEMALLOC - indicates that this task must not allocate memory which may be allocated with io operations. For the zcrypt layer this limits the number of EP11 targets to 16 APQNs. But as this flag is passed down the stack, it may induce further restrictions.

For the AP bus and zcrypt message layer this means:
* The ZCRYPT_XFLAG_USERSPACE is mapped to the AP flag AP_MSG_FLAG_USERSPACE stored into the flags field of each ap message in the ap_message struct. This replaces the extra function parameter "userspace" and makes some function invocations simpler.
* The ZCRYPT_XFLAG_NOMEMALLOC causes the AP message buffer to use buffer space from the AP message mempool instead of allocating memory via kmalloc. Note that the buffer space from the AP message mem pool is limited to 12KB per item.

Quoted 1 line

The boolean parameter userspace should only be merged with the xflags in functions, which has the need to handle ZCRYPT_XFLAG_USERSPACE and ZCRYPT_XFLAG_NOMEMALLOC, e.g _zcrypt_send_cprb(). Functions, which either only take one or the other flag may stay with the boolean parameter. There is also no need for a definition of AP_MSG_FLAG_USERSPACE, as the AP layer does not care about userspace pointers at all, only the zcrypt layer is affected by this flag. See my comments below.

Quoted 11 lines
---
 drivers/s390/crypto/ap_bus.c          |  6 +-
 drivers/s390/crypto/ap_bus.h          | 11 ++--
 drivers/s390/crypto/zcrypt_api.c      | 90 +++++++++++++++------------
 drivers/s390/crypto/zcrypt_api.h      | 36 +++++++----
 drivers/s390/crypto/zcrypt_ccamisc.c  | 16 ++---
 drivers/s390/crypto/zcrypt_ep11misc.c | 10 +--
 drivers/s390/crypto/zcrypt_msgtype6.c | 12 ++--
 drivers/s390/crypto/zcrypt_msgtype6.h |  4 +-
 8 files changed, 107 insertions(+), 78 deletions(-)

[...]

Quoted 7 lines
drivers/s390/crypto/ap_bus.h +0 -0
index a7bd44e5cc76..5581fb13af73 100644
@@ -233,12 +233,13 @@ struct ap_message {
 			struct ap_message *);
 };

drivers/s390/crypto/ap_bus.h struct ap_message { · line 240

Quoted 10 lines
drivers/s390/crypto/ap_bus.h +5 -4
 
-#define AP_MSG_FLAG_SPECIAL  0x0001   /* flag msg as 'special' with NQAP */
-#define AP_MSG_FLAG_USAGE    0x0002   /* CCA, EP11: usage (no admin) msg */
-#define AP_MSG_FLAG_ADMIN    0x0004   /* CCA, EP11: admin (=control) msg */
-#define AP_MSG_FLAG_MEMPOOL  0x0008   /* ap msg buffer allocated from mempool */
+#define AP_MSG_FLAG_SPECIAL    0x0001  /* flag msg as 'special' with NQAP */
+#define AP_MSG_FLAG_USAGE      0x0002  /* CCA, EP11: usage (no admin) msg */
+#define AP_MSG_FLAG_ADMIN      0x0004  /* CCA, EP11: admin (=control) msg */
+#define AP_MSG_FLAG_MEMPOOL    0x0008  /* ap msg buffer allocated from mempool */
+#define AP_MSG_FLAG_USERSPACE  0x0010  /* pointers address userspace memory */

Do we really need this flag in the AP layer? IIRC it has only meaning in the zcrypt layer. If this is correct, please remove it.

Quoted 11 lines
drivers/s390/crypto/ap_bus.h +1 -1
-int ap_init_apmsg(struct ap_message *ap_msg, bool use_mempool);
+int ap_init_apmsg(struct ap_message *ap_msg, u32 flags);
 void ap_release_apmsg(struct ap_message *ap_msg);
 
 enum ap_sm_wait ap_sm_event(struct ap_queue *aq, enum ap_sm_event event);
drivers/s390/crypto/zcrypt_api.c +0 -0
index ad09c5306e28..659fe7afb67e 100644

drivers/s390/crypto/zcrypt_api.c static long zcrypt_rsa_modexpo(struct ap_perms *perms, · line 651

Quoted 5 lines
drivers/s390/crypto/zcrypt_api.c +1 -1
@@ -648,7 +648,7 @@ static long zcrypt_rsa_modexpo(struct ap_perms *perms,
 
 	trace_s390_zcrypt_req(mex, TP_ICARSAMODEXPO);
 
-	rc = ap_init_apmsg(&ap_msg, false);
+	rc = ap_init_apmsg(&ap_msg, AP_MSG_FLAG_USERSPACE);

use_mempool == false should be changed to 0, not AP_MSG_FLAG_USERSPACE. rc = ap_init_apmsg(&ap_msg, 0);

drivers/s390/crypto/zcrypt_api.c static long zcrypt_rsa_crt(struct ap_perms *perms, · line 756

Quoted 9 lines
drivers/s390/crypto/zcrypt_api.c +1 -1
 	if (rc)
 		goto out;
 
@@ -753,7 +753,7 @@ static long zcrypt_rsa_crt(struct ap_perms *perms,
 
 	trace_s390_zcrypt_req(crt, TP_ICARSACRT);
 
-	rc = ap_init_apmsg(&ap_msg, false);
+	rc = ap_init_apmsg(&ap_msg, AP_MSG_FLAG_USERSPACE);

Same here.
rc = ap_init_apmsg(&ap_msg, 0);

Quoted 3 lines
drivers/s390/crypto/zcrypt_api.c +0 -0
 	if (rc)
 		goto out;
 

[...]

Quoted 4 lines
drivers/s390/crypto/zcrypt_api.c +0 -0
@@ -856,16 +856,19 @@ static long _zcrypt_send_cprb(bool userspace, struct ap_perms *perms,
 	unsigned short *domain, tdom;
 	int cpen, qpen, qid = 0, rc;
 	struct module *mod;

drivers/s390/crypto/zcrypt_api.c static long _zcrypt_send_cprb(bool userspace, struct ap_perms *perms, · line 867

Quoted 10 lines
drivers/s390/crypto/zcrypt_api.c +4 -1
+	u32 flags;
 
 	trace_s390_zcrypt_req(xcrb, TB_ZSECSENDCPRB);
 
 	xcrb->status = 0;
 
-	rc = ap_init_apmsg(&ap_msg, false);
+	flags = (xflags & ZCRYPT_XFLAG_USERSPACE ? AP_MSG_FLAG_USERSPACE : 0) |
+		(xflags & ZCRYPT_XFLAG_NOMEMALLOC ? AP_MSG_FLAG_MEMPOOL : 0);
+	rc = ap_init_apmsg(&ap_msg, flags);

There is no need to translate ZCRYPT_XFLAG_USERSPACE to ap-msg flags, the AP layer should not care about userspace/kernelspace pointer. rc = ap_init_apmsg(&ap_msg, xflags & ZCRYPT_XFLAG_NOMEMALLOC ? AP_MSG_FLAG_MEMPOOL : 0);

drivers/s390/crypto/zcrypt_api.c static long _zcrypt_send_cprb(bool userspace, struct ap_perms *perms, · line 871

Quoted 5 lines
drivers/s390/crypto/zcrypt_api.c +1 -1
 	if (rc)
 		goto out;
 
-	rc = prep_cca_ap_msg(userspace, xcrb, &ap_msg, &func_code, &domain);
+	rc = prep_cca_ap_msg(xcrb, &ap_msg, &func_code, &domain);

The prep_cca_ap_msg() - and all functions below - can stay with the bool parameter. rc = prep_cca_ap_msg((xflags & ZCRYPT_XFLAG_USERSPACE), xcrb, &ap_msg, &func_code, &domain);

drivers/s390/crypto/zcrypt_api.c static long _zcrypt_send_cprb(bool userspace, struct ap_perms *perms, · line 962

Quoted 9 lines
drivers/s390/crypto/zcrypt_api.c +1 -1
 	if (rc)
 		goto out;
 	print_hex_dump_debug("ccareq: ", DUMP_PREFIX_ADDRESS, 16, 1,
@@ -956,7 +959,7 @@ static long _zcrypt_send_cprb(bool userspace, struct ap_perms *perms,
 	if (*domain == AUTOSEL_DOM)
 		*domain = AP_QID_QUEUE(qid);
 
-	rc = pref_zq->ops->send_cprb(userspace, pref_zq, xcrb, &ap_msg);
+	rc = pref_zq->ops->send_cprb(pref_zq, xcrb, &ap_msg);

Here as well, stay with the bool parameter userspace in the callback.
rc = pref_zq->ops->send_cprb((xflags & ZCRYPT_XFLAG_USERSPACE), pref_zq, xcrb, &ap_msg);

Quoted 3 lines
drivers/s390/crypto/zcrypt_api.c +0 -0
 	if (!rc) {
 		print_hex_dump_debug("ccarpl: ", DUMP_PREFIX_ADDRESS, 16, 1,
 				     ap_msg.msg, ap_msg.len, false);

[...]

Quoted 17 lines
drivers/s390/crypto/zcrypt_api.c +2 -2
@@ -1029,52 +1032,58 @@ static bool is_desired_ep11_queue(unsigned int dev_qid,
 	return false;
 }
 
-static long _zcrypt_send_ep11_cprb(bool userspace, struct ap_perms *perms,
+static long _zcrypt_send_ep11_cprb(u32 xflags, struct ap_perms *perms,
 				   struct zcrypt_track *tr,
 				   struct ep11_urb *xcrb)
 {
 	struct zcrypt_card *zc, *pref_zc;
 	struct zcrypt_queue *zq, *pref_zq;
-	struct ep11_target_dev *targets;
+	struct ep11_target_dev targetbuf[16], *targets = NULL;
 	unsigned short target_num;
 	unsigned int wgt = 0, pref_wgt = 0;
 	unsigned int func_code = 0, domain;
 	struct ap_message ap_msg;

drivers/s390/crypto/zcrypt_api.c static bool is_desired_ep11_queue(unsigned int dev_qid, · line 1054

Quoted 10 lines
drivers/s390/crypto/zcrypt_api.c +4 -1
 	int cpen, qpen, qid = 0, rc;
 	struct module *mod;
+	u32 flags;
 
 	trace_s390_zcrypt_req(xcrb, TP_ZSENDEP11CPRB);
 
-	rc = ap_init_apmsg(&ap_msg, false);
+	flags = (xflags & ZCRYPT_XFLAG_USERSPACE ? AP_MSG_FLAG_USERSPACE : 0) |
+		(xflags & ZCRYPT_XFLAG_NOMEMALLOC ? AP_MSG_FLAG_MEMPOOL : 0);
+	rc = ap_init_apmsg(&ap_msg, flags);

The AP layer does not care about the userspace flag. Please remove it.
rc = ap_init_apmsg(&ap_msg, xflags & ZCRYPT_XFLAG_NOMEMALLOC ? AP_MSG_FLAG_MEMPOOL : 0);

Quoted 30 lines
drivers/s390/crypto/zcrypt_api.c +9 -8
 	if (rc)
 		goto out;
 
 	target_num = (unsigned short)xcrb->targets_num;
 
 	/* empty list indicates autoselect (all available targets) */
-	targets = NULL;
+	rc = -ENOMEM;
 	if (target_num != 0) {
 		struct ep11_target_dev __user *uptr;
 
-		targets = kcalloc(target_num, sizeof(*targets), GFP_KERNEL);
-		if (!targets) {
-			func_code = 0;
-			rc = -ENOMEM;
+		if (target_num <= ARRAY_SIZE(targetbuf)) {
+			targets = targetbuf;
+		} else if (xflags & ZCRYPT_XFLAG_NOMEMALLOC) {
 			goto out;
+		} else {
+			targets = kcalloc(target_num,
+					  sizeof(*targets), GFP_KERNEL);
+			if (!targets)
+				goto out;
 		}
 
 		uptr = (struct ep11_target_dev __force __user *)xcrb->targets;
-		if (z_copy_from_user(userspace, targets, uptr,
-				     target_num * sizeof(*targets))) {
-			func_code = 0;

drivers/s390/crypto/zcrypt_api.c static bool is_desired_ep11_queue(unsigned int dev_qid, · line 1084

Quoted 10 lines
drivers/s390/crypto/zcrypt_api.c +4 -2
+		if (z_copy_from_user(xflags & ZCRYPT_XFLAG_USERSPACE, targets,
+				     uptr, target_num * sizeof(*targets))) {
 			rc = -EFAULT;
-			goto out_free;
+			goto out;
 		}
 	}
 
-	rc = prep_ep11_ap_msg(userspace, xcrb, &ap_msg, &func_code, &domain);
+	rc = prep_ep11_ap_msg(xcrb, &ap_msg, &func_code, &domain);

Stay here with the boolean parameter for userspace.

Quoted 6 lines
drivers/s390/crypto/zcrypt_api.c +1 -1
 	if (rc)
-		goto out_free;
+		goto out;
 	print_hex_dump_debug("ep11req: ", DUMP_PREFIX_ADDRESS, 16, 1,
 			     ap_msg.msg, ap_msg.len, false);
 

[...]

drivers/s390/crypto/zcrypt_api.c static long _zcrypt_send_ep11_cprb(bool userspace, struct ap_perms *perms, · line 1170

Quoted 11 lines
drivers/s390/crypto/zcrypt_api.c +2 -2
@@ -1154,11 +1163,11 @@ static long _zcrypt_send_ep11_cprb(bool userspace, struct ap_perms *perms,
 			pr_debug("no match for address ff.ffff => ENODEV\n");
 		}
 		rc = -ENODEV;
-		goto out_free;
+		goto out;
 	}
 
 	qid = pref_zq->queue->qid;
-	rc = pref_zq->ops->send_ep11_cprb(userspace, pref_zq, xcrb, &ap_msg);
+	rc = pref_zq->ops->send_ep11_cprb(pref_zq, xcrb, &ap_msg);

Keep the boolean parameter for userspace here as well.

Quoted 3 lines
drivers/s390/crypto/zcrypt_api.c +0 -0
 	if (!rc) {
 		print_hex_dump_debug("ep11rpl: ", DUMP_PREFIX_ADDRESS, 16, 1,
 				     ap_msg.msg, ap_msg.len, false);

[...]

Signature · 5 lines
Mit freundlichen Grüßen / Kind regards
Holger Dengler
--
IBM Systems, Linux on IBM Z Development
[email protected]
maintainer Reviewed-by on v2 5/20
#13 lore raw

Re: [PATCH v2 05/20] s390/zcrypt: Introduce cprb mempool for cca misc functions

In reply to Harald Freudenberger
Quoted 11 lines · Harald Freudenberger

Introduce a cprb mempool for the zcrypt cca misc functions (zcrypt_ccamisc.*) do some preparation rework to support a do-not-allocate path through some zcrypt cca misc functions.

The mempool is by default space for 4 cprbs with each 16KB. For CCA a CPRB needs to hold the request and the reply, so the pool items only support requests/replies with a limit of about 8KB. The minimal number of items in the mempool can get adjusted via module parameter zcrypt.cca_cprbpool_min_items on module load.

Quoted 4 lines

This is only part of an rework to support a new xflag ZCRYPT_XFLAG_NOMEMALLOC but not yet complete.

One minor comment below. Beside that

Quoted 7 lines
---
 drivers/s390/crypto/zcrypt_api.c     |  13 ++-
 drivers/s390/crypto/zcrypt_api.h     |   2 +
 drivers/s390/crypto/zcrypt_ccamisc.c | 116 ++++++++++++++++++++-------
 drivers/s390/crypto/zcrypt_ccamisc.h |   1 +
 4 files changed, 101 insertions(+), 31 deletions(-)

[...]

Quoted 4 lines
drivers/s390/crypto/zcrypt_ccamisc.c +0 -0
index 521baaea06ff..2c2ca2d67e2d 100644

[...]

drivers/s390/crypto/zcrypt_ccamisc.c static int alloc_and_prep_cprbmem(size_t paramblen, · line 250

Quoted 12 lines
drivers/s390/crypto/zcrypt_ccamisc.c +7 -1
@@ -229,7 +241,15 @@ static int alloc_and_prep_cprbmem(size_t paramblen,
 	 * allocate consecutive memory for request CPRB, request param
 	 * block, reply CPRB and reply param block
 	 */
-	cprbmem = kcalloc(2, cprbplusparamblen, GFP_KERNEL);
+	if (xflags & ZCRYPT_XFLAG_NOMEMALLOC) {
+		if (cprb_mempool &&
+		    2 * cprbplusparamblen <= CPRB_MEMPOOL_ITEM_SIZE) {
+			cprbmem = mempool_alloc_preallocated(cprb_mempool);
+			memset(cprbmem, 0, 2 * cprbplusparamblen);
+		}
+	} else {

Just a nit: let the compiler decide, if code should be duplicated or not.

if (xflags & ZCRYPT_XFLAG_NOMEMALLOC) {
	size_t len = 2 * cprbplusparamblen;

	if (cprb_mempool && len <= CPRB_MEMPOOL_ITEM_SIZE) {
		cprbmem = mempool_alloc_preallocated(cprb_mempool);
		memset(cprbmem, 0, len);
	}
} else {
Quoted 5 lines
drivers/s390/crypto/zcrypt_ccamisc.c +2 -0
+		cprbmem = kcalloc(2, cprbplusparamblen, GFP_KERNEL);
+	}
 	if (!cprbmem)
 		return -ENOMEM;
 

[...]

Signature · 5 lines
Mit freundlichen Grüßen / Kind regards
Holger Dengler
--
IBM Systems, Linux on IBM Z Development
[email protected]
maintainer Reviewed-by on v2 6/20
#16 lore raw

Re: [PATCH v2 06/20] s390/zcrypt: Introduce cprb mempool for ep11 misc functions

In reply to Harald Freudenberger
Quoted 11 lines · Harald Freudenberger

Introduce a cprb mempool for the zcrypt ep11 misc functions (zcrypt_ep11misc.*) do some preparation rework to support a do-not-allocate path through some zcrypt cca misc functions.

The mempool is by default space for 8 cprbs with each 8KB. For EP11 a CPRB either holds the request or the reply. So for a request/reply there is always a couple of cprb buffers needed. The minimal number of items in the mempool can get adjusted via module parameter zcrypt.ep11_cprbpool_min_items on module load.

Quoted 4 lines

This is only part of an rework to support a new xflag ZCRYPT_XFLAG_NOMEMALLOC but not yet complete.

With the minor change (see comment below)

Quoted 7 lines
---
 drivers/s390/crypto/zcrypt_api.c      |  10 ++
 drivers/s390/crypto/zcrypt_api.h      |   1 +
 drivers/s390/crypto/zcrypt_ep11misc.c | 158 ++++++++++++++++----------
 drivers/s390/crypto/zcrypt_ep11misc.h |   1 +
 4 files changed, 109 insertions(+), 61 deletions(-)

[...]

Quoted 4 lines
drivers/s390/crypto/zcrypt_ep11misc.c +0 -0
index b60e262bcaa3..86578a95b140 100644

[...]

Quoted 5 lines
drivers/s390/crypto/zcrypt_ep11misc.c +0 -1
@@ -621,22 +652,20 @@ static int ep11_query_info(u16 cardnr, u16 domain, u32 query_type,
 	req_pl->query_subtype_len = sizeof(u32);
 
 	/* reply cprb and payload */
-	rep = alloc_cprb(sizeof(struct ep11_info_rep_pl) + buflen);

drivers/s390/crypto/zcrypt_ep11misc.c static int ep11_query_info(u16 cardnr, u16 domain, u32 query_type, · line 661

Quoted 10 lines
drivers/s390/crypto/zcrypt_ep11misc.c +2 -3
+	rep = alloc_cprbmem(sizeof(struct ep11_info_rep_pl) + buflen, xflags);
 	if (!rep)
 		goto out;
 	rep_pl = (struct ep11_info_rep_pl *)(((u8 *)rep) + sizeof(*rep));
 
 	/* urb and target */
-	urb = kmalloc(sizeof(*urb), GFP_KERNEL);
-	if (!urb)
-		goto out;
+	memset(&urb, 0, sizeof(urb));

The memset is done each time before a prep_urb() call. Please do the memset inside the prep_urb() function and remove the other ones.

Quoted 12 lines
drivers/s390/crypto/zcrypt_ep11misc.c +2 -2
 	target.ap_id = cardnr;
 	target.dom_id = domain;
-	prep_urb(urb, &target, 1,
+	prep_urb(&urb, &target, 1,
 		 req, sizeof(*req) + sizeof(*req_pl),
 		 rep, sizeof(*rep) + sizeof(*rep_pl) + buflen);
 
-	rc = zcrypt_send_ep11_cprb(urb, 0);
+	rc = zcrypt_send_ep11_cprb(&urb, xflags);
 	if (rc) {
 		ZCRYPT_DBF_ERR("%s zcrypt_send_ep11_cprb(card=%d dom=%d) failed, rc=%d\n",
 			       __func__, (int)cardnr, (int)domain, rc);

[...]

Signature · 5 lines
Mit freundlichen Grüßen / Kind regards
Holger Dengler
--
IBM Systems, Linux on IBM Z Development
[email protected]
maintainer
#19 lore raw

Re: [PATCH v2 07/20] s390/zcrypt: Rework zcrypt function zcrypt_device_status_mask_ext

In reply to Harald Freudenberger
Quoted 4 lines · Harald Freudenberger

Rework the existing function zcrypt_device_status_mask_ext():
* Add two new parameters to provide upper limits for cards and queues. The existing implementation needed an array of 256 * 256 * 4 = 256 KB which is really huge. The

Quoted 8 lines

reworked function is more flexible in the sense that the caller can decide the upper limit for cards and domains to be stored into the status array. So for example a caller may decide to only query for cards 0...127 and queues 0...127 and thus only an array of size 128 * 128 * 4 = 64 KB is needed.
* Instead of void the reworked function now returns an int. The currently only way to have the function return != 0 is by providing card or domains limits beyond 256.

I would prefer to stay with a void function and limit the card and domain values to the current maximum. Details below.

Quoted 14 lines
---
 drivers/s390/crypto/zcrypt_api.c      | 20 +++++++++++++++-----
 drivers/s390/crypto/zcrypt_api.h      |  3 ++-
 drivers/s390/crypto/zcrypt_ccamisc.c  | 22 +++++++++++++++++-----
 drivers/s390/crypto/zcrypt_ep11misc.c | 14 ++++++++++----
 4 files changed, 44 insertions(+), 15 deletions(-)
drivers/s390/crypto/zcrypt_api.c +0 -0
index 62cc05881b13..bd2738e3792a 100644

drivers/s390/crypto/zcrypt_api.c static void zcrypt_device_status_mask(struct zcrypt_device_status *devstatus) · line 1321

Quoted 6 lines
drivers/s390/crypto/zcrypt_api.c +2 -1
@@ -1317,19 +1317,25 @@ static void zcrypt_device_status_mask(struct zcrypt_device_status *devstatus)
 	spin_unlock(&zcrypt_list_lock);
 }
 
-void zcrypt_device_status_mask_ext(struct zcrypt_device_status_ext *devstatus)
+int zcrypt_device_status_mask_ext(struct zcrypt_device_status_ext *devstatus,
+				  int maxcard, int maxqueue)

Keep void and ...

drivers/s390/crypto/zcrypt_api.c static void zcrypt_device_status_mask(struct zcrypt_device_status *devstatus) · line 1330

Quoted 9 lines
drivers/s390/crypto/zcrypt_api.c +3 -0
 {
 	struct zcrypt_card *zc;
 	struct zcrypt_queue *zq;
 	struct zcrypt_device_status_ext *stat;
 	int card, queue;
 
+	if (maxcard > MAX_ZDEV_CARDIDS_EXT || maxqueue > MAX_ZDEV_DOMAINS_EXT)
+		return -EINVAL;
+

... limit maxcard/maxqueue to the maximum supported values. In my opinion, it does not make any sense to call this function with higher values than the maximum.

maxcard = MIN(maxcard, MAX_ZDEV_CARDIDS_EXT);
maxqueue = MIN(maxqueue, MAX_ZDEV_DOMAINS_EXT);

As a side effect, it keeps the caller code much simpler.

Quoted 12 lines
drivers/s390/crypto/zcrypt_api.c +3 -1
 	spin_lock(&zcrypt_list_lock);
 	for_each_zcrypt_card(zc) {
 		for_each_zcrypt_queue(zq, zc) {
 			card = AP_QID_CARD(zq->queue->qid);
 			queue = AP_QID_QUEUE(zq->queue->qid);
-			stat = &devstatus[card * AP_DOMAINS + queue];
+			if (card >= maxcard || queue >= maxqueue)
+				continue;
+			stat = &devstatus[card * maxqueue + queue];
 			stat->hwtype = zc->card->ap_dev.device_type;
 			stat->functions = zc->card->hwinfo.fac >> 26;
 			stat->qid = zq->queue->qid;

[...]

drivers/s390/crypto/zcrypt_api.c static long zcrypt_unlocked_ioctl(struct file *filp, unsigned int cmd, · line 1650

Quoted 12 lines
drivers/s390/crypto/zcrypt_api.c +5 -3
@@ -1635,9 +1643,11 @@ static long zcrypt_unlocked_ioctl(struct file *filp, unsigned int cmd,
 					 GFP_KERNEL);
 		if (!device_status)
 			return -ENOMEM;
-		zcrypt_device_status_mask_ext(device_status);
-		if (copy_to_user((char __user *)arg, device_status,
-				 total_size))
+		rc = zcrypt_device_status_mask_ext(device_status,
+						   MAX_ZDEV_CARDIDS_EXT,
+						   MAX_ZDEV_DOMAINS_EXT);
+		if (!rc && copy_to_user((char __user *)arg, device_status,
+					total_size))

With the change above, you can stay with the current error handling. Only the addition parameters for zcrypt_device_status_mask_ext() need to be added.

Quoted 3 lines
drivers/s390/crypto/zcrypt_api.c +0 -0
 			rc = -EFAULT;
 		kvfree(device_status);
 		return rc;

[...]

Signature · 5 lines
Mit freundlichen Grüßen / Kind regards
Holger Dengler
--
IBM Systems, Linux on IBM Z Development
[email protected]
maintainer
#22 lore raw

Re: [PATCH v2 08/20] s390/zcrypt: Introduce pre-allocated device status array for cca misc

In reply to Harald Freudenberger
Quoted 3 lines · Harald Freudenberger

Introduce a pre-allocated device status array memory together with a mutex controlling the occupation to be used by the two findcard() functions. Limit the device status array to max 128 cards and max

As far as I can see, cca_findcard() (and also the static findcard()) are no longer used. If this is the case, I would prefer to remove this unused variant, either in this patch (with a hint in the commit message) or in a separate one (in the order prior to this patch).

Quoted 1 line

128 domains to reduce the size of this pre-allocated memory to 64 KB.

I'm a bit unhappy about introducing a synchronization with this single piece of memory.

Quoted 10 lines
---
 drivers/s390/crypto/zcrypt_ccamisc.c | 78 +++++++++++++++++++---------
 1 file changed, 53 insertions(+), 25 deletions(-)
drivers/s390/crypto/zcrypt_ccamisc.c +0 -0
index 420895df70f0..65b4cdb9b478 100644

[...]

drivers/s390/crypto/zcrypt_ccamisc.c static int findcard(u64 mkvp, u16 *pcardnr, u16 *pdomain,

Quoted 1 line
drivers/s390/crypto/zcrypt_ccamisc.c +0 -0
@@ -1801,21 +1817,20 @@ static int findcard(u64 mkvp, u16 *pcardnr, u16 *pdomain,

As mentioned above, please check for users of findcard() and cca_findcard(). If there are no users anymore, please remove the obsolete code.

[...]

drivers/s390/crypto/zcrypt_ccamisc.c int __init zcrypt_ccamisc_init(void) · line 2046

Quoted 7 lines
drivers/s390/crypto/zcrypt_ccamisc.c +3 -0
@@ -2023,11 +2041,21 @@ int __init zcrypt_ccamisc_init(void)
 		cprb_mempool = NULL;
 		return -ENOMEM;
 	}
+
+	/* Pre-allocate one crypto status card struct used in findcard() */
+	dev_status_mem = kvmalloc(ZCRYPT_DEV_STATUS_EXT_SIZE, GFP_KERNEL);

The alloc of dev_status_mem should be protected by the mutex as well.

drivers/s390/crypto/zcrypt_ccamisc.c int __init zcrypt_ccamisc_init(void) · line 2059

Quoted 13 lines
drivers/s390/crypto/zcrypt_ccamisc.c +7 -0
+	if (!dev_status_mem) {
+		ZCRYPT_DBF_ERR("%s allocation of dev_status_mem failed\n", __func__);
+		mempool_destroy(cprb_mempool);
+		return -ENOMEM;
+	}
+
 	return 0;
 }
 
 void zcrypt_ccamisc_exit(void)
 {
 	mkvp_cache_free();
+	kvfree(dev_status_mem);

Same here: please lock the mutex before releasing dev_status_mem.

Quoted 2 lines
drivers/s390/crypto/zcrypt_ccamisc.c +0 -0
 	mempool_destroy(cprb_mempool);
 }
Signature · 5 lines
Mit freundlichen Grüßen / Kind regards
Holger Dengler
--
IBM Systems, Linux on IBM Z Development
[email protected]
maintainer
#28 lore raw

Re: [PATCH v2 10/20] s390/zcrypt/pkey: Rework cca findcard() implementation and callers

In reply to Harald Freudenberger
Quoted 7 lines · Harald Freudenberger

Rework the memory usage of the cca findcard() implementation:
- findcard does not allocate memory for the list of apqns any more.
- the callers are now responsible to provide an array of apqns to store the matching apqns into.

See my comments below.

Quoted 6 lines
---
 drivers/s390/crypto/pkey_cca.c       | 25 +++++++++++--------------
 drivers/s390/crypto/zcrypt_ccamisc.c | 18 ++++--------------
 drivers/s390/crypto/zcrypt_ccamisc.h | 12 +++++-------
 3 files changed, 20 insertions(+), 35 deletions(-)

[...]

Quoted 4 lines
drivers/s390/crypto/zcrypt_ccamisc.c +0 -0
index 65b4cdb9b478..d3b093dcdf30 100644

[...]

Quoted 4 lines
drivers/s390/crypto/zcrypt_ccamisc.c +0 -0
@@ -2006,17 +1999,14 @@ int cca_findcard2(u32 **apqns, u32 *nr_apqns, u16 cardnr, u16 domain,
 				continue;
 		}
 		/* apqn passed all filtering criterons, add to the array */

drivers/s390/crypto/zcrypt_ccamisc.c int cca_findcard2(u32 **apqns, u32 *nr_apqns, u16 cardnr, u16 domain, · line 2008

Quoted 10 lines
drivers/s390/crypto/zcrypt_ccamisc.c +2 -3
-		if (_nr_apqns < 256)
-			_apqns[_nr_apqns++] = (((u16)card) << 16) | ((u16)dom);
+		if (_nr_apqns < *nr_apqns)
+			apqns[_nr_apqns++] = (((u16)card) << 16) | ((u16)dom);
 	}
 
 	/* nothing found ? */
 	if (!_nr_apqns) {
-		kfree(_apqns);
 		rc = -ENODEV;

In my opinion, the -ENODEV return value can be completely dropped. For the caller it should be sufficient to check for nr_apqns == 0.

drivers/s390/crypto/zcrypt_ccamisc.c int cca_findcard2(u32 **apqns, u32 *nr_apqns, u16 cardnr, u16 domain, · line 2010

Quoted 4 lines
drivers/s390/crypto/zcrypt_ccamisc.c +0 -2
 	} else {
-		/* no re-allocation, simple return the _apqns array */
-		*apqns = _apqns;
 		*nr_apqns = _nr_apqns;

Please update *nr_apqns unconditionally.

Quoted 10 lines
drivers/s390/crypto/zcrypt_ccamisc.c +0 -0
 		rc = 0;
 	}
drivers/s390/crypto/zcrypt_ccamisc.h +0 -0
index 273edf2bb036..bed647a42eb2 100644
@@ -229,14 +229,12 @@ int cca_findcard(const u8 *key, u16 *pcardnr, u16 *pdomain, int verify);
  *   cur_mkvp or old_mkvp values of the apqn are used.
  * The mktype determines which set of master keys to use:
  *   0 = AES_MK_SET - AES MK set, 1 = APKA MK_SET - APKA MK set

drivers/s390/crypto/zcrypt_ccamisc.h int cca_findcard(const u8 *key, u16 *pcardnr, u16 *pdomain, int verify); · line 235

Quoted 10 lines
drivers/s390/crypto/zcrypt_ccamisc.h +4 -6
- * The array of apqn entries is allocated with kmalloc and returned in *apqns;
- * the number of apqns stored into the list is returned in *nr_apqns. One apqn
- * entry is simple a 32 bit value with 16 bit cardnr and 16 bit domain nr and
- * may be casted to struct pkey_apqn. The return value is either 0 for success
- * or a negative errno value. If no apqn meeting the criteria is found,
- * -ENODEV is returned.
+ * The caller should set *nr_apqns to the nr of elements available in *apqns.
+ * On return *nr_apqns is then updated with the nr of apqns filled into *apqns.
+ * The return value is either 0 for success or a negative errno value.
+ * If no apqn meeting the criteria is found, -ENODEV is returned.

Why not just return nr_apqns == 0 to indicate, that no matching device has been found? Anyhow, even if you would stay with the -ENODEV return value, *nr_apqns should be updated in any case.

Quoted 6 lines
drivers/s390/crypto/zcrypt_ccamisc.h +1 -1
  */
-int cca_findcard2(u32 **apqns, u32 *nr_apqns, u16 cardnr, u16 domain,
+int cca_findcard2(u32 *apqns, u32 *nr_apqns, u16 cardnr, u16 domain,
 		  int minhwtype, int mktype, u64 cur_mkvp, u64 old_mkvp,
 		  int verify);
 
Signature · 5 lines
Mit freundlichen Grüßen / Kind regards
Holger Dengler
--
IBM Systems, Linux on IBM Z Development
[email protected]
maintainer
#25 lore raw

Re: [PATCH v2 09/20] s390/zcrypt: Introduce pre-allocated device status array for ep11 misc

In reply to Harald Freudenberger
Quoted 4 lines · Harald Freudenberger

Introduce a pre-allocated device status array memory together with a mutex controlling the occupation to be used by the findcard() function. Limit the device status array to max 128 cards and max 128 domains to reduce the size of this pre-allocated memory to 64 KB.

I have the same concerns as for patch 8/20. Please think about an alternative to the dev_status_mem sharing, because it synchronizes all findcard() calls.

Quoted 5 lines
---
 drivers/s390/crypto/zcrypt_ep11misc.c | 46 +++++++++++++++++++++------
 1 file changed, 36 insertions(+), 10 deletions(-)
Signature · 5 lines
Mit freundlichen Grüßen / Kind regards
Holger Dengler
--
IBM Systems, Linux on IBM Z Development
[email protected]
maintainer
#31 lore raw

Re: [PATCH v2 11/20] s390/zcrypt/pkey: Rework ep11 findcard() implementation and callers

In reply to Harald Freudenberger
Quoted 5 lines · Harald Freudenberger

Rework the memory usage of the ep11 findcard() implementation:
- findcard does not allocate memory for the list of apqns any more.
- the callers are now responsible to provide an array of apqns to store the matching apqns into.

See my comments below.

Quoted 8 lines
---
 drivers/s390/crypto/pkey_ep11.c       | 19 ++++++++-----------
 drivers/s390/crypto/zcrypt_ep11misc.c | 18 ++++--------------
 drivers/s390/crypto/zcrypt_ep11misc.h | 12 +++++-------
 3 files changed, 17 insertions(+), 32 deletions(-)

[...]

Quoted 4 lines
drivers/s390/crypto/zcrypt_ep11misc.c +0 -0
index 04153b476168..6005ef79c001 100644

[...]

Quoted 7 lines
drivers/s390/crypto/zcrypt_ep11misc.c +1 -2
@@ -1678,17 +1671,14 @@ int ep11_findcard2(u32 **apqns, u32 *nr_apqns, u16 cardnr, u16 domain,
 				continue;
 		}
 		/* apqn passed all filtering criterons, add to the array */
-		if (_nr_apqns < 256)
-			_apqns[_nr_apqns++] = (((u16)card) << 16) | ((u16)dom);
+		if (_nr_apqns < *nr_apqns)

drivers/s390/crypto/zcrypt_ep11misc.c int ep11_findcard2(u32 **apqns, u32 *nr_apqns, u16 cardnr, u16 domain, · line 1691

Quoted 10 lines
drivers/s390/crypto/zcrypt_ep11misc.c +1 -3
+			apqns[_nr_apqns++] = (((u16)card) << 16) | ((u16)dom);
 	}
 
 	/* nothing found ? */
 	if (!_nr_apqns) {
-		kfree(_apqns);
 		rc = -ENODEV;
 	} else {
-		/* no re-allocation, simple return the _apqns array */
-		*apqns = _apqns;

Please update *apqns unconditionally.

Quoted 11 lines
drivers/s390/crypto/zcrypt_ep11misc.c +0 -0
 		*nr_apqns = _nr_apqns;
 		rc = 0;
 	}
drivers/s390/crypto/zcrypt_ep11misc.h +0 -0
index a4b98eca8431..cbd615547bc2 100644
@@ -136,14 +136,12 @@ int ep11_clr2keyblob(u16 cardnr, u16 domain, u32 keybitsize, u32 keygenflags,
  *   key for this domain. When a wkvp is given there will always be a re-fetch
  *   of the domain info for the potential apqn - so this triggers an request
  *   reply to each apqn eligible.

drivers/s390/crypto/zcrypt_ep11misc.h int ep11_clr2keyblob(u16 cardnr, u16 domain, u32 keybitsize, u32 keygenflags, · line 142

Quoted 10 lines
drivers/s390/crypto/zcrypt_ep11misc.h +4 -6
- * The array of apqn entries is allocated with kmalloc and returned in *apqns;
- * the number of apqns stored into the list is returned in *nr_apqns. One apqn
- * entry is simple a 32 bit value with 16 bit cardnr and 16 bit domain nr and
- * may be casted to struct pkey_apqn. The return value is either 0 for success
- * or a negative errno value. If no apqn meeting the criteria is found,
- * -ENODEV is returned.
+ * The caller should set *nr_apqns to the nr of elements available in *apqns.
+ * On return *nr_apqns is then updated with the nr of apqns filled into *apqns.
+ * The return value is either 0 for success or a negative errno value.
+ * If no apqn meeting the criteria is found, -ENODEV is returned.

As mentioned in my comment to patch 10/20: please update nr_apqns in any case. If -ENODEV should be dropped for cca, than also drop it here.

Quoted 6 lines
drivers/s390/crypto/zcrypt_ep11misc.h +1 -1
  */
-int ep11_findcard2(u32 **apqns, u32 *nr_apqns, u16 cardnr, u16 domain,
+int ep11_findcard2(u32 *apqns, u32 *nr_apqns, u16 cardnr, u16 domain,
 		   int minhwtype, int minapi, const u8 *wkvp);
 
 /*
Signature · 5 lines
Mit freundlichen Grüßen / Kind regards
Holger Dengler
--
IBM Systems, Linux on IBM Z Development
[email protected]
maintainer Reviewed-by on v2 12/20
#34 lore raw

Re: [PATCH v2 12/20] s390/zcrypt: Rework cca misc functions kmallocs to use the cprb mempool

In reply to Harald Freudenberger
Quoted 6 lines · Harald Freudenberger

Rework two places in the zcrypt cca misc code using kmalloc() for ephemeral memory allocation. As there is anyway now a cprb mempool let's use this pool instead to satisfy these short term memory allocations.

Signature · 5 lines
Mit freundlichen Grüßen / Kind regards
Holger Dengler
--
IBM Systems, Linux on IBM Z Development
[email protected]
maintainer Reviewed-by on v2 13/20
#36 lore raw

Re: [PATCH v2 13/20] s390/zcrypt: Add small mempool for cca info list entries

In reply to Harald Freudenberger
Quoted 5 lines · Harald Freudenberger

Add a small memory pool for (pre-)allocating cca info list entries. These entries are rather small and the pool is a simple way to support the xflag ZCRYPT_XFLAG_NOMEMALLOC to avoid mallocs.

With the requested change,

Quoted 10 lines
---
 drivers/s390/crypto/zcrypt_ccamisc.c | 67 ++++++++++++++++++++--------
 drivers/s390/crypto/zcrypt_ccamisc.h |  3 +-
 drivers/s390/crypto/zcrypt_cex4.c    |  4 +-
 3 files changed, 53 insertions(+), 21 deletions(-)
drivers/s390/crypto/zcrypt_ccamisc.c +0 -0
index ff7ba2622484..e4ec922aae0d 100644

[...]

drivers/s390/crypto/zcrypt_ccamisc.c static int findcard(u64 mkvp, u16 *pcardnr, u16 *pdomain, · line 1837

Quoted 5 lines
drivers/s390/crypto/zcrypt_ccamisc.c +1 -0
@@ -1828,6 +1834,7 @@ static int findcard(u64 mkvp, u16 *pcardnr, u16 *pdomain,
 	u16 card, dom;
 	struct cca_info ci;
 	int i, rc, oi = -1;
+	u32 xflg = 0; /* xflags */

I'm confused. Why not just calling it xflags? Anyhow, as mentioned earlier: findcard() has no consumers, so please remove it completely.

Quoted 25 lines
drivers/s390/crypto/zcrypt_ccamisc.c +4 -4
 	/* mkvp must not be zero, minhwtype needs to be >= 0 */
 	if (mkvp == 0 || minhwtype < 0)
@@ -1859,8 +1866,8 @@ static int findcard(u64 mkvp, u16 *pcardnr, u16 *pdomain,
 				if (!verify)
 					break;
 				/* verify: refresh card info */
-				if (fetch_cca_info(card, dom, &ci) == 0) {
-					cca_info_cache_update(card, dom, &ci);
+				if (fetch_cca_info(card, dom, &ci, xflg) == 0) {
+					cca_info_cache_update(card, dom, &ci, xflg);
 					if (ci.hwtype >= minhwtype &&
 					    ci.cur_aes_mk_state == '2' &&
 					    ci.cur_aes_mkvp == mkvp)
@@ -1882,8 +1889,8 @@ static int findcard(u64 mkvp, u16 *pcardnr, u16 *pdomain,
 			card = AP_QID_CARD(device_status[i].qid);
 			dom = AP_QID_QUEUE(device_status[i].qid);
 			/* fresh fetch mkvp from adapter */
-			if (fetch_cca_info(card, dom, &ci) == 0) {
-				cca_info_cache_update(card, dom, &ci);
+			if (fetch_cca_info(card, dom, &ci, xflg) == 0) {
+				cca_info_cache_update(card, dom, &ci, xflg);
 				if (ci.hwtype >= minhwtype &&
 				    ci.cur_aes_mk_state == '2' &&
 				    ci.cur_aes_mkvp == mkvp)

[...]

Signature · 5 lines
Mit freundlichen Grüßen / Kind regards
Holger Dengler
--
IBM Systems, Linux on IBM Z Development
[email protected]
maintainer Reviewed-by on v2 14/20
#40 lore raw

Re: [PATCH v2 14/20] s390/zcrypt: Locate ep11_domain_query_info onto the stack instead of kmalloc

In reply to Harald Freudenberger
Quoted 4 lines · Harald Freudenberger

Locate the relative small struct ep11_domain_query_info variable onto the stack instead of kmalloc()/kfree().

One minor comment.

Quoted 9 lines
---
 drivers/s390/crypto/zcrypt_ep11misc.c | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)
drivers/s390/crypto/zcrypt_ep11misc.c +0 -0
index 6005ef79c001..7fb55be3e943 100644

drivers/s390/crypto/zcrypt_ep11misc.c int ep11_get_domain_info(u16 card, u16 domain, struct ep11_domain_info *info) · line 793

Quoted 9 lines
drivers/s390/crypto/zcrypt_ep11misc.c +1 -5
@@ -790,36 +790,31 @@ int ep11_get_domain_info(u16 card, u16 domain, struct ep11_domain_info *info)
 		u8  new_WK_VP[32];
 		u32 dom_flags;
 		u64 op_mode;
-	} __packed * p_dom_info;
-
-	p_dom_info = kmalloc(sizeof(*p_dom_info), GFP_KERNEL);
-	if (!p_dom_info)
-		return -ENOMEM;
+	} __packed dom_query_info;

Why is dom_query_info a typed struct? The struct type is not used and an untyped struct can be used as well.

Signature · 5 lines
Mit freundlichen Grüßen / Kind regards
Holger Dengler
--
IBM Systems, Linux on IBM Z Development
[email protected]
maintainer Reviewed-by on v2 15/20
#43 lore raw

Re: [PATCH v2 15/20] s390/zcrypt: Rework ep11 misc functions to use cprb mempool

In reply to Harald Freudenberger
Quoted 5 lines · Harald Freudenberger

There are two places in the ep11 misc code where a short term memory buffer is needed. Rework this code to use the cprb mempool to satisfy this ephemeral memory requirements.

Quoted 6 lines
---
 drivers/s390/crypto/pkey_ep11.c       |   3 +-
 drivers/s390/crypto/zcrypt_cex4.c     |  12 +--
 drivers/s390/crypto/zcrypt_ep11misc.c | 104 ++++++++++++++++----------
 drivers/s390/crypto/zcrypt_ep11misc.h |   8 +-
 4 files changed, 78 insertions(+), 49 deletions(-)
Signature · 5 lines
Mit freundlichen Grüßen / Kind regards
Holger Dengler
--
IBM Systems, Linux on IBM Z Development
[email protected]
maintainer
#38 lore raw

Re: [PATCH v2 13/20] s390/zcrypt: Add small mempool for cca info list entries

In reply to Harald Freudenberger
Quoted 5 lines · Harald Freudenberger

Add a small memory pool for (pre-)allocating cca info list entries. These entries are rather small and the pool is a simple way to support the xflag ZCRYPT_XFLAG_NOMEMALLOC to avoid mallocs.

Sorry, I forgot one aspect, see comment below.

Quoted 11 lines
---
 drivers/s390/crypto/zcrypt_ccamisc.c | 67 ++++++++++++++++++++--------
 drivers/s390/crypto/zcrypt_ccamisc.h |  3 +-
 drivers/s390/crypto/zcrypt_cex4.c    |  4 +-
 3 files changed, 53 insertions(+), 21 deletions(-)
drivers/s390/crypto/zcrypt_ccamisc.c +0 -0
index ff7ba2622484..e4ec922aae0d 100644

drivers/s390/crypto/zcrypt_ccamisc.c struct cca_info_list_entry { · line 47

Quoted 7 lines
drivers/s390/crypto/zcrypt_ccamisc.c +4 -0
@@ -41,6 +41,10 @@ struct cca_info_list_entry {
 static LIST_HEAD(cca_info_list);
 static DEFINE_SPINLOCK(cca_info_list_lock);
 
+/* memory pool for cca_info_list entries */
+#define INFO_ENTRY_MEMPOOL_MIN_ITEMS 8
+static mempool_t *info_mempool;
+

The minimal elements in all smaller mempools should also be configurable via a module parameter, if this is required to process a larger number of NOMEMALLOC requests in parallel. There should be one parameter per module, which configures the minimal number of all mempools of this module. I also would prefer the same parameter name across all modules (e.g. "mempool_threshold").

Signature · 5 lines
Mit freundlichen Grüßen / Kind regards
Holger Dengler
--
IBM Systems, Linux on IBM Z Development
[email protected]
maintainer Reviewed-by on v2 16/20
#45 lore raw

Re: [PATCH v2 16/20] s390/zcrypt: Add small mempool for ep11 card info list entries

In reply to Harald Freudenberger
Quoted 5 lines · Harald Freudenberger

Add a small memory pool for (pre-)allocating ep11 card info list entries. These entries are rather small and the pool is a simple way to support the xflag ZCRYPT_XFLAG_NOMEMALLOC to avoid mallocs.

With the change below,

Quoted 9 lines
---
 drivers/s390/crypto/zcrypt_ep11misc.c | 48 ++++++++++++++++++++++-----
 1 file changed, 39 insertions(+), 9 deletions(-)
drivers/s390/crypto/zcrypt_ep11misc.c +0 -0
index af59d66bff33..a9a6fdc32464 100644

drivers/s390/crypto/zcrypt_ep11misc.c struct card_list_entry { · line 70

Quoted 7 lines
drivers/s390/crypto/zcrypt_ep11misc.c +4 -0
@@ -64,6 +64,10 @@ struct card_list_entry {
 static LIST_HEAD(card_list);
 static DEFINE_SPINLOCK(card_list_lock);
 
+/* memory pool for card_list_entry entries */
+#define INFO_ENTRY_MEMPOOL_MIN_ITEMS 4
+static mempool_t *info_mempool;
+

The minimal elements in all smaller mempools should also be configurable via a module parameter, if this is required to process a larger number of NOMEMALLOC requests in parallel. There should be one parameter per module, which configures the minimal number of all mempools of this module. I also would prefer the same parameter name across all modules (e.g. "mempool_threshold"). There is no need to state the card type in the module parameter again.

Signature · 5 lines
Mit freundlichen Grüßen / Kind regards
Holger Dengler
--
IBM Systems, Linux on IBM Z Development
[email protected]
maintainer Reviewed-by on v2 19/20
#51 lore raw

Re: [PATCH v2 19/20] s390/zcrypt/pkey: Provide and pass xflags within pkey and zcrypt layers

In reply to Harald Freudenberger
Quoted 5 lines · Harald Freudenberger

Provide and pass the xflag parameter from pkey ioctls through the pkey handler and further down to the implementations (CCA, EP11, PCKMO and UV). So all the code is now prepared and ready to support the currently only xflag ("execution flag"):

Quoted 8 lines

* ZCRYPT_XFLAG_NOMEMALLOC - If this flag is set, no memory allocations which may trigger any IO operations are done.

The in-kernel pkey API still does not provide this xflag param. That's intended to come with another patch which more or less only enables this functionality.

Without the findcard() function or with a changed parameter name according to my comment

Quoted 15 lines
---
 drivers/s390/crypto/pkey_api.c        | 49 +++++++++++-----------
 drivers/s390/crypto/pkey_base.c       | 34 ++++++++-------
 drivers/s390/crypto/pkey_base.h       | 37 ++++++++++-------
 drivers/s390/crypto/pkey_cca.c        | 59 +++++++++++++++------------
 drivers/s390/crypto/pkey_ep11.c       | 49 ++++++++++++----------
 drivers/s390/crypto/pkey_pckmo.c      |  9 ++--
 drivers/s390/crypto/pkey_sysfs.c      |  4 +-
 drivers/s390/crypto/pkey_uv.c         | 16 +++++++-
 drivers/s390/crypto/zcrypt_ccamisc.c  | 53 +++++++++++-------------
 drivers/s390/crypto/zcrypt_ccamisc.h  | 25 +++++++-----
 drivers/s390/crypto/zcrypt_ep11misc.c | 10 ++---
 drivers/s390/crypto/zcrypt_ep11misc.h |  7 ++--
 12 files changed, 196 insertions(+), 156 deletions(-)

[...]

Quoted 4 lines
drivers/s390/crypto/zcrypt_ccamisc.c +0 -0
index e4ec922aae0d..3b80ce605192 100644

[...]

drivers/s390/crypto/zcrypt_ccamisc.c EXPORT_SYMBOL(cca_get_info); · line 1837

Quoted 12 lines
drivers/s390/crypto/zcrypt_ccamisc.c +1 -2
@@ -1828,13 +1822,12 @@ EXPORT_SYMBOL(cca_get_info);
  * Master Key Verification Pattern given.
  */
 static int findcard(u64 mkvp, u16 *pcardnr, u16 *pdomain,
-		    int verify, int minhwtype)
+		    int verify, int minhwtype, u32 xflg)
 {
 	struct zcrypt_device_status_ext *device_status;
 	u16 card, dom;
 	struct cca_info ci;
 	int i, rc, oi = -1;
-	u32 xflg = 0; /* xflags */

If you keep findcard() please name the parameter xflags instead of xflg.

Quoted 3 lines
drivers/s390/crypto/zcrypt_ccamisc.c +0 -0
 	/* mkvp must not be zero, minhwtype needs to be >= 0 */
 	if (mkvp == 0 || minhwtype < 0)
Signature · 5 lines
Mit freundlichen Grüßen / Kind regards
Holger Dengler
--
IBM Systems, Linux on IBM Z Development
[email protected]
maintainer Reviewed-by on v2 20/20
#53 lore raw

Re: [PATCH v2 20/20] s390/pkey/crypto: Introduce xflags param for pkey in-kernel API

In reply to Harald Freudenberger
Quoted 11 lines · Harald Freudenberger

Add a new parameter xflags to the in-kernel API function pkey_key2protkey(). Currently there is only one flag supported:

* PKEY_XFLAG_NOMEMALLOC:
If this flag is given in the xflags parameter, the pkey implementation is not allowed to allocate memory but instead should fall back to use preallocated memory or simple fail with -ENOMEM.
This flag is for protected key derive within a cipher or similar which must not allocate memory which would cause io operations - see also the CRYPTO_ALG_ALLOCATES_MEMORY flag in crypto.h.

Quoted 5 lines

The one and only user of this in-kernel API - the skcipher implementations PAES in paes_s390.c set this flag upon request to derive a protected key from the given raw key material.

Signature · 5 lines
Mit freundlichen Grüßen / Kind regards
Holger Dengler
--
IBM Systems, Linux on IBM Z Development
[email protected]
maintainer
#54 lore raw
In reply to Harald Freudenberger
Quoted 14 lines · Harald Freudenberger

This series of patches has the goal to open up a do-not-allocate memory path from the callers of the pkey in-kernel api down to the crypto cards and back.

The asynch in-kernel cipher implementations (and the s390 PAES cipher implementations are one of them) may be called in a context where memory allocations which trigger IO is not acceptable.

So this patch series reworks the AP bus code, the zcrypt layer, the pkey layer and the pkey handlers to respect this situation by processing a new parameter xflags (execution hints flags). There is a flag PKEY_XFLAG_NOMEMALLOC which tells the code to not allocate memory which may lead to IO operations.

Quoted 7 lines

To reach this goal, the actual code changes have been differed. The zcrypt misc functions which need memory for cprb build use a pre allocated memory pool for this purpose. The findcard() functions have one temp memory area preallocated and protected with a mutex. Some smaller data is not allocated any more but went to the stack instead. The AP bus also uses a pre-allocated memory pool for building AP message requests.

Please check in all affected modules: the parameter for the minimal number of element in all meempools of the module should be configurable with the same module parameter. Please also use the same module parameter name (e.g. mempool_threshold) in all modules. This makes it easier for users to syncronize the mempool thresholds accross modules.

Quoted 23 lines

Note that the PAES implementation still needs to get reworked to run the protected key derivation in a real asynchronous way. However, this rework of AP bus, zcrypt and pkey is the base work required before reconsidering the PAES implementation.

The patch series starts bottom (AP bus) and goes up the call chain (PKEY). At any time in the patch stack it should compile. For easier review I tried to have one logic code change by each patch and thus keep the patches "small". For the upstream version I intend to fold them together into only a few commits.

Changelog:
v1: initial version
v2: - Rework on patch 0001 and 0002 based on feedback from Holger.
Also there was one place in zcrypt_msgtype50.c where still an ap msg buffer was alloacated.
- Rework on patch 0003 - fixed feedback from Holger. Also the min poolitems is now a module parameter and defaults to 8.
- Rework on patch 0004 - as suggested by Holger the "userspace" parameter is now included into the ap msg flags.
- Rework on patch 0005 - nr of cca cprbs in the mempool is now a module parameter.

Quoted 8 lines

- Rework on patch 0006 - nr of ep11 cprbs in the mempool is now a module parameter.
- Rework on patch 0007 - as suggested by Holger instead of implementing a copy-and-pasted new function zcrypt_device_status_mask_ext2() use and extend the existing the existing function to avoid code duplication.
- The rest of the patch series needed adaptions but there is no functional change compared to v1.

Please pick my R-b tags of this review for v3.

Signature · 5 lines
Mit freundlichen Grüßen / Kind regards
Holger Dengler
--
IBM Systems, Linux on IBM Z Development
[email protected]
maintainer Reviewed-by on v2 17/20
#47 lore raw

Re: [PATCH v2 17/20] s390/pkey: Rework CCA pkey handler to use stack for small memory allocs

In reply to Harald Freudenberger
Quoted 5 lines · Harald Freudenberger

There have been some places in the CCA handler code where relatively small amounts of memory have been allocated an freed at the end of the function. This code has been reworked to use the stack instead.

Signature · 5 lines
Mit freundlichen Grüßen / Kind regards
Holger Dengler
--
IBM Systems, Linux on IBM Z Development
[email protected]
maintainer Reviewed-by on v2 18/20
#49 lore raw

Re: [PATCH v2 18/20] s390/pkey: Rework EP11 pkey handler to use stack for small memory allocs

In reply to Harald Freudenberger
Quoted 5 lines · Harald Freudenberger

There have been some places in the EP11 handler code where relatively small amounts of memory have been allocated an freed at the end of the function. This code has been reworked to use the stack instead.

Signature · 5 lines
Mit freundlichen Grüßen / Kind regards
Holger Dengler
--
IBM Systems, Linux on IBM Z Development
[email protected]
author maintainer
#3 lore raw

Re: [PATCH v2 01/20] s390/ap: Move response_type struct into ap_msg struct

In reply to Holger Dengler
Quoted 25 lines · Holger Dengler
Quoted 5 lines · Harald Freudenberger

Move the very small response_type struct into struct ap_msg. So there is no need to kmalloc this tiny struct with each ap message preparation.

See my comment below. Beside that

Quoted 6 lines
---
 drivers/s390/crypto/ap_bus.h           |  8 ++-
 drivers/s390/crypto/zcrypt_msgtype50.c | 16 ++----
 drivers/s390/crypto/zcrypt_msgtype6.c  | 74 
++++++++++----------------
 3 files changed, 38 insertions(+), 60 deletions(-)

[...]

Quoted 8 lines
drivers/s390/crypto/zcrypt_msgtype6.c +0 -0
index b64c9d9fc613..521cc0b39990 100644
@@ -31,10 +31,7 @@
 
 #define CEIL4(x) ((((x) + 3) / 4) * 4)
 
Quoted 8 lines

drivers/s390/crypto/zcrypt_msgtype6.c line 34

Quoted 5 lines
drivers/s390/crypto/zcrypt_msgtype6.c +1 -4
-struct response_type {
-	struct completion work;
-	int type;
-};
+struct response_type;

This struct is only defined, but not used. Remove it.

done -> see v3 (coming soon)

Quoted 4 lines
Quoted 3 lines
drivers/s390/crypto/zcrypt_msgtype6.c +0 -0
 #define CEXXC_RESPONSE_TYPE_ICA  0
 #define CEXXC_RESPONSE_TYPE_XCRB 1

[...]

author maintainer
#8 lore raw

Re: [PATCH v2 03/20] s390/ap: Introduce ap message buffer pool

In reply to Holger Dengler
Quoted 12 lines · Holger Dengler
Quoted 11 lines · Harald Freudenberger

There is a need for a do-not-allocate-memory path through the ap bus layer. When ap_init_apmsg() with use_mempool set to true is called, instead of kmalloc() the ap message buffer is allocated from the ap_msg_pool. This pool only holds a limited amount of buffers: ap_msg_pool_min_items with the item size AP_DEFAULT_MAX_MSG_SIZE and exactly one of these items (if available) is returned if ap_init_apmsg() with the use_mempool arg set to true is called. When this pool is exhausted and use_mempool is set true, ap_init_apmsg() returns -ENOMEM without any attempt to allocate memory.

Quoted 6 lines
Quoted 3 lines

Default values for this mempool of ap messages is:
* Each buffer is 12KB (that is the default AP bus size and all the urgend messages should fit into this space).

typo: urgent

done -> v3

Quoted 39 lines
Quoted 10 lines

* Minimum items held in the pool is 8. This value is adjustable via module parameter ap.msgpool_min_items.

The zcrypt layer may use this flag to indicate to the ap bus that the processing path for this message should not allocate memory but should use pre-allocated memory buffer instead. This is to prevent deadlocks with crypto and io for example with encrypted swap volumes.

With the typo and the changed indent (see comment below)

Quoted 7 lines
---
 drivers/s390/crypto/ap_bus.c     | 57 
++++++++++++++++++++++++++++----
 drivers/s390/crypto/ap_bus.h     |  9 ++---
 drivers/s390/crypto/zcrypt_api.c | 10 +++---
 3 files changed, 60 insertions(+), 16 deletions(-)

[...]

Quoted 17 lines
drivers/s390/crypto/ap_bus.h +0 -1
index 483231bcdea6..a7bd44e5cc76 100644
@@ -233,11 +233,12 @@ struct ap_message {
 			struct ap_message *);
 };
 
-#define AP_MSG_FLAG_SPECIAL  0x0001	/* flag msg as 'special' with 

NQAP */
-#define AP_MSG_FLAG_USAGE 0x0002 /* CCA, EP11: usage (no admin)
msg */
-#define AP_MSG_FLAG_ADMIN 0x0004 /* CCA, EP11: admin (=control)
msg */
+#define AP_MSG_FLAG_SPECIAL 0x0001 /* flag msg as 'special' with
NQAP */
+#define AP_MSG_FLAG_USAGE 0x0002 /* CCA, EP11: usage (no admin)

Quoted 9 lines
Quoted 5 lines

msg */
+#define AP_MSG_FLAG_ADMIN 0x0004 /* CCA, EP11: admin (=control)
msg */
+#define AP_MSG_FLAG_MEMPOOL 0x0008 /* ap msg buffer allocated from
mempool */

Please do not change the indent here. The change is not required, but it makes the life of reviewers much harder.

corrected -> v3

Quoted 8 lines
Quoted 7 lines
drivers/s390/crypto/ap_bus.h +1 -1
-int ap_init_apmsg(struct ap_message *ap_msg);
+int ap_init_apmsg(struct ap_message *ap_msg, bool use_mempool);
 void ap_release_apmsg(struct ap_message *ap_msg);
 
 enum ap_sm_wait ap_sm_event(struct ap_queue *aq, enum ap_sm_event 

event);

[...]

author maintainer
#11 lore raw

Re: [PATCH v2 04/20] s390/ap/zcrypt: New xflag parameter and extension of the ap msg flags

In reply to Holger Dengler
Quoted 276 lines · Holger Dengler
Quoted 27 lines · Harald Freudenberger

Introduce a new flag parameter for the both cprb send functions zcrypt_send_cprb() and zcrypt_send_ep11_cprb(). This new xflags parameter ("execution flags") shall be used to provide execution hints and flags for this crypto request.

There are two flags implemented to be used with these functions:
* ZCRYPT_XFLAG_USERSPACE - indicates to the lower layers that all the ptrs address userspace. So when construction the ap msg copy_from_user() is to be used. If this flag is NOT set, the ptrs address kernel memory and thus memcpy() is to be used.
* ZCRYPT_XFLAG_NOMEMALLOC - indicates that this task must not allocate memory which may be allocated with io operations. For the zcrypt layer this limits the number of EP11 targets to 16 APQNs. But as this flag is passed down the stack, it may induce further restrictions.

For the AP bus and zcrypt message layer this means:
* The ZCRYPT_XFLAG_USERSPACE is mapped to the AP flag AP_MSG_FLAG_USERSPACE stored into the flags field of each ap message in the ap_message struct. This replaces the extra function parameter "userspace" and makes some function invocations simpler.
* The ZCRYPT_XFLAG_NOMEMALLOC causes the AP message buffer to use buffer space from the AP message mempool instead of allocating memory via kmalloc. Note that the buffer space from the AP message mem pool is limited to 12KB per item.

Quoted 1 line

The boolean parameter userspace should only be merged with the xflags in functions, which has the need to handle ZCRYPT_XFLAG_USERSPACE and ZCRYPT_XFLAG_NOMEMALLOC, e.g _zcrypt_send_cprb(). Functions, which either only take one or the other flag may stay with the boolean parameter. There is also no need for a definition of AP_MSG_FLAG_USERSPACE, as the AP layer does not care about userspace pointers at all, only the zcrypt layer is affected by this flag. See my comments below.

Quoted 12 lines
---
 drivers/s390/crypto/ap_bus.c          |  6 +-
 drivers/s390/crypto/ap_bus.h          | 11 ++--
 drivers/s390/crypto/zcrypt_api.c      | 90 
+++++++++++++++------------
 drivers/s390/crypto/zcrypt_api.h      | 36 +++++++----
 drivers/s390/crypto/zcrypt_ccamisc.c  | 16 ++---
 drivers/s390/crypto/zcrypt_ep11misc.c | 10 +--
 drivers/s390/crypto/zcrypt_msgtype6.c | 12 ++--
 drivers/s390/crypto/zcrypt_msgtype6.h |  4 +-
 8 files changed, 107 insertions(+), 78 deletions(-)

[...]

Quoted 18 lines
drivers/s390/crypto/ap_bus.h +0 -1
index a7bd44e5cc76..5581fb13af73 100644
@@ -233,12 +233,13 @@ struct ap_message {
 			struct ap_message *);
 };
 
-#define AP_MSG_FLAG_SPECIAL  0x0001   /* flag msg as 'special' with 

NQAP */
-#define AP_MSG_FLAG_USAGE 0x0002 /* CCA, EP11: usage (no admin)
msg */
-#define AP_MSG_FLAG_ADMIN 0x0004 /* CCA, EP11: admin (=control)
msg */
-#define AP_MSG_FLAG_MEMPOOL 0x0008 /* ap msg buffer allocated from
mempool */
+#define AP_MSG_FLAG_SPECIAL 0x0001 /* flag msg as 'special' with
NQAP */

Quoted 8 lines

+#define AP_MSG_FLAG_USAGE 0x0002 /* CCA, EP11: usage (no admin)
msg */
+#define AP_MSG_FLAG_ADMIN 0x0004 /* CCA, EP11: admin (=control)
msg */
+#define AP_MSG_FLAG_MEMPOOL 0x0008 /* ap msg buffer allocated
from mempool */
+#define AP_MSG_FLAG_USERSPACE 0x0010 /* pointers address userspace memory */

Do we really need this flag in the AP layer? IIRC it has only meaning in the zcrypt layer. If this is correct, please remove it.

Quoted 12 lines
drivers/s390/crypto/ap_bus.h +1 -1
-int ap_init_apmsg(struct ap_message *ap_msg, bool use_mempool);
+int ap_init_apmsg(struct ap_message *ap_msg, u32 flags);
 void ap_release_apmsg(struct ap_message *ap_msg);
 
 enum ap_sm_wait ap_sm_event(struct ap_queue *aq, enum ap_sm_event 

event);

drivers/s390/crypto/zcrypt_api.c +0 -0
index ad09c5306e28..659fe7afb67e 100644

drivers/s390/crypto/zcrypt_api.c static long zcrypt_rsa_modexpo(struct ap_perms · line 652

Quoted 6 lines
drivers/s390/crypto/zcrypt_api.c +1 -1
@@ -648,7 +648,7 @@ static long zcrypt_rsa_modexpo(struct ap_perms 
 *perms,
 
 	trace_s390_zcrypt_req(mex, TP_ICARSAMODEXPO);
 
-	rc = ap_init_apmsg(&ap_msg, false);
+	rc = ap_init_apmsg(&ap_msg, AP_MSG_FLAG_USERSPACE);

use_mempool == false should be changed to 0, not AP_MSG_FLAG_USERSPACE. rc = ap_init_apmsg(&ap_msg, 0);

drivers/s390/crypto/zcrypt_api.c static long zcrypt_rsa_crt(struct ap_perms *perms, · line 756

Quoted 9 lines
drivers/s390/crypto/zcrypt_api.c +1 -1
 	if (rc)
 		goto out;
@@ -753,7 +753,7 @@ static long zcrypt_rsa_crt(struct ap_perms *perms,
 
 	trace_s390_zcrypt_req(crt, TP_ICARSACRT);
 
-	rc = ap_init_apmsg(&ap_msg, false);
+	rc = ap_init_apmsg(&ap_msg, AP_MSG_FLAG_USERSPACE);

Same here.
rc = ap_init_apmsg(&ap_msg, 0);

Quoted 3 lines
drivers/s390/crypto/zcrypt_api.c +0 -0
 	if (rc)
 		goto out;
 

[...]

Quoted 14 lines
drivers/s390/crypto/zcrypt_api.c +2 -1
@@ -856,16 +856,19 @@ static long _zcrypt_send_cprb(bool userspace, 
 struct ap_perms *perms,
 	unsigned short *domain, tdom;
 	int cpen, qpen, qid = 0, rc;
 	struct module *mod;
+	u32 flags;
 
 	trace_s390_zcrypt_req(xcrb, TB_ZSECSENDCPRB);
 
 	xcrb->status = 0;
 
-	rc = ap_init_apmsg(&ap_msg, false);
+	flags = (xflags & ZCRYPT_XFLAG_USERSPACE ? AP_MSG_FLAG_USERSPACE : 

0) |

drivers/s390/crypto/zcrypt_api.c

Quoted 2 lines
drivers/s390/crypto/zcrypt_api.c +2 -0
+		(xflags & ZCRYPT_XFLAG_NOMEMALLOC ? AP_MSG_FLAG_MEMPOOL : 0);
+	rc = ap_init_apmsg(&ap_msg, flags);

There is no need to translate ZCRYPT_XFLAG_USERSPACE to ap-msg flags, the AP layer should not care about userspace/kernelspace pointer. rc = ap_init_apmsg(&ap_msg, xflags & ZCRYPT_XFLAG_NOMEMALLOC ? AP_MSG_FLAG_MEMPOOL : 0);

drivers/s390/crypto/zcrypt_api.c static long _zcrypt_send_cprb(bool userspace, struct ap_perms *perms, · line 871

Quoted 5 lines
drivers/s390/crypto/zcrypt_api.c +1 -1
 	if (rc)
 		goto out;
 
-	rc = prep_cca_ap_msg(userspace, xcrb, &ap_msg, &func_code, &domain);
+	rc = prep_cca_ap_msg(xcrb, &ap_msg, &func_code, &domain);

The prep_cca_ap_msg() - and all functions below - can stay with the bool parameter.
rc = prep_cca_ap_msg((xflags & ZCRYPT_XFLAG_USERSPACE), xcrb, &ap_msg, &func_code, &domain);

drivers/s390/crypto/zcrypt_api.c static long _zcrypt_send_cprb(bool userspace, · line 963

Quoted 10 lines
drivers/s390/crypto/zcrypt_api.c +1 -1
 	if (rc)
 		goto out;
 	print_hex_dump_debug("ccareq: ", DUMP_PREFIX_ADDRESS, 16, 1,
@@ -956,7 +959,7 @@ static long _zcrypt_send_cprb(bool userspace, 
 struct ap_perms *perms,
 	if (*domain == AUTOSEL_DOM)
 		*domain = AP_QID_QUEUE(qid);
 
-	rc = pref_zq->ops->send_cprb(userspace, pref_zq, xcrb, &ap_msg);
+	rc = pref_zq->ops->send_cprb(pref_zq, xcrb, &ap_msg);

Here as well, stay with the bool parameter userspace in the callback. rc = pref_zq->ops->send_cprb((xflags & ZCRYPT_XFLAG_USERSPACE), pref_zq, xcrb, &ap_msg);

Quoted 3 lines
drivers/s390/crypto/zcrypt_api.c +0 -0
 	if (!rc) {
 		print_hex_dump_debug("ccarpl: ", DUMP_PREFIX_ADDRESS, 16, 1,

ap_msg.msg, ap_msg.len, false);

[...]

Quoted 29 lines
drivers/s390/crypto/zcrypt_api.c +4 -3
@@ -1029,52 +1032,58 @@ static bool is_desired_ep11_queue(unsigned int 
 dev_qid,
 	return false;
 }
 
-static long _zcrypt_send_ep11_cprb(bool userspace, struct ap_perms 
 *perms,
+static long _zcrypt_send_ep11_cprb(u32 xflags, struct ap_perms 
 *perms,
 				   struct zcrypt_track *tr,
 				   struct ep11_urb *xcrb)
 {
 	struct zcrypt_card *zc, *pref_zc;
 	struct zcrypt_queue *zq, *pref_zq;
-	struct ep11_target_dev *targets;
+	struct ep11_target_dev targetbuf[16], *targets = NULL;
 	unsigned short target_num;
 	unsigned int wgt = 0, pref_wgt = 0;
 	unsigned int func_code = 0, domain;
 	struct ap_message ap_msg;
 	int cpen, qpen, qid = 0, rc;
 	struct module *mod;
+	u32 flags;
 
 	trace_s390_zcrypt_req(xcrb, TP_ZSENDEP11CPRB);
 
-	rc = ap_init_apmsg(&ap_msg, false);
+	flags = (xflags & ZCRYPT_XFLAG_USERSPACE ? AP_MSG_FLAG_USERSPACE : 

0) |

drivers/s390/crypto/zcrypt_api.c

Quoted 2 lines
drivers/s390/crypto/zcrypt_api.c +2 -0
+		(xflags & ZCRYPT_XFLAG_NOMEMALLOC ? AP_MSG_FLAG_MEMPOOL : 0);
+	rc = ap_init_apmsg(&ap_msg, flags);

The AP layer does not care about the userspace flag. Please remove it. rc = ap_init_apmsg(&ap_msg, xflags & ZCRYPT_XFLAG_NOMEMALLOC ? AP_MSG_FLAG_MEMPOOL : 0);

Quoted 40 lines
drivers/s390/crypto/zcrypt_api.c +12 -10
 	if (rc)
 		goto out;
 
 	target_num = (unsigned short)xcrb->targets_num;
 
 	/* empty list indicates autoselect (all available targets) */
-	targets = NULL;
+	rc = -ENOMEM;
 	if (target_num != 0) {
 		struct ep11_target_dev __user *uptr;
 
-		targets = kcalloc(target_num, sizeof(*targets), GFP_KERNEL);
-		if (!targets) {
-			func_code = 0;
-			rc = -ENOMEM;
+		if (target_num <= ARRAY_SIZE(targetbuf)) {
+			targets = targetbuf;
+		} else if (xflags & ZCRYPT_XFLAG_NOMEMALLOC) {
 			goto out;
+		} else {
+			targets = kcalloc(target_num,
+					  sizeof(*targets), GFP_KERNEL);
+			if (!targets)
+				goto out;
 		}
 
 		uptr = (struct ep11_target_dev __force __user *)xcrb->targets;
-		if (z_copy_from_user(userspace, targets, uptr,
-				     target_num * sizeof(*targets))) {
-			func_code = 0;
+		if (z_copy_from_user(xflags & ZCRYPT_XFLAG_USERSPACE, targets,
+				     uptr, target_num * sizeof(*targets))) {
 			rc = -EFAULT;
-			goto out_free;
+			goto out;
 		}
 	}
 
-	rc = prep_ep11_ap_msg(userspace, xcrb, &ap_msg, &func_code, 

&domain);

drivers/s390/crypto/zcrypt_api.c static bool is_desired_ep11_queue(unsigned int dev_qid, · line 1084

Quoted 1 line
drivers/s390/crypto/zcrypt_api.c +1 -0
+	rc = prep_ep11_ap_msg(xcrb, &ap_msg, &func_code, &domain);

Stay here with the boolean parameter for userspace.

Quoted 6 lines
drivers/s390/crypto/zcrypt_api.c +1 -1
 	if (rc)
-		goto out_free;
+		goto out;
 	print_hex_dump_debug("ep11req: ", DUMP_PREFIX_ADDRESS, 16, 1,
 			     ap_msg.msg, ap_msg.len, false);

[...]

drivers/s390/crypto/zcrypt_api.c static long _zcrypt_send_ep11_cprb(bool · line 1172

Quoted 13 lines
drivers/s390/crypto/zcrypt_api.c +2 -2
@@ -1154,11 +1163,11 @@ static long _zcrypt_send_ep11_cprb(bool 
 userspace, struct ap_perms *perms,
 			pr_debug("no match for address ff.ffff => ENODEV\n");
 		}
 		rc = -ENODEV;
-		goto out_free;
+		goto out;
 	}
 
 	qid = pref_zq->queue->qid;
-	rc = pref_zq->ops->send_ep11_cprb(userspace, pref_zq, xcrb, 
 &ap_msg);
+	rc = pref_zq->ops->send_ep11_cprb(pref_zq, xcrb, &ap_msg);

Keep the boolean parameter for userspace here as well.

Quoted 4 lines
Quoted 3 lines
drivers/s390/crypto/zcrypt_api.c +0 -0
 	if (!rc) {
drivers/s390/crypto/zcrypt_api.c +0 -0
 		print_hex_dump_debug("ep11rpl: ", DUMP_PREFIX_ADDRESS, 16, 1,
 				     ap_msg.msg, ap_msg.len, false);

[...]

I've picked all your suggestions. See v3 (coming soon).

author maintainer
#14 lore raw

Re: [PATCH v2 05/20] s390/zcrypt: Introduce cprb mempool for cca misc functions

In reply to Holger Dengler
Quoted 59 lines · Holger Dengler
Quoted 11 lines · Harald Freudenberger

Introduce a cprb mempool for the zcrypt cca misc functions (zcrypt_ccamisc.*) do some preparation rework to support a do-not-allocate path through some zcrypt cca misc functions.

The mempool is by default space for 4 cprbs with each 16KB. For CCA a CPRB needs to hold the request and the reply, so the pool items only support requests/replies with a limit of about 8KB. The minimal number of items in the mempool can get adjusted via module parameter zcrypt.cca_cprbpool_min_items on module load.

Quoted 4 lines

This is only part of an rework to support a new xflag ZCRYPT_XFLAG_NOMEMALLOC but not yet complete.

One minor comment below. Beside that

Quoted 8 lines
---
 drivers/s390/crypto/zcrypt_api.c     |  13 ++-
 drivers/s390/crypto/zcrypt_api.h     |   2 +
 drivers/s390/crypto/zcrypt_ccamisc.c | 116 
++++++++++++++++++++-------
 drivers/s390/crypto/zcrypt_ccamisc.h |   1 +
 4 files changed, 101 insertions(+), 31 deletions(-)

[...]

Quoted 4 lines
drivers/s390/crypto/zcrypt_ccamisc.c +0 -0
index 521baaea06ff..2c2ca2d67e2d 100644

[...]

drivers/s390/crypto/zcrypt_ccamisc.c static int alloc_and_prep_cprbmem(size_t · line 251

Quoted 13 lines
drivers/s390/crypto/zcrypt_ccamisc.c +7 -1
@@ -229,7 +241,15 @@ static int alloc_and_prep_cprbmem(size_t 
 paramblen,
 	 * allocate consecutive memory for request CPRB, request param
 	 * block, reply CPRB and reply param block
 	 */
-	cprbmem = kcalloc(2, cprbplusparamblen, GFP_KERNEL);
+	if (xflags & ZCRYPT_XFLAG_NOMEMALLOC) {
+		if (cprb_mempool &&
+		    2 * cprbplusparamblen <= CPRB_MEMPOOL_ITEM_SIZE) {
+			cprbmem = mempool_alloc_preallocated(cprb_mempool);
+			memset(cprbmem, 0, 2 * cprbplusparamblen);
+		}
+	} else {

Just a nit: let the compiler decide, if code should be duplicated or not.

if (xflags & ZCRYPT_XFLAG_NOMEMALLOC) {
	size_t len = 2 * cprbplusparamblen;

	if (cprb_mempool && len <= CPRB_MEMPOOL_ITEM_SIZE) {
		cprbmem = mempool_alloc_preallocated(cprb_mempool);
		memset(cprbmem, 0, len);
	}
} else {
Quoted 6 lines
Quoted 5 lines
drivers/s390/crypto/zcrypt_ccamisc.c +2 -0
+		cprbmem = kcalloc(2, cprbplusparamblen, GFP_KERNEL);
+	}
 	if (!cprbmem)
 		return -ENOMEM;

[...]

It was not my intention to outsmart the compier when writing this code. However, changed to your suggestion -> v3

author maintainer
#17 lore raw

Re: [PATCH v2 06/20] s390/zcrypt: Introduce cprb mempool for ep11 misc functions

In reply to Holger Dengler
Quoted 46 lines · Holger Dengler
Quoted 11 lines · Harald Freudenberger

Introduce a cprb mempool for the zcrypt ep11 misc functions (zcrypt_ep11misc.*) do some preparation rework to support a do-not-allocate path through some zcrypt cca misc functions.

The mempool is by default space for 8 cprbs with each 8KB. For EP11 a CPRB either holds the request or the reply. So for a request/reply there is always a couple of cprb buffers needed. The minimal number of items in the mempool can get adjusted via module parameter zcrypt.ep11_cprbpool_min_items on module load.

Quoted 4 lines

This is only part of an rework to support a new xflag ZCRYPT_XFLAG_NOMEMALLOC but not yet complete.

With the minor change (see comment below)

Quoted 8 lines
---
 drivers/s390/crypto/zcrypt_api.c      |  10 ++
 drivers/s390/crypto/zcrypt_api.h      |   1 +
 drivers/s390/crypto/zcrypt_ep11misc.c | 158 
++++++++++++++++----------
 drivers/s390/crypto/zcrypt_ep11misc.h |   1 +
 4 files changed, 109 insertions(+), 61 deletions(-)

[...]

Quoted 4 lines
drivers/s390/crypto/zcrypt_ep11misc.c +0 -0
index b60e262bcaa3..86578a95b140 100644

[...]

Quoted 12 lines
drivers/s390/crypto/zcrypt_ep11misc.c +1 -1
@@ -621,22 +652,20 @@ static int ep11_query_info(u16 cardnr, u16 
 domain, u32 query_type,
 	req_pl->query_subtype_len = sizeof(u32);
 
 	/* reply cprb and payload */
-	rep = alloc_cprb(sizeof(struct ep11_info_rep_pl) + buflen);
+	rep = alloc_cprbmem(sizeof(struct ep11_info_rep_pl) + buflen, 
 xflags);
 	if (!rep)
 		goto out;
 	rep_pl = (struct ep11_info_rep_pl *)(((u8 *)rep) + sizeof(*rep));
 
Quoted 9 lines

drivers/s390/crypto/zcrypt_ep11misc.c static int ep11_query_info(u16 cardnr, u16 domain, u32 query_type, · line 661

Quoted 5 lines
drivers/s390/crypto/zcrypt_ep11misc.c +1 -3
 	/* urb and target */
-	urb = kmalloc(sizeof(*urb), GFP_KERNEL);
-	if (!urb)
-		goto out;
+	memset(&urb, 0, sizeof(urb));

The memset is done each time before a prep_urb() call. Please do the memset inside the prep_urb() function and remove the other ones.

done -> v3

Quoted 14 lines
Quoted 13 lines
drivers/s390/crypto/zcrypt_ep11misc.c +2 -2
 	target.ap_id = cardnr;
 	target.dom_id = domain;
-	prep_urb(urb, &target, 1,
+	prep_urb(&urb, &target, 1,
 		 req, sizeof(*req) + sizeof(*req_pl),
 		 rep, sizeof(*rep) + sizeof(*rep_pl) + buflen);
 
-	rc = zcrypt_send_ep11_cprb(urb, 0);
+	rc = zcrypt_send_ep11_cprb(&urb, xflags);
 	if (rc) {

ZCRYPT_DBF_ERR("%s zcrypt_send_ep11_cprb(card=%d dom=%d) failed,
rc=%d\n",
__func__, (int)cardnr, (int)domain, rc);

[...]

author maintainer
#20 lore raw

Re: [PATCH v2 07/20] s390/zcrypt: Rework zcrypt function zcrypt_device_status_mask_ext

In reply to Holger Dengler
Quoted 94 lines · Holger Dengler
Quoted 4 lines · Harald Freudenberger

Rework the existing function zcrypt_device_status_mask_ext():
* Add two new parameters to provide upper limits for cards and queues. The existing implementation needed an array of 256 * 256 * 4 = 256 KB which is really huge. The

Quoted 8 lines

reworked function is more flexible in the sense that the caller can decide the upper limit for cards and domains to be stored into the status array. So for example a caller may decide to only query for cards 0...127 and queues 0...127 and thus only an array of size 128 * 128 * 4 = 64 KB is needed.
* Instead of void the reworked function now returns an int. The currently only way to have the function return != 0 is by providing card or domains limits beyond 256.

I would prefer to stay with a void function and limit the card and domain values to the current maximum. Details below.

Quoted 14 lines
---
 drivers/s390/crypto/zcrypt_api.c      | 20 +++++++++++++++-----
 drivers/s390/crypto/zcrypt_api.h      |  3 ++-
 drivers/s390/crypto/zcrypt_ccamisc.c  | 22 +++++++++++++++++-----
 drivers/s390/crypto/zcrypt_ep11misc.c | 14 ++++++++++----
 4 files changed, 44 insertions(+), 15 deletions(-)
drivers/s390/crypto/zcrypt_api.c +0 -0
index 62cc05881b13..bd2738e3792a 100644

drivers/s390/crypto/zcrypt_api.c static void zcrypt_device_status_mask(struct · line 1324

Quoted 9 lines
drivers/s390/crypto/zcrypt_api.c +2 -1
@@ -1317,19 +1317,25 @@ static void zcrypt_device_status_mask(struct 
 zcrypt_device_status *devstatus)
 	spin_unlock(&zcrypt_list_lock);
 }
 
-void zcrypt_device_status_mask_ext(struct zcrypt_device_status_ext 
 *devstatus)
+int zcrypt_device_status_mask_ext(struct zcrypt_device_status_ext 
 *devstatus,
+				  int maxcard, int maxqueue)

Keep void and ...

drivers/s390/crypto/zcrypt_api.c static void zcrypt_device_status_mask(struct zcrypt_device_status *devstatus) · line 1330

Quoted 10 lines
drivers/s390/crypto/zcrypt_api.c +3 -0
 {
 	struct zcrypt_card *zc;
 	struct zcrypt_queue *zq;
 	struct zcrypt_device_status_ext *stat;
 	int card, queue;
 
+	if (maxcard > MAX_ZDEV_CARDIDS_EXT || maxqueue > 
 MAX_ZDEV_DOMAINS_EXT)
+		return -EINVAL;
+

... limit maxcard/maxqueue to the maximum supported values. In my opinion, it does not make any sense to call this function with higher values than the maximum.

maxcard = MIN(maxcard, MAX_ZDEV_CARDIDS_EXT);
maxqueue = MIN(maxqueue, MAX_ZDEV_DOMAINS_EXT);

As a side effect, it keeps the caller code much simpler.

Quoted 12 lines
drivers/s390/crypto/zcrypt_api.c +3 -1
 	spin_lock(&zcrypt_list_lock);
 	for_each_zcrypt_card(zc) {
 		for_each_zcrypt_queue(zq, zc) {
 			card = AP_QID_CARD(zq->queue->qid);
 			queue = AP_QID_QUEUE(zq->queue->qid);
-			stat = &devstatus[card * AP_DOMAINS + queue];
+			if (card >= maxcard || queue >= maxqueue)
+				continue;
+			stat = &devstatus[card * maxqueue + queue];
 			stat->hwtype = zc->card->ap_dev.device_type;
 			stat->functions = zc->card->hwinfo.fac >> 26;
 			stat->qid = zq->queue->qid;

[...]

drivers/s390/crypto/zcrypt_api.c static long zcrypt_unlocked_ioctl(struct file · line 1651

Quoted 13 lines
drivers/s390/crypto/zcrypt_api.c +5 -3
@@ -1635,9 +1643,11 @@ static long zcrypt_unlocked_ioctl(struct file 
 *filp, unsigned int cmd,
 					 GFP_KERNEL);
 		if (!device_status)
 			return -ENOMEM;
-		zcrypt_device_status_mask_ext(device_status);
-		if (copy_to_user((char __user *)arg, device_status,
-				 total_size))
+		rc = zcrypt_device_status_mask_ext(device_status,
+						   MAX_ZDEV_CARDIDS_EXT,
+						   MAX_ZDEV_DOMAINS_EXT);
+		if (!rc && copy_to_user((char __user *)arg, device_status,
+					total_size))

With the change above, you can stay with the current error handling. Only the addition parameters for zcrypt_device_status_mask_ext() need to be added.

Quoted 4 lines
Quoted 3 lines
drivers/s390/crypto/zcrypt_api.c +0 -0
 			rc = -EFAULT;
 		kvfree(device_status);

return rc;

[...]

Done as suggested - only I used typed min (min_t()) instead of MIN. -> v3

author maintainer
#23 lore raw

Re: [PATCH v2 08/20] s390/zcrypt: Introduce pre-allocated device status array for cca misc

In reply to Holger Dengler
Quoted 10 lines · Holger Dengler
Quoted 3 lines · Harald Freudenberger

Introduce a pre-allocated device status array memory together with a mutex controlling the occupation to be used by the two findcard() functions. Limit the device status array to max 128 cards and max

As far as I can see, cca_findcard() (and also the static findcard()) are no longer used. If this is the case, I would prefer to remove this unused variant, either in this patch (with a hint in the commit message) or in a separate one (in the order prior to this patch).

Quoted 5 lines
Quoted 1 line

128 domains to reduce the size of this pre-allocated memory to 64 KB.

I'm a bit unhappy about introducing a synchronization with this single piece of memory.

Any other ideas ?

Quoted 12 lines
Quoted 11 lines
---
 drivers/s390/crypto/zcrypt_ccamisc.c | 78 
+++++++++++++++++++---------
 1 file changed, 53 insertions(+), 25 deletions(-)
drivers/s390/crypto/zcrypt_ccamisc.c +0 -0
index 420895df70f0..65b4cdb9b478 100644

[...]

Quoted 7 lines

drivers/s390/crypto/zcrypt_ccamisc.c static int findcard(u64 mkvp, u16 *pcardnr, · line 1817

Quoted 2 lines
drivers/s390/crypto/zcrypt_ccamisc.c +0 -0
@@ -1801,21 +1817,20 @@ static int findcard(u64 mkvp, u16 *pcardnr, 
 u16 *pdomain,

As mentioned above, please check for users of findcard() and cca_findcard(). If there are no users anymore, please remove the obsolete code.

Seems you are right - findcard() and cca_findcard() are no longer used. So I'll introduce another patch before this one which removes the unused functions. -> v3

Quoted 11 lines

[...]

drivers/s390/crypto/zcrypt_ccamisc.c int __init zcrypt_ccamisc_init(void) · line 2046

Quoted 7 lines
drivers/s390/crypto/zcrypt_ccamisc.c +3 -0
@@ -2023,11 +2041,21 @@ int __init zcrypt_ccamisc_init(void)
 		cprb_mempool = NULL;
 		return -ENOMEM;
 	}
+
+	/* Pre-allocate one crypto status card struct used in findcard() */
+	dev_status_mem = kvmalloc(ZCRYPT_DEV_STATUS_EXT_SIZE, GFP_KERNEL);

The alloc of dev_status_mem should be protected by the mutex as well.

No, init() is supposed to be executed exactly once and there is nothing running which may somehow occupy this memory already.

Quoted 10 lines
Quoted 10 lines
drivers/s390/crypto/zcrypt_ccamisc.c +6 -0
+	if (!dev_status_mem) {
+		ZCRYPT_DBF_ERR("%s allocation of dev_status_mem failed\n", 
 __func__);
+		mempool_destroy(cprb_mempool);
+		return -ENOMEM;
+	}
+
 	return 0;
 }
 
Quoted 7 lines

drivers/s390/crypto/zcrypt_ccamisc.c int __init zcrypt_ccamisc_init(void) · line 2059

Quoted 4 lines
drivers/s390/crypto/zcrypt_ccamisc.c +1 -0
 void zcrypt_ccamisc_exit(void)
 {
 	mkvp_cache_free();
+	kvfree(dev_status_mem);

Same here: please lock the mutex before releasing dev_status_mem.

Agreed - the free call should be delayed in cases where the memory is currently occupied by a caller. So I'll lock the mutex before calling free() -> v3

Quoted 2 lines
Quoted 2 lines
drivers/s390/crypto/zcrypt_ccamisc.c +0 -0
 	mempool_destroy(cprb_mempool);

}

author maintainer
#26 lore raw

Re: [PATCH v2 09/20] s390/zcrypt: Introduce pre-allocated device status array for ep11 misc

In reply to Holger Dengler
Quoted 10 lines · Holger Dengler
Quoted 4 lines · Harald Freudenberger

Introduce a pre-allocated device status array memory together with a mutex controlling the occupation to be used by the findcard() function. Limit the device status array to max 128 cards and max 128 domains to reduce the size of this pre-allocated memory to 64 KB.

I have the same concerns as for patch 8/20. Please think about an alternative to the dev_status_mem sharing, because it synchronizes all findcard() calls.

There are not so many findcard() calls in parallel. And the lock is only during running the findcard itself. Ok, the function may need a couple of milliseconds and during this time block other callers but as I wrote, I do not expect this to have impact on any load.

I could think of giving this function a ptr to memory from the caller. So then all ioctl calls could alloc some work mem and pass it down to findcard(). On the other side exactly these callers have time and a short delay because of the mutex does no harm. The real issue is with a pkey request coming via in-kernel pkey API. The pkey_cca handler could hold some memory for this purpose - but with that I am only moving the mem + mutex one level up. I have no other idea.

Btw. the exit() function now locks the mutex before freeing the memory. -> v3

Quoted 6 lines
Quoted 6 lines
---
 drivers/s390/crypto/zcrypt_ep11misc.c | 46 
+++++++++++++++++++++------
 1 file changed, 36 insertions(+), 10 deletions(-)
author maintainer
#29 lore raw

Re: [PATCH v2 10/20] s390/zcrypt/pkey: Rework cca findcard() implementation and callers

In reply to Holger Dengler
Quoted 83 lines · Holger Dengler
Quoted 7 lines · Harald Freudenberger

Rework the memory usage of the cca findcard() implementation:
- findcard does not allocate memory for the list of apqns any more.
- the callers are now responsible to provide an array of apqns to store the matching apqns into.

See my comments below.

Quoted 6 lines
---
 drivers/s390/crypto/pkey_cca.c       | 25 +++++++++++--------------
 drivers/s390/crypto/zcrypt_ccamisc.c | 18 ++++--------------
 drivers/s390/crypto/zcrypt_ccamisc.h | 12 +++++-------
 3 files changed, 20 insertions(+), 35 deletions(-)

[...]

Quoted 4 lines
drivers/s390/crypto/zcrypt_ccamisc.c +0 -0
index 65b4cdb9b478..d3b093dcdf30 100644

[...]

Quoted 5 lines
drivers/s390/crypto/zcrypt_ccamisc.c +0 -0
@@ -2006,17 +1999,14 @@ int cca_findcard2(u32 **apqns, u32 *nr_apqns, 
 u16 cardnr, u16 domain,
 				continue;
 		}
 		/* apqn passed all filtering criterons, add to the array */

drivers/s390/crypto/zcrypt_ccamisc.c int cca_findcard2(u32 **apqns, u32 *nr_apqns, · line 2009

Quoted 10 lines
drivers/s390/crypto/zcrypt_ccamisc.c +2 -3
-		if (_nr_apqns < 256)
-			_apqns[_nr_apqns++] = (((u16)card) << 16) | ((u16)dom);
+		if (_nr_apqns < *nr_apqns)
+			apqns[_nr_apqns++] = (((u16)card) << 16) | ((u16)dom);
 	}
 
 	/* nothing found ? */
 	if (!_nr_apqns) {
-		kfree(_apqns);
 		rc = -ENODEV;

In my opinion, the -ENODEV return value can be completely dropped. For the caller it should be sufficient to check for nr_apqns == 0.

drivers/s390/crypto/zcrypt_ccamisc.c int cca_findcard2(u32 **apqns, u32 *nr_apqns, u16 cardnr, u16 domain, · line 2010

Quoted 4 lines
drivers/s390/crypto/zcrypt_ccamisc.c +0 -2
 	} else {
-		/* no re-allocation, simple return the _apqns array */
-		*apqns = _apqns;
 		*nr_apqns = _nr_apqns;

Please update *nr_apqns unconditionally.

Quoted 21 lines
drivers/s390/crypto/zcrypt_ccamisc.c +0 -0
 		rc = 0;
drivers/s390/crypto/zcrypt_ccamisc.c +0 -0
 	}
drivers/s390/crypto/zcrypt_ccamisc.h +0 -2
index 273edf2bb036..bed647a42eb2 100644
@@ -229,14 +229,12 @@ int cca_findcard(const u8 *key, u16 *pcardnr, 
 u16 *pdomain, int verify);
  *   cur_mkvp or old_mkvp values of the apqn are used.
  * The mktype determines which set of master keys to use:
  *   0 = AES_MK_SET - AES MK set, 1 = APKA MK_SET - APKA MK set
- * The array of apqn entries is allocated with kmalloc and returned 
 in *apqns;
- * the number of apqns stored into the list is returned in *nr_apqns. 

One apqn
- * entry is simple a 32 bit value with 16 bit cardnr and 16 bit domain nr and
- * may be casted to struct pkey_apqn. The return value is either 0 for success
- * or a negative errno value. If no apqn meeting the criteria is found,

Quoted 8 lines

- * -ENODEV is returned.
+ * The caller should set *nr_apqns to the nr of elements available in *apqns.
+ * On return *nr_apqns is then updated with the nr of apqns filled into *apqns.
+ * The return value is either 0 for success or a negative errno value.
+ * If no apqn meeting the criteria is found, -ENODEV is returned.

Why not just return nr_apqns == 0 to indicate, that no matching device has been found? Anyhow, even if you would stay with the -ENODEV return value, *nr_apqns should be updated in any case.

Quoted 6 lines

drivers/s390/crypto/zcrypt_ccamisc.h int cca_findcard(const u8 *key, u16 *pcardnr, u16 *pdomain, int verify); · line 239

Quoted 6 lines

*/

drivers/s390/crypto/zcrypt_ccamisc.h +1 -1
-int cca_findcard2(u32 **apqns, u32 *nr_apqns, u16 cardnr, u16 domain,
+int cca_findcard2(u32 *apqns, u32 *nr_apqns, u16 cardnr, u16 domain,
 		  int minhwtype, int mktype, u64 cur_mkvp, u64 old_mkvp,
 		  int verify);

I changed this to unconditionally always update *nr_apqns.
But I'd like to stay with the -ENODEV in case 0 apqns have been found. There is code using this returncode (which then also would need reworked).

author maintainer
#32 lore raw

Re: [PATCH v2 11/20] s390/zcrypt/pkey: Rework ep11 findcard() implementation and callers

In reply to Holger Dengler
Quoted 81 lines · Holger Dengler
Quoted 5 lines · Harald Freudenberger

Rework the memory usage of the ep11 findcard() implementation:
- findcard does not allocate memory for the list of apqns any more.
- the callers are now responsible to provide an array of apqns to store the matching apqns into.

See my comments below.

Quoted 8 lines
---
 drivers/s390/crypto/pkey_ep11.c       | 19 ++++++++-----------
 drivers/s390/crypto/zcrypt_ep11misc.c | 18 ++++--------------
 drivers/s390/crypto/zcrypt_ep11misc.h | 12 +++++-------
 3 files changed, 17 insertions(+), 32 deletions(-)

[...]

Quoted 4 lines
drivers/s390/crypto/zcrypt_ep11misc.c +0 -0
index 04153b476168..6005ef79c001 100644

[...]

Quoted 8 lines
drivers/s390/crypto/zcrypt_ep11misc.c +1 -2
@@ -1678,17 +1671,14 @@ int ep11_findcard2(u32 **apqns, u32 *nr_apqns, 
 u16 cardnr, u16 domain,
 				continue;
 		}
 		/* apqn passed all filtering criterons, add to the array */
-		if (_nr_apqns < 256)
-			_apqns[_nr_apqns++] = (((u16)card) << 16) | ((u16)dom);
+		if (_nr_apqns < *nr_apqns)

drivers/s390/crypto/zcrypt_ep11misc.c int ep11_findcard2(u32 **apqns, u32 *nr_apqns, · line 1692

Quoted 10 lines
drivers/s390/crypto/zcrypt_ep11misc.c +1 -3
+			apqns[_nr_apqns++] = (((u16)card) << 16) | ((u16)dom);
 	}
 
 	/* nothing found ? */
 	if (!_nr_apqns) {
-		kfree(_apqns);
 		rc = -ENODEV;
 	} else {
-		/* no re-allocation, simple return the _apqns array */
-		*apqns = _apqns;

Please update *apqns unconditionally.

Quoted 24 lines
drivers/s390/crypto/zcrypt_ep11misc.c +0 -0
 		*nr_apqns = _nr_apqns;
 		rc = 0;
drivers/s390/crypto/zcrypt_ep11misc.c +0 -0
 	}
drivers/s390/crypto/zcrypt_ep11misc.h +0 -0
index a4b98eca8431..cbd615547bc2 100644
@@ -136,14 +136,12 @@ int ep11_clr2keyblob(u16 cardnr, u16 domain, u32 
 keybitsize, u32 keygenflags,
  *   key for this domain. When a wkvp is given there will always be a 

re-fetch
* of the domain info for the potential apqn - so this triggers an
request
* reply to each apqn eligible.
- * The array of apqn entries is allocated with kmalloc and returned in *apqns;
- * the number of apqns stored into the list is returned in *nr_apqns. One apqn
- * entry is simple a 32 bit value with 16 bit cardnr and 16 bit domain nr and
- * may be casted to struct pkey_apqn. The return value is either 0 for success
- * or a negative errno value. If no apqn meeting the criteria is found,

Quoted 8 lines

- * -ENODEV is returned.
+ * The caller should set *nr_apqns to the nr of elements available in *apqns.
+ * On return *nr_apqns is then updated with the nr of apqns filled into *apqns.
+ * The return value is either 0 for success or a negative errno value.
+ * If no apqn meeting the criteria is found, -ENODEV is returned.

As mentioned in my comment to patch 10/20: please update nr_apqns in any case. If -ENODEV should be dropped for cca, than also drop it here.

Quoted 7 lines

drivers/s390/crypto/zcrypt_ep11misc.h int ep11_clr2keyblob(u16 cardnr, u16 domain, u32 keybitsize, u32 keygenflags, · line 147

Quoted 7 lines

*/
-int ep11_findcard2(u32 **apqns, u32 *nr_apqns, u16 cardnr, u16 domain,

drivers/s390/crypto/zcrypt_ep11misc.h +1 -0
+int ep11_findcard2(u32 *apqns, u32 *nr_apqns, u16 cardnr, u16 domain,
 		   int minhwtype, int minapi, const u8 *wkvp);
 
 /*

The *nr_apqns is now unconditional updated. But I keep the behavior with the -ENODEV as there is code relaying on that.
-> v3

author maintainer
#37 lore raw

Re: [PATCH v2 13/20] s390/zcrypt: Add small mempool for cca info list entries

In reply to Holger Dengler
Quoted 22 lines · Holger Dengler
Quoted 5 lines · Harald Freudenberger

Add a small memory pool for (pre-)allocating cca info list entries. These entries are rather small and the pool is a simple way to support the xflag ZCRYPT_XFLAG_NOMEMALLOC to avoid mallocs.

With the requested change,

Quoted 11 lines
---
 drivers/s390/crypto/zcrypt_ccamisc.c | 67 
++++++++++++++++++++--------
 drivers/s390/crypto/zcrypt_ccamisc.h |  3 +-
 drivers/s390/crypto/zcrypt_cex4.c    |  4 +-
 3 files changed, 53 insertions(+), 21 deletions(-)
drivers/s390/crypto/zcrypt_ccamisc.c +0 -0
index ff7ba2622484..e4ec922aae0d 100644

[...]

Quoted 9 lines

drivers/s390/crypto/zcrypt_ccamisc.c static int findcard(u64 mkvp, u16 *pcardnr, u16 · line 1838

Quoted 6 lines
drivers/s390/crypto/zcrypt_ccamisc.c +1 -0
@@ -1828,6 +1834,7 @@ static int findcard(u64 mkvp, u16 *pcardnr, u16 
 *pdomain,
 	u16 card, dom;
 	struct cca_info ci;
 	int i, rc, oi = -1;
+	u32 xflg = 0; /* xflags */

I'm confused. Why not just calling it xflags? Anyhow, as mentioned
earlier: findcard() has no consumers, so please remove it completely.

findcard() does not exist any more. :-)

Quoted 29 lines
Quoted 28 lines
drivers/s390/crypto/zcrypt_ccamisc.c +2 -2
 	/* mkvp must not be zero, minhwtype needs to be >= 0 */
 	if (mkvp == 0 || minhwtype < 0)
@@ -1859,8 +1866,8 @@ static int findcard(u64 mkvp, u16 *pcardnr, u16 
 *pdomain,
 				if (!verify)
 					break;
 				/* verify: refresh card info */
-				if (fetch_cca_info(card, dom, &ci) == 0) {
-					cca_info_cache_update(card, dom, &ci);
+				if (fetch_cca_info(card, dom, &ci, xflg) == 0) {
+					cca_info_cache_update(card, dom, &ci, xflg);
 					if (ci.hwtype >= minhwtype &&
 					    ci.cur_aes_mk_state == '2' &&
drivers/s390/crypto/zcrypt_ccamisc.c +2 -2
 					    ci.cur_aes_mkvp == mkvp)
@@ -1882,8 +1889,8 @@ static int findcard(u64 mkvp, u16 *pcardnr, u16 
 *pdomain,
 			card = AP_QID_CARD(device_status[i].qid);
 			dom = AP_QID_QUEUE(device_status[i].qid);
 			/* fresh fetch mkvp from adapter */
-			if (fetch_cca_info(card, dom, &ci) == 0) {
-				cca_info_cache_update(card, dom, &ci);
+			if (fetch_cca_info(card, dom, &ci, xflg) == 0) {
+				cca_info_cache_update(card, dom, &ci, xflg);
 				if (ci.hwtype >= minhwtype &&
 				    ci.cur_aes_mk_state == '2' &&

ci.cur_aes_mkvp == mkvp)

[...]

author maintainer
#41 lore raw

Re: [PATCH v2 14/20] s390/zcrypt: Locate ep11_domain_query_info onto the stack instead of kmalloc

In reply to Holger Dengler
Quoted 23 lines · Holger Dengler
Quoted 4 lines · Harald Freudenberger

Locate the relative small struct ep11_domain_query_info variable onto the stack instead of kmalloc()/kfree().

One minor comment.

Quoted 14 lines
---
 drivers/s390/crypto/zcrypt_ep11misc.c | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)
drivers/s390/crypto/zcrypt_ep11misc.c +0 -1
index 6005ef79c001..7fb55be3e943 100644
@@ -790,36 +790,31 @@ int ep11_get_domain_info(u16 card, u16 domain, 
 struct ep11_domain_info *info)
 		u8  new_WK_VP[32];
 		u32 dom_flags;
 		u64 op_mode;
-	} __packed * p_dom_info;
Quoted 8 lines

drivers/s390/crypto/zcrypt_ep11misc.c int ep11_get_domain_info(u16 card, u16 domain, struct ep11_domain_info *info) · line 793

Quoted 5 lines
drivers/s390/crypto/zcrypt_ep11misc.c +1 -4
-
-	p_dom_info = kmalloc(sizeof(*p_dom_info), GFP_KERNEL);
-	if (!p_dom_info)
-		return -ENOMEM;
+	} __packed dom_query_info;

Why is dom_query_info a typed struct? The struct type is not used and an untyped struct can be used as well.

You are right - this struct and the relevant struct for card info are only function local and would not need a naming. However, I'll keep these names - I think the idea was to easily copy this code to file scope. The compiler removes it anyway.