|
[PATCH 1/8] ACRN:DM:VDISPLAY: Refine display API to support multi scanout_window
Zhao, Yakui
Currenly it can support only one display_win. When virtio-gpu wants to display
the framebuffer from Guest_vm, it will render it into the default win. In order to support multi-window, the scanout_id is added for display API. After display API is refined, the vdisplay and virtio-gpu can support the multi-win independently. BTW: Now the scanout_id is not implemented in vdisplay module and the virtio-gpu always passes the zero. It will be implemeneted in the later patches. Signed-off-by: Zhao Yakui <yakui.zhao@...> --- devicemodel/hw/pci/virtio/virtio_gpu.c | 28 +++++++++++++------------- devicemodel/hw/vdisplay_sdl.c | 12 +++++------ devicemodel/include/vdisplay.h | 12 +++++------ 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/devicemodel/hw/pci/virtio/virtio_gpu.c b/devicemodel/hw/pci/virtio/virtio_gpu.c index 4ba219bc1..2f8c4362e 100644 --- a/devicemodel/hw/pci/virtio/virtio_gpu.c +++ b/devicemodel/hw/pci/virtio/virtio_gpu.c @@ -556,7 +556,7 @@ virtio_gpu_cmd_get_edid(struct virtio_gpu_command *cmd) resp.size = 128; resp.hdr.type = VIRTIO_GPU_RESP_OK_EDID; virtio_gpu_update_resp_fence(&cmd->hdr, &resp.hdr); - vdpy_get_edid(gpu->vdpy_handle, resp.edid, resp.size); + vdpy_get_edid(gpu->vdpy_handle, 0, resp.edid, resp.size); memcpy(cmd->iov[1].iov_base, &resp, sizeof(resp)); } @@ -570,7 +570,7 @@ virtio_gpu_cmd_get_display_info(struct virtio_gpu_command *cmd) gpu = cmd->gpu; cmd->iolen = sizeof(resp); memset(&resp, 0, sizeof(resp)); - vdpy_get_display_info(gpu->vdpy_handle, &info); + vdpy_get_display_info(gpu->vdpy_handle, 0, &info); resp.hdr.type = VIRTIO_GPU_RESP_OK_DISPLAY_INFO; virtio_gpu_update_resp_fence(&cmd->hdr, &resp.hdr); resp.pmodes[0].enabled = 1; @@ -790,7 +790,7 @@ virtio_gpu_cmd_set_scanout(struct virtio_gpu_command *cmd) r2d = virtio_gpu_find_resource_2d(gpu, req.resource_id); if ((req.resource_id == 0) || (r2d == NULL)) { - vdpy_surface_set(gpu->vdpy_handle, NULL); + vdpy_surface_set(gpu->vdpy_handle, 0, NULL); resp.type = VIRTIO_GPU_RESP_OK_NODATA; memcpy(cmd->iov[1].iov_base, &resp, sizeof(resp)); return; @@ -814,7 +814,7 @@ virtio_gpu_cmd_set_scanout(struct virtio_gpu_command *cmd) surf.stride = pixman_image_get_stride(r2d->image); surf.surf_format = r2d->format; surf.surf_type = SURFACE_PIXMAN; - vdpy_surface_set(gpu->vdpy_handle, &surf); + vdpy_surface_set(gpu->vdpy_handle, 0, &surf); pixman_image_unref(r2d->image); resp.type = VIRTIO_GPU_RESP_OK_NODATA; } @@ -934,7 +934,7 @@ virtio_gpu_cmd_resource_flush(struct virtio_gpu_command *cmd) virtio_gpu_dmabuf_ref(r2d->dma_info); surf.dma_info.dmabuf_fd = r2d->dma_info->dmabuf_fd; surf.surf_type = SURFACE_DMABUF; - vdpy_surface_update(gpu->vdpy_handle, &surf); + vdpy_surface_update(gpu->vdpy_handle, 0, &surf); resp.type = VIRTIO_GPU_RESP_OK_NODATA; memcpy(cmd->iov[1].iov_base, &resp, sizeof(resp)); virtio_gpu_dmabuf_unref(r2d->dma_info); @@ -949,7 +949,7 @@ virtio_gpu_cmd_resource_flush(struct virtio_gpu_command *cmd) surf.stride = pixman_image_get_stride(r2d->image); surf.surf_format = r2d->format; surf.surf_type = SURFACE_PIXMAN; - vdpy_surface_update(gpu->vdpy_handle, &surf); + vdpy_surface_update(gpu->vdpy_handle, 0, &surf); pixman_image_unref(r2d->image); cmd->iolen = sizeof(resp); @@ -1143,7 +1143,7 @@ virtio_gpu_cmd_set_scanout_blob(struct virtio_gpu_command *cmd) if (req.resource_id == 0) { resp.type = VIRTIO_GPU_RESP_OK_NODATA; memcpy(cmd->iov[cmd->iovcnt - 1].iov_base, &resp, sizeof(resp)); - vdpy_surface_set(gpu->vdpy_handle, NULL); + vdpy_surface_set(gpu->vdpy_handle, 0, NULL); return; } r2d = virtio_gpu_find_resource_2d(cmd->gpu, req.resource_id); @@ -1187,7 +1187,7 @@ virtio_gpu_cmd_set_scanout_blob(struct virtio_gpu_command *cmd) break; } surf.dma_info.surf_fourcc = drm_fourcc; - vdpy_surface_set(gpu->vdpy_handle, &surf); + vdpy_surface_set(gpu->vdpy_handle, 0, &surf); resp.type = VIRTIO_GPU_RESP_OK_NODATA; memcpy(cmd->iov[cmd->iovcnt - 1].iov_base, &resp, sizeof(resp)); virtio_gpu_dmabuf_unref(r2d->dma_info); @@ -1312,7 +1312,7 @@ virtio_gpu_cmd_update_cursor(struct virtio_gpu_command *cmd) cur.height = r2d->height; pixman_image_ref(r2d->image); cur.data = pixman_image_get_data(r2d->image); - vdpy_cursor_define(gpu->vdpy_handle, &cur); + vdpy_cursor_define(gpu->vdpy_handle, 0, &cur); pixman_image_unref(r2d->image); } } @@ -1325,7 +1325,7 @@ virtio_gpu_cmd_move_cursor(struct virtio_gpu_command *cmd) gpu = cmd->gpu; memcpy(&req, cmd->iov[0].iov_base, sizeof(req)); - vdpy_cursor_move(gpu->vdpy_handle, req.pos.x, req.pos.y); + vdpy_cursor_move(gpu->vdpy_handle, 0, req.pos.x, req.pos.y); } static void @@ -1397,10 +1397,10 @@ virtio_gpu_vga_bh(void *param) gpu->vga.surf.pixel = gpu->vga.gc->gc_image->data; gpu->vga.surf.surf_format = PIXMAN_a8r8g8b8; gpu->vga.surf.surf_type = SURFACE_PIXMAN; - vdpy_surface_set(gpu->vdpy_handle, &gpu->vga.surf); + vdpy_surface_set(gpu->vdpy_handle, 0, &gpu->vga.surf); } - vdpy_surface_update(gpu->vdpy_handle, &gpu->vga.surf); + vdpy_surface_update(gpu->vdpy_handle, 0, &gpu->vga.surf); } static void * @@ -1553,7 +1553,7 @@ virtio_gpu_init(struct vmctx *ctx, struct pci_vdev *dev, char *opts) pci_set_cfgdata16(dev, PCIR_SUBVEND_0, VIRTIO_VENDOR); LIST_INIT(&gpu->r2d_list); - vdpy_get_display_info(gpu->vdpy_handle, &info); + vdpy_get_display_info(gpu->vdpy_handle, 0, &info); /*** PCI Config BARs setup ***/ /** BAR0: VGA framebuffer **/ @@ -1566,7 +1566,7 @@ virtio_gpu_init(struct vmctx *ctx, struct pci_vdev *dev, char *opts) /** BAR2: VGA & Virtio Modern regs **/ /* EDID data blob [0x000~0x3ff] */ - vdpy_get_edid(gpu->vdpy_handle, gpu->edid, VIRTIO_GPU_EDID_SIZE); + vdpy_get_edid(gpu->vdpy_handle, 0, gpu->edid, VIRTIO_GPU_EDID_SIZE); /* VGA ioports regs [0x400~0x41f] */ gpu->vga.gc = gc_init(info.width, info.height, ctx->fb_base); gpu->vga.dev = vga_init(gpu->vga.gc, 0); diff --git a/devicemodel/hw/vdisplay_sdl.c b/devicemodel/hw/vdisplay_sdl.c index 21ceb2325..567a2de6f 100644 --- a/devicemodel/hw/vdisplay_sdl.c +++ b/devicemodel/hw/vdisplay_sdl.c @@ -510,7 +510,7 @@ vdpy_edid_generate(uint8_t *edid, size_t size, struct edid_info *info) } void -vdpy_get_edid(int handle, uint8_t *edid, size_t size) +vdpy_get_edid(int handle, int scanout_id, uint8_t *edid, size_t size) { struct edid_info edid_info; @@ -534,7 +534,7 @@ vdpy_get_edid(int handle, uint8_t *edid, size_t size) } void -vdpy_get_display_info(int handle, struct display_info *info) +vdpy_get_display_info(int handle, int scanout_id, struct display_info *info) { if (handle == vdpy.s.n_connect) { info->xoff = vdpy.info.xoff; @@ -582,7 +582,7 @@ sdl_gl_display_init(void) } void -vdpy_surface_set(int handle, struct surface *surf) +vdpy_surface_set(int handle, int scanout_id, struct surface *surf) { pixman_image_t *src_img; int format; @@ -749,7 +749,7 @@ vdpy_cursor_position_transformation(struct display *vdpy, SDL_Rect *rect) } void -vdpy_surface_update(int handle, struct surface *surf) +vdpy_surface_update(int handle, int scanout_id, struct surface *surf) { SDL_Rect cursor_rect; @@ -792,7 +792,7 @@ vdpy_surface_update(int handle, struct surface *surf) } void -vdpy_cursor_define(int handle, struct cursor *cur) +vdpy_cursor_define(int handle, int scanout_id, struct cursor *cur) { if (handle != vdpy.s.n_connect) { return; @@ -826,7 +826,7 @@ vdpy_cursor_define(int handle, struct cursor *cur) } void -vdpy_cursor_move(int handle, uint32_t x, uint32_t y) +vdpy_cursor_move(int handle, int scanout_id, uint32_t x, uint32_t y) { if (handle != vdpy.s.n_connect) { return; diff --git a/devicemodel/include/vdisplay.h b/devicemodel/include/vdisplay.h index 99506469b..fc0e91b46 100644 --- a/devicemodel/include/vdisplay.h +++ b/devicemodel/include/vdisplay.h @@ -86,13 +86,13 @@ struct cursor { int vdpy_parse_cmd_option(const char *opts); int gfx_ui_init(); int vdpy_init(); -void vdpy_get_display_info(int handle, struct display_info *info); -void vdpy_surface_set(int handle, struct surface *surf); -void vdpy_surface_update(int handle, struct surface *surf); +void vdpy_get_display_info(int handle, int scanout_id, struct display_info *info); +void vdpy_surface_set(int handle, int scanout_id, struct surface *surf); +void vdpy_surface_update(int handle, int scanout_id, struct surface *surf); bool vdpy_submit_bh(int handle, struct vdpy_display_bh *bh); -void vdpy_get_edid(int handle, uint8_t *edid, size_t size); -void vdpy_cursor_define(int handle, struct cursor *cur); -void vdpy_cursor_move(int handle, uint32_t x, uint32_t y); +void vdpy_get_edid(int handle, int scanout_id, uint8_t *edid, size_t size); +void vdpy_cursor_define(int handle, int scanout_id, struct cursor *cur); +void vdpy_cursor_move(int handle, int scanout_id, uint32_t x, uint32_t y); int vdpy_deinit(int handle); void gfx_ui_deinit(); -- 2.25.1
|
|
|
|
[PATCH 0/8] ACRN:DM:VGPU Add the support of Multi-display for guest_vm
Zhao, Yakui
Virtio-gpu is added to support the display for Guest VM. The Virtio-gpu driver in guest vm
will try to submit the cmd of framebuffer that needs to be displayed. The virtio-gpu BE driver will call the vdisplay API to display the request framebuffer on the corresponding graphics window. But now only one display is supported for each VM. Based on the virtio-gpu spec, it can support multi-display so that the guest_vm can optimize to submit the display regions. This patch set will try to add the support of multi-display for guest_vm. And it will cover the below parts. 1. Refine display API tso that the VGPU and VDISPLAY module can add the function of multi-display/windows. 2. Refine the vdisplay module so that it can support multi-window 3. Refine the virtio-gpu BE module so that it can handle the multi-display request from guest_vm. Zhao Yakui (8): ACRN:DM:VDISPLAY: Refine display API to support multi scanout_window ACRN:DM:VDisplay: vdpy_init connection returns the supported number of window ACRN:DM:VGPU: Add virtio_gpu_scanout structure to handle virtio-gpu-cmds correctly ACRN:DM:VGPU: Handle the virtio-gpu-cmds based on scanout_id in cmd_request ACRN:DM:VGPU: Handle the scanout_id for cursor virtio-gpu-cmd ACRN:DM:VGPU: virtio-gpu-flush cmds check whether one scanout_win needs to be displayed ACRN:DM:VGPU: Calibrate the offset in dmabuf/pixman_image to display the scanout_window ACRN:DM:VGPU: Return the parsed scanout_num to virtio_gpu in Guest_VM devicemodel/hw/pci/virtio/virtio_gpu.c | 249 ++++++++++++++++++++----- devicemodel/hw/vdisplay_sdl.c | 18 +- devicemodel/include/vdisplay.h | 15 +- 3 files changed, 225 insertions(+), 57 deletions(-) -- 2.25.1
|
|
|
|
Re: [PATCH] misc: add assert to check the vBDF conflict
chenli.wei
On 8/8/2022 9:57 PM, Junjie Mao wrote:
"chenli.wei" <chenli.wei@...> writes:OK, Let's check Service VM only.On 8/5/2022 11:19 PM, Junjie Mao wrote:Aren't the vBDF of passthrough devices of a pre-launched VM allocated byChenli Wei <chenli.wei@...> writes:I thinks the pre-launched VM's vBDF setting should also be checked if we don'tFrom: Chenli Wei <chenli.wei@...>Shall we check only the BDFs of ivshmem/vUART devices for the service
|
|
|
|
Re: [PATCH] misc: add assert to check the vBDF conflict
Junjie Mao
"chenli.wei" <chenli.wei@...> writes:
On 8/5/2022 11:19 PM, Junjie Mao wrote:Aren't the vBDF of passthrough devices of a pre-launched VM allocated byChenli Wei <chenli.wei@...> writes:I thinks the pre-launched VM's vBDF setting should also be checked if we don'tFrom: Chenli Wei <chenli.wei@...>Shall we check only the BDFs of ivshmem/vUART devices for the service the config tools rather than specified by users? -- Best Regards Junjie Mao
|
|
|
|
[PATCH v1 3/3] dm: vdisplay: multi-vdisplay support.
Sun, Peng
From: Sun Peng <peng.p.sun@...>
Allow one VM have more than 1 virtual display for output. Till now, the max virtual display number is 2. So guest VM can use dual display for mirror and extend desktop mode. To specify multi-vdisplay, need use acrn-dm parameters like this: For fullscreen mode: virtio-gpu,geometry=fullscreen:monitor_id1,geometry=fullscreen:monitor_id2 For window mode: virtio-gpu,geometry=<width>x<height>+<x_off>+<y_off>,geometry=<width>x<height>+<x_off>+<y_off> Signed-off-by: Sun Peng <peng.p.sun@...> --- devicemodel/hw/vdisplay_sdl.c | 67 +++++++++++++++++++++-------------- 1 file changed, 40 insertions(+), 27 deletions(-) diff --git a/devicemodel/hw/vdisplay_sdl.c b/devicemodel/hw/vdisplay_sdl.c index 28457c52e..c7a279ab6 100644 --- a/devicemodel/hw/vdisplay_sdl.c +++ b/devicemodel/hw/vdisplay_sdl.c @@ -32,7 +32,7 @@ #define VDPY_MIN_WIDTH 640 #define VDPY_MIN_HEIGHT 480 #define transto_10bits(color) (uint16_t)(color * 1024 + 0.5) -#define VSCREEN_MAX_NUM 1 +#define VSCREEN_MAX_NUM 2 static unsigned char default_raw_argb[VDPY_DEFAULT_WIDTH * VDPY_DEFAULT_HEIGHT * 4]; @@ -1323,7 +1323,7 @@ gfx_ui_deinit() int vdpy_parse_cmd_option(const char *opts) { - char *str; + char *str, *stropts, *tmp; int snum, error; struct vscreen *vscr; @@ -1331,35 +1331,48 @@ int vdpy_parse_cmd_option(const char *opts) vdpy.vscrs = calloc(VSCREEN_MAX_NUM, sizeof(struct vscreen)); vdpy.vscrs_num = 0; - str = strcasestr(opts, "geometry="); - vscr = vdpy.vscrs + vdpy.vscrs_num; - if (opts && strcasestr(opts, "geometry=fullscreen")) { - snum = sscanf(str, "geometry=fullscreen:%d", &vscr->pscreen_id); - if (snum != 1) { + stropts = strdup(opts); + while ((str = strsep(&stropts, ",")) != NULL) { + vscr = vdpy.vscrs + vdpy.vscrs_num; + tmp = strcasestr(str, "geometry="); + if (str && strcasestr(str, "geometry=fullscreen")) { + snum = sscanf(tmp, "geometry=fullscreen:%d", &vscr->pscreen_id); + if (snum != 1) { + vscr->pscreen_id = 0; + } + vscr->width = VDPY_MAX_WIDTH; + vscr->height = VDPY_MAX_HEIGHT; + vscr->is_fullscreen = true; + pr_info("virtual display: fullscreen.\n"); + vscr->info.xoff = vscr->org_x; + vscr->info.yoff = vscr->org_y; + vscr->info.width = vscr->width; + vscr->info.height = vscr->height; + vdpy.vscrs_num++; + } else if (str && strcasestr(str, "geometry=")) { + snum = sscanf(tmp, "geometry=%dx%d+%d+%d", + &vscr->width, &vscr->height, + &vscr->org_x, &vscr->org_y); + if (snum != 4) { + pr_err("incorrect geometry option. Should be" + " WxH+x+y\n"); + error = -1; + } + vscr->is_fullscreen = false; vscr->pscreen_id = 0; + pr_info("virtual display: windowed.\n"); + vscr->info.xoff = vscr->org_x; + vscr->info.yoff = vscr->org_y; + vscr->info.width = vscr->width; + vscr->info.height = vscr->height; + vdpy.vscrs_num++; } - vscr->width = VDPY_MAX_WIDTH; - vscr->height = VDPY_MAX_HEIGHT; - vscr->is_fullscreen = true; - vdpy.vscrs_num++; - pr_info("virtual display: fullscreen.\n"); - } else if (opts && strcasestr(opts, "geometry=")) { - snum = sscanf(str, "geometry=%dx%d+%d+%d", - &vscr->width, &vscr->height, - &vscr->org_x, &vscr->org_y); - if (snum != 4) { - pr_err("incorrect geometry option. Should be" - " WxH+x+y\n"); - error = -1; + if (vdpy.vscrs_num > VSCREEN_MAX_NUM) { + pr_err("Too many virtual display that acrn-dm can't support!\n"); + break; } - vscr->is_fullscreen = false; - vdpy.vscrs_num++; - pr_info("virtual display: windowed.\n"); } + free(stropts); - vscr->info.xoff = 0; - vscr->info.yoff = 0; - vscr->info.width = vdpy.vscrs->width; - vscr->info.height = vdpy.vscrs->height; return error; } -- 2.25.1
|
|
|
|
[PATCH v1 2/3] dm: vdisplay: refine vdisplay core concept abstractions
Sun, Peng
From: Sun Peng <peng.p.sun@...>
Add new concept "vscreen" to abstract all specs about screen in a display server. This can provide convenience to add more screens for one VM. Signed-off-by: Sun Peng <peng.p.sun@...> --- devicemodel/hw/vdisplay_sdl.c | 503 +++++++++++++++++++++------------- 1 file changed, 315 insertions(+), 188 deletions(-) diff --git a/devicemodel/hw/vdisplay_sdl.c b/devicemodel/hw/vdisplay_sdl.c index 7a098f4b2..28457c52e 100644 --- a/devicemodel/hw/vdisplay_sdl.c +++ b/devicemodel/hw/vdisplay_sdl.c @@ -32,6 +32,7 @@ #define VDPY_MIN_WIDTH 640 #define VDPY_MIN_HEIGHT 480 #define transto_10bits(color) (uint16_t)(color * 1024 + 0.5) +#define VSCREEN_MAX_NUM 1 static unsigned char default_raw_argb[VDPY_DEFAULT_WIDTH * VDPY_DEFAULT_HEIGHT * 4]; @@ -40,8 +41,6 @@ struct state { bool is_active; bool is_wayland; bool is_x11; - bool is_fullscreen; - uint64_t updates; int n_connect; }; @@ -51,27 +50,39 @@ struct egl_display_ops { PFNGLEGLIMAGETARGETTEXTURE2DOESPROC glEGLImageTargetTexture2DOES; }; -static struct display { +struct vscreen { + struct display_info info; int pscreen_id; SDL_Rect pscreen_rect; - struct display_info info; - struct state s; - SDL_Texture *dpy_texture; - SDL_Window *dpy_win; - SDL_Renderer *dpy_renderer; - pixman_image_t *dpy_img; - pthread_t tid; - int width, height; // Width/height of dpy_win - int org_x, org_y; - int guest_width, guest_height; + bool is_fullscreen; + int org_x; + int org_y; + int width; + int height; + int guest_width; + int guest_height; struct surface surf; struct cursor cur; - SDL_Texture *cursor_tex; + SDL_Texture *surf_tex; + SDL_Texture *cur_tex; + int surf_updates; + int cur_updates; + SDL_Window *win; + SDL_Renderer *renderer; + pixman_image_t *img; + EGLImage egl_img; + /* Record the update_time that is activated from guest_vm */ + struct timespec last_time; +}; + +static struct display { + struct state s; + struct vscreen *vscrs; + int vscrs_num; + pthread_t tid; /* Add one UI_timer(33ms) to render the buffers from guest_vm */ struct acrn_timer ui_timer; struct vdpy_display_bh ui_timer_bh; - /* Record the update_time that is activated from guest_vm */ - struct timespec last_time; // protect the request_list pthread_mutex_t vdisplay_mutex; // receive the signal that request is submitted @@ -82,14 +93,11 @@ static struct display { SDL_GLContext eglContext; EGLDisplay eglDisplay; struct egl_display_ops gl_ops; - EGLImage cur_egl_img; } vdpy = { .s.is_ui_realized = false, .s.is_active = false, .s.is_wayland = false, .s.is_x11 = false, - .s.is_fullscreen = false, - .s.updates = 0, .s.n_connect = 0 }; @@ -514,10 +522,19 @@ void vdpy_get_edid(int handle, int scanout_id, uint8_t *edid, size_t size) { struct edid_info edid_info; + struct vscreen *vscr; + + if (scanout_id >= vdpy.vscrs_num) + return; + + vscr = vdpy.vscrs + scanout_id; + if (vscr == NULL) { + return; + } if (handle == vdpy.s.n_connect) { - edid_info.prefx = vdpy.info.width; - edid_info.prefy = vdpy.info.height; + edid_info.prefx = vscr->info.width; + edid_info.prefy = vscr->info.height; edid_info.maxx = VDPY_MAX_WIDTH; edid_info.maxy = VDPY_MAX_HEIGHT; } else { @@ -537,11 +554,21 @@ vdpy_get_edid(int handle, int scanout_id, uint8_t *edid, size_t size) void vdpy_get_display_info(int handle, int scanout_id, struct display_info *info) { + struct vscreen *vscr; + + if (scanout_id >= vdpy.vscrs_num) + return; + + vscr = vdpy.vscrs + scanout_id; + if (vscr == NULL) { + return; + } + if (handle == vdpy.s.n_connect) { - info->xoff = vdpy.info.xoff; - info->yoff = vdpy.info.yoff; - info->width = vdpy.info.width; - info->height = vdpy.info.height; + info->xoff = vscr->info.xoff; + info->yoff = vscr->info.yoff; + info->width = vscr->info.width; + info->height = vscr->info.height; } else { info->xoff = 0; info->yoff = 0; @@ -554,6 +581,8 @@ static void sdl_gl_display_init(void) { struct egl_display_ops *gl_ops = &vdpy.gl_ops; + struct vscreen *vscr; + int i; /* obtain the eglDisplay/eglContext */ vdpy.eglDisplay = eglGetCurrentDisplay(); @@ -570,7 +599,15 @@ sdl_gl_display_init(void) gl_ops->glEGLImageTargetTexture2DOES = (PFNGLEGLIMAGETARGETTEXTURE2DOESPROC) eglGetProcAddress("glEGLImageTargetTexture2DOES"); - vdpy.cur_egl_img = EGL_NO_IMAGE_KHR; + for (i = 0; i < vdpy.vscrs_num; i++) { + vscr = vdpy.vscrs + i; + if (vscr == NULL) { + continue; + } + + vscr->egl_img = EGL_NO_IMAGE_KHR; + } + if ((gl_ops->eglCreateImageKHR == NULL) || (gl_ops->eglDestroyImageKHR == NULL) || (gl_ops->glEGLImageTargetTexture2DOES == NULL)) { @@ -588,6 +625,7 @@ vdpy_surface_set(int handle, int scanout_id, struct surface *surf) pixman_image_t *src_img; int format; int access, i; + struct vscreen *vscr; if (handle != vdpy.s.n_connect) { return; @@ -599,9 +637,18 @@ vdpy_surface_set(int handle, int scanout_id, struct surface *surf) return; } + if (scanout_id >= vdpy.vscrs_num) { + return; + } + + vscr = vdpy.vscrs + scanout_id; + if (vscr == NULL) { + return; + } + if (surf == NULL ) { - vdpy.surf.width = 0; - vdpy.surf.height = 0; + vscr->surf.width = 0; + vscr->surf.height = 0; /* Need to use the default 640x480 for the SDL_Texture */ src_img = pixman_image_create_bits(PIXMAN_a8r8g8b8, VDPY_MIN_WIDTH, VDPY_MIN_HEIGHT, @@ -611,8 +658,8 @@ vdpy_surface_set(int handle, int scanout_id, struct surface *surf) pr_err("failed to create pixman_image\n"); return; } - vdpy.guest_width = VDPY_MIN_WIDTH; - vdpy.guest_height = VDPY_MIN_HEIGHT; + vscr->guest_width = VDPY_MIN_WIDTH; + vscr->guest_height = VDPY_MIN_HEIGHT; } else if (surf->surf_type == SURFACE_PIXMAN) { src_img = pixman_image_create_bits(surf->surf_format, surf->width, surf->height, surf->pixel, @@ -621,21 +668,21 @@ vdpy_surface_set(int handle, int scanout_id, struct surface *surf) pr_err("failed to create pixman_image\n"); return; } - vdpy.surf = *surf; - vdpy.guest_width = surf->width; - vdpy.guest_height = surf->height; + vscr->surf = *surf; + vscr->guest_width = surf->width; + vscr->guest_height = surf->height; } else if (surf->surf_type == SURFACE_DMABUF) { src_img = NULL; - vdpy.surf = *surf; - vdpy.guest_width = surf->width; - vdpy.guest_height = surf->height; + vscr->surf = *surf; + vscr->guest_width = surf->width; + vscr->guest_height = surf->height; } else { /* Unsupported type */ return; } - if (vdpy.dpy_texture) { - SDL_DestroyTexture(vdpy.dpy_texture); + if (vscr->surf_tex) { + SDL_DestroyTexture(vscr->surf_tex); } if (surf && (surf->surf_type == SURFACE_DMABUF)) { access = SDL_TEXTUREACCESS_STATIC; @@ -666,23 +713,23 @@ vdpy_surface_set(int handle, int scanout_id, struct surface *surf) pixman_image_get_format(src_img)); } } - vdpy.dpy_texture = SDL_CreateTexture(vdpy.dpy_renderer, + vscr->surf_tex = SDL_CreateTexture(vscr->renderer, format, access, - vdpy.guest_width, vdpy.guest_height); + vscr->guest_width, vscr->guest_height); - if (vdpy.dpy_texture == NULL) { + if (vscr->surf_tex == NULL) { pr_err("Failed to create SDL_texture for surface.\n"); } /* For the surf_switch, it will be updated in surface_update */ if (!surf) { - SDL_UpdateTexture(vdpy.dpy_texture, NULL, + SDL_UpdateTexture(vscr->surf_tex, NULL, pixman_image_get_data(src_img), pixman_image_get_stride(src_img)); - SDL_RenderClear(vdpy.dpy_renderer); - SDL_RenderCopy(vdpy.dpy_renderer, vdpy.dpy_texture, NULL, NULL); - SDL_RenderPresent(vdpy.dpy_renderer); + SDL_RenderClear(vscr->renderer); + SDL_RenderCopy(vscr->renderer, vscr->surf_tex, NULL, NULL); + SDL_RenderPresent(vscr->renderer); } else if (surf->surf_type == SURFACE_DMABUF) { EGLImageKHR egl_img = EGL_NO_IMAGE_KHR; EGLint attrs[64]; @@ -713,46 +760,58 @@ vdpy_surface_set(int handle, int scanout_id, struct surface *surf) return; } - SDL_GL_BindTexture(vdpy.dpy_texture, NULL, NULL); + SDL_GL_BindTexture(vscr->surf_tex, NULL, NULL); gl_ops->glEGLImageTargetTexture2DOES(GL_TEXTURE_EXTERNAL_OES, egl_img); - if (vdpy.cur_egl_img != EGL_NO_IMAGE_KHR) + if (vscr->egl_img != EGL_NO_IMAGE_KHR) gl_ops->eglDestroyImageKHR(vdpy.eglDisplay, - vdpy.cur_egl_img); + vscr->egl_img); /* In theory the created egl_img can be released after it is bound * to texture. * Now it is released next time so that it is controlled correctly */ - vdpy.cur_egl_img = egl_img; + vscr->egl_img = egl_img; } - if (vdpy.dpy_img) - pixman_image_unref(vdpy.dpy_img); + if (vscr->img) + pixman_image_unref(vscr->img); if (surf == NULL) { - SDL_SetWindowTitle(vdpy.dpy_win, + SDL_SetWindowTitle(vscr->win, "Not activate display yet!"); } else { - SDL_SetWindowTitle(vdpy.dpy_win, + SDL_SetWindowTitle(vscr->win, "ACRN Virtual Monitor"); } /* Replace the cur_img with the created_img */ - vdpy.dpy_img = src_img; + vscr->img = src_img; } void -vdpy_cursor_position_transformation(struct display *vdpy, SDL_Rect *rect) +vdpy_cursor_position_transformation(struct display *vdpy, int scanout_id, SDL_Rect *rect) { - rect->x = (vdpy->cur.x * vdpy->width) / vdpy->guest_width; - rect->y = (vdpy->cur.y * vdpy->height) / vdpy->guest_height; - rect->w = (vdpy->cur.width * vdpy->width) / vdpy->guest_width; - rect->h = (vdpy->cur.height * vdpy->height) / vdpy->guest_height; + struct vscreen *vscr; + + if (scanout_id >= vdpy->vscrs_num) { + return; + } + + vscr = vdpy->vscrs + scanout_id; + if(vscr == NULL) { + return; + } + + rect->x = (vscr->cur.x * vscr->width) / vscr->guest_width; + rect->y = (vscr->cur.y * vscr->height) / vscr->guest_height; + rect->w = (vscr->cur.width * vscr->width) / vscr->guest_width; + rect->h = (vscr->cur.height * vscr->height) / vscr->guest_height; } void vdpy_surface_update(int handle, int scanout_id, struct surface *surf) { SDL_Rect cursor_rect; + struct vscreen *vscr; if (handle != vdpy.s.n_connect) { return; @@ -769,32 +828,43 @@ vdpy_surface_update(int handle, int scanout_id, struct surface *surf) return; } + if (scanout_id >= vdpy.vscrs_num) { + return; + } + + vscr = vdpy.vscrs + scanout_id; + if (vscr == NULL) { + return; + } + if (surf->surf_type == SURFACE_PIXMAN) - SDL_UpdateTexture(vdpy.dpy_texture, NULL, + SDL_UpdateTexture(vscr->surf_tex, NULL, surf->pixel, surf->stride); - SDL_RenderClear(vdpy.dpy_renderer); - SDL_RenderCopy(vdpy.dpy_renderer, vdpy.dpy_texture, NULL, NULL); + SDL_RenderClear(vscr->renderer); + SDL_RenderCopy(vscr->renderer, vscr->surf_tex, NULL, NULL); /* This should be handled after rendering the surface_texture. * Otherwise it will be hidden */ - if (vdpy.cursor_tex) { - vdpy_cursor_position_transformation(&vdpy, &cursor_rect); - SDL_RenderCopy(vdpy.dpy_renderer, vdpy.cursor_tex, + if (vscr->cur_tex) { + vdpy_cursor_position_transformation(&vdpy, scanout_id, &cursor_rect); + SDL_RenderCopy(vscr->renderer, vscr->cur_tex, NULL, &cursor_rect); } - SDL_RenderPresent(vdpy.dpy_renderer); + SDL_RenderPresent(vscr->renderer); /* update the rendering time */ - clock_gettime(CLOCK_MONOTONIC, &vdpy.last_time); + clock_gettime(CLOCK_MONOTONIC, &vscr->last_time); } void vdpy_cursor_define(int handle, int scanout_id, struct cursor *cur) { + struct vscreen *vscr; + if (handle != vdpy.s.n_connect) { return; } @@ -805,39 +875,55 @@ vdpy_cursor_define(int handle, int scanout_id, struct cursor *cur) return; } + if (scanout_id >= vdpy.vscrs_num) { + return; + } + if (cur->data == NULL) return; - if (vdpy.cursor_tex) - SDL_DestroyTexture(vdpy.cursor_tex); + vscr = vdpy.vscrs + scanout_id; + if (vscr == NULL) { + return; + } + + if (vscr->cur_tex) + SDL_DestroyTexture(vscr->cur_tex); - vdpy.cursor_tex = SDL_CreateTexture( - vdpy.dpy_renderer, + vscr->cur_tex = SDL_CreateTexture( + vscr->renderer, SDL_PIXELFORMAT_ARGB8888, SDL_TEXTUREACCESS_STREAMING, cur->width, cur->height); - if (vdpy.cursor_tex == NULL) { + if (vscr->cur_tex == NULL) { pr_err("Failed to create sdl_cursor surface for %p.\n", cur); return; } - SDL_SetTextureBlendMode(vdpy.cursor_tex, SDL_BLENDMODE_BLEND); - vdpy.cur = *cur; - SDL_UpdateTexture(vdpy.cursor_tex, NULL, cur->data, cur->width * 4); + SDL_SetTextureBlendMode(vscr->cur_tex, SDL_BLENDMODE_BLEND); + vscr->cur = *cur; + SDL_UpdateTexture(vscr->cur_tex, NULL, cur->data, cur->width * 4); } void vdpy_cursor_move(int handle, int scanout_id, uint32_t x, uint32_t y) { + struct vscreen *vscr; + if (handle != vdpy.s.n_connect) { return; } + if (scanout_id >= vdpy.vscrs_num) { + return; + } + + vscr = vdpy.vscrs + scanout_id; /* Only move the position of the cursor. The cursor_texture * will be handled in surface_update */ - vdpy.cur.x = x; - vdpy.cur.y = y; + vscr->cur.x = x; + vscr->cur.y = y; } static void @@ -847,35 +933,41 @@ vdpy_sdl_ui_refresh(void *data) struct timespec cur_time; uint64_t elapsed_time; SDL_Rect cursor_rect; + struct vscreen *vscr; + int i; ui_vdpy = (struct display *)data; - /* Skip it if no surface needs to be rendered */ - if (ui_vdpy->dpy_texture == NULL) - return; + for (i = 0; i < vdpy.vscrs_num; i++) { + vscr = ui_vdpy->vscrs + i; - clock_gettime(CLOCK_MONOTONIC, &cur_time); + /* Skip it if no surface needs to be rendered */ + if (vscr->surf_tex == NULL) + continue; - elapsed_time = (cur_time.tv_sec - ui_vdpy->last_time.tv_sec) * 1000000000 + - cur_time.tv_nsec - ui_vdpy->last_time.tv_nsec; + clock_gettime(CLOCK_MONOTONIC, &cur_time); - /* the time interval is less than 10ms. Skip it */ - if (elapsed_time < 10000000) - return; + elapsed_time = (cur_time.tv_sec - vscr->last_time.tv_sec) * 1000000000 + + cur_time.tv_nsec - vscr->last_time.tv_nsec; - SDL_RenderClear(ui_vdpy->dpy_renderer); - SDL_RenderCopy(ui_vdpy->dpy_renderer, ui_vdpy->dpy_texture, NULL, NULL); + /* the time interval is less than 10ms. Skip it */ + if (elapsed_time < 10000000) + return; - /* This should be handled after rendering the surface_texture. - * Otherwise it will be hidden - */ - if (ui_vdpy->cursor_tex) { - vdpy_cursor_position_transformation(ui_vdpy, &cursor_rect); - SDL_RenderCopy(ui_vdpy->dpy_renderer, ui_vdpy->cursor_tex, - NULL, &cursor_rect); - } + SDL_RenderClear(vscr->renderer); + SDL_RenderCopy(vscr->renderer, vscr->surf_tex, NULL, NULL); + + /* This should be handled after rendering the surface_texture. + * Otherwise it will be hidden + */ + if (vscr->cur_tex) { + vdpy_cursor_position_transformation(ui_vdpy, i, &cursor_rect); + SDL_RenderCopy(vscr->renderer, vscr->cur_tex, + NULL, &cursor_rect); + } - SDL_RenderPresent(ui_vdpy->dpy_renderer); + SDL_RenderPresent(vscr->renderer); + } } static void @@ -911,57 +1003,67 @@ vdpy_sdl_display_thread(void *data) struct itimerspec ui_timer_spec; int max_width, max_height; int min_width, min_height; + struct vscreen *vscr; + int i; - max_width = MIN(vdpy.pscreen_rect.w, VDPY_MAX_WIDTH); - max_height = MIN(vdpy.pscreen_rect.h, VDPY_MAX_HEIGHT); - min_width = MAX(vdpy.pscreen_rect.w, VDPY_MIN_WIDTH); - min_height = MAX(vdpy.pscreen_rect.h, VDPY_MIN_HEIGHT); - if (vdpy.width && vdpy.height) { - /* clip the region between (640x480) and (1920x1080) */ - if (vdpy.width < min_width) - vdpy.width = min_width; - if (vdpy.width > max_width) - vdpy.width = max_width; - if (vdpy.height < min_height) - vdpy.height = min_height; - if (vdpy.height > max_height) - vdpy.height = max_height; - } else { - /* the default window(1280x720) is created with undefined pos - * when no geometry info is passed - */ - vdpy.org_x = 0xFFFF; - vdpy.org_y = 0xFFFF; - vdpy.width = VDPY_DEFAULT_WIDTH; - vdpy.height = VDPY_DEFAULT_HEIGHT; - } + for (i = 0; i < vdpy.vscrs_num; i++) { + vscr = vdpy.vscrs + i; + if (vscr == NULL) { + continue; + } - win_flags = SDL_WINDOW_OPENGL | - SDL_WINDOW_ALWAYS_ON_TOP | - SDL_WINDOW_SHOWN; - if (vdpy.s.is_fullscreen) { - win_flags |= SDL_WINDOW_FULLSCREEN_DESKTOP; - } - vdpy.dpy_win = NULL; - vdpy.dpy_renderer = NULL; - vdpy.dpy_img = NULL; - vdpy.org_x = vdpy.pscreen_rect.x; - vdpy.org_y = vdpy.pscreen_rect.y; - vdpy.dpy_win = SDL_CreateWindow("ACRN_DM", - vdpy.org_x, vdpy.org_y, - vdpy.width, vdpy.height, + max_width = MIN(vscr->pscreen_rect.w, VDPY_MAX_WIDTH); + max_height = MIN(vscr->pscreen_rect.h, VDPY_MAX_HEIGHT); + min_width = MAX(vscr->pscreen_rect.w, VDPY_MIN_WIDTH); + min_height = MAX(vscr->pscreen_rect.h, VDPY_MIN_HEIGHT); + if (vscr->width && vscr->height) { + /* clip the region between (640x480) and (1920x1080) */ + if (vscr->width < min_width) + vscr->width = min_width; + if (vscr->width > max_width) + vscr->width = max_width; + if (vscr->height < min_height) + vscr->height = min_height; + if (vscr->height > max_height) + vscr->height = max_height; + } else { + /* the default window(1280x720) is created with undefined pos + * when no geometry info is passed + */ + vscr->org_x = 0xFFFF; + vscr->org_y = 0xFFFF; + vscr->width = VDPY_DEFAULT_WIDTH; + vscr->height = VDPY_DEFAULT_HEIGHT; + } + + win_flags = SDL_WINDOW_OPENGL | + SDL_WINDOW_ALWAYS_ON_TOP | + SDL_WINDOW_SHOWN; + if (vscr->is_fullscreen) { + win_flags |= SDL_WINDOW_FULLSCREEN_DESKTOP; + } + vscr->win = NULL; + vscr->renderer = NULL; + vscr->img = NULL; + vscr->org_x = vscr->pscreen_rect.x; + vscr->org_y = vscr->pscreen_rect.y; + vscr->win = SDL_CreateWindow("ACRN_DM", + vscr->org_x, vscr->org_y, + vscr->width, vscr->height, win_flags); - if (vdpy.dpy_win == NULL) { - pr_err("Failed to Create SDL_Window\n"); - goto sdl_fail; - } - pr_info("SDL display bind to screen %d: [%d,%d,%d,%d].\n", vdpy.pscreen_id, - vdpy.org_x, vdpy.org_y, vdpy.width, vdpy.height); + if (vscr->win == NULL) { + pr_err("Failed to Create SDL_Window\n"); + goto sdl_fail; + } + pr_info("SDL display bind to screen %d: [%d,%d,%d,%d].\n", vscr->pscreen_id, + vscr->org_x, vscr->org_y, vscr->width, vscr->height); - vdpy.dpy_renderer = SDL_CreateRenderer(vdpy.dpy_win, -1, 0); - if (vdpy.dpy_renderer == NULL) { - pr_err("Failed to Create GL_Renderer \n"); - goto sdl_fail; + vscr->renderer = SDL_CreateRenderer(vscr->win, -1, 0); + if (vscr->renderer == NULL) { + pr_err("Failed to Create GL_Renderer \n"); + goto sdl_fail; + } + clock_gettime(CLOCK_MONOTONIC, &vscr->last_time); } sdl_gl_display_init(); pthread_mutex_init(&vdpy.vdisplay_mutex, NULL); @@ -971,7 +1073,6 @@ vdpy_sdl_display_thread(void *data) vdpy.ui_timer_bh.task_cb = vdpy_sdl_ui_refresh; vdpy.ui_timer_bh.data = &vdpy; - clock_gettime(CLOCK_MONOTONIC, &vdpy.last_time); vdpy.ui_timer.clockid = CLOCK_MONOTONIC; acrn_timer_init(&vdpy.ui_timer, vdpy_sdl_ui_timer, &vdpy); ui_timer_spec.it_interval.tv_sec = 0; @@ -1019,34 +1120,48 @@ vdpy_sdl_display_thread(void *data) /* SDL display_thread will exit because of DM request */ pthread_mutex_destroy(&vdpy.vdisplay_mutex); pthread_cond_destroy(&vdpy.vdisplay_signal); - if (vdpy.dpy_img) { - pixman_image_unref(vdpy.dpy_img); - vdpy.dpy_img = NULL; - } - /* Continue to thread cleanup */ - if (vdpy.dpy_texture) { - SDL_DestroyTexture(vdpy.dpy_texture); - vdpy.dpy_texture = NULL; - } - if (vdpy.cursor_tex) { - SDL_DestroyTexture(vdpy.cursor_tex); - vdpy.cursor_tex = NULL; - } + for (i = 0; i < vdpy.vscrs_num; i++) { + vscr = vdpy.vscrs + i; + if (vscr == NULL) { + continue; + } - if (vdpy.egl_dmabuf_supported && (vdpy.cur_egl_img != EGL_NO_IMAGE_KHR)) - vdpy.gl_ops.eglDestroyImageKHR(vdpy.eglDisplay, - vdpy.cur_egl_img); + if (vscr->img) { + pixman_image_unref(vscr->img); + vscr->img = NULL; + } + /* Continue to thread cleanup */ -sdl_fail: + if (vscr->surf_tex) { + SDL_DestroyTexture(vscr->surf_tex); + vscr->surf_tex = NULL; + } + if (vscr->cur_tex) { + SDL_DestroyTexture(vscr->cur_tex); + vscr->cur_tex = NULL; + } - if (vdpy.dpy_renderer) { - SDL_DestroyRenderer(vdpy.dpy_renderer); - vdpy.dpy_renderer = NULL; + if (vdpy.egl_dmabuf_supported && (vscr->egl_img != EGL_NO_IMAGE_KHR)) + vdpy.gl_ops.eglDestroyImageKHR(vdpy.eglDisplay, + vscr->egl_img); } - if (vdpy.dpy_win) { - SDL_DestroyWindow(vdpy.dpy_win); - vdpy.dpy_win = NULL; + +sdl_fail: + for (i = 0; i < vdpy.vscrs_num; i++) { + vscr = vdpy.vscrs + i; + if (vscr == NULL) { + continue; + } + + if (vscr->renderer) { + SDL_DestroyRenderer(vscr->renderer); + vscr->renderer = NULL; + } + if (vscr->win) { + SDL_DestroyWindow(vscr->win); + vscr->win = NULL; + } } /* This is used to workaround the TLS issue of libEGL + libGLdispatch @@ -1113,7 +1228,7 @@ vdpy_init(int *supported_wins) vdpy.s.n_connect++; if (supported_wins) - *supported_wins = 1; + *supported_wins = vdpy.vscrs_num; return vdpy.s.n_connect; } @@ -1146,6 +1261,8 @@ int gfx_ui_init() { SDL_SysWMinfo info; + struct vscreen *vscr; + int i; setenv("SDL_VIDEO_X11_FORCE_EGL", "1", 1); setenv("SDL_OPENGL_ES_DRIVER", "1", 1); @@ -1157,14 +1274,17 @@ gfx_ui_init() return -1; } - SDL_GetDisplayBounds(vdpy.pscreen_id, &vdpy.pscreen_rect); + for (i = 0; i < vdpy.vscrs_num; i++) { + vscr = vdpy.vscrs + i; + SDL_GetDisplayBounds(vscr->pscreen_id, &vscr->pscreen_rect); - if (vdpy.pscreen_rect.w < VDPY_MIN_WIDTH || - vdpy.pscreen_rect.h < VDPY_MIN_HEIGHT) { - pr_err("Too small resolutions. Please check the " - " graphics system\n"); - SDL_Quit(); - return -1; + if (vscr->pscreen_rect.w < VDPY_MIN_WIDTH || + vscr->pscreen_rect.h < VDPY_MIN_HEIGHT) { + pr_err("Too small resolutions. Please check the " + " graphics system\n"); + SDL_Quit(); + return -1; + } } SDL_SetHint(SDL_HINT_GRAB_KEYBOARD, "1"); @@ -1196,6 +1316,7 @@ gfx_ui_deinit() return; } + free(vdpy.vscrs); SDL_Quit(); pr_info("SDL_Quit\r\n"); } @@ -1204,35 +1325,41 @@ int vdpy_parse_cmd_option(const char *opts) { char *str; int snum, error; + struct vscreen *vscr; error = 0; + vdpy.vscrs = calloc(VSCREEN_MAX_NUM, sizeof(struct vscreen)); + vdpy.vscrs_num = 0; str = strcasestr(opts, "geometry="); + vscr = vdpy.vscrs + vdpy.vscrs_num; if (opts && strcasestr(opts, "geometry=fullscreen")) { - snum = sscanf(str, "geometry=fullscreen:%d", &vdpy.pscreen_id); + snum = sscanf(str, "geometry=fullscreen:%d", &vscr->pscreen_id); if (snum != 1) { - vdpy.pscreen_id = 0; + vscr->pscreen_id = 0; } - vdpy.width = VDPY_MAX_WIDTH; - vdpy.height = VDPY_MAX_HEIGHT; - vdpy.s.is_fullscreen = true; + vscr->width = VDPY_MAX_WIDTH; + vscr->height = VDPY_MAX_HEIGHT; + vscr->is_fullscreen = true; + vdpy.vscrs_num++; pr_info("virtual display: fullscreen.\n"); } else if (opts && strcasestr(opts, "geometry=")) { snum = sscanf(str, "geometry=%dx%d+%d+%d", - &vdpy.width, &vdpy.height, - &vdpy.org_x, &vdpy.org_y); + &vscr->width, &vscr->height, + &vscr->org_x, &vscr->org_y); if (snum != 4) { pr_err("incorrect geometry option. Should be" " WxH+x+y\n"); error = -1; } - vdpy.s.is_fullscreen = false; + vscr->is_fullscreen = false; + vdpy.vscrs_num++; pr_info("virtual display: windowed.\n"); } - vdpy.info.xoff = 0; - vdpy.info.yoff = 0; - vdpy.info.width = vdpy.width; - vdpy.info.height = vdpy.height; + vscr->info.xoff = 0; + vscr->info.yoff = 0; + vscr->info.width = vdpy.vscrs->width; + vscr->info.height = vdpy.vscrs->height; return error; } -- 2.25.1
|
|
|
|
[PATCH v1 1/3] dm: vdisplay: multi-local-mornitor support.
Sun, Peng
From: Sun Peng <peng.p.sun@...>
To support full screen mode on one of multi-local-mornitor which connected to SOS by monitor ID that customer specify. The monitor ID is specified in acrn-dm's parameter like this: virtio-gpu,geometry=fullscreen:monitor_id For window mode, the vdisplay window always be shown on monitor 0, because the customer can drag the window to anyone monitor. Besides, the customer can set the monitor by x_off and y_off parameter like this: virtio-gpu,geometry=<width>x<height>+<x_off>+<y_off> Signed-off-by: Sun Peng <peng.p.sun@...> --- devicemodel/hw/vdisplay_sdl.c | 43 ++++++++++++++++++++++------------- 1 file changed, 27 insertions(+), 16 deletions(-) diff --git a/devicemodel/hw/vdisplay_sdl.c b/devicemodel/hw/vdisplay_sdl.c index 65fd78d93..7a098f4b2 100644 --- a/devicemodel/hw/vdisplay_sdl.c +++ b/devicemodel/hw/vdisplay_sdl.c @@ -52,6 +52,8 @@ struct egl_display_ops { }; static struct display { + int pscreen_id; + SDL_Rect pscreen_rect; struct display_info info; struct state s; SDL_Texture *dpy_texture; @@ -62,7 +64,6 @@ static struct display { int width, height; // Width/height of dpy_win int org_x, org_y; int guest_width, guest_height; - int screen; struct surface surf; struct cursor cur; SDL_Texture *cursor_tex; @@ -908,17 +909,23 @@ vdpy_sdl_display_thread(void *data) uint32_t win_flags; struct vdpy_display_bh *bh; struct itimerspec ui_timer_spec; + int max_width, max_height; + int min_width, min_height; + max_width = MIN(vdpy.pscreen_rect.w, VDPY_MAX_WIDTH); + max_height = MIN(vdpy.pscreen_rect.h, VDPY_MAX_HEIGHT); + min_width = MAX(vdpy.pscreen_rect.w, VDPY_MIN_WIDTH); + min_height = MAX(vdpy.pscreen_rect.h, VDPY_MIN_HEIGHT); if (vdpy.width && vdpy.height) { /* clip the region between (640x480) and (1920x1080) */ - if (vdpy.width < VDPY_MIN_WIDTH) - vdpy.width = VDPY_MIN_WIDTH; - if (vdpy.width > VDPY_MAX_WIDTH) - vdpy.width = VDPY_MAX_WIDTH; - if (vdpy.height < VDPY_MIN_HEIGHT) - vdpy.height = VDPY_MIN_HEIGHT; - if (vdpy.height > VDPY_MAX_HEIGHT) - vdpy.height = VDPY_MAX_HEIGHT; + if (vdpy.width < min_width) + vdpy.width = min_width; + if (vdpy.width > max_width) + vdpy.width = max_width; + if (vdpy.height < min_height) + vdpy.height = min_height; + if (vdpy.height > max_height) + vdpy.height = max_height; } else { /* the default window(1280x720) is created with undefined pos * when no geometry info is passed @@ -933,11 +940,13 @@ vdpy_sdl_display_thread(void *data) SDL_WINDOW_ALWAYS_ON_TOP | SDL_WINDOW_SHOWN; if (vdpy.s.is_fullscreen) { - win_flags |= SDL_WINDOW_FULLSCREEN; + win_flags |= SDL_WINDOW_FULLSCREEN_DESKTOP; } vdpy.dpy_win = NULL; vdpy.dpy_renderer = NULL; vdpy.dpy_img = NULL; + vdpy.org_x = vdpy.pscreen_rect.x; + vdpy.org_y = vdpy.pscreen_rect.y; vdpy.dpy_win = SDL_CreateWindow("ACRN_DM", vdpy.org_x, vdpy.org_y, vdpy.width, vdpy.height, @@ -946,6 +955,9 @@ vdpy_sdl_display_thread(void *data) pr_err("Failed to Create SDL_Window\n"); goto sdl_fail; } + pr_info("SDL display bind to screen %d: [%d,%d,%d,%d].\n", vdpy.pscreen_id, + vdpy.org_x, vdpy.org_y, vdpy.width, vdpy.height); + vdpy.dpy_renderer = SDL_CreateRenderer(vdpy.dpy_win, -1, 0); if (vdpy.dpy_renderer == NULL) { pr_err("Failed to Create GL_Renderer \n"); @@ -1134,7 +1146,6 @@ int gfx_ui_init() { SDL_SysWMinfo info; - SDL_Rect disp_rect; setenv("SDL_VIDEO_X11_FORCE_EGL", "1", 1); setenv("SDL_OPENGL_ES_DRIVER", "1", 1); @@ -1146,10 +1157,10 @@ gfx_ui_init() return -1; } - SDL_GetDisplayBounds(0, &disp_rect); + SDL_GetDisplayBounds(vdpy.pscreen_id, &vdpy.pscreen_rect); - if (disp_rect.w < VDPY_MIN_WIDTH || - disp_rect.h < VDPY_MIN_HEIGHT) { + if (vdpy.pscreen_rect.w < VDPY_MIN_WIDTH || + vdpy.pscreen_rect.h < VDPY_MIN_HEIGHT) { pr_err("Too small resolutions. Please check the " " graphics system\n"); SDL_Quit(); @@ -1198,9 +1209,9 @@ int vdpy_parse_cmd_option(const char *opts) str = strcasestr(opts, "geometry="); if (opts && strcasestr(opts, "geometry=fullscreen")) { - snum = sscanf(str, "geometry=fullscreen:%d", &vdpy.screen); + snum = sscanf(str, "geometry=fullscreen:%d", &vdpy.pscreen_id); if (snum != 1) { - vdpy.screen = 0; + vdpy.pscreen_id = 0; } vdpy.width = VDPY_MAX_WIDTH; vdpy.height = VDPY_MAX_HEIGHT; -- 2.25.1
|
|
|
|
Re: [PATCH 4/4] hv: change 'DISABLED' settings to 'ENABLED'
Acked-by: Eddie Dong <eddie.dong@...>
toggle quoted messageShow quoted text
-----Original Message-----
|
|
|
|
Re: [PATCH] misc: add assert to check the vBDF conflict
chenli.wei
On 8/5/2022 11:19 PM, Junjie Mao wrote:
Chenli Wei <chenli.wei@...> writes:I thinks the pre-launched VM's vBDF setting should also be checked if we don't check every VM.From: Chenli Wei <chenli.wei@...>Shall we check only the BDFs of ivshmem/vUART devices for the service
|
|
|
|
Re: [PATCH 0/4] change 'DISABLED' style settings to 'ENABLED' style
Junjie Mao
"Zhou, Wu" <wu.zhou@...> writes:
Some configurator settings are defined as 'feature DISABLED' style,The names "AC_ENABLED" and "GP_ENABLED" are quite vague as AC and GP are names of exceptions and it is not straightforward to say what it means to enable them. How about: ENFORCE_TURNOFF_AC -> SPLIT_LOCK_DETECTION_ENABLED ENFORCE_TURNOFF_GP -> UC_LOCK_DETECTION_ENABLED Please also update the misc/config_tools/scenario_config/upgrader.py. Users will use that to upgrade there scenario XMLs when future releases are out. You can also update the existing XMLs by using that script. -- Best Regards Junjie Mao
|
|
|
|
Re: [PATCH] config_tools: fix vBDF schema pattern issue
Junjie Mao
Kunhui-Li <kunhuix.li@...> writes:
add escape charater to fix vBDF pattern match any character issueReviewed-by: Junjie Mao <junjie.mao@...> -- Best Regards Junjie Mao ---
|
|
|
|
Re: [PATCH] misc: add assert to check the vBDF conflict
Junjie Mao
Chenli Wei <chenli.wei@...> writes:
From: Chenli Wei <chenli.wei@...>Shall we check only the BDFs of ivshmem/vUART devices for the service VM? To other VMs the BDFs are generated by the config tools which should be able to avoid BDF collision. BTW, please do not mix white spaces and tabs. -- Best Regards Junjie Mao + string-length(substring-after(/acrn-config//PCI_DEVICE/text(), $vbdf)) = 0">
|
|
|
|
Re: [PATCH] vUART and IVSHMEM widgets don't generate address
Junjie Mao
Chuang Ke <chuangx.ke@...> writes:
Tool doesn't generate I/O address. User needs to save twice, then the tool generates I/O address.Reviewed-by: Junjie Mao <junjie.mao@...> One minor coding style issue below. Tracked-On: #7942Mind the indentation. -- Best Regards Junjie Mao if (_.isEmpty(this.scenario.vm)) {
|
|
|
|
[PATCH] config_tools: fix vBDF schema pattern issue
Kunhui Li
add escape charater to fix vBDF pattern match any character issue
for vUART and ivshmem. Tracked-On: #7925 Signed-off-by: Kunhui-Li <kunhuix.li@...> --- misc/config_tools/schema/types.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/config_tools/schema/types.xsd b/misc/config_tools/schema/types.xsd index 4aa4c5cbc..1ebaeb8bf 100644 --- a/misc/config_tools/schema/types.xsd +++ b/misc/config_tools/schema/types.xsd @@ -182,7 +182,7 @@ Read more about the available scheduling options in :ref:`cpu_sharing`.</xs:docu <xs:documentation>A string with up to two hex digits, a ``:``, two hex digits, a ``.``, and one digit between 0-7.</xs:documentation> </xs:annotation> <xs:restriction base="xs:string"> - <xs:pattern value="[0-9A-Fa-f]{1,2}:[0-1][0-9A-Fa-f].[0-7]" /> + <xs:pattern value="[0-9A-Fa-f]{1,2}:[0-1][0-9A-Fa-f]\.[0-7]" /> </xs:restriction> </xs:simpleType> -- 2.25.1
|
|
|
|
[PATCH 4/4] hv: change 'DISABLED' settings to 'ENABLED'
Zhou, Wu
In order to improve DX, 'DISABLED' style configurator settings are
changed to 'ENABLED' style. The meaning of the MACROs are reversed, so in the hv code we have to change '#ifndef' -> '#ifdef' or '#ifdef' -> '#ifndef'. Including: - MCE_ON_PSC_DISABLED -> MCE_ON_PSC_ENABLED - ENFORCE_TURNOFF_AC -> AC_ENABLED - ENFORCE_TURNOFF_GP -> GP_ENABLED Tracked-On: #7661 Signed-off-by: Wu Zhou <wu.zhou@...> --- hypervisor/arch/x86/cpu.c | 8 ++++---- hypervisor/arch/x86/security.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hypervisor/arch/x86/cpu.c b/hypervisor/arch/x86/cpu.c index 13ffb3f59..b17497589 100644 --- a/hypervisor/arch/x86/cpu.c +++ b/hypervisor/arch/x86/cpu.c @@ -110,7 +110,7 @@ uint64_t get_active_pcpu_bitmap(void) static void enable_ac_for_splitlock(void) { -#ifndef CONFIG_ENFORCE_TURNOFF_AC +#ifdef CONFIG_AC_ENABLED uint64_t test_ctl; if (has_core_cap(CORE_CAP_SPLIT_LOCK)) { @@ -118,12 +118,12 @@ static void enable_ac_for_splitlock(void) test_ctl |= MSR_TEST_CTL_AC_SPLITLOCK; msr_write(MSR_TEST_CTL, test_ctl); } -#endif /*CONFIG_ENFORCE_TURNOFF_AC*/ +#endif /*CONFIG_AC_ENABLED*/ } static void enable_gp_for_uclock(void) { -#ifndef CONFIG_ENFORCE_TURNOFF_GP +#ifdef CONFIG_GP_ENABLED uint64_t test_ctl; if (has_core_cap(CORE_CAP_UC_LOCK)) { @@ -131,7 +131,7 @@ static void enable_gp_for_uclock(void) test_ctl |= MSR_TEST_CTL_GP_UCLOCK; msr_write(MSR_TEST_CTL, test_ctl); } -#endif /*CONFIG_ENFORCE_TURNOFF_GP*/ +#endif /*CONFIG_GP_ENABLED*/ } void init_pcpu_pre(bool is_bsp) diff --git a/hypervisor/arch/x86/security.c b/hypervisor/arch/x86/security.c index f4032b040..93d7ac1a9 100644 --- a/hypervisor/arch/x86/security.c +++ b/hypervisor/arch/x86/security.c @@ -221,7 +221,7 @@ void set_fs_base(void) } #endif -#ifdef CONFIG_MCE_ON_PSC_WORKAROUND_DISABLED +#ifndef CONFIG_MCE_ON_PSC_WORKAROUND_ENABLED bool is_ept_force_4k_ipage(void) { return false; -- 2.25.1
|
|
|
|
[PATCH 3/4] config-tools: change 'DISABLED' settings to 'ENABLED' in config xml
Zhou, Wu
In order to improve DX, 'DISABLED' style configurator settings are
changed to 'ENABLED' style. The config xml files need too be changed accordingly. Including: - MCE_ON_PSC_DISABLED -> MCE_ON_PSC_ENABLED - ENFORCE_TURNOFF_AC -> AC_ENABLED - ENFORCE_TURNOFF_GP -> GP_ENABLED Tracked-On: #7661 Signed-off-by: Wu Zhou <wu.zhou@...> --- .../data/cfl-k700-i7/hybrid_launch_2user_vm.xml | 6 +++--- misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml | 6 +++--- misc/config_tools/data/cfl-k700-i7/partitioned.xml | 6 +++--- .../data/cfl-k700-i7/shared_launch_6user_vm.xml | 6 +++--- .../data/generic_board/hybrid_launch_2user_vm.xml | 6 +++--- misc/config_tools/data/generic_board/hybrid_rt.xml | 4 ++-- misc/config_tools/data/generic_board/partitioned.xml | 6 +++--- .../data/generic_board/shared_launch_2user_vm.xml | 6 +++--- .../config_tools/data/nuc11tnbi5/hybrid_launch_2user_vm.xml | 6 +++--- misc/config_tools/data/nuc11tnbi5/partitioned.xml | 6 +++--- .../config_tools/data/nuc11tnbi5/shared_launch_6user_vm.xml | 6 +++--- misc/config_tools/data/qemu/shared.xml | 6 +++--- misc/config_tools/data/tgl-vecow-spc-7100-Corei7/hybrid.xml | 6 +++--- .../data/tgl-vecow-spc-7100-Corei7/partitioned.xml | 6 +++--- .../tgl-vecow-spc-7100-Corei7/shared_launch_2user_vm.xml | 6 +++--- misc/config_tools/data/whl-ipc-i5/hybrid.xml | 6 +++--- .../data/whl-ipc-i5/hybrid_rt_launch_1user_vm_waag.xml | 6 +++--- misc/config_tools/data/whl-ipc-i5/partitioned.xml | 6 +++--- .../data/whl-ipc-i5/shared_launch_1user_vm_hardrt.xml | 6 +++--- .../data/whl-ipc-i5/shared_launch_1user_vm_vxworks.xml | 6 +++--- .../data/whl-ipc-i5/shared_launch_1user_vm_waag.xml | 6 +++--- .../config_tools/data/whl-ipc-i5/shared_launch_2user_vm.xml | 6 +++--- .../config_tools/data/whl-ipc-i5/shared_launch_6user_vm.xml | 6 +++--- 23 files changed, 68 insertions(+), 68 deletions(-) diff --git a/misc/config_tools/data/cfl-k700-i7/hybrid_launch_2user_vm.xml b/misc/config_tools/data/cfl-k700-i7/hybrid_launch_2user_vm.xml index a931350a3..51172378d 100644 --- a/misc/config_tools/data/cfl-k700-i7/hybrid_launch_2user_vm.xml +++ b/misc/config_tools/data/cfl-k700-i7/hybrid_launch_2user_vm.xml @@ -11,8 +11,8 @@ <RELOC_ENABLED>y</RELOC_ENABLED> <SCHEDULER>SCHED_BVT</SCHEDULER> <MULTIBOOT2_ENABLED>y</MULTIBOOT2_ENABLED> - <ENFORCE_TURNOFF_AC>y</ENFORCE_TURNOFF_AC> - <ENFORCE_TURNOFF_GP>n</ENFORCE_TURNOFF_GP> + <AC_ENABLED>n</AC_ENABLED> + <GP_ENABLED>y</GP_ENABLED> <SECURITY_VM_FIXUP>n</SECURITY_VM_FIXUP> <RDT> <RDT_ENABLED>n</RDT_ENABLED> @@ -23,7 +23,7 @@ <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP> <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED> <L1D_VMENTRY_ENABLED>n</L1D_VMENTRY_ENABLED> - <MCE_ON_PSC_DISABLED>n</MCE_ON_PSC_DISABLED> + <MCE_ON_PSC_ENABLED>y</MCE_ON_PSC_ENABLED> <IVSHMEM/> </FEATURES> <MEMORY> diff --git a/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml b/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml index 97e762399..9bc3858e9 100644 --- a/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml +++ b/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml @@ -11,8 +11,8 @@ <RELOC_ENABLED>y</RELOC_ENABLED> <SCHEDULER>SCHED_BVT</SCHEDULER> <MULTIBOOT2_ENABLED>y</MULTIBOOT2_ENABLED> - <ENFORCE_TURNOFF_AC>y</ENFORCE_TURNOFF_AC> - <ENFORCE_TURNOFF_GP>n</ENFORCE_TURNOFF_GP> + <AC_ENABLED>n</AC_ENABLED> + <GP_ENABLED>y</GP_ENABLED> <SECURITY_VM_FIXUP>n</SECURITY_VM_FIXUP> <RDT> <RDT_ENABLED>n</RDT_ENABLED> @@ -23,7 +23,7 @@ <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP> <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED> <L1D_VMENTRY_ENABLED>n</L1D_VMENTRY_ENABLED> - <MCE_ON_PSC_DISABLED>n</MCE_ON_PSC_DISABLED> + <MCE_ON_PSC_ENABLED>y</MCE_ON_PSC_ENABLED> <IVSHMEM> <IVSHMEM_REGION> <NAME>shm_region_0</NAME> diff --git a/misc/config_tools/data/cfl-k700-i7/partitioned.xml b/misc/config_tools/data/cfl-k700-i7/partitioned.xml index db626afd2..520a5be98 100644 --- a/misc/config_tools/data/cfl-k700-i7/partitioned.xml +++ b/misc/config_tools/data/cfl-k700-i7/partitioned.xml @@ -11,8 +11,8 @@ <RELOC_ENABLED>y</RELOC_ENABLED> <SCHEDULER>SCHED_BVT</SCHEDULER> <MULTIBOOT2_ENABLED>y</MULTIBOOT2_ENABLED> - <ENFORCE_TURNOFF_AC>y</ENFORCE_TURNOFF_AC> - <ENFORCE_TURNOFF_GP>n</ENFORCE_TURNOFF_GP> + <AC_ENABLED>n</AC_ENABLED> + <GP_ENABLED>y</GP_ENABLED> <SECURITY_VM_FIXUP>n</SECURITY_VM_FIXUP> <RDT> <RDT_ENABLED>n</RDT_ENABLED> @@ -23,7 +23,7 @@ <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP> <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED> <L1D_VMENTRY_ENABLED>n</L1D_VMENTRY_ENABLED> - <MCE_ON_PSC_DISABLED>n</MCE_ON_PSC_DISABLED> + <MCE_ON_PSC_ENABLED>y</MCE_ON_PSC_ENABLED> <IVSHMEM/> </FEATURES> <MEMORY> diff --git a/misc/config_tools/data/cfl-k700-i7/shared_launch_6user_vm.xml b/misc/config_tools/data/cfl-k700-i7/shared_launch_6user_vm.xml index 27cde6a8f..f3d36e522 100644 --- a/misc/config_tools/data/cfl-k700-i7/shared_launch_6user_vm.xml +++ b/misc/config_tools/data/cfl-k700-i7/shared_launch_6user_vm.xml @@ -11,8 +11,8 @@ <RELOC_ENABLED>y</RELOC_ENABLED> <SCHEDULER>SCHED_BVT</SCHEDULER> <MULTIBOOT2_ENABLED>y</MULTIBOOT2_ENABLED> - <ENFORCE_TURNOFF_AC>y</ENFORCE_TURNOFF_AC> - <ENFORCE_TURNOFF_GP>n</ENFORCE_TURNOFF_GP> + <AC_ENABLED>n</AC_ENABLED> + <GP_ENABLED>y</GP_ENABLED> <SECURITY_VM_FIXUP>n</SECURITY_VM_FIXUP> <RDT> <RDT_ENABLED>n</RDT_ENABLED> @@ -23,7 +23,7 @@ <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP> <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED> <L1D_VMENTRY_ENABLED>n</L1D_VMENTRY_ENABLED> - <MCE_ON_PSC_DISABLED>n</MCE_ON_PSC_DISABLED> + <MCE_ON_PSC_ENABLED>y</MCE_ON_PSC_ENABLED> <IVSHMEM/> </FEATURES> <MEMORY> diff --git a/misc/config_tools/data/generic_board/hybrid_launch_2user_vm.xml b/misc/config_tools/data/generic_board/hybrid_launch_2user_vm.xml index 454c6b912..a4d60c83a 100644 --- a/misc/config_tools/data/generic_board/hybrid_launch_2user_vm.xml +++ b/misc/config_tools/data/generic_board/hybrid_launch_2user_vm.xml @@ -11,8 +11,8 @@ <RELOC_ENABLED>y</RELOC_ENABLED> <SCHEDULER>SCHED_BVT</SCHEDULER> <MULTIBOOT2_ENABLED>y</MULTIBOOT2_ENABLED> - <ENFORCE_TURNOFF_AC>y</ENFORCE_TURNOFF_AC> - <ENFORCE_TURNOFF_GP>n</ENFORCE_TURNOFF_GP> + <AC_ENABLED>n</AC_ENABLED> + <GP_ENABLED>y</GP_ENABLED> <SECURITY_VM_FIXUP>n</SECURITY_VM_FIXUP> <RDT> <RDT_ENABLED>n</RDT_ENABLED> @@ -23,7 +23,7 @@ <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP> <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED> <L1D_VMENTRY_ENABLED>n</L1D_VMENTRY_ENABLED> - <MCE_ON_PSC_DISABLED>n</MCE_ON_PSC_DISABLED> + <MCE_ON_PSC_ENABLED>y</MCE_ON_PSC_ENABLED> <IVSHMEM/> </FEATURES> <MEMORY> diff --git a/misc/config_tools/data/generic_board/hybrid_rt.xml b/misc/config_tools/data/generic_board/hybrid_rt.xml index 47e2aa86b..8f40c09f3 100644 --- a/misc/config_tools/data/generic_board/hybrid_rt.xml +++ b/misc/config_tools/data/generic_board/hybrid_rt.xml @@ -11,7 +11,7 @@ <RELOC_ENABLED>y</RELOC_ENABLED> <SCHEDULER>SCHED_BVT</SCHEDULER> <MULTIBOOT2_ENABLED>y</MULTIBOOT2_ENABLED> - <ENFORCE_TURNOFF_AC>y</ENFORCE_TURNOFF_AC> + <AC_ENABLED>n</AC_ENABLED> <RDT> <RDT_ENABLED>n</RDT_ENABLED> <CDP_ENABLED>n</CDP_ENABLED> @@ -20,7 +20,7 @@ <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP> <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED> <L1D_VMENTRY_ENABLED>n</L1D_VMENTRY_ENABLED> - <MCE_ON_PSC_DISABLED>n</MCE_ON_PSC_DISABLED> + <MCE_ON_PSC_ENABLED>y</MCE_ON_PSC_ENABLED> <IVSHMEM> <IVSHMEM_REGION> <NAME>shm_region_0</NAME> diff --git a/misc/config_tools/data/generic_board/partitioned.xml b/misc/config_tools/data/generic_board/partitioned.xml index 1d155eac3..b8c1ecdd6 100644 --- a/misc/config_tools/data/generic_board/partitioned.xml +++ b/misc/config_tools/data/generic_board/partitioned.xml @@ -11,8 +11,8 @@ <RELOC_ENABLED>y</RELOC_ENABLED> <SCHEDULER>SCHED_BVT</SCHEDULER> <MULTIBOOT2_ENABLED>y</MULTIBOOT2_ENABLED> - <ENFORCE_TURNOFF_AC>y</ENFORCE_TURNOFF_AC> - <ENFORCE_TURNOFF_GP>n</ENFORCE_TURNOFF_GP> + <AC_ENABLED>n</AC_ENABLED> + <GP_ENABLED>y</GP_ENABLED> <SECURITY_VM_FIXUP>n</SECURITY_VM_FIXUP> <RDT> <RDT_ENABLED>n</RDT_ENABLED> @@ -23,7 +23,7 @@ <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP> <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED> <L1D_VMENTRY_ENABLED>n</L1D_VMENTRY_ENABLED> - <MCE_ON_PSC_DISABLED>n</MCE_ON_PSC_DISABLED> + <MCE_ON_PSC_ENABLED>y</MCE_ON_PSC_ENABLED> <IVSHMEM/> </FEATURES> <MEMORY> diff --git a/misc/config_tools/data/generic_board/shared_launch_2user_vm.xml b/misc/config_tools/data/generic_board/shared_launch_2user_vm.xml index 4f5b3fef6..68e126f70 100644 --- a/misc/config_tools/data/generic_board/shared_launch_2user_vm.xml +++ b/misc/config_tools/data/generic_board/shared_launch_2user_vm.xml @@ -11,8 +11,8 @@ <RELOC_ENABLED>y</RELOC_ENABLED> <SCHEDULER>SCHED_BVT</SCHEDULER> <MULTIBOOT2_ENABLED>y</MULTIBOOT2_ENABLED> - <ENFORCE_TURNOFF_AC>y</ENFORCE_TURNOFF_AC> - <ENFORCE_TURNOFF_GP>n</ENFORCE_TURNOFF_GP> + <AC_ENABLED>n</AC_ENABLED> + <GP_ENABLED>y</GP_ENABLED> <SECURITY_VM_FIXUP>n</SECURITY_VM_FIXUP> <RDT> <RDT_ENABLED>n</RDT_ENABLED> @@ -23,7 +23,7 @@ <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP> <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED> <L1D_VMENTRY_ENABLED>n</L1D_VMENTRY_ENABLED> - <MCE_ON_PSC_DISABLED>n</MCE_ON_PSC_DISABLED> + <MCE_ON_PSC_ENABLED>y</MCE_ON_PSC_ENABLED> <IVSHMEM/> </FEATURES> <MEMORY> diff --git a/misc/config_tools/data/nuc11tnbi5/hybrid_launch_2user_vm.xml b/misc/config_tools/data/nuc11tnbi5/hybrid_launch_2user_vm.xml index 454c6b912..a4d60c83a 100644 --- a/misc/config_tools/data/nuc11tnbi5/hybrid_launch_2user_vm.xml +++ b/misc/config_tools/data/nuc11tnbi5/hybrid_launch_2user_vm.xml @@ -11,8 +11,8 @@ <RELOC_ENABLED>y</RELOC_ENABLED> <SCHEDULER>SCHED_BVT</SCHEDULER> <MULTIBOOT2_ENABLED>y</MULTIBOOT2_ENABLED> - <ENFORCE_TURNOFF_AC>y</ENFORCE_TURNOFF_AC> - <ENFORCE_TURNOFF_GP>n</ENFORCE_TURNOFF_GP> + <AC_ENABLED>n</AC_ENABLED> + <GP_ENABLED>y</GP_ENABLED> <SECURITY_VM_FIXUP>n</SECURITY_VM_FIXUP> <RDT> <RDT_ENABLED>n</RDT_ENABLED> @@ -23,7 +23,7 @@ <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP> <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED> <L1D_VMENTRY_ENABLED>n</L1D_VMENTRY_ENABLED> - <MCE_ON_PSC_DISABLED>n</MCE_ON_PSC_DISABLED> + <MCE_ON_PSC_ENABLED>y</MCE_ON_PSC_ENABLED> <IVSHMEM/> </FEATURES> <MEMORY> diff --git a/misc/config_tools/data/nuc11tnbi5/partitioned.xml b/misc/config_tools/data/nuc11tnbi5/partitioned.xml index c94b8ac3c..e30ffa52c 100644 --- a/misc/config_tools/data/nuc11tnbi5/partitioned.xml +++ b/misc/config_tools/data/nuc11tnbi5/partitioned.xml @@ -11,8 +11,8 @@ <RELOC_ENABLED>y</RELOC_ENABLED> <SCHEDULER>SCHED_BVT</SCHEDULER> <MULTIBOOT2_ENABLED>y</MULTIBOOT2_ENABLED> - <ENFORCE_TURNOFF_AC>y</ENFORCE_TURNOFF_AC> - <ENFORCE_TURNOFF_GP>n</ENFORCE_TURNOFF_GP> + <AC_ENABLED>n</AC_ENABLED> + <GP_ENABLED>y</GP_ENABLED> <SECURITY_VM_FIXUP>n</SECURITY_VM_FIXUP> <RDT> <RDT_ENABLED>n</RDT_ENABLED> @@ -23,7 +23,7 @@ <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP> <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED> <L1D_VMENTRY_ENABLED>n</L1D_VMENTRY_ENABLED> - <MCE_ON_PSC_DISABLED>n</MCE_ON_PSC_DISABLED> + <MCE_ON_PSC_ENABLED>y</MCE_ON_PSC_ENABLED> <IVSHMEM/> </FEATURES> <MEMORY> diff --git a/misc/config_tools/data/nuc11tnbi5/shared_launch_6user_vm.xml b/misc/config_tools/data/nuc11tnbi5/shared_launch_6user_vm.xml index 27c6b9e38..68f742025 100644 --- a/misc/config_tools/data/nuc11tnbi5/shared_launch_6user_vm.xml +++ b/misc/config_tools/data/nuc11tnbi5/shared_launch_6user_vm.xml @@ -11,8 +11,8 @@ <RELOC_ENABLED>y</RELOC_ENABLED> <SCHEDULER>SCHED_BVT</SCHEDULER> <MULTIBOOT2_ENABLED>y</MULTIBOOT2_ENABLED> - <ENFORCE_TURNOFF_AC>y</ENFORCE_TURNOFF_AC> - <ENFORCE_TURNOFF_GP>n</ENFORCE_TURNOFF_GP> + <AC_ENABLED>n</AC_ENABLED> + <GP_ENABLED>y</GP_ENABLED> <SECURITY_VM_FIXUP>n</SECURITY_VM_FIXUP> <RDT> <RDT_ENABLED>n</RDT_ENABLED> @@ -23,7 +23,7 @@ <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP> <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED> <L1D_VMENTRY_ENABLED>n</L1D_VMENTRY_ENABLED> - <MCE_ON_PSC_DISABLED>n</MCE_ON_PSC_DISABLED> + <MCE_ON_PSC_ENABLED>y</MCE_ON_PSC_ENABLED> <IVSHMEM/> </FEATURES> <MEMORY> diff --git a/misc/config_tools/data/qemu/shared.xml b/misc/config_tools/data/qemu/shared.xml index 265305792..974f74ed4 100644 --- a/misc/config_tools/data/qemu/shared.xml +++ b/misc/config_tools/data/qemu/shared.xml @@ -11,8 +11,8 @@ <RELOC_ENABLED>y</RELOC_ENABLED> <SCHEDULER>SCHED_BVT</SCHEDULER> <MULTIBOOT2_ENABLED>y</MULTIBOOT2_ENABLED> - <ENFORCE_TURNOFF_AC>y</ENFORCE_TURNOFF_AC> - <ENFORCE_TURNOFF_GP>n</ENFORCE_TURNOFF_GP> + <AC_ENABLED>n</AC_ENABLED> + <GP_ENABLED>y</GP_ENABLED> <SECURITY_VM_FIXUP>n</SECURITY_VM_FIXUP> <RDT> <RDT_ENABLED>n</RDT_ENABLED> @@ -23,7 +23,7 @@ <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP> <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED> <L1D_VMENTRY_ENABLED>n</L1D_VMENTRY_ENABLED> - <MCE_ON_PSC_DISABLED>n</MCE_ON_PSC_DISABLED> + <MCE_ON_PSC_ENABLED>y</MCE_ON_PSC_ENABLED> <IVSHMEM/> </FEATURES> <MEMORY> diff --git a/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/hybrid.xml b/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/hybrid.xml index 55e48340f..e9a367f07 100644 --- a/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/hybrid.xml +++ b/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/hybrid.xml @@ -6,8 +6,8 @@ <RELOC_ENABLED>y</RELOC_ENABLED> <SCHEDULER>SCHED_BVT</SCHEDULER> <MULTIBOOT2_ENABLED>y</MULTIBOOT2_ENABLED> - <ENFORCE_TURNOFF_AC>y</ENFORCE_TURNOFF_AC> - <ENFORCE_TURNOFF_GP>n</ENFORCE_TURNOFF_GP> + <AC_ENABLED>n</AC_ENABLED> + <GP_ENABLED>y</GP_ENABLED> <SECURITY_VM_FIXUP>n</SECURITY_VM_FIXUP> <RDT> <RDT_ENABLED>n</RDT_ENABLED> @@ -18,7 +18,7 @@ <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP> <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED> <L1D_VMENTRY_ENABLED>n</L1D_VMENTRY_ENABLED> - <MCE_ON_PSC_DISABLED>n</MCE_ON_PSC_DISABLED> + <MCE_ON_PSC_ENABLED>y</MCE_ON_PSC_ENABLED> <KEEP_IRQ_DISABLED>n</KEEP_IRQ_DISABLED> </FEATURES> <vuart_connections> diff --git a/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/partitioned.xml b/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/partitioned.xml index 53908fc69..3a423fb3e 100644 --- a/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/partitioned.xml +++ b/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/partitioned.xml @@ -11,8 +11,8 @@ <RELOC_ENABLED>y</RELOC_ENABLED> <SCHEDULER>SCHED_BVT</SCHEDULER> <MULTIBOOT2_ENABLED>y</MULTIBOOT2_ENABLED> - <ENFORCE_TURNOFF_AC>y</ENFORCE_TURNOFF_AC> - <ENFORCE_TURNOFF_GP>n</ENFORCE_TURNOFF_GP> + <AC_ENABLED>n</AC_ENABLED> + <GP_ENABLED>y</GP_ENABLED> <SECURITY_VM_FIXUP>n</SECURITY_VM_FIXUP> <RDT> <RDT_ENABLED>n</RDT_ENABLED> @@ -23,7 +23,7 @@ <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP> <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED> <L1D_VMENTRY_ENABLED>n</L1D_VMENTRY_ENABLED> - <MCE_ON_PSC_DISABLED>n</MCE_ON_PSC_DISABLED> + <MCE_ON_PSC_ENABLED>y</MCE_ON_PSC_ENABLED> <IVSHMEM/> </FEATURES> <MEMORY> diff --git a/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/shared_launch_2user_vm.xml b/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/shared_launch_2user_vm.xml index 87e482c2f..4cf59142f 100644 --- a/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/shared_launch_2user_vm.xml +++ b/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/shared_launch_2user_vm.xml @@ -11,8 +11,8 @@ <RELOC_ENABLED>y</RELOC_ENABLED> <SCHEDULER>SCHED_BVT</SCHEDULER> <MULTIBOOT2_ENABLED>y</MULTIBOOT2_ENABLED> - <ENFORCE_TURNOFF_AC>y</ENFORCE_TURNOFF_AC> - <ENFORCE_TURNOFF_GP>n</ENFORCE_TURNOFF_GP> + <AC_ENABLED>n</AC_ENABLED> + <GP_ENABLED>y</GP_ENABLED> <SECURITY_VM_FIXUP>n</SECURITY_VM_FIXUP> <RDT> <RDT_ENABLED>n</RDT_ENABLED> @@ -23,7 +23,7 @@ <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP> <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED> <L1D_VMENTRY_ENABLED>n</L1D_VMENTRY_ENABLED> - <MCE_ON_PSC_DISABLED>n</MCE_ON_PSC_DISABLED> + <MCE_ON_PSC_ENABLED>y</MCE_ON_PSC_ENABLED> <IVSHMEM/> </FEATURES> <MEMORY> diff --git a/misc/config_tools/data/whl-ipc-i5/hybrid.xml b/misc/config_tools/data/whl-ipc-i5/hybrid.xml index 2bac6ca89..981b8e32b 100644 --- a/misc/config_tools/data/whl-ipc-i5/hybrid.xml +++ b/misc/config_tools/data/whl-ipc-i5/hybrid.xml @@ -11,8 +11,8 @@ <RELOC_ENABLED>y</RELOC_ENABLED> <SCHEDULER>SCHED_BVT</SCHEDULER> <MULTIBOOT2_ENABLED>y</MULTIBOOT2_ENABLED> - <ENFORCE_TURNOFF_AC>y</ENFORCE_TURNOFF_AC> - <ENFORCE_TURNOFF_GP>n</ENFORCE_TURNOFF_GP> + <AC_ENABLED>n</AC_ENABLED> + <GP_ENABLED>y</GP_ENABLED> <SECURITY_VM_FIXUP>n</SECURITY_VM_FIXUP> <RDT> <RDT_ENABLED>n</RDT_ENABLED> @@ -23,7 +23,7 @@ <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP> <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED> <L1D_VMENTRY_ENABLED>n</L1D_VMENTRY_ENABLED> - <MCE_ON_PSC_DISABLED>n</MCE_ON_PSC_DISABLED> + <MCE_ON_PSC_ENABLED>y</MCE_ON_PSC_ENABLED> <IVSHMEM/> </FEATURES> <MEMORY> diff --git a/misc/config_tools/data/whl-ipc-i5/hybrid_rt_launch_1user_vm_waag.xml b/misc/config_tools/data/whl-ipc-i5/hybrid_rt_launch_1user_vm_waag.xml index 76347192b..d371f9543 100644 --- a/misc/config_tools/data/whl-ipc-i5/hybrid_rt_launch_1user_vm_waag.xml +++ b/misc/config_tools/data/whl-ipc-i5/hybrid_rt_launch_1user_vm_waag.xml @@ -11,8 +11,8 @@ <RELOC_ENABLED>y</RELOC_ENABLED> <SCHEDULER>SCHED_BVT</SCHEDULER> <MULTIBOOT2_ENABLED>y</MULTIBOOT2_ENABLED> - <ENFORCE_TURNOFF_AC>y</ENFORCE_TURNOFF_AC> - <ENFORCE_TURNOFF_GP>n</ENFORCE_TURNOFF_GP> + <AC_ENABLED>n</AC_ENABLED> + <GP_ENABLED>y</GP_ENABLED> <SECURITY_VM_FIXUP>n</SECURITY_VM_FIXUP> <RDT> <RDT_ENABLED>n</RDT_ENABLED> @@ -23,7 +23,7 @@ <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP> <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED> <L1D_VMENTRY_ENABLED>n</L1D_VMENTRY_ENABLED> - <MCE_ON_PSC_DISABLED>n</MCE_ON_PSC_DISABLED> + <MCE_ON_PSC_ENABLED>y</MCE_ON_PSC_ENABLED> <IVSHMEM> <IVSHMEM_REGION> <NAME>shm_region_0</NAME> diff --git a/misc/config_tools/data/whl-ipc-i5/partitioned.xml b/misc/config_tools/data/whl-ipc-i5/partitioned.xml index 5241e2a43..211f49e0e 100644 --- a/misc/config_tools/data/whl-ipc-i5/partitioned.xml +++ b/misc/config_tools/data/whl-ipc-i5/partitioned.xml @@ -11,8 +11,8 @@ <RELOC_ENABLED>y</RELOC_ENABLED> <SCHEDULER>SCHED_BVT</SCHEDULER> <MULTIBOOT2_ENABLED>y</MULTIBOOT2_ENABLED> - <ENFORCE_TURNOFF_AC>y</ENFORCE_TURNOFF_AC> - <ENFORCE_TURNOFF_GP>n</ENFORCE_TURNOFF_GP> + <AC_ENABLED>n</AC_ENABLED> + <GP_ENABLED>y</GP_ENABLED> <SECURITY_VM_FIXUP>n</SECURITY_VM_FIXUP> <RDT> <RDT_ENABLED>n</RDT_ENABLED> @@ -23,7 +23,7 @@ <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP> <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED> <L1D_VMENTRY_ENABLED>n</L1D_VMENTRY_ENABLED> - <MCE_ON_PSC_DISABLED>n</MCE_ON_PSC_DISABLED> + <MCE_ON_PSC_ENABLED>y</MCE_ON_PSC_ENABLED> <IVSHMEM/> </FEATURES> <MEMORY> diff --git a/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_hardrt.xml b/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_hardrt.xml index 0601f10d9..1eb4065ac 100644 --- a/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_hardrt.xml +++ b/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_hardrt.xml @@ -11,8 +11,8 @@ <RELOC_ENABLED>y</RELOC_ENABLED> <SCHEDULER>SCHED_BVT</SCHEDULER> <MULTIBOOT2_ENABLED>y</MULTIBOOT2_ENABLED> - <ENFORCE_TURNOFF_AC>y</ENFORCE_TURNOFF_AC> - <ENFORCE_TURNOFF_GP>n</ENFORCE_TURNOFF_GP> + <AC_ENABLED>n</AC_ENABLED> + <GP_ENABLED>y</GP_ENABLED> <SECURITY_VM_FIXUP>n</SECURITY_VM_FIXUP> <RDT> <RDT_ENABLED>n</RDT_ENABLED> @@ -23,7 +23,7 @@ <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP> <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED> <L1D_VMENTRY_ENABLED>n</L1D_VMENTRY_ENABLED> - <MCE_ON_PSC_DISABLED>n</MCE_ON_PSC_DISABLED> + <MCE_ON_PSC_ENABLED>y</MCE_ON_PSC_ENABLED> <IVSHMEM/> </FEATURES> <MEMORY> diff --git a/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_vxworks.xml b/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_vxworks.xml index 6f0693f77..10903c71e 100644 --- a/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_vxworks.xml +++ b/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_vxworks.xml @@ -11,8 +11,8 @@ <RELOC_ENABLED>y</RELOC_ENABLED> <SCHEDULER>SCHED_BVT</SCHEDULER> <MULTIBOOT2_ENABLED>y</MULTIBOOT2_ENABLED> - <ENFORCE_TURNOFF_AC>y</ENFORCE_TURNOFF_AC> - <ENFORCE_TURNOFF_GP>n</ENFORCE_TURNOFF_GP> + <AC_ENABLED>n</AC_ENABLED> + <GP_ENABLED>y</GP_ENABLED> <SECURITY_VM_FIXUP>n</SECURITY_VM_FIXUP> <RDT> <RDT_ENABLED>n</RDT_ENABLED> @@ -23,7 +23,7 @@ <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP> <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED> <L1D_VMENTRY_ENABLED>n</L1D_VMENTRY_ENABLED> - <MCE_ON_PSC_DISABLED>n</MCE_ON_PSC_DISABLED> + <MCE_ON_PSC_ENABLED>y</MCE_ON_PSC_ENABLED> <IVSHMEM/> </FEATURES> <MEMORY> diff --git a/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_waag.xml b/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_waag.xml index 95bdcaa4d..7fc42a012 100644 --- a/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_waag.xml +++ b/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_waag.xml @@ -11,8 +11,8 @@ <RELOC_ENABLED>y</RELOC_ENABLED> <SCHEDULER>SCHED_BVT</SCHEDULER> <MULTIBOOT2_ENABLED>y</MULTIBOOT2_ENABLED> - <ENFORCE_TURNOFF_AC>y</ENFORCE_TURNOFF_AC> - <ENFORCE_TURNOFF_GP>n</ENFORCE_TURNOFF_GP> + <AC_ENABLED>n</AC_ENABLED> + <GP_ENABLED>y</GP_ENABLED> <SECURITY_VM_FIXUP>n</SECURITY_VM_FIXUP> <RDT> <RDT_ENABLED>n</RDT_ENABLED> @@ -23,7 +23,7 @@ <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP> <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED> <L1D_VMENTRY_ENABLED>n</L1D_VMENTRY_ENABLED> - <MCE_ON_PSC_DISABLED>n</MCE_ON_PSC_DISABLED> + <MCE_ON_PSC_ENABLED>y</MCE_ON_PSC_ENABLED> <IVSHMEM/> </FEATURES> <MEMORY> diff --git a/misc/config_tools/data/whl-ipc-i5/shared_launch_2user_vm.xml b/misc/config_tools/data/whl-ipc-i5/shared_launch_2user_vm.xml index 4bd7de3c5..8f8f66f56 100644 --- a/misc/config_tools/data/whl-ipc-i5/shared_launch_2user_vm.xml +++ b/misc/config_tools/data/whl-ipc-i5/shared_launch_2user_vm.xml @@ -11,8 +11,8 @@ <RELOC_ENABLED>y</RELOC_ENABLED> <SCHEDULER>SCHED_BVT</SCHEDULER> <MULTIBOOT2_ENABLED>y</MULTIBOOT2_ENABLED> - <ENFORCE_TURNOFF_AC>y</ENFORCE_TURNOFF_AC> - <ENFORCE_TURNOFF_GP>n</ENFORCE_TURNOFF_GP> + <AC_ENABLED>n</AC_ENABLED> + <GP_ENABLED>y</GP_ENABLED> <SECURITY_VM_FIXUP>n</SECURITY_VM_FIXUP> <RDT> <RDT_ENABLED>n</RDT_ENABLED> @@ -23,7 +23,7 @@ <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP> <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED> <L1D_VMENTRY_ENABLED>n</L1D_VMENTRY_ENABLED> - <MCE_ON_PSC_DISABLED>n</MCE_ON_PSC_DISABLED> + <MCE_ON_PSC_ENABLED>y</MCE_ON_PSC_ENABLED> <IVSHMEM/> </FEATURES> <MEMORY> diff --git a/misc/config_tools/data/whl-ipc-i5/shared_launch_6user_vm.xml b/misc/config_tools/data/whl-ipc-i5/shared_launch_6user_vm.xml index d0d614c07..630269443 100644 --- a/misc/config_tools/data/whl-ipc-i5/shared_launch_6user_vm.xml +++ b/misc/config_tools/data/whl-ipc-i5/shared_launch_6user_vm.xml @@ -11,8 +11,8 @@ <RELOC_ENABLED>y</RELOC_ENABLED> <SCHEDULER>SCHED_BVT</SCHEDULER> <MULTIBOOT2_ENABLED>y</MULTIBOOT2_ENABLED> - <ENFORCE_TURNOFF_AC>y</ENFORCE_TURNOFF_AC> - <ENFORCE_TURNOFF_GP>n</ENFORCE_TURNOFF_GP> + <AC_ENABLED>n</AC_ENABLED> + <GP_ENABLED>y</GP_ENABLED> <SECURITY_VM_FIXUP>n</SECURITY_VM_FIXUP> <RDT> <RDT_ENABLED>n</RDT_ENABLED> @@ -23,7 +23,7 @@ <IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP> <ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED> <L1D_VMENTRY_ENABLED>n</L1D_VMENTRY_ENABLED> - <MCE_ON_PSC_DISABLED>n</MCE_ON_PSC_DISABLED> + <MCE_ON_PSC_ENABLED>y</MCE_ON_PSC_ENABLED> <IVSHMEM/> </FEATURES> <MEMORY> -- 2.25.1
|
|
|
|
[PATCH 2/4] doc: change 'DISABLED' settings to 'ENABLED'
Zhou, Wu
In order to improve DX, 'DISABLED' style configurator settings are changed
to 'ENABLED' style. - MCE_ON_PSC_DISABLED -> MCE_ON_PSC_ENABLED - ENFORCE_TURNOFF_AC -> AC_ENABLED Tracked-On: #7661 Signed-off-by: Wu Zhou <wu.zhou@...> --- doc/developer-guides/hld/hld-splitlock.rst | 2 +- doc/tutorials/rtvm_performance_tips.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/developer-guides/hld/hld-splitlock.rst b/doc/developer-guides/hld/hld-splitlock.rst index 1b4bd932a..6dd3b4049 100644 --- a/doc/developer-guides/hld/hld-splitlock.rst +++ b/doc/developer-guides/hld/hld-splitlock.rst @@ -131,6 +131,6 @@ Disable Split-Locked Access Detection If the CPU supports Split-locked Access detection, the ACRN hypervisor uses it to prevent any VM running with potential system performance impacting split-locked instructions. This detection can be disabled -(by changing the :option:`hv.FEATURES.ENFORCE_TURNOFF_AC` setting in +(by changing the :option:`hv.FEATURES.AC_ENABLED` setting in the ACRN Configurator tool) for customers not caring about system performance. diff --git a/doc/tutorials/rtvm_performance_tips.rst b/doc/tutorials/rtvm_performance_tips.rst index 33ac02c55..c7064e402 100644 --- a/doc/tutorials/rtvm_performance_tips.rst +++ b/doc/tutorials/rtvm_performance_tips.rst @@ -190,7 +190,7 @@ Tip: Disable the software workaround for Machine Check Error on Page Size Change Change is conditionally applied to the models that may be affected by the issue. However, the software workaround has a negative impact on performance. If all guest OS kernels are trusted, the - :option:`hv.FEATURES.MCE_ON_PSC_DISABLED` option could be set for performance. + :option:`hv.FEATURES.MCE_ON_PSC_ENABLED` option could be unset for performance. .. note:: The tips for preempt-RT Linux are mostly applicable to the Linux-based RTOS as well, such as Xenomai. -- 2.25.1
|
|
|
|
[PATCH 1/4] config-tools: change 'DISABLED' settings to 'ENABLED'
Zhou, Wu
Some configurator settings are defined as 'feature DISABLED' style, which
could cause confusion to developers. This patch is to change them into straightforward 'ENABLED' style. Including: - MCE_ON_PSC_DISABLED -> MCE_ON_PSC_ENABLED - ENFORCE_TURNOFF_AC -> AC_ENABLED - ENFORCE_TURNOFF_GP -> GP_ENABLED Tracked-On: #7661 Signed-off-by: Wu Zhou <wu.zhou@...> --- misc/config_tools/schema/config.xsd | 18 +++++++++--------- misc/config_tools/xforms/config_common.xsl | 8 ++++---- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/misc/config_tools/schema/config.xsd b/misc/config_tools/schema/config.xsd index 040433dd3..beec24d6a 100644 --- a/misc/config_tools/schema/config.xsd +++ b/misc/config_tools/schema/config.xsd @@ -58,14 +58,14 @@ <xs:documentation>Enable multiboot2 protocol support (with multiboot1 downward compatibility). If multiboot1 meets your requirements, disable this feature to reduce hypervisor code size.</xs:documentation> </xs:annotation> </xs:element> - <xs:element name="ENFORCE_TURNOFF_AC" type="Boolean" default="y"> - <xs:annotation acrn:title="Disable split lock detection" acrn:views="advanced"> - <xs:documentation>Disable detection of split locks. A split lock can negatively affect an application's real-time performance. If a lock is detected, an alignment check exception #AC occurs.</xs:documentation> + <xs:element name="AC_ENABLED" type="Boolean" default="n"> + <xs:annotation acrn:title="Enable split lock detection" acrn:views="advanced"> + <xs:documentation>Enable detection of split locks. A split lock can negatively affect an application's real-time performance. If a lock is detected, an alignment check exception #AC occurs.</xs:documentation> </xs:annotation> </xs:element> - <xs:element name="ENFORCE_TURNOFF_GP" type="Boolean" default="n"> - <xs:annotation acrn:title="Disable UC lock detection" acrn:views="advanced"> - <xs:documentation>Disable detection of uncacheable-memory (UC) locks. A UC lock can negatively affect an application's real-time performance. If a lock is detected, a general-protection exception #GP occurs.</xs:documentation> + <xs:element name="GP_ENABLED" type="Boolean" default="y"> + <xs:annotation acrn:title="Enable UC lock detection" acrn:views="advanced"> + <xs:documentation>Enable detection of uncacheable-memory (UC) locks. A UC lock can negatively affect an application's real-time performance. If a lock is detected, a general-protection exception #GP occurs.</xs:documentation> </xs:annotation> </xs:element> <xs:element name="SECURITY_VM_FIXUP" type="Boolean" default="n"> @@ -98,9 +98,9 @@ <xs:documentation>Enable L1 cache flush before VM entry to prevent L1 terminal fault. L1 terminal fault is a hardware vulnerability that could allow unauthorized disclosure of information residing in the L1 data cache.</xs:documentation> </xs:annotation> </xs:element> - <xs:element name="MCE_ON_PSC_DISABLED" type="Boolean" default="n"> - <xs:annotation acrn:title="Disable MCE workaround" acrn:views="advanced"> - <xs:documentation>Disable the software workaround for Machine Check Error on Page Size Change (erratum in some processor families).</xs:documentation> + <xs:element name="MCE_ON_PSC_ENABLED" type="Boolean" default="y"> + <xs:annotation acrn:title="Enable MCE workaround" acrn:views="advanced"> + <xs:documentation>Enable the software workaround for Machine Check Error on Page Size Change (erratum in some processor families).</xs:documentation> </xs:annotation> </xs:element> <xs:element name="RDT" type="RDTType"> diff --git a/misc/config_tools/xforms/config_common.xsl b/misc/config_tools/xforms/config_common.xsl index 626bc10b7..34e8fea59 100644 --- a/misc/config_tools/xforms/config_common.xsl +++ b/misc/config_tools/xforms/config_common.xsl @@ -73,11 +73,11 @@ </xsl:call-template> <xsl:call-template name="boolean-by-key"> - <xsl:with-param name="key" select="'ENFORCE_TURNOFF_AC'" /> + <xsl:with-param name="key" select="'AC_ENABLED'" /> </xsl:call-template> <xsl:call-template name="boolean-by-key"> - <xsl:with-param name="key" select="'ENFORCE_TURNOFF_GP'" /> + <xsl:with-param name="key" select="'GP_ENABLED'" /> </xsl:call-template> <xsl:call-template name="boolean-by-key"> @@ -124,8 +124,8 @@ </xsl:call-template> <xsl:call-template name="boolean-by-key-value"> - <xsl:with-param name="key" select="'MCE_ON_PSC_WORKAROUND_DISABLED'" /> - <xsl:with-param name="value" select="MCE_ON_PSC_DISABLED" /> + <xsl:with-param name="key" select="'MCE_ON_PSC_WORKAROUND_ENABLED'" /> + <xsl:with-param name="value" select="MCE_ON_PSC_ENABLED" /> </xsl:call-template> <xsl:call-template name="boolean-by-key-value"> -- 2.25.1
|
|
|
|
[PATCH 0/4] change 'DISABLED' style settings to 'ENABLED' style
Zhou, Wu
Some configurator settings are defined as 'feature DISABLED' style,
which could cause confusion to developers. This patch set is to change them into straightforward 'ENABLED' style. Including: - MCE_ON_PSC_DISABLED -> MCE_ON_PSC_ENABLED - ENFORCE_TURNOFF_AC -> AC_ENABLED - ENFORCE_TURNOFF_GP -> GP_ENABLED With the change of configurator settings, the scenario data files and doc files are changed accordingly. MACROs generated by config-tools are changed to 'CONFIG_xxx_ENABLED' too. Tracked-On: #7661 Signed-off-by: Wu Zhou <wu.zhou@...> Wu Zhou (4): config-tools: change 'DISABLED' settings to 'ENABLED' doc: change 'DISABLED' settings to 'ENABLED' config-tools: change 'DISABLED' settings to 'ENABLED' in config xml hv: change 'DISABLED' settings to 'ENABLED' doc/developer-guides/hld/hld-splitlock.rst | 2 +- doc/tutorials/rtvm_performance_tips.rst | 2 +- hypervisor/arch/x86/cpu.c | 8 ++++---- hypervisor/arch/x86/security.c | 2 +- .../cfl-k700-i7/hybrid_launch_2user_vm.xml | 6 +++--- .../data/cfl-k700-i7/hybrid_rt.xml | 6 +++--- .../data/cfl-k700-i7/partitioned.xml | 6 +++--- .../cfl-k700-i7/shared_launch_6user_vm.xml | 6 +++--- .../generic_board/hybrid_launch_2user_vm.xml | 6 +++--- .../data/generic_board/hybrid_rt.xml | 4 ++-- .../data/generic_board/partitioned.xml | 6 +++--- .../generic_board/shared_launch_2user_vm.xml | 6 +++--- .../data/nuc11tnbi5/hybrid_launch_2user_vm.xml | 6 +++--- .../data/nuc11tnbi5/partitioned.xml | 6 +++--- .../data/nuc11tnbi5/shared_launch_6user_vm.xml | 6 +++--- misc/config_tools/data/qemu/shared.xml | 6 +++--- .../data/tgl-vecow-spc-7100-Corei7/hybrid.xml | 6 +++--- .../tgl-vecow-spc-7100-Corei7/partitioned.xml | 6 +++--- .../shared_launch_2user_vm.xml | 6 +++--- misc/config_tools/data/whl-ipc-i5/hybrid.xml | 6 +++--- .../hybrid_rt_launch_1user_vm_waag.xml | 6 +++--- .../data/whl-ipc-i5/partitioned.xml | 6 +++--- .../shared_launch_1user_vm_hardrt.xml | 6 +++--- .../shared_launch_1user_vm_vxworks.xml | 6 +++--- .../whl-ipc-i5/shared_launch_1user_vm_waag.xml | 6 +++--- .../data/whl-ipc-i5/shared_launch_2user_vm.xml | 6 +++--- .../data/whl-ipc-i5/shared_launch_6user_vm.xml | 6 +++--- misc/config_tools/schema/config.xsd | 18 +++++++++--------- misc/config_tools/xforms/config_common.xsl | 8 ++++---- 29 files changed, 88 insertions(+), 88 deletions(-) -- 2.25.1
|
|
|
|
[PATCH] misc: add assert to check the vBDF conflict
chenli.wei
From: Chenli Wei <chenli.wei@...>
The current ACRN-Configurator just check the conflict of user setting. have not check the conflict with native PCI device's bdf. This patch add an assert to check the above conflict. Tracked-On: #6690 Signed-off-by: Chenli Wei <chenli.wei@...> --- misc/config_tools/schema/checks/vbdf_assignment.xsd | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/misc/config_tools/schema/checks/vbdf_assignment.xsd b/misc/config_tools/schema/checks/vbdf_assignment.xsd index fde14c2b7..062b0fe67 100644 --- a/misc/config_tools/schema/checks/vbdf_assignment.xsd +++ b/misc/config_tools/schema/checks/vbdf_assignment.xsd @@ -14,4 +14,14 @@ </xs:annotation> </xs:assert> + + <xs:assert test="every $root in /acrn-config satisfies + every $vm in $root/vm satisfies + every $vbdf in $root/hv//vuart_connection[type='pci']/endpoint[vm_name=$vm/name]/vbdf/text() | $root/hv//IVSHMEM_VM[VM_NAME=$vm/name]/VBDF/text() satisfies + string-length(substring-after(/acrn-config//PCI_DEVICE/text(), $vbdf)) = 0"> + <xs:annotation acrn:severity="error" acrn:report-on="$root/hv//vuart_connection[type='pci']/endpoint[vm_name=$vm/name and vbdf=$vbdf] | $root/hv//IVSHMEM_VM[VM_NAME=$vm/name and VBDF=$vbdf]"> + <xs:documentation>VM "{$vm/name}" virtual UART controllers or IVSHMEM interfaces using BDF {$vbdf} conflict with native PCI device. Adjust the BDF of those devices to be unique.</xs:documentation> + </xs:annotation> + </xs:assert> + </xs:schema> -- 2.25.1
|
|
|