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=1794081386; b=HS1oJDEvt2v6hV4P6fv6p57qwG2AHnpqWoD9WKtiF2nS2y7wTBGWaRYSqzJUBwxhJwnF 3oR9UBoLQvyTNHMZDKdTxh3ZuPBwr4LF3DMck0/FRq9QNBIeRDWm+RfOwAkDct9sAQBdL zbipYr31rTaE0UGz3runM0/hqLKZOg+nqvI74RG2PU2mSJsq6iQwE5aG3628clSfqZLDB o4gqy1qnLE2TZGsJWD2nBrxxljvwdKKeZGiaPIc/zADk1Zo9pZ4NM4ZeGNxPAf19A1UrL Dnn06wNu+DY8dadBxPX4ktEJZPoX9p7Gjw+rif8XTwejk4++TYyuvi2wnkaeWKycdJQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794081386; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: MIME-Version:Content-Transfer-Encoding; bh=sDM1g2usw11clzcjRGyZq237Nj3L/W+8yTIjTKHdRCk=; b=RiSasTIMKkk+GtO/uNqsDfpaKNPgjoDgg2eHsX1uI2JkDdMzpjQN82Kt9+OOsjXUlFdp l4fYbXokrINdXHKPm8rvHknX+i4EHia/7eydIsArHEYIQ5ZOYI6t0rXNXejn8Vo7gU8SG 5ZkG07EPU9GigFBevBqPBojBWpeNcFiZsnrPpJ60WVD2cNRU5j+lva4BwcNJSvsuwGTfS vJjKfmv2bnppPcnDEg2A/s2G202D+ifZvyts/VUhZhXx44Z3YgOaBFWfr5C2qCgX3yzxI Ywv2ngsVFf2/vSR5d6NvT6Sz2DlhFErMp4cYiJtCNHDjYWQ9KrYt0S0kktrRya0V1+g== 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=LkC9cwol; 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 5E005606A32C; Sat, 7 Nov 2026 19:56:26 +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=LkC9cwol Received: by smtp.kernel.org (Postfix) with UTF8SMTPSA id 822361F0089F; Sat, 7 Nov 2026 19:56:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1794081386; bh=sDM1g2usw11clzcjRGyZq237Nj3L/W+8yTIjTKHdRCk=; h=From:To:Cc:Subject:Date; b=LkC9cwolOSoDnHT4ne9E9j7Xa6p4ON3N+1JSvdTJA8TFEuj+QBxzSlJVtRTlss3rT m57slsOf4VZT8vnMUq+0p1VW/xlXRSSBJM9Y5N+S/UYw06eLYuKguGIdLsZ26NV10e 11VIlSU1zZzmDvcQ9JXjgnMHQnxlZyDjoolW7GO4ZrFVbrlUSs+xgB5OC8vx0fTByf 9/LR3SscC8lxdLy0mpuuQ8T6P7n50jNbStDEicV9uKPW6cWpXIU3idLjmFbOEKwoo1 4Y4paNvZd+2RddL9FtN4MRMEhYkm37VTEYdk5mQQDon94YnzGLoaDlz4OhqKV8VwCb me7rCMfti58eQ== 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 , Alexei Starovoitov , Alex Shi , Andrew Morton , Andrii Nakryiko , Benjamin Marzinski , Daniel Borkmann , Dongliang Mu , Eduard Zingerman , Emil Tsalapatis , Eric Biggers , Ignat Korchagin , Ihor Solodrai , James Morris , Jiri Olsa , Jonathan Corbet , Kumar Kartikeya Dwivedi , Martin KaFai Lau , Mike Snitzer , Mikulas Patocka , Paul Moore , Randy Dunlap , "Serge E. Hallyn" , Shuah Khan , Song Liu , "Theodore Y. Ts'o" , Yanteng Si , Yonghong Song Subject: [PATCH v6 0/3] KEYS: Replace assoc_array with rhashtable Date: Sat, 7 Nov 2026 21:56:01 +0200 Message-ID: <20261107195605.3929659-1-jarkko@kernel.org> X-Mailer: git-send-email 2.47.3 X-Mailing-List: linux-kernel@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 ======= 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 ======== - 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: Alexei Starovoitov Cc: Alex Shi Cc: Andrew Morton Cc: Andrii Nakryiko Cc: Benjamin Marzinski Cc: Daniel Borkmann Cc: David Howells Cc: Dongliang Mu Cc: Eduard Zingerman Cc: Emil Tsalapatis Cc: Eric Biggers Cc: Ignat Korchagin Cc: Ihor Solodrai Cc: James Morris Cc: Jarkko Sakkinen Cc: Jiri Olsa Cc: Jonathan Corbet Cc: Kumar Kartikeya Dwivedi Cc: Martin KaFai Lau Cc: Mike Snitzer Cc: Mikulas Patocka Cc: Paul Moore Cc: Randy Dunlap Cc: "Serge E. Hallyn" Cc: Shuah Khan Cc: Song Liu Cc: "Theodore Y. Ts'o" Cc: Yanteng Si Cc: Yonghong Song Jarkko Sakkinen (3): 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 - 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 | 990 +++++----- security/keys/request_key.c | 8 +- .../dm-verity/test-dm-verity-keyring.sh | 2 +- 21 files changed, 475 insertions(+), 3643 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