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

Do not test Log.wtf reporting pipeline on V+

Browse source 
On U QPR3+, networking bpf programs are already loaded by netbpfload, so
there is no point in checking the netbpfload result. The system will
likely abort if anything was not loaded correctly.

Checking the netbpfload result is only really relevant on devices before
V that receive netbpfload via mainline update.

In addition, removing the Log.wtf from V+ devices prevents Android Go
devices that use non-updatable modules from reporting wtf logs for a
very long time.

Test: TH
Bug: 351118770
(cherry picked from https://android-review.googlesource.com/q/commit:1c351b2c4aed13b6169cbb107f7a1488637dbdd5)
Merged-In: I8a412cb25374f3637f2fbd89617baa58d41d8589
Change-Id: I8a412cb25374f3637f2fbd89617baa58d41d8589
This commit is contained in:
Patrick Rohr 2024-07-08 13:43:48 -07:00 • committed by Android Build Coastguard Worker
commit 72df65b28d
1 changed files with 27 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

52
service/src/com/android/server/ConnectivityService.java
View file

@ -1847,31 +1847,33 @@ public class ConnectivityService extends IConnectivityManager.Stub
mHandler = new InternalHandler(mHandlerThread.getLooper());
// Temporary hack to report netbpfload result.
// TODO: remove in 2024-09 when netbpfload starts loading mainline bpf programs.
mHandler.postDelayed(() -> {
// Test Pitot pipeline, ignore this Log.wtf if it shows up in the logs.
final Random r = new Random();
if (Build.TYPE.equals("user") && r.nextInt(1000) == 0) {
Log.wtf(TAG, "NOT A FAILURE, PLEASE IGNORE! Test Pitot pipeline works correctly");
}
// Did netbpfload create the map?
try {
Os.access("/sys/fs/bpf/net_shared/map_gentle_test", F_OK);
} catch (ErrnoException e) {
Log.wtf(TAG, "netbpfload did not create map", e);
}
// Did netbpfload create the program?
try {
Os.access("/sys/fs/bpf/net_shared/prog_gentle_skfilter_accept", F_OK);
} catch (ErrnoException e) {
Log.wtf(TAG, "netbpfload did not create program", e);
}
// Did netbpfload run to completion?
try {
Os.access("/sys/fs/bpf/netd_shared/mainline_done", F_OK);
} catch (ErrnoException e) {
Log.wtf(TAG, "netbpfload did not run to completion", e);
}
}, 30_000 /* delayMillis */);
if (!mDeps.isAtLeastV()) {
mHandler.postDelayed(() -> {
// Test Log.wtf reporting pipeline. Ignore this Log.wtf if it shows up in the logs.
final Random r = new Random();
if (Build.TYPE.equals("user") && r.nextInt(1000) == 0) {
Log.wtf(TAG, "NOT A FAILURE, PLEASE IGNORE! Ensure netbpfload result reported");
}
// Did netbpfload create the map?
try {
Os.access("/sys/fs/bpf/net_shared/map_gentle_test", F_OK);
} catch (ErrnoException e) {
Log.wtf(TAG, "netbpfload did not create map", e);
}
// Did netbpfload create the program?
try {
Os.access("/sys/fs/bpf/net_shared/prog_gentle_skfilter_accept", F_OK);
} catch (ErrnoException e) {
Log.wtf(TAG, "netbpfload did not create program", e);
}
// Did netbpfload run to completion?
try {
Os.access("/sys/fs/bpf/netd_shared/mainline_done", F_OK);
} catch (ErrnoException e) {
Log.wtf(TAG, "netbpfload did not run to completion", e);
}
}, 30_000 /* delayMillis */);
}
mTrackerHandler = new NetworkStateTrackerHandler(mHandlerThread.getLooper());
mConnectivityDiagnosticsHandler =
new ConnectivityDiagnosticsHandler(mHandlerThread.getLooper());