Skip to content

Commit 3dd23b4

Browse files
authored
refactor(xdp): rename GTPU[IPv4+TEID]->PDR map (#593)
1 parent 49b1600 commit 3dd23b4

6 files changed

Lines changed: 13 additions & 13 deletions

File tree

‎cmd/api/rest/uplink_pdr.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ func (h *ApiHandler) getUplinkPdrValue(c *gin.Context) {
2626
}
2727

2828
var value ebpf.PdrInfo
29-
if err = h.BpfObjects.IpEntrypointObjects.PdrMapUplinkIp4.Lookup(uint32(id), unsafe.Pointer(&value)); err != nil {
29+
if err = h.BpfObjects.IpEntrypointObjects.PdrMapTeidIp4.Lookup(uint32(id), unsafe.Pointer(&value)); err != nil {
3030
log.Printf("Error reading map: %s", err.Error())
3131
c.JSON(http.StatusNotFound, gin.H{"error": err.Error()})
3232
return
@@ -55,7 +55,7 @@ func (h *ApiHandler) setUplinkPdrValue(c *gin.Context) {
5555
QerId: pdrElement.QerId,
5656
}
5757

58-
if err := h.BpfObjects.IpEntrypointObjects.PdrMapUplinkIp4.Put(uint32(pdrElement.Id), unsafe.Pointer(&value)); err != nil {
58+
if err := h.BpfObjects.IpEntrypointObjects.PdrMapTeidIp4.Put(uint32(pdrElement.Id), unsafe.Pointer(&value)); err != nil {
5959
log.Printf("Error writting map: %s", err.Error())
6060
c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
6161
return

‎cmd/ebpf/objects.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ func (bpfObjects *BpfObjects) ResizeAllMaps(qerMapSize uint32, farMapSize uint32
164164
log.Info().Msgf("Failed to resize PDR map: %s", err)
165165
return err
166166
}
167-
if err := ResizeEbpfMap(&bpfObjects.PdrMapUplinkIp4, bpfObjects.UpfIpEntrypointFunc, pdrMapSize); err != nil {
167+
if err := ResizeEbpfMap(&bpfObjects.PdrMapTeidIp4, bpfObjects.UpfIpEntrypointFunc, pdrMapSize); err != nil {
168168
log.Info().Msgf("Failed to resize PDR map: %s", err)
169169
return err
170170
}

‎cmd/ebpf/objects_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ func testGtpWithPDRBenchmark(bpfObjects *BpfObjects, repeat int) (int64, error)
181181
if err := bpfObjects.QerMap.Put(uint32(1), unsafe.Pointer(&qer)); err != nil {
182182
return 0, fmt.Errorf("benchmark run failed: %v", err)
183183
}
184-
if err := bpfObjects.PdrMapUplinkIp4.Put(teid, unsafe.Pointer(&pdr)); err != nil {
184+
if err := bpfObjects.PdrMapTeidIp4.Put(teid, unsafe.Pointer(&pdr)); err != nil {
185185
return 0, fmt.Errorf("benchmark run failed: %v", err)
186186
}
187187

‎cmd/ebpf/pdr.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,13 @@ func (bpfObjects *BpfObjects) PutPdrUplink(teid uint32, pdrInfo PdrInfo) error {
5656
var pdrToStore IpEntrypointPdrInfo
5757
var err error
5858
if pdrInfo.SdfFilter != nil {
59-
if pdrToStore, err = PreprocessPdrWithSdf(bpfObjects.PdrMapUplinkIp4.Lookup, teid, pdrInfo); err != nil {
59+
if pdrToStore, err = PreprocessPdrWithSdf(bpfObjects.PdrMapTeidIp4.Lookup, teid, pdrInfo); err != nil {
6060
return err
6161
}
6262
} else {
6363
pdrToStore = ToIpEntrypointPdrInfo(pdrInfo)
6464
}
65-
return bpfObjects.PdrMapUplinkIp4.Put(teid, unsafe.Pointer(&pdrToStore))
65+
return bpfObjects.PdrMapTeidIp4.Put(teid, unsafe.Pointer(&pdrToStore))
6666
}
6767

6868
func (bpfObjects *BpfObjects) PutPdrDownlink(ipv4 net.IP, pdrInfo PdrInfo) error {
@@ -84,13 +84,13 @@ func (bpfObjects *BpfObjects) UpdatePdrUplink(teid uint32, pdrInfo PdrInfo) erro
8484
var pdrToStore IpEntrypointPdrInfo
8585
var err error
8686
if pdrInfo.SdfFilter != nil {
87-
if pdrToStore, err = PreprocessPdrWithSdf(bpfObjects.PdrMapUplinkIp4.Lookup, teid, pdrInfo); err != nil {
87+
if pdrToStore, err = PreprocessPdrWithSdf(bpfObjects.PdrMapTeidIp4.Lookup, teid, pdrInfo); err != nil {
8888
return err
8989
}
9090
} else {
9191
pdrToStore = ToIpEntrypointPdrInfo(pdrInfo)
9292
}
93-
return bpfObjects.PdrMapUplinkIp4.Update(teid, unsafe.Pointer(&pdrToStore), ebpf.UpdateExist)
93+
return bpfObjects.PdrMapTeidIp4.Update(teid, unsafe.Pointer(&pdrToStore), ebpf.UpdateExist)
9494
}
9595

9696
func (bpfObjects *BpfObjects) UpdatePdrDownlink(ipv4 net.IP, pdrInfo PdrInfo) error {
@@ -109,7 +109,7 @@ func (bpfObjects *BpfObjects) UpdatePdrDownlink(ipv4 net.IP, pdrInfo PdrInfo) er
109109

110110
func (bpfObjects *BpfObjects) DeletePdrUplink(teid uint32) error {
111111
log.Debug().Msgf("EBPF: Delete PDR Uplink: teid=%d", teid)
112-
return bpfObjects.PdrMapUplinkIp4.Delete(teid)
112+
return bpfObjects.PdrMapTeidIp4.Delete(teid)
113113
}
114114

115115
func (bpfObjects *BpfObjects) DeletePdrDownlink(ipv4 net.IP) error {

‎cmd/ebpf/xdp/n3n6_entrypoint.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ static __always_inline enum xdp_action handle_gtp_packet(struct packet_context *
192192
* Step 1: search for PDR and apply PDR instructions
193193
*/
194194
__u32 teid = bpf_htonl(ctx->gtp->teid);
195-
struct pdr_info *pdr = bpf_map_lookup_elem(&pdr_map_uplink_ip4, &teid);
195+
struct pdr_info *pdr = bpf_map_lookup_elem(&pdr_map_teid_ip4, &teid);
196196
if (!pdr) {
197197
upf_printk("upf: [n3] no session for teid:%u", teid);
198198
return DEFAULT_XDP_ACTION;

‎cmd/ebpf/xdp/pdr.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
#include "xdp/sdf_filter.h"
2424

25-
#define PDR_MAP_UPLINK_SIZE 1024
25+
#define PDR_MAP_TEID_IPV4_SIZE 1024
2626
#define PDR_MAP_DOWNLINK_IPV4_SIZE 1024
2727
#define PDR_MAP_DOWNLINK_IPV6_SIZE 1024
2828
#define FAR_MAP_SIZE 1024
@@ -89,8 +89,8 @@ struct
8989
__uint(type, BPF_MAP_TYPE_HASH);
9090
__type(key, __u32);
9191
__type(value, struct pdr_info);
92-
__uint(max_entries, PDR_MAP_UPLINK_SIZE);
93-
} pdr_map_uplink_ip4 SEC(".maps");
92+
__uint(max_entries, PDR_MAP_TEID_IPV4_SIZE);
93+
} pdr_map_teid_ip4 SEC(".maps");
9494

9595
enum far_action_mask {
9696
FAR_DROP = 0x01,

0 commit comments

Comments
 (0)