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 935BE330D22 for ; Thu, 18 Jun 2026 06:09:04 +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=1781762945; cv=none; b=H6YkMqLkWbeQmz/9kZ1fH6tbA6rr811OvxImYlqmNi+6wWmEOme5rC1/WFIBp8KarUvHtn+OKscn0C8syOReJt3GzqFkFlY/WXEbrUPlBRgvdVy3tKZgM9KbCxlZdhgsI0jVCZugTi5HXzozto+ddhO1tZo+sXdIUT4+bVSugGI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781762945; c=relaxed/simple; bh=0WOoSDlgQMF/4d9X0FpSceGFGusqIVLuPdPo6ycPPFQ=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=Qcm3lcEHMezoNQm+Ry39phjx8Ip9642UR2M5Oi18ZEDM+VvrLxP0hZY8kJVBQ/Jc8jsny9jrNwRreWvBVCZbkzB+OIJ5aOtOFJnBPQBl82AHc/VXoTFRC7teQ9sMKCT9fa849vRfQmrp+goL58wzJ8WTUOHQS1joMtE7OkCc43A= 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=Jr5O9j6p; 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="Jr5O9j6p" 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 65HHmQvO1016585; Thu, 18 Jun 2026 06:08:57 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=pp1; bh=hZPlTK l7Ug3lJ4AFx76UQ3qjGuHiXsBYeW8HCL//Ksw=; b=Jr5O9j6p+BtngCIzoDBkZS ww0Tqi/hNmrcSgpOt5nywlFIx9pOBMrdCsK1o0bBaOTLS2AArfxw1WJwfEFE32gB enze9S23M9pe5TFfuWtxBG2TdfuxIGjtYUb6V8z8GmdB0QSOgdoiZwAfeQ9ig9CQ ffKP5hjLcMDul7Nlxk6FiECxj7A3BCf1UxCPyRmWFiyS4Vk2o43fd5LQqfdBK8ao +CC4aofT2xd/zYQaeQ45sdhsgUmmNJGft6vsYy/gyshkyaKXCTzjKPKOA9xtUV10 Xlf6yite9rlrWc9Be3tGDYOgl0FOnnJGJkslJbMcC/USdAQ/mzkAgeMmwfe8YpcQ == Received: from ppma23.wdc07v.mail.ibm.com (5d.69.3da9.ip4.static.sl-reverse.com [169.61.105.93]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4eueqxegjp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 18 Jun 2026 06:08:57 +0000 (GMT) Received: from pps.filterd (ppma23.wdc07v.mail.ibm.com [127.0.0.1]) by ppma23.wdc07v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 65I64fCT031398; Thu, 18 Jun 2026 06:08:56 GMT Received: from smtprelay04.fra02v.mail.ibm.com ([9.218.2.228]) by ppma23.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4ev172a9dw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 18 Jun 2026 06:08:56 +0000 (GMT) Received: from smtpav04.fra02v.mail.ibm.com (smtpav04.fra02v.mail.ibm.com [10.20.54.103]) by smtprelay04.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 65I68qt89961964 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 18 Jun 2026 06:08:52 GMT Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id AA15E2004B; Thu, 18 Jun 2026 06:08:52 +0000 (GMT) Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 7775520043; Thu, 18 Jun 2026 06:08:52 +0000 (GMT) Received: from [9.224.89.241] (unknown [9.224.89.241]) by smtpav04.fra02v.mail.ibm.com (Postfix) with ESMTP; Thu, 18 Jun 2026 06:08:52 +0000 (GMT) Message-ID: Date: Thu, 18 Jun 2026 08:08:52 +0200 Precedence: bulk X-Mailing-List: linux-s390@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v7 11/17] target/s390x: Support protected key AES CBC for cpacf kmc instruction Content-Language: en-GB To: Harald Freudenberger , 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, cohuck@redhat.com References: <20260617094820.34402-1-freude@linux.ibm.com> <20260617094820.34402-12-freude@linux.ibm.com> From: Finn Callies In-Reply-To: <20260617094820.34402-12-freude@linux.ibm.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-TM-AS-GCONF: 00 X-Authority-Analysis: v=2.4 cv=OcSoyBTY c=1 sm=1 tr=0 ts=6a338b79 cx=c_pps a=3Bg1Hr4SwmMryq2xdFQyZA==:117 a=3Bg1Hr4SwmMryq2xdFQyZA==:17 a=IkcTkHD0fZMA:10 a=FelO9ux0wxsA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=V8glGbnc2Ofi9Qvn3v5h:22 a=VnNF1IyMAAAA:8 a=E6Shn9zuVhdXiWxorOUA:9 a=QEXdDO2ut3YA:10 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjE4MDA1MSBTYWx0ZWRfX0/S1jxyMWdmp PLLQCxWOaPrWhaNOHTqfk+qp9NDolfix/Ir7O+0dfGsO2pCggpRrJNeOIOMc0RBo4lqHoGEm3g1 PTdoCIXBGSZQQxhxS71i2Kwdya7bthXpALCdKe6yng2J9TmWo6FZakVNwsQVwJX87eJXi4+5C9C MgTdqf3WKp/vhuE4H4oGWk2qpPJ4fgI1CW8o5j9pmYvmTbOqtjLMq7adQ4/VIoyqcOecYsyOjI9 /QVdNd+Gw40hW/rOKKZOdSpEoxcbmKuC6kdwQKGHkrjOTVXLH2afunpYlwnEFY4DVlWIbMFBXR0 dEZt9zu7JyIrhkaTa4VqQhO1Tf3u/ebszpV82Mk6BSlMYGv5+9KxW9y51Wk9vlhLRDDt7bdsTwL GTHbJW8sSjC4HySbS/n/lWbDdLIvUSR6pvrW5TfdjZTABvqxz1COE8n/3dlRkIPJuOpg5SnDOf4 B9DfiUefgX1XSdjT+XQ== X-Proofpoint-GUID: k2KgRmRlpZRBFmARJdd1V8gazSsYH7gJ X-Proofpoint-Spam-Info: AW1haW4tMjYwNjE4MDA1MSBTYWx0ZWRfX5XNPHUcLOS5M gykAhxeS3AXvi0soQzRHU85n64I9+Pa3zWY4zDvcSRDsuzIUSCEFk0DxLKBh5NxXWFwCsqy65BW AJATGGrAgEMTlBEVPVOQ0YLjp4yDDWA= X-Proofpoint-ORIG-GUID: k2KgRmRlpZRBFmARJdd1V8gazSsYH7gJ 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_02,2026-06-17_03,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-2606180051 On 17.06.26 11:48, Harald Freudenberger wrote: > Support the subfunctions CPACF_KMC_PAES_128, CPACF_KMC_PAES_192 > and CPACF_KMC_PAES_256 for the cpacf kmc instruction. > > Signed-off-by: Harald Freudenberger > Tested-by: Holger Dengler With the suggested changes: Reviewed-by: Finn Callies > --- > 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(+) > > diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c > index 71e0e41d6e..074c53aecd 100644 > --- a/target/s390x/gen-features.c > +++ b/target/s390x/gen-features.c > @@ -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, Again, either EAES -> PAES or EAES -> ENCRYPTED_AES > S390_FEAT_KMCTR_AES_128, > S390_FEAT_KMCTR_AES_192, > S390_FEAT_KMCTR_AES_256, [ snip ] > diff --git a/target/s390x/tcg/cpacf_aes.c b/target/s390x/tcg/cpacf_aes.c > index bcfcf3b660..a6487261e1 100644 > --- a/target/s390x/tcg/cpacf_aes.c > +++ b/target/s390x/tcg/cpacf_aes.c > @@ -620,3 +620,112 @@ int cpacf_paes_ecb(CPUS390XState *env, const int mmu_idx, uintptr_t ra, > > return !len ? 0 : 3; > } > + > +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) > +{ [ snip ] > + /* fetch protected key from param block */ > + for (i = 0; i < keysize; i++) { > + addr = wrap_address(env, param_addr + AES_BLOCK_SIZE + 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]; > + } You would already benefit from the suggested outsourcing. > + > + /* expand key */ > + if (mod) { > + AES_set_decrypt_key(key, keysize * 8, &exkey); > + } else { > + AES_set_encrypt_key(key, keysize * 8, &exkey); > + } [ snip ]