target/s390x: Extend qemu CPACF support
Subsystems (2)
v6 cover target/s390x: Extend qemu CPACF support
This patch series extends the s390 qemu CPACF support to be able to run a subset of the CPACF instruction cross platform. There have been requests on the kernel crypto mailing list about a way to test s390 specific crypto implementations. For example a way to test s390 CPACF exploitation code like the s390_aes.ko kernel module.
So here now is a set of patches verified on x86 and s390 which over (slow but working) support for a subset of the subfunctions of some of the CPACF instructions.
Test: As this series is more or less complete, a full blown linux can be run and the 'usual' in-kernel crpyto modules will be automatically loaded which run a bunch of test cases. So there is now support for these kernel modules:
* sha256_s390x (autoloaded, sha256)
* sha512_s390x (autoloaded, sha512)
* aes_s390x (autoloaded, clear key aes ecb, cbc, ctr, xts)
* pkey_pckmo (autoloaded, derive AES protected key from clear key)
* paes_s390x (not autoloaded, protected key aes ecb, cbc, ctr, xts) All these modules run selftests if configured by the kernel (which is enabled by default). Failures are reported via syslog. Additionally the aes testcases from libica can be run either inside such an qemu environment or with a static build executed with the qemu tcg application qemu-s390x --cpu max <static-build-libica-test>.
Changelog:
v1: Initial version with
- Related code restructured
- Support KIMD SHA512 and thus SHA256
- Support KMC AES-128, AES-192 and AES-256 and thus have basic AES support (ECB mode) enabled.
- Support PCC Compute-XTS-Parameter-AES-128 and Compute-XTS-Parameter-AES-256 but only for block sequence number
0. This is a requirement for the next step:
- Support KM XTS-AES-128 and KM XTS-AES-256. Together with the minimal PCC support this enables AES-XTS CPACF acceleration.
v2: - Basic PCKMO support to be able to 'derive' an AES protected key
from clear key. See header details.
- Support protected key AES-ECB.
- Support protected key AES-CBC.
- Minimal protected key AES-XTS support for CPACF PCC.
- Support protected key AES-XTS.
- Support AES-CTR.
- Support protected key AES-CTR.
v3: - Reordered patches as suggested by Finn.
- One small bug fix in CPACF_aes.c related to address translation.
v4: - Rename of the parameters based on feedback from Janosch to
make clear these are registers or ptrs to registers. Added Tested by from Holger. Fixed typo "face" -> "fake".
v5: - Add documentation file docs/system/s390x/cpacf.rst which
describes the state of the CPACF instructions and which functions are covered when this series is applied. First version sent to public mailing list qemu-s390x.
v6: - Rebase/rework to build on current qemu head.
- Add docs/system/s390x/cpacf.rst to target-s390x.rst
- New file crypto/aes-helpers.c with some simple functions to support AES modes CBC, CTR and XTS.
- Slight rewrite of the s390x CPACF implementations to use these generic AES mode implementations.
Harald Freudenberger (17):
target/s390x: Rework s390 cpacf implementations target/s390x: Move cpacf sha512 code into a new file target/s390x: Support cpacf sha256
target/s390x: Support AES ECB for cpacf km instruction target/s390x: Support AES CBC for cpacf kmc instruction target/s390x: Support AES CTR for cpacf kmctr instruction target/s390x: Minimal AES XTS support for cpacf pcc instruction target/s390x: Support AES XTS for cpacf km instruction target/s390x: Support pckmo encrypt AES subfunctions target/s390x: Support protected key AES ECB for cpacf km instruction target/s390x: Support protected key AES CBC for cpacf kmc instruction target/s390x: Support protected key AES CTR for cpacf kmctr
instruction
target/s390x: Minimal protected key AES XTS support for cpacf pcc
instruction
target/s390x: Support protected key AES XTS for cpacf km instruction docs/s390: Document CPACF instructions support
crypto: Add aes-helpers file to support some AES modes target/s390x: Use generic AES helper functions
crypto/aes-helpers.c | 101 ++++ crypto/meson.build | 1 + docs/system/s390x/cpacf.rst | 109 ++++ docs/system/target-s390x.rst | 1 + include/crypto/aes.h | 14 + target/s390x/gen-features.c | 31 + target/s390x/tcg/cpacf.h | 63 ++ target/s390x/tcg/cpacf_aes.c | 955 +++++++++++++++++++++++++++++++ target/s390x/tcg/cpacf_sha256.c | 232 ++++++++ target/s390x/tcg/cpacf_sha512.c | 245 ++++++++ target/s390x/tcg/crypto_helper.c | 423 +++++++------- target/s390x/tcg/insn-data.h.inc | 1 + target/s390x/tcg/meson.build | 3 + target/s390x/tcg/translate.c | 2 + 14 files changed, 1965 insertions(+), 216 deletions(-) create mode 100644 crypto/aes-helpers.c create mode 100644 docs/system/s390x/cpacf.rst create mode 100644 target/s390x/tcg/cpacf.h create mode 100644 target/s390x/tcg/cpacf_aes.c create mode 100644 target/s390x/tcg/cpacf_sha256.c create mode 100644 target/s390x/tcg/cpacf_sha512.c
base-commit: e89049b3ba5f1f0468bc0d294173345597514a1b --
2.43.0
PATCH v6 1/17 target/s390x: Rework s390 cpacf implementations
Fix missing parts for MSA 9 kdsa and rework the cpacf handling code so that further extensions can be made in a clean and structured way.
--- target/s390x/tcg/crypto_helper.c | 84 +++++++++++++++++++++++++++----- target/s390x/tcg/insn-data.h.inc | 1 + target/s390x/tcg/translate.c | 2 + 3 files changed, 74 insertions(+), 13 deletions(-)
target/s390x/tcg/crypto_helper.c +71 -13
@@ -272,6 +272,57 @@ static void fill_buf_random(CPUS390XState *env, const int mmu_idx, uintptr_t ra, } } +static int cpacf_kimd (CPUS390XState *env,const int mmu_idx,const uintptr_t ra, +uint32_t r1,uint32_t r2,uint32_t r3,uint8_t fc) +{ +int rc =0 ; + +switch (fc) { +case 0x03 :/* CPACF_KIMD_SHA_512 */ + rc =cpacf_sha512 (env, mmu_idx, ra, env->regs[1 ], &env->regs[r2], + &env->regs[r2 +1 ],S390_FEAT_TYPE_KIMD ); +break ; +default : +g_assert_not_reached (); + } + +return rc; +} + +static int cpacf_klmd (CPUS390XState *env,const int mmu_idx,const uintptr_t ra, +uint32_t r1,uint32_t r2,uint32_t r3,uint8_t fc) +{ +int rc =0 ; + +switch (fc) { +case 0x03 :/* CPACF_KLMD_SHA_512 */ + rc =cpacf_sha512 (env, mmu_idx, ra, env->regs[1 ], &env->regs[r2], + &env->regs[r2 +1 ],S390_FEAT_TYPE_KLMD ); +break ; +default : +g_assert_not_reached (); + } + +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) +{ +int rc =0 ; + +switch (fc) { +case 0x72 :/* CPACF_PRNO_TRNG */ +fill_buf_random (env, mmu_idx, ra, &env->regs[r1], &env->regs[r1 +1 ]); +fill_buf_random (env, mmu_idx, ra, &env->regs[r2], &env->regs[r2 +1 ]); +break ; +default : +g_assert_not_reached (); + } + +return rc; +} +uint32_t HELPER (msa )(CPUS390XState *env,uint32_t r1,uint32_t r2,uint32_t r3,uint32_t type) {
@@ -282,13 +333,15 @@ uint32_t HELPER(msa)(CPUS390XState *env, uint32_t r1, uint32_t r2, uint32_t r3,uint8_t subfunc[16 ] = {0 };uint64_t param_addr;MemOpIdx oi; +int rc =0 ;switch (type) { -case S390_FEAT_TYPE_KMAC : +case S390_FEAT_TYPE_KDSA :case S390_FEAT_TYPE_KIMD :case S390_FEAT_TYPE_KLMD : -case S390_FEAT_TYPE_PCKMO : +case S390_FEAT_TYPE_KMAC :case S390_FEAT_TYPE_PCC : +case S390_FEAT_TYPE_PCKMO :if (mod) {tcg_s390_program_interrupt (env,PGM_SPECIFICATION , ra); }
@@ -300,25 +353,30 @@ uint32_t HELPER(msa)(CPUS390XState *env, uint32_t r1, uint32_t r2, uint32_t r3,tcg_s390_program_interrupt (env,PGM_SPECIFICATION , ra); } -switch (fc) { -case 0 :/* query subfunction */ +/* handle query subfunction */ +if (fc ==0 ) { oi =make_memop_idx (MO_8 , mmu_idx); -for (int i =0 ; i <16 ; i++) { +for (int i =0 ; i <sizeof (subfunc); i++) { param_addr =wrap_address (env, env->regs[1 ] + i);cpu_stb_mmu (env, param_addr, subfunc[i], oi, ra); } + goto out; + } + +switch (type) { +case S390_FEAT_TYPE_KIMD : + rc =cpacf_kimd (env, mmu_idx, ra, r1, r2, r3, fc);break ; -case 3 :/* CPACF_*_SHA_512 */ -return cpacf_sha512 (env, mmu_idx, ra, env->regs[1 ], &env->regs[r2], - &env->regs[r2 +1 ], type); -case 114 :/* CPACF_PRNO_TRNG */ -fill_buf_random (env, mmu_idx, ra, &env->regs[r1], &env->regs[r1 +1 ]); -fill_buf_random (env, mmu_idx, ra, &env->regs[r2], &env->regs[r2 +1 ]); +case S390_FEAT_TYPE_KLMD : + rc =cpacf_klmd (env, mmu_idx, ra, r1, r2, r3, fc); +break ; +case S390_FEAT_TYPE_PPNO : + rc =cpacf_ppno (env, mmu_idx, ra, r1, r2, r3, fc);break ;default : -/* we don't implement any other subfunction yet */ g_assert_not_reached (); } -return 0 ; +out: +return rc; }
target/s390x/tcg/insn-data.h.inc +1 -0
@@ -1015,6 +1015,7 @@ D(0xb92e, KM, RRE, MSA, 0, 0, 0, 0, msa, 0, S390_FEAT_TYPE_KM) D(0xb92f, KMC, RRE, MSA, 0, 0, 0, 0, msa, 0, S390_FEAT_TYPE_KMC) D(0xb929, KMA, RRF_b, MSA8, 0, 0, 0, 0, msa, 0, S390_FEAT_TYPE_KMA) + D(0xb93a, KDSA, RRE, MSA9, 0, 0, 0, 0, msa, 0, S390_FEAT_TYPE_KDSA) E(0xb93c, PPNO, RRE, MSA5, 0, 0, 0, 0, msa, 0, S390_FEAT_TYPE_PPNO, IF_IO) D(0xb93e, KIMD, RRE, MSA, 0, 0, 0, 0, msa, 0, S390_FEAT_TYPE_KIMD) D(0xb93f, KLMD, RRE, MSA, 0, 0, 0, 0, msa, 0, S390_FEAT_TYPE_KLMD)
target/s390x/tcg/translate.c +2 -0
@@ -2592,6 +2592,7 @@ static DisasJumpType op_msa(DisasContext *s, DisasOps *o)/* FALL THROUGH */ case S390_FEAT_TYPE_PCKMO :case S390_FEAT_TYPE_PCC : +case S390_FEAT_TYPE_KDSA :break ;default :g_assert_not_reached ();
@@ -6046,6 +6047,7 @@ enum DisasInsnEnum {#define FAC_MSA4 S390_FEAT_MSA_EXT_4/* msa-extension-4 facility */ #define FAC_MSA5 S390_FEAT_MSA_EXT_5/* msa-extension-5 facility */ #define FAC_MSA8 S390_FEAT_MSA_EXT_8/* msa-extension-8 facility */ +#define FAC_MSA9 S390_FEAT_MSA_EXT_9/* msa-extension-9 facility */ #define FAC_ECT S390_FEAT_EXTRACT_CPU_TIME#define FAC_PCI S390_FEAT_ZPCI/* z/PCI facility */ #define FAC_AIS S390_FEAT_ADAPTER_INT_SUPPRESSION
Signature · 1 line
2.43.0
PATCH v6 2/17 target/s390x: Move cpacf sha512 code into a new file
In reply to Harald FreudenbergerMove the cpacf sha512 implementation into a new file cpacf_sha512.c. Add this new file to the build and add a new header file cpacf.h containing the prototypes for the s390 cpacf stuff.
--- target/s390x/tcg/cpacf.h | 16 ++ target/s390x/tcg/cpacf_sha512.c | 245 +++++++++++++++++++++++++++++++ target/s390x/tcg/crypto_helper.c | 227 +--------------------------- target/s390x/tcg/meson.build | 1 + 4 files changed, 263 insertions(+), 226 deletions(-) create mode 100644 target/s390x/tcg/cpacf.h create mode 100644 target/s390x/tcg/cpacf_sha512.c
target/s390x/tcg/cpacf.h new file +16 -0
@@ -0,0 +1,16 @@ +/* +* s390x cpacf +* +* This work is licensed under the terms of the GNU GPL, version 2 or later. +* See the COPYING file in the top-level directory. +*/ + +#ifndef S390X_CPACF_H +#define S390X_CPACF_H + +/* from crypto_sha512.c */ +int cpacf_sha512 (CPUS390XState *env,const int mmu_idx,uintptr_t ra, +uint64_t param_addr,uint64_t *message_reg,uint64_t *len_reg, +uint32_t type); + +#endif
target/s390x/tcg/cpacf_sha512.c new file +245 -0
245 lines not on this page · raw message
target/s390x/tcg/crypto_helper.c +1 -226
233 lines not on this page · raw message
target/s390x/tcg/meson.build +1 -0
@@ -5,6 +5,7 @@ s390x_ss.add(when: 'CONFIG_TCG', if_true: files( )) s390x_common_ss.add(when: 'CONFIG_TCG', if_true: files( 'cc_helper.c', + 'cpacf_sha512.c', 'crypto_helper.c', 'excp_helper.c', 'fpu_helper.c',
Signature · 1 line
2.43.0
PATCH v6 3/17 target/s390x: Support cpacf sha256
In reply to Harald FreudenbergerAdd a new file cpacf_sha256.c which implements sha256. Add support for the sha256 subfuction for CPACF kimd and klmd.
--- target/s390x/gen-features.c | 2 + target/s390x/tcg/cpacf.h | 5 + target/s390x/tcg/cpacf_sha256.c | 232 +++++++++++++++++++++++++++++++ target/s390x/tcg/crypto_helper.c | 8 ++ target/s390x/tcg/meson.build | 1 + 5 files changed, 248 insertions(+) create mode 100644 target/s390x/tcg/cpacf_sha256.c
target/s390x/gen-features.c +2 -0
@@ -916,7 +916,9 @@ static uint16_t qemu_V7_1[] = {*/ static uint16_t qemu_MAX[] = {S390_FEAT_MSA_EXT_5 , +S390_FEAT_KIMD_SHA_256 ,S390_FEAT_KIMD_SHA_512 , +S390_FEAT_KLMD_SHA_256 ,S390_FEAT_KLMD_SHA_512 ,S390_FEAT_PRNO_TRNG , };
target/s390x/tcg/cpacf.h +5 -0
@@ -8,6 +8,11 @@#ifndef S390X_CPACF_H #define S390X_CPACF_H +/* from crypto_sha256.c */ +int cpacf_sha256 (CPUS390XState *env,const int mmu_idx,uintptr_t ra, +uint64_t param_addr,uint64_t *message_reg,uint64_t *len_reg, +uint32_t type); +/* from crypto_sha512.c */ int cpacf_sha512(CPUS390XState *env, const int mmu_idx, uintptr_t ra, uint64_t param_addr, uint64_t *message_reg, uint64_t *len_reg,
target/s390x/tcg/cpacf_sha256.c new file +232 -0
232 lines not on this page · raw message
target/s390x/tcg/crypto_helper.c +8 -0
@@ -53,6 +53,10 @@ static int cpacf_kimd(CPUS390XState *env, const int mmu_idx, const uintptr_t ra,int rc =0 ;switch (fc) { +case 0x02 :/* CPACF_KIMD_SHA_256 */ + rc =cpacf_sha256 (env, mmu_idx, ra, env->regs[1 ], &env->regs[r2], + &env->regs[r2 +1 ],S390_FEAT_TYPE_KIMD ); +break ;case 0x03 :/* CPACF_KIMD_SHA_512 */ rc =cpacf_sha512 (env, mmu_idx, ra, env->regs[1 ], &env->regs[r2], &env->regs[r2 +1 ],S390_FEAT_TYPE_KIMD );
@@ -70,6 +74,10 @@ static int cpacf_klmd(CPUS390XState *env, const int mmu_idx, const uintptr_t ra,int rc =0 ;switch (fc) { +case 0x02 :/* CPACF_KLMD_SHA_256 */ + rc =cpacf_sha256 (env, mmu_idx, ra, env->regs[1 ], &env->regs[r2], + &env->regs[r2 +1 ],S390_FEAT_TYPE_KLMD ); +break ;case 0x03 :/* CPACF_KLMD_SHA_512 */ rc =cpacf_sha512 (env, mmu_idx, ra, env->regs[1 ], &env->regs[r2], &env->regs[r2 +1 ],S390_FEAT_TYPE_KLMD );
target/s390x/tcg/meson.build +1 -0
@@ -5,6 +5,7 @@ s390x_ss.add(when: 'CONFIG_TCG', if_true: files( )) s390x_common_ss.add(when: 'CONFIG_TCG', if_true: files( 'cc_helper.c', + 'cpacf_sha256.c', 'cpacf_sha512.c', 'crypto_helper.c', 'excp_helper.c',
Signature · 1 line
2.43.0
PATCH v6 4/17 target/s390x: Support AES ECB for cpacf km instruction
In reply to Harald FreudenbergerSupport the subfunctions CPACF_KM_AES_128, CPACF_KM_AES_192 and CPACF_KM_AES_256 for the cpacf km instruction.
--- target/s390x/gen-features.c | 3 + target/s390x/tcg/cpacf.h | 6 ++ target/s390x/tcg/cpacf_aes.c | 113 +++++++++++++++++++++++++++++++ target/s390x/tcg/crypto_helper.c | 24 +++++++ target/s390x/tcg/meson.build | 1 + 5 files changed, 147 insertions(+) create mode 100644 target/s390x/tcg/cpacf_aes.c
target/s390x/gen-features.c +3 -0
@@ -921,6 +921,9 @@ static uint16_t qemu_MAX[] = {S390_FEAT_KLMD_SHA_256 ,S390_FEAT_KLMD_SHA_512 ,S390_FEAT_PRNO_TRNG , +S390_FEAT_KM_AES_128 , +S390_FEAT_KM_AES_192 , + S390_FEAT_KM_AES_256, };/****** END FEATURE DEFS ******/
target/s390x/tcg/cpacf.h +6 -0
@@ -18,4 +18,10 @@ int cpacf_sha512(CPUS390XState *env, const int mmu_idx, uintptr_t ra, uint64_t param_addr, uint64_t *message_reg, uint64_t *len_reg, uint32_t type); +/* from crypto_aes.c */ +int cpacf_aes_ecb (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); +#endif
target/s390x/tcg/cpacf_aes.c new file +113 -0
113 lines not on this page · raw message
target/s390x/tcg/crypto_helper.c +24 -0
@@ -89,6 +89,27 @@ static int cpacf_klmd(CPUS390XState *env, const int mmu_idx, const uintptr_t ra,return rc; } +static int cpacf_km (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 0x12 :/* CPACF_KM_AES_128 */ +case 0x13 :/* CPACF_KM_AES_192 */ +case 0x14 :/* CPACF_KM_AES_256 */ + rc =cpacf_aes_ecb (env, mmu_idx, ra, env->regs[1 ], + &env->regs[r1], &env->regs[r2], &env->regs[r2 +1 ], +S390_FEAT_TYPE_KM , fc, mod); +break ; +default : +g_assert_not_reached (); + } + +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) {
@@ -156,6 +177,9 @@ uint32_t HELPER(msa)(CPUS390XState *env, uint32_t r1, uint32_t r2, uint32_t r3,case S390_FEAT_TYPE_PPNO : rc =cpacf_ppno (env, mmu_idx, ra, r1, r2, r3, fc);break ; +case S390_FEAT_TYPE_KM : + rc =cpacf_km (env, mmu_idx, ra, r1, r2, r3, fc, mod); +break ;default :g_assert_not_reached (); }
target/s390x/tcg/meson.build +1 -0
@@ -5,6 +5,7 @@ s390x_ss.add(when: 'CONFIG_TCG', if_true: files( )) s390x_common_ss.add(when: 'CONFIG_TCG', if_true: files( 'cc_helper.c', + 'cpacf_aes.c', 'cpacf_sha256.c', 'cpacf_sha512.c', 'crypto_helper.c',
Signature · 1 line
2.43.0
PATCH v6 5/17 target/s390x: Support AES CBC for cpacf kmc instruction
In reply to Harald FreudenbergerSupport the subfunctions CPACF_KMC_AES_128, CPACF_KMC_AES_192 and CPACF_KMC_AES_256 for the cpacf kmc instruction.
--- target/s390x/gen-features.c | 3 + target/s390x/tcg/cpacf.h | 4 ++ target/s390x/tcg/cpacf_aes.c | 102 +++++++++++++++++++++++++++++++ target/s390x/tcg/crypto_helper.c | 24 ++++++++ 4 files changed, 133 insertions(+)
target/s390x/gen-features.c +3 -0
@@ -924,6 +924,9 @@ static uint16_t qemu_MAX[] = {S390_FEAT_KM_AES_128 ,S390_FEAT_KM_AES_192 ,S390_FEAT_KM_AES_256 , +S390_FEAT_KMC_AES_128 , +S390_FEAT_KMC_AES_192 , + S390_FEAT_KMC_AES_256, };/****** END FEATURE DEFS ******/
target/s390x/tcg/cpacf.h +4 -0
@@ -23,5 +23,9 @@ int cpacf_aes_ecb(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_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);#endif
target/s390x/tcg/cpacf_aes.c +102 -0
105 lines not on this page · raw message
target/s390x/tcg/crypto_helper.c +24 -0
@@ -110,6 +110,27 @@ static int cpacf_km(CPUS390XState *env, const int mmu_idx, uintptr_t ra,return rc; } +static int cpacf_kmc (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 0x12 :/* CPACF_KMC_AES_128 */ +case 0x13 :/* CPACF_KMC_AES_192 */ +case 0x14 :/* CPACF_KMC_AES_256 */ + rc =cpacf_aes_cbc (env, mmu_idx, ra, env->regs[1 ], + &env->regs[r1], &env->regs[r2], &env->regs[r2 +1 ], +S390_FEAT_TYPE_KMC , fc, mod); +break ; +default : +g_assert_not_reached (); + } + +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) {
@@ -180,6 +201,9 @@ uint32_t HELPER(msa)(CPUS390XState *env, uint32_t r1, uint32_t r2, uint32_t r3,case S390_FEAT_TYPE_KM : rc =cpacf_km (env, mmu_idx, ra, r1, r2, r3, fc, mod);break ; +case S390_FEAT_TYPE_KMC : + rc =cpacf_kmc (env, mmu_idx, ra, r1, r2, r3, fc, mod); +break ;default :g_assert_not_reached (); }
Signature · 1 line
2.43.0
PATCH v6 6/17 target/s390x: Support AES CTR for cpacf kmctr instruction
In reply to Harald FreudenbergerSupport the subfunctions CPACF_KMCTR_AES_128, CPACF_KMCTR_AES_192 and CPACF_KMCTR_AES_256 for the cpacf kmctr instruction.
--- target/s390x/gen-features.c | 3 ++ target/s390x/tcg/cpacf.h | 5 +++ target/s390x/tcg/cpacf_aes.c | 76 ++++++++++++++++++++++++++++++++ target/s390x/tcg/crypto_helper.c | 24 ++++++++++ 4 files changed, 108 insertions(+)
target/s390x/gen-features.c +3 -0
@@ -927,6 +927,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 ******/
target/s390x/tcg/cpacf.h +5 -0
@@ -27,5 +27,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
target/s390x/tcg/cpacf_aes.c +76 -0
79 lines not on this page · raw message
target/s390x/tcg/crypto_helper.c +24 -0
@@ -131,6 +131,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 0x12 :/* CPACF_KMCTR_AES_128 */ +case 0x13 :/* CPACF_KMCTR_AES_192 */ +case 0x14 :/* 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 : +g_assert_not_reached (); + } + +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) {
@@ -204,6 +225,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 ;default :g_assert_not_reached (); }
Signature · 1 line
2.43.0
PATCH v6 7/17 target/s390x: Minimal AES XTS support for cpacf pcc instruction
In reply to Harald FreudenbergerSupport CPACF pcc subfunctions PCC-Compute-XTS-Parameter-AES-128 and PCC-Compute-XTS-Parameter-AES-128 but only for the special case block sequential number is 0. However, this covers the s390 AES XTS implementation in the Linux kernel and Libica and thus also Opencryptoki clear key via Libica.
--- target/s390x/gen-features.c | 2 + target/s390x/tcg/cpacf.h | 2 + target/s390x/tcg/cpacf_aes.c | 71 ++++++++++++++++++++++++++++++++ target/s390x/tcg/crypto_helper.c | 20 +++++++++ 4 files changed, 95 insertions(+)
target/s390x/gen-features.c +2 -0
@@ -930,6 +930,8 @@ static uint16_t qemu_MAX[] = {S390_FEAT_KMCTR_AES_128 ,S390_FEAT_KMCTR_AES_192 ,S390_FEAT_KMCTR_AES_256 , +S390_FEAT_PCC_XTS_AES_128 , + S390_FEAT_PCC_XTS_AES_256, };/****** END FEATURE DEFS ******/
target/s390x/tcg/cpacf.h +2 -0
@@ -32,5 +32,7 @@ int cpacf_aes_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_aes_pcc (CPUS390XState *env,const int mmu_idx,uintptr_t ra, +uint64_t param_addr,uint8_t fc);#endif
target/s390x/tcg/cpacf_aes.c +71 -0
80 lines not on this page · raw message
target/s390x/tcg/crypto_helper.c +20 -0
@@ -169,6 +169,23 @@ static int cpacf_ppno(CPUS390XState *env, const int mmu_idx, uintptr_t ra,return rc; } +static int cpacf_pcc (CPUS390XState *env,const int mmu_idx,uintptr_t ra, +uint8_t fc) +{ +int rc =0 ; + +switch (fc) { +case 0x32 :/* CPACF_PCC compute XTS param AES-128 */ +case 0x34 :/* CPACF PCC compute XTS param AES-256 */ + rc =cpacf_aes_pcc (env, mmu_idx, ra, env->regs[1 ], fc); +break ; +default : +g_assert_not_reached (); + } + +return rc; +} +uint32_t HELPER (msa )(CPUS390XState *env,uint32_t r1,uint32_t r2,uint32_t r3,uint32_t type) {
@@ -228,6 +245,9 @@ uint32_t HELPER(msa)(CPUS390XState *env, uint32_t r1, uint32_t r2, uint32_t r3,case S390_FEAT_TYPE_KMCTR : rc =cpacf_kmctr (env, mmu_idx, ra, r1, r2, r3, fc, mod);break ; +case S390_FEAT_TYPE_PCC : + rc =cpacf_pcc (env, mmu_idx, ra, fc); +break ;default :g_assert_not_reached (); }
Signature · 1 line
2.43.0
PATCH v6 8/17 target/s390x: Support AES XTS for cpacf km instruction
In reply to Harald FreudenbergerSupport the subfunctions XTS-AES-128 and XTS-AES-256 for the cpacf km instruction.
--- target/s390x/gen-features.c | 2 + target/s390x/tcg/cpacf.h | 4 ++ target/s390x/tcg/cpacf_aes.c | 107 +++++++++++++++++++++++++++++++ target/s390x/tcg/crypto_helper.c | 6 ++ 4 files changed, 119 insertions(+)
target/s390x/gen-features.c +2 -0
@@ -924,6 +924,8 @@ static uint16_t qemu_MAX[] = {S390_FEAT_KM_AES_128 ,S390_FEAT_KM_AES_192 ,S390_FEAT_KM_AES_256 , +S390_FEAT_KM_XTS_AES_128 , +S390_FEAT_KM_XTS_AES_256 ,S390_FEAT_KMC_AES_128 ,S390_FEAT_KMC_AES_192 , S390_FEAT_KMC_AES_256,
target/s390x/tcg/cpacf.h +4 -0
@@ -34,5 +34,9 @@ int cpacf_aes_ctr(CPUS390XState *env, const int mmu_idx, uintptr_t ra, uint8_t fc, uint8_t mod);int cpacf_aes_pcc (CPUS390XState *env,const int mmu_idx,uintptr_t ra,uint64_t param_addr,uint8_t fc); +int cpacf_aes_xts (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);#endif
target/s390x/tcg/cpacf_aes.c +107 -0
110 lines not on this page · raw message
target/s390x/tcg/crypto_helper.c +6 -0
@@ -103,6 +103,12 @@ static int cpacf_km(CPUS390XState *env, const int mmu_idx, uintptr_t ra, &env->regs[r1], &env->regs[r2], &env->regs[r2 +1 ], S390_FEAT_TYPE_KM, fc, mod);break ; +case 0x32 :/* CPACF_KM_XTS_128 */ +case 0x34 :/* CPACF_KM_XTS_256 */ + rc =cpacf_aes_xts (env, mmu_idx, ra, env->regs[1 ], + &env->regs[r1], &env->regs[r2], &env->regs[r2 +1 ], +S390_FEAT_TYPE_KM , fc, mod); +break ;default :g_assert_not_reached (); }
Signature · 1 line
2.43.0
PATCH v6 9/17 target/s390x: Support pckmo encrypt AES subfunctions
In reply to Harald FreudenbergerSupport the subfuctions PCKMO-Encrypt-AES-128-Key, PCKMO-Encrypt-AES-192-Key and PCKMO-Encrypt-AES-256-Key.
These subfunctions derive a protected key from an AES clear key by encrypting it with an internal AES wrapping key. More details can be found in the "z/Architecture Prinziples of Operation" document.
The qemu version provided here is only a fake indented to make protected key available for developing and testing purpose:
* The protected key is 'derived' from the clear key by xoring the fixed pattern 0xAAAA... onto the key value.
* The AES Wrapping Key Verification Pattern is a fixed value of 32 bytes 0xFACEFACE...
--- target/s390x/gen-features.c | 3 ++ target/s390x/tcg/cpacf.h | 2 + target/s390x/tcg/cpacf_aes.c | 66 ++++++++++++++++++++++++++++++++ target/s390x/tcg/crypto_helper.c | 21 ++++++++++ 4 files changed, 92 insertions(+)
target/s390x/gen-features.c +3 -0
@@ -934,6 +934,9 @@ static uint16_t qemu_MAX[] = {S390_FEAT_KMCTR_AES_256 ,S390_FEAT_PCC_XTS_AES_128 ,S390_FEAT_PCC_XTS_AES_256 , +S390_FEAT_PCKMO_AES_128 , +S390_FEAT_PCKMO_AES_192 , + S390_FEAT_PCKMO_AES_256, };/****** END FEATURE DEFS ******/
target/s390x/tcg/cpacf.h +2 -0
@@ -38,5 +38,7 @@ int cpacf_aes_xts(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_pckmo (CPUS390XState *env,const int mmu_idx,uintptr_t ra, +uint64_t param_addr,uint8_t fc);#endif
target/s390x/tcg/cpacf_aes.c +66 -0
69 lines not on this page · raw message
target/s390x/tcg/crypto_helper.c +21 -0
@@ -192,6 +192,24 @@ static int cpacf_pcc(CPUS390XState *env, const int mmu_idx, uintptr_t ra,return rc; } +static int cpacf_pckmo (CPUS390XState *env,const int mmu_idx,uintptr_t ra, +uint8_t fc) +{ +int rc =0 ; + +switch (fc) { +case 0x12 :/* CPACF_PCKMO_ENC_AES_128_KEY */ +case 0x13 :/* CPACF_PCKMO_ENC_AES_192_KEY */ +case 0x14 :/* CPACF_PCKMO_ENC_AES_256_KEY */ + rc =cpacf_aes_pckmo (env, mmu_idx, ra, env->regs[1 ], fc); +break ; +default : +g_assert_not_reached (); + } + +return rc; +} +uint32_t HELPER (msa )(CPUS390XState *env,uint32_t r1,uint32_t r2,uint32_t r3,uint32_t type) {
@@ -254,6 +272,9 @@ uint32_t HELPER(msa)(CPUS390XState *env, uint32_t r1, uint32_t r2, uint32_t r3,case S390_FEAT_TYPE_PCC : rc =cpacf_pcc (env, mmu_idx, ra, fc);break ; +case S390_FEAT_TYPE_PCKMO : + rc =cpacf_pckmo (env, mmu_idx, ra, fc); +break ;default :g_assert_not_reached (); }
Signature · 1 line
2.43.0
PATCH v6 10/17 target/s390x: Support protected key AES ECB for cpacf km instruction
In reply to Harald FreudenbergerSupport the subfunctions CPACF_KM_PAES_128, CPACF_KM_PAES_192 and CPACF_KM_PAES_256 for the cpacf km instruction.
--- target/s390x/gen-features.c | 3 ++ target/s390x/tcg/cpacf.h | 4 ++ target/s390x/tcg/cpacf_aes.c | 87 ++++++++++++++++++++++++++++++++ target/s390x/tcg/crypto_helper.c | 7 +++ 4 files changed, 101 insertions(+)
target/s390x/gen-features.c +3 -0
@@ -924,6 +924,9 @@ static uint16_t qemu_MAX[] = {S390_FEAT_KM_AES_128 ,S390_FEAT_KM_AES_192 ,S390_FEAT_KM_AES_256 , +S390_FEAT_KM_EAES_128 , +S390_FEAT_KM_EAES_192 , +S390_FEAT_KM_EAES_256 ,S390_FEAT_KM_XTS_AES_128 ,S390_FEAT_KM_XTS_AES_256 , S390_FEAT_KMC_AES_128,
target/s390x/tcg/cpacf.h +4 -0
@@ -40,5 +40,9 @@ int cpacf_aes_xts(CPUS390XState *env, const int mmu_idx, uintptr_t ra, uint32_t type, uint8_t fc, uint8_t mod);int cpacf_aes_pckmo (CPUS390XState *env,const int mmu_idx,uintptr_t ra,uint64_t param_addr,uint8_t fc); +int cpacf_paes_ecb (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);#endif
target/s390x/tcg/cpacf_aes.c +87 -0
90 lines not on this page · raw message
target/s390x/tcg/crypto_helper.c +7 -0
@@ -103,6 +103,13 @@ static int cpacf_km(CPUS390XState *env, const int mmu_idx, uintptr_t ra, &env->regs[r1], &env->regs[r2], &env->regs[r2 +1 ], S390_FEAT_TYPE_KM, fc, mod);break ; +case 0x1a :/* CPACF_KM_PAES_128 */ +case 0x1b :/* CPACF_KM_PAES_192 */ +case 0x1c :/* CPACF_KM_PAES_256 */ + rc =cpacf_paes_ecb (env, mmu_idx, ra, env->regs[1 ], + &env->regs[r1], &env->regs[r2], &env->regs[r2 +1 ], +S390_FEAT_TYPE_KM , fc, mod); +break ;case 0x32 :/* CPACF_KM_XTS_128 */ case 0x34 :/* CPACF_KM_XTS_256 */ rc = cpacf_aes_xts(env, mmu_idx, ra, env->regs[1],
Signature · 1 line
2.43.0
PATCH v6 11/17 target/s390x: Support protected key AES CBC for cpacf kmc instruction
In reply to Harald FreudenbergerSupport the subfunctions CPACF_KMC_PAES_128, CPACF_KMC_PAES_192 and CPACF_KMC_PAES_256 for the cpacf kmc instruction.
--- target/s390x/gen-features.c | 3 + target/s390x/tcg/cpacf.h | 4 ++ target/s390x/tcg/cpacf_aes.c | 109 +++++++++++++++++++++++++++++++ target/s390x/tcg/crypto_helper.c | 7 ++ 4 files changed, 123 insertions(+)
target/s390x/gen-features.c +3 -0
@@ -932,6 +932,9 @@ static uint16_t qemu_MAX[] = {S390_FEAT_KMC_AES_128 ,S390_FEAT_KMC_AES_192 ,S390_FEAT_KMC_AES_256 , +S390_FEAT_KMC_EAES_128 , +S390_FEAT_KMC_EAES_192 , +S390_FEAT_KMC_EAES_256 ,S390_FEAT_KMCTR_AES_128 ,S390_FEAT_KMCTR_AES_192 , S390_FEAT_KMCTR_AES_256,
target/s390x/tcg/cpacf.h +4 -0
@@ -44,5 +44,9 @@ int cpacf_paes_ecb(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_paes_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);#endif
target/s390x/tcg/cpacf_aes.c +109 -0
112 lines not on this page · raw message
target/s390x/tcg/crypto_helper.c +7 -0
@@ -137,6 +137,13 @@ static int cpacf_kmc(CPUS390XState *env, const int mmu_idx, uintptr_t ra, &env->regs[r1], &env->regs[r2], &env->regs[r2 +1 ], S390_FEAT_TYPE_KMC, fc, mod);break ; +case 0x1a :/* CPACF_KMC_PAES_128 */ +case 0x1b :/* CPACF_KMC_PAES_192 */ +case 0x1c :/* CPACF_KMC_PAES_256 */ + rc =cpacf_paes_cbc (env, mmu_idx, ra, env->regs[1 ], + &env->regs[r1], &env->regs[r2], &env->regs[r2 +1 ], +S390_FEAT_TYPE_KMC , fc, mod); +break ;default :g_assert_not_reached (); }
Signature · 1 line
2.43.0
PATCH v6 12/17 target/s390x: Support protected key AES CTR for cpacf kmctr instruction
In reply to Harald FreudenbergerSupport the subfunctions CPACF_KMCTR_PAES_128, CPACF_KMCTR_PAES_192 and CPACF_KMCTR_PAES_256 for the cpacf kmctr instruction.
--- target/s390x/gen-features.c | 3 ++ target/s390x/tcg/cpacf.h | 5 ++ target/s390x/tcg/cpacf_aes.c | 90 ++++++++++++++++++++++++++++++++ target/s390x/tcg/crypto_helper.c | 7 +++ 4 files changed, 105 insertions(+)
target/s390x/gen-features.c +3 -0
@@ -938,6 +938,9 @@ static uint16_t qemu_MAX[] = {S390_FEAT_KMCTR_AES_128 ,S390_FEAT_KMCTR_AES_192 ,S390_FEAT_KMCTR_AES_256 , +S390_FEAT_KMCTR_EAES_128 , +S390_FEAT_KMCTR_EAES_192 , +S390_FEAT_KMCTR_EAES_256 ,S390_FEAT_PCC_XTS_AES_128 ,S390_FEAT_PCC_XTS_AES_256 , S390_FEAT_PCKMO_AES_128,
target/s390x/tcg/cpacf.h +5 -0
@@ -48,5 +48,10 @@ int cpacf_paes_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_paes_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
target/s390x/tcg/cpacf_aes.c +90 -0
93 lines not on this page · raw message
target/s390x/tcg/crypto_helper.c +7 -0
@@ -165,6 +165,13 @@ static int cpacf_kmctr(CPUS390XState *env, const int mmu_idx, uintptr_t ra, &env->regs[r1], &env->regs[r2], &env->regs[r2 +1 ], &env->regs[r3], S390_FEAT_TYPE_KMCTR, fc, mod);break ; +case 0x1a :/* CPACF_KMCTR_PAES_128 */ +case 0x1b :/* CPACF_KMCTR_PAES_192 */ +case 0x1c :/* CPACF_KMCTR_PAES_256 */ + rc =cpacf_paes_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 :g_assert_not_reached (); }
Signature · 1 line
2.43.0
PATCH v6 13/17 target/s390x: Minimal protected key AES XTS support for cpacf pcc instruction
In reply to Harald FreudenbergerSupport 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.
--- target/s390x/gen-features.c | 2 + target/s390x/tcg/cpacf.h | 2 + target/s390x/tcg/cpacf_aes.c | 80 ++++++++++++++++++++++++++++++++ target/s390x/tcg/crypto_helper.c | 4 ++ 4 files changed, 88 insertions(+)
target/s390x/gen-features.c +2 -0
@@ -943,6 +943,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,
target/s390x/tcg/cpacf.h +2 -0
@@ -53,5 +53,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
target/s390x/tcg/cpacf_aes.c +80 -0
83 lines not on this page · raw message
target/s390x/tcg/crypto_helper.c +4 -0
@@ -206,6 +206,10 @@ static int cpacf_pcc(CPUS390XState *env, const int mmu_idx, uintptr_t ra,case 0x34 :/* CPACF PCC compute XTS param AES-256 */ rc =cpacf_aes_pcc (env, mmu_idx, ra, env->regs[1 ], fc);break ; +case 0x3a :/* CPACF_PCC compute XTS param Encrypted AES-128 */ +case 0x3c :/* CPACF PCC compute XTS param Encrypted AES-256 */ + rc =cpacf_paes_pcc (env, mmu_idx, ra, env->regs[1 ], fc); +break ;default :g_assert_not_reached (); }
Signature · 1 line
2.43.0
PATCH v6 14/17 target/s390x: Support protected key AES XTS for cpacf km instruction
In reply to Harald FreudenbergerSupport the subfunctions CPACF_KM_PXTS_128 and CPACF_KM_PAES_256 for the cpacf km instruction.
--- target/s390x/gen-features.c | 2 + target/s390x/tcg/cpacf.h | 4 ++ target/s390x/tcg/cpacf_aes.c | 106 +++++++++++++++++++++++++++++++ target/s390x/tcg/crypto_helper.c | 6 ++ 4 files changed, 118 insertions(+)
target/s390x/gen-features.c +2 -0
@@ -929,6 +929,8 @@ static uint16_t qemu_MAX[] = {S390_FEAT_KM_EAES_256 ,S390_FEAT_KM_XTS_AES_128 ,S390_FEAT_KM_XTS_AES_256 , +S390_FEAT_KM_XTS_EAES_128 , +S390_FEAT_KM_XTS_EAES_256 ,S390_FEAT_KMC_AES_128 ,S390_FEAT_KMC_AES_192 , S390_FEAT_KMC_AES_256,
target/s390x/tcg/cpacf.h +4 -0
@@ -55,5 +55,9 @@ int cpacf_paes_ctr(CPUS390XState *env, const int mmu_idx, uintptr_t ra, 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); +int cpacf_paes_xts (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);#endif
target/s390x/tcg/cpacf_aes.c +106 -0
109 lines not on this page · raw message
target/s390x/tcg/crypto_helper.c +6 -0
@@ -116,6 +116,12 @@ static int cpacf_km(CPUS390XState *env, const int mmu_idx, uintptr_t ra, &env->regs[r1], &env->regs[r2], &env->regs[r2 +1 ], S390_FEAT_TYPE_KM, fc, mod);break ; +case 0x3a :/* CPACF_KM_PXTS_128 */ +case 0x3c :/* CPACF_KM_PXTS_256 */ + rc =cpacf_paes_xts (env, mmu_idx, ra, env->regs[1 ], + &env->regs[r1], &env->regs[r2], &env->regs[r2 +1 ], +S390_FEAT_TYPE_KM , fc, mod); +break ;default :g_assert_not_reached (); }
Signature · 1 line
2.43.0
PATCH v6 15/17 docs/s390: Document CPACF instructions support
In reply to Harald FreudenbergerAdd a first document covering the Qemu s390 CPACF instructions and functions supported.
--- docs/system/s390x/cpacf.rst | 109 +++++++++++++++++++++++++++++++++++ docs/system/target-s390x.rst | 1 + 2 files changed, 110 insertions(+) create mode 100644 docs/system/s390x/cpacf.rst
docs/system/s390x/cpacf.rst new file +109 -0
@@ -0,0 +1,109 @@ +CPACF Support +============= + +CPACF +----- + +CP Assist for Cryptographic Function (CPACF) is a hardware-integrated +coprocessor feature built into every processor core of IBM Z and +LinuxONE mainframes (s390x architecture). It provides high-speed, +hardware-accelerated encryption and hashing directly on the CPU. + +CPACF provides a set of z/Architecture instructions (known as Message +Security Assist or MSA) that execute cryptographic operations +synchronously with the main processor. + +- Symmetric Encryption: Support for AES (128, 192, 256-bit), DES, and + Triple-DES (TDES). +- Hashing: Acceleration for SHA-1, SHA-2 (up to SHA-512), SHA-3 and + SHAKE. +- Random Number Generation: Pseudo Random Number Generator (PRNG) and + a hardware-based True Random Number Generator (TRNG). +- Asymmetric Support: Elliptic Curve Cryptography (ECC) primitives + P-256, P-384, P-521, Montgomery/Edwards curves (e.g., Ed25519). + +CPACF instructions +------------------ + +Here is a list of implemented CPACF instructions and the supported +functions for each instruction: + +KDSA (COMPUTE DIGITAL SIGNATURE AUTHENTICATION) +- Function code 0x00 - Function Query + +KIMD (COMPUTE INTERMEDIATE MESSAGE DIGEST) +- Function code 0x00 - Function Query +- Function code 0x02 - CPACF_KIMD_SHA_256 +- Function code 0x03 - CPACF_KIMD_SHA_512 + +KLMD (COMPUTE LAST MESSAGE DIGEST) +- Function code 0x00 - Function Query +- Function code 0x02 - CPACF_KLMD_SHA_256 +- Function code 0x03 - CPACF_KLMD_SHA_512 + +KM (CIPHER MESSAGE) +- Function code 0x00 - Function Query +- Function code 0x12 - CPACF_KM_AES_128 +- Function code 0x13 - CPACF_KM_AES_192 +- Function code 0x14 - CPACF_KM_AES_256 +- Function code 0x1a - CPACF_KM_PAES_128 +- Function code 0x1b - CPACF_KM_PAES_192 +- Function code 0x1c - CPACF_KM_PAES_256 +- Function code 0x32 - CPACF_KM_XTS_128 +- Function code 0x34 - CPACF_KM_XTS_256 +- Function code 0x3a - CPACF_KM_PXTS_128 +- Function code 0x3c - CPACF_KM_PXTS_256 + +KMAC (COMPUTE MESSAGE AUTHENTICATION CODE) +- Function code 0x00 - Function Query + +KMC (CIPHER MESSAGE WITH CHAINING) +- Function code 0x00 - Function Query +- Function code 0x12 - CPACF_KMC_AES_128 +- Function code 0x13 - CPACF_KMC_AES_192 +- Function code 0x14 - CPACF_KMC_AES_256 +- Function code 0x1a - CPACF_KMC_PAES_128 +- Function code 0x1b - CPACF_KMC_PAES_192 +- Function code 0x1c - CPACF_KMC_PAES_256 + +KMCTR (CIPHER MESSAGE WITH COUNTER) +- Function code 0x00 - Function Query +- Function code 0x12 - CPACF_KMCTR_AES_128 +- Function code 0x13 - CPACF_KMCTR_AES_192 +- Function code 0x14 - CPACF_KMCTR_AES_256 +- Function code 0x1a - CPACF_KMCTR_PAES_128 +- Function code 0x1b - CPACF_KMCTR_PAES_192 +- Function code 0x1c - CPACF_KMCTR_PAES_256 + +KMF (CIPHER MESSAGE WITH CIPHER FEEDBACK) +- not supported + +KMO (CIPHER MESSAGE WITH OUTPUT FEEDBACK) +- not supported + +PCC (PERFORM CRYPTOGRAPHIC COMPUTATION) +- Function code 0x00 - Function Query +- Function code 0x32 - compute XTS param AES-128 +- Function code 0x34 - compute XTS param AES-256 +- Function code 0x3a - compute XTS param Encrypted AES-128 +- Function code 0x3c - compute XTS param Encrypted AES-256 + +PCKMO (PERFORM CRYPTOGRAPHIC KEY MANAGEMENT OPERATION) +- Function code 0x00 - Function Query +- Function code 0x12 - CPACF_PCKMO_ENC_AES_128_KEY +- Function code 0x13 - CPACF_PCKMO_ENC_AES_192_KEY +- Function code 0x14 - CPACF_PCKMO_ENC_AES_256_KEY + +PRNO (PERFORM RANDOM NUMBER OPERATION) +- Function code 0x00 - Function Query +- Function code 0x72 - CPACF_PRNO_TRNG + +Note that the use of a not supported CPACF instruction (KMF and KMO) +or invocation of a not listed function will result in a Specification +Exception. + +Not listed CPACF instructions (KMF, KMO) cause an Operation Exception +when used. Not listed functions cause a Specification Exception when +called. If only the query function is listed (KDSA), then the query +function will return a function status word with all but the query +function bit set to 0.
docs/system/target-s390x.rst +1 -0
@@ -35,3 +35,4 @@ Architectural features s390x/bootdevices s390x/protvirt s390x/cpu-topology + s390x/cpacf
Signature · 1 line
2.43.0
PATCH v6 16/17 crypto: Add aes-helpers file to support some AES modes
In reply to Harald FreudenbergerAdd a new file crypto/aes-helpers.c with simple functions to support some AES modes:
- AES cbc: AES_cbc_encrypt() AES_cbc_decrypt()
- AES ctr: AES_ctr_encrypt()
- AES xts: AES_xts_encrypt() AES_xts_decrypt() and some AES related helpers:
- AES_xor()
- AES_xts_prep_next_tweak()
--- crypto/aes-helpers.c | 101 +++++++++++++++++++++++++++++++++++++++++++ crypto/meson.build | 1 + include/crypto/aes.h | 14 ++++++ 3 files changed, 116 insertions(+) create mode 100644 crypto/aes-helpers.c
crypto/aes-helpers.c new file +101 -0
@@ -0,0 +1,101 @@ +/* +* AES helper functions and mode implementations +* +* Authors: +* Harald Freudenberger <[email protected]> +* +* This work is licensed under the terms of the GNU GPL, version 2 or later. +* See the COPYING file in the top-level directory. +*/ + +#include <stdint.h> +#include <string.h> +#include "crypto/aes.h" + +void AES_xor (const unsigned char *src1,const unsigned char *src2, +unsigned char *dst) +{ +int i; + +for (i =0 ; i <AES_BLOCK_SIZE ; i++) { + dst[i] = src1[i] ^ src2[i]; + } +} + +void AES_cbc_encrypt (const unsigned char *in,unsigned char *out, +unsigned char *iv,const AES_KEY *key) +{ +unsigned char buf[AES_BLOCK_SIZE ]; + +/* in xor iv => buf */ +AES_xor (in, iv, buf); +/* encrypt buf => out */ +AES_encrypt (buf, out, key); +/* prep iv for next round */ +memcpy (iv, out,AES_BLOCK_SIZE ); +} + +void AES_cbc_decrypt (const unsigned char *in,unsigned char *out, +unsigned char *iv,const AES_KEY *key) +{ +unsigned char buf[AES_BLOCK_SIZE ]; + +/* decrypt in => buf */ +AES_decrypt (in, buf, key); +/* buf xor iv => out */ +AES_xor (buf, iv, out); +/* prep iv for next round */ +memcpy (iv, in,AES_BLOCK_SIZE ); +} + +void AES_ctr_encrypt (const unsigned char *in,unsigned char *out, +const unsigned char *ctr,const AES_KEY *key) +{ +unsigned char buf[AES_BLOCK_SIZE ]; + +/* encrypt ctr => buf */ +AES_encrypt (ctr, buf, key); +/* exor input data with encrypted ctr => out */ +AES_xor (in, buf, out); +} + +void AES_xts_prep_next_tweak (unsigned char *tweak) +{ +unsigned char carry; +int i; + + carry = tweak[AES_BLOCK_SIZE -1 ] >>7 ; + +for (i =AES_BLOCK_SIZE -1 ; i >0 ; i--) { + tweak[i] = (unsigned char )((tweak[i] <<1 ) | (tweak[i -1 ] >>7 )); + } + + tweak[i] = (unsigned char )(tweak[i] <<1 ); + tweak[i] ^= (unsigned char )(0x87 & (unsigned char )(-(unsigned char )carry)); +} + +void AES_xts_encrypt (const unsigned char *in,unsigned char *out, +const unsigned char *tweak,const AES_KEY *key) +{ +unsigned char buf1[AES_BLOCK_SIZE ], buf2[AES_BLOCK_SIZE ]; + +/* in xor tweak => buf1 */ +AES_xor (in, tweak, buf1); +/* encrypt buf1 => buf2 */ +AES_encrypt (buf1, buf2, key); +/* buf2 xor tweak => out */ +AES_xor (buf2, tweak, out); +} + +void AES_xts_decrypt (const unsigned char *in,unsigned char *out, +const unsigned char *tweak,const AES_KEY *key) +{ +unsigned char buf1[AES_BLOCK_SIZE ], buf2[AES_BLOCK_SIZE ]; + +/* in xor tweak => buf1 */ +AES_xor (in, tweak, buf1); +/* encrypt buf1 => buf2 */ +AES_decrypt (buf1, buf2, key); +/* buf2 xor tweak => out */ +AES_xor (buf2, tweak, out); +}
crypto/meson.build +1 -0
@@ -55,6 +55,7 @@ system_ss.add(when: gnutls, if_true: files('tls-cipher-suites.c')) util_ss.add(files( 'aes.c', + 'aes-helpers.c', 'clmul.c', 'init.c', 'sm4.c',
include/crypto/aes.h +14 -0
@@ -37,4 +37,18 @@ AES_Td0[x] = Si[x].[0e, 09, 0d, 0b];extern const uint32_t AES_Te0[256 ], AES_Td0[256 ]; +void AES_xor (const unsigned char *src1,const unsigned char *src2, +unsigned char *dst); +void AES_cbc_encrypt (const unsigned char *in,unsigned char *out, +unsigned char *iv,const AES_KEY *key); +void AES_cbc_decrypt (const unsigned char *in,unsigned char *out, +unsigned char *iv,const AES_KEY *key); +void AES_ctr_encrypt (const unsigned char *in,unsigned char *out, +const unsigned char *ctr,const AES_KEY *key); +void AES_xts_prep_next_tweak (unsigned char *tweak); +void AES_xts_encrypt (const unsigned char *in,unsigned char *out, +const unsigned char *tweak,const AES_KEY *key); +void AES_xts_decrypt (const unsigned char *in,unsigned char *out, +const unsigned char *tweak,const AES_KEY *key); +#endif
Signature · 1 line
2.43.0
PATCH v6 17/17 target/s390x: Use generic AES helper functions
In reply to Harald FreudenbergerRewrite the cpacf implementations to use the generic AES helper functions from crypto/aes-helpers.c
--- target/s390x/tcg/cpacf_aes.c | 124 ++++++++++------------------------- 1 file changed, 36 insertions(+), 88 deletions(-)
target/s390x/tcg/cpacf_aes.c +36 -88
@@ -119,20 +119,13 @@ int cpacf_aes_ecb(CPUS390XState *env, const int mmu_idx, uintptr_t ra,return !len ?0 :3 ; } -static void aes_xor (const uint8_t *src1,const uint8_t *src2,uint8_t *dst) -{ -for (int i =0 ; i <AES_BLOCK_SIZE ; i++) { - dst[i] = src1[i] ^ src2[i]; - } -} -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) {enum {MAX_BLOCKS_PER_RUN =8192 /AES_BLOCK_SIZE }; -uint8_t in[AES_BLOCK_SIZE ], out[AES_BLOCK_SIZE ], buf[AES_BLOCK_SIZE ]; +uint8_t in[AES_BLOCK_SIZE ], out[AES_BLOCK_SIZE ];const MemOpIdx oi =make_memop_idx (MO_8 , mmu_idx);uint64_t addr, len = *src_len_reg, done =0 ;int i, keysize, addr_reg_size =64 ;
@@ -188,19 +181,11 @@ int cpacf_aes_cbc(CPUS390XState *env, const int mmu_idx, uintptr_t ra,for (i =0 ; i <MAX_BLOCKS_PER_RUN && len >=AES_BLOCK_SIZE ; i++) {aes_read_block (env, mmu_idx, *src_ptr_reg + done, in, ra);if (mod) { -/* decrypt in => buf */ -AES_decrypt (in, buf, &exkey); -/* buf xor iv => out */ -aes_xor (buf, iv, out); -/* prep iv for next round */ -memcpy (iv, in,AES_BLOCK_SIZE ); +/* decrypt in => out */ +AES_cbc_decrypt (in, out, iv, &exkey); }else { -/* in xor iv => buf */ -aes_xor (in, iv, buf); -/* encrypt buf => out */ -AES_encrypt (buf, out, &exkey); -/* prep iv for next round */ -memcpy (iv, out,AES_BLOCK_SIZE ); +/* encrypt in => out */ +AES_cbc_encrypt (in, out, iv, &exkey); }aes_write_block (env, mmu_idx, *dst_ptr_reg + done, out, ra); len -=AES_BLOCK_SIZE , done +=AES_BLOCK_SIZE ;
@@ -229,11 +214,10 @@ int cpacf_aes_ctr(CPUS390XState *env, const int mmu_idx, uintptr_t ra, {enum {MAX_BLOCKS_PER_RUN =8192 /AES_BLOCK_SIZE };const MemOpIdx oi =make_memop_idx (MO_8 , mmu_idx); -uint8_t ctr[AES_BLOCK_SIZE ], buf[AES_BLOCK_SIZE ];uint8_t in[AES_BLOCK_SIZE ], out[AES_BLOCK_SIZE ];uint64_t addr, len = *src_len_reg, done =0 ; +uint8_t ctr[AES_BLOCK_SIZE ], key[32 ];int i, keysize, addr_reg_size =64 ; -uint8_t key[32 ];AES_KEY exkey;g_assert (type ==S390_FEAT_TYPE_KMCTR );
@@ -275,12 +259,10 @@ int cpacf_aes_ctr(CPUS390XState *env, const int mmu_idx, uintptr_t ra,for (i =0 ; i <MAX_BLOCKS_PER_RUN && len >=AES_BLOCK_SIZE ; i++) {/* read in nonce/ctr => ctr */ aes_read_block (env, mmu_idx, *ctr_ptr_reg + done, ctr, ra); -/* encrypt ctr => buf */ -AES_encrypt (ctr, buf, &exkey);/* read in one block of input data => in */ aes_read_block (env, mmu_idx, *src_ptr_reg + done, in, ra); -/* exor input data with encrypted ctr => out */ -aes_xor (in, buf, out); +/* 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, *dst_ptr_reg + done, out, ra); len -=AES_BLOCK_SIZE , done +=AES_BLOCK_SIZE ;
@@ -361,28 +343,13 @@ int cpacf_aes_pcc(CPUS390XState *env, const int mmu_idx, uintptr_t ra,return 0 ; } -static void aes_xts_prep_next_tweak (uint8_t tweak[AES_BLOCK_SIZE ]) -{ -uint8_t carry; -int i; - - carry = tweak[AES_BLOCK_SIZE -1 ] >>7 ; - -for (i =AES_BLOCK_SIZE -1 ; i >0 ; i--) { - tweak[i] = (uint8_t )((tweak[i] <<1 ) | (tweak[i -1 ] >>7 )); - } - - tweak[i] = (uint8_t )(tweak[i] <<1 ); - tweak[i] ^= (uint8_t )(0x87 & (uint8_t )(-(int8_t )carry)); -} -int cpacf_aes_xts (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) {enum {MAX_BLOCKS_PER_RUN =8192 /AES_BLOCK_SIZE }; -uint8_t buf1[AES_BLOCK_SIZE ], buf2[AES_BLOCK_SIZE ]; +uint8_t in[AES_BLOCK_SIZE ], out[AES_BLOCK_SIZE ];const MemOpIdx oi =make_memop_idx (MO_8 , mmu_idx);uint64_t addr, len = *src_len_reg, done =0 ;uint8_t key[32 ], tweak[AES_BLOCK_SIZE ];
@@ -433,23 +400,19 @@ int cpacf_aes_xts(CPUS390XState *env, const int mmu_idx, uintptr_t ra,/* process up to MAX_BLOCKS_PER_RUN aes blocks */ for (i =0 ; i <MAX_BLOCKS_PER_RUN && len >=AES_BLOCK_SIZE ; i++) { -/* fetch one AES block into buf1 */ -aes_read_block (env, mmu_idx, *src_ptr_reg + done, buf1, ra); -/* buf1 xor tweak => buf2 */ -aes_xor (buf1, tweak, buf2); +/* fetch one AES block into in */ +aes_read_block (env, mmu_idx, *src_ptr_reg + done, in, ra);if (mod) { -/* decrypt buf2 => buf1 */ -AES_decrypt (buf2, buf1, &exkey); +/* decrypt in => out */ +AES_xts_decrypt (in, out, tweak, &exkey); }else { -/* encrypt buf2 => buf1 */ -AES_encrypt (buf2, buf1, &exkey); +/* encrypt in => out */ +AES_xts_encrypt (in, out, tweak, &exkey); } -/* buf1 xor tweak => buf2 */ -aes_xor (buf1, tweak, buf2);/* prep tweak for next round */ -aes_xts_prep_next_tweak (tweak); -/* write out this processed block from buf2 */ -aes_write_block (env, mmu_idx, *dst_ptr_reg + done, buf2, ra); +AES_xts_prep_next_tweak (tweak); +/* write out this processed block from out */ +aes_write_block (env, mmu_idx, *dst_ptr_reg + done, out, ra); len -=AES_BLOCK_SIZE , done +=AES_BLOCK_SIZE ; }
@@ -627,7 +590,7 @@ int cpacf_paes_cbc(CPUS390XState *env, const int mmu_idx, uintptr_t ra, 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 ], buf[AES_BLOCK_SIZE ]; +uint8_t in[AES_BLOCK_SIZE ], out[AES_BLOCK_SIZE ];const MemOpIdx oi =make_memop_idx (MO_8 , mmu_idx);uint8_t key[32 ], wkvp[32 ], iv[AES_BLOCK_SIZE ];uint64_t addr, len = *src_len_reg, done =0 ;
@@ -697,19 +660,11 @@ int cpacf_paes_cbc(CPUS390XState *env, const int mmu_idx, uintptr_t ra,for (i =0 ; i <MAX_BLOCKS_PER_RUN && len >=AES_BLOCK_SIZE ; i++) {aes_read_block (env, mmu_idx, *src_ptr_reg + done, in, ra);if (mod) { -/* decrypt in => buf */ -AES_decrypt (in, buf, &exkey); -/* buf xor iv => out */ -aes_xor (buf, iv, out); -/* prep iv for next round */ -memcpy (iv, in,AES_BLOCK_SIZE ); +/* decrypt in => out */ +AES_cbc_decrypt (in, out, iv, &exkey); }else { -/* in xor iv => buf */ -aes_xor (in, iv, buf); -/* encrypt buf => out */ -AES_encrypt (buf, out, &exkey); -/* prep iv for next round */ -memcpy (iv, out,AES_BLOCK_SIZE ); +/* encrypt in => out */ +AES_cbc_encrypt (in, out, iv, &exkey); }aes_write_block (env, mmu_idx, *dst_ptr_reg + done, out, ra); len -=AES_BLOCK_SIZE , done +=AES_BLOCK_SIZE ;
@@ -738,11 +693,10 @@ int cpacf_paes_ctr(CPUS390XState *env, const int mmu_idx, uintptr_t ra, {enum {MAX_BLOCKS_PER_RUN =8192 /AES_BLOCK_SIZE };const MemOpIdx oi =make_memop_idx (MO_8 , mmu_idx); -uint8_t ctr[AES_BLOCK_SIZE ], buf[AES_BLOCK_SIZE ];uint8_t in[AES_BLOCK_SIZE ], out[AES_BLOCK_SIZE ]; +uint8_t ctr[AES_BLOCK_SIZE ], key[32 ], wkvp[32 ];uint64_t addr, len = *src_len_reg, done =0 ;int i, keysize, addr_reg_size =64 ; -uint8_t key[32 ], wkvp[32 ];AES_KEY exkey;g_assert (type ==S390_FEAT_TYPE_KMCTR );
@@ -798,12 +752,10 @@ int cpacf_paes_ctr(CPUS390XState *env, const int mmu_idx, uintptr_t ra,for (i =0 ; i <MAX_BLOCKS_PER_RUN && len >=AES_BLOCK_SIZE ; i++) {/* read in nonce/ctr => ctr */ aes_read_block (env, mmu_idx, *ctr_ptr_reg + done, ctr, ra); -/* encrypt ctr => buf */ -AES_encrypt (ctr, buf, &exkey);/* read in one block of input data => in */ aes_read_block (env, mmu_idx, *src_ptr_reg + done, in, ra); -/* exor input data with encrypted ctr => out */ -aes_xor (in, buf, out); +/* 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, *dst_ptr_reg + done, out, ra); len -=AES_BLOCK_SIZE , done +=AES_BLOCK_SIZE ;
@@ -906,7 +858,7 @@ int cpacf_paes_xts(CPUS390XState *env, const int mmu_idx, uintptr_t ra, uint32_t type, uint8_t fc, uint8_t mod) { enum { MAX_BLOCKS_PER_RUN = 8192 / AES_BLOCK_SIZE }; -uint8_t buf1[AES_BLOCK_SIZE ], buf2[AES_BLOCK_SIZE ]; +uint8_t in[AES_BLOCK_SIZE ], out[AES_BLOCK_SIZE ];const MemOpIdx oi =make_memop_idx (MO_8 , mmu_idx);uint8_t key[32 ], wkvp[32 ], tweak[AES_BLOCK_SIZE ];uint64_t addr, len = *src_len_reg, done =0 ;
@@ -971,23 +923,19 @@ int cpacf_paes_xts(CPUS390XState *env, const int mmu_idx, uintptr_t ra,/* process up to MAX_BLOCKS_PER_RUN aes blocks */ for (i =0 ; i <MAX_BLOCKS_PER_RUN && len >=AES_BLOCK_SIZE ; i++) { -/* fetch one AES block into buf1 */ -aes_read_block (env, mmu_idx, *src_ptr_reg + done, buf1, ra); -/* buf1 xor tweak => buf2 */ -aes_xor (buf1, tweak, buf2); +/* fetch one AES block into in */ +aes_read_block (env, mmu_idx, *src_ptr_reg + done, in, ra);if (mod) { -/* decrypt buf2 => buf1 */ -AES_decrypt (buf2, buf1, &exkey); +/* decrypt in => out */ +AES_xts_decrypt (in, out, tweak, &exkey); }else { -/* encrypt buf2 => buf1 */ -AES_encrypt (buf2, buf1, &exkey); +/* encrypt in => out */ +AES_xts_encrypt (in, out, tweak, &exkey); } -/* buf1 xor tweak => buf2 */ -aes_xor (buf1, tweak, buf2);/* prep tweak for next round */ -aes_xts_prep_next_tweak (tweak); -/* write out this processed block from buf2 */ -aes_write_block (env, mmu_idx, *dst_ptr_reg + done, buf2, ra); +AES_xts_prep_next_tweak (tweak); +/* write out this processed block from out */ +aes_write_block (env, mmu_idx, *dst_ptr_reg + done, out, ra); len -=AES_BLOCK_SIZE , done +=AES_BLOCK_SIZE ; }
Signature · 1 line
2.43.0
Quoted 10 lines · Harald Freudenberger
This patch series extends the s390 qemu CPACF support to be able to run a subset of the CPACF instruction cross platform. There have been requests on the kernel crypto mailing list about a way to test s390 specific crypto implementations. For example a way to test s390 CPACF exploitation code like the s390_aes.ko kernel module.
So here now is a set of patches verified on x86 and s390 which over (slow but working) support for a subset of the subfunctions of some of the CPACF instructions.
Quoted 14 lines
Test: As this series is more or less complete, a full blown linux can be run and the 'usual' in-kernel crpyto modules will be automatically loaded which run a bunch of test cases. So there is now support for these kernel modules:
*sha256_s390x(autoloaded, sha256)
*sha512_s390x(autoloaded, sha512)
*aes_s390x(autoloaded, clear key aes ecb, cbc, ctr, xts)
*pkey_pckmo(autoloaded, derive AES protected key from clear key)
*paes_s390x(not autoloaded, protected key aes ecb, cbc, ctr, xts) All these modules run selftests if configured by the kernel (which is enabled by default). Failures are reported via syslog. Additionally the aes testcases from libica can be run either inside such an qemu environment or with a static build executed with the qemu tcg application qemu-s390x --cpu max <static-build-libica-test>.
So the test setup here would be to leverage the kernel tests, but not any QEMU tests? (I'm wondering if there's a way to integrate this into normal CI workflows; can we use the libica testcases for that? I'm not really familiar with how this is used.)
Also, is there any public documentation for these instructions? If not, it would be helpful if someone with access to the documentation could give an R-b here.
Otherwise, nothing bad jumped out at me.
Hi Cornelia,
Quoted 3 lines · Cornelia Huck
Also, is there any public documentation for these instructions? If not, it would be helpful if someone with access to the documentation could give an R-b here.
All CPACF instructions and related topics are documented in the z/Architecture Principles of Operation [1].
[1] https://www.ibm.com/docs/en/module_1678991624569/pdf/SA22-7832-14.pdf
Signature · 2 lines
Mit freundlichen Grüßen / Kind regards Holger Dengler
Quoted 11 lines · Holger Dengler
Hi Cornelia,
Quoted 3 lines · Cornelia Huck
Also, is there any public documentation for these instructions? If not, it would be helpful if someone with access to the documentation could give an R-b here.
All CPACF instructions and related topics are documented in the z/Architecture Principles of Operation [1].
[1] https://www.ibm.com/docs/en/module_1678991624569/pdf/SA22-7832-14.pdf
TIL :) Thanks!