From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 86CA73CE0B4 for ; Wed, 17 Jun 2026 09:48:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.158.5 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781689721; cv=none; b=qQ0GlFBuuwfo0qD93BozaFc+w0IrJDkHbryNLROqhTQNsnoUD1v23OL5V6Tqr+NQhOj/9ZGW/fbO8v0hLX6h+IlxKisFyjZOSjGOIabs7XuHXvwE+WyzrAcQgpROWr+xzv2tuDdPT138VeZ9G59kk4IkXobQkLvIN1tKoTuqR9M= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781689721; c=relaxed/simple; bh=Qct8XNgai0kICEBEFwXV9cTY8RmJkGiWbjLbITX06wg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=llIMqLRpFdbAZjEp1ZqQLx5K8RBjM5nWmpskUtW/+qZVNhNkwNZKdztzpPjlL3YSVMV7kkJWrsEnvF68HDGZ4M0l9MeEuJlGzQL5k+Bhmc2KmsQed1Bt9jDRRn4iNzOOK+WTmS/vHUra4jRUwTwzKSZ9dvRm1bK68WcAhCEbJKA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=fdhn/VWo; arc=none smtp.client-ip=148.163.158.5 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="fdhn/VWo" Received: from pps.filterd (m0353725.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 65H8nMZ24042648; Wed, 17 Jun 2026 09:48:28 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=xo7pvH/X4yi+gCUPr GrW2XBKdW8exQ2xAF/cbSvA7oU=; b=fdhn/VWoJvgBmBNH0L28OTO9WnFjPP6jV PG/BeK5zqBtDlEXYlZPnmJo5SLnVZHxA4szZsTRb9X8yZNv7YCL4g7ggnj1kxX8H x2lBJE/QumSRQFo4mkBRXB7LLKmS4kA4vdFPNrTkP7qijlkZQMy542bEnEbNPQoz WYaSWUkH/a6dSWwFo2ULPtUZsgGE8USWQSphh8QLbKF5KvwK/HmXEqZ5YQi/9VeU /V+2ffwCGhxfSjJMyZpYgVzYhscm033vVm8Mex7O3yy6ysSnv1pNMeJD93DRe/a9 fuVW5eD/9x/OiOyoOB2GxVFW+/nqMDH3V2IJEwqyk4HRR5PsK0yHQ== Received: from ppma21.wdc07v.mail.ibm.com (5b.69.3da9.ip4.static.sl-reverse.com [169.61.105.91]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4eueqxa7xj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 17 Jun 2026 09:48:28 +0000 (GMT) Received: from pps.filterd (ppma21.wdc07v.mail.ibm.com [127.0.0.1]) by ppma21.wdc07v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 65H9Yf8t008357; Wed, 17 Jun 2026 09:48:27 GMT Received: from smtprelay01.fra02v.mail.ibm.com ([9.218.2.227]) by ppma21.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4eudvaags2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 17 Jun 2026 09:48:27 +0000 (GMT) Received: from smtpav02.fra02v.mail.ibm.com (smtpav02.fra02v.mail.ibm.com [10.20.54.101]) by smtprelay01.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 65H9mNf440305134 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 17 Jun 2026 09:48:23 GMT Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id BFD6920043; Wed, 17 Jun 2026 09:48:23 +0000 (GMT) Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 91F362004F; Wed, 17 Jun 2026 09:48:23 +0000 (GMT) Received: from funtu2.ehn-de.ibm.com (unknown [9.224.92.54]) by smtpav02.fra02v.mail.ibm.com (Postfix) with ESMTP; Wed, 17 Jun 2026 09:48:23 +0000 (GMT) From: Harald Freudenberger 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, linux390-list@tuxmaker.boeblingen.de.ibm.com, linux-s390@vger.kernel.org, dengler@linux.ibm.com, borntraeger@linux.ibm.com, fcallies@linux.ibm.com, cohuck@redhat.com Subject: [PATCH v7 12/17] target/s390x: Support protected key AES CTR for cpacf kmctr instruction Date: Wed, 17 Jun 2026 11:48:15 +0200 Message-ID: <20260617094820.34402-13-freude@linux.ibm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260617094820.34402-1-freude@linux.ibm.com> References: <20260617094820.34402-1-freude@linux.ibm.com> Precedence: bulk X-Mailing-List: linux-s390@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Authority-Analysis: v=2.4 cv=OcSoyBTY c=1 sm=1 tr=0 ts=6a326d6c cx=c_pps a=GFwsV6G8L6GxiO2Y/PsHdQ==:117 a=GFwsV6G8L6GxiO2Y/PsHdQ==:17 a=FelO9ux0wxsA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=V8glGbnc2Ofi9Qvn3v5h:22 a=VnNF1IyMAAAA:8 a=f59o6tnjY-_5Ge3baHwA:9 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjE3MDA5MiBTYWx0ZWRfXwuCv0uFN4IgS 1foreO5ETzEEpaA50ITgYwP/Vsexmk+g23xoreQpTYOzY8d6WFf8Rx3UmKGpZ3DNx38eMfsg7oW N2ncrMqTaW+9RUGVJZZpvQFotrPS8oyu/gN7iRb9dn1JCl/LS6TGhkWWIYYNpk+b/ZmkMgfyu41 pCq+a5ls1nHxX4tyAew7BnB/KkK8a4XJ3Oo9v156/6zKwT5xmRXxjeQu/uwV4bbNXho1vJGyWZL 1zObxCxfEHkgvbrUWaJHTPtA0n9mKrrjj21lDe/lmuDV57PHEwNrR2vCAarvqHMCxJJP6PAHZgs 9P9OYii6/YEO6tRisqe6BcopE+uixdYy5k1S+jja1cZFuW/+Ad9p7JQOvR0IFuK3YLbxbZBsVdQ BE7my0+m2G8gEpESTWSyQvaVBkokVTLj8wcvIgH7vffcTkxHI4YWkGPRB1y/5y/HsR5ftl7JHR/ TEpd/m/fy2AkV1LH+HA== X-Proofpoint-GUID: GRbGu_rxwjPl2RkF3nYbH4xFbgspwzn0 X-Proofpoint-Spam-Info: AW1haW4tMjYwNjE3MDA5MiBTYWx0ZWRfX5cidD09JS0kt 1VqzkPKrDOZ71Sl/xXYqsuXeL5b2TkebEWu5dTVPGhZVJyThwlZJLVN0iTriiaZVLCNNZ7stg86 WcJhW4o+CBHgdVqtbeIiqy1wxPEnkdQ= X-Proofpoint-ORIG-GUID: GRbGu_rxwjPl2RkF3nYbH4xFbgspwzn0 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.125,FMLib:17.12.100.49 definitions=2026-06-17_01,2026-06-16_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 phishscore=0 bulkscore=0 suspectscore=0 lowpriorityscore=0 impostorscore=0 malwarescore=0 spamscore=0 adultscore=0 clxscore=1015 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2606170092 Support the subfunctions CPACF_KMCTR_PAES_128, CPACF_KMCTR_PAES_192 and CPACF_KMCTR_PAES_256 for the cpacf kmctr instruction. Signed-off-by: Harald Freudenberger --- 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(+) diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c index 074c53aecd..4a131dc191 100644 --- a/target/s390x/gen-features.c +++ b/target/s390x/gen-features.c @@ -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, diff --git a/target/s390x/tcg/cpacf.h b/target/s390x/tcg/cpacf.h index e302c17a2f..223bada622 100644 --- a/target/s390x/tcg/cpacf.h +++ b/target/s390x/tcg/cpacf.h @@ -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 diff --git a/target/s390x/tcg/cpacf_aes.c b/target/s390x/tcg/cpacf_aes.c index a6487261e1..ffa286d422 100644 --- a/target/s390x/tcg/cpacf_aes.c +++ b/target/s390x/tcg/cpacf_aes.c @@ -729,3 +729,93 @@ int cpacf_paes_cbc(CPUS390XState *env, const int mmu_idx, uintptr_t ra, return !len ? 0 : 3; } + +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) +{ + 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; + int i, keysize, addr_reg_size = 64; + uint8_t key[32], wkvp[32]; + AES_KEY exkey; + + g_assert(type == S390_FEAT_TYPE_KMCTR); + + switch (fc) { + case 0x1a: /* CPACF_KMCTR_PAES_128 */ + keysize = 16; + break; + case 0x1b: /* CPACF_KMCTR_PAES_192 */ + keysize = 24; + break; + case 0x1c: /* CPACF_KMCTR_PAES_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 and check wkvp from param block */ + for (i = 0; i < sizeof(wkvp); i++) { + addr = wrap_address(env, param_addr + keysize + i); + wkvp[i] = cpu_ldb_mmu(env, addr, oi, ra); + } + if (memcmp(wkvp, protkey_wkvp, sizeof(wkvp))) { + /* wkvp mismatch -> return with cc 1 */ + return 1; + } + + /* fetch protected key from param block */ + for (i = 0; i < keysize; i++) { + addr = wrap_address(env, param_addr + i); + key[i] = cpu_ldb_mmu(env, addr, oi, ra); + } + /* 'decrypt' the protected key */ + for (i = 0; i < keysize; i++) { + key[i] ^= protkey_xor_pattern[i]; + } + + /* 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, *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); + /* 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; + } + + *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 3fc48bc9a1..60c3ebd79e 100644 --- a/target/s390x/tcg/crypto_helper.c +++ b/target/s390x/tcg/crypto_helper.c @@ -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(); } -- 2.43.0