From patchwork Thu Feb 2 18:27:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Gardon X-Patchwork-Id: 52112 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp400598wrn; Thu, 2 Feb 2023 10:29:44 -0800 (PST) X-Google-Smtp-Source: AK7set+Uuvs0kCXqFjhCx6oYZjeXINNqXPyXOWuwWcNsAJgCTyuWhcWrjRX5W57ha62f/U+WdnhO X-Received: by 2002:a05:6a21:158e:b0:bc:9007:e53 with SMTP id nr14-20020a056a21158e00b000bc90070e53mr6171316pzb.0.1675362584172; Thu, 02 Feb 2023 10:29:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675362584; cv=none; d=google.com; s=arc-20160816; b=gKGcIa0DruN2gjxqaqBU1/1WkF3Zgheb9BwforSwMhpol6b578+LA25M7iRUXEfYar PO1JWzZSXOfbxjtUYudZpNmW4oERZgGYiZVlXQf/xS/ZmUU1s1o3k5mcq7JW0i9dFjc5 FL8pP41kmfYa9ppdW+p2PewRi/p2z9tUH3j4EkwTWD/LaUSWvLCFbzSe33sLuKWMX5ex g0gcBHjDLSL1scmtnCP7r34PbLZxLM191ojcMJWdB8J9c7mIfyFrkrRfrVyIJx7jLbHO /zdOfDMh06ISXsyFmq6t69f8NaSHNi1RJwaGMttCNTRaBUdml+aBwP8g0NLmOH+/ms+I Vk2w== 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:dkim-signature; bh=VxkR2t/soCZeC9eyZl1mM8b7dI9FSV2mUjQI7FtOHrA=; b=k3RP7JaU2F5txJvaEMZrJCt3Z3qO0X3f009wp3fYhoUE4uS/EWeTe2rekLt8Kr1LvP Vka554WrUXjvM77JbqdPYxFCQJwSK43ESrVktD1mXKwJlVHUrJ7I9z8pJPID2+Z09uO7 0dc9jJJpBRGQHzFqZ34gfLH84mNHXl6KE4oYFYm3g0PCjt3IIuJreT1j7xrtVdXyyRZj A3yb4UOP1Ls4t4jnVpq6sSAA8P04mwBcVAfbRfsknnXwTaveHtCWJuYPd0+tbSN0iOgW q2d7Bbj5lWT60bwwV/z5k9ooWT+t1sx08s1Z4fxvsK/eI7KM4vMinUKvb9fXFpxXHtQM wvHQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=bRIm91U6; 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 e24-20020a637458000000b004f235dc52c1si310882pgn.350.2023.02.02.10.29.29; Thu, 02 Feb 2023 10:29:44 -0800 (PST) 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=20210112 header.b=bRIm91U6; 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 S232341AbjBBS2o (ORCPT + 99 others); Thu, 2 Feb 2023 13:28:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33262 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232514AbjBBS2j (ORCPT ); Thu, 2 Feb 2023 13:28:39 -0500 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 20520265B8 for ; Thu, 2 Feb 2023 10:28:21 -0800 (PST) Received: by mail-pg1-x54a.google.com with SMTP id g12-20020a656ccc000000b004ee62dadb95so1363039pgw.9 for ; Thu, 02 Feb 2023 10:28:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=VxkR2t/soCZeC9eyZl1mM8b7dI9FSV2mUjQI7FtOHrA=; b=bRIm91U6CXHVWLtrnVZHyCbrrPa45LPwdl416lNZtl+FS4NbZUA/w8w3xI7dR3QaUJ uzEyVHHOYRIhLTQG+2FeNkgmc+azanymGtl1QjsMyWScmGGcZ4ulvAEN2hHl11MQnb5J eOl35AxgHUpuLLm/0yUkZ6/NrKDsh0/x+qZEWGU+6030SYpFKtDTj64pHtPMMmbY3Djo hurVP9eX5Osf7WNhIL0csIDXWHRBcJu+1F20CketRewTixj85Jz2/ph8G9qDLLd45WEW kk/bY69JhozRJVuKnj5DtXaDcPI7Ke+YuN+juZuw+du57/vbwq2+6mu5fKeeVzoB0WdE jUJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=VxkR2t/soCZeC9eyZl1mM8b7dI9FSV2mUjQI7FtOHrA=; b=6vSQPnvyZ+EWTkVZ0Z6H+qWmuNhvzEbZOBJ+5n4cw5g6gioFhQUaWzVSyRXcDMaROK k6MlMA4/YwBRDHi3WO5TTnGcct0tyMjpp5p+ZFQnoDWdtpkeVBkMO1C0GXZD1VVxvRf1 BHSUSlYw8cfyEq340LRs8iw6xD+vDq693y7PUx0M2IhQEyvlIjAcChERgKsACcvfgknf Asy3MpU9O00IAqvv0jKinhU+x8b+Xpac4b6LH8rZVadPW+cCsUwWQGfiYHAU82yBt3fr bsox+5XFtz6LbXHGLN/WvDUsc4ZV/UdEi8b50Dci/4Md4u0WCSjb8r4p7mfuqPOfutN+ K0Fw== X-Gm-Message-State: AO0yUKWQwMIvIlessG+oVUGpqPZ7Xf8XZ1Cf0DHPn2820gsAD+NfiaAB Hj4Evzqm6xxuc2RCnaKR4/8oh/n0j2WywCM1al3ELlhE52NDOuuczTcXk17jrL2/o8q0EN20wXu uxuyQB2M78ehfzC+FuEtztQWMBge0rOylDNU3iVBKZcl5DtVvlrt2jcBF9AQSYXZWsw99uWip X-Received: from sweer.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:e45]) (user=bgardon job=sendgmr) by 2002:aa7:9f51:0:b0:58b:c29a:87a6 with SMTP id h17-20020aa79f51000000b0058bc29a87a6mr1724887pfr.13.1675362500951; Thu, 02 Feb 2023 10:28:20 -0800 (PST) Date: Thu, 2 Feb 2023 18:27:54 +0000 In-Reply-To: <20230202182809.1929122-1-bgardon@google.com> Mime-Version: 1.0 References: <20230202182809.1929122-1-bgardon@google.com> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog Message-ID: <20230202182809.1929122-7-bgardon@google.com> Subject: [PATCH 06/21] KVM: x86/mmu: Get rid of is_cpuid_PSE36() From: Ben Gardon To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: Paolo Bonzini , Peter Xu , Sean Christopherson , David Matlack , Vipin Sharma , Ricardo Koller , Ben Gardon 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?1756744997003628115?= X-GMAIL-MSGID: =?utf-8?q?1756744997003628115?= is_cpuid_PSE36() always returns 1 and is never overridden, so just get rid of the function. This saves having to export it in a future commit in order to move the include of paging_tmpl.h out of mmu.c. No functional change intended. Suggested-by: David Matlack Signed-off-by: Ben Gardon --- arch/x86/kvm/mmu/mmu.c | 13 ++----------- arch/x86/kvm/mmu/paging_tmpl.h | 2 +- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c index 12d38a8772a80..35cb59737c0a3 100644 --- a/arch/x86/kvm/mmu/mmu.c +++ b/arch/x86/kvm/mmu/mmu.c @@ -304,11 +304,6 @@ static bool check_mmio_spte(struct kvm_vcpu *vcpu, u64 spte) return likely(kvm_gen == spte_gen); } -static int is_cpuid_PSE36(void) -{ - return 1; -} - #ifdef CONFIG_X86_64 static void __set_spte(u64 *sptep, u64 spte) { @@ -4661,12 +4656,8 @@ static void __reset_rsvds_bits_mask(struct rsvd_bits_validate *rsvd_check, break; } - if (is_cpuid_PSE36()) - /* 36bits PSE 4MB page */ - rsvd_check->rsvd_bits_mask[1][1] = rsvd_bits(17, 21); - else - /* 32 bits PSE 4MB page */ - rsvd_check->rsvd_bits_mask[1][1] = rsvd_bits(13, 21); + /* 36bits PSE 4MB page */ + rsvd_check->rsvd_bits_mask[1][1] = rsvd_bits(17, 21); break; case PT32E_ROOT_LEVEL: rsvd_check->rsvd_bits_mask[0][2] = rsvd_bits(63, 63) | diff --git a/arch/x86/kvm/mmu/paging_tmpl.h b/arch/x86/kvm/mmu/paging_tmpl.h index e5662dbd519c4..730b413eebfde 100644 --- a/arch/x86/kvm/mmu/paging_tmpl.h +++ b/arch/x86/kvm/mmu/paging_tmpl.h @@ -426,7 +426,7 @@ static int FNAME(walk_addr_generic)(struct guest_walker *walker, gfn += (addr & PT_LVL_OFFSET_MASK(walker->level)) >> PAGE_SHIFT; #if PTTYPE == 32 - if (walker->level > PG_LEVEL_4K && is_cpuid_PSE36()) + if (walker->level > PG_LEVEL_4K) gfn += pse36_gfn_delta(pte); #endif