ppp: Add XDP support to ingress vlan_id

acassen · Feb 14, 2024 · 9cb77ed · 9cb77ed
1 parent 51305c2
commit 9cb77ed
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 0 deletions.
diff --git a/src/bpf/gtp.h b/src/bpf/gtp.h
@@ -134,6 +134,7 @@ struct gtp_rt_rule {
 	__be32  daddr;
 	__be32  dst_key;
 	__u8	ifindex;
+	__u16	vlan_id;
 
 	/* Some stats */
 	__u64   packets;

diff --git a/src/gtp_xdp_ppp.c b/src/gtp_xdp_ppp.c
@@ -99,8 +99,14 @@ gtp_xdp_ppp_rule_set(struct gtp_rt_rule *r, gtp_teid_t *t, spppoe_t *spppoe)
 	gtp_conn_t *c = s->conn;
 	gtp_router_t *rtr = c->ctx;
 	gtp_server_t *srv = &rtr->gtpu;
+	ip_vrf_t *vrf = s->apn->vrf;
+	__u16 vlan_id = 0;
 	int i;
 
+	vlan_id = (vrf) ? vrf->encap_vlan_id : 0;
+	if (__test_bit(GTP_TEID_FL_INGRESS, &t->flags))
+		vlan_id = (vrf) ? vrf->decap_vlan_id : 0;
+
 	for (i = 0; i < nr_cpus; i++) {
 		/* PPP related */
 		memcpy(r[i].h_src, &spppoe->hw_src, ETH_ALEN);
@@ -111,6 +117,8 @@ gtp_xdp_ppp_rule_set(struct gtp_rt_rule *r, gtp_teid_t *t, spppoe_t *spppoe)
 		r[i].teid = t->id;
 		r[i].saddr = inet_sockaddrip4(&srv->addr);
 		r[i].daddr = t->ipv4;
+		r[i].vlan_id = vlan_id;
+		r[i].ifindex = spppoe->pppoe->ifindex;
 		r[i].dst_key = 0;
 		r[i].packets = 0;
 		r[i].bytes = 0;

diff --git a/src/gtp_xdp_rt.c b/src/gtp_xdp_rt.c
@@ -132,13 +132,19 @@ gtp_xdp_rt_rule_set(struct gtp_rt_rule *r, gtp_teid_t *t)
 	ip_vrf_t *vrf = s->apn->vrf;
 	__be32 dst_key = (vrf) ? vrf->id : 0;
 	__u8 flags = __test_bit(IP_VRF_FL_IPIP_BIT, &vrf->flags) ? GTP_RT_FL_IPIP : 0;
+	__u16 vlan_id = 0;
 	int i;
 
+	vlan_id = (vrf) ? vrf->encap_vlan_id : 0;
+	if (__test_bit(GTP_TEID_FL_INGRESS, &t->flags))
+		vlan_id = (vrf) ? vrf->decap_vlan_id : 0;
+
 	for (i = 0; i < nr_cpus; i++) {
 		r[i].teid = t->id;
 		r[i].saddr = inet_sockaddrip4(&srv->addr);
 		r[i].daddr = t->ipv4;
 		r[i].dst_key = dst_key;
+		r[i].vlan_id = vlan_id;
 		r[i].packets = 0;
 		r[i].bytes = 0;
 		r[i].flags = flags;

diff --git a/src/include/gtp_xdp_rt.h b/src/include/gtp_xdp_rt.h
@@ -48,6 +48,7 @@ struct gtp_rt_rule {
 	__be32	daddr;
 	__be32	dst_key;
 	__u8	ifindex;
+	__u16	vlan_id;
 
 	/* Some stats */
 	__u64	packets;