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.

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

Fix older kernel handling for Fentry #374

Merged
merged 2 commits into from
Aug 6, 2024

Conversation

msherif1234
Copy link
Contributor

@msherif1234 msherif1234 commented Jul 25, 2024

Description

Fix upstream #369

Dependencies

n/a

Checklist

If you are not familiar with our processes or don't know what to answer in the list below, let us know in a comment: the maintainers will take care of that.

  • Will this change affect NetObserv / Network Observability operator? If not, you can ignore the rest of this checklist.
  • Is this PR backed with a JIRA ticket? If so, make sure it is written as a title prefix (in general, PRs affecting the NetObserv/Network Observability product should be backed with a JIRA ticket - especially if they bring user facing changes).
  • Does this PR require product documentation?
    • If so, make sure the JIRA epic is labelled with "documentation" and provides a description relevant for doc writers, such as use cases or scenarios. Any required step to activate or configure the feature should be documented there, such as new CRD knobs.
  • Does this PR require a product release notes entry?
    • If so, fill in "Release Note Text" in the JIRA.
  • Is there anything else the QE team should know before testing? E.g: configuration changes, environment setup, etc.
    • If so, make sure it is described in the JIRA ticket.
  • QE requirements (check 1 from the list):
    • Standard QE validation, with pre-merge tests unless stated otherwise.
    • Regression tests only (e.g. refactoring with no user-facing change).
    • No QE (e.g. trivial change with high reviewer's confidence, or per agreement with the QE team).

Copy link

codecov bot commented Jul 25, 2024

Codecov Report

Attention: Patch coverage is 18.75000% with 13 lines in your changes missing coverage. Please review.

Please upload report for BASE (main@c9b6a78). Learn more about missing BASE report.
Report is 7 commits behind head on main.

Files Patch % Lines
pkg/ebpf/tracer.go 0.00% 13 Missing ⚠️
Additional details and impacted files
@@           Coverage Diff           @@
##             main     #374   +/-   ##
=======================================
  Coverage        ?   32.18%           
=======================================
  Files           ?       49           
  Lines           ?     3673           
  Branches        ?        0           
=======================================
  Hits            ?     1182           
  Misses          ?     2390           
  Partials        ?      101           
Flag Coverage Δ
unittests 32.18% <18.75%> (?)

Flags with carried forward coverage won't be shown. Click here to find out more.

Files Coverage Δ
pkg/pbpacket/packet_grpc.pb.go 75.86% <100.00%> (ø)
pkg/ebpf/tracer.go 0.00% <0.00%> (ø)

@msherif1234
Copy link
Contributor Author

/ok-to-test

@openshift-ci openshift-ci bot added the ok-to-test To set manually when a PR is safe to test. Triggers image build on PR. label Jul 25, 2024
Copy link

New image:
quay.io/netobserv/netobserv-ebpf-agent:18bc1ee

It will expire after two weeks.

To deploy this build, run from the operator repo, assuming the operator is running:

USER=netobserv VERSION=18bc1ee make set-agent-image

// try to use kprobe for older kernels
rttKprobeLink, err = link.Kprobe("tcp_rcv_established", objects.TcpRcvKprobe, nil)
if err != nil {
log.Warningf("failed to attach the BPF program to tcpReceiveFentry: %v fallback to use kprobe", err)

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This warn is not always correct. In case of new kernel tcp_rcv_fentry can be successfully attached and the code will continue and fail with kprobe.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah good catch I will fix it Thanks!!

@github-actions github-actions bot removed the ok-to-test To set manually when a PR is safe to test. Triggers image build on PR. label Jul 29, 2024
Copy link

openshift-ci bot commented Jul 29, 2024

@matijavizintin: changing LGTM is restricted to collaborators

In response to this:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

Signed-off-by: Mohamed Mahmoud <[email protected]>
matijavizintin added a commit to outbrain-inc/netobserv-ebpf-agent that referenced this pull request Jul 30, 2024
Copy link
Contributor

@jpinsonneau jpinsonneau left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me, just a comment

@@ -85,6 +86,7 @@ type FlowFetcherConfig struct {
FilterConfig *FilterConfig
}

// nolint:cyclop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can't we split the function here ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we probably can will do that in a follow on pr

@msherif1234
Copy link
Contributor Author

/approve

Copy link

openshift-ci bot commented Aug 6, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: msherif1234

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved label Aug 6, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit 2d9657e into netobserv:main Aug 6, 2024
10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants