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

API interface change and UTs for TC functions #25

Merged
merged 5 commits into from
Aug 18, 2023
Merged

API interface change and UTs for TC functions #25

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
54dd25a
UTs for tc functions
jayanthvn Aug 17, 2023
c94d236
Fix vet
jayanthvn Aug 17, 2023
ded96db
Add mocks
jayanthvn Aug 17, 2023
1bc9bb4
Feedback
jayanthvn Aug 18, 2023
fa170d3
PR feedbacl
jayanthvn Aug 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 56 additions & 9 deletions pkg/tc/tc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,25 @@ const (

var log = logger.Get()

type BpfTcAPIs interface {
TCIngressAttach(interfaceName string, progFD int, funcName string) error
TCIngressDetach(interfaceName string) error
TCEgressAttach(interfaceName string, progFD int, funcName string) error
TCEgressDetach(interfaceName string) error
CleanupQdiscs(prefix string, ingressCleanup bool, egressCleanup bool) error
}

type BpfTc struct {
InterfacePrefix string
}

func New(interfacePrefix string) *BpfTc {
return &BpfTc{
InterfacePrefix: interfacePrefix,
}

}

func enableQdisc(link netlink.Link) bool {
qdiscs, err := netlink.QdiscList(link)
if err != nil {
Expand All @@ -54,7 +73,20 @@ func enableQdisc(link netlink.Link) bool {

}

func TCIngressAttach(interfaceName string, progFD int, funcName string) error {
func (m *BpfTc) mismatchedInterfacePrefix(interfaceName string) error {
if !strings.HasPrefix(interfaceName, m.InterfacePrefix) {
log.Errorf("expected prefix - %s but got %s", m.InterfacePrefix, interfaceName)
return errors.New("Mismatched initialized prefix name and passed interface name")
}
return nil
}

func (m *BpfTc) TCIngressAttach(interfaceName string, progFD int, funcName string) error {

if err := m.mismatchedInterfacePrefix(interfaceName); err != nil {
return err
}

intf, err := netlink.LinkByName(interfaceName)
if err != nil {
log.Errorf("failed to find device by name %s: %w", interfaceName, err)
Expand Down Expand Up @@ -101,7 +133,12 @@ func TCIngressAttach(interfaceName string, progFD int, funcName string) error {
return nil
}

func TCIngressDetach(interfaceName string) error {
func (m *BpfTc) TCIngressDetach(interfaceName string) error {

if err := m.mismatchedInterfacePrefix(interfaceName); err != nil {
return err
}

intf, err := netlink.LinkByName(interfaceName)
if err != nil {
log.Errorf("failed to find device by name %s: %w", interfaceName, err)
Expand Down Expand Up @@ -132,7 +169,12 @@ func TCIngressDetach(interfaceName string) error {
return fmt.Errorf("no active filter to detach-%s", interfaceName)
}

func TCEgressAttach(interfaceName string, progFD int, funcName string) error {
func (m *BpfTc) TCEgressAttach(interfaceName string, progFD int, funcName string) error {

if err := m.mismatchedInterfacePrefix(interfaceName); err != nil {
return err
}

intf, err := netlink.LinkByName(interfaceName)
if err != nil {
log.Errorf("failed to find device by name %s: %w", interfaceName, err)
Expand Down Expand Up @@ -179,7 +221,12 @@ func TCEgressAttach(interfaceName string, progFD int, funcName string) error {
return nil
}

func TCEgressDetach(interfaceName string) error {
func (m *BpfTc) TCEgressDetach(interfaceName string) error {

if err := m.mismatchedInterfacePrefix(interfaceName); err != nil {
return err
}

intf, err := netlink.LinkByName(interfaceName)
if err != nil {
log.Errorf("failed to find device by name %s: %w", interfaceName, err)
Expand Down Expand Up @@ -210,9 +257,9 @@ func TCEgressDetach(interfaceName string) error {
return fmt.Errorf("no active filter to detach-%s", interfaceName)
}

func CleanupQdiscs(prefix string, ingressCleanup bool, egressCleanup bool) error {
func (m *BpfTc) CleanupQdiscs(ingressCleanup bool, egressCleanup bool) error {

if prefix == "" {
if m.InterfacePrefix == "" {
log.Errorf("invalid empty prefix")
return nil
}
Expand All @@ -225,10 +272,10 @@ func CleanupQdiscs(prefix string, ingressCleanup bool, egressCleanup bool) error

for _, link := range linkList {
linkName := link.Attrs().Name
if strings.HasPrefix(linkName, prefix) {
if strings.HasPrefix(linkName, m.InterfacePrefix) {
if ingressCleanup {
log.Infof("Trying to cleanup ingress on %s", linkName)
err = TCIngressDetach(linkName)
err = m.TCIngressDetach(linkName)
if err != nil {
if err.Error() == FILTER_CLEANUP_FAILED {
log.Errorf("failed to detach ingress, might not be present so moving on")
Expand All @@ -238,7 +285,7 @@ func CleanupQdiscs(prefix string, ingressCleanup bool, egressCleanup bool) error

if egressCleanup {
log.Infof("Trying to cleanup egress on %s", linkName)
err = TCEgressDetach(linkName)
err = m.TCEgressDetach(linkName)
if err != nil {
if err.Error() == FILTER_CLEANUP_FAILED {
log.Errorf("failed to detach egress, might not be present so moving on")
Expand Down
Loading
Loading