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

DscpPolicy Move to kernel 5.15

Browse Source 
Require at least kernel 5.15. Feature is not required on older
kernels and may impact boot time unnecessarily.

Bug: 235559605
Change-Id: I2e4b509de1d8940fc63ae057a8326f13c0fd1420
This commit is contained in:
Tyler Wear
2022-06-29 12:45:20 -07:00
parent dd9a89c2f2
commit a8ca597aec
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bpf_progs/dscp_policy.c
View File

@@ -297,7 +297,7 @@ static inline __always_inline void match_policy(struct __sk_buff* skb, bool ipv4
}
DEFINE_BPF_PROG_KVER("schedcls/set_dscp_ether", AID_ROOT, AID_SYSTEM,
schedcls_set_dscp_ether, KVER(5, 4, 0))
schedcls_set_dscp_ether, KVER(5, 15, 0))
(struct __sk_buff* skb) {
if (skb->pkt_type != PACKET_HOST) return TC_ACT_PIPE;
@@ -313,7 +313,7 @@ DEFINE_BPF_PROG_KVER("schedcls/set_dscp_ether", AID_ROOT, AID_SYSTEM,
}
DEFINE_BPF_PROG_KVER("schedcls/set_dscp_raw_ip", AID_ROOT, AID_SYSTEM,
schedcls_set_dscp_raw_ip, KVER(5, 4, 0))
schedcls_set_dscp_raw_ip, KVER(5, 15, 0))
(struct __sk_buff* skb) {
if (skb->protocol == htons(ETH_P_IP)) {
match_policy(skb, true, false);

6
tests/cts/net/src/android/net/cts/DscpPolicyTest.kt
View File

@@ -136,8 +136,8 @@ class DscpPolicyTest {
@Before
fun setUp() {
// For BPF support kernel needs to be at least 5.4.
assumeTrue(kernelIsAtLeast(5, 4))
// For BPF support kernel needs to be at least 5.15.
assumeTrue(kernelIsAtLeast(5, 15))
runAsShell(MANAGE_TEST_NETWORKS) {
val tnm = realContext.getSystemService(TestNetworkManager::class.java)
@@ -158,7 +158,7 @@ class DscpPolicyTest {
@After
fun tearDown() {
if (!kernelIsAtLeast(5, 4)) {
if (!kernelIsAtLeast(5, 15)) {
return;
}
agentsToCleanUp.forEach { it.unregister() }