From bf24fdbcc2447e37327e9ec2ffa0c47e052f3ffa Mon Sep 17 00:00:00 2001 From: Motomu Utsumi Date: Fri, 22 Aug 2025 13:12:28 +0900 Subject: [PATCH] tcpAccECN: update DEFINE_BPF_PROG to follow the current syntax This CL also sets the min kver to 5.10. skb_tcp_flags field in bpf_sock_ops was introduced on 5.10 kernel Test: TH Bug: 440448408 Flag: EXEMPT tcpAccECN is not used Change-Id: I71696e0bf3b36296c5f2e7fd5b692406d96ddf97 --- bpf/progs/tcpAccECN.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bpf/progs/tcpAccECN.c b/bpf/progs/tcpAccECN.c index ac577c0195..33a89175f6 100644 --- a/bpf/progs/tcpAccECN.c +++ b/bpf/progs/tcpAccECN.c @@ -168,7 +168,7 @@ parse_tcp_mss_option(struct __sk_buff *skb, uint8_t offset) { return -1; } -DEFINE_BPF_PROG("sockops/l4s_accecn_option", AID_ROOT, AID_SYSTEM, l4s_accecn_option) +DEFINE_BPF_PROG_KVER(sockops, accecn_option, , AID_SYSTEM, 5_10) (struct bpf_sock_ops *skops) { switch (skops->op) { case BPF_SOCK_OPS_TCP_CONNECT_CB: @@ -222,7 +222,7 @@ DEFINE_BPF_PROG("sockops/l4s_accecn_option", AID_ROOT, AID_SYSTEM, l4s_accecn_op return 1; } -DEFINE_BPF_PROG("schedcls/ingress/l4s_accecn_eth", AID_ROOT, AID_SYSTEM, sched_cls_ingress_l4s_accecn_eth) +DEFINE_BPF_PROG_KVER(schedcls, ingress_accecn_eth, , AID_SYSTEM, 5_10) (struct __sk_buff* skb) { void* data = (void*)(long)skb->data; void* data_end = (void*)(long)skb->data_end; @@ -358,7 +358,7 @@ DEFINE_BPF_PROG("schedcls/ingress/l4s_accecn_eth", AID_ROOT, AID_SYSTEM, sched_c } -DEFINE_BPF_PROG("schedcls/egress/l4s_accecn_eth", AID_ROOT, AID_SYSTEM, sched_cls_egress_l4s_accecn_eth) +DEFINE_BPF_PROG_KVER(schedcls, egress_accecn_eth, , AID_SYSTEM, 5_10) (struct __sk_buff* skb) { void* data = (void*)(long)skb->data; void* data_end = (void*)(long)skb->data_end; @@ -476,7 +476,7 @@ DEFINE_BPF_PROG("schedcls/egress/l4s_accecn_eth", AID_ROOT, AID_SYSTEM, sched_cl return TC_ACT_PIPE; } -DEFINE_BPF_PROG("schedcls/ingress/l4s_accecn_rawip", AID_ROOT, AID_SYSTEM, sched_cls_ingress_l4s_accecn_rawip) +DEFINE_BPF_PROG_KVER(schedcls, ingress_accecn_rawip, , AID_SYSTEM, 5_10) (struct __sk_buff* skb) { void* data = (void*)(long)skb->data; void* data_end = (void*)(long)skb->data_end; @@ -612,7 +612,7 @@ DEFINE_BPF_PROG("schedcls/ingress/l4s_accecn_rawip", AID_ROOT, AID_SYSTEM, sched } -DEFINE_BPF_PROG("schedcls/egress/l4s_accecn_rawip", AID_ROOT, AID_SYSTEM, sched_cls_egress_l4s_accecn_rawip) +DEFINE_BPF_PROG_KVER(schedcls, egress_accecn_rawip, , AID_SYSTEM, 5_10) (struct __sk_buff* skb) { void* data = (void*)(long)skb->data; void* data_end = (void*)(long)skb->data_end;