Skip to contentSkip to conversation

target/i386/mshv: remove unused gpa txl optimization

PATCH Applied Magnus Kulke 3 participants 3 messages Nov 25, 2025 – Feb 10

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 target/i386/mshv: remove unused gpa txl optimization

The removed parameters are remnants of a prior attempt to optimize gva=>gpa translation. Currently there is only one call site and it's not using it. So we can remove it as dead code.

---
 target/i386/mshv/mshv-cpu.c | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)
target/i386/mshv/mshv-cpu.c +9 -13
index 1c3db02188..03ef085d5e 100644
@@ -1189,7 +1189,7 @@ static int handle_unmapped_mem(int vm_fd, CPUState *cpu,
     remap_result = mshv_remap_overlap_region(vm_fd, gpa);
     *exit_reason = MshvVmExitIgnore;
 
-    switch (remap_result) {
+   switch (remap_result) {
     case MshvRemapNoMapping:
         /* if we didn't find a mapping, it is probably mmio */
         return handle_mmio(cpu, msg, exit_reason);
@@ -1374,23 +1374,19 @@ static int read_memory(const CPUState *cpu, uint64_t initial_gva,
     return 0;
 }
 
-static int write_memory(const CPUState *cpu, uint64_t initial_gva,
-                        uint64_t initial_gpa, uint64_t gva, const uint8_t *data,
+static int write_memory(const CPUState *cpu, uint64_t gva, const uint8_t *data,
                         size_t len)
 {
     int ret;
     uint64_t gpa, flags;
 
-    if (gva == initial_gva) {
-        gpa = initial_gpa;
-    } else {
-        flags = HV_TRANSLATE_GVA_VALIDATE_WRITE;
-        ret = translate_gva(cpu, gva, &gpa, flags);
-        if (ret < 0) {
-            error_report("failed to translate gva to gpa");
-            return -1;
-        }
+    flags = HV_TRANSLATE_GVA_VALIDATE_WRITE;
+    ret = translate_gva(cpu, gva, &gpa, flags);
+    if (ret < 0) {
+        error_report("failed to translate gva to gpa");
+        return -1;
     }
+
     ret = mshv_guest_mem_write(gpa, data, len, false);
     if (ret != MEMTX_OK) {
         error_report("failed to write to mmio");
@@ -1445,7 +1441,7 @@ static int handle_pio_str_read(CPUState *cpu,
     for (size_t i = 0; i < repeat; i++) {
         pio_read(port, data, len, false);
 
-        ret = write_memory(cpu, 0, 0, dst, data, len);
+        ret = write_memory(cpu, dst, data, len);
         if (ret < 0) {
             error_report("Failed to write memory");
             return -1;
Signature · 1 line
2.34.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 14 lines · Magnus Kulke

The removed parameters are remnants of a prior attempt to optimize gva=>gpa translation. Currently there is only one call site and it's not using it. So we can remove it as dead code.

---
 target/i386/mshv/mshv-cpu.c | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)
target/i386/mshv/mshv-cpu.c +0 -0
index 1c3db02188..03ef085d5e 100644

target/i386/mshv/mshv-cpu.c static int handle_unmapped_mem(int vm_fd, CPUState *cpu, · line 1192

Quoted 5 lines
target/i386/mshv/mshv-cpu.c +1 -1
@@ -1189,7 +1189,7 @@ static int handle_unmapped_mem(int vm_fd, CPUState *cpu,
     remap_result = mshv_remap_overlap_region(vm_fd, gpa);
     *exit_reason = MshvVmExitIgnore;
 
-    switch (remap_result) {
+   switch (remap_result) {

This indentation looks off.

With this issue fixed:

Quoted 22 lines
target/i386/mshv/mshv-cpu.c +1 -9
     case MshvRemapNoMapping:
         /* if we didn't find a mapping, it is probably mmio */
         return handle_mmio(cpu, msg, exit_reason);
@@ -1374,23 +1374,19 @@ static int read_memory(const CPUState *cpu, uint64_t initial_gva,
     return 0;
 }
 
-static int write_memory(const CPUState *cpu, uint64_t initial_gva,
-                        uint64_t initial_gpa, uint64_t gva, const uint8_t *data,
+static int write_memory(const CPUState *cpu, uint64_t gva, const uint8_t *data,
                         size_t len)
 {
     int ret;
     uint64_t gpa, flags;
 
-    if (gva == initial_gva) {
-        gpa = initial_gpa;
-    } else {
-        flags = HV_TRANSLATE_GVA_VALIDATE_WRITE;
-        ret = translate_gva(cpu, gva, &gpa, flags);
-        if (ret < 0) {
-            error_report("failed to translate gva to gpa");

target/i386/mshv/mshv-cpu.c static int read_memory(const CPUState *cpu, uint64_t initial_gva, · line 1390

Quoted 10 lines
target/i386/mshv/mshv-cpu.c +6 -2
-            return -1;
-        }
+    flags = HV_TRANSLATE_GVA_VALIDATE_WRITE;
+    ret = translate_gva(cpu, gva, &gpa, flags);
+    if (ret < 0) {
+        error_report("failed to translate gva to gpa");
+        return -1;
     }
+
     ret = mshv_guest_mem_write(gpa, data, len, false);

Not entirely related to this, but you should be careful with cross-page accesses in these functions.

Wei