calipso: hash the cache key, not the option start, in calipso_cache_add()
Subsystems (4)
PATCH 1/1 calipso: hash the cache key, not the option start, in calipso_cache_add()
calipso_cache_add() stores calipso_ptr + 2 as the cache key, but computes entry->hash over calipso_ptr, i.e. starting two bytes earlier at the option type and length. calipso_opt_getattr() looks entries up with calipso_cache_check(calipso + 2, calipso[1], ...), which hashes the key itself.
The two hashes only match on a jhash collision, so the CALIPSO label cache never hits and every labelled packet takes the full DOI lookup and category conversion path. The memcmp() on the key keeps lookups correct, so this is a performance bug only.
Hash the stored key, as cipso_v4_cache_add() does for CIPSO.
---
Found by code review. Compile-tested only (arm64, W=1); not runtime-tested.
net/ipv6/calipso.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/ipv6/calipso.c +1 -1
@@ -283,7 +283,7 @@ static int calipso_cache_add(const unsigned char *calipso_ptr, goto cache_add_failure; } entry->key_len = calipso_ptr_len; - entry->hash =calipso_map_cache_hash (calipso_ptr, calipso_ptr_len); + entry->hash =calipso_map_cache_hash (entry->key, calipso_ptr_len);refcount_inc (&secattr->cache->refcount); entry->lsm_data = secattr->cache;
[email protected]
AI reviewSashiko has reviewed this patch and found no issues. It looks great!
Quoted 11 lines
calipso_cache_add()storescalipso_ptr+ 2 as the cache key, but computesentry->hashovercalipso_ptr, i.e. starting two bytes earlier at the option type and length.calipso_opt_getattr()looks entries up withcalipso_cache_check(calipso + 2, calipso[1], ...), which hashes the key itself.The two hashes only match on a jhash collision, so the CALIPSO label cache never hits and every labelled packet takes the full DOI lookup and category conversion path. The
memcmp()on the key keeps lookups correct, so this is a performance bug only.
Quoted 4 lines
Hash the stored key, as
cipso_v4_cache_add()does for CIPSO.Fixes 4fee5242bf41 ("calipso: Add a label cache.")Signed-off-by Joas Antonio dos Santos <[email protected]>
Sashiko has reviewed this patch and found no issues. It looks great!
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=1
Quoted 6 lines
calipso_cache_add()storescalipso_ptr+ 2 as the cache key, but computesentry->hashovercalipso_ptr, i.e. starting two bytes earlier at the option type and length.calipso_opt_getattr()looks entries up withcalipso_cache_check(calipso + 2, calipso[1], ...), which hashes the key itself.
Quoted 6 lines
The two hashes only match on a jhash collision, so the CALIPSO label cache never hits and every labelled packet takes the full DOI lookup and category conversion path. The
memcmp()on the key keeps lookups correct, so this is a performance bug only.Hash the stored key, as
cipso_v4_cache_add()does for CIPSO.
FWIW:
I tested this with a small throwaway KUnit test: put 16 labels into the cache, then look each one up again the same way the kernel does when a packet arrives. Without the patch none of them were found (0/16), with it all of them were (16/16).
This patch was applied to netdev/net-next.git (main) by Paolo Abeni <[email protected]>:
Hello:
This patch was applied to netdev/net-next.git (main) by Paolo Abeni <[email protected]>:
Quoted 6 lines · On Wed, 07 Oct 2026 12:25:00 -0300 you wrote:
calipso_cache_add()storescalipso_ptr+ 2 as the cache key, but computesentry->hashovercalipso_ptr, i.e. starting two bytes earlier at the option type and length.calipso_opt_getattr()looks entries up withcalipso_cache_check(calipso + 2, calipso[1], ...), which hashes the key itself.
Quoted 6 lines
The two hashes only match on a jhash collision, so the CALIPSO label cache never hits and every labelled packet takes the full DOI lookup and category conversion path. The
memcmp()on the key keeps lookups correct, so this is a performance bug only.[...]
Here is the summary with links:
- [net-next] calipso: hash the cache key, not the option start, in calipso_cache_add()
https://git.kernel.org/netdev/net-next/c/d538cc3ec0bc
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
Quoted 18 lines · On Tue, Oct 13, 2026 at 6:10 AM <[email protected]> wrote:
Hello:
This patch was applied to netdev/net-next.git (main) by Paolo Abeni <[email protected]>:
Quoted 11 lines · On Wed, 07 Oct 2026 12:25:00 -0300 you wrote:
calipso_cache_add()storescalipso_ptr+ 2 as the cache key, but computesentry->hashovercalipso_ptr, i.e. starting two bytes earlier at the option type and length.calipso_opt_getattr()looks entries up withcalipso_cache_check(calipso + 2, calipso[1], ...), which hashes the key itself.The two hashes only match on a jhash collision, so the CALIPSO label cache never hits and every labelled packet takes the full DOI lookup and category conversion path. The
memcmp()on the key keeps lookups correct, so this is a performance bug only.
Quoted 7 lines
Quoted 1 line
[...]
Here is the summary with links:
- [net-next] calipso: hash the cache key, not the option start, incalipso_cache_add()https://git.kernel.org/netdev/net-next/c/d538cc3ec0bcYou are awesome, thank you!
My apologies, travel last week for LPC and LSS-EU has me a bit behind, but this patch looks good to me. Thanks for identifying the problem and providing a fix!
Likely too late, but for the sake of posterity ...
Signature · 1 line
paul-moore.com