From patchwork Tue Mar 27 02:12:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Wanpeng Li X-Patchwork-Id: 10309133 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D5E1560325 for ; Tue, 27 Mar 2018 02:13:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C264B28FE6 for ; Tue, 27 Mar 2018 02:13:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B719929039; Tue, 27 Mar 2018 02:13:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 75D2C28FE6 for ; Tue, 27 Mar 2018 02:13:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752360AbeC0CNL (ORCPT ); Mon, 26 Mar 2018 22:13:11 -0400 Received: from mail-pl0-f65.google.com ([209.85.160.65]:42204 "EHLO mail-pl0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752266AbeC0CNI (ORCPT ); Mon, 26 Mar 2018 22:13:08 -0400 Received: by mail-pl0-f65.google.com with SMTP id g20-v6so1895444plo.9; Mon, 26 Mar 2018 19:13:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=a3NKH9xgwcs8FoJsri5F8+AO8CIZmVDXYAPvFliPh2w=; b=iNSjnpUPSkVo2FFLBiahs6tNuc7wHjl1RVLO9KEldTK9NGUrXQfIiaUPViAenhD+2k o6PAw0EezErhSoKUNcbBrWhRh2q7QV2vxnPUiKSRI7cKushJN5lI4R2qkMYlL8K6J94P VH3RKYK92vcHBUS6MKP7o7IfabyMjjEHELAy7jE6ptBG/vjRt/qm9Y7qrDPNVDI+wlWF Q4z0bTZJ1ZmGSA/dWu4aEnjtVlqnVybVhGaCFAumbBn8sr93P29jYZu4kORrKoevk20L jCuX1p74Zo9li+KJXXz6AR+RG4wW7MkZqhJyevVH/sYbd62iK7Lwm2xPo5W/0TpaII6b EXyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=a3NKH9xgwcs8FoJsri5F8+AO8CIZmVDXYAPvFliPh2w=; b=UEg09CBCsWYh0F6JFlkyQmFrOm4vYyqFuqLHYFJuq4S6bUigYaM5TLfPO6PkJl7Oq2 4HJuwIjehOpUMZ+Ks4g1kQxT2ZHvAwbhZhH0rWdJ8tq84KXbLCsPud1U++9BJJOXMWTg 6uGPCyZBnLxdNXrgHXGX+SnxKUn8Ar7fXTCZbhlOL1xYOw0acLtORpu45mODrtyB/9yd 1yKVCtZyGILvTFWjonw2nV30R0EAP0dEB26JRy5WP53c4o1bjTp5I4lpD8zt2qGuT91o ZnuMZ5WbQFnTXtP5vnUxPKBTGZOCu5QP6be/z1bh9fL3PhBoRrgskWApNsV3P1Zfo9lt kwkQ== X-Gm-Message-State: AElRT7GISctogXpb9e/WmF8W9cvGtEOi0nxZFiB+6mRRMTIRfVu0QYwu 6ZM09+bpcmVnT00UqinDg3nmFg== X-Google-Smtp-Source: AG47ELuh4tHbcHJmjBfwzxs/rCpfhVMxQ8FCeECOsnN2OE4cQpoLEVUVXE6826pC+UG0j0dJ/33iEA== X-Received: by 2002:a17:902:684:: with SMTP id 4-v6mr43722380plh.262.1522116788326; Mon, 26 Mar 2018 19:13:08 -0700 (PDT) Received: from localhost.localdomain ([203.205.141.123]) by smtp.googlemail.com with ESMTPSA id k3sm148607pgq.35.2018.03.26.19.13.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 26 Mar 2018 19:13:07 -0700 (PDT) From: Wanpeng Li X-Google-Original-From: Wanpeng Li To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: Paolo Bonzini , =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= , Andrew Cooper Subject: [PATCH 1/2] KVM: VMX: Introduce handle_ud() Date: Mon, 26 Mar 2018 19:12:14 -0700 Message-Id: <1522116735-4861-2-git-send-email-wanpengli@tencent.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1522116735-4861-1-git-send-email-wanpengli@tencent.com> References: <1522116735-4861-1-git-send-email-wanpengli@tencent.com> MIME-Version: 1.0 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Wanpeng Li Introduce handle_ud() to handle invalid opcode, this function will be used by later patches. Cc: Paolo Bonzini Cc: Radim Krčmář Cc: Andrew Cooper Signed-off-by: Wanpeng Li Reviewed-by: Konrad Rzeszutek Wilk --- arch/x86/kvm/vmx.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 9bc05f5..0f99833 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -6215,6 +6215,18 @@ static int handle_machine_check(struct kvm_vcpu *vcpu) return 1; } +static int handle_ud(struct kvm_vcpu *vcpu) +{ + enum emulation_result er; + + er = emulate_instruction(vcpu, EMULTYPE_TRAP_UD); + if (er == EMULATE_USER_EXIT) + return 0; + if (er != EMULATE_DONE) + kvm_queue_exception(vcpu, UD_VECTOR); + return 1; +} + static int handle_exception(struct kvm_vcpu *vcpu) { struct vcpu_vmx *vmx = to_vmx(vcpu); @@ -6233,14 +6245,8 @@ static int handle_exception(struct kvm_vcpu *vcpu) if (is_nmi(intr_info)) return 1; /* already handled by vmx_vcpu_run() */ - if (is_invalid_opcode(intr_info)) { - er = emulate_instruction(vcpu, EMULTYPE_TRAP_UD); - if (er == EMULATE_USER_EXIT) - return 0; - if (er != EMULATE_DONE) - kvm_queue_exception(vcpu, UD_VECTOR); - return 1; - } + if (is_invalid_opcode(intr_info)) + return handle_ud(vcpu); error_code = 0; if (intr_info & INTR_INFO_DELIVER_CODE_MASK)