From patchwork Thu May 11 23:33:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 92882 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp4738356vqo; Thu, 11 May 2023 16:44:07 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6p2frgQkGbMRBxqGNdhQVe58Mua5/E+lx2aH/djAo+i3gAq33wj8iTj8gon+0NnPk05vvi X-Received: by 2002:a05:6a20:a10c:b0:103:8643:f0c with SMTP id q12-20020a056a20a10c00b0010386430f0cmr6477878pzk.0.1683848647672; Thu, 11 May 2023 16:44:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683848647; cv=none; d=google.com; s=arc-20160816; b=B+zCY0uVbZgU1CA4Hfyr3F9gIyjNQ0HS8mDqfJ4F6ib3Fw1kJRw22sXKZAAYH+Zsna AbYr2QoCs9UIsnruPJbkSm2ncXEo70HuCpmlIfL0Y3hFFPrQh8hGUDEkJn20UwdkYjIB orW0lx3K5Wkxefmy6OVIfBabcA74scqHDSvmIZSTyuDEWZrBmPeRcVpW8biCf3nqlK+8 z0G5sBczM1Ae5rAN7KtTOQ2JCc6UUhbFNi3Lq9t/lSEJo2KqWTaCw8ufZIfh6Bi3NQ4T WhYDNhmh7BeHY1ZaMqN/b0yOSVc7M3vhsUyQuQF5/g0lBVlvu/qb4R7mjfWQE63mcAzL E/xQ== 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=iMwZebLgqrimvcRjxTfXs1dPRahEkXvBmYggFarwQK8=; b=IHf/6970PsxxBhtiA6IGftoy8TzTwvI8i4SyIc7iXgZdp78BN516OmguOGSowf9Gqe tTXXw7XI6bk3GvwHWIyidhGu6NaTRYz7q9DoAPlw6FTfuZ1B6P587A76wElgLmwj/uIr bNjkmhACUKwoBzSqxUd7+BVF+V59Q3amfZ+WuydP5W6Ym1g3wHzCksj8JU+TMjeSFDvX fD6r3PC5ktB2j/b1v1CE/IyHAwMEMkk34C43gzV1+sguWANMTICTB+Fw9iR223dkrJtT 6t4lxR45bYkfLqQmTl0q1HxEnE/r6c0RnjI+h2iTovXLc7DXLUYhQ2/VBiL7Zvfc2FBV 61KQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=6B1XJv4N; 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 t17-20020a639551000000b0050bd4b86169si7806673pgn.414.2023.05.11.16.43.55; Thu, 11 May 2023 16:44:07 -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=6B1XJv4N; 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 S239663AbjEKXe0 (ORCPT + 99 others); Thu, 11 May 2023 19:34:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40050 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239589AbjEKXeK (ORCPT ); Thu, 11 May 2023 19:34:10 -0400 Received: from mail-pf1-x44a.google.com (mail-pf1-x44a.google.com [IPv6:2607:f8b0:4864:20::44a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DC5F67DAA for ; Thu, 11 May 2023 16:34:06 -0700 (PDT) Received: by mail-pf1-x44a.google.com with SMTP id d2e1a72fcca58-643a1fed384so4792471b3a.3 for ; Thu, 11 May 2023 16:34:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1683848046; x=1686440046; 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=iMwZebLgqrimvcRjxTfXs1dPRahEkXvBmYggFarwQK8=; b=6B1XJv4N1xwFm9+hw3yUdlyIha5yGy5ism5usAmm7EBXKHEUSxlhvEuMjk30Ogb6/g OPwyvr1uYzs1afzyIN6AKaE+VoaJRpnxiqIVgwCSe3qpJLDAZ/caTCsZP1HDWtYpaDqF 5MajFgVb/NeKV08xJhzUy5dWZkSBb8oqSQh150nLBW/30x+CZrkAiptOJa1TuO00zExa Ki+4/RHftZI/v6X81Fuf9m0yL+VvVGLS+XMT7BxI2Xw5q/UW5sVKgsgFGjrfSW3plTtS ACrHIqyH0QRZ6rulFJHprnjG738oBMuikGZKQOcv92lB+NbZTlahrsPqhzDdeeMMJh+7 PaMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683848046; x=1686440046; 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=iMwZebLgqrimvcRjxTfXs1dPRahEkXvBmYggFarwQK8=; b=UfPO8hWFZ/vKA6lre4GcabVij6608S5ZzIRPPZKi8/98fqnDN183HhjAY+VWZuoq8L kmGH74SgoAXg4K2+dDLfJCajsbzzDwQlOgQRVIqIM+72Hhl8mPyZ7BAqQle6osjgOvZE HyykbkzFExrpXkFCdcxy9/7iI+AeN3MUOE53qzYxtxgCKAby7+eFC/URV2Cm5GwCCHgB D2p3DldQuzbi/8JruKUNkidNJ6DYn5CYfQWK/qzhu+FXbHazqw5yt7bDOmf0bxQG3nNM VnY1WYnfTW0eUOp9YYpCOSYDRXtEOzX6zZ6BTLFwc5DdX4POgYpM30oZpHKbictupfQl uM/w== X-Gm-Message-State: AC+VfDwqm06qJm38qAp3oKVdB82lwvlrXLqpgmtCpgArfylkEE3PNb1j t8FR5wg7HTDxkpDYauTaMVVoK65J2tI= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a05:6a00:7d6:b0:624:5886:4b4b with SMTP id n22-20020a056a0007d600b0062458864b4bmr5999295pfu.5.1683848046330; Thu, 11 May 2023 16:34:06 -0700 (PDT) Reply-To: Sean Christopherson Date: Thu, 11 May 2023 16:33:50 -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-8-seanjc@google.com> Subject: [PATCH v2 7/8] KVM: x86: Make kvm_mtrr_valid() static now that there are no external users 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?1765643279543448370?= X-GMAIL-MSGID: =?utf-8?q?1765643279543448370?= Make kvm_mtrr_valid() local to mtrr.c now that it's not used to check the validity of a PAT MSR value. Signed-off-by: Sean Christopherson Reviewed-by: Kai Huang --- arch/x86/kvm/mtrr.c | 3 +-- arch/x86/kvm/x86.h | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/arch/x86/kvm/mtrr.c b/arch/x86/kvm/mtrr.c index cdbbb511f940..3eb6e7f47e96 100644 --- a/arch/x86/kvm/mtrr.c +++ b/arch/x86/kvm/mtrr.c @@ -65,7 +65,7 @@ static bool valid_mtrr_type(unsigned t) return t < 8 && (1 << t) & 0x73; /* 0, 1, 4, 5, 6 */ } -bool kvm_mtrr_valid(struct kvm_vcpu *vcpu, u32 msr, u64 data) +static bool kvm_mtrr_valid(struct kvm_vcpu *vcpu, u32 msr, u64 data) { int i; u64 mask; @@ -100,7 +100,6 @@ bool kvm_mtrr_valid(struct kvm_vcpu *vcpu, u32 msr, u64 data) return (data & mask) == 0; } -EXPORT_SYMBOL_GPL(kvm_mtrr_valid); static bool mtrr_is_enabled(struct kvm_mtrr *mtrr_state) { diff --git a/arch/x86/kvm/x86.h b/arch/x86/kvm/x86.h index c544602d07a3..82e3dafc5453 100644 --- a/arch/x86/kvm/x86.h +++ b/arch/x86/kvm/x86.h @@ -309,7 +309,6 @@ void kvm_deliver_exception_payload(struct kvm_vcpu *vcpu, void kvm_vcpu_mtrr_init(struct kvm_vcpu *vcpu); u8 kvm_mtrr_get_guest_memory_type(struct kvm_vcpu *vcpu, gfn_t gfn); -bool kvm_mtrr_valid(struct kvm_vcpu *vcpu, u32 msr, u64 data); int kvm_mtrr_set_msr(struct kvm_vcpu *vcpu, u32 msr, u64 data); int kvm_mtrr_get_msr(struct kvm_vcpu *vcpu, u32 msr, u64 *pdata); bool kvm_mtrr_check_gfn_range_consistency(struct kvm_vcpu *vcpu, gfn_t gfn,