From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.4 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,USER_AGENT_SANE_1 autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 22EEBCA9EA0 for ; Fri, 25 Oct 2019 16:26:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E762A205ED for ; Fri, 25 Oct 2019 16:26:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=alien8.de header.i=@alien8.de header.b="DnmXcTuG" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2505727AbfJYQ0v (ORCPT ); Fri, 25 Oct 2019 12:26:51 -0400 Received: from mail.skyhub.de ([5.9.137.197]:51640 "EHLO mail.skyhub.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2502714AbfJYQ0v (ORCPT ); Fri, 25 Oct 2019 12:26:51 -0400 Received: from zn.tnic (p200300EC2F0D3C00114ACBE854FF623C.dip0.t-ipconnect.de [IPv6:2003:ec:2f0d:3c00:114a:cbe8:54ff:623c]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.skyhub.de (SuperMail on ZX Spectrum 128k) with ESMTPSA id EC34C1EC0CE8; Fri, 25 Oct 2019 18:26:49 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alien8.de; s=dkim; t=1572020810; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:in-reply-to:in-reply-to: references:references; bh=QNBNQdarg0dpZLohqWeIybHPr4TLX6P1ivjz+W78+CM=; b=DnmXcTuGaBym1zEMBVWHXgE82fqZaXQ3+jXVHt8wA7J3TFThBKwlXqp5QfH0DkMQ32PwR9 wvjPkZ58XyV07bBK9xoacO4x3OmtjgZ1J2GKH9abz7nBwjVWw7258/GObXS9Ow4+uuZKJ7 c9I7hqwW0CGComP0MCM7YTa+cLO6qlY= Date: Fri, 25 Oct 2019 18:26:45 +0200 From: Borislav Petkov To: Sean Christopherson Cc: Thomas Gleixner , Ingo Molnar , x86@kernel.org, "H. Peter Anvin" , linux-kernel@vger.kernel.org, Paolo Bonzini , Radim =?utf-8?B?S3LEjW3DocWZ?= , Vitaly Kuznetsov , Wanpeng Li , Jim Mattson , kvm@vger.kernel.org Subject: Re: [PATCH v2 05/16] KVM: VMX: Drop initialization of IA32_FEATURE_CONTROL MSR Message-ID: <20191025162645.GE6483@zn.tnic> References: <20191021234632.32363-1-sean.j.christopherson@intel.com> <20191022000820.1854-1-sean.j.christopherson@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20191022000820.1854-1-sean.j.christopherson@intel.com> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Oct 21, 2019 at 05:08:20PM -0700, Sean Christopherson wrote: > + if (WARN_ON_ONCE(!(msr & FEATURE_CONTROL_LOCKED))) > + return 1; > + > + /* launched w/ TXT and VMX disabled */ > + if (!(msr & FEATURE_CONTROL_VMXON_ENABLED_INSIDE_SMX) && > + tboot_enabled()) > + return 1; > + /* launched w/o TXT and VMX only enabled w/ TXT */ > + if (!(msr & FEATURE_CONTROL_VMXON_ENABLED_OUTSIDE_SMX) && > + (msr & FEATURE_CONTROL_VMXON_ENABLED_INSIDE_SMX) && > + !tboot_enabled()) { > + pr_warn("kvm: disable TXT in the BIOS or " > + "activate TXT before enabling KVM\n"); > + return 1; Might as well fix that with a cleanup patch ontop: WARNING: quoted string split across lines #69: FILE: arch/x86/kvm/vmx/vmx.c:2208: + pr_warn("kvm: disable TXT in the BIOS or " + "activate TXT before enabling KVM\n"); Also in that same cleanup patch, if the order of those tests doesn't matter, you can simplify them a bit: if (tboot_enabled()) { /* msr flag test here */ /* tboot disabled */ } else { /* other two tests here */ } Should make it a bit easier to parse. -- Regards/Gruss, Boris. https://people.kernel.org/tglx/notes-about-netiquette