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 E847AC0015E for ; Fri, 21 Jul 2023 23:56:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230337AbjGUX4u (ORCPT ); Fri, 21 Jul 2023 19:56:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34260 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230233AbjGUX4q (ORCPT ); Fri, 21 Jul 2023 19:56:46 -0400 Received: from mail-pl1-x649.google.com (mail-pl1-x649.google.com [IPv6:2607:f8b0:4864:20::649]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0657F30E3 for ; Fri, 21 Jul 2023 16:56:46 -0700 (PDT) Received: by mail-pl1-x649.google.com with SMTP id d9443c01a7336-1b9de7951easo14448945ad.0 for ; Fri, 21 Jul 2023 16:56:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1689983805; x=1690588605; 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=/0/Ys3eyilWPWK3MFX3CavmjPp16nyypaJP3VylXGoU=; b=AozewlHZURPovNElQfoYDp0vUxJqneJqSpZ25EaH5FyAd+F6cPs+hMGzHxOByIMyyh cR4vkzvcesyxfxZklzBFTQTHJDnA+yJQFcZVLfCq4J4NTQ54Dhz1GxFvCBQ3OpazhV2t mSegV8J9RIDYTJTSxe1a/R9AdW0mwmzUwYjnECwhFQdQsvzipRK2PPsQOHcTNR2TuU2c OAT/p71pi2JxgYVyi3xGPONi9yWumb2uFjAJlqpu99GgiMhGvGZdUHVW9615aMaMV6Hg j2I0ZYUg4yYhysw5dsu3sD9dUF57v7H59Qf0FX55q7EB0U4nTm5c+T/MFN3AnMoClLaV Zd5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689983805; x=1690588605; 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=/0/Ys3eyilWPWK3MFX3CavmjPp16nyypaJP3VylXGoU=; b=VYIqPIOH5VCoOkZ7K7Th4rAYwplweoX7B7/ocNrNzR3CzmO8oTGayhfkk3ShPKPP6C nxsqUpZmEviAnc/EF9K3wO0koDF80lty4wkh0sUtqYw3OmKNSqOdz4yxZXHFx7nERJSA lcYi0nrXQFAAksq+rrThKSS5CuCrPFOVBDfEX4OabBNvz/UTXf7njYqmEjcu1f+iBRTI q6MD3RhlQDoJQmptE6GsGAlBdAsiRv3/YaIB1Sr0WaEjeGNOGOcjt6NKx2JJVQ3TmBuP 7035CHYJyWfBPVvVKrpcAYh50TScynGV1968dXaENR3o4ccYSlwpHPjcVyoO9OmX+NVl SdWg== X-Gm-Message-State: ABy/qLbSPhibCYcvlqcs/c3SlbTr3hfddo+NLOy7AN9gkERR7e5Ubx7V cuWk98upgPOaN6tbXGqZSiPofHyyBho= X-Google-Smtp-Source: APBJJlF9re/QfEiwtTvrQ2bbtlEB4e6P4b3U+Tw4dcVSuQCMsevPuEn/b6qzORLgenNlpOoqeUsTqJReT68= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a17:903:32cd:b0:1a6:4ce8:3ed5 with SMTP id i13-20020a17090332cd00b001a64ce83ed5mr13087plr.4.1689983805595; Fri, 21 Jul 2023 16:56:45 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 21 Jul 2023 16:56:37 -0700 In-Reply-To: <20230721235637.2345403-1-seanjc@google.com> Mime-Version: 1.0 References: <20230721235637.2345403-1-seanjc@google.com> X-Mailer: git-send-email 2.41.0.487.g6d72f3e995-goog Message-ID: <20230721235637.2345403-3-seanjc@google.com> Subject: [PATCH 2/2] KVM: VMX: Use vmread_error() to report VM-Fail in "goto" path From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Su Hui Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Use vmread_error() to report VM-Fail on VMREAD for the "asm goto" case, now that trampoline case has yet another wrapper around vmread_error() to play nice with instrumentation. Signed-off-by: Sean Christopherson --- arch/x86/kvm/vmx/vmx_ops.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/x86/kvm/vmx/vmx_ops.h b/arch/x86/kvm/vmx/vmx_ops.h index 5fa74779a37a..33af7b4c6eb4 100644 --- a/arch/x86/kvm/vmx/vmx_ops.h +++ b/arch/x86/kvm/vmx/vmx_ops.h @@ -108,8 +108,7 @@ static __always_inline unsigned long __vmcs_readl(unsigned long field) do_fail: instrumentation_begin(); - WARN_ONCE(1, KBUILD_MODNAME ": vmread failed: field=%lx\n", field); - pr_warn_ratelimited(KBUILD_MODNAME ": vmread failed: field=%lx\n", field); + vmread_error(field); instrumentation_end(); return 0; -- 2.41.0.487.g6d72f3e995-goog