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 9B6183F8ED2 for ; Mon, 6 Jul 2026 09:43:34 +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=1783331018; cv=none; b=WnzYUkTA9FoKIb7JbepmenlieeMt3osg1aNUIYtknYTTuRj98UX/Jxoa4kHkyX46VK1aC9ExUYFmTixrePgdue+4sfS/gHtTtweVyKd4pzMfMkNTA4SkiIjuRahsp/DCTx90f4TU/1YXYMZklkE/OHUPo9ZHKHtrzJ68GQiE/cw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783331018; c=relaxed/simple; bh=cGjOMh+Iv+Bijl6GVaQ7rCEEZS3GPv239TBw9ln55tU=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=k+UD/IOZSvSywm6sYUicm6BG5PiaqLr3uGuk59+xWnB5Ma/sEph9exeb1WSO51/Gin2oglRFBr13stxQOoJC29ZrQ6eeHvhv6eLvXNdqUr+wfewuCXLkXvHRKhdecHSPuAAUMFHeABKhhy8uu4LRcIDVR/fC1jhl/N3VjTCIJvQ= 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=ibNIaO38; 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="ibNIaO38" Received: from pps.filterd (m0356516.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 6669Id233826572; Mon, 6 Jul 2026 09:43:21 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:message-id:mime-version :subject:to; s=pp1; bh=Wh/4rPp46SivOSGYZxnj/AZsnowXoQEZyL50EghZ+ h0=; b=ibNIaO38uwe8daPEqFMnIOnqJWfpvPftZHQ8Qx/5fOzftt6O/jM3PzXII T0U4F0Q38MZG4xY/c2P4jBcxp8/9zFZKe38hByrxldCYSb/5LwxCsEOnM4PKOvPB pXKVZbrqeGH5mVjrWiVTTXG3a9Bp5e8ZcF254MZwyXD+knZ+rCz9NbhKNblcQZ9s evbA6k4gmPg+Tll8dQMA5qneidfnwdKKOga6ik79U7S+GBbbE6jy//XTCN06vBud pJqa9jvAQJKD3G4pRmaGZbxRUeMBmL6EV4LolmUsOLVb4YTAWrhMlwCpw5R9IE0c cjiILT7Bj7zFQzYzUke6EuU05Z0Iw== Received: from ppma11.dal12v.mail.ibm.com (db.9e.1632.ip4.static.sl-reverse.com [50.22.158.219]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4f6qkn8vj8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 06 Jul 2026 09:43:20 +0000 (GMT) Received: from pps.filterd (ppma11.dal12v.mail.ibm.com [127.0.0.1]) by ppma11.dal12v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 6669Yb93030218; Mon, 6 Jul 2026 09:43:19 GMT Received: from smtprelay03.fra02v.mail.ibm.com ([9.218.2.224]) by ppma11.dal12v.mail.ibm.com (PPS) with ESMTPS id 4f7f6xvnqc-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 06 Jul 2026 09:43:19 +0000 (GMT) Received: from smtpav07.fra02v.mail.ibm.com (smtpav07.fra02v.mail.ibm.com [10.20.54.106]) by smtprelay03.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 6669hGLt54985074 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 6 Jul 2026 09:43:16 GMT Received: from smtpav07.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 177EB2004D; Mon, 6 Jul 2026 09:43:16 +0000 (GMT) Received: from smtpav07.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id D8F212004B; Mon, 6 Jul 2026 09:43:15 +0000 (GMT) Received: from funtu2.ibm.com (unknown [9.111.193.81]) by smtpav07.fra02v.mail.ibm.com (Postfix) with ESMTP; Mon, 6 Jul 2026 09:43:15 +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, linux-s390@vger.kernel.org, dengler@linux.ibm.com, borntraeger@linux.ibm.com, fcallies@linux.ibm.com, cohuck@redhat.com Subject: [PATCH v10 00/21] target/s390x: Extend qemu CPACF support Date: Mon, 6 Jul 2026 11:42:53 +0200 Message-ID: <20260706094317.17032-1-freude@linux.ibm.com> X-Mailer: git-send-email 2.43.0 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=Q/XiJY2a c=1 sm=1 tr=0 ts=6a4b78b8 cx=c_pps a=aDMHemPKRhS1OARIsFnwRA==:117 a=aDMHemPKRhS1OARIsFnwRA==:17 a=RAioF0-LDSMA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=Y2IxJ9c9Rs8Kov3niI8_:22 a=4kPY7uk7g80pab73rssA:9 X-Proofpoint-GUID: dxazoaWCo-5QlEBntSdF_MFCiKJ6tUyR X-Proofpoint-ORIG-GUID: dxazoaWCo-5QlEBntSdF_MFCiKJ6tUyR X-Proofpoint-Spam-Info: AW1haW4tMjYwNzA2MDA5NCBTYWx0ZWRfX6CkvKJawlx4i Fs6HXZjqdMPdy9nL+OpaoIY1A1QejcUl0eZri83knx4lZemvyJkfF1OmPr/mOGZ6pWxGHFRKzZA jNeu5NeW7WzmeBw4RK3nZzIYkb4Umoo= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzA2MDA5NCBTYWx0ZWRfX47uLuYsfUyvq 4r0OI1zIV18MLVZBS3WoZ/GidhlwlTLep0NkFocFg53ZPpLB0nFp38UJ7P+EFnFQCnevDNyX1hT fNlcPRtDV7n/JvVVY8h2Qd6+LcBlsVkSoklmp1rzNasYMx5VTYn05ntEVzdyxIPwPXXDWVJxmJZ EUpLqsrkA/2GqkE9+Vb2m9X9nGs/1GXrsR8i/Lbv1TtFiQ7ZaADYdHn/HFFfJnm/ohbefK05vqi uWoNKNVyXu1JWjIIWgGUodoFUlkOy65JKyYN2d+x3cFz/XZ17KGYcDj+lj6tdAHpQSG+R6XCSSJ O46eCIYgTppwEgZtdsT1Ew1aquWuvHVfV7wnUk75+4tCAfhOrEocD3q1gf/rXpeHX7BDOFIEBch Ug7ZCDV3dg6QL96TU4ieV5neTMwMZQfwYFxB5x47tc8q4Ql5o+dJd1ljmv2fuQCZHcWCj9saDsS p2zMgN+CsJ879MBvIcw== 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-07-06_01,2026-07-03_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 impostorscore=0 spamscore=0 phishscore=0 priorityscore=1501 bulkscore=0 clxscore=1015 lowpriorityscore=0 suspectscore=0 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607060094 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: There are some very basic tests included with this patch series suitable for some CI run. Better test coverage can be done by running a full blown Linux and use for example the in-kernel crypto modules. 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 . 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. v7: - Update on docs/system/s390x/cpacf.rst to mention the zArchicteture Principles of Operation document which describes all these CPACF instructions. v8: - Add a fix which deals with incorrect address handling in the sha512 implementation related to fetch and push data from/to memory. - Slight rework around the capcf function implementation and exception generation. - Added some more details to the new cpacf.rst file. - Fixed some typos and added some suggestions from Finn. - Fixed cc handling on return of PCKMO (must not update cc). Missing: simple test cases to verify that the implemented and not implemented cpacf functions and subfunctions work as expected. But see the statement about tests at the header. v9: - Add simple tests for all the implemented CPACF instructions but pckmo (which is a privileged instruction). - Reworked the Fix for wrong address to call the wrap function inline; rephrased commit header. - Improve the header file cpacf.h to hold defines for all the cpacf instruction functions and use them in the code. - one new commit comprising the base protected key support with exposing the xor pattern and wkvp and en/decrypt key functions via cpacf.h. So the testcases can use this header file. - one new commit which reworks the fetch memory and store memory from and to guest (suggested by Ilya Leoshkevich). v10: - Fixed v9 patch 3 (cpacf_sha512.c was missing) Please note that patch #10 "target/s390x: Base support for cpacf protected keys" produces a build warning ("unused function"). As by default the qemu build has warnings=errors enabled, this one patch does not build on it's own. If this is not acceptable, the hunk introducing the two functions may be moved to the next commit; another solution would be to merge with patch #11. Harald Freudenberger (21): target/s390x: Fix wrong address handling in address loops 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: Base support for cpacf protected keys 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 target/s390x: Improve fetch and store mem from and to guest tests/tcg/s390x: Add tests for CPACF instructions crypto/aes-helpers.c | 106 ++++ crypto/meson.build | 1 + docs/system/s390x/cpacf.rst | 144 +++++ docs/system/target-s390x.rst | 1 + include/crypto/aes.h | 14 + target/s390x/gen-features.c | 31 ++ target/s390x/tcg/cpacf.h | 312 +++++++++++ target/s390x/tcg/cpacf_aes.c | 903 +++++++++++++++++++++++++++++++ target/s390x/tcg/cpacf_sha256.c | 228 ++++++++ target/s390x/tcg/cpacf_sha512.c | 241 +++++++++ target/s390x/tcg/crypto_helper.c | 426 ++++++++------- target/s390x/tcg/insn-data.h.inc | 1 + target/s390x/tcg/meson.build | 3 + target/s390x/tcg/translate.c | 11 +- tests/tcg/s390x/Makefile.target | 9 + tests/tcg/s390x/cpacf-kdsa.c | 59 ++ tests/tcg/s390x/cpacf-kimd.c | 164 ++++++ tests/tcg/s390x/cpacf-klmd.c | 202 +++++++ tests/tcg/s390x/cpacf-km.c | 576 ++++++++++++++++++++ tests/tcg/s390x/cpacf-kmac.c | 59 ++ tests/tcg/s390x/cpacf-kmc.c | 342 ++++++++++++ tests/tcg/s390x/cpacf-kmctr.c | 354 ++++++++++++ tests/tcg/s390x/cpacf-pcc.c | 241 +++++++++ tests/tcg/s390x/cpacf-prno.c | 130 +++++ tests/tcg/s390x/cpacf.h | 570 +++++++++++++++++++ 25 files changed, 4911 insertions(+), 217 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 create mode 100644 tests/tcg/s390x/cpacf-kdsa.c create mode 100644 tests/tcg/s390x/cpacf-kimd.c create mode 100644 tests/tcg/s390x/cpacf-klmd.c create mode 100644 tests/tcg/s390x/cpacf-km.c create mode 100644 tests/tcg/s390x/cpacf-kmac.c create mode 100644 tests/tcg/s390x/cpacf-kmc.c create mode 100644 tests/tcg/s390x/cpacf-kmctr.c create mode 100644 tests/tcg/s390x/cpacf-pcc.c create mode 100644 tests/tcg/s390x/cpacf-prno.c create mode 100644 tests/tcg/s390x/cpacf.h base-commit: 20553466cc47af6a8c95f665b601fce3c852e503 -- 2.43.0