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

Revert "Trim some redundant Arm feature detection files" #1979

Merged
merged 7 commits into from
Dec 5, 2024

Conversation

knightjoel
Copy link
Contributor

This reverts commit d36bf85.

Issues:

Resolves AWS-LC-496

Description of changes:

d36bf85 was a merge from upstream. BoringSSL removed some 32-bit ARM stuff for OpenBSD, but the merge to aws-lc removed some aarch64 stuff, breaking the build on OpenBSD/arm64 platform (a regression from #962).

Testing:

I can successfully build aws-lc on OpenBSD/arm64 with this PR.

~/aws-lc-obsd-aarch64% cmake --build ./build
[...]
[588/595] Linking CXX executable ssl/test/bssl_shim
ld: warning: ssl_transfer.cc:30 (/home/jwk/aws-lc-obsd-aarch64/ssl/test/ssl_transfer.cc:30)(ssl/test/CMakeFiles/bssl_shim.dir/ssl_transfer.cc.o:(SSLTransfer::ResetSSL(TestConfig const*, std::__1::unique_ptr<ssl_st, bssl::internal::Deleter>*))): warning: rand() may return deterministic values, is that what you want?
[591/595] Linking CXX executable crypto/crypto_testld: warning: bio_md_test.cc:185 (/home/jwk/aws-lc-obsd-aarch64/crypto/pkcs7/bio/bio_md_test.cc:185)(crypto/CMakeFiles/crypto_test.dir/pkcs7/bio/bio_md_test.cc.o:(BIOMessageDigestTest_Randomized_Test::TestBody())): warning: rand() may return deterministic values, is that what you want?
[595/595] Linking CXX executable ssl/ssl_test

~/aws-lc-obsd-aarch64% uname -a
OpenBSD arm64 7.6 GENERIC.MP#196 arm64

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license and the ISC license.

@knightjoel knightjoel requested a review from a team as a code owner November 9, 2024 23:58
@codecov-commenter
Copy link

codecov-commenter commented Nov 11, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 78.67%. Comparing base (7c47081) to head (de57e08).

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1979      +/-   ##
==========================================
- Coverage   78.68%   78.67%   -0.01%     
==========================================
  Files         598      598              
  Lines      103329   103329              
  Branches    14687    14686       -1     
==========================================
- Hits        81301    81292       -9     
- Misses      21376    21386      +10     
+ Partials      652      651       -1     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@justsmth justsmth force-pushed the openbsd-aarch64 branch 2 times, most recently from a1ce804 to 372d9a2 Compare November 11, 2024 22:11
Copy link
Contributor

@torben-hansen torben-hansen left a comment

Choose a reason for hiding this comment

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

Looks like d36bf85 removed cpu_aarch64_openbsd.c that handles the 64-bit stuff. While it should have removed cpu_arm_openbsd.c that handles the 32-bit stuff, except this file doesn't exist in AWS-LC (a difference from BoringSSL).

Now see CryptoAlg-2781

Copy link
Contributor

@torben-hansen torben-hansen left a comment

Choose a reason for hiding this comment

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

Actually, looks like there are some test setup to work through before PR is ready to merge.

But the revert part lgtm.

@torben-hansen
Copy link
Contributor

The OpenBSD 7.{5,6} (arm64) are failing for some reason. I restarted them once, but failed at the same point, so looks consistent. I haven't observed the same error for other PRs, so looks related to this change.

@justsmth
Copy link
Contributor

justsmth commented Dec 3, 2024

The OpenBSD 7.{5,6} (arm64) are failing for some reason. I restarted them once, but failed at the same point, so looks consistent. I haven't observed the same error for other PRs, so looks related to this change.

The ARM64 OpenBSD 7.x tests were added by this PR, so there's no point of reference from which we can compare.

@justsmth
Copy link
Contributor

justsmth commented Dec 3, 2024

The OpenBSD (ARM64) failure relates to a TCP timeout.

unexpected failure: local error 'read tcp [::1]:21654->[::1]:21014: i/o timeout', child error 'exit status 1', stdout:

stderr:
SSL error: SYSCALL
Connection 1 failed.

Since the ARM64 OpenBSD tests are failing due to a TCP timeout (and b/c these tests run incredibly slow under emulation), I'll try to narrow the ARM64 OpenBSD tests further to just cover libcrypto.

@justsmth justsmth force-pushed the openbsd-aarch64 branch 3 times, most recently from 7319dbe to 0e2c517 Compare December 3, 2024 15:03
justsmth and others added 7 commits December 3, 2024 15:10
While here, rotate the OpenBSD versions to keep up with the latest
release (OpenBSD support model is N and N-1).
There's no tag which supports OpenBSD 7.6, so pinning to the latest
commit for now.
@justsmth justsmth merged commit 1bf38a8 into aws:main Dec 5, 2024
120 of 121 checks passed
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.

5 participants