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

s390x: fix big endian issue #2381

Merged
merged 3 commits into from May 8, 2020
Merged

s390x: fix big endian issue #2381

merged 3 commits into from May 8, 2020

Conversation

alicefr
Copy link

@alicefr alicefr commented May 5, 2020

Note: this is a carry of #2350

This PR fixes a big endian issue and modify the tests accordingly.

The solution is based on the same fix as containers/crun@07bae05

@alicefr
Copy link
Author

alicefr commented May 5, 2020

/cc @AkihiroSuda @kolyshkin

@AkihiroSuda
Copy link
Member

Needs cilium/ebpf#91 as well?

@alicefr
Copy link
Author

alicefr commented May 5, 2020

yes, otherwise the ebpf library still generates the wrong position for src and dst registers on s390x. I'll check with @iii-i, what is blocking or the TODOs for that PR

@AkihiroSuda
Copy link
Member

cilium/ebpf#91 seems merged.

@AkihiroSuda
Copy link
Member

Was this closed by mistake?

Alice Frosi added 2 commits May 8, 2020 07:31
Load the full 32 bits word and take the lower 16 bits, instead of
reading just 16 bits.

Same fix as containers/crun@07bae05

Signed-off-by: Alice Frosi <afrosi@de.ibm.com>
The test cases need to take into account the assembly modifications.
The instruction:
	LdXMemH dst: r2 src: r1 off: 0 imm: 0
has been replaced with:
        LdXMemW dst: r2 src: r1 off: 0 imm: 0
        And32Imm dst: r2 imm: 65535

Signed-off-by: Alice Frosi <afrosi@de.ibm.com>
@alicefr alicefr reopened this May 8, 2020
@alicefr
Copy link
Author

alicefr commented May 8, 2020

@AkihiroSuda sorry, I had some wrong setup in my git.

@AkihiroSuda
Copy link
Member

AkihiroSuda commented May 8, 2020

LGTM

Approved with PullApprove

Update ebpf to include PR cilium/ebpf#91.
The update is needed to fix opencontainers#2316.

Signed-off-by: Alice Frosi <afrosi@de.ibm.com>
@alicefr
Copy link
Author

alicefr commented May 8, 2020

Merged with the PR #2389

@AkihiroSuda
Copy link
Member

AkihiroSuda commented May 8, 2020

LGTM

Approved with PullApprove

@cyphar
Copy link
Member

cyphar commented May 8, 2020

LGTM.

Approved with PullApprove

@cyphar cyphar closed this in 6621af8 May 8, 2020
@cyphar cyphar merged commit 6621af8 into opencontainers:master May 8, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants