From patchwork Tue Oct 25 12:42:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Levitsky X-Patchwork-Id: 10740 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp983758wru; Tue, 25 Oct 2022 05:46:56 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4FxDuqbBKeWVdIME3dVjCkU7BBWkGgZgs2gQeosP2xw+j8k1isXexKNB+uxUI7mwWSzV7r X-Received: by 2002:a17:906:ee88:b0:78d:1a9a:b2db with SMTP id wt8-20020a170906ee8800b0078d1a9ab2dbmr32205184ejb.225.1666702015746; Tue, 25 Oct 2022 05:46:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666702015; cv=none; d=google.com; s=arc-20160816; b=rwpmsH6An3+qZ1EnH+B4IZ6S9NR38A9EqnQE8ZKl+zk0OLqmN4YSN3ZK9gokdgxy1t t7F9oaP64ZBiyJHfj3hqGncZith3q1LdxFA6fQDvaneIR7ExTPfKqOF2bpeeP9nYEytm PLvcBWeClYieswQ3bRhGpDT6YD6qZTlyFFMcAqooq2ady47ZTl+1E8ecCGkSE24geYov xMwVOKjkiXN8fCau4QqMNh8l9YyQCXF96qvOVzpOzmdtY5DoJD05luCgbV4Uy7ZN3ZbJ hvlWBSszNWEOm1LiaF+/qNcxerEaW775gT+d+Vsx4R4AF73aDdLC+a5m7nWNlE/ZELNm YZQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=IkrTzU5rG8TBDhJXggqu3Ho3+X8GGbZwRVqLpyPTTs0=; b=CLJpxlWr5v4lgMLlQpYr8jSbwyccC7oWedgv/5o37cklI4l/ZopmhRKEx/9lyArwnd 4Poz/D8N9jXX9Wrx7J02YJyQ4PRzq6hJOr4AmW+bO3njFWWJCDcvhDSimA9HbPASARDg Hlgs9Tr3iefNhMKBwCn0htCG+8RLs2jyLyok4A/5ueR+pL43aeZld8jEK2eTyvSw12ze 06ttSEXoAZhjopvIrNWwp7dXNOorcXO+YgufnS/JHubZYfAOic+07iuXateO/mEHBRyN q4ZKLx+ZD3dxG069O1AduTsjsAciSL3JLRkWdYoTtkVrzWl4RDMhsjvZvXCNDPJrZUxh SDcw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=i80AaMb8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y6-20020a056402358600b0045b265a1712si3293302edc.595.2022.10.25.05.46.31; Tue, 25 Oct 2022 05:46:55 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=i80AaMb8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 S231379AbiJYMoj (ORCPT + 99 others); Tue, 25 Oct 2022 08:44:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40530 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232163AbiJYMnz (ORCPT ); Tue, 25 Oct 2022 08:43:55 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7A3F7190461 for ; Tue, 25 Oct 2022 05:43:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1666701793; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=IkrTzU5rG8TBDhJXggqu3Ho3+X8GGbZwRVqLpyPTTs0=; b=i80AaMb8PMxSsx0dQEsgI1kHPvqsiWMJfsXWt887yQT7xRHU410KJUcbjsbGXkQ40aw8Ul UwFmbhuj5JWukrfciaRPke+OLUfbQTczVOaHQz/3zv9dbbZdnR8qorxhnNgpehizbetCgR wGYODdY7t42+VaDfeZluj2YLZfHd2Ao= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-638-PM1bvPmSOxWnXe8PjSY2UQ-1; Tue, 25 Oct 2022 08:43:12 -0400 X-MC-Unique: PM1bvPmSOxWnXe8PjSY2UQ-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id AD5723833289; Tue, 25 Oct 2022 12:43:11 +0000 (UTC) Received: from amdlaptop.tlv.redhat.com (dhcp-4-238.tlv.redhat.com [10.35.4.238]) by smtp.corp.redhat.com (Postfix) with ESMTP id 59AA320290A2; Tue, 25 Oct 2022 12:43:08 +0000 (UTC) From: Maxim Levitsky To: kvm@vger.kernel.org Cc: Paolo Bonzini , Yang Zhong , linux-kselftest@vger.kernel.org, Kees Cook , Borislav Petkov , Guang Zeng , Wanpeng Li , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Maxim Levitsky , Joerg Roedel , linux-kernel@vger.kernel.org, Wei Wang , Jim Mattson , Dave Hansen , Sean Christopherson , Vitaly Kuznetsov , x86@kernel.org, Shuah Khan Subject: [PATCH v4 12/23] KVM: x86: emulator: update the emulation mode after rsm Date: Tue, 25 Oct 2022 15:42:12 +0300 Message-Id: <20221025124223.227577-13-mlevitsk@redhat.com> In-Reply-To: <20221025124223.227577-1-mlevitsk@redhat.com> References: <20221025124223.227577-1-mlevitsk@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747663732680789550?= X-GMAIL-MSGID: =?utf-8?q?1747663732680789550?= Update the emulation mode after RSM so that RIP will be correctly written back, because the RSM instruction can switch the CPU mode from 32 bit (or less) to 64 bit. This fixes a guest crash in case the #SMI is received while the guest runs a code from an address > 32 bit. Signed-off-by: Maxim Levitsky --- arch/x86/kvm/emulate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c index c65f57b6da9bf1..2c56d08b426065 100644 --- a/arch/x86/kvm/emulate.c +++ b/arch/x86/kvm/emulate.c @@ -2315,7 +2315,7 @@ static int em_rsm(struct x86_emulate_ctxt *ctxt) if (ctxt->ops->leave_smm(ctxt)) ctxt->ops->triple_fault(ctxt); - return X86EMUL_CONTINUE; + return emulator_recalc_and_set_mode(ctxt); } static void