Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B82FEC4332F for ; Tue, 13 Dec 2022 06:09:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234410AbiLMGJ3 (ORCPT ); Tue, 13 Dec 2022 01:09:29 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46206 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234360AbiLMGJV (ORCPT ); Tue, 13 Dec 2022 01:09:21 -0500 Received: from mail-pg1-x54a.google.com (mail-pg1-x54a.google.com [IPv6:2607:f8b0:4864:20::54a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6290D1A3A0 for ; Mon, 12 Dec 2022 22:09:20 -0800 (PST) Received: by mail-pg1-x54a.google.com with SMTP id 7-20020a631547000000b00478959ba320so9054032pgv.19 for ; Mon, 12 Dec 2022 22:09:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=3rYplRUH90lferx/1QrjPQLbygHUDtj5qeJE1KQCTqc=; b=EI40B1d/Mbv8m0VRGcWzxsd7VuKCZkwAPkWVNlQv9uYdsZdudkMdcUKtlj3sz3lzDa LUEvap9m5gVbRVLArHGjcPy1pJ1T0m1vx5tGFB7nzLVu6AbFptybI8XxoFizChEiw11b Xluwh7PxOVZthsV34BGOkV0j7R35fZic+oWBLpklUUJMaeKQh0ePUgTdiBi1QwYG9uQ/ Y8VI8cc/xhlGHau44SRNm3GSt4rYlXVCNL1nR2HMxr47eALh9q6z3n65fdaXu06LCVWV HngCvPGCyXTRA5NAp54D7J80f9dtcUdssrAsbngPyX1B17IdPjhXDZyFtP0PwjqGOjP/ 5dlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=3rYplRUH90lferx/1QrjPQLbygHUDtj5qeJE1KQCTqc=; b=lKIrouPXc9zY37CQ7vPi7DvdVeRblXoBjMcm2uqQNpIKx1fxHIiq+FOKqISL/0Dkz+ DdKabQWjegNPcV9bnTesk8KLxwZM9Ko7eZFLnGW4m5ezQNE99jqKdsYp2W/+km/v5il3 9qjN3aPahKfI0F2IISv17xKJ3mLEzhRuqoKGS3m9xpFU4nYB6HOG88gFJXkzok/ED+uW pJ0Vap2b8qbGIrBminLM/0+fcFDoAHWsC7Kql8UslC6NiCuhlurN9FEm+nT/2PviN/ct 3r+kPrSAJ/Cyl96ERWLxGvgJBk3cZl8eh5VeLIrUke7lnPitOPPTGiJGgacRveRM8/H4 VfVw== X-Gm-Message-State: ANoB5pmAUbcrUCOyLHbhCQbY2FcgP78jhedEiMbGWhCCTyoWr1p3Gugo xWydCNz9YLcWFzQewwVApYu3IMejDJc= X-Google-Smtp-Source: AA0mqf59poWFoBEYN/ZqdGI/4uRVPx0JCk1L8iDLHBT4JiNXVR0fo+3paILjT1aP4fCgo/AxBSkuWshdn50= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a62:1991:0:b0:578:5559:d5a5 with SMTP id 139-20020a621991000000b005785559d5a5mr501316pfz.74.1670911759951; Mon, 12 Dec 2022 22:09:19 -0800 (PST) Reply-To: Sean Christopherson Date: Tue, 13 Dec 2022 06:09:07 +0000 In-Reply-To: <20221213060912.654668-1-seanjc@google.com> Mime-Version: 1.0 References: <20221213060912.654668-1-seanjc@google.com> X-Mailer: git-send-email 2.39.0.rc1.256.g54fd8350bd-goog Message-ID: <20221213060912.654668-3-seanjc@google.com> Subject: [PATCH 2/7] KVM: VMX: Allow VM-Fail path of VMREAD helper to be instrumented From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Peter Zijlstra , Andy Lutomirski , Thomas Gleixner Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Allow instrumentation in the VM-Fail path of __vmcs_readl() so that the helper can be used in noinstr functions, e.g. to get the exit reason in vmx_vcpu_enter_exit() in order to handle NMI VM-Exits in the noinstr section. While allowing instrumentation isn't technically safe, KVM has much bigger problems if VMREAD fails in a noinstr section. Note, all other VMX instructions also allow instrumentation in their VM-Fail paths for similar reasons, VMREAD was simply omitted by commit 3ebccdf373c2 ("x86/kvm/vmx: Move guest enter/exit into .noinstr.text") because VMREAD wasn't used in a noinstr section at the time. Signed-off-by: Sean Christopherson --- arch/x86/kvm/vmx/vmx_ops.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/x86/kvm/vmx/vmx_ops.h b/arch/x86/kvm/vmx/vmx_ops.h index 842dc898c972..5838489e719b 100644 --- a/arch/x86/kvm/vmx/vmx_ops.h +++ b/arch/x86/kvm/vmx/vmx_ops.h @@ -100,8 +100,10 @@ static __always_inline unsigned long __vmcs_readl(unsigned long field) return value; do_fail: + instrumentation_begin(); WARN_ONCE(1, "kvm: vmread failed: field=%lx\n", field); pr_warn_ratelimited("kvm: vmread failed: field=%lx\n", field); + instrumentation_end(); return 0; do_exception: -- 2.39.0.rc1.256.g54fd8350bd-goog