tequilaOS/platform_system_bpf
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

BpfLoader - create /sys/fs/bpf/loader am: ebfacde967

Browse source 
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2327675

Change-Id: I1d9bfee78db171f0a380e7917608b9d2989e63ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Maciej Żenczykowski 2022-12-09 09:51:49 +00:00 committed by Automerger Merge Worker
commit 9836896064
2 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
bpfloader/BpfLoader.cpp
View file

@ -218,7 +218,7 @@ int loadAllElfObjects(const Location& location) {
return retVal; return retVal;
} }
void createSysFsBpfSubDir(const char* const prefix) { int createSysFsBpfSubDir(const char* const prefix) {
if (*prefix) { if (*prefix) {
mode_t prevUmask = umask(0); mode_t prevUmask = umask(0);
@ -228,11 +228,14 @@ void createSysFsBpfSubDir(const char* const prefix) {
errno = 0; errno = 0;
int ret = mkdir(s.c_str(), S_ISVTX | S_IRWXU | S_IRWXG | S_IRWXO); int ret = mkdir(s.c_str(), S_ISVTX | S_IRWXU | S_IRWXG | S_IRWXO);
if (ret && errno != EEXIST) { if (ret && errno != EEXIST) {
ALOGE("Failed to create directory: %s, ret: %s", s.c_str(), std::strerror(errno)); const int err = errno;
ALOGE("Failed to create directory: %s, ret: %s", s.c_str(), std::strerror(err));
return -err;
} }
umask(prevUmask); umask(prevUmask);
} }
return 0;
} }
int main(int argc, char** argv) { int main(int argc, char** argv) {
@ -244,8 +247,8 @@ int main(int argc, char** argv) {
// (due to genfscon rules) have fs_bpf_tethering selinux context, which is restricted // (due to genfscon rules) have fs_bpf_tethering selinux context, which is restricted
// to the network_stack process only (which is where out of process tethering runs) // to the network_stack process only (which is where out of process tethering runs)
if (isInProcessTethering() && !exists("/sys/fs/bpf/tethering")) { if (isInProcessTethering() && !exists("/sys/fs/bpf/tethering")) {
createSysFsBpfSubDir(/* /sys/fs/bpf/ */ "net_shared"); if (createSysFsBpfSubDir(/* /sys/fs/bpf/ */ "net_shared")) return 1;
createSysFsBpfSubDir(/* /sys/fs/bpf/ */ "net_shared/tethering"); if (createSysFsBpfSubDir(/* /sys/fs/bpf/ */ "net_shared/tethering")) return 1;
/* /sys/fs/bpf/tethering -> net_shared/tethering */ /* /sys/fs/bpf/tethering -> net_shared/tethering */
if (symlink("net_shared/tethering", "/sys/fs/bpf/tethering")) { if (symlink("net_shared/tethering", "/sys/fs/bpf/tethering")) {
@ -259,9 +262,16 @@ int main(int argc, char** argv) {
// which could otherwise fail with ENOENT during object pinning or renaming, // which could otherwise fail with ENOENT during object pinning or renaming,
// due to ordering issues) // due to ordering issues)
for (const auto& location : locations) { for (const auto& location : locations) {
createSysFsBpfSubDir(location.prefix); if (createSysFsBpfSubDir(location.prefix)) return 1;
} }
// Note: there's no actual src dir for fs_bpf_loader .o's,
// so it is not listed in 'locations[].prefix'.
// This is because this is primarily meant for triggering genfscon rules,
// and as such this will likely always be the case.
// Thus we need to manually create the /sys/fs/bpf/loader subdirectory.
if (createSysFsBpfSubDir("loader")) return 1;
// Load all ELF objects, create programs and maps, and pin them // Load all ELF objects, create programs and maps, and pin them
for (const auto& location : locations) { for (const auto& location : locations) {
if (loadAllElfObjects(location) != 0) { if (loadAllElfObjects(location) != 0) {

4
libbpf_android/Loader.cpp
View file

@ -30,9 +30,9 @@
#include <sys/wait.h> #include <sys/wait.h>
#include <unistd.h> #include <unistd.h>
// This is BpfLoader v0.30 // This is BpfLoader v0.31
#define BPFLOADER_VERSION_MAJOR 0u #define BPFLOADER_VERSION_MAJOR 0u
#define BPFLOADER_VERSION_MINOR 30u #define BPFLOADER_VERSION_MINOR 31u
#define BPFLOADER_VERSION ((BPFLOADER_VERSION_MAJOR << 16) | BPFLOADER_VERSION_MINOR) #define BPFLOADER_VERSION ((BPFLOADER_VERSION_MAJOR << 16) | BPFLOADER_VERSION_MINOR)
#include "bpf/BpfUtils.h" #include "bpf/BpfUtils.h"