From nobody Fri Oct 2 06:57:48 2026 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (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 B5148366546; Tue, 4 Aug 2026 11:37:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.156.1 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785843472; cv=none; b=ADqlqCX78EpbrdKJH0+0nFp4+zM3fX8dUjit3Lmwu2fbvTkMu4zpJt106FjyEYEUu5apYDSnncWzQ3AVMnIPwCBgv72gu6cAjCkuhsng6KoRR0KmjLdKBpCCOf5kbHYljKSSx7NNL3BoW+Gm1tNS6NeT3dr5CqZGQQkLXcbzLQA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785843472; c=relaxed/simple; bh=ts0XQmNOx7XtHue//tpOAU9G//jcEVC8cJ+sDvhsDFU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ez+qh6sM1KVxowPf6sgaiELdGfHdKKCvhNSUHju0ExqTk9X7EGWhMugsMn0xWNHq/rNnC/Sk86v04X6AvkCAoWvvpC8Y9OIA9J2cZxzGNH5d0AoWSwMj7xnAriQIZBWl6+NLMXeuHnqZAE3Pnqe9s+HlaDftleybnM14ubQAXak= 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=T5c2eXW3; arc=none smtp.client-ip=148.163.156.1 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="T5c2eXW3" Received: from pps.filterd (m0356517.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 6748HUJS323443; Tue, 4 Aug 2026 11:37:42 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=XwGGfuvy4HLVO8e/x epTISc9Tht5d7q5k1aAnxJNsaU=; b=T5c2eXW332x3f4waFmiBuPcoL0FVvFK/A ugvN8hYjFWaqszYtV2HmqbsC2dr6MJFhsJf4mCEsNi7+WoDGneoBAqSZbqn78VQf 6E7ZmTzaKh/945cQhlDSieHu8++kbc7YT6R5UEuNPws1zTFLItx27okyRuwD3EU2 xWWOdbL1KOyKz1N/ZR/aCAXJdC2Y5JM8EDNNCA3b70c0RVHsGBvOfnlC+/VvxK2J 0Aol5HUFkYuExoaQbzQby/gYJRwJEw5AXcLQod1HXWDQEbqZO3w79VdSSjdnCGS8 YY4mlASe57PUx9AumhYX3v3PDDHjTAmxwyP0WoQERfHPOFt1UZ9dw== 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 4fs8h4wkbv-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 04 Aug 2026 11:37:42 +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 674BQLdg009806; Tue, 4 Aug 2026 11:37:40 GMT Received: from smtprelay05.fra02v.mail.ibm.com ([9.218.2.225]) by ppma23.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4fsvmh9neu-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 04 Aug 2026 11:37:40 +0000 (GMT) Received: from smtpav04.fra02v.mail.ibm.com (smtpav04.fra02v.mail.ibm.com [10.20.54.103]) by smtprelay05.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 674Bbapv44171696 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 4 Aug 2026 11:37:37 GMT Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id D31AB2004B; Tue, 4 Aug 2026 11:37:36 +0000 (GMT) Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id A33A12004D; Tue, 4 Aug 2026 11:37:36 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.87.85.9]) by smtpav04.fra02v.mail.ibm.com (Postfix) with ESMTP; Tue, 4 Aug 2026 11:37:36 +0000 (GMT) From: Heiko Carstens To: Harald Freudenberger , Holger Dengler , Herbert Xu Cc: Alexander Gordeev , Sven Schnelle , Vasily Gorbik , Christian Borntraeger , linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org, linux-crypto@vger.kernel.org Subject: [PATCH 1/3] s390/crypto: Rework ctr_aes_crypt() to remove conditional locking Date: Tue, 4 Aug 2026 13:37:34 +0200 Message-ID: <20260804113736.1423667-2-hca@linux.ibm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260804113736.1423667-1-hca@linux.ibm.com> References: <20260804113736.1423667-1-hca@linux.ibm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-Spam-Info: AW1haW4tMjYwODA0MDA5MCBTYWx0ZWRfX++kZP1pquKVD t/t+37fCUXjFwXA+st3Jf3TrLXGhD6kwt7pwYCusagMk7KC8PclyNrOCz4sDEQvy3OmDsvQ6UXM NPTkJhqvSpNXdWazjIHdSt8H1/1vIVY= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODA0MDA5MCBTYWx0ZWRfX4LLoEbkE4wCt /C9yvxyKERzL5IW292wYduCN+M1ehACuB4SMphO3d/PqeOT8gn2pnPLDx59XWkDljPhMrX911q/ KBh9oSczuZ9H9Xor7TMkVfIW8eHneEE2WctQzpdm+nLfSuavSDpvP/N2rhfqryqiG7OJohcWAQ/ gYXrAGM2ZXwBKdKWh84DkYy53lkyBBHWcr9GX0vx10OTC2bRALhKpstYTRo7wQ/C4TwSC2Z0cNJ 2bs4TchJMIB5bHUkG8O7h69ru41H/UE1dDJdxfil7dZkMqyP0B8amCv+kAuO+7obOD5g0gw8ZFh UvHHgV04mRdKZsI/KlB0iB1/VPod1X0z8hYgiXI2nApJFJAgxqwpJNDxiFPUpc2IZerIdI9B0R3 AIrhcsXhe3eecW2uDwcubohKGpMuyROFv8uQqEBLZ4agB9QE1qNsoWvub/mXAcNwz+aO2dbztLp hH+4n8ZVx8wU0dRFRXQ== X-Authority-Analysis: v=2.4 cv=SI1ykuvH c=1 sm=1 tr=0 ts=6a71cf06 cx=c_pps a=3Bg1Hr4SwmMryq2xdFQyZA==:117 a=3Bg1Hr4SwmMryq2xdFQyZA==:17 a=Sv0fKeRqtYgA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=U7nrCbtTmkRpXpFmAIza:22 a=VnNF1IyMAAAA:8 a=WSDBmxW9uEwFgrZJePAA:9 X-Proofpoint-ORIG-GUID: g0gSl_rI6OLYr8Oncl10UV8EXrqj3Chh X-Proofpoint-GUID: g0gSl_rI6OLYr8Oncl10UV8EXrqj3Chh X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-08-04_02,2026-08-03_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 bulkscore=0 suspectscore=0 impostorscore=0 spamscore=0 phishscore=0 priorityscore=1501 lowpriorityscore=0 adultscore=0 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608040090 Content-Type: text/plain; charset="utf-8" Clang's compiler based static context analysis does not work with locks that are conditionally taken like in ctr_aes_crypt(): arch/s390/crypto/aes_s390.c:585:13: warning: mutex 'ctrblk_lock' is not hel= d on every path through here [-Wthread-safety-analysis] 585 | ctrptr =3D (n > AES_BLOCK_SIZE) ? ctrblk : walk.iv; | ^ Given that code which takes locks conditionally can be considered suboptimal rework ctr_aes_crypt() to get rid of this. Signed-off-by: Heiko Carstens --- arch/s390/crypto/aes_s390.c | 54 ++++++++++++++++++++++++------------- 1 file changed, 35 insertions(+), 19 deletions(-) diff --git a/arch/s390/crypto/aes_s390.c b/arch/s390/crypto/aes_s390.c index 62edc66d5478..4b7e47423e89 100644 --- a/arch/s390/crypto/aes_s390.c +++ b/arch/s390/crypto/aes_s390.c @@ -562,37 +562,53 @@ static unsigned int __ctrblk_init(u8 *ctrptr, u8 *iv,= unsigned int nbytes) return n; } =20 +static int __ctr_aes_crypt(struct s390_aes_ctx *sctx, + struct skcipher_walk *walk, bool locked) +{ + unsigned int n, nbytes; + int ret =3D 0; + u8 *ctrptr; + + while ((nbytes =3D walk->nbytes) >=3D AES_BLOCK_SIZE) { + n =3D AES_BLOCK_SIZE; + if (nbytes >=3D 2 * AES_BLOCK_SIZE && locked) + n =3D __ctrblk_init(ctrblk, walk->iv, nbytes); + ctrptr =3D (n > AES_BLOCK_SIZE) ? ctrblk : walk->iv; + cpacf_kmctr(sctx->fc, sctx->key, walk->dst.virt.addr, + walk->src.virt.addr, n, ctrptr); + if (ctrptr =3D=3D ctrblk) { + memcpy(walk->iv, ctrptr + n - AES_BLOCK_SIZE, + AES_BLOCK_SIZE); + } + crypto_inc(walk->iv, AES_BLOCK_SIZE); + ret =3D skcipher_walk_done(walk, nbytes - n); + } + + return ret; +} + static int ctr_aes_crypt(struct skcipher_request *req) { struct crypto_skcipher *tfm =3D crypto_skcipher_reqtfm(req); struct s390_aes_ctx *sctx =3D crypto_skcipher_ctx(tfm); - u8 buf[AES_BLOCK_SIZE], *ctrptr; struct skcipher_walk walk; - unsigned int n, nbytes; - int ret, locked; + u8 buf[AES_BLOCK_SIZE]; + unsigned int nbytes; + int ret; =20 if (unlikely(!sctx->fc)) return fallback_skcipher_crypt(sctx, req, 0); =20 - locked =3D mutex_trylock(&ctrblk_lock); - ret =3D skcipher_walk_virt(&walk, req, false); - while ((nbytes =3D walk.nbytes) >=3D AES_BLOCK_SIZE) { - n =3D AES_BLOCK_SIZE; =20 - if (nbytes >=3D 2*AES_BLOCK_SIZE && locked) - n =3D __ctrblk_init(ctrblk, walk.iv, nbytes); - ctrptr =3D (n > AES_BLOCK_SIZE) ? ctrblk : walk.iv; - cpacf_kmctr(sctx->fc, sctx->key, walk.dst.virt.addr, - walk.src.virt.addr, n, ctrptr); - if (ctrptr =3D=3D ctrblk) - memcpy(walk.iv, ctrptr + n - AES_BLOCK_SIZE, - AES_BLOCK_SIZE); - crypto_inc(walk.iv, AES_BLOCK_SIZE); - ret =3D skcipher_walk_done(&walk, nbytes - n); - } - if (locked) + if (mutex_trylock(&ctrblk_lock)) { + ret =3D __ctr_aes_crypt(sctx, &walk, true); mutex_unlock(&ctrblk_lock); + } else { + ret =3D __ctr_aes_crypt(sctx, &walk, false); + } + + nbytes =3D walk.nbytes; /* * final block may be < AES_BLOCK_SIZE, copy only nbytes */ --=20 2.53.0 From nobody Fri Oct 2 06:57:48 2026 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (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 4AD92367B71; Tue, 4 Aug 2026 11:37:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.156.1 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785843473; cv=none; b=aT7lr8vmSTAWQw+xp13Td5yl1S4ons8oNaNJN0n7PlpiviScGIAtQfh3vzH5AnQKt4SN3n2frJGpU8+7/j9r1u1CUSWMvpu8zKWLU+v9oDGMr2nYfcYOe/T/0IoJ0Vuexg9/qIczFAsw4/055xKw5ZlAywLRDKVJGay4u++Pw8I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785843473; c=relaxed/simple; bh=eJNjEQmcOcwt1zVIh2UcoddTj0ZphN8gmeoJRMgY8Nc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RhLu08AVi+CE38YSlalHZCWXq4nrFicvXGH6x5m+VN7J6VdTJ+S/1MiRrpLf/noqrk/NxObDuUidbBGrapGoTpNKfawGkwcXTmDo166/5/FcH0YHkppFSM14n2Z7aZPyVBqXjRbhxcz05rAKxfEe8FGoeKZFrY7eZY3Lj1FNf4E= 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=OIdPia8W; arc=none smtp.client-ip=148.163.156.1 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="OIdPia8W" Received: from pps.filterd (m0356517.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 6748HYmS323765; Tue, 4 Aug 2026 11:37:42 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=n1tP/Wb6I+V56lc0X H0QW++tQ4IYzSXAzAfvoyTkBNU=; b=OIdPia8WDA/8DLlNHha6BPbSjMK9vHTbH zjajGSYGFreK0ZVs4yWE9X/PNk457Jg26r7l6X7/aZi9gTleE7TqdRjHGdaPZqq7 cmApXA1nD8jdbPI0AR0wWJ1az/mpdx4jSW4qEonFcLYnr+1RSSD7U+xGNBmJLcTW hMWudTPIbkwQmwEUvg2Mn2VG9W0GQ6TuZjcbkyX2mAOT9EqRZPR4XfLBuwfNyqgE VYHj125xbUIr+uafEu6xAKFUr0xrxCAb2QW4+IXdiQxUjjpcZW2vPYesplbh1OhF 8nwFFbwPVD6JJNgR2goD7Xw4urcDAF+bsntBPNJ8WXDJqzj2fgYww== Received: from ppma22.wdc07v.mail.ibm.com (5c.69.3da9.ip4.static.sl-reverse.com [169.61.105.92]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4fs8h4wkbw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 04 Aug 2026 11:37:42 +0000 (GMT) Received: from pps.filterd (ppma22.wdc07v.mail.ibm.com [127.0.0.1]) by ppma22.wdc07v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 674BBIwR020840; Tue, 4 Aug 2026 11:37:41 GMT Received: from smtprelay06.fra02v.mail.ibm.com ([9.218.2.230]) by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4fsugw1tpx-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 04 Aug 2026 11:37:40 +0000 (GMT) Received: from smtpav04.fra02v.mail.ibm.com (smtpav04.fra02v.mail.ibm.com [10.20.54.103]) by smtprelay06.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 674BbbfE32702914 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 4 Aug 2026 11:37:37 GMT Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 1293E2004B; Tue, 4 Aug 2026 11:37:37 +0000 (GMT) Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id D8FFC2004E; Tue, 4 Aug 2026 11:37:36 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.87.85.9]) by smtpav04.fra02v.mail.ibm.com (Postfix) with ESMTP; Tue, 4 Aug 2026 11:37:36 +0000 (GMT) From: Heiko Carstens To: Harald Freudenberger , Holger Dengler , Herbert Xu Cc: Alexander Gordeev , Sven Schnelle , Vasily Gorbik , Christian Borntraeger , linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org, linux-crypto@vger.kernel.org Subject: [PATCH 2/3] s390/crypto: Rework ctr_paes_do_crypt() to remove conditional locking Date: Tue, 4 Aug 2026 13:37:35 +0200 Message-ID: <20260804113736.1423667-3-hca@linux.ibm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260804113736.1423667-1-hca@linux.ibm.com> References: <20260804113736.1423667-1-hca@linux.ibm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-Spam-Info: AW1haW4tMjYwODA0MDA5MCBTYWx0ZWRfX5UTDsrJJ/twB i5Pb6MxsxqeLmniVTcw0QV4Lp43OWAegeGaPqnSnNScG23PjZkKE5RhlXzQOmYkMJecgXwttuxq 8M+lPn52e9Cha9kWAbT3jXp6NkRoy34= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODA0MDA5MCBTYWx0ZWRfX+mjVJjigqzfa LUPGRRZLH7d7IcOCLvMkxvvmAUBq+KVpac0tmdOzARRV9T8TYr6e/fflsDQNLjwFG31rmFDU+4d iqibXlE9cV+nuW0G5gUVqxi4eBMRmooCVWBau+affFtYYMFamGXt8lyAibSE0uJHYpF19gX44IB VrcCR9+5QmVxMKsyKloEy35iivmzDoJM3lQAuuCeh25wr3khYxQERILBlT2+LyK2+XRFNOYmnwU IpzVtmnJZz6o5Z6AnjmESGQU5O49dOJ3Q7tRT4WquEecbnB3m/OiQHFew8q2w+oWopIYVbe3P32 HCajjYPFxs82Nm6OT9yux8U0+oE1rs5ccYeS99efqJZ5/grAHeHhopQZhz7czRCW7+McFHlxUTJ PIvwxLACXT7LCRp2ZG31Z97T/3xufA0ej7STiUazylOZG/PvHaACyQX+UWJucchRX5wCL4nUNAJ jhsAuP0MI16hICnRr5A== X-Authority-Analysis: v=2.4 cv=SI1ykuvH c=1 sm=1 tr=0 ts=6a71cf06 cx=c_pps a=5BHTudwdYE3Te8bg5FgnPg==:117 a=5BHTudwdYE3Te8bg5FgnPg==:17 a=Sv0fKeRqtYgA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=U7nrCbtTmkRpXpFmAIza:22 a=VnNF1IyMAAAA:8 a=AK4rZKg6osCYkldYSQwA:9 X-Proofpoint-ORIG-GUID: OO4eJjJwJLK-S0tn5yVjK-kuFCn6o1jk X-Proofpoint-GUID: OO4eJjJwJLK-S0tn5yVjK-kuFCn6o1jk X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-08-04_02,2026-08-03_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 bulkscore=0 suspectscore=0 impostorscore=0 spamscore=0 phishscore=0 priorityscore=1501 lowpriorityscore=0 adultscore=0 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608040090 Content-Type: text/plain; charset="utf-8" Clang's compiler based static context analysis does not work with locks that are conditionally taken like in ctr_paes_do_crypt(): arch/s390/crypto/paes_s390.c:980:13: warning: mutex 'ctrblk_lock' is not he= ld on every path through here [-Wthread-safety-analysis] 980 | ctrptr =3D (n > AES_BLOCK_SIZE) ? ctrblk : walk->iv; | ^ Given that code which takes locks conditionally can be considered suboptimal rework ctr_paes_do_crypt() to get rid of this. Signed-off-by: Heiko Carstens --- arch/s390/crypto/paes_s390.c | 104 ++++++++++++++++++++--------------- 1 file changed, 60 insertions(+), 44 deletions(-) diff --git a/arch/s390/crypto/paes_s390.c b/arch/s390/crypto/paes_s390.c index 8cfe6166c193..d4a9108d39f5 100644 --- a/arch/s390/crypto/paes_s390.c +++ b/arch/s390/crypto/paes_s390.c @@ -932,15 +932,63 @@ static inline unsigned int __ctrblk_init(u8 *ctrptr, = u8 *iv, unsigned int nbytes return n; } =20 +static int __ctr_paes_do_crypt(struct s390_paes_ctx *ctx, + struct s390_pctr_req_ctx *req_ctx, + bool tested, bool maysleep, bool locked) +{ + struct skcipher_walk *walk =3D &req_ctx->walk; + struct ctr_param *param =3D &req_ctx->param; + unsigned int nbytes, n, k; + u8 *ctrptr; + int rc =3D 0; + + /* + * Note that in case of partial processing or failure the walk + * is NOT unmapped here. So a follow up task may reuse the walk + * or in case of unrecoverable failure needs to unmap it. + */ + while ((nbytes =3D walk->nbytes) >=3D AES_BLOCK_SIZE) { + n =3D AES_BLOCK_SIZE; + if (nbytes >=3D 2 * AES_BLOCK_SIZE && locked) + n =3D __ctrblk_init(ctrblk, walk->iv, nbytes); + ctrptr =3D (n > AES_BLOCK_SIZE) ? ctrblk : walk->iv; + k =3D cpacf_kmctr(ctx->fc, param, walk->dst.virt.addr, + walk->src.virt.addr, n, ctrptr); + if (k) { + if (ctrptr =3D=3D ctrblk) { + memcpy(walk->iv, ctrptr + k - AES_BLOCK_SIZE, + AES_BLOCK_SIZE); + } + crypto_inc(walk->iv, AES_BLOCK_SIZE); + rc =3D skcipher_walk_done(walk, nbytes - k); + } + if (k < n) { + if (!maysleep) { + rc =3D -EKEYEXPIRED; + goto out; + } + rc =3D paes_convert_key(ctx, tested); + if (rc) + goto out; + spin_lock_bh(&ctx->pk_lock); + memcpy(param->key, ctx->pk.protkey, sizeof(param->key)); + spin_unlock_bh(&ctx->pk_lock); + } + } + +out: + return rc; +} + static int ctr_paes_do_crypt(struct s390_paes_ctx *ctx, struct s390_pctr_req_ctx *req_ctx, bool tested, bool maysleep) { - struct ctr_param *param =3D &req_ctx->param; struct skcipher_walk *walk =3D &req_ctx->walk; - u8 buf[AES_BLOCK_SIZE], *ctrptr; - unsigned int nbytes, n, k; - int pk_state, locked, rc =3D 0; + struct ctr_param *param =3D &req_ctx->param; + u8 buf[AES_BLOCK_SIZE]; + int pk_state, rc =3D 0; + unsigned int nbytes; =20 if (!req_ctx->param_init_done) { /* fetch and check protected key state */ @@ -966,49 +1014,17 @@ static int ctr_paes_do_crypt(struct s390_paes_ctx *c= tx, if (rc) goto out; =20 - locked =3D mutex_trylock(&ctrblk_lock); - - /* - * Note that in case of partial processing or failure the walk - * is NOT unmapped here. So a follow up task may reuse the walk - * or in case of unrecoverable failure needs to unmap it. - */ - while ((nbytes =3D walk->nbytes) >=3D AES_BLOCK_SIZE) { - n =3D AES_BLOCK_SIZE; - if (nbytes >=3D 2 * AES_BLOCK_SIZE && locked) - n =3D __ctrblk_init(ctrblk, walk->iv, nbytes); - ctrptr =3D (n > AES_BLOCK_SIZE) ? ctrblk : walk->iv; - k =3D cpacf_kmctr(ctx->fc, param, walk->dst.virt.addr, - walk->src.virt.addr, n, ctrptr); - if (k) { - if (ctrptr =3D=3D ctrblk) - memcpy(walk->iv, ctrptr + k - AES_BLOCK_SIZE, - AES_BLOCK_SIZE); - crypto_inc(walk->iv, AES_BLOCK_SIZE); - rc =3D skcipher_walk_done(walk, nbytes - k); - } - if (k < n) { - if (!maysleep) { - if (locked) - mutex_unlock(&ctrblk_lock); - rc =3D -EKEYEXPIRED; - goto out; - } - rc =3D paes_convert_key(ctx, tested); - if (rc) { - if (locked) - mutex_unlock(&ctrblk_lock); - goto out; - } - spin_lock_bh(&ctx->pk_lock); - memcpy(param->key, ctx->pk.protkey, sizeof(param->key)); - spin_unlock_bh(&ctx->pk_lock); - } - } - if (locked) + if (mutex_trylock(&ctrblk_lock)) { + rc =3D __ctr_paes_do_crypt(ctx, req_ctx, tested, maysleep, true); mutex_unlock(&ctrblk_lock); + } else { + rc =3D __ctr_paes_do_crypt(ctx, req_ctx, tested, maysleep, false); + } + if (rc) + goto out; =20 /* final block may be < AES_BLOCK_SIZE, copy only nbytes */ + nbytes =3D walk->nbytes; if (nbytes) { memset(buf, 0, AES_BLOCK_SIZE); memcpy(buf, walk->src.virt.addr, nbytes); --=20 2.53.0 From nobody Fri Oct 2 06:57:48 2026 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (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 48201344D9F; Tue, 4 Aug 2026 11:37:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.156.1 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785843471; cv=none; b=VyWm7FbODYLBCrma9oterre2uDXMcY/nhbqmx/tU0wAwRq0gbB5IJVWQ4IEQf5rgJmH2Q+cmidqNP8qKzmmdc2xrsCpGhVU8u6VO7YHEkJZyOFjPQ4KUX4962Pn5jSCdbWmazW/n8j4DN93yuL4NHcbLz8UChMhvLXcyLZQ6XDY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785843471; c=relaxed/simple; bh=gi2r4nsxmmh0nrowARy+PUEpL5Fo4xMUyFf+f5gokXk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=l8fzwmxFbvj4NtKIBWhDf8FehkCHjWYFQnwMc5E37mDf2GV8k/i5wVfKPIMlFIY+zbHUERZULvcj2M+X8OaTiJ7nuylZD36WyImAnmQBRx0+WN49+u+xC452FYW0JOg8r4ORd8XqFY3ymyEgI3lcpfYOkPnkVHYYNinlGe2x+RE= 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=dWb6oHBN; arc=none smtp.client-ip=148.163.156.1 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="dWb6oHBN" Received: from pps.filterd (m0360083.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 6748Hfb6296040; Tue, 4 Aug 2026 11:37:42 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=wfCQq8/h/rC0+0774 t2TT/GK+X+y6Bl3MPXnbQdPgXo=; b=dWb6oHBNc2cCht2yrq7SYNnzbi0wkinGR ZhXHUnQoUnLHzsHVNUoeW7fpObNIgteym29j6gdKGu/iHsc5onMGdyKGKbSmGfIa 6t7iLjg9vwAHePezST96bCYDpm+QWRhiM43U5005u+CsVgVcxmJBOVyNey8AJbyR 2buBhnR7bIQTkLopFy57A40q8IAijDl0NTOelAOTDnmCwtU9RyAU8CdehVZzJMhJ sf9CRok8t+4j28HYcftezZDpXYydsrUVX2CzMlmKycrTBSZsWqJGmNGyXgox7BAr 29HGlKoEr7SEXllmOP0Lm+WREWHcu2gZYAruAv4IZlJ+l1fpWGNtw== 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 4fs8a3wk0f-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 04 Aug 2026 11:37:42 +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 674BQLdh009806; Tue, 4 Aug 2026 11:37:41 GMT Received: from smtprelay06.fra02v.mail.ibm.com ([9.218.2.230]) by ppma23.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4fsvmh9nf1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 04 Aug 2026 11:37:41 +0000 (GMT) Received: from smtpav04.fra02v.mail.ibm.com (smtpav04.fra02v.mail.ibm.com [10.20.54.103]) by smtprelay06.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 674Bbbw832178510 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 4 Aug 2026 11:37:37 GMT Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 525C92004B; Tue, 4 Aug 2026 11:37:37 +0000 (GMT) Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 1991E2004D; Tue, 4 Aug 2026 11:37:37 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.87.85.9]) by smtpav04.fra02v.mail.ibm.com (Postfix) with ESMTP; Tue, 4 Aug 2026 11:37:37 +0000 (GMT) From: Heiko Carstens To: Harald Freudenberger , Holger Dengler , Herbert Xu Cc: Alexander Gordeev , Sven Schnelle , Vasily Gorbik , Christian Borntraeger , linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org, linux-crypto@vger.kernel.org Subject: [PATCH 3/3] s390/crypto: Enable CONTEXT_ANALYSIS Date: Tue, 4 Aug 2026 13:37:36 +0200 Message-ID: <20260804113736.1423667-4-hca@linux.ibm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260804113736.1423667-1-hca@linux.ibm.com> References: <20260804113736.1423667-1-hca@linux.ibm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Authority-Analysis: v=2.4 cv=E6P9Y6dl c=1 sm=1 tr=0 ts=6a71cf06 cx=c_pps a=3Bg1Hr4SwmMryq2xdFQyZA==:117 a=3Bg1Hr4SwmMryq2xdFQyZA==:17 a=Sv0fKeRqtYgA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=iQ6ETzBq9ecOQQE5vZCe:22 a=VnNF1IyMAAAA:8 a=76iW4yKgqpReaEcOz0EA:9 X-Proofpoint-ORIG-GUID: CEXh9gejOJs7tCks9YNxT3GgOjrtbUaz X-Proofpoint-GUID: CEXh9gejOJs7tCks9YNxT3GgOjrtbUaz X-Proofpoint-Spam-Info: AW1haW4tMjYwODA0MDA5MCBTYWx0ZWRfX+st6aWNjfhCY c7trQwO1GOILmvDRGqZj8QOREI6tswiUptszMgUhoDrAy27QQhpertkVKarXvum6dHiGWz3WdpS idCyVP1v4fdLV+JvI97e/txDmBsbLPs= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODA0MDA5MCBTYWx0ZWRfX5TssDmmbAj6Z vuMX45eIHxMeYWR5PDJ3wAP6+GcDy+/XnUHWXKEj9F2GQw7zKGSHALDlRSZQW8cGWnDr8ZongKa 5JHGotz9vYpnvkY1C2cKcGfDNUwWyz8HB7lEh/mszczER65qNOlNCghBvATwPp55F6+G40AfTo0 j3/GO8m455ygSUd1TAiQKyMHMKGVH3qKcLn3TtxpkCvbrJgWe1gr28k2gmPYc5NFBmPEWHSF/nO HMVrvLCPeEXiw+nfpiAeIj4Vzn3zwc2jEv3L0iIyrXJc/80ZlFvUJtMmvv5ntOgm/jdi+9dJNDA FF2bzDefJHehmpG1RFPTSrjFaXvJzTP5ZdKPhXEGRwortNdV4KzO59z81MEQ98NuKphOIMWeP2K li+d68TTw19BI1McbrpNRj6tvg0ssFNzJGaBG7RVq17KYvRgoer0IHzZOVJQkod6k/49c7vdW7w MuXL/G/l/Q06NKuduvg== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-08-04_02,2026-08-03_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 clxscore=1015 lowpriorityscore=0 priorityscore=1501 suspectscore=0 adultscore=0 spamscore=0 malwarescore=0 impostorscore=0 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608040090 Content-Type: text/plain; charset="utf-8" Enable CONTEXT_ANALYSIS since s390's crypto code compiles now without warnings. Signed-off-by: Heiko Carstens --- arch/s390/crypto/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/s390/crypto/Makefile b/arch/s390/crypto/Makefile index 48aeb0c0ffbd..1d6420813935 100644 --- a/arch/s390/crypto/Makefile +++ b/arch/s390/crypto/Makefile @@ -3,6 +3,8 @@ # Cryptographic API # =20 +CONTEXT_ANALYSIS :=3D y + obj-$(CONFIG_CRYPTO_AES_S390) +=3D aes_s390.o obj-$(CONFIG_CRYPTO_PAES_S390) +=3D paes_s390.o obj-$(CONFIG_S390_PRNG) +=3D prng.o --=20 2.53.0