shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 18:41:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

bpf: Handle BPF_EXIST and BPF_NOEXIST for LPM trie

Browse Source 
[ Upstream commit eae6a075e9537dd69891cf77ca5a88fa8a28b4a1 ]

Add the currently missing handling for the BPF_EXIST and BPF_NOEXIST
flags. These flags can be specified by users and are relevant since LPM
trie supports exact matches during update.

Fixes: b95a5c4db0 ("bpf: add a longest prefix match trie map implementation")
Reviewed-by: Toke Høiland-Jørgensen <toke@redhat.com>
Acked-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: Hou Tao <houtao1@huawei.com>
Link: https://lore.kernel.org/r/20241206110622.1161752-4-houtao@huaweicloud.com
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Hou Tao
2024-12-06 19:06:16 +08:00
committed by Greg Kroah-Hartman
parent 68fc3da03c
commit 5bc31abdc7
1 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
kernel/bpf/lpm_trie.c
View File

@@ -368,6 +368,10 @@ static int trie_update_elem(struct bpf_map *map,
* simply assign the @new_node to that slot and be done. * simply assign the @new_node to that slot and be done.
*/ */
if (!node) { if (!node) {
if (flags == BPF_EXIST) {
ret = -ENOENT;
goto out;
}
rcu_assign_pointer(*slot, new_node); rcu_assign_pointer(*slot, new_node);
goto out; goto out;
} }
@@ -376,18 +380,31 @@ static int trie_update_elem(struct bpf_map *map,
* which already has the correct data array set. * which already has the correct data array set.
*/ */
if (node->prefixlen == matchlen) { if (node->prefixlen == matchlen) {
if (!(node->flags & LPM_TREE_NODE_FLAG_IM)) {
if (flags == BPF_NOEXIST) {
ret = -EEXIST;
goto out;
}
trie->n_entries--;
} else if (flags == BPF_EXIST) {
ret = -ENOENT;
goto out;
}
new_node->child[0] = node->child[0]; new_node->child[0] = node->child[0];
new_node->child[1] = node->child[1]; new_node->child[1] = node->child[1];
if (!(node->flags & LPM_TREE_NODE_FLAG_IM))
trie->n_entries--;
rcu_assign_pointer(*slot, new_node); rcu_assign_pointer(*slot, new_node);
free_node = node; free_node = node;
goto out; goto out;
} }
if (flags == BPF_EXIST) {
ret = -ENOENT;
goto out;
}
/* If the new node matches the prefix completely, it must be inserted /* If the new node matches the prefix completely, it must be inserted
* as an ancestor. Simply insert it between @node and *@slot. * as an ancestor. Simply insert it between @node and *@slot.
*/ */