Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/2183206/?format=api
{ "id": 2183206, "url": "http://patchwork.ozlabs.org/api/patches/2183206/?format=api", "web_url": "http://patchwork.ozlabs.org/project/linuxppc-dev/patch/20260112192035.10427-33-ebiggers@kernel.org/", "project": { "id": 2, "url": "http://patchwork.ozlabs.org/api/projects/2/?format=api", "name": "Linux PPC development", "link_name": "linuxppc-dev", "list_id": "linuxppc-dev.lists.ozlabs.org", "list_email": "linuxppc-dev@lists.ozlabs.org", "web_url": "https://github.com/linuxppc/wiki/wiki", "scm_url": "https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git", "webscm_url": "https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/", "list_archive_url": "https://lore.kernel.org/linuxppc-dev/", "list_archive_url_format": "https://lore.kernel.org/linuxppc-dev/{}/", "commit_url_format": "https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/commit/?id={}" }, "msgid": "<20260112192035.10427-33-ebiggers@kernel.org>", "list_archive_url": "https://lore.kernel.org/linuxppc-dev/20260112192035.10427-33-ebiggers@kernel.org/", "date": "2026-01-12T19:20:30", "name": "[v2,32/35] lib/crypto: aescfb: Use new AES library API", "commit_ref": null, "pull_url": null, "state": "handled-elsewhere", "archived": false, "hash": "eda4f6afd68de239504d1b9a5916657af1bf3678", "submitter": { "id": 74690, "url": "http://patchwork.ozlabs.org/api/people/74690/?format=api", "name": "Eric Biggers", "email": "ebiggers@kernel.org" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/linuxppc-dev/patch/20260112192035.10427-33-ebiggers@kernel.org/mbox/", "series": [ { "id": 488089, "url": "http://patchwork.ozlabs.org/api/series/488089/?format=api", "web_url": "http://patchwork.ozlabs.org/project/linuxppc-dev/list/?series=488089", "date": "2026-01-12T19:19:58", "name": "AES library improvements", "version": 2, "mbox": "http://patchwork.ozlabs.org/series/488089/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/2183206/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2183206/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "\n <linuxppc-dev+bounces-15572-incoming=patchwork.ozlabs.org@lists.ozlabs.org>", "X-Original-To": [ "incoming@patchwork.ozlabs.org", "linuxppc-dev@lists.ozlabs.org" ], "Delivered-To": "patchwork-incoming@legolas.ozlabs.org", "Authentication-Results": [ "legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256\n header.s=k20201202 header.b=b0RBfUzQ;\n\tdkim-atps=neutral", "legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org\n (client-ip=112.213.38.117; helo=lists.ozlabs.org;\n envelope-from=linuxppc-dev+bounces-15572-incoming=patchwork.ozlabs.org@lists.ozlabs.org;\n receiver=patchwork.ozlabs.org)", "lists.ozlabs.org;\n arc=none smtp.remote-ip=172.105.4.254", "lists.ozlabs.org;\n dmarc=pass (p=quarantine dis=none) header.from=kernel.org", "lists.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256\n header.s=k20201202 header.b=b0RBfUzQ;\n\tdkim-atps=neutral", "lists.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=kernel.org\n (client-ip=172.105.4.254; helo=tor.source.kernel.org;\n envelope-from=ebiggers@kernel.org; receiver=lists.ozlabs.org)" ], "Received": [ "from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4dqj5j0D5xz1xpY\n\tfor <incoming@patchwork.ozlabs.org>; Tue, 13 Jan 2026 06:25:45 +1100 (AEDT)", "from boromir.ozlabs.org (localhost [127.0.0.1])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 4dqj3F6MPHz3bY7;\n\tTue, 13 Jan 2026 06:23:37 +1100 (AEDT)", "from tor.source.kernel.org (tor.source.kernel.org [172.105.4.254])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519)\n\t(No client certificate requested)\n\tby lists.ozlabs.org (Postfix) with ESMTPS id 4dqj3D1hZSz30Vf\n\tfor <linuxppc-dev@lists.ozlabs.org>; Tue, 13 Jan 2026 06:23:36 +1100 (AEDT)", "from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58])\n\tby tor.source.kernel.org (Postfix) with ESMTP id D3E3C600C3;\n\tMon, 12 Jan 2026 19:23:35 +0000 (UTC)", "by smtp.kernel.org (Postfix) with ESMTPSA id 27044C19424;\n\tMon, 12 Jan 2026 19:23:35 +0000 (UTC)" ], "ARC-Seal": "i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1768245817;\n\tcv=none;\n b=EfOCtKH5f79072rhkTTO2g8CTs08Og6MXR+iVGpC1KFHvPbzFxA2JVZKc8fsqaD5Wr3xbwpUnRJeqgFl18Miz658cEmg9+dLokhZw04D9oH5YcibG1VoRnm0CEY0jcSYacXy7BmPboE18Xi0GgpG471+UZvmSz5FW0mAS1TuO8cSUUBev6IOKGTi1RrZQU3GcZ3kPpiZLNAtrCrPKKw5/ptaROHP7AtULkwgPTtY+GOEt13opga7M220F7OV+h4iA1Xxf+dyzQu+BIoNEDKC+KUYedxDoWw1lBXSxM91LoSlZSJUs54ZvuaDtkUT3RScycCDNJBaskGqunf6I3QZdg==", "ARC-Message-Signature": "i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707;\n\tt=1768245817; c=relaxed/relaxed;\n\tbh=6e/8Kxoaf7xxhSnd9xMn2u6QeyDqsDYTj5E6wM5HefY=;\n\th=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References:\n\t MIME-Version;\n b=ZzHN8i4L1RmXG77iF13hVxUxH5NmgCfZpm40wb5BkneN0HJh3I7gru7yn/2aCrF++25S2xzzBXC+yQl6vMGEHmZJyk4MDiFCkbkebb8yFCQGNa3t7fqmPFQ//m7W8w43xSyfdh+oydJKjgvceEmLQ5mwf/11JMvk9JByXUAUidDbE+EozcFAV03dxCxoi0ECtBLSzCAUlNNK2bYWfP36WqRrblD16NniY4gcEFqeSslfmqFJJqdxTdeNeztnbqYtMPWCpc5cdwghb1Ptydzaca92atZpf8l72jwYFlKkev7QsKzf7jpTykZTKwurMkLqCn4G+RQl/aVwSsaNI6QJkA==", "ARC-Authentication-Results": "i=1; lists.ozlabs.org;\n dmarc=pass (p=quarantine dis=none) header.from=kernel.org;\n dkim=pass (2048-bit key;\n unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256\n header.s=k20201202 header.b=b0RBfUzQ; dkim-atps=neutral;\n spf=pass (client-ip=172.105.4.254; helo=tor.source.kernel.org;\n envelope-from=ebiggers@kernel.org;\n receiver=lists.ozlabs.org) smtp.mailfrom=kernel.org", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;\n\ts=k20201202; t=1768245815;\n\tbh=JLs8bq0ROpmCEQjkpHCQ8d/SpuKsQOsr6NwPCgnihKU=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=b0RBfUzQys2ZqJtm4Gnsyo+LFtO49H/4V1vBcG0UFdcL3d4er81g2SKeTPRBUfXlD\n\t m4M0CH0sjlKOMYmu5MKQUxxNNhgjBkXhlxsEJWsyOMNw/H5cz+0C/Ps+oieOmtIsnf\n\t 42oOgGWrCU2dcQWgW9oaLQ2GOJT0MjnsdRT7AGxdEQdlwoJHzPSgRrGn+bi8VRh99V\n\t 4KSB/CeMRewIeb8S1zLPd6/900w117IawjI2VbypbiXJ+dWaHngCbGCS57sol6Vy9F\n\t PmtGWO6L8nZLLtYShrJjmWS/Q0DYQ/3ba+J/FyOtwkWnRCotaa8rKeBIPbKmTpxzYr\n\t klHjBpXQvod3w==", "From": "Eric Biggers <ebiggers@kernel.org>", "To": "linux-crypto@vger.kernel.org", "Cc": "linux-kernel@vger.kernel.org,\n\tArd Biesheuvel <ardb@kernel.org>,\n\t\"Jason A . Donenfeld\" <Jason@zx2c4.com>,\n\tHerbert Xu <herbert@gondor.apana.org.au>,\n\tlinux-arm-kernel@lists.infradead.org,\n\tlinuxppc-dev@lists.ozlabs.org,\n\tlinux-riscv@lists.infradead.org,\n\tlinux-s390@vger.kernel.org,\n\tsparclinux@vger.kernel.org,\n\tx86@kernel.org,\n\tHolger Dengler <dengler@linux.ibm.com>,\n\tHarald Freudenberger <freude@linux.ibm.com>,\n\tEric Biggers <ebiggers@kernel.org>", "Subject": "[PATCH v2 32/35] lib/crypto: aescfb: Use new AES library API", "Date": "Mon, 12 Jan 2026 11:20:30 -0800", "Message-ID": "<20260112192035.10427-33-ebiggers@kernel.org>", "X-Mailer": "git-send-email 2.52.0", "In-Reply-To": "<20260112192035.10427-1-ebiggers@kernel.org>", "References": "<20260112192035.10427-1-ebiggers@kernel.org>", "X-Mailing-List": "linuxppc-dev@lists.ozlabs.org", "List-Id": "<linuxppc-dev.lists.ozlabs.org>", "List-Help": "<mailto:linuxppc-dev+help@lists.ozlabs.org>", "List-Owner": "<mailto:linuxppc-dev+owner@lists.ozlabs.org>", "List-Post": "<mailto:linuxppc-dev@lists.ozlabs.org>", "List-Archive": "<https://lore.kernel.org/linuxppc-dev/>,\n <https://lists.ozlabs.org/pipermail/linuxppc-dev/>", "List-Subscribe": "<mailto:linuxppc-dev+subscribe@lists.ozlabs.org>,\n <mailto:linuxppc-dev+subscribe-digest@lists.ozlabs.org>,\n <mailto:linuxppc-dev+subscribe-nomail@lists.ozlabs.org>", "List-Unsubscribe": "<mailto:linuxppc-dev+unsubscribe@lists.ozlabs.org>", "Precedence": "list", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "X-Spam-Status": "No, score=-0.2 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED,\n\tDKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS\n\tautolearn=disabled version=4.0.1 OzLabs 8", "X-Spam-Checker-Version": "SpamAssassin 4.0.1 (2024-03-25) on lists.ozlabs.org" }, "content": "Switch from the old AES library functions (which use struct\ncrypto_aes_ctx) to the new ones (which use struct aes_enckey). This\neliminates the unnecessary computation and caching of the decryption\nround keys. The new AES en/decryption functions are also much faster\nand use AES instructions when supported by the CPU.\n\nNote that in addition to the change in the key preparation function and\nthe key struct type itself, the change in the type of the key struct\nresults in aes_encrypt() (which is temporarily a type-generic macro)\ncalling the new encryption function rather than the old one.\n\nAcked-by: Ard Biesheuvel <ardb@kernel.org>\nSigned-off-by: Eric Biggers <ebiggers@kernel.org>\n---\n drivers/char/tpm/tpm2-sessions.c | 10 +++++-----\n include/crypto/aes.h | 4 ++--\n lib/crypto/aescfb.c | 30 +++++++++++++++---------------\n 3 files changed, 22 insertions(+), 22 deletions(-)", "diff": "diff --git a/drivers/char/tpm/tpm2-sessions.c b/drivers/char/tpm/tpm2-sessions.c\nindex 4149379665c4..09df6353ef04 100644\n--- a/drivers/char/tpm/tpm2-sessions.c\n+++ b/drivers/char/tpm/tpm2-sessions.c\n@@ -124,11 +124,11 @@ struct tpm2_auth {\n \t * session_key and passphrase.\n \t */\n \tu8 session_key[SHA256_DIGEST_SIZE];\n \tu8 passphrase[SHA256_DIGEST_SIZE];\n \tint passphrase_len;\n-\tstruct crypto_aes_ctx aes_ctx;\n+\tstruct aes_enckey aes_key;\n \t/* saved session attributes: */\n \tu8 attrs;\n \t__be32 ordinal;\n \n \t/*\n@@ -675,12 +675,12 @@ int tpm_buf_fill_hmac_session(struct tpm_chip *chip, struct tpm_buf *buf)\n \t\t\t + auth->passphrase_len, \"CFB\", auth->our_nonce,\n \t\t\t auth->tpm_nonce, AES_KEY_BYTES + AES_BLOCK_SIZE,\n \t\t\t auth->scratch);\n \n \t\tlen = tpm_buf_read_u16(buf, &offset_p);\n-\t\taes_expandkey(&auth->aes_ctx, auth->scratch, AES_KEY_BYTES);\n-\t\taescfb_encrypt(&auth->aes_ctx, &buf->data[offset_p],\n+\t\taes_prepareenckey(&auth->aes_key, auth->scratch, AES_KEY_BYTES);\n+\t\taescfb_encrypt(&auth->aes_key, &buf->data[offset_p],\n \t\t\t &buf->data[offset_p], len,\n \t\t\t auth->scratch + AES_KEY_BYTES);\n \t\t/* reset p to beginning of parameters for HMAC */\n \t\toffset_p -= 2;\n \t}\n@@ -856,12 +856,12 @@ int tpm_buf_check_hmac_response(struct tpm_chip *chip, struct tpm_buf *buf,\n \t\t\t + auth->passphrase_len, \"CFB\", auth->tpm_nonce,\n \t\t\t auth->our_nonce, AES_KEY_BYTES + AES_BLOCK_SIZE,\n \t\t\t auth->scratch);\n \n \t\tlen = tpm_buf_read_u16(buf, &offset_p);\n-\t\taes_expandkey(&auth->aes_ctx, auth->scratch, AES_KEY_BYTES);\n-\t\taescfb_decrypt(&auth->aes_ctx, &buf->data[offset_p],\n+\t\taes_prepareenckey(&auth->aes_key, auth->scratch, AES_KEY_BYTES);\n+\t\taescfb_decrypt(&auth->aes_key, &buf->data[offset_p],\n \t\t\t &buf->data[offset_p], len,\n \t\t\t auth->scratch + AES_KEY_BYTES);\n \t}\n \n out:\ndiff --git a/include/crypto/aes.h b/include/crypto/aes.h\nindex 4a56aed59973..4cb3c27d1bf5 100644\n--- a/include/crypto/aes.h\n+++ b/include/crypto/aes.h\n@@ -341,11 +341,11 @@ void aes_decrypt_new(const struct aes_key *key, u8 out[at_least AES_BLOCK_SIZE],\n extern const u8 crypto_aes_sbox[];\n extern const u8 crypto_aes_inv_sbox[];\n extern const u32 aes_enc_tab[256];\n extern const u32 aes_dec_tab[256];\n \n-void aescfb_encrypt(const struct crypto_aes_ctx *ctx, u8 *dst, const u8 *src,\n+void aescfb_encrypt(const struct aes_enckey *key, u8 *dst, const u8 *src,\n \t\t int len, const u8 iv[AES_BLOCK_SIZE]);\n-void aescfb_decrypt(const struct crypto_aes_ctx *ctx, u8 *dst, const u8 *src,\n+void aescfb_decrypt(const struct aes_enckey *key, u8 *dst, const u8 *src,\n \t\t int len, const u8 iv[AES_BLOCK_SIZE]);\n \n #endif\ndiff --git a/lib/crypto/aescfb.c b/lib/crypto/aescfb.c\nindex 0f294c8cbf3c..147e5211728f 100644\n--- a/lib/crypto/aescfb.c\n+++ b/lib/crypto/aescfb.c\n@@ -9,11 +9,11 @@\n #include <crypto/algapi.h>\n #include <linux/export.h>\n #include <linux/module.h>\n #include <asm/irqflags.h>\n \n-static void aescfb_encrypt_block(const struct crypto_aes_ctx *ctx, void *dst,\n+static void aescfb_encrypt_block(const struct aes_enckey *key, void *dst,\n \t\t\t\t const void *src)\n {\n \tunsigned long flags;\n \n \t/*\n@@ -23,31 +23,31 @@ static void aescfb_encrypt_block(const struct crypto_aes_ctx *ctx, void *dst,\n \t * extent by pulling the entire S-box into the caches before doing any\n \t * substitutions, but this strategy is more effective when running with\n \t * interrupts disabled.\n \t */\n \tlocal_irq_save(flags);\n-\taes_encrypt(ctx, dst, src);\n+\taes_encrypt(key, dst, src);\n \tlocal_irq_restore(flags);\n }\n \n /**\n * aescfb_encrypt - Perform AES-CFB encryption on a block of data\n *\n- * @ctx:\tThe AES-CFB key schedule\n+ * @key:\tThe AES-CFB key schedule\n * @dst:\tPointer to the ciphertext output buffer\n * @src:\tPointer the plaintext (may equal @dst for encryption in place)\n * @len:\tThe size in bytes of the plaintext and ciphertext.\n * @iv:\t\tThe initialization vector (IV) to use for this block of data\n */\n-void aescfb_encrypt(const struct crypto_aes_ctx *ctx, u8 *dst, const u8 *src,\n+void aescfb_encrypt(const struct aes_enckey *key, u8 *dst, const u8 *src,\n \t\t int len, const u8 iv[AES_BLOCK_SIZE])\n {\n \tu8 ks[AES_BLOCK_SIZE];\n \tconst u8 *v = iv;\n \n \twhile (len > 0) {\n-\t\taescfb_encrypt_block(ctx, ks, v);\n+\t\taescfb_encrypt_block(key, ks, v);\n \t\tcrypto_xor_cpy(dst, src, ks, min(len, AES_BLOCK_SIZE));\n \t\tv = dst;\n \n \t\tdst += AES_BLOCK_SIZE;\n \t\tsrc += AES_BLOCK_SIZE;\n@@ -59,31 +59,31 @@ void aescfb_encrypt(const struct crypto_aes_ctx *ctx, u8 *dst, const u8 *src,\n EXPORT_SYMBOL(aescfb_encrypt);\n \n /**\n * aescfb_decrypt - Perform AES-CFB decryption on a block of data\n *\n- * @ctx:\tThe AES-CFB key schedule\n+ * @key:\tThe AES-CFB key schedule\n * @dst:\tPointer to the plaintext output buffer\n * @src:\tPointer the ciphertext (may equal @dst for decryption in place)\n * @len:\tThe size in bytes of the plaintext and ciphertext.\n * @iv:\t\tThe initialization vector (IV) to use for this block of data\n */\n-void aescfb_decrypt(const struct crypto_aes_ctx *ctx, u8 *dst, const u8 *src,\n+void aescfb_decrypt(const struct aes_enckey *key, u8 *dst, const u8 *src,\n \t\t int len, const u8 iv[AES_BLOCK_SIZE])\n {\n \tu8 ks[2][AES_BLOCK_SIZE];\n \n-\taescfb_encrypt_block(ctx, ks[0], iv);\n+\taescfb_encrypt_block(key, ks[0], iv);\n \n \tfor (int i = 0; len > 0; i ^= 1) {\n \t\tif (len > AES_BLOCK_SIZE)\n \t\t\t/*\n \t\t\t * Generate the keystream for the next block before\n \t\t\t * performing the XOR, as that may update in place and\n \t\t\t * overwrite the ciphertext.\n \t\t\t */\n-\t\t\taescfb_encrypt_block(ctx, ks[!i], src);\n+\t\t\taescfb_encrypt_block(key, ks[!i], src);\n \n \t\tcrypto_xor_cpy(dst, src, ks[i], min(len, AES_BLOCK_SIZE));\n \n \t\tdst += AES_BLOCK_SIZE;\n \t\tsrc += AES_BLOCK_SIZE;\n@@ -212,34 +212,34 @@ static struct {\n };\n \n static int __init libaescfb_init(void)\n {\n \tfor (int i = 0; i < ARRAY_SIZE(aescfb_tv); i++) {\n-\t\tstruct crypto_aes_ctx ctx;\n+\t\tstruct aes_enckey key;\n \t\tu8 buf[64];\n \n-\t\tif (aes_expandkey(&ctx, aescfb_tv[i].key, aescfb_tv[i].klen)) {\n-\t\t\tpr_err(\"aes_expandkey() failed on vector %d\\n\", i);\n+\t\tif (aes_prepareenckey(&key, aescfb_tv[i].key, aescfb_tv[i].klen)) {\n+\t\t\tpr_err(\"aes_prepareenckey() failed on vector %d\\n\", i);\n \t\t\treturn -ENODEV;\n \t\t}\n \n-\t\taescfb_encrypt(&ctx, buf, aescfb_tv[i].ptext, aescfb_tv[i].len,\n+\t\taescfb_encrypt(&key, buf, aescfb_tv[i].ptext, aescfb_tv[i].len,\n \t\t\t aescfb_tv[i].iv);\n \t\tif (memcmp(buf, aescfb_tv[i].ctext, aescfb_tv[i].len)) {\n \t\t\tpr_err(\"aescfb_encrypt() #1 failed on vector %d\\n\", i);\n \t\t\treturn -ENODEV;\n \t\t}\n \n \t\t/* decrypt in place */\n-\t\taescfb_decrypt(&ctx, buf, buf, aescfb_tv[i].len, aescfb_tv[i].iv);\n+\t\taescfb_decrypt(&key, buf, buf, aescfb_tv[i].len, aescfb_tv[i].iv);\n \t\tif (memcmp(buf, aescfb_tv[i].ptext, aescfb_tv[i].len)) {\n \t\t\tpr_err(\"aescfb_decrypt() failed on vector %d\\n\", i);\n \t\t\treturn -ENODEV;\n \t\t}\n \n \t\t/* encrypt in place */\n-\t\taescfb_encrypt(&ctx, buf, buf, aescfb_tv[i].len, aescfb_tv[i].iv);\n+\t\taescfb_encrypt(&key, buf, buf, aescfb_tv[i].len, aescfb_tv[i].iv);\n \t\tif (memcmp(buf, aescfb_tv[i].ctext, aescfb_tv[i].len)) {\n \t\t\tpr_err(\"aescfb_encrypt() #2 failed on vector %d\\n\", i);\n \n \t\t\treturn -ENODEV;\n \t\t}\n", "prefixes": [ "v2", "32/35" ] }