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 v13 15/18] target/s390x: Minimal protected key AES XTS support for cpacf pcc instruction
Date: Mon, 3 Aug 2026 18:12:32 +0200 [thread overview]
Message-ID: <20260803161235.228704-16-freude@linux.ibm.com> (raw)
In-Reply-To: <20260803161235.228704-1-freude@linux.ibm.com>
Support CPACF pcc subfunctions PCC-Compute-XTS-Parameter-Encrypted-AES-128
and PCC-Compute-XTS-Parameter-Encrypted-AES-128 but only for the special
case block sequential number is 0. However, this covers the s390 PAES XTS
implementation in the Linux kernel.
Signed-off-by: Harald Freudenberger <freude@linux.ibm.com>
Tested-by: Holger Dengler <dengler@linux.ibm.com>
---
target/s390x/gen-features.c | 2 +
target/s390x/tcg/cpacf.h | 2 +
target/s390x/tcg/cpacf_aes.c | 65 ++++++++++++++++++++++++++++++++
target/s390x/tcg/crypto_helper.c | 4 ++
4 files changed, 73 insertions(+)
diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c
index 9898f880a6..6b206cee83 100644
--- a/target/s390x/gen-features.c
+++ b/target/s390x/gen-features.c
@@ -944,6 +944,8 @@ static uint16_t qemu_MAX[] = {
S390_FEAT_KMCTR_EAES_256,
S390_FEAT_PCC_XTS_AES_128,
S390_FEAT_PCC_XTS_AES_256,
+ S390_FEAT_PCC_XTS_EAES_128,
+ S390_FEAT_PCC_XTS_EAES_256,
S390_FEAT_PCKMO_AES_128,
S390_FEAT_PCKMO_AES_192,
S390_FEAT_PCKMO_AES_256,
diff --git a/target/s390x/tcg/cpacf.h b/target/s390x/tcg/cpacf.h
index 71a2c6b914..1786a21f83 100644
--- a/target/s390x/tcg/cpacf.h
+++ b/target/s390x/tcg/cpacf.h
@@ -295,5 +295,7 @@ int cpacf_paes_ctr(CPUS390XState *env, const int mmu_idx, uintptr_t ra,
uint64_t *src_ptr_reg, uint64_t *src_len_reg,
uint64_t *ctr_ptr_reg, uint32_t type,
uint8_t fc, uint8_t mod);
+int cpacf_paes_pcc(CPUS390XState *env, const int mmu_idx, uintptr_t ra,
+ uint64_t param_addr, uint8_t fc);
#endif /* S390X_CPACF_H */
diff --git a/target/s390x/tcg/cpacf_aes.c b/target/s390x/tcg/cpacf_aes.c
index 18d8e2299b..d1f3b44a15 100644
--- a/target/s390x/tcg/cpacf_aes.c
+++ b/target/s390x/tcg/cpacf_aes.c
@@ -714,3 +714,68 @@ int cpacf_paes_ctr(CPUS390XState *env, const int mmu_idx, uintptr_t ra,
return !len ? 0 : 3;
}
+
+int cpacf_paes_pcc(CPUS390XState *env, const int mmu_idx, uintptr_t ra,
+ uint64_t param_addr, uint8_t fc)
+{
+ uint8_t key[32], wkvp[32], tweak[AES_BLOCK_SIZE], buf[AES_BLOCK_SIZE];
+ int keysize, i;
+ AES_KEY exkey;
+
+ switch (fc) {
+ case CPACF_PCC_XTS_PAES_128:
+ keysize = 16;
+ break;
+ case CPACF_PCC_XTS_PAES_256:
+ keysize = 32;
+ break;
+ default:
+ g_assert_not_reached();
+ }
+
+ /* fetch and check wkvp from param block */
+ read_guest_wrap_u8(env, mmu_idx, ra,
+ param_addr + keysize, wkvp, sizeof(wkvp));
+ if (memcmp(wkvp, protkey_wkvp, sizeof(wkvp))) {
+ /* wkvp mismatch -> return with cc 1 */
+ return 1;
+ }
+
+ /* fetch block sequence nr from param block into buf */
+ read_guest_wrap_u8(env, mmu_idx, ra,
+ param_addr + keysize + sizeof(wkvp) + AES_BLOCK_SIZE,
+ buf, AES_BLOCK_SIZE);
+
+ /* is the block sequence nr 0 ? */
+ for (i = 0; i < AES_BLOCK_SIZE && !buf[i]; i++) {
+ ;
+ }
+ if (i < AES_BLOCK_SIZE) {
+ /* no, sorry handling of non zero block sequence is not implemented */
+ tcg_s390_program_interrupt(env, PGM_SPECIFICATION, ra);
+ return 1;
+ }
+
+ /* fetch protected key from param block */
+ read_guest_wrap_u8(env, mmu_idx, ra, param_addr, key, keysize);
+ /* decrypt the protected key */
+ decrypt_protkey(key, keysize);
+
+ /* fetch tweak from param block into tweak */
+ read_guest_wrap_u8(env, mmu_idx, ra,
+ param_addr + keysize + sizeof(wkvp),
+ tweak, AES_BLOCK_SIZE);
+
+ /* expand key */
+ AES_set_encrypt_key(key, keysize * 8, &exkey);
+
+ /* encrypt tweak */
+ AES_encrypt(tweak, buf, &exkey);
+
+ /* store encrypted tweak into xts parameter field of the param block */
+ write_guest_wrap_u8(env, mmu_idx, ra,
+ param_addr + keysize + sizeof(wkvp) + 3 * AES_BLOCK_SIZE,
+ buf, AES_BLOCK_SIZE);
+
+ return 0;
+}
diff --git a/target/s390x/tcg/crypto_helper.c b/target/s390x/tcg/crypto_helper.c
index 155c06ee4c..aa27889d97 100644
--- a/target/s390x/tcg/crypto_helper.c
+++ b/target/s390x/tcg/crypto_helper.c
@@ -207,6 +207,10 @@ static int cpacf_pcc(CPUS390XState *env, const int mmu_idx, uintptr_t ra,
case CPACF_PCC_XTS_AES_256:
rc = cpacf_aes_pcc(env, mmu_idx, ra, env->regs[1], fc);
break;
+ case CPACF_PCC_XTS_PAES_128:
+ case CPACF_PCC_XTS_PAES_256:
+ rc = cpacf_paes_pcc(env, mmu_idx, ra, env->regs[1], fc);
+ break;
default:
tcg_s390_program_interrupt(env, PGM_SPECIFICATION, ra);
}
--
2.43.0
next prev parent reply other threads:[~2026-08-03 16:12 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-08-03 16:12 [PATCH v13 00/18] target/s390x: Extend qemu CPACF support Harald Freudenberger
2026-08-03 16:12 ` [PATCH v13 01/18] target/s390x: Rework s390 cpacf implementations Harald Freudenberger
2026-08-03 16:12 ` [PATCH v13 02/18] target/s390x: Move cpacf sha512 code into a new file Harald Freudenberger
2026-08-03 16:12 ` [PATCH v13 03/18] target/s390x: Support cpacf sha256 Harald Freudenberger
2026-08-03 16:12 ` [PATCH v13 04/18] target/s390x: Add helper functions for copy memory to and from guest Harald Freudenberger
2026-08-03 16:12 ` [PATCH v13 05/18] crypto: Add aes-helpers file to support some AES modes Harald Freudenberger
2026-08-03 16:12 ` [PATCH v13 06/18] target/s390x: Support AES ECB for cpacf km instruction Harald Freudenberger
2026-08-03 16:12 ` [PATCH v13 07/18] target/s390x: Support AES CBC for cpacf kmc instruction Harald Freudenberger
2026-08-03 16:12 ` [PATCH v13 08/18] target/s390x: Support AES CTR for cpacf kmctr instruction Harald Freudenberger
2026-08-03 16:12 ` [PATCH v13 09/18] target/s390x: Minimal AES XTS support for cpacf pcc instruction Harald Freudenberger
2026-08-03 16:12 ` [PATCH v13 10/18] target/s390x: Support AES XTS for cpacf km instruction Harald Freudenberger
2026-08-03 16:12 ` [PATCH v13 11/18] target/s390x: Base support for cpacf protected keys and pckmo Harald Freudenberger
2026-08-03 16:12 ` [PATCH v13 12/18] target/s390x: Support protected key AES ECB for cpacf km instruction Harald Freudenberger
2026-08-03 16:12 ` [PATCH v13 13/18] target/s390x: Support protected key AES CBC for cpacf kmc instruction Harald Freudenberger
2026-08-03 16:12 ` [PATCH v13 14/18] target/s390x: Support protected key AES CTR for cpacf kmctr instruction Harald Freudenberger
2026-08-03 16:12 ` Harald Freudenberger [this message]
2026-08-03 16:12 ` [PATCH v13 16/18] target/s390x: Support protected key AES XTS for cpacf km instruction Harald Freudenberger
2026-08-03 16:12 ` [PATCH v13 17/18] docs/s390: Document CPACF instructions support Harald Freudenberger
2026-08-03 16:12 ` [PATCH v13 18/18] 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=20260803161235.228704-16-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox