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

Fix index wrap around in model #266

Merged
merged 2 commits into from
Nov 3, 2023
Merged

Fix index wrap around in model #266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d7d7818
fix index wrap
ved-rivos Nov 3, 2023
feaed81
fix index wrap in tests
ved-rivos Nov 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion iommu_ref_model/libiommu/src/iommu_ats.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ handle_page_request(
pqh = g_reg_file.pqh.index;
pqt = g_reg_file.pqt.index;
pqb = g_reg_file.pqb.ppn;
if ( pqt == (pqh - 1) ) {
if ( ((pqt + 1) & ((1UL << (g_reg_file.pqb.log2szm1 + 1)) - 1)) == pqh ) {
g_reg_file.pqcsr.pqof = 1;
generate_interrupt(PAGE_QUEUE);
response_code = SUCCESS;
Expand Down
2 changes: 1 addition & 1 deletion iommu_ref_model/libiommu/src/iommu_faults.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ report_fault(uint16_t cause, uint64_t iotval, uint64_t iotval2, uint8_t TTYP, ui
fqh = g_reg_file.fqh.index;
fqt = g_reg_file.fqt.index;
fqb = g_reg_file.fqb.ppn;
if ( fqt == (fqh - 1) ) {
if ( ((fqt + 1) & ((1UL << (g_reg_file.fqb.log2szm1 + 1)) - 1)) == fqh ) {
g_reg_file.fqcsr.fqof = 1;
generate_interrupt(FAULT_QUEUE);
return;
Expand Down
18 changes: 14 additions & 4 deletions iommu_ref_model/test/test_app.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,10 @@ main(void) {
// Trigger a fault queue overflow
// The queue should be empty now
fail_if( ( (read_register(FQH_OFFSET, 4) != read_register(FQT_OFFSET, 4)) ) );
// Force the head and tail to 0
g_reg_file.fqh.index = 0;
g_reg_file.fqt.index = 0;
fqb.raw = read_register(FQB_OFFSET, 8);
pid_valid = exec_req = priv_req = no_write = 1;
at = 0;
for ( i = 0; i < 1023; i++ ) {
Expand All @@ -248,14 +252,16 @@ main(void) {
fail_if( ( ipsr.fip != 0 ) );

// The queue should be be full
fail_if( ( ((read_register(FQH_OFFSET, 4) - 1) != read_register(FQT_OFFSET, 4)) ) );
fail_if( (((read_register(FQT_OFFSET, 4) + 1) & ((1UL << (fqb.log2szm1 + 1)) - 1)) !=
read_register(FQH_OFFSET, 4)) );
// No overflow should be set
fqcsr.raw = read_register(FQCSR_OFFSET, 4);
fail_if( ( fqcsr.fqof == 1 ) );
// Next fault should cause overflow
send_translation_request(0x012345, pid_valid, 0x99, no_write, exec_req,
priv_req, 0, at, 0xdeadbeef, 16, (no_write ^ 1), &req, &rsp);
fail_if( ( ((read_register(FQH_OFFSET, 4) - 1) != read_register(FQT_OFFSET, 4)) ) );
fail_if( (((read_register(FQT_OFFSET, 4) + 1) & ((1UL << (fqb.log2szm1 + 1)) - 1)) !=
read_register(FQH_OFFSET, 4)) );
fqcsr.raw = read_register(FQCSR_OFFSET, 4);
fail_if( ( fqcsr.fqof == 0 ) );

Expand All @@ -279,7 +285,8 @@ main(void) {
// Overflow should remain
send_translation_request(0x012345, pid_valid, 0x99, no_write, exec_req,
priv_req, 0, at, 0xdeadbeef, 16, (no_write ^ 1), &req, &rsp);
fail_if( ( ((read_register(FQH_OFFSET, 4) - 1) != read_register(FQT_OFFSET, 4)) ) );
fail_if( (((read_register(FQT_OFFSET, 4) + 1) & ((1UL << (fqb.log2szm1 + 1)) - 1)) !=
read_register(FQH_OFFSET, 4)) );
fqcsr.raw = read_register(FQCSR_OFFSET, 4);
fail_if( ( fqcsr.fqof == 0 ) );

Expand Down Expand Up @@ -2904,7 +2911,10 @@ main(void) {
fail_if( ( message_received == 1 ) );

// Create a overflow case
write_register(PQH_OFFSET, 4, read_register(PQT_OFFSET, 4)+1);
pqb.raw = read_register(PQB_OFFSET, 8);
write_register(PQH_OFFSET, 4,
(read_register(PQT_OFFSET, 4) + 1) & ((1UL << (pqb.log2szm1 + 1)) - 1));

pr.RID = 0x2233;
pr.DSEG = 0x11;
DC.tc.EN_ATS = 1;
Expand Down