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 X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 68490C433E1 for ; Fri, 19 Jun 2020 14:56:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3D405217D8 for ; Fri, 19 Jun 2020 14:56:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592578577; bh=GibQffaZiT5SahzB4RVbVR61djiqNgKqwWI9cX+EDJw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ShMEnjs1I6MVqlXnrXlN2RHT4IoPQBEcdxLaJiAJY0vOuEsDS/r4nfSVZOSiUj9lD ub/9/YqWx5frTbCzy7rgnf5vr2UKOP1Na621Glv4tXYslVpLkm+iOgxch7QI7hME47 gBPLwGapBbsZLeBph9t9fnrp6Cn21jw6nk9VAxy0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390047AbgFSO4L (ORCPT ); Fri, 19 Jun 2020 10:56:11 -0400 Received: from mail.kernel.org ([198.145.29.99]:51154 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390045AbgFSO4K (ORCPT ); Fri, 19 Jun 2020 10:56:10 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C035C2184D; Fri, 19 Jun 2020 14:56:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592578570; bh=GibQffaZiT5SahzB4RVbVR61djiqNgKqwWI9cX+EDJw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oiTBFrxVBSj8SGUPUJMV0jQ8VJefVpuz8TMh9JA1O7s/BzECYBjxF4bQIwmtLF2dB 93Rd9whAAi4FRwu4S18t3wQJeAMjucbUnx4ZCAK/zQA123xS+L4NenEfrBbtmwMJOF OIyTavOPXjMFzItYS3hvEsjUOQ1n9YQ3HsNFAxQE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Paolo Bonzini Subject: [PATCH 4.19 072/267] KVM: nSVM: leave ASID aside in copy_vmcb_control_area Date: Fri, 19 Jun 2020 16:30:57 +0200 Message-Id: <20200619141652.354659631@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200619141648.840376470@linuxfoundation.org> References: <20200619141648.840376470@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Paolo Bonzini commit 6c0238c4a62b3a0b1201aeb7e33a4636d552a436 upstream. Restoring the ASID from the hsave area on VMEXIT is wrong, because its value depends on the handling of TLB flushes. Just skipping the field in copy_vmcb_control_area will do. Cc: stable@vger.kernel.org Signed-off-by: Paolo Bonzini Signed-off-by: Greg Kroah-Hartman --- arch/x86/kvm/svm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c @@ -3319,7 +3319,7 @@ static inline void copy_vmcb_control_are dst->iopm_base_pa = from->iopm_base_pa; dst->msrpm_base_pa = from->msrpm_base_pa; dst->tsc_offset = from->tsc_offset; - dst->asid = from->asid; + /* asid not copied, it is handled manually for svm->vmcb. */ dst->tlb_ctl = from->tlb_ctl; dst->int_ctl = from->int_ctl; dst->int_vector = from->int_vector;