代码拉取完成,页面将自动刷新
同步操作将从 src-openEuler/qemu 强制同步,此操作会覆盖自 Fork 仓库以来所做的任何修改,且无法恢复!!!
确定后同步将在后台操作,完成时将刷新页面,请耐心等待。
From 8125145bcd3b8348e69686e26f482cf16b16ec98 Mon Sep 17 00:00:00 2001
From: fangbaoshun <fangbaoshun@hygon.cn>
Date: Mon, 2 Aug 2021 13:49:48 +0800
Subject: [PATCH] target/i386: csv: add support to queue the incoming page into
a list
The csv_queue_incoming_page() provide the implementation to queue the
guest private pages during transmission. The routines queues the incoming
socket which contains the guest private pages into a list then uses the
COMMAND_BATCH command to load the encrypted pages into the guest memory.
Signed-off-by: hanliyang <hanliyang@hygon.cn>
---
include/exec/confidential-guest-support.h | 3 +
target/i386/csv.h | 1 +
target/i386/sev.c | 92 +++++++++++++++++++++++
3 files changed, 96 insertions(+)
diff --git a/include/exec/confidential-guest-support.h b/include/exec/confidential-guest-support.h
index c84f8c1efc..101cc5220a 100644
--- a/include/exec/confidential-guest-support.h
+++ b/include/exec/confidential-guest-support.h
@@ -84,6 +84,9 @@ struct ConfidentialGuestMemoryEncryptionOps {
/* Write the list queued with encrypted pages and metadata associated
* with them */
int (*save_queued_outgoing_pages)(QEMUFile *f, uint64_t *bytes_sent);
+
+ /* Queue the incoming encrypted page into a list */
+ int (*queue_incoming_page)(QEMUFile *f, uint8_t *ptr);
};
typedef struct ConfidentialGuestSupportClass {
diff --git a/target/i386/csv.h b/target/i386/csv.h
index 2a3a3119d9..d1bcc8bc16 100644
--- a/target/i386/csv.h
+++ b/target/i386/csv.h
@@ -55,5 +55,6 @@ struct CsvBatchCmdList {
int csv_queue_outgoing_page(uint8_t *ptr, uint32_t sz, uint64_t addr);
int csv_save_queued_outgoing_pages(QEMUFile *f, uint64_t *bytes_sent);
+int csv_queue_incoming_page(QEMUFile *f, uint8_t *ptr);
#endif
diff --git a/target/i386/sev.c b/target/i386/sev.c
index 1e2bbafe36..606aaad328 100644
--- a/target/i386/sev.c
+++ b/target/i386/sev.c
@@ -192,6 +192,7 @@ static struct ConfidentialGuestMemoryEncryptionOps sev_memory_encryption_ops = {
.load_incoming_shared_regions_list = sev_load_incoming_shared_regions_list,
.queue_outgoing_page = csv_queue_outgoing_page,
.save_queued_outgoing_pages = csv_save_queued_outgoing_pages,
+ .queue_incoming_page = csv_queue_incoming_page,
};
static int
@@ -1941,6 +1942,15 @@ static void send_update_data_free(void *data)
g_free(update);
}
+static void receive_update_data_free(void *data)
+{
+ struct kvm_sev_receive_update_data *update =
+ (struct kvm_sev_receive_update_data *)data;
+ g_free((guchar *)update->hdr_uaddr);
+ g_free((guchar *)update->trans_uaddr);
+ g_free(update);
+}
+
static int
csv_send_queue_data(SevGuestState *s, uint8_t *ptr,
uint32_t size, uint64_t addr)
@@ -2013,6 +2023,66 @@ err:
return ret;
}
+static int
+csv_receive_queue_data(SevGuestState *s, QEMUFile *f, uint8_t *ptr)
+{
+ int ret = 0;
+ gchar *hdr = NULL, *trans = NULL;
+ struct kvm_sev_receive_update_data *update;
+ struct kvm_csv_batch_list_node *new_node = NULL;
+
+ update = g_new0(struct kvm_sev_receive_update_data, 1);
+ /* get packet header */
+ update->hdr_len = qemu_get_be32(f);
+ hdr = g_new(gchar, update->hdr_len);
+ qemu_get_buffer(f, (uint8_t *)hdr, update->hdr_len);
+ update->hdr_uaddr = (unsigned long)hdr;
+
+ /* get transport buffer */
+ update->trans_len = qemu_get_be32(f);
+ trans = g_new(gchar, update->trans_len);
+ update->trans_uaddr = (unsigned long)trans;
+ qemu_get_buffer(f, (uint8_t *)update->trans_uaddr, update->trans_len);
+
+ /* set guest address,guest len is page_size */
+ update->guest_uaddr = (uint64_t)ptr;
+ update->guest_len = TARGET_PAGE_SIZE;
+
+ new_node = csv_batch_cmd_list_node_create((uint64_t)update, 0);
+ if (!new_node) {
+ ret = -ENOMEM;
+ goto err;
+ }
+
+ if (s->csv_batch_cmd_list == NULL) {
+ s->csv_batch_cmd_list = csv_batch_cmd_list_create(new_node,
+ receive_update_data_free);
+ if (s->csv_batch_cmd_list == NULL) {
+ ret = -ENOMEM;
+ goto err;
+ }
+ } else {
+ /* Add new_node's command address to the last_node */
+ csv_batch_cmd_list_add_after(s->csv_batch_cmd_list, new_node);
+ }
+
+ trace_kvm_sev_receive_update_data(trans, (void *)ptr, update->guest_len,
+ (void *)hdr, update->hdr_len);
+
+ return ret;
+
+err:
+ g_free(trans);
+ g_free(update);
+ g_free(hdr);
+ g_free(new_node);
+ if (s->csv_batch_cmd_list) {
+ csv_batch_cmd_list_destroy(s->csv_batch_cmd_list);
+ s->csv_batch_cmd_list = NULL;
+ }
+ return ret;
+}
+
static int
csv_command_batch(uint32_t cmd_id, uint64_t head_uaddr, int *fw_err)
{
@@ -2090,6 +2160,28 @@ csv_queue_outgoing_page(uint8_t *ptr, uint32_t sz, uint64_t addr)
return csv_send_queue_data(s, ptr, sz, addr);
}
+int csv_queue_incoming_page(QEMUFile *f, uint8_t *ptr)
+{
+ SevGuestState *s = sev_guest;
+
+ /* Only support for HYGON CSV */
+ if (!is_hygon_cpu()) {
+ error_report("Only support enqueue received pages for HYGON CSV");
+ return -EINVAL;
+ }
+
+ /*
+ * If this is first buffer and SEV is not in recieiving state then
+ * use RECEIVE_START command to create a encryption context.
+ */
+ if (!sev_check_state(s, SEV_STATE_RECEIVE_UPDATE) &&
+ sev_receive_start(s, f)) {
+ return 1;
+ }
+
+ return csv_receive_queue_data(s, f, ptr);
+}
+
int
csv_save_queued_outgoing_pages(QEMUFile *f, uint64_t *bytes_sent)
{
--
2.41.0.windows.1
此处可能存在不合适展示的内容,页面不予展示。您可通过相关编辑功能自查并修改。
如您确认内容无涉及 不当用语 / 纯广告导流 / 暴力 / 低俗色情 / 侵权 / 盗版 / 虚假 / 无价值内容或违法国家有关法律法规的内容,可点击提交进行申诉,我们将尽快为您处理。