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

[v1.11] vagrant: Bump 4.9 Vagrant box (Linux 4.9.326, to fix a kernel bug) #25247

Merged
merged 2 commits into from May 12, 2023
Merged

[v1.11] vagrant: Bump 4.9 Vagrant box (Linux 4.9.326, to fix a kernel bug) #25247

merged 2 commits into from May 12, 2023

Conversation

qmonnet
Copy link
Member

@qmonnet qmonnet commented May 3, 2023

Fixes: #24394

Once this PR is merged, you can update the PR labels via:

for pr in 21106; do contrib/backporting/set-labels.py $pr done 1.11; done

or with

make add-labels BRANCH=v1.11 ISSUES=21106

@qmonnet qmonnet added kind/backports This PR provides functionality previously merged into master. backport/1.11 This PR represents a backport for Cilium 1.11.x of a PR that was merged to main. labels May 3, 2023
@qmonnet qmonnet mentioned this pull request May 3, 2023
Closed
@qmonnet
Copy link
Member Author

qmonnet commented May 3, 2023

/test-backport-1.11

2 similar comments
@jrajahalme

This comment was marked as outdated.

Sign in to view
@jrajahalme

This comment was marked as outdated.

Sign in to view
@ciliumbot

This comment was marked as outdated.

Sign in to view
3 similar comments
@ciliumbot

This comment was marked as outdated.

Sign in to view
@ciliumbot

This comment was marked as outdated.

Sign in to view
@ciliumbot

This comment was marked as outdated.

Sign in to view
@jrajahalme

This comment was marked as outdated.

Sign in to view
@jrajahalme

This comment was marked as outdated.

Sign in to view
@jrajahalme

This comment was marked as outdated.

Sign in to view
@jrajahalme

This comment was marked as outdated.

Sign in to view
@jrajahalme

This comment was marked as outdated.

Sign in to view
@jrajahalme

This comment was marked as outdated.

Sign in to view
@jrajahalme

This comment was marked as outdated.

Sign in to view
@jrajahalme

This comment was marked as outdated.

Sign in to view
@jrajahalme

This comment was marked as outdated.

Sign in to view
@jrajahalme

This comment was marked as outdated.

Sign in to view
@jrajahalme

This comment was marked as outdated.

Sign in to view
@jrajahalme

This comment was marked as outdated.

Sign in to view
@jrajahalme

This comment was marked as outdated.

Sign in to view
@qmonnet
vagrant: Bump 4.9 Vagrant box (Linux 4.9.326, to fix a kernel bug)
cab599b 
[ upstream commit 07e7fb0 ]

We have been hitting a kernel bug on 4.9 for the verifier tests. An
underflow on the memlock rlimit counter, caused by the reallocation of
BPF programs not updating the charged values, makes the counter go under
zero and convert into a huge value, blocking all further loads of BPF
objects [0].

This has been fixed in kernel 4.10 [1], and was backported at last in
4.9.326. We generated a new Ubuntu image based on that, let's update.

[0] #20288
[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?h=5ccb071e97fbd9ffe623a0d3977cc6d013bee93c

[ Backport note: Only update the v4.9 image, not the cilium-dev image
    because version 232 also contains an updated Go version. This is
    fine for VM images used in tests because they use CI images built by
    GH actions using the proper Go version for the branch. ]

Signed-off-by: Quentin Monnet <quentin@isovalent.com>
@qmonnet
Copy link
Member Author

qmonnet commented May 11, 2023

/test-backport-1.11

@jrajahalme
test/provision: Only install bpf mount if not already there
225676a 
Avoid failing VM start due to mount failing:

   Created symlink /etc/systemd/system/multi-user.target.wants/sys-fs-bpf.mount → /etc/systemd/system/sys-fs-bpf.mount.
   Failed to restart sys-fs-bpf.mount: Unit sys-fs-bpf.mount has a bad unit file setting.
   See system logs and 'systemctl status sys-fs-bpf.mount' for details.

Signed-off-by: Jarno Rajahalme <jarno@isovalent.com>
@jrajahalme
Copy link
Member

@qmonnet Added commit trying to avoid trying to re-mount the bpf file system.

@jrajahalme
Copy link
Member

/test-backport-1.11

@qmonnet
Copy link
Member Author

qmonnet commented May 12, 2023 •
edited

/test-1.19-4.9
Failure was an occurrence of #16847 (or #16813?), unrelated to the flake we're trying to fix here.

@qmonnet
Copy link
Member Author

qmonnet commented May 12, 2023

Not sure why Cilium L4LB XDP didn't trigger, but it's not affected by the version of the Vagrant boxes anyway.

@qmonnet qmonnet marked this pull request as ready for review May 12, 2023 09:38
@qmonnet qmonnet requested a review from a team as a code owner May 12, 2023 09:38
jrajahalme
jrajahalme approved these changes May 12, 2023
View reviewed changes
Copy link
Member

@jrajahalme jrajahalme left a comment

Choose a reason for hiding this comment

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

LGTM

@jrajahalme jrajahalme merged commit 7a1ad6d into v1.11 May 12, 2023
51 of 52 checks passed
@jrajahalme jrajahalme deleted the pr/qmonnet/vagrant-4.9 branch May 12, 2023 11:15
This was referenced May 12, 2023
Closed
Closed
Closed
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jrajahalme jrajahalme jrajahalme approved these changes

Assignees
No one assigned
Labels
backport/1.11 This PR represents a backport for Cilium 1.11.x of a PR that was merged to main. kind/backports This PR provides functionality previously merged into master.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@qmonnet @jrajahalme @ciliumbot