[v3,1/4] tpm: mark correct memory region range dirty when clearing RAM

Commit Message

David Hildenbrand July 21, 2021, 8:38 a.m. UTC

We might not start at the beginning of the memory region. We could also
calculate via the difference in the host address; however,
memory_region_set_dirty() also relies on memory_region_get_ram_addr()
internally, so let's just use that.

Acked-by: Stefan Berger <[e-mail]>
Fixes: ffab1be70692 ("tpm: clear RAM when "memory overwrite" requested")
Cc: Marc-André Lureau <[e-mail]>
Cc: Paolo Bonzini <[e-mail]>
Cc: "Michael S. Tsirkin" <[e-mail]>
Cc: Eduardo Habkost <[e-mail]>
Cc: Alex Williamson <[e-mail]>
Cc: Dr. David Alan Gilbert <[e-mail]>
Cc: Igor Mammedov <[e-mail]>
Cc: Claudio Fontana <[e-mail]>
Cc: Thomas Huth <[e-mail]>
Cc: "Alex Bennée" <[e-mail]>
Cc: Peter Xu <[e-mail]>
Cc: Laurent Vivier <[e-mail]>
Cc: Stefan Berger <[e-mail]>
Signed-off-by: David Hildenbrand <[e-mail]>
---
 hw/tpm/tpm_ppi.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Patch

diff --git a/hw/tpm/tpm_ppi.c b/hw/tpm/tpm_ppi.c
index 362edcc5c9..261f33431c 100644
--- a/hw/tpm/tpm_ppi.c
+++ b/hw/tpm/tpm_ppi.c
@@ -30,11 +30,13 @@  void tpm_ppi_reset(TPMPPI *tpmppi)
         guest_phys_blocks_init(&guest_phys_blocks);
         guest_phys_blocks_append(&guest_phys_blocks);
         QTAILQ_FOREACH(block, &guest_phys_blocks.head, next) {
+            ram_addr_t mr_start = memory_region_get_ram_addr(block->mr);
+
             trace_tpm_ppi_memset(block->host_addr,
                                  block->target_end - block->target_start);
             memset(block->host_addr, 0,
                    block->target_end - block->target_start);
-            memory_region_set_dirty(block->mr, 0,
+            memory_region_set_dirty(block->mr, block->target_start - mr_start,
                                     block->target_end - block->target_start);
         }
         guest_phys_blocks_free(&guest_phys_blocks);