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

timechaos: support injection on aarch64 #3088

Merged

ti-chi-bot merged 25 commits into chaos-mesh:master from YangKeao:time-chaos-aarch64

Jun 1, 2022

Member

YangKeao commented Mar 31, 2022

What problem does this PR solve?

Support TimeChaos on aarch64

Before reviewing this PR, it's highly suggested to read the document of ldr arm instruction: ldr literal and ldr register. The source code of binutils is also helpful in understanding the relocation of arm64.

You could objdump -d to disassembly the codes of fake image.

Member

ti-chi-bot commented Mar 31, 2022 •

edited

[REVIEW NOTIFICATION]

This pull request has been approved by:

Andrewmatilde
iguoyr

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

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

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

ti-chi-bot requested a review from STRRL

March 31, 2022 14:02

ti-chi-bot added the size/XXL label

codecov bot commented Mar 31, 2022 •

edited

Codecov Report

Merging #3088 (cc406d9) into master (bbbb6da) will increase coverage by 0.12%.
The diff coverage is 80.00%.

@@            Coverage Diff             @@
##           master    #3088      +/-   ##
==========================================
+ Coverage   41.08%   41.21%   +0.12%     
==========================================
  Files         163      165       +2     
  Lines       13796    13819      +23     
==========================================
+ Hits         5668     5695      +27     
+ Misses       7699     7695       -4     
  Partials      429      429

Impacted Files	Coverage Δ
pkg/chaosdaemon/time_server.go	`0.00% <0.00%> (ø)`
pkg/time/asset.go	`58.92% <57.14%> (-5.36%)`	⬇️
pkg/time/fake_image_linux.go	`49.29% <71.42%> (ø)`
pkg/time/fake_image_amd64.go	`83.33% <83.33%> (ø)`
pkg/time/asset_amd64.go	`100.00% <100.00%> (ø)`
api/v1alpha1/zz_generated.chaosmesh.go	`57.04% <0.00%> (-0.32%)`	⬇️
pkg/workflow/controllers/chaos_node_reconciler.go	`61.31% <0.00%> (+3.15%)`	⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 9ed62da...cc406d9. Read the comment docs.

YangKeao requested a review from iguoyr

March 31, 2022 14:19

YangKeao force-pushed the time-chaos-aarch64 branch from 0aa3719 to c9ceb42 Compare

April 1, 2022 03:41

YangKeao requested review from Hexilee and Andrewmatilde

April 1, 2022 03:47

sonatype-lift bot reviewed

View reviewed changes

pkg/ptrace/ptrace_linux.go

+              	buffer := make([]byte, size)
+              	localIov := C.struct_iovec{
+              		iov_base: C.long(uintptr(unsafe.Pointer(&buffer[0]))),

sonatype-lift bot Apr 1, 2022

G103: Use of unsafe calls should be audited

(at-me in a reply with help or ignore)

Member Author

YangKeao Apr 1, 2022

ignore

sonatype-lift bot Apr 1, 2022

I've recorded this as ignored for this pull request. If you change your mind, just comment @sonatype-lift unignore.

YangKeao added 2 commits

April 14, 2022 17:58


          add aarch64 support for timechaos

97da543

Signed-off-by: YangKeao <yangkeao@chunibyo.icu>


          add CHANGELOG.md

1cb97dc

Signed-off-by: YangKeao <yangkeao@chunibyo.icu>

YangKeao force-pushed the time-chaos-aarch64 branch from c9ceb42 to 1cb97dc Compare

April 14, 2022 09:59

YangKeao added 4 commits

April 15, 2022 11:43


          make check

7e0b093

Signed-off-by: YangKeao <yangkeao@chunibyo.icu>


          fix watchmaker building

7412b1a

Signed-off-by: YangKeao <yangkeao@chunibyo.icu>


          make check

bf42445

Signed-off-by: YangKeao <yangkeao@chunibyo.icu>


          Merge remote-tracking branch 'origin/time-chaos-aarch64' into time-ch…

163dfc2

…aos-aarch64

Member

iguoyr commented Apr 15, 2022

Close #2634

iguoyr linked an issue

that may be closed by this pull request

timechaos support arm64 #2634

Closed

Member Author

YangKeao commented Apr 25, 2022

@iguoyr @Andrewmatilde PTAL

STRRL mentioned this pull request

pkg/time cannot compile on arm64 #3191

Closed

STRRL added this to the Draft: Release 2.3 milestone

ti-chi-bot added the needs-rebase label

iguoyr linked an issue

that may be closed by this pull request

support ptrace on arm64 #2749

Closed

YangKeao added 2 commits

May 7, 2022 16:59


          fix recovery on arm

216d9c4

Signed-off-by: YangKeao <yangkeao@chunibyo.icu>


          Merge remote-tracking branch 'upstream/master' into time-chaos-aarch64

a0761d0

Signed-off-by: YangKeao <yangkeao@chunibyo.icu>

ti-chi-bot removed the needs-rebase label

YangKeao added 2 commits

May 7, 2022 17:06


          don't know why it changes, reset

ae5b613

Signed-off-by: YangKeao <yangkeao@chunibyo.icu>


          fix check

60fc9d6

Signed-off-by: YangKeao <yangkeao@chunibyo.icu>

Andrewmatilde reviewed

View reviewed changes

Member

Andrewmatilde left a comment

Rest LGTM

pkg/ptrace/stdwrapper_amd64.go Outdated Show resolved Hide resolved

pkg/ptrace/ptrace_linux.go Show resolved Hide resolved

pkg/ptrace/ptrace_linux_arm64.go Show resolved Hide resolved


          add some comments and combine some files

5276eac

Signed-off-by: YangKeao <yangkeao@chunibyo.icu>

YangKeao added 2 commits

May 25, 2022 14:41


          add unix dependency

2f095a6

Signed-off-by: YangKeao <yangkeao@chunibyo.icu>


          add golang.org/x/sys to direct dependency

72cb68a

Signed-off-by: YangKeao <yangkeao@chunibyo.icu>

Member Author

YangKeao commented May 26, 2022 •

edited

@STRRL PTAL.

The arm timechaos test has passed 😆


          modify comments to little endian

a19e16b

Signed-off-by: YangKeao <yangkeao@chunibyo.icu>

iguoyr reviewed

View reviewed changes

pkg/time/asset.go Outdated Show resolved Hide resolved


          split asset to multiple arch

145f620

Signed-off-by: YangKeao <yangkeao@chunibyo.icu>

iguoyr reviewed

View reviewed changes

pkg/time/asset_amd64.go Outdated Show resolved Hide resolved

pkg/time/asset_arm64.go Outdated Show resolved Hide resolved

pkg/time/asset_arm64.go Show resolved Hide resolved


          add some comments and use varLength

059fbcf

Signed-off-by: YangKeao <yangkeao@chunibyo.icu>

iguoyr reviewed

View reviewed changes

pkg/time/asset_arm64.go Outdated Show resolved Hide resolved


          modify the comments

ecce638

Signed-off-by: YangKeao <yangkeao@chunibyo.icu>

iguoyr reviewed

View reviewed changes

pkg/ptrace/ptrace_linux_arm64.go Show resolved Hide resolved

pkg/ptrace/ptrace_linux_arm64.go Show resolved Hide resolved

pkg/ptrace/ptrace_linux_arm64.go Outdated Show resolved Hide resolved

pkg/ptrace/ptrace_linux_arm64.go Show resolved Hide resolved


          wrap error of get/set regs

85a1933

Signed-off-by: YangKeao <yangkeao@chunibyo.icu>

iguoyr reviewed

View reviewed changes

pkg/ptrace/ptrace_linux.go Outdated Show resolved Hide resolved


          fix error handling

619c742

Signed-off-by: YangKeao <yangkeao@chunibyo.icu>

Member

iguoyr commented May 30, 2022

@YangKeao Please fix the CI :)

YangKeao added 2 commits

May 30, 2022 14:15


          rewrite %x to %v for bytes

363b555

Signed-off-by: YangKeao <yangkeao@chunibyo.icu>


          Merge remote-tracking branch 'upstream/master' into time-chaos-aarch64

8ff6cb2

Member Author

YangKeao commented May 30, 2022

@YangKeao Please fix the CI :)

PTAL

iguoyr approved these changes

View reviewed changes

Member

iguoyr left a comment

LGTM! 👍

ti-chi-bot added the status/LGT1 label

Member Author

YangKeao commented May 30, 2022

@Andrewmatilde @STRRL PTAL

Andrewmatilde approved these changes

View reviewed changes

Member

Andrewmatilde left a comment

LGTM

ti-chi-bot added status/LGT2 and removed status/LGT1 labels

Member Author

YangKeao commented Jun 1, 2022

/merge

Member

ti-chi-bot commented Jun 1, 2022

This pull request has been accepted and is ready to merge.

Commit hash: 8ff6cb2

ti-chi-bot added the status/can-merge label


          Merge branch 'master' into time-chaos-aarch64

cc406d9

ti-chi-bot merged commit 5184d78 into chaos-mesh:master

xlgao-zju pushed a commit to xlgao-zju/chaos-mesh that referenced this pull request


          timechaos: support injection on aarch64 (chaos-mesh#3088)

62a7c39

* add aarch64 support for timechaos

Signed-off-by: YangKeao <yangkeao@chunibyo.icu>

Co-authored-by: Ti Chi Robot <ti-community-prow-bot@tidb.io>

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

sonatype-lift[bot] sonatype-lift left review comments

iguoyr iguoyr approved these changes

Andrewmatilde Andrewmatilde approved these changes

STRRL Awaiting requested review from STRRL

Hexilee Awaiting requested review from Hexilee