mem: Defer deletion of respQueue.front() in DRAMCtrl
authorMatthew Poremba <matthew.poremba@amd.com>
Fri, 8 May 2020 22:18:43 +0000 (17:18 -0500)
committerMatthew Poremba <matthew.poremba@amd.com>
Mon, 11 May 2020 15:42:28 +0000 (15:42 +0000)
The front() of respQueue was being deleted before the last usuage of
dram_pkt (which points to the same object) causing random crashes.

Change-Id: I89862d10599dc0d1a50717dac8ed9298b4d74a3d
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/28808
Reviewed-by: Nikos Nikoleris <nikos.nikoleris@arm.com>
Maintainer: Nikos Nikoleris <nikos.nikoleris@arm.com>
Tested-by: kokoro <noreply+kokoro@google.com>
src/mem/dram_ctrl.cc

index 0a8479eb89cc304d9f3d359737df8a4280a3d445..5f0fcc77a23614b6904fb9c85fdb842a4ab9ca95 100644 (file)
@@ -716,7 +716,7 @@ DRAMCtrl::processRespondEvent()
         accessAndRespond(dram_pkt->pkt, frontendLatency + backendLatency);
     }
 
-    delete respQueue.front();
+    assert(respQueue.front() == dram_pkt);
     respQueue.pop_front();
 
     if (!respQueue.empty()) {
@@ -738,6 +738,8 @@ DRAMCtrl::processRespondEvent()
         }
     }
 
+    delete dram_pkt;
+
     // We have made a location in the queue available at this point,
     // so if there is a read that was forced to wait, retry now
     if (retryRdReq) {