From nobody Sun May 19 10:01:26 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1595514477; cv=none; d=zohomail.com; s=zohoarc; b=adStbXuA/yUZXuSnTIZGv56R4hnBPx17g6eLZEAr+3GWKTNKEIdjf0RCQ1Edkj/aQLOJBW3UJ4Zwu8r5XFZfV/hKyepEijSrQsboxca4y/DlkJ5LSJzIAjR/RgkqUAkZSP+Z3TVuXZXKYueF0To7dFlhuEjUnLbr3EsWA0GLD6M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1595514477; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=SbiK5khyVMBu78/mEyApTcqJIqrCQgVVgiOOhaI9VrU=; b=KQ3SfOgniLJJRIkJ0rKchsVxKp/zKdJ39ofaO8KyER3wrgIhwb87uVJMS17HYWau58xEkbMuXv+F7wS0bOKkV1TXUi8x5734IJVvg0jng0PE4qprP+0FN55IWNDddLBYQjjSdXMuwutQjAF7pmwD9wb42CILUvJTwzLymkc+mc0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1595514477020556.526836607075; Thu, 23 Jul 2020 07:27:57 -0700 (PDT) Received: from localhost ([::1]:42228 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jycCR-0006OH-78 for importer@patchew.org; Thu, 23 Jul 2020 10:27:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45104) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jycBl-0005un-MS for qemu-devel@nongnu.org; Thu, 23 Jul 2020 10:27:13 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:26262 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jycBi-0006ua-SD for qemu-devel@nongnu.org; Thu, 23 Jul 2020 10:27:12 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-390-1wggAiB-PKW_8A4ymTirXw-1; Thu, 23 Jul 2020 10:27:07 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A991F185BE06; Thu, 23 Jul 2020 14:27:05 +0000 (UTC) Received: from vitty.brq.redhat.com (unknown [10.40.195.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 66E9075558; Thu, 23 Jul 2020 14:27:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1595514429; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SbiK5khyVMBu78/mEyApTcqJIqrCQgVVgiOOhaI9VrU=; b=Ha9sQUbcpfpQhRJ5ZvFY+FBBlxLHsrKzi1gRXd4q74qwvyuHgcSWXuFgUhqbk9Ksytin5K z/SzFAmVtr+tTZXLusQ8JpYkAKHSDQHa9CFuVCXZ58CzQ6kj+WNTPxf2IQZJuo25jTWOBk xEypVrSh7tND806Ec0boThPjwKlvEQM= X-MC-Unique: 1wggAiB-PKW_8A4ymTirXw-1 From: Vitaly Kuznetsov To: qemu-devel@nongnu.org Subject: [PATCH] KVM: fix CPU reset wrt HF2_GIF_MASK Date: Thu, 23 Jul 2020 16:27:01 +0200 Message-Id: <20200723142701.2521161-1-vkuznets@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=205.139.110.120; envelope-from=vkuznets@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/23 06:04:25 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eduardo Habkost , Jan Kiszka , Marcelo Tosatti , "Dr. David Alan Gilbert" , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" HF2_GIF_MASK is set in env->hflags2 unconditionally on CPU reset (see x86_cpu_reset()) but when calling KVM_SET_NESTED_STATE, KVM_STATE_NESTED_GIF_SET is only valid for nSVM as e.g. nVMX code looks like if (kvm_state->hdr.vmx.vmxon_pa =3D=3D -1ull) { if (kvm_state->flags & ~KVM_STATE_NESTED_EVMCS) return -EINVAL; } Also, when adjusting the environment after KVM_GET_NESTED_STATE we need not reset HF2_GIF_MASK on VMX as e.g. x86_cpu_pending_interrupt() expects it to be set. Alternatively, we could've made env->hflags2 SVM-only. Reported-by: Jan Kiszka Fixes: b16c0e20c742 ("KVM: add support for AMD nested live migration") Signed-off-by: Vitaly Kuznetsov Tested-by: Jan Kiszka --- target/i386/kvm.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/target/i386/kvm.c b/target/i386/kvm.c index 2b6b7443d273..3c4647fbfbf6 100644 --- a/target/i386/kvm.c +++ b/target/i386/kvm.c @@ -3883,7 +3883,9 @@ static int kvm_put_nested_state(X86CPU *cpu) } else { env->nested_state->flags &=3D ~KVM_STATE_NESTED_GUEST_MODE; } - if (env->hflags2 & HF2_GIF_MASK) { + + /* Don't set KVM_STATE_NESTED_GIF_SET on VMX as it is illegal */ + if (cpu_has_svm(env) && (env->hflags2 & HF2_GIF_MASK)) { env->nested_state->flags |=3D KVM_STATE_NESTED_GIF_SET; } else { env->nested_state->flags &=3D ~KVM_STATE_NESTED_GIF_SET; @@ -3925,10 +3927,14 @@ static int kvm_get_nested_state(X86CPU *cpu) } else { env->hflags &=3D ~HF_GUEST_MASK; } - if (env->nested_state->flags & KVM_STATE_NESTED_GIF_SET) { - env->hflags2 |=3D HF2_GIF_MASK; - } else { - env->hflags2 &=3D ~HF2_GIF_MASK; + + /* Keep HF2_GIF_MASK set on !SVM as x86_cpu_pending_interrupt() needs = it */ + if (cpu_has_svm(env)) { + if (env->nested_state->flags & KVM_STATE_NESTED_GIF_SET) { + env->hflags2 |=3D HF2_GIF_MASK; + } else { + env->hflags2 &=3D ~HF2_GIF_MASK; + } } =20 return ret; --=20 2.25.4