joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Revert "NetBpfLoad: hacky way to make LPM_TRIE bpf maps work."" into main

Browse source
This commit is contained in:
Maciej Żenczykowski 2025-01-20 13:43:27 -08:00 • committed by Gerrit Code Review
commit 4c0ba60c36
1 changed files with 1 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
bpf/loader/NetBpfLoad.cpp
View file

@ -616,9 +616,6 @@ static bool mapMatchesExpectations(const unique_fd& fd, const string& mapName,
if (type == BPF_MAP_TYPE_DEVMAP || type == BPF_MAP_TYPE_DEVMAP_HASH)
desired_map_flags |= BPF_F_RDONLY_PROG;
if (type == BPF_MAP_TYPE_LPM_TRIE)
desired_map_flags |= BPF_F_NO_PREALLOC;
// The .h file enforces that this is a power of two, and page size will
// also always be a power of two, so this logic is actually enough to
// force it to be a multiple of the page size, as required by the kernel.
@ -794,7 +791,7 @@ static int createMaps(const char* elfPath, ifstream& elfFile, vector<unique_fd>&
.key_size = md[i].key_size,
.value_size = md[i].value_size,
.max_entries = max_entries,
.map_flags = md[i].map_flags | (type == BPF_MAP_TYPE_LPM_TRIE ? BPF_F_NO_PREALLOC : 0),
.map_flags = md[i].map_flags,
};
if (isAtLeastKernelVersion(4, 15, 0))
strlcpy(req.map_name, mapNames[i].c_str(), sizeof(req.map_name));