From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794674504; b=ANZefSeYtZbliwH6qQ3cMUrgQ++T7uKynAR1IRjiamgCHEnrU0EKDOX3M3B2bI4C8e3g 9QUNljQp/eqgh68PvoLcmd31rN29JpQHNOvhDL9lIZjYIep2KnHo1a/mX2zhazKYyOiyF 2c05edUs7qQeWntyK7viMmYJ8lL8lkL6RKQY4x7BZ2GJQMsHRBE8FPrZ1MspINtrehWgT b9xiyNP9SWXhauLUBbY12+Tin8YeHF3/PXPOfUnFxaY4oB2SYvwrTPDvNDI18c77HOlh9 0PG9ZzpK886j7AuSEvNUG0TXWl+VnSDdQbA2lYVmJNNiVudTosS+h2nw77aJmlg+bUg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794674504; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: MIME-Version:Content-Transfer-Encoding; bh=gw9rNwmZP2BAUweKXHlIiA/7poa4mRSBBabGfBVJKZk=; b=48FQQx0xg3AsXsrNKg8v6oNd0TKf5ldtKXVn+NnFXkWeVDDsD5uWFARrxR/oieQJ2Bft pkrAqHq4sP1aSHhgVE7Njq0WOQKV068xxxSSQ5g6NDI2lBWGd+tIuHCLcATRnBhWifFLZ aAbGiGmhMabEc9UxYwf/PL+FVqfFshdbtiV7lH+W6AGOSvRBlilX4MIsPf1qaLdocqDV3 zo0sUWimkRaoiaB3G+6TRM5nuqIOhV3RhAl31KGEzYglkdtp7ByDJtKixOGdoyns+QhQy AFyaNc2zTHzmKwJ6lyOesgaXBmEFaMOY3tL3cUTMz1IExd84Q/51vTUo9ufMOdPRxFQ== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=VxGN2VLb; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with UTF8SMTPS id 20D0A606A323; Sat, 14 Nov 2026 16:41:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=VxGN2VLb Received: by smtp.kernel.org (Postfix) with UTF8SMTPSA id 1A9441F000C4; Sat, 14 Nov 2026 16:41:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1794674503; bh=gw9rNwmZP2BAUweKXHlIiA/7poa4mRSBBabGfBVJKZk=; h=From:To:Cc:Subject:Date; b=VxGN2VLbDqsMqx9R5YPIbFQZ6gev+/zng2L7ypWiFCz22AYm9Dh0+l6h8eFPGma1p UpUjamU6lR4GzH9LQHLZKLWosuj3RK7LxcKd4Cg3czbNlkrtOimheZANG177HrLo5A 8Gvh1fLlpEOPOkd1d2zVArwl4NcOqzFPZpEmYbDRvcJ6/Vm6nHpfHDgNUjhGzkugZd 9LqrJpeyBjGrMoENF2cKcYyvBEw7kgAwZ7RufOhs6zu/0iWmvzhjNX+Krz0gkz9Lif CiilXf1JTZLjMujhS4wZoeDHjVJ5RJe4Gs85OXEc9WzgeClHPytU5XCMr8i8N993JO P+M7Ni4s5VwjA== From: Jarkko Sakkinen To: David Howells Cc: Jarkko Sakkinen , bpf@vger.kernel.org, dm-devel@lists.linux.dev, fsverity@lists.linux.dev, keyrings@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-security-module@vger.kernel.org, Alasdair Kergon , Alexander Gordeev , Alexei Starovoitov , Alex Shi , Anastasia Eskova , Andrew Morton , Andrii Nakryiko , Benjamin Marzinski , Christian Borntraeger , Daniel Borkmann , Dongliang Mu , Eduard Zingerman , Emil Tsalapatis , Eric Biggers , Ignat Korchagin , Heiko Carstens , Ihor Solodrai , James Bottomley , James Morris , Jiri Olsa , Jonathan Corbet , Kumar Kartikeya Dwivedi , Linus Torvalds , Martin KaFai Lau , Mike Snitzer , Mikulas Patocka , Mimi Zohar , Paul Moore , Peter Oberparleiter , Randy Dunlap , Roberto Sassu , "Serge E. Hallyn" , Shuah Khan , Song Liu , Sven Schnelle , "Theodore Y. Ts'o" , Vasily Gorbik , Yanteng Si , Yonghong Song Subject: [PATCH v12 0/6] KEYS: Replace assoc_array with rhashtable Date: Sat, 14 Nov 2026 18:41:33 +0200 Message-ID: <20261114164139.429814-1-jarkko@kernel.org> X-Mailer: git-send-email 2.47.3 X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The keyrings subsystem is the sole user of assoc_array. It has over 1700 lines of code, no test suite, and a long history of bugs, with LLMs now finding more. This unfortunate outcome has evolved over time by large from the shortage of in-kernel callers, time bandwidth and 3rd party contributors. What the keyrings subsystem needs is just a generic key-value store, which performs well with sparse key sets. Replace assoc_array with an rhashtable-backed keyring index and remove assoc_array from the kernel. CHANGES ======= v12: - Fixed Sashiko reported issues in s390/cert_store patches. v11: - RCU-safe iterator for keyring_read(). - Addresses s390 issues. I won't carry them for long in the series. v10: - No changes since the previous round. This is a sanity check round given the lack of feedback to v9. I'll apply these patch very soon, unless nothing (relevant) comes up fast. v9: - Replace __free(kfree) with explicit cleanup so early goto out paths cannot bypass initialization of the link pointer. Preserve kleave() tracing on all exit paths. v8: - Fixed broken rebase. - Restructured __key_link_begin() a bit as a response to a minor complaint from Sashiko. - Fixed a minor glitch in __key_link_begin(): now also first invariant invokes kleave() on failure. v7: - Rebased. v6: - Eric Biggers: Set .insecure_elasticity = true in keyring_link_params and drop the -EBUSY retry loop in __key_link_begin(). - Addeded Reviewed-by's from Eric Bigger and Ignat Korchagin. v5: - Eric Biggers: Include explicitly in keyring.c. - Eric Biggers: Document why hashing type/domain_tag pointers with SipHash and truncating the digest to 32 bits are safe. - Eric Biggers: Rework the commit message for "KEYS: Replace assoc_array with rhashtable", including behavioral and operational changes. - Retry rhashtable_insert_fast() on transient -EBUSY in __key_link_begin(). v4: - Eric Biggers: Correct the kerneldoc summary for keyring_is_empty(). - Eric Biggers: Truncate keyring_index_key hash to u32 and drop index_id. - Eric Biggers, David Howells: Use a proper struct instead of a two-element array to pass the edits. - Eric Biggers: __keyring_link(): Call key_put() in the rollback of rhashtable_replace_fast(). - Eric Biggers: Retract from using __free(kfree) in keyring_get_index(). - Eric Biggers: Reuse keyring_link_key() in keyring_obj_cmpfn(). - Eric Biggers: Document why keyring_index_free() uses queue_rcu_work(). - Eric Biggers: Fix the commit message for "KEYS: Replace assoc_array with rhashtable". v3: - Since David is away for the next week I decided to address the low hanging fruit that I reported myself. - Unified and sanitized function and variable naming and removed unnecessary asymmetry e.g., by renaming keyring_remove_all_links as keyring_index_free, 'links' as 'index' and '_edit' as 'edit'. - Flattened the implementation by refactoring out some useless wrappers and other constructs. - Addressed continuation after triggered WARN_ON() on at the three sites that I've described in my email response to the previous patch set version. - Reworked keyring_read() so that it triggers the scheduler between the iterations. - Dropped "Assisted-by: LLM" tag because checkpatch.pl told me so. v2: - Tried to address all the issues pointed out by David and Eric. Tell me if something was ignored, as that would be an unintentional mishap. - Updated and trimmed the source code comments. - For assoc_array_edit I decided to go with two-element pointer array, which shifts a bit what David suggested. - Dropped is_keyring flag. It was so obvious call so I mention it here just in case because too obvious maxes out my self-doubt ;-) - Used cleanup.h primitives where I possibly could especially in order to make fallible initializations more bug-resistant. - The already-ack'd bug fixes are included but will be dropped as soon as I've sent them over to Linus. VERSIONS ======== - v11: https://lore.kernel.org/keyrings/20261114161211.376859-1-jarkko@kernel.org/ - v10: https://lore.kernel.org/keyrings/20261113161836.3587552-1-jarkko@kernel.org/ - v9: https://lore.kernel.org/keyrings/20261110053323.2936729-1-jarkko@kernel.org/k - v8: https://lore.kernel.org/keyrings/20261110044043.2608600-1-jarkko@kernel.org/ - v7: https://lore.kernel.org/keyrings/20261110033738.2495880-1-jarkko@kernel.org/ - v6: https://lore.kernel.org/keyrings/20261107195605.3929659-1-jarkko@kernel.org/ - v5: https://lore.kernel.org/keyrings/20261105031401.956609-1-jarkko@kernel.org/ - v4: https://lore.kernel.org/keyrings/20261029232437.2581640-1-jarkko@kernel.org/ - v3: https://lore.kernel.org/keyrings/20261025001105.1824178-1-jarkko@kernel.org/ - v2: https://lore.kernel.org/keyrings/20261023120953.1206778-1-jarkko@kernel.org/ - v1: https://lore.kernel.org/keyrings/20261016215326.4110064-1-jarkko@kernel.org/ Cc: bpf@vger.kernel.org Cc: dm-devel@lists.linux.dev Cc: fsverity@lists.linux.dev Cc: keyrings@vger.kernel.org Cc: linux-doc@vger.kernel.org Cc: linux-kernel@vger.kernel.org Cc: linux-kselftest@vger.kernel.org Cc: linux-security-module@vger.kernel.org Cc: Alasdair Kergon Cc: Alexander Gordeev Cc: Alexei Starovoitov Cc: Alex Shi Cc: Anastasia Eskova Cc: Andrew Morton Cc: Andrii Nakryiko Cc: Benjamin Marzinski Cc: Christian Borntraeger Cc: Daniel Borkmann Cc: David Howells Cc: Dongliang Mu Cc: Eduard Zingerman Cc: Emil Tsalapatis Cc: Eric Biggers Cc: Ignat Korchagin Cc: Heiko Carstens Cc: Ihor Solodrai Cc: James Bottomley Cc: James Morris Cc: Jarkko Sakkinen Cc: Jiri Olsa Cc: Jonathan Corbet Cc: Kumar Kartikeya Dwivedi Cc: Linus Torvalds Cc: Martin KaFai Lau Cc: Mike Snitzer Cc: Mikulas Patocka Cc: Mimi Zohar Cc: Paul Moore Cc: Peter Oberparleiter Cc: Randy Dunlap Cc: Roberto Sassu Cc: "Serge E. Hallyn" Cc: Shuah Khan Cc: Song Liu Cc: Sven Schnelle Cc: "Theodore Y. Ts'o" Cc: Vasily Gorbik Cc: Yanteng Si Cc: Yonghong Song Jarkko Sakkinen (6): s390/cert_store: Pin the user session keyring s390/cert_store: Return an owned reference from find_cs_keyring() s390/cert_store: Skip keys that disappeared during invalidation KEYS: Introduce keyring_is_empty() KEYS: Replace assoc_array with rhashtable lib: Remove assoc_array Documentation/core-api/assoc_array.rst | 564 ------ Documentation/core-api/index.rst | 1 - .../zh_CN/core-api/assoc_array.rst | 473 ----- .../translations/zh_CN/core-api/index.rst | 1 - arch/s390/kernel/cert_store.c | 49 +- drivers/md/dm-verity-verify-sig.c | 2 +- fs/verity/signature.c | 2 +- include/keys/keyring-type.h | 1 - include/linux/assoc_array.h | 88 - include/linux/assoc_array_priv.h | 178 -- include/linux/key-type.h | 1 - include/linux/key.h | 29 +- kernel/bpf/keys.c | 2 +- lib/Kconfig | 14 - lib/Makefile | 1 - lib/assoc_array.c | 1724 ----------------- security/keys/Kconfig | 1 - security/keys/internal.h | 14 +- security/keys/key.c | 22 +- security/keys/keyring.c | 1016 +++++----- security/keys/request_key.c | 8 +- .../dm-verity/test-dm-verity-keyring.sh | 2 +- 22 files changed, 532 insertions(+), 3661 deletions(-) delete mode 100644 Documentation/core-api/assoc_array.rst delete mode 100644 Documentation/translations/zh_CN/core-api/assoc_array.rst delete mode 100644 include/linux/assoc_array.h delete mode 100644 include/linux/assoc_array_priv.h delete mode 100644 lib/assoc_array.c -- 2.47.3