From patchwork Thu Apr 13 23:19:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 83128 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2726vqo; Thu, 13 Apr 2023 16:20:59 -0700 (PDT) X-Google-Smtp-Source: AKy350YCR5aaCP/faB6ZndnLwkr+MOMbfQtLeAyFTJ3ZJCGgOhQ4InBTR363M7TpfMtXGYEbNyqH X-Received: by 2002:a05:6a20:1592:b0:ec:8f81:e9f7 with SMTP id h18-20020a056a20159200b000ec8f81e9f7mr2751119pzj.16.1681428059727; Thu, 13 Apr 2023 16:20:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681428059; cv=none; d=google.com; s=arc-20160816; b=d2VRL7fYgvmdRVfIe9rl2QPjmKckt2jL880R5+mSMrrp/PulB9u8xKQK/hvLXMgwl8 Ay48k7kXokvoOdlHxp5SCFuUGpk4p3f/OZJ2YNYsi7PBhpPzC+QSnjPv3TBa+VRP0F5O eLjxloKfLdymuvTClKmy5pYs0uUlgDo/sDikqQb/OnSUy9OLSaNOM1UO55hlJxl47sJk 5+f9sP7OMSiMcylx5SAeQ0ZROwYGxnSY4Z+oCOKmg+nRA4/+wogdMZ486iidmh+2fpkd baOMJXcjYB6NPXF1Cl6KQCJ8CHYEgNP2KvwT45UHeZL4grteRshT9OhynML6jrw8hr5N e+Cw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:reply-to:dkim-signature; bh=76AH6jeC0zUFc6RLhtB1VloLSMnKdwxfmQWgPXRFScc=; b=OcoEN5qJlsJsioxTd2xLl/tw53kKVyWL5SLHc4TbAWyCzhnQkqnZ+r+5sN3K38NsQU l7Raui5QAKiy/UJxq54ABctpFgSdJ8yTqiTxcsdsOiPKMJqK69eccqSb7KbGiucPIBxd vMCcGk2UIeKQENWjLO89mCV3Lf540XvIqINo4p+daconLFlT94wNow8qeOxd4NEdJvdn V8Y7Auyw4w91eyJFHNc1fnHkb7KzTCYo68H1iP5zxEQkYKjc8uNIEueZGpdjDtl5NqfO xZKazyf/itf1pvotsFqHLCm/bF0ik90YaVpK+VP69Mp0CFWHIyfgvhr79DxDj7PjT+0f Z7FA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=3JkngVwk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l28-20020a63571c000000b0050fa7d26537si2963017pgb.601.2023.04.13.16.20.46; Thu, 13 Apr 2023 16:20:59 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=3JkngVwk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231247AbjDMXUC (ORCPT + 99 others); Thu, 13 Apr 2023 19:20:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52474 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231229AbjDMXTm (ORCPT ); Thu, 13 Apr 2023 19:19:42 -0400 Received: from mail-yw1-x1149.google.com (mail-yw1-x1149.google.com [IPv6:2607:f8b0:4864:20::1149]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 21C49448B for ; Thu, 13 Apr 2023 16:19:21 -0700 (PDT) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-54fba72c1adso41530057b3.18 for ; Thu, 13 Apr 2023 16:19:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1681427960; x=1684019960; 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=76AH6jeC0zUFc6RLhtB1VloLSMnKdwxfmQWgPXRFScc=; b=3JkngVwkuZE/YTh1waUy7PTk9n/XgQp4TSQpXmwlB49LWxI9cPN/uXZJfO1L1Yqjd6 G/rjeCDaxoAW+0UbA87uVs+Op/nA46kVZQXvMq/nMpKkafrk7o7DleSB/h9FZJAZ05fT 5Swu9qAWOMPKj1IY04zyyF0AppbMGDiOa2NXw9oLgauoBYlGxij0wA1TXOu3UwStSRxK 0EKIPdPvZyu0HKZvErkzoWOIgS3GS+dFVjYI1w23aCzxd0OiN0QkQVaWYMcO9+c8vC3w EsOtPYUbAjxFFbypNbMaYZ4Cni5hVFCgpkp57PAAS/rM6GqIbmhFViXB/7ZPIxF9Nzrx c+lg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681427960; x=1684019960; 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=76AH6jeC0zUFc6RLhtB1VloLSMnKdwxfmQWgPXRFScc=; b=bx2S54nTSgHdFLkTvuJu8s9LUBkkYUdfmoPxzMCPv7XSGRn+/+hYqcpFq7AxjhQwiK 4I7LPxn/ftC92Q+/l432Ixpp+jWnfik97q4EL3jBI1zXwSuw0CaXqtvP1V5L+Uf2B/9M AnqGL6EOySDpkLh8fvW38PL96ZgWskY5cVp5t+w04TwbAJGmgLzEqRDzKhGLjo1MbpIG 0VS38wnBUrHHjoWsiLNI7axJvz8psL3BO6d6cBX9+Q4dzqWwj1K9QwuWqoIzj3jdZ3Jj vznro+dBiHeVy2Sa/+cwMO1zCLOVhLckGkTLjZP6C+1ncIryWbmb7uTp6ZNRE4vA9mwl Abnw== X-Gm-Message-State: AAQBX9cycQ0yZyKoeu7m9MkQeL7xkmW/jnfXCwIo5qPiLk8Ed3J+B9C5 QascGN1onGULDan9ZtRwSE9leRAAvN4= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a25:cc05:0:b0:b8b:eea7:525a with SMTP id l5-20020a25cc05000000b00b8beea7525amr2052763ybf.7.1681427960466; Thu, 13 Apr 2023 16:19:20 -0700 (PDT) Reply-To: Sean Christopherson Date: Thu, 13 Apr 2023 16:19:14 -0700 In-Reply-To: <20230413231914.1482782-1-seanjc@google.com> Mime-Version: 1.0 References: <20230413231914.1482782-1-seanjc@google.com> X-Mailer: git-send-email 2.40.0.634.g4ca3ef3211-goog Message-ID: <20230413231914.1482782-3-seanjc@google.com> Subject: [PATCH 2/2] KVM: VMX: Use proper accessor to read guest CR4 in handle_desc() From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Robert Hoo X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1763105109603663274?= X-GMAIL-MSGID: =?utf-8?q?1763105109603663274?= Use kvm_is_cr4_bit_set() to read guest CR4.UMIP when sanity checking that a descriptor table VM-Exit occurs if and only if guest.CR4.UMIP=1. UMIP can't be guest-owned, i.e. using kvm_read_cr4_bits() to decache guest- owned bits isn't strictly necessary, but eliminating raw reads of vcpu->arch.cr4 is desirable as it makes it easy to visually audit KVM for correctness. Opportunistically add a compile-time assertion that UMIP isn't guest-owned as letting the guest own UMIP isn't compatible with emulation (or any CR4 bit that is emulated by KVM). Opportunistically change the WARN_ON() to a ONCE variant. When the WARN fires, it fires _a lot_, and spamming the kernel logs ends up doing more harm than whatever led to KVM's unnecessary emulation. Reported-by: Robert Hoo Link: https://lore.kernel.org/all/20230310125718.1442088-4-robert.hu@intel.com Signed-off-by: Sean Christopherson --- arch/x86/kvm/vmx/vmx.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c index 57464c762c79..f0975e790f7f 100644 --- a/arch/x86/kvm/vmx/vmx.c +++ b/arch/x86/kvm/vmx/vmx.c @@ -5402,7 +5402,13 @@ static int handle_set_cr4(struct kvm_vcpu *vcpu, unsigned long val) static int handle_desc(struct kvm_vcpu *vcpu) { - WARN_ON(!(vcpu->arch.cr4 & X86_CR4_UMIP)); + /* + * UMIP emulation relies on intercepting writes to CR4.UMIP, i.e. this + * and other code needs to be updated if UMIP can be guest owned. + */ + BUILD_BUG_ON(KVM_POSSIBLE_CR4_GUEST_BITS & X86_CR4_UMIP); + + WARN_ON_ONCE(!kvm_is_cr4_bit_set(vcpu, X86_CR4_UMIP)); return kvm_emulate_instruction(vcpu, 0); }