From patchwork Fri Oct 12 11:38:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kleber Sacilotto de Souza X-Patchwork-Id: 982996 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42Wm721J4Rz9s55; Fri, 12 Oct 2018 22:38:22 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1gAvlk-0001Uc-89; Fri, 12 Oct 2018 11:38:12 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1gAvlj-0001UP-9u for kernel-team@lists.ubuntu.com; Fri, 12 Oct 2018 11:38:11 +0000 Received: from mail-wr1-f69.google.com ([209.85.221.69]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1gAvlj-0006fy-2M for kernel-team@lists.ubuntu.com; Fri, 12 Oct 2018 11:38:11 +0000 Received: by mail-wr1-f69.google.com with SMTP id j90-v6so7576026wrj.20 for ; Fri, 12 Oct 2018 04:38:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=CNVoGXBv+JHIVe5gE255pXOvCHU8XgnPquazVTgxWf0=; b=CB4rP09HSlfa8gnCHsLkQCJBbOt/F6g6SbakftwHqEr1TlgzJ9DnvfG2WeQ6beBG47 V0Mr3TrnAlvykvLwGeyY+KtYQNDDaeXAFnhmTZRgrM74hdk1TIvEBuur2zb7TiToAuq+ VOgzAlAyq/r8GJdzmRkBNUVAROfTFeRYOoXBd3DRpT+/s+vja9BglNzqcbL3r58yn73f Fo7zOu+ROrF7Fk1/ug0pJyglIlYkTk6CI/jUGV/etIvm+GrfN1RBaRXqQi6WOoOynzTj gqv9X/up3+vV9xgjWKncqNHpyUmCuzcdunR2tLSmhffneMV32UGp6Tzpl64WRHWycqHy /YQQ== X-Gm-Message-State: ABuFfog4+5ORPGJczSic+0THf4LDwJp/Vm94KBtmoa+rXjdmWnfvTQnE G0RH/pN7cLtGwfyN5SyI+QLfLOchLwIDM59/8WMGetCxuRM81y2gDhnmdqjVdreVzLBNXtbq9/O 2jfuvklOSbULU/Y0FX4IVyAn2EmiOJlS6JVVqHIbdxg== X-Received: by 2002:a5d:4488:: with SMTP id j8-v6mr5235143wrq.236.1539344290435; Fri, 12 Oct 2018 04:38:10 -0700 (PDT) X-Google-Smtp-Source: ACcGV62Y2ueiJWKEvwdPWUM3WZuyg83tGgMIlGJb6d2WMzyEpBJZxfZvNJuiPPyw5PaTWF3EpPwTeQ== X-Received: by 2002:a5d:4488:: with SMTP id j8-v6mr5235125wrq.236.1539344290157; Fri, 12 Oct 2018 04:38:10 -0700 (PDT) Received: from localhost ([212.121.131.210]) by smtp.gmail.com with ESMTPSA id u191-v6sm1086131wmd.31.2018.10.12.04.38.09 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 12 Oct 2018 04:38:09 -0700 (PDT) From: Kleber Sacilotto de Souza To: kernel-team@lists.ubuntu.com Subject: [SRU][Trusty][PATCH 1/1] kvm: nVMX: Allow L1 to intercept software exceptions (#BP and #OF) Date: Fri, 12 Oct 2018 13:38:06 +0200 Message-Id: <20181012113806.7483-2-kleber.souza@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181012113806.7483-1-kleber.souza@canonical.com> References: <20181012113806.7483-1-kleber.souza@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Jim Mattson When L2 exits to L0 due to "exception or NMI", software exceptions (#BP and #OF) for which L1 has requested an intercept should be handled by L1 rather than L0. Previously, only hardware exceptions were forwarded to L1. Signed-off-by: Jim Mattson Cc: stable@vger.kernel.org Signed-off-by: Paolo Bonzini CVE-2016-9588 (backported from commit ef85b67385436ddc1998f45f1d6a210f935b3388) Signed-off-by: Kleber Sacilotto de Souza Acked-by: Stefan Bader --- arch/x86/kvm/vmx.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index b5e7c586c878..76286508ad9b 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -1217,10 +1217,10 @@ static inline int nested_cpu_has_ept(struct vmcs12 *vmcs12) return nested_cpu_has2(vmcs12, SECONDARY_EXEC_ENABLE_EPT); } -static inline bool is_exception(u32 intr_info) +static inline bool is_nmi(u32 intr_info) { return (intr_info & (INTR_INFO_INTR_TYPE_MASK | INTR_INFO_VALID_MASK)) - == (INTR_TYPE_HARD_EXCEPTION | INTR_INFO_VALID_MASK); + == (INTR_TYPE_NMI_INTR | INTR_INFO_VALID_MASK); } static void nested_vmx_vmexit(struct kvm_vcpu *vcpu, u32 exit_reason, @@ -4949,7 +4949,7 @@ static int handle_exception(struct kvm_vcpu *vcpu) if (is_machine_check(intr_info)) return handle_machine_check(vcpu); - if ((intr_info & INTR_INFO_INTR_TYPE_MASK) == INTR_TYPE_NMI_INTR) + if (is_nmi(intr_info)) return 1; /* already handled by vmx_vcpu_run() */ if (is_no_device(intr_info)) { @@ -6853,7 +6853,7 @@ static bool nested_vmx_exit_handled(struct kvm_vcpu *vcpu) switch (exit_reason) { case EXIT_REASON_EXCEPTION_NMI: - if (!is_exception(intr_info)) + if (is_nmi(intr_info)) return 0; else if (is_page_fault(intr_info)) return enable_ept; @@ -7264,8 +7264,7 @@ static void vmx_complete_atomic_exit(struct vcpu_vmx *vmx) kvm_machine_check(); /* We need to handle NMIs before interrupts are enabled */ - if ((exit_intr_info & INTR_INFO_INTR_TYPE_MASK) == INTR_TYPE_NMI_INTR && - (exit_intr_info & INTR_INFO_VALID_MASK)) { + if (is_nmi(exit_intr_info)) { kvm_before_handle_nmi(&vmx->vcpu); asm("int $2"); kvm_after_handle_nmi(&vmx->vcpu);