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

Merge https://github.com/k8snetworkplumbingwg/sriov-cni:master into master #111

Merged
merged 8 commits into from
Jul 4, 2024

Conversation

SchSeba
Copy link
Contributor

@SchSeba SchSeba commented Jun 23, 2024

No description provided.

zeeke and others added 6 commits June 3, 2024 09:36
Signed-off-by: Thomas Haller <thaller@redhat.com>
Signed-off-by: Thomas Haller <thaller@redhat.com>
Previously, we called AnnounceIPs() right after configuring the
interface. At that point, the interface was just recently set IFF_UP,
and it might not yet have carrier. In that case, the messages will be
lost. We will need to wait a bit for carrier.

Since AnnounceIPs() is an optional performance improvement, let's first
do all the important things. Move the non-critical call to the end.

This will be interesting next, when we will do some additional waiting
for the device to have carrier. Let's not do the waiting in the middle
of the critical operations, but only at the end.

Signed-off-by: Thomas Haller <thaller@redhat.com>
After setting up the interface, it might take a bit for kernel to detect
carrier. If we then already send the GARP/NA packets, they are lost.

Instead, wait for up to 200 msec for the interface to get carrier. This
time is chosen somewhat arbitrarily. We don't want to block the process
too long, but we also need to wait long enough, that kernel and driver
has time to detect carrier. Also, while busy waiting, sleep with an
exponential back-off time (growth factor 1.5).

Fixes: c241dcb ('Send IPv4 GARP and IPv6 Unsolicited NA in "cmdAdd"')

See-also: https://issues.redhat.com/browse/OCPBUGS-30549

Signed-off-by: Thomas Haller <thaller@redhat.com>
Co-authored-by: Thomas Haller <thaller@redhat.com>
Signed-off-by: Thomas Haller <thaller@redhat.com>
Wait for carrier before announcing IPs via GARP/NA
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 23, 2024
@SchSeba SchSeba force-pushed the merge-bot-master branch 7 times, most recently from 1686c4d to 983138d Compare June 29, 2024 23:30
@SchSeba SchSeba force-pushed the merge-bot-master branch from 983138d to c1f16c2 Compare June 30, 2024 23:30
@SchSeba SchSeba force-pushed the merge-bot-master branch from c1f16c2 to bb69f91 Compare July 1, 2024 23:30
@bn222
Copy link
Contributor

bn222 commented Jul 2, 2024

/retest

@SchSeba
Copy link
Contributor Author

SchSeba commented Jul 3, 2024

/retest

Copy link
Contributor

openshift-ci bot commented Jul 3, 2024

@SchSeba: all tests passed!

Full PR test history. Your PR dashboard.

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. I understand the commands that are listed here.

@bn222
Copy link
Contributor

bn222 commented Jul 4, 2024

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jul 4, 2024
Copy link
Contributor

openshift-ci bot commented Jul 4, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bn222, SchSeba

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-merge-bot openshift-merge-bot bot merged commit d7f5748 into openshift:master Jul 4, 2024
4 checks passed
@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

This PR has been included in build sriov-cni-container-v4.17.0-202407041049.p0.gd7f5748.assembly.stream.el9 for distgit sriov-cni.
All builds following this will include this PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants