Merge branch 'bpf-dedup-fixes'

Browse source

Andrii Nakryiko says:

====================
This patchset fixes a bug in btf_dedup() algorithm, which under specific
hash collision causes infinite loop. It also exposes ability to tune BTF
deduplication table size, with double purpose of allowing applications to
adjust size according to the size of BTF data, as well as allowing a simple
way to force hash collisions by setting table size to 1.

- Patch #1 fixes bug in btf_dedup testing code that's checking strings
- Patch #2 fixes pointer arg formatting in btf.h
- Patch #3 adds option to specify custom dedup table size
- Patch #4 fixes aforementioned bug in btf_dedup
- Patch #5 adds test that validates the fix

v1->v2:
- remove "Fixes" from formatting change patch
- extract roundup_pow2_max func for dedup table size
- btf_equal_struct -> btf_shallow_equal_struct
- explain in comment why we can't rely on just btf_dedup_is_equiv
====================

Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>

...

This commit is contained in:

Daniel Borkmann 2019-03-01 01:31:48 +01:00

parent 3d8669e637 7c7a4890c8

commit 3860d38f28

4 changed files with 103 additions and 23 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

73

tools/lib/bpf/btf.c

View file

3

tools/lib/bpf/btf.h

View file

1

tools/testing/selftests/bpf/.gitignore vendored

View file

49

tools/testing/selftests/bpf/test_btf.c

View file