commit c5cebbc0e8d0a6a0425bf58cc7d8d0140632125b
author Karl Meakin <karl.meakin@arm.com> Mon Jun 17 11:30:27 2024 +0100
committer Karl Meakin <karl.meakin@arm.com> Mon Jul 22 13:43:33 2024 +0100
tree 23c9e063ffc190f85f8f584650c8e2f709a217bb
parent 99fe2434f9d91b91f02d47f7b775f072f42425d0

refactor: move log buffer from VM to vCPU

Have one log buffer per virtual CPU, to ensure that different virtual
CPUs logging at the same time do not overwrite each others' messages.

Change-Id: I7f371865830783a5bf702e608690f95b444f5010
Signed-off-by: Karl Meakin <karl.meakin@arm.com>

src/api.c

diff --git a/src/api.c b/src/api.c
index 1ef18c1..98659ea 100644
--- a/src/api.c
+++ b/src/api.c
@@ -29,6 +29,7 @@
 #include "hf/spinlock.h"
 #include "hf/static_assert.h"
 #include "hf/std.h"
+#include "hf/vcpu.h"
 #include "hf/vm.h"
 
 #include "vmapi/hf/call.h"
@@ -4684,7 +4685,7 @@
 }
 
 /**
- * Send the contents of the given VM's log buffer to the log, preceded
+ * Send the contents of the given vCPU's log buffer to the log, preceded
  * by the VM ID and followed by a newline.
  */
 void api_flush_log_buffer(ffa_id_t id, struct log_buffer *buffer)
@@ -4714,7 +4715,8 @@
 	const size_t chars_max =
 		registers_max * (log32 ? sizeof(uint32_t) : sizeof(uint64_t));
 	const size_t chars_count = args.arg1;
-	struct vm_locked vm_locked;
+	struct vcpu_locked vcpu_locked;
+	struct log_buffer *log_buffer;
 
 	assert(args.func == FFA_CONSOLE_LOG_32 ||
 	       args.func == FFA_CONSOLE_LOG_64);
@@ -4755,8 +4757,8 @@
 		}
 	}
 
-	vm_locked = vm_lock(current->vm);
-	struct log_buffer *log_buffer = &current->vm->log_buffer;
+	vcpu_locked = vcpu_lock(current);
+	log_buffer = &current->log_buffer;
 
 	for (size_t i = 0; i < chars_count; i++) {
 		bool flush = false;
@@ -4770,10 +4772,10 @@
 		}
 
 		if (flush) {
-			api_flush_log_buffer(vm_locked.vm->id, log_buffer);
+			api_flush_log_buffer(current->vm->id, log_buffer);
 		}
 	}
 
-	vm_unlock(&vm_locked);
+	vcpu_unlock(&vcpu_locked);
 	return (struct ffa_value){.func = FFA_SUCCESS_32};
 }