44 lines
1.7 KiB
Diff
44 lines
1.7 KiB
Diff
|
From 458d90e226d5833661f9257f6af57c14f9b9bdfe Mon Sep 17 00:00:00 2001
|
||
|
|
From: gongchangsui <gongchangsui@outlook.com>
|
||
|
|
Date: Mon, 17 Mar 2025 02:52:21 -0400
|
||
|
|
Subject: [PATCH] BUGFIX: Enforce isolation for virtcca_shared_hugepage
|
||
|
|
|
||
|
|
Add memory isolation enforcement when virtcca hugepage is disabled.
|
||
|
|
|
||
|
|
Signed-off-by: gongchangsui <gongchangsui@outlook.com>
|
||
|
|
---
|
||
|
|
hw/core/numa.c | 3 ++-
|
||
|
|
hw/virtio/vhost.c | 2 +-
|
||
|
|
2 files changed, 3 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/hw/core/numa.c b/hw/core/numa.c
|
||
|
|
index e7c48dab61..c691578ef5 100644
|
||
|
|
--- a/hw/core/numa.c
|
||
|
|
+++ b/hw/core/numa.c
|
||
|
|
@@ -728,7 +728,8 @@ void numa_complete_configuration(MachineState *ms)
|
||
|
|
memory_region_init(ms->ram, OBJECT(ms), mc->default_ram_id,
|
||
|
|
ms->ram_size);
|
||
|
|
numa_init_memdev_container(ms, ms->ram);
|
||
|
|
- if (virtcca_cvm_enabled() && virtcca_shared_hugepage->ram_block) {
|
||
|
|
+ if (virtcca_cvm_enabled() && virtcca_shared_hugepage &&
|
||
|
|
+ virtcca_shared_hugepage->ram_block) {
|
||
|
|
virtcca_shared_memory_configuration(ms);
|
||
|
|
}
|
||
|
|
}
|
||
|
|
diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c
|
||
|
|
index 8b95558013..4bf0b03977 100644
|
||
|
|
--- a/hw/virtio/vhost.c
|
||
|
|
+++ b/hw/virtio/vhost.c
|
||
|
|
@@ -1617,7 +1617,7 @@ int vhost_dev_init(struct vhost_dev *hdev, void *opaque,
|
||
|
|
hdev->log_size = 0;
|
||
|
|
hdev->log_enabled = false;
|
||
|
|
hdev->started = false;
|
||
|
|
- if (virtcca_cvm_enabled()) {
|
||
|
|
+ if (virtcca_cvm_enabled() && virtcca_shared_hugepage && virtcca_shared_hugepage->ram_block) {
|
||
|
|
memory_listener_register(&hdev->memory_listener,
|
||
|
|
&address_space_virtcca_shared_memory);
|
||
|
|
} else {
|
||
|
|
--
|
||
|
|
2.41.0.windows.1
|
||
|
|
|