From: Harald Freudenberger <freude@linux.ibm.com>
To: richard.henderson@linaro.org, iii@linux.ibm.com,
david@kernel.org, thuth@redhat.com, berrange@redhat.com
Cc: qemu-s390x@nongnu.org, qemu-devel@nongnu.org,
linux-s390@vger.kernel.org, dengler@linux.ibm.com,
borntraeger@linux.ibm.com, fcallies@linux.ibm.com,
cohuck@redhat.com
Subject: [PATCH v14 09/19] target/s390x: Support AES CTR for cpacf kmctr instruction
Date: Thu, 6 Aug 2026 17:12:51 +0200 [thread overview]
Message-ID: <20260806151302.26846-10-freude@linux.ibm.com> (raw)
In-Reply-To: <20260806151302.26846-1-freude@linux.ibm.com>
Support the subfunctions CPACF_KMCTR_AES_128, CPACF_KMCTR_AES_192
and CPACF_KMCTR_AES_256 for the cpacf kmctr instruction.
Reviewed-by: Finn Callies <fcallies@linux.ibm.com>
Reviewed-by: Ilya Leoshkevich <iii@linux.ibm.com>
Signed-off-by: Harald Freudenberger <freude@linux.ibm.com>
---
target/s390x/gen-features.c | 3 ++
target/s390x/tcg/cpacf.h | 5 +++
target/s390x/tcg/cpacf_aes.c | 70 ++++++++++++++++++++++++++++++++
target/s390x/tcg/crypto_helper.c | 24 +++++++++++
4 files changed, 102 insertions(+)
diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c
index 2dacc65995..3281037958 100644
--- a/target/s390x/gen-features.c
+++ b/target/s390x/gen-features.c
@@ -928,6 +928,9 @@ static uint16_t qemu_MAX[] = {
S390_FEAT_KMC_AES_128,
S390_FEAT_KMC_AES_192,
S390_FEAT_KMC_AES_256,
+ S390_FEAT_KMCTR_AES_128,
+ S390_FEAT_KMCTR_AES_192,
+ S390_FEAT_KMCTR_AES_256,
};
/****** END FEATURE DEFS ******/
diff --git a/target/s390x/tcg/cpacf.h b/target/s390x/tcg/cpacf.h
index 1e3e585239..fe08cc182e 100644
--- a/target/s390x/tcg/cpacf.h
+++ b/target/s390x/tcg/cpacf.h
@@ -242,5 +242,10 @@ int cpacf_aes_cbc(CPUS390XState *env, const int mmu_idx, uintptr_t ra,
uint64_t param_addr, uint64_t *dst_ptr_reg,
uint64_t *src_ptr_reg, uint64_t *src_len_reg,
uint32_t type, uint8_t fc, uint8_t mod);
+int cpacf_aes_ctr(CPUS390XState *env, const int mmu_idx, uintptr_t ra,
+ uint64_t param_addr, uint64_t *dst_ptr_reg,
+ uint64_t *src_ptr_reg, uint64_t *src_len_reg,
+ uint64_t *ctr_ptr_reg, uint32_t type,
+ uint8_t fc, uint8_t mod);
#endif /* S390X_CPACF_H */
diff --git a/target/s390x/tcg/cpacf_aes.c b/target/s390x/tcg/cpacf_aes.c
index fa30fad1d4..a94c5e74e1 100644
--- a/target/s390x/tcg/cpacf_aes.c
+++ b/target/s390x/tcg/cpacf_aes.c
@@ -184,3 +184,73 @@ int cpacf_aes_cbc(CPUS390XState *env, const int mmu_idx, uintptr_t ra,
return !len ? 0 : 3;
}
+
+int cpacf_aes_ctr(CPUS390XState *env, const int mmu_idx, uintptr_t ra,
+ uint64_t param_addr, uint64_t *dst_ptr_reg,
+ uint64_t *src_ptr_reg, uint64_t *src_len_reg,
+ uint64_t *ctr_ptr_reg, uint32_t type,
+ uint8_t fc, uint8_t mod)
+{
+ enum { MAX_BLOCKS_PER_RUN = 8192 / AES_BLOCK_SIZE };
+ uint8_t in[AES_BLOCK_SIZE], out[AES_BLOCK_SIZE];
+ uint64_t len = *src_len_reg, done = 0;
+ uint8_t ctr[AES_BLOCK_SIZE], key[32];
+ int i, keysize, addr_reg_size = 64;
+ AES_KEY exkey;
+
+ g_assert(type == S390_FEAT_TYPE_KMCTR);
+
+ switch (fc) {
+ case CPACF_KMCTR_AES_128:
+ keysize = 16;
+ break;
+ case CPACF_KMCTR_AES_192:
+ keysize = 24;
+ break;
+ case CPACF_KMCTR_AES_256:
+ keysize = 32;
+ break;
+ default:
+ g_assert_not_reached();
+ }
+
+ if (!(env->psw.mask & PSW_MASK_64)) {
+ len = (uint32_t)len;
+ addr_reg_size = (env->psw.mask & PSW_MASK_32) ? 32 : 24;
+ }
+
+ /* length has to be properly aligned. */
+ if (!QEMU_IS_ALIGNED(len, AES_BLOCK_SIZE)) {
+ tcg_s390_program_interrupt(env, PGM_SPECIFICATION, ra);
+ }
+
+ /* fetch key from param block */
+ read_guest_wrap_u8(env, mmu_idx, ra, param_addr, key, keysize);
+
+ /* expand key */
+ AES_set_encrypt_key(key, keysize * 8, &exkey);
+
+ /* process up to MAX_BLOCKS_PER_RUN aes blocks */
+ for (i = 0; i < MAX_BLOCKS_PER_RUN && len >= AES_BLOCK_SIZE; i++) {
+ /* read in nonce/ctr => ctr */
+ aes_read_block(env, mmu_idx, ra, *ctr_ptr_reg + done, ctr);
+ /* read in one block of input data => in */
+ aes_read_block(env, mmu_idx, ra, *src_ptr_reg + done, in);
+ /* encrypt ctr and xor with in => out */
+ AES_ctr_encrypt(in, out, ctr, &exkey);
+ /* write out the processed block */
+ aes_write_block(env, mmu_idx, ra, *dst_ptr_reg + done, out);
+ len -= AES_BLOCK_SIZE;
+ done += AES_BLOCK_SIZE;
+ }
+
+ *src_ptr_reg = deposit64(*src_ptr_reg, 0, addr_reg_size,
+ *src_ptr_reg + done);
+ *dst_ptr_reg = deposit64(*dst_ptr_reg, 0, addr_reg_size,
+ *dst_ptr_reg + done);
+ *ctr_ptr_reg = deposit64(*ctr_ptr_reg, 0, addr_reg_size,
+ *ctr_ptr_reg + done);
+ *src_len_reg -= done;
+
+ return !len ? 0 : 3;
+}
diff --git a/target/s390x/tcg/crypto_helper.c b/target/s390x/tcg/crypto_helper.c
index 695e3fef7e..7dd6ae4ed4 100644
--- a/target/s390x/tcg/crypto_helper.c
+++ b/target/s390x/tcg/crypto_helper.c
@@ -132,6 +132,27 @@ static int cpacf_kmc(CPUS390XState *env, const int mmu_idx, uintptr_t ra,
return rc;
}
+static int cpacf_kmctr(CPUS390XState *env, const int mmu_idx, uintptr_t ra,
+ uint32_t r1, uint32_t r2, uint32_t r3,
+ uint8_t fc, uint8_t mod)
+{
+ int rc = 0;
+
+ switch (fc) {
+ case CPACF_KMCTR_AES_128:
+ case CPACF_KMCTR_AES_192:
+ case CPACF_KMCTR_AES_256:
+ rc = cpacf_aes_ctr(env, mmu_idx, ra, env->regs[1],
+ &env->regs[r1], &env->regs[r2], &env->regs[r2 + 1],
+ &env->regs[r3], S390_FEAT_TYPE_KMCTR, fc, mod);
+ break;
+ default:
+ tcg_s390_program_interrupt(env, PGM_SPECIFICATION, ra);
+ }
+
+ return rc;
+}
+
static int cpacf_ppno(CPUS390XState *env, const int mmu_idx, uintptr_t ra,
uint32_t r1, uint32_t r2, uint32_t r3, uint8_t fc)
{
@@ -202,6 +223,9 @@ uint32_t HELPER(msa)(CPUS390XState *env, uint32_t r1, uint32_t r2, uint32_t r3,
case S390_FEAT_TYPE_KMC:
rc = cpacf_kmc(env, mmu_idx, ra, r1, r2, r3, fc, mod);
break;
+ case S390_FEAT_TYPE_KMCTR:
+ rc = cpacf_kmctr(env, mmu_idx, ra, r1, r2, r3, fc, mod);
+ break;
case S390_FEAT_TYPE_PPNO:
rc = cpacf_ppno(env, mmu_idx, ra, r1, r2, r3, fc);
break;
--
2.43.0
next prev parent reply other threads:[~2026-08-06 15:13 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-08-06 15:12 [PATCH v14 00/19] target/s390x: Extend qemu CPACF support Harald Freudenberger
2026-08-06 15:12 ` [PATCH v14 01/19] target/s390x: Fix missing privileged flag at PCKMO instruction Harald Freudenberger
2026-08-06 18:48 ` Ilya Leoshkevich
2026-08-06 15:12 ` [PATCH v14 02/19] target/s390x: Rework s390 cpacf implementations Harald Freudenberger
2026-08-06 15:12 ` [PATCH v14 03/19] target/s390x: Move cpacf sha512 code into a new file Harald Freudenberger
2026-08-06 15:12 ` [PATCH v14 04/19] target/s390x: Support cpacf sha256 Harald Freudenberger
2026-08-06 15:12 ` [PATCH v14 05/19] target/s390x: Add helper functions for copy memory to and from guest Harald Freudenberger
2026-08-06 15:12 ` [PATCH v14 06/19] crypto: Add aes-helpers file to support some AES modes Harald Freudenberger
2026-08-06 15:12 ` [PATCH v14 07/19] target/s390x: Support AES ECB for cpacf km instruction Harald Freudenberger
2026-08-06 15:12 ` [PATCH v14 08/19] target/s390x: Support AES CBC for cpacf kmc instruction Harald Freudenberger
2026-08-06 15:12 ` Harald Freudenberger [this message]
2026-08-06 15:12 ` [PATCH v14 10/19] target/s390x: Minimal AES XTS support for cpacf pcc instruction Harald Freudenberger
2026-08-06 15:12 ` [PATCH v14 11/19] target/s390x: Support AES XTS for cpacf km instruction Harald Freudenberger
2026-08-06 15:12 ` [PATCH v14 12/19] target/s390x: Base support for cpacf protected keys and pckmo Harald Freudenberger
2026-08-06 15:12 ` [PATCH v14 13/19] target/s390x: Support protected key AES ECB for cpacf km instruction Harald Freudenberger
2026-08-06 15:12 ` [PATCH v14 14/19] target/s390x: Support protected key AES CBC for cpacf kmc instruction Harald Freudenberger
2026-08-06 15:12 ` [PATCH v14 15/19] target/s390x: Support protected key AES CTR for cpacf kmctr instruction Harald Freudenberger
2026-08-06 15:12 ` [PATCH v14 16/19] target/s390x: Minimal protected key AES XTS support for cpacf pcc instruction Harald Freudenberger
2026-08-06 15:12 ` [PATCH v14 17/19] target/s390x: Support protected key AES XTS for cpacf km instruction Harald Freudenberger
2026-08-06 15:13 ` [PATCH v14 18/19] docs/s390: Document CPACF instructions support Harald Freudenberger
2026-08-06 15:13 ` [PATCH v14 19/19] tests/tcg/s390x: Add tests for CPACF instructions Harald Freudenberger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260806151302.26846-10-freude@linux.ibm.com \
--to=freude@linux.ibm.com \
--cc=berrange@redhat.com \
--cc=borntraeger@linux.ibm.com \
--cc=cohuck@redhat.com \
--cc=david@kernel.org \
--cc=dengler@linux.ibm.com \
--cc=fcallies@linux.ibm.com \
--cc=iii@linux.ibm.com \
--cc=linux-s390@vger.kernel.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.