From patchwork Thu May 11 23:33:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 92883 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp4738499vqo; Thu, 11 May 2023 16:44:30 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6RXm30aegwbmwoUxT4XnRtRjfsSZPyIUKnYjt4X+lzkBobaer5BCMcUldZSL+Mtrbccnud X-Received: by 2002:a05:6a20:9f90:b0:f2:f05f:6e9e with SMTP id mm16-20020a056a209f9000b000f2f05f6e9emr23055641pzb.29.1683848670445; Thu, 11 May 2023 16:44:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683848670; cv=none; d=google.com; s=arc-20160816; b=IKly/I41D6XCUO217wC+hfDgrv5JSarhG828RYLGS8Bj58l/uIgI2UmA0+JvRfBGux kOUta9AZeIUVmfyu5Mza1vT0xO32hA1xzo/tlI7FZeoQqm/SN5j3ZUVglS3i9taelCbm WJJoP0Fx/FUz/RWnO8fT4hIqFOhRVzOkmaGdXB9FD4oxDx33HG6rnqeSpR+85EbYerVp M1N9L9pjwdc5370zDMPa8nsJ4GtRcF6r92+Vlkv2/QbEqj+tK+pRaUIdwk9GtUqKM8Z3 P82tzMKEChLbeKHiedeeDeakoPM0h6sQZrxx87ynkWxizAamDRt5T0T07mxQsottNSsq AD5A== 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=kPIJozqKXpOav88tMQOfWStS9Qhm+Sc47i+elwuNCsI=; b=dGP3gWhqQjJUkduFsNeOFALhXY/V5ZeKzifDl/E7uTFCB/3ppF7VzSr32VC2Z7Q+Rb kQpCjgHe760IgOmi7+dxTYmkXnLQfdgBHAD/BNCoWd9qYs7FPsiDgM/aZGniOUdQNM6l laqbKfYgI8vYLMHHcpNUqnc4UUzU4Nv8AzJi8myGBXRQj5HVuH32GBcsZyd8Fw+5Qr4k TMtgtvRdfvugJS+pWOkzhK2SSt7IHaC4M8mxf60kLBQ6ADyoJzxJGsK+OzFULVylaMyD K/6nWojkIRT5GDxs5K/7iQ0Waq7oeVKWXhpKPfxdGb774uA8216fgJvrmfvyW8TUOqWR VtIA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=B086lI0n; 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 c186-20020a621cc3000000b0063b88d7c754si9021352pfc.210.2023.05.11.16.44.17; Thu, 11 May 2023 16:44:30 -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=B086lI0n; 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 S239609AbjEKXeI (ORCPT + 99 others); Thu, 11 May 2023 19:34:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40036 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239577AbjEKXeD (ORCPT ); Thu, 11 May 2023 19:34:03 -0400 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 AAE9865A4 for ; Thu, 11 May 2023 16:34:00 -0700 (PDT) Received: by mail-pg1-x54a.google.com with SMTP id 41be03b00d2f7-53017eb8b2eso5547426a12.0 for ; Thu, 11 May 2023 16:34:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1683848039; x=1686440039; 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=kPIJozqKXpOav88tMQOfWStS9Qhm+Sc47i+elwuNCsI=; b=B086lI0nSfRZjZS0qeaNeIB8DDth56jWhjosvQ9CDikIgaIEztFBmRseLITc0/8cEN sB4veeK84ZUL5joKqH6ggii054kSdHisLNq4Utk7jHhXp0af8TfzwZumClHUC8FvBk7J 8Mn7v2WRwzoXX4Dh8QgorX7R9KwtJzd8qEu11tgjrMJZT1ICpcVZXQQuwZRp3qdStBe0 dDug+R5w9hlsFahXiEhsS2LDD7b4TUG9NKTFAJYKWgj39cgoGsnveKJOxcyKQDYFaMEY dGTvrnwDnI8ragV8iJXBF8PH8pc4brBGGTDJKecp03K3pLmgEWeVo38MoVQ6c+QI63On 6/bQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683848039; x=1686440039; 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=kPIJozqKXpOav88tMQOfWStS9Qhm+Sc47i+elwuNCsI=; b=K1+QhBqOJhWYpahTBK12o69o4Q+OJaL7ZL64ypXAEeR0Yj5SbKBb9BXCFRsw+IWNrE A9NipQgFeo672OIgAmd1Mvr6I6/xqbZui42uijo6Zsj8dx3dIK29BhyWHrXusccqivuH l6P8/26FZeRuLdgUNbX8bYMbniiIByJ/F5md51MDlp36WrfacA+01uunX+5njRD98mJ/ j2brB4VupCJluzCuZnR65hcYXkBz6hTzOzLVJ5leuGmZ8Q7RiOKtCs6rzoWLy3ZsFGhP fDRIkTCFy9l6bnBlYSghS69Kenb7IVD/PFMZCvpnE9fQGkH8B/HXRuk/O6X4MpZwN4gW Uk7w== X-Gm-Message-State: AC+VfDw9aQSPEXJZOfEVcHAyHlhKXEdOza0vMBIw2zEoAjKnOfwZin9Y f207z6oqKziIz8g1o6TDZdXQjI16Evk= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a63:a1d:0:b0:530:8674:b4d5 with SMTP id 29-20020a630a1d000000b005308674b4d5mr676894pgk.12.1683848039669; Thu, 11 May 2023 16:33:59 -0700 (PDT) Reply-To: Sean Christopherson Date: Thu, 11 May 2023 16:33:46 -0700 In-Reply-To: <20230511233351.635053-1-seanjc@google.com> Mime-Version: 1.0 References: <20230511233351.635053-1-seanjc@google.com> X-Mailer: git-send-email 2.40.1.606.ga4b1b128d6-goog Message-ID: <20230511233351.635053-4-seanjc@google.com> Subject: [PATCH v2 3/8] KVM: x86: Add helper to query if variable MTRR MSR is base (versus mask) From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Kai Huang , Wenyao Hai , Ke Guo 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,T_SCC_BODY_TEXT_LINE,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?1765643303460493422?= X-GMAIL-MSGID: =?utf-8?q?1765643303460493422?= Add a helper to query whether a variable MTRR MSR is a base versus as mask MSR. Replace the unnecessarily complex math with a simple check on bit 0; base MSRs are even, mask MSRs are odd. Signed-off-by: Sean Christopherson --- arch/x86/kvm/mtrr.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/arch/x86/kvm/mtrr.c b/arch/x86/kvm/mtrr.c index 9fac1ec03463..f65ce4b3980f 100644 --- a/arch/x86/kvm/mtrr.c +++ b/arch/x86/kvm/mtrr.c @@ -25,6 +25,12 @@ #define IA32_MTRR_DEF_TYPE_FE (1ULL << 10) #define IA32_MTRR_DEF_TYPE_TYPE_MASK (0xff) +static bool is_mtrr_base_msr(unsigned int msr) +{ + /* MTRR base MSRs use even numbers, masks use odd numbers. */ + return !(msr & 0x1); +} + static bool msr_mtrr_valid(unsigned msr) { switch (msr) { @@ -342,10 +348,9 @@ static void set_var_mtrr_msr(struct kvm_vcpu *vcpu, u32 msr, u64 data) { struct kvm_mtrr *mtrr_state = &vcpu->arch.mtrr_state; struct kvm_mtrr_range *tmp, *cur; - int index, is_mtrr_mask; + int index; index = (msr - 0x200) / 2; - is_mtrr_mask = msr - 0x200 - 2 * index; cur = &mtrr_state->var_ranges[index]; /* remove the entry if it's in the list. */ @@ -356,7 +361,7 @@ static void set_var_mtrr_msr(struct kvm_vcpu *vcpu, u32 msr, u64 data) * Set all illegal GPA bits in the mask, since those bits must * implicitly be 0. The bits are then cleared when reading them. */ - if (!is_mtrr_mask) + if (is_mtrr_base_msr(msr)) cur->base = data; else cur->mask = data | kvm_vcpu_reserved_gpa_bits_raw(vcpu); @@ -418,11 +423,8 @@ int kvm_mtrr_get_msr(struct kvm_vcpu *vcpu, u32 msr, u64 *pdata) else if (msr == MSR_IA32_CR_PAT) *pdata = vcpu->arch.pat; else { /* Variable MTRRs */ - int is_mtrr_mask; - index = (msr - 0x200) / 2; - is_mtrr_mask = msr - 0x200 - 2 * index; - if (!is_mtrr_mask) + if (is_mtrr_base_msr(msr)) *pdata = vcpu->arch.mtrr_state.var_ranges[index].base; else *pdata = vcpu->arch.mtrr_state.var_ranges[index].mask;