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.

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

QEMU Morello #149

Merged
merged 208 commits into from
Oct 12, 2021
Merged

QEMU Morello #149

merged 208 commits into from
Oct 12, 2021

Conversation

arichardson
Copy link
Member

Supersedes #128

Comments from #148 also still need to be addressed, but otherwise it should mostly be ready for reviewing.

@arichardson
Copy link
Member Author

I think we should not use rebase+merge here but rather create a merge commit once all issues have been addressed. Rebasing and fixing history is rather awkward.

qwattash
qwattash reviewed Jun 23, 2021
View reviewed changes
include/qemu/log.h Outdated Show resolved Hide resolved
qwattash
qwattash reviewed Jun 23, 2021
View reviewed changes
accel/tcg/log_instr.c Outdated Show resolved Hide resolved
qwattash
qwattash reviewed Jun 23, 2021
View reviewed changes
accel/tcg/tcg-runtime.h Outdated Show resolved Hide resolved
qwattash
qwattash reviewed Jun 23, 2021
View reviewed changes
target/arm/helper.c Outdated Show resolved Hide resolved
qwattash
qwattash reviewed Jun 23, 2021
View reviewed changes
accel/tcg/translator.c Outdated Show resolved Hide resolved
qwattash
qwattash reviewed Jun 23, 2021
View reviewed changes
hw/arm/Kconfig Outdated Show resolved Hide resolved
qwattash
qwattash reviewed Jun 23, 2021
View reviewed changes
hw/arm/armtrickbox.c Outdated Show resolved Hide resolved
qwattash
qwattash reviewed Jun 23, 2021
View reviewed changes
scripts/sail_parser.py Outdated Show resolved Hide resolved
qwattash
qwattash reviewed Jun 23, 2021
View reviewed changes
target/arm/arm-semi.c Outdated Show resolved Hide resolved
qwattash
qwattash reviewed Jun 23, 2021
View reviewed changes
target/arm/cpu.h Outdated Show resolved Hide resolved
qwattash
qwattash reviewed Jun 23, 2021
View reviewed changes
target/arm/helper.c Outdated Show resolved Hide resolved
qwattash
qwattash reviewed Jun 23, 2021
View reviewed changes
target/arm/helper.c Outdated Show resolved Hide resolved
qwattash
qwattash reviewed Jun 24, 2021
View reviewed changes
tcg/tcg.c Outdated Show resolved Hide resolved
qwattash
qwattash reviewed Jun 24, 2021
View reviewed changes
target/arm/helper.c Outdated Show resolved Hide resolved
LawrenceEsswood and others added 17 commits October 12, 2021 14:14
@LawrenceEsswood @arichardson
Pass PC to cpu_get_asid
79770bf
@LawrenceEsswood @arichardson
Make some more TCG work for 32-bit
680db26
@LawrenceEsswood @arichardson
Remove stale comments
3dfb6e2
@LawrenceEsswood @arichardson
Simplify some flow control
4e2762f
@LawrenceEsswood @arichardson
Fix type of placeholder for RISCV target_get_gpr_global
d3a0255
@LawrenceEsswood @arichardson
Change asserts for cap_set_(un)sealed for AARCH64
0da7537
@jrtc27 @arichardson
morello: Diff-reduce tables (and match style for new ones)
14ea14f
@jrtc27 @arichardson
tcg: Diff-reduce GEN_ATOMIC_HELPER
538b2e0
@jrtc27 @arichardson
morello: Fix up clang-format directives
c5619ba 
One was missing and one was poor style.
@arichardson
Update clang-format config to be closer to upstream code style
061d269
@arichardson
Rename INSN_ARM_C64 to ARM_DIS_FLAG_C64
7ed2846 
This matches RISC-V and avoids using the binutils INSN_* namespace.
@arichardson
Reformat translate-a64.c with IndentCaseBlocks: true
e4b608e 
This reduces the diff to upstream.
@arichardson
Simplify cap_is_unsealed()
2bc73a2 
It is impossible to have an otype outside of the valid range with the
current compression schemes. Now that we extract the otype from the
pesbt bits it's also impossible for cap_get_otype_unsigned() to return
such a value.
@arichardson
Clean up Morello ifdefs in cap_set_sealed/cap_set_unsealed
d0f5750 
These helpers are not called by the TCG generated for Morello.
@arichardson
Add a cap_unseal_reserved_otype() helper
592a9c3 
This removes some CAP_cc usages from the Morello helpers.
@arichardson
Cleanup cap_is_sealed_with_type()
3cbc78a 
And factor out a new cap_otype_is_reserved() helper function.
@arichardson
Simplify assertions in cap_set_sealed() and cap_set_unsealed()
d0ac758 
After the latest refactoring we can now drop the TARGET_MORELLO branch.
@arichardson
Fix value of CC{64,128}_LAST_NONRESERVED_OTYPE
44a5bf3 
Most uses appear to assume that LAST_NONRESERVED_OTYPE is a valid
non-reserved otype rather than the first reserved one. However, all of
those checks are incorrect for Morello, so we should really remove
this macro.
@arichardson arichardson linked an issue Oct 12, 2021 that may be closed by this pull request
Ctrl-C in interactive morello-purecap session hits assertion and brings down QEMU. #173
Open
jrtc27
jrtc27 reviewed Oct 12, 2021
View reviewed changes
target/cheri-common/cheri_utils.h Outdated Show resolved Hide resolved
target/cheri-common/cheri_utils.h Show resolved Hide resolved
target/cheri-common/op_helper_cheri_common.c Outdated Show resolved Hide resolved
target/cheri-common/op_helper_cheri_common.c Outdated Show resolved Hide resolved
target/cheri-common/cheri_utils.h Outdated Show resolved Hide resolved
@arichardson
Stop using CAP_LAST_NONRESERVED_OTYPE
537ec7b 
Performing comparisons against this constant is likely to cause bugs
since Morello allocates otypes from the bottom but MIPS/RISC-V allocate
from the top, so any less than/greater than checks are wrong for at
least one architecture.
@arichardson
[cheri-compressed-cap] Replace FIRST/LAST otype with MIN/MAX
227d42e 
This makes it clear that we are referring the the MIN/MAX numerical value.
Previously it was -1 to -16 for MIPS/RISC-V which meant that my
implementation of cap_otype_is_reserved() was broken since the check
`otype > 0x3ffff && otype <= 0x3fff0` is never true.
@arichardson
[cheri-compressed-cap] Assert cap_pesbt_deposit_X arguments are in range
771c788 
This does not corrupt other fields, but they will be truncated silently.
jrtc27
jrtc27 approved these changes Oct 12, 2021
View reviewed changes
Copy link
Member

@jrtc27 jrtc27 left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Let's hope this one didn't break anything... 🤞

@arichardson arichardson changed the title QEMU Morello (rebased) QEMU Morello Oct 12, 2021
@arichardson arichardson merged commit 138fc64 into dev Oct 12, 2021
@arichardson arichardson deleted the qemu-morello-rebased branch October 12, 2021 16:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@qwattash qwattash qwattash left review comments

@jrtc27 jrtc27 jrtc27 approved these changes

@LawrenceEsswood LawrenceEsswood Awaiting requested review from LawrenceEsswood

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Ctrl-C in interactive morello-purecap session hits assertion and brings down QEMU.
4 participants
@arichardson @qwattash @jrtc27 @LawrenceEsswood