LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Ignore BPF tethering offload test if tether config is disabled"

Browse Source
This commit is contained in:
Treehugger Robot
2022-06-29 07:57:56 +00:00
committed by Gerrit Code Review
parent b7c368c27f b37f76f28e
commit dd9a89c2f2
2 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Tethering/src/com/android/networkstack/tethering/BpfCoordinator.java
View File

@@ -944,6 +944,8 @@ public class BpfCoordinator {
* be allowed to be accessed on the handler thread.
*/
public void dump(@NonNull IndentingPrintWriter pw) {
// Note that EthernetTetheringTest#isTetherConfigBpfOffloadEnabled relies on
// "mIsBpfEnabled" to check tethering config via dumpsys. Beware of the change if any.
pw.println("mIsBpfEnabled: " + mIsBpfEnabled);
pw.println("Polling " + (mPollingStarted ? "started" : "not started"));
pw.println("Stats provider " + (mStatsProvider != null

27
Tethering/tests/integration/src/android/net/EthernetTetheringTest.java
View File

@@ -1125,12 +1125,18 @@ public class EthernetTetheringTest {
@IgnoreUpTo(Build.VERSION_CODES.R)
public void testTetherUdpV4AfterR() throws Exception {
final String kernelVersion = VintfRuntimeInfo.getKernelVersion();
boolean usingBpf = isUdpOffloadSupportedByKernel(kernelVersion);
if (!usingBpf) {
final boolean isUdpOffloadSupported = isUdpOffloadSupportedByKernel(kernelVersion);
if (!isUdpOffloadSupported) {
Log.i(TAG, "testTetherUdpV4AfterR will skip BPF offload test for kernel "
+ kernelVersion);
}
runUdp4Test(initTetheringTester(toList(TEST_IP4_ADDR), toList(TEST_IP4_DNS)), usingBpf);
final boolean isTetherConfigBpfOffloadEnabled = isTetherConfigBpfOffloadEnabled();
if (!isTetherConfigBpfOffloadEnabled) {
Log.i(TAG, "testTetherUdpV4AfterR will skip BPF offload test "
+ "because tethering config doesn't enable BPF offload.");
}
runUdp4Test(initTetheringTester(toList(TEST_IP4_ADDR), toList(TEST_IP4_DNS)),
isUdpOffloadSupported && isTetherConfigBpfOffloadEnabled);
}
@Nullable
@@ -1189,6 +1195,21 @@ public class EthernetTetheringTest {
return null;
}
private boolean isTetherConfigBpfOffloadEnabled() throws Exception {
final String dumpStr = DumpTestUtils.dumpService(Context.TETHERING_SERVICE, "--short");
// BPF offload tether config can be overridden by "config_tether_enable_bpf_offload" in
// packages/modules/Connectivity/Tethering/res/values/config.xml. OEM may disable config by
// RRO to override the enabled default value. Get the tethering config via dumpsys.
// $ dumpsys tethering
// mIsBpfEnabled: true
boolean enabled = dumpStr.contains("mIsBpfEnabled: true");
if (!enabled) {
Log.d(TAG, "BPF offload tether config not enabled: " + dumpStr);
}
return enabled;
}
@NonNull
private Inet6Address getClatIpv6Address(TetheringTester tester, TetheredDevice tethered)
throws Exception {