Merge pull request #13994 from keszybz/bpf-refactor

Refactor the bpf devices code and fix some bugs

diff --cc src/test/meson.build
Simple merge

diff --cc src/test/test-unit-name.c
Simple merge