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 7383F3E5A01 for ; Tue, 7 Jul 2026 16:18:32 +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=1783441114; cv=none; b=Mxe7kBZfbTeE1F1FEN+PgHuCxjx3oxnEPqy/1t+h/lFyt5srqYFDHMStMp1UcK6H8UQq4fToFHRNUOFDs2WWk2mJN6/RoeMOoZQ2w4paB3j6AvUs6ugaIrR+iwfit5qd6icfoKSuFI06eZOcIWDROlw2cN1ltuED/83bK01iTss= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783441114; c=relaxed/simple; bh=wGFKvMk3C4TsJyFnMbnUZwSE1McTVqWJUyxIkL8Ht9Y=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=R5Aj3SPgM5DoLtqILjMGM2HgvH9vaaoMwtqso5/ghKMbfYrww8fJXLEoGMG1XsK/Zwr2qImoS3r+e+tfVJbqFi7lFGvI/HmpnP1F+QYdsyrrT4OpWNnBEOaP2lTdFNshVBAAPWtvu1DJ0WmB1gPcSGqHz0UaXuOGtVTEOJBM1Qg= 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=ocDX8F7A; 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="ocDX8F7A" Received: from pps.filterd (m0360072.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 667FmIRK3424575; Tue, 7 Jul 2026 16:18:19 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=lm2TPCQN/iEJHdnmUzi//95wrVDlKt3ZkRy8fCNdU gI=; b=ocDX8F7A56ZUU80TQeeN2PaufilNrrPTMvQMSHE43T2O9wadr63swt5KC /rORXlgrP4Dw9fdM+VBKUKMdp4FEqQgoftwObMyduafHIVYAyYB5/uOKrnY1ChCi ENHmXX7dPorh12qhV/CLEtk4DXOiv73J5JWhtLnuRTFun4tflyRh6vrhm46V+Zce REE745uS0pH00tAoJSQR2qlw8qoodaD93nmWG+yELtZtG47HEGJFaWIPYGabS96A kaP+JlY4NPPX/p2yft3CcmtJBZ7zcCnqbsmHBDrqUV4g7g6ApSnPcivIEmmU33Ib 3LmuiPn6jLyMSGn2a2tKxoPY/GUhg== 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 4f6stsrk2b-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 07 Jul 2026 16:18:18 +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 667G4apn025990; Tue, 7 Jul 2026 16:18:18 GMT Received: from smtprelay06.fra02v.mail.ibm.com ([9.218.2.230]) by ppma11.dal12v.mail.ibm.com (PPS) with ESMTPS id 4f7f6y39tg-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 07 Jul 2026 16:18:17 +0000 (GMT) Received: from smtpav07.fra02v.mail.ibm.com (smtpav07.fra02v.mail.ibm.com [10.20.54.106]) by smtprelay06.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 667GIEaa26149220 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 7 Jul 2026 16:18:14 GMT Received: from smtpav07.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 0C0772005A; Tue, 7 Jul 2026 16:18:14 +0000 (GMT) Received: from smtpav07.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id CF2B82004E; Tue, 7 Jul 2026 16:18:13 +0000 (GMT) Received: from funtu2.ibm.com (unknown [9.111.140.5]) by smtpav07.fra02v.mail.ibm.com (Postfix) with ESMTP; Tue, 7 Jul 2026 16:18:13 +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 v11 00/21] target/s390x: Extend qemu CPACF support Date: Tue, 7 Jul 2026 18:17:47 +0200 Message-ID: <20260707161815.40919-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-Proofpoint-ORIG-GUID: p_pOuAtu5Hm83-DSrmbiMXFDETe0oytw X-Proofpoint-Spam-Info: AW1haW4tMjYwNzA3MDE2MCBTYWx0ZWRfX58UX298MUPTj hz4cvS+Xc/08MoTk2MbX2/eca9RgkHFanl7R2G7VePzW9WMMBCxXPcLwcP44nEtaOzt6egct0UA vjGJPDTwsky5QYEm99wmafvEnLc3qqE= X-Authority-Analysis: v=2.4 cv=DKW/JSNb c=1 sm=1 tr=0 ts=6a4d26ca cx=c_pps a=aDMHemPKRhS1OARIsFnwRA==:117 a=aDMHemPKRhS1OARIsFnwRA==:17 a=RAioF0-LDSMA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=RzCfie-kr_QcCd8fBx8p:22 a=4kPY7uk7g80pab73rssA:9 X-Proofpoint-GUID: p_pOuAtu5Hm83-DSrmbiMXFDETe0oytw X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzA3MDE2MCBTYWx0ZWRfX41tSrDXQVBte FRatnuswFR8xWAqwwGMAnl5/San4EZ2lS4bVWuHaefJY+vOfNc/A0A7buDlqTR/Wp+J7p7XeecR ycqZmLVhAj0PUvCncRJzoK6pQWnj2I/iQGsiKf12jPF+oeC5ccHHrlngHS5w2htz+pjbaNqvVas ndJ6RhXywuM0lT28lC6JRrZ8R9YpPfnITGL05kZSiwleGvRokRWO18Dupwnci9gNVIg4hKypVmV hK2QbBsbd+zzCG/jbZyJmVSvFGBIKFOUXZul11Nl33rF4hcUrIy5b4WjaWXelVDjmIa3zY0rznu jO1HpL5TFR9tmwx8fvZG0Bb0da17CLVtkc9SWQyQ+BXyA9a1enxfFt2n1EXfq4fR/G0E8IoW5Th cOyVWZ6jCBWu1s5ApxXGZl9nk8qWH9R/Sa8dTXi0ljxtqJ6JqLyvpopyZfwP4k0BTn+W8gZ9nSR p2th4pGFaTKQnVwkVaA== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-07_04,2026-07-06_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 bulkscore=0 clxscore=1015 phishscore=0 impostorscore=0 priorityscore=1501 adultscore=0 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-2607070160 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. v11: Fixed nearly all checkpatch findings - only the warnings about Maintainers may need update is still there. 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 | 146 +++++ 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 | 902 +++++++++++++++++++++++++++++++ target/s390x/tcg/cpacf_sha256.c | 227 ++++++++ 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 | 58 ++ tests/tcg/s390x/cpacf-kimd.c | 166 ++++++ tests/tcg/s390x/cpacf-klmd.c | 206 +++++++ tests/tcg/s390x/cpacf-km.c | 590 ++++++++++++++++++++ tests/tcg/s390x/cpacf-kmac.c | 58 ++ tests/tcg/s390x/cpacf-kmc.c | 351 ++++++++++++ tests/tcg/s390x/cpacf-kmctr.c | 360 ++++++++++++ tests/tcg/s390x/cpacf-pcc.c | 245 +++++++++ tests/tcg/s390x/cpacf-prno.c | 131 +++++ tests/tcg/s390x/cpacf.h | 571 +++++++++++++++++++ 25 files changed, 4950 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: 94826ec1370328375c3b6d1e80fdc94c8f46c348 -- 2.43.0