From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3C32AC433F5 for ; Wed, 8 Dec 2021 16:14:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236589AbhLHQSI (ORCPT ); Wed, 8 Dec 2021 11:18:08 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:53935 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229743AbhLHQSF (ORCPT ); Wed, 8 Dec 2021 11:18:05 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1638980073; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc; bh=af7UUkQfwANXCH9PPiFH5Q1V8TxWCsTgXvJBilVgbwM=; b=C1yeA47Pl19DwDWK9J0cd3nxvFfmHuvK/ooHwSMNrcweGnpm1bjj3gUehKAgLkk16+WLgz 2+XhgOxDAAdIo/xvRpzzKN9Jx1y+LFAAPM26Gu5/kN8ysNPV1JNCPjshIEZrDhqd/f+gpM iwordcUgZvkrmM53ehV/b3CjsoUj/Sk= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-180-CY2N46IEOXKEznj3P8oSqg-1; Wed, 08 Dec 2021 11:14:32 -0500 X-MC-Unique: CY2N46IEOXKEznj3P8oSqg-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4729492500; Wed, 8 Dec 2021 16:14:31 +0000 (UTC) Received: from fuller.cnet (ovpn-112-3.gru2.redhat.com [10.97.112.3]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 37FA819C59; Wed, 8 Dec 2021 16:14:29 +0000 (UTC) Received: by fuller.cnet (Postfix, from userid 1000) id 470C8415EE6D; Wed, 8 Dec 2021 13:13:05 -0300 (-03) Message-ID: <20211208161000.865373817@fuller.cnet> User-Agent: quilt/0.66 Date: Wed, 08 Dec 2021 13:09:14 -0300 From: Marcelo Tosatti To: linux-kernel@vger.kernel.org Cc: Nitesh Lal , Nicolas Saenz Julienne , Frederic Weisbecker , Christoph Lameter , Juri Lelli , Peter Zijlstra , Alex Belits , Peter Xu , Thomas Gleixner , Daniel Bristot de Oliveira , Marcelo Tosatti Subject: [patch v8 08/10] KVM: x86: process isolation work from VM-entry code path X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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 #include +#include -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 tsk_isol_work) { do { int ret; @@ -26,14 +29,20 @@ static int xfer_to_guest_mode_work(struc if (ret) return ret; + if (tsk_isol_work) + isolation_exit_to_user_mode(); + ti_work = READ_ONCE(current_thread_info()->flags); - } while (ti_work & XFER_TO_GUEST_MODE_WORK || need_resched()); + tsk_isol_work = task_isol_has_work(); + } while (ti_work & XFER_TO_GUEST_MODE_WORK || need_resched() || + tsk_isol_work); return 0; } int xfer_to_guest_mode_handle_work(struct kvm_vcpu *vcpu) { unsigned long ti_work; + unsigned long tsk_isol_work; /* * This is invoked from the outer guest loop with interrupts and @@ -44,9 +53,10 @@ int xfer_to_guest_mode_handle_work(struc * to disable interrupts here. */ ti_work = READ_ONCE(current_thread_info()->flags); - if (!(ti_work & XFER_TO_GUEST_MODE_WORK)) + tsk_isol_work = task_isol_has_work(); + if (!((ti_work & XFER_TO_GUEST_MODE_WORK) || tsk_isol_work)) return 0; - return xfer_to_guest_mode_work(vcpu, ti_work); + return xfer_to_guest_mode_work(vcpu, ti_work, tsk_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 #include #include +#include /* 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_ONCE(current_thread_info()->flags); + unsigned long tsk_isol_work = task_isol_has_work(); - return !!(ti_work & XFER_TO_GUEST_MODE_WORK); + return !!((ti_work & XFER_TO_GUEST_MODE_WORK) || tsk_isol_work); } /**