Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add PortRange type and support PDR port ranges in BESS-upf #438

Merged
merged 19 commits into from
Feb 7, 2022
Merged

Add PortRange type and support PDR port ranges in BESS-upf #438

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
342cc5f
WIP Add ternary port ranges
pudelkoM Feb 1, 2022
86721ef
Add test for zero `portFilter`
pudelkoM Feb 1, 2022
00eb9a4
Shorten port filter string
pudelkoM Feb 1, 2022
f4bd068
More doc strings
pudelkoM Feb 1, 2022
2411c64
Fix typo
pudelkoM Feb 2, 2022
fba124f
Rename product and enable `want` test check
pudelkoM Feb 2, 2022
0d6fd96
Add `portFilter.Width` function
pudelkoM Feb 2, 2022
63f15de
Implement exact range conversion
pudelkoM Feb 2, 2022
3e064cc
Add exact match conversion strategy
pudelkoM Feb 3, 2022
7be1ae7
Fix missing renames
pudelkoM Feb 3, 2022
004a2a9
Use `portFilter` in application
pudelkoM Feb 3, 2022
5416561
Flip src and dst port in access PDRs
pudelkoM Feb 4, 2022
164226b
Lint and formatting
pudelkoM Feb 4, 2022
2ee9ca2
Merge remote-tracking branch 'origin/master' into bess-pdr-port-ranges
pudelkoM Feb 4, 2022
82362d9
Rename `portFilter` to `portRange`
pudelkoM Feb 4, 2022
625de2e
Fix missed renames
pudelkoM Feb 4, 2022
f9bd979
More renames
pudelkoM Feb 4, 2022
8f3e3ed
Add license header
pudelkoM Feb 5, 2022
0cc1f3b
Trigger CI
pudelkoM Feb 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
140 changes: 79 additions & 61 deletions pfcpiface/bess.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -711,45 +711,55 @@ func (b *bess) addPDR(ctx context.Context, done chan<- bool, p pdr) {
break
}

f := &pb.WildcardMatchCommandAddArg{
Gate: uint64(p.needDecap),
Priority: int64(math.MaxUint32 - p.precedence),
Values: []*pb.FieldData{
intEnc(uint64(p.srcIface)), /* src_iface */
intEnc(uint64(p.tunnelIP4Dst)), /* tunnel_ipv4_dst */
intEnc(uint64(p.tunnelTEID)), /* enb_teid */
intEnc(uint64(p.appFilter.srcIP)), /* ueaddr ip*/
intEnc(uint64(p.appFilter.dstIP)), /* inet ip */
intEnc(uint64(p.appFilter.srcPort)), /* ue port */
intEnc(uint64(p.appFilter.dstPort)), /* inet port */
intEnc(uint64(p.appFilter.proto)), /* proto id */
},
Masks: []*pb.FieldData{
intEnc(uint64(p.srcIfaceMask)), /* src_iface-mask */
intEnc(uint64(p.tunnelIP4DstMask)), /* tunnel_ipv4_dst-mask */
intEnc(uint64(p.tunnelTEIDMask)), /* enb_teid-mask */
intEnc(uint64(p.appFilter.srcIPMask)), /* ueaddr ip-mask */
intEnc(uint64(p.appFilter.dstIPMask)), /* inet ip-mask */
intEnc(uint64(p.appFilter.srcPortMask)), /* ue port-mask */
intEnc(uint64(p.appFilter.dstPortMask)), /* inet port-mask */
intEnc(uint64(p.appFilter.protoMask)), /* proto id-mask */
},
Valuesv: []*pb.FieldData{
intEnc(uint64(p.pdrID)), /* pdr-id */
intEnc(p.fseID), /* fseid */
intEnc(uint64(p.ctrID)), /* ctr_id */
intEnc(uint64(qerID)), /* qer_id */
intEnc(uint64(p.farID)), /* far_id */
},
}

any, err = anypb.New(f)
// Translate port ranges into ternary rule(s) and insert them one-by-one.
portRules, err := CreatePortFilterCartesianProduct(p.appFilter.srcPortFilter, p.appFilter.dstPortFilter)
if err != nil {
log.Println("Error marshalling the rule", f, err)
log.Errorln(err)
return
}
log.Tracef("PDR rules %+v", portRules)

for _, r := range portRules {
f := &pb.WildcardMatchCommandAddArg{
Gate: uint64(p.needDecap),
Priority: int64(math.MaxUint32 - p.precedence),
Values: []*pb.FieldData{
intEnc(uint64(p.srcIface)), /* src_iface */
intEnc(uint64(p.tunnelIP4Dst)), /* tunnel_ipv4_dst */
intEnc(uint64(p.tunnelTEID)), /* enb_teid */
intEnc(uint64(p.appFilter.srcIP)), /* ueaddr ip*/
intEnc(uint64(p.appFilter.dstIP)), /* inet ip */
intEnc(uint64(r.srcPort)), /* ue port */
intEnc(uint64(r.dstPort)), /* inet port */
intEnc(uint64(p.appFilter.proto)), /* proto id */
},
Masks: []*pb.FieldData{
intEnc(uint64(p.srcIfaceMask)), /* src_iface-mask */
intEnc(uint64(p.tunnelIP4DstMask)), /* tunnel_ipv4_dst-mask */
intEnc(uint64(p.tunnelTEIDMask)), /* enb_teid-mask */
intEnc(uint64(p.appFilter.srcIPMask)), /* ueaddr ip-mask */
intEnc(uint64(p.appFilter.dstIPMask)), /* inet ip-mask */
intEnc(uint64(r.srcMask)), /* ue port-mask */
intEnc(uint64(r.dstMask)), /* inet port-mask */
intEnc(uint64(p.appFilter.protoMask)), /* proto id-mask */
},
Valuesv: []*pb.FieldData{
intEnc(uint64(p.pdrID)), /* pdr-id */
intEnc(p.fseID), /* fseid */
intEnc(uint64(p.ctrID)), /* ctr_id */
intEnc(uint64(qerID)), /* qer_id */
intEnc(uint64(p.farID)), /* far_id */
},
}

any, err = anypb.New(f)
if err != nil {
log.Println("Error marshalling the rule", f, err)
return
}

b.processPDR(ctx, any, upfMsgTypeAdd)
b.processPDR(ctx, any, upfMsgTypeAdd)
}
done <- true
}()
}
Expand All @@ -761,36 +771,44 @@ func (b *bess) delPDR(ctx context.Context, done chan<- bool, p pdr) {
err error
)

f := &pb.WildcardMatchCommandDeleteArg{
Values: []*pb.FieldData{
intEnc(uint64(p.srcIface)), /* src_iface */
intEnc(uint64(p.tunnelIP4Dst)), /* tunnel_ipv4_dst */
intEnc(uint64(p.tunnelTEID)), /* enb_teid */
intEnc(uint64(p.appFilter.srcIP)), /* ueaddr ip*/
intEnc(uint64(p.appFilter.dstIP)), /* inet ip */
intEnc(uint64(p.appFilter.srcPort)), /* ue port */
intEnc(uint64(p.appFilter.dstPort)), /* inet port */
intEnc(uint64(p.appFilter.proto)), /* proto id */
},
Masks: []*pb.FieldData{
intEnc(uint64(p.srcIfaceMask)), /* src_iface-mask */
intEnc(uint64(p.tunnelIP4DstMask)), /* tunnel_ipv4_dst-mask */
intEnc(uint64(p.tunnelTEIDMask)), /* enb_teid-mask */
intEnc(uint64(p.appFilter.srcIPMask)), /* ueaddr ip-mask */
intEnc(uint64(p.appFilter.dstIPMask)), /* inet ip-mask */
intEnc(uint64(p.appFilter.srcPortMask)), /* ue port-mask */
intEnc(uint64(p.appFilter.dstPortMask)), /* inet port-mask */
intEnc(uint64(p.appFilter.protoMask)), /* proto id-mask */
},
}

any, err = anypb.New(f)
// Translate port ranges into ternary rule(s) and insert them one-by-one.
portRules, err := CreatePortFilterCartesianProduct(p.appFilter.srcPortFilter, p.appFilter.dstPortFilter)
if err != nil {
log.Errorln("Error marshalling the rule", f, err)
log.Errorln(err)
return
}

b.processPDR(ctx, any, upfMsgTypeDel)
for _, r := range portRules {
f := &pb.WildcardMatchCommandDeleteArg{
Values: []*pb.FieldData{
intEnc(uint64(p.srcIface)), /* src_iface */
intEnc(uint64(p.tunnelIP4Dst)), /* tunnel_ipv4_dst */
intEnc(uint64(p.tunnelTEID)), /* enb_teid */
intEnc(uint64(p.appFilter.srcIP)), /* ueaddr ip*/
intEnc(uint64(p.appFilter.dstIP)), /* inet ip */
intEnc(uint64(r.srcPort)), /* ue port */
intEnc(uint64(r.dstPort)), /* inet port */
intEnc(uint64(p.appFilter.proto)), /* proto id */
},
Masks: []*pb.FieldData{
intEnc(uint64(p.srcIfaceMask)), /* src_iface-mask */
intEnc(uint64(p.tunnelIP4DstMask)), /* tunnel_ipv4_dst-mask */
intEnc(uint64(p.tunnelTEIDMask)), /* enb_teid-mask */
intEnc(uint64(p.appFilter.srcIPMask)), /* ueaddr ip-mask */
intEnc(uint64(p.appFilter.dstIPMask)), /* inet ip-mask */
intEnc(uint64(r.srcMask)), /* ue port-mask */
intEnc(uint64(r.dstMask)), /* inet port-mask */
intEnc(uint64(p.appFilter.protoMask)), /* proto id-mask */
},
}

any, err = anypb.New(f)
if err != nil {
log.Errorln("Error marshalling the rule", f, err)
return
}
b.processPDR(ctx, any, upfMsgTypeDel)
}
done <- true
}()
}
Expand Down
10 changes: 5 additions & 5 deletions pfcpiface/p4rt_translator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -518,15 +518,15 @@ func (t *P4rtTranslator) BuildApplicationsTableEntry(pdr pdr, internalAppID uint

var (
appIP, appIPMask uint32 = 0, 0
appPort uint16 = 0
appPort portFilter
)

if pdr.srcIface == access {
appIP, appIPMask = pdr.appFilter.dstIP, pdr.appFilter.dstIPMask
appPort = pdr.appFilter.dstPort
appPort = pdr.appFilter.dstPortFilter
} else if pdr.srcIface == core {
appIP, appIPMask = pdr.appFilter.srcIP, pdr.appFilter.srcIPMask
appPort = pdr.appFilter.srcPort
appPort = pdr.appFilter.srcPortFilter
}

appProto, appProtoMask := pdr.appFilter.proto, pdr.appFilter.protoMask
Expand All @@ -538,8 +538,8 @@ func (t *P4rtTranslator) BuildApplicationsTableEntry(pdr pdr, internalAppID uint
}
}

if appPort != 0 {
if err := t.withRangeMatchField(entry, FieldAppL4Port, appPort, appPort); err != nil {
if !appPort.isWildcardMatch() {
if err := t.withRangeMatchField(entry, FieldAppL4Port, appPort.portLow, appPort.portHigh); err != nil {
return nil, err
}
}
Expand Down