Skip to content

Conversation

gilles-peskine-arm
Copy link
Contributor

@gilles-peskine-arm gilles-peskine-arm commented Jun 20, 2024

This is a collection of fixes to issues in all.sh that I discovered while working on #9286. The biggest part is a reorganization of component_build_aes_armce and component_build_sha_armce to make them split into clear distinct configurations.

While the issues themselves are minor, this pull request is priority-high because it blocks priority-high work.

PR checklist

Please tick as appropriate and edit the reasons (e.g.: "backport: not needed because this is a new feature")

@gilles-peskine-arm gilles-peskine-arm added needs-review Every commit must be reviewed by at least two team members, needs-reviewer This PR needs someone to pick it up for review component-test Test framework and CI scripts priority-high High priority - will be reviewed soon size-xs Estimated task size: extra small (a few hours at most) labels Jun 20, 2024
@gilles-peskine-arm gilles-peskine-arm force-pushed the outcome-check-repeated-configurations-all.sh-preliminaries branch from 8bc7ce2 to d8ae3d4 Compare June 20, 2024 08:31
@paul-elliott-arm paul-elliott-arm self-requested a review July 11, 2024 08:35
@gilles-peskine-arm gilles-peskine-arm force-pushed the outcome-check-repeated-configurations-all.sh-preliminaries branch from 6bc0245 to 3856d5c Compare July 11, 2024 10:13
@gilles-peskine-arm gilles-peskine-arm added needs-ci Needs to pass CI tests and removed needs-review Every commit must be reviewed by at least two team members, needs-reviewer This PR needs someone to pick it up for review labels Jul 11, 2024
Copy link
Contributor

@waleed-elmelegy-arm waleed-elmelegy-arm left a comment

Choose a reason for hiding this comment

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

LGTM

@gilles-peskine-arm gilles-peskine-arm added needs-review Every commit must be reviewed by at least two team members, and removed needs-ci Needs to pass CI tests labels Jul 12, 2024
Copy link
Contributor

@yanesca yanesca left a comment

Choose a reason for hiding this comment

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

LGTM

@yanesca yanesca added needs-work and removed needs-review Every commit must be reviewed by at least two team members, labels Aug 5, 2024
Copy link
Contributor

@yanesca yanesca left a comment

Choose a reason for hiding this comment

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

I looks like now we need a rebase.

Our makefiles don't use $(LD) so the typo was harmless.

Signed-off-by: Gilles Peskine <[email protected]>
`grep mbedtls_des*` would pick up e.g. mbedtls_derive_xxx.

Signed-off-by: Gilles Peskine <[email protected]>
The compilation is slower but we get more potential warnings and running the
tests is faster.

Signed-off-by: Gilles Peskine <[email protected]>
Having assembly files called *.o was confusing.

Signed-off-by: Gilles Peskine <[email protected]>
Reorganize the structure of the builds of aesce.c and sha256ce.c with
various configurations of AES/SHA256 acceleration. Now everything in a given
configuration is grouped together (building the object file, and checking
the presence or absence of certain instructions in the assembly).

Fix several instances of copypasta in -m options where we were sometimes not
allowing the compiler to use optional instructions even though we use them
in inline assembly, and sometimes allowing the compiler to use optional
instructions even though we then checked their absence

Signed-off-by: Gilles Peskine <[email protected]>
@gilles-peskine-arm gilles-peskine-arm force-pushed the outcome-check-repeated-configurations-all.sh-preliminaries branch from 3856d5c to 59aea4e Compare August 5, 2024 14:13
@gilles-peskine-arm
Copy link
Contributor Author

I rebased to resolve the conflicts, mostly in tests/scripts/all.sh after #8226 but also consecutive lines modified in library/Makefile. The previous version is in https://github.com/gilles-peskine-arm/mbedtls/tree/outcome-check-repeated-configurations-all.sh-preliminaries-2.

The following command shows that the new changeset differs from the old one only by file names and (in a few places) context, but the line changes are the same.

git range-diff origin/development 3856d5cf68130f9e66704b54cd8bd7dee7df4ff8 59aea4e1cc2c1b94ef10ed0872f278aa4c449380 | grep -v '^    [-+][-+]'

@gilles-peskine-arm gilles-peskine-arm added needs-ci Needs to pass CI tests and removed needs-work labels Aug 5, 2024
Copy link
Contributor

@yanesca yanesca left a comment

Choose a reason for hiding this comment

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

I have checked the parameters and the output of the range-diff command, the only differences are in a few commit messages.

Looks good to me.

@gilles-peskine-arm gilles-peskine-arm added needs-review Every commit must be reviewed by at least two team members, and removed needs-ci Needs to pass CI tests labels Aug 5, 2024
@gilles-peskine-arm gilles-peskine-arm added the needs-backports Backports are missing or are pending review and approval. label Sep 20, 2024
Copy link
Contributor

@waleed-elmelegy-arm waleed-elmelegy-arm left a comment

Choose a reason for hiding this comment

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

Checked the diff as well, LGTM.

@gilles-peskine-arm gilles-peskine-arm added approved Design and code approved - may be waiting for CI or backports and removed needs-review Every commit must be reviewed by at least two team members, labels Sep 24, 2024
@gilles-peskine-arm gilles-peskine-arm added this pull request to the merge queue Oct 25, 2024
Merged via the queue into Mbed-TLS:development with commit 665df83 Oct 25, 2024
1 of 2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Design and code approved - may be waiting for CI or backports component-test Test framework and CI scripts needs-backports Backports are missing or are pending review and approval. priority-high High priority - will be reviewed soon size-xs Estimated task size: extra small (a few hours at most)

Projects

Development

Successfully merging this pull request may close these issues.

3 participants