Messages in this thread Patch in this message | | | Date | Thu, 27 Jan 2022 14:30:45 -0300 | From | Marcelo Tosatti <> | Subject | [patch v10 08/10] KVM: x86: process isolation work from VM-entry code path |
| |
VM-entry code path is an entry point similar to userspace return when task isolation is concerned.
Call isolation_exit_to_user_mode before VM-enter.
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
--- include/linux/entry-kvm.h | 4 +++- kernel/entry/kvm.c | 18 ++++++++++++++---- 2 files changed, 17 insertions(+), 5 deletions(-)
Index: linux-2.6/kernel/entry/kvm.c =================================================================== --- linux-2.6.orig/kernel/entry/kvm.c +++ linux-2.6/kernel/entry/kvm.c @@ -2,8 +2,11 @@ #include <linux/entry-kvm.h> #include <linux/kvm_host.h> +#include <linux/task_isolation.h> -static int xfer_to_guest_mode_work(struct kvm_vcpu *vcpu, unsigned long ti_work) +static int xfer_to_guest_mode_work(struct kvm_vcpu *vcpu, + unsigned long ti_work, + unsigned long task_isol_work) { do { int ret; @@ -25,15 +28,19 @@ static int xfer_to_guest_mode_work(struc ret = arch_xfer_to_guest_mode_handle_work(vcpu, ti_work); if (ret) return ret; + if (task_isol_work) + task_isol_exit_to_user_mode(); ti_work = read_thread_flags(); - } while (ti_work & XFER_TO_GUEST_MODE_WORK || need_resched()); + } while (ti_work & XFER_TO_GUEST_MODE_WORK || need_resched() || + task_isol_work); return 0; } int xfer_to_guest_mode_handle_work(struct kvm_vcpu *vcpu) { unsigned long ti_work; + unsigned long task_isol_work; /* * This is invoked from the outer guest loop with interrupts and @@ -44,9 +51,9 @@ int xfer_to_guest_mode_handle_work(struc * to disable interrupts here. */ ti_work = read_thread_flags(); - if (!(ti_work & XFER_TO_GUEST_MODE_WORK)) + if (!(ti_work & XFER_TO_GUEST_MODE_WORK) || task_isol_work) return 0; - return xfer_to_guest_mode_work(vcpu, ti_work); + return xfer_to_guest_mode_work(vcpu, ti_work, task_isol_work); } EXPORT_SYMBOL_GPL(xfer_to_guest_mode_handle_work); Index: linux-2.6/include/linux/entry-kvm.h =================================================================== --- linux-2.6.orig/include/linux/entry-kvm.h +++ linux-2.6/include/linux/entry-kvm.h @@ -8,6 +8,7 @@ #include <linux/seccomp.h> #include <linux/sched.h> #include <linux/tick.h> +#include <linux/task_isolation.h> /* Transfer to guest mode work */ #ifdef CONFIG_KVM_XFER_TO_GUEST_WORK @@ -76,8 +77,9 @@ static inline void xfer_to_guest_mode_pr static inline bool __xfer_to_guest_mode_work_pending(void) { unsigned long ti_work = read_thread_flags(); + unsigned long task_isol_work = task_isol_has_work(); - return !!(ti_work & XFER_TO_GUEST_MODE_WORK); + return !!((ti_work & XFER_TO_GUEST_MODE_WORK) || task_isol_work); } /**
| |