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

make mapRetrieveWO take exclusive lock am: 7eb7d67279

Browse source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3134022

Change-Id: Id6d2e5f4d159cae27aa62b12ccc2a1c70771907e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Maciej Żenczykowski 2024-06-15 00:20:34 +00:00 • committed by Automerger Merge Worker
commit 2c8345d94f
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
netd/BpfHandler.cpp
View file

@ -204,7 +204,7 @@ static void mapLockTest(void) {
const char * const m1 = BPF_NETD_PATH "map_netd_lock_array_test_map";
const char * const m2 = BPF_NETD_PATH "map_netd_lock_hash_test_map";
unique_fd fd0(bpf::mapRetrieveExclusiveRW(m1)); if (!fd0.ok()) abort();
unique_fd fd0(bpf::mapRetrieveExclusiveRW(m1)); if (!fd0.ok()) abort(); // grabs exclusive lock
unique_fd fd1(bpf::mapRetrieveExclusiveRW(m2)); if (!fd1.ok()) abort(); // no conflict with fd0
unique_fd fd2(bpf::mapRetrieveExclusiveRW(m2)); if ( fd2.ok()) abort(); // busy due to fd1
@ -215,6 +215,9 @@ static void mapLockTest(void) {
unique_fd fd6(bpf::mapRetrieveRW(m2)); if (!fd6.ok()) abort(); // now ok
unique_fd fd7(bpf::mapRetrieveRO(m2)); if (!fd7.ok()) abort(); // no lock taken
unique_fd fd8(bpf::mapRetrieveExclusiveRW(m2)); if ( fd8.ok()) abort(); // busy due to fd6
fd0.reset(); // releases exclusive lock
unique_fd fd9(bpf::mapRetrieveWO(m1)); if (!fd9.ok()) abort(); // grabs exclusive lock
}
Status BpfHandler::initMaps() {

5
staticlibs/native/bpf_syscall_wrappers/include/BpfSyscallWrappers.h
View file

@ -175,10 +175,9 @@ inline int mapRetrieveRO(const char* pathname) {
}
// WARNING: it's impossible to grab a shared (ie. read) lock on a write-only fd,
// so only use this if you don't care about locking, ie. never use
// mapRetrieveExclusiveRW() on the same map (ie. pathname).
// so we instead choose to grab an exclusive (ie. write) lock.
inline int mapRetrieveWO(const char* pathname) {
return bpfFdGet(pathname, BPF_F_WRONLY);
return bpfLock(bpfFdGet(pathname, BPF_F_WRONLY), F_WRLCK);
}
inline int retrieveProgram(const char* pathname) {