Skip to content
Snippets Groups Projects

fix: various errors in implementation of BTI

Merged André Kempe requested to merge andrekempe-arm/dav-1-d-reloaded:master into master
All threads resolved!

Hej everyone.

During internal testing at Arm we realized that various bits and pieces of the BTI implementation are broken. This commit fixes the known errors

  • Amend call type in refmvs. Because these blocks are reached via blr x11, they need to be annotated.
  • Add missing BTI landing pads in ipred16.S. Because the subroutines are called via a br from x9, they need annotation with 'bti j' (AARCH64_VALID_JUMP_TARGET).

Could you please have a look?

Thanks & Best Regards. André

Merge request reports

Pipeline #382560 passed

Pipeline passed for 769bd145 on andrekempe-arm:master

Test coverage 92.00% (-0.01%) from 1 job
Approval is optional

Merged by Janne GrunauJanne Grunau 1 year ago (Sep 8, 2023 5:18pm UTC)

Merge details

  • Changes merged into master with 769bd145.
  • Did not delete the source branch.

Pipeline #382704 passed

Pipeline passed for 769bd145 on master

Test coverage 92.00% (-0.01%) from 1 job

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • André Kempe added 1 commit

    added 1 commit

    • 769bd145 - fix: various errors in implementation of BTI

    Compare with previous version

  • LGTM, this version seems to run fine in qemu for me. Thanks!

  • Martin Storsjö approved this merge request

    approved this merge request

  • Author Contributor

    Martin, thanks for testing. I was just about to ask you for that.

  • André Kempe resolved all threads

    resolved all threads

  • Seems to be fine now at least as far as checkasm is concerned, ran over the last hours on M2/fedora with -mbranch-protection=bti without finding issues.

    Edited by Janne Grunau
  • Author Contributor

    Hi Janne.

    Thanks for verifying so thoroughly. From your point of view, would it be ok to merge the commit? If so, what would I have to do?

    Thanks & Best Regards, André

  • Janne Grunau approved this merge request

    approved this merge request

  • merged

  • Jean-Baptiste Kempf changed milestone to %1.3.0

    changed milestone to %1.3.0

  • Please register or sign in to reply
    Loading