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

[NETD-BPF#10] Add WaitForProgsLoaded.h am: 5b0fbc192e am: 0f9e8af368 am: 2e70f46b48

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

Change-Id: Ie18a7a9bdb12830a9559e57ed863bbb035fa3acc
This commit is contained in:
Ken Chen 2021-12-03 10:41:11 +00:00 committed by Automerger Merge Worker
commit 416aa4b846
2 changed files with 39 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
libbpf_android/include/WaitForProgsLoaded.h Normal file
View file

@ -0,0 +1,39 @@
/*
* Copyright (C) 2021 The Android Open Source Project
* Android BPF library - public API
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#pragma once
#include <log/log.h>
#include <android-base/properties.h>
namespace android {
namespace bpf {
// Wait for bpfloader to load BPF programs.
static inline void waitForProgsLoaded() {
// infinite loop until success with 5/10/20/40/60/60/60... delay
for (int delay = 5;; delay *= 2) {
if (delay > 60) delay = 60;
if (android::base::WaitForProperty("bpf.progs_loaded", "1", std::chrono::seconds(delay)))
return;
ALOGW("Waited %ds for bpf.progs_loaded, still waiting...", delay);
}
}
} // namespace bpf
} // namespace android

14
libbpf_android/include/libbpf_android.h
View file

@ -19,9 +19,6 @@
#include <libbpf.h>
#include <linux/bpf.h>
#include <log/log.h>
#include <android-base/properties.h>
namespace android {
namespace bpf {
@ -32,16 +29,5 @@ int loadProg(const char* elfPath, bool* isCritical, const char* prefix = "");
// Exposed for testing
unsigned int readSectionUint(const char* name, std::ifstream& elfFile, unsigned int defVal);
// Wait for bpfloader to load BPF programs.
static inline void waitForProgsLoaded() {
// infinite loop until success with 5/10/20/40/60/60/60... delay
for (int delay = 5;; delay *= 2) {
if (delay > 60) delay = 60;
if (android::base::WaitForProperty("bpf.progs_loaded", "1", std::chrono::seconds(delay)))
return;
ALOGW("Waited %ds for bpf.progs_loaded, still waiting...", delay);
}
}
} // namespace bpf
} // namespace android