Received: by 2002:a25:868d:0:0:0:0:0 with SMTP id z13csp3713013ybk; Tue, 19 May 2020 11:09:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy9EhX6XNfZdqMPSE/esiI8YYYjULDvrULjoIMLyxakzw2UY/+NDbGQljJpJ9AjyTP4E10Y X-Received: by 2002:a50:d7c7:: with SMTP id m7mr163004edj.101.1589911776958; Tue, 19 May 2020 11:09:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1589911776; cv=none; d=google.com; s=arc-20160816; b=dfDbETglgRL14pl/TSDrrka5893JALjDsAMXkh9wOeYRlAjiCP0Bm58gTf8TNDiLGG IIwmR9GQ0SG3m2JSZ5ohhT0vttQV42vIUYbs+gIKgDzLVbIuM0VqQML+cGrmhMwKWZjV mehJeaC/IaEaUXFAjHsfsUPpCUkYS+WkrhyO5d/E1qRpKfylQfVAfStu9QR/84uF3lLQ dkTlIXAPt8ARx7pC3PNihCMwdDCqn55cNCYB/dcNsTCuY7FEv07VOmBV/QX7CTQLAQ3E haUCpuAxiwmzmfOJME786bGBahB7LmXw/dowpYaNBcXSESYNUzMWWkztauDTKHoKpv8s 3T7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature; bh=megtxqWXyglz/CqjKs2x/itHX3lBYfTYHJlMu70hZuI=; b=LuzdQD72ecX57nvPqmZbBDk2GMMrv0k72ES2JTB3YbWROGE4svWukTaZBAZpSOIb7c kd+UfHJd+6s1e4i71hafODyQYA07ByakIchuEmV970VbAt5MPZGetKiFGl3z9BAt+Wtu cwWmXg7GiwUAdqYgm6MEC/VLgsba1nfdKdPLLH7rXoHq8Wxgo9WUdVfVPEdDB6hfLz08 pTv0p94JWhpJcH3BOJrsnJ5gBzjXwWdvr0prY6yEXv8cnznMMdBQYwCzVnB79bGG/NyX aJnx+VkRcAKq+XPEoTGMtR9uga8DlttWGa4Ek1o73rg0im9IEYhnljGLBzeKg5iQVWUd Q6+g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=hpEnHFsZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id dc19si336964ejb.181.2020.05.19.11.09.14; Tue, 19 May 2020 11:09:36 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=hpEnHFsZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728822AbgESSHs (ORCPT + 99 others); Tue, 19 May 2020 14:07:48 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:45539 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726447AbgESSHs (ORCPT ); Tue, 19 May 2020 14:07:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589911667; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc; bh=megtxqWXyglz/CqjKs2x/itHX3lBYfTYHJlMu70hZuI=; b=hpEnHFsZWae2flxOrgbMzvuAA5joLJ2OsqLpVung+PRaqwsiILYJEmHdV9tZyCnORLjmfi EIW1WVZIBOwmmcU62gEDmI1q9eYxHrIQXCUL2QbqAqq2eKfrD+QKAu1QkSwKjkbxpHFDIp JCZIBcIKvmih9VvXt6qHvHwc+m+1CXM= 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-426-8zS8eI4HPqOnJYwKbtq5eQ-1; Tue, 19 May 2020 14:07:46 -0400 X-MC-Unique: 8zS8eI4HPqOnJYwKbtq5eQ-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id ECE9A107ACCA; Tue, 19 May 2020 18:07:44 +0000 (UTC) Received: from virtlab511.virt.lab.eng.bos.redhat.com (virtlab511.virt.lab.eng.bos.redhat.com [10.19.152.198]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6367410016EB; Tue, 19 May 2020 18:07:44 +0000 (UTC) From: Paolo Bonzini To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: oupton@google.com, stable@vger.kernel.org Subject: [PATCH] KVM: x86: allow KVM_STATE_NESTED_MTF_PENDING in kvm_state flags Date: Tue, 19 May 2020 14:07:43 -0400 Message-Id: <20200519180743.89974-1-pbonzini@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The migration functionality was left incomplete in commit 5ef8acbdd687 ("KVM: nVMX: Emulate MTF when performing instruction emulation", 2020-02-23), fix it. Fixes: 5ef8acbdd687 ("KVM: nVMX: Emulate MTF when performing instruction emulation") Cc: stable@vger.kernel.org Signed-off-by: Paolo Bonzini --- arch/x86/kvm/x86.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 4f55a44951c3..0001b2addc66 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -4626,7 +4626,7 @@ long kvm_arch_vcpu_ioctl(struct file *filp, if (kvm_state.flags & ~(KVM_STATE_NESTED_RUN_PENDING | KVM_STATE_NESTED_GUEST_MODE - | KVM_STATE_NESTED_EVMCS)) + | KVM_STATE_NESTED_EVMCS | KVM_STATE_NESTED_MTF_PENDING)) break; /* nested_run_pending implies guest_mode. */ -- 2.18.2