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=-26.3 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT,USER_IN_DEF_DKIM_WL autolearn=ham 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 5CDF1C48BC2 for ; Wed, 23 Jun 2021 23:06:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 43F896115A for ; Wed, 23 Jun 2021 23:06:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230083AbhFWXIg (ORCPT ); Wed, 23 Jun 2021 19:08:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34730 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229940AbhFWXIc (ORCPT ); Wed, 23 Jun 2021 19:08:32 -0400 Received: from mail-qt1-x849.google.com (mail-qt1-x849.google.com [IPv6:2607:f8b0:4864:20::849]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 319E4C061760 for ; Wed, 23 Jun 2021 16:06:13 -0700 (PDT) Received: by mail-qt1-x849.google.com with SMTP id c29-20020ac86e9d0000b0290247b267c8e4so4241556qtv.22 for ; Wed, 23 Jun 2021 16:06:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=reply-to:date:in-reply-to:message-id:mime-version:references :subject:from:to:cc; bh=JYOF6IU31rISPQS51fxGfY25qPgNWHWroepjRPbVyV0=; b=FhDEofVv7xZfuj0yEbanAeLh5izVcGy94ZW/HpIxrq+UTUfNz5932VE3qFDG90wFze HFSZ52k9mcrYSV+VtkUaHKwh3gr1GZ1Ux6JsrdeRDten3lWqA6Vort0o2Ru4mb83KcbJ DcPScXdoL4aIr5jIVVMySiGw9N38hgK1UH/v+ZLzinbYQHnrXzrPq7TRo8uAhHpzwfMP xOCYuFE4CmwTfay1XzlAnIfrVmFFAqRjzemp2IIvmDz9wK36cCpTohzIw2v2U1SYw7Fl 1nbrqBJ2K2sKUOcLPAeIvWHQe4IlrcafPG0y9zk2iCkrWkWDSQNMrIEw8YEBjmoNfx27 Zm2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:reply-to:date:in-reply-to:message-id :mime-version:references:subject:from:to:cc; bh=JYOF6IU31rISPQS51fxGfY25qPgNWHWroepjRPbVyV0=; b=LvfrBBxvV6fwuLYKfz1QgBtFIFpKD4k217oDXiKYt5P/6D2yjrSIyJYTheinP0dyO/ 2AR20LDwa0rbvM9cv5cs1ssEDvwICdhasuIypHEgyLUgPpwI98+gKxEQkOoZszdskLWJ Ue8RPvPMVitMDGkpcc4p7denZiiw4eg42gZniCWyDRvXsZJFyOakhT/NX5DiFHvWBCRf y9C6pIZbL3kZCFli/cHYVlC9DoOmCIE4UmRE9Ixt9NBMsh1b/yp7siJFD5StqQtXZ8Jc rS+bnVorD1bQgQSd1bjeYaOfpTS4WZQ0zza2jSY2hz4vycLBxb+nFHp1SPT/nCroBkVw tQug== X-Gm-Message-State: AOAM5307JLSCBWl8913fSOx2D4thEwI5tQ/WWNre2dwxGUgyU3Gng2L5 8e4TnASxPC7X0WGUo/wTKmI//IyvuDw= X-Google-Smtp-Source: ABdhPJzlnWyNDJVBCpEkhcYeS0AKEtJS2LIBFOouzwcvlNqNDRnX3IgykVtM5EsNA5pqC4TTIFHy/V56rSg= X-Received: from seanjc798194.pdx.corp.google.com ([2620:15c:f:10:e9e:5b86:b4f2:e3c9]) (user=seanjc job=sendgmr) by 2002:a25:b98d:: with SMTP id r13mr654971ybg.430.1624489572305; Wed, 23 Jun 2021 16:06:12 -0700 (PDT) Reply-To: Sean Christopherson Date: Wed, 23 Jun 2021 16:05:51 -0700 In-Reply-To: <20210623230552.4027702-1-seanjc@google.com> Message-Id: <20210623230552.4027702-7-seanjc@google.com> Mime-Version: 1.0 References: <20210623230552.4027702-1-seanjc@google.com> X-Mailer: git-send-email 2.32.0.288.g62a8d224e6-goog Subject: [PATCH 6/7] KVM: x86/mmu: Bury 32-bit PSE paging helpers in paging_tmpl.h From: Sean Christopherson To: Paolo Bonzini Cc: Sean Christopherson , Vitaly Kuznetsov , Wanpeng Li , Jim Mattson , Joerg Roedel , kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Peter Gonda , Brijesh Singh , Tom Lendacky Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Move a handful of one-off macros and helpers for 32-bit PSE paging into paging_tmpl.h. Under no circumstance should anything but shadow paging care about 32-bit PSE paging. No functional change intended. Signed-off-by: Sean Christopherson --- arch/x86/kvm/mmu.h | 5 ----- arch/x86/kvm/mmu/mmu.c | 13 ------------- arch/x86/kvm/mmu/paging_tmpl.h | 18 ++++++++++++++++++ 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/arch/x86/kvm/mmu.h b/arch/x86/kvm/mmu.h index bc11402df83b..2b9d08b080cc 100644 --- a/arch/x86/kvm/mmu.h +++ b/arch/x86/kvm/mmu.h @@ -34,11 +34,6 @@ #define PT_DIR_PAT_SHIFT 12 #define PT_DIR_PAT_MASK (1ULL << PT_DIR_PAT_SHIFT) -#define PT32_DIR_PSE36_SIZE 4 -#define PT32_DIR_PSE36_SHIFT 13 -#define PT32_DIR_PSE36_MASK \ - (((1ULL << PT32_DIR_PSE36_SIZE) - 1) << PT32_DIR_PSE36_SHIFT) - #define PT64_ROOT_5LEVEL 5 #define PT64_ROOT_4LEVEL 4 #define PT32_ROOT_LEVEL 2 diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c index 84d48a33e38b..ef92717bff86 100644 --- a/arch/x86/kvm/mmu/mmu.c +++ b/arch/x86/kvm/mmu/mmu.c @@ -259,23 +259,10 @@ static gpa_t translate_gpa(struct kvm_vcpu *vcpu, gpa_t gpa, u32 access, return gpa; } -static int is_cpuid_PSE36(void) -{ - return 1; -} - static int is_nx(struct kvm_vcpu *vcpu) { return vcpu->arch.efer & EFER_NX; } - -static gfn_t pse36_gfn_delta(u32 gpte) -{ - int shift = 32 - PT32_DIR_PSE36_SHIFT - PAGE_SHIFT; - - return (gpte & PT32_DIR_PSE36_MASK) << shift; -} - #ifdef CONFIG_X86_64 static void __set_spte(u64 *sptep, u64 spte) { diff --git a/arch/x86/kvm/mmu/paging_tmpl.h b/arch/x86/kvm/mmu/paging_tmpl.h index 9df7e4b315a1..a2dbea70ffda 100644 --- a/arch/x86/kvm/mmu/paging_tmpl.h +++ b/arch/x86/kvm/mmu/paging_tmpl.h @@ -31,6 +31,24 @@ #define PT64_LVL_OFFSET_MASK(level) \ (GUEST_PT64_BASE_ADDR_MASK & ((1ULL << (PAGE_SHIFT + (((level) - 1) \ * PT64_LEVEL_BITS))) - 1)) + +#define PT32_DIR_PSE36_SIZE 4 +#define PT32_DIR_PSE36_SHIFT 13 +#define PT32_DIR_PSE36_MASK \ + (((1ULL << PT32_DIR_PSE36_SIZE) - 1) << PT32_DIR_PSE36_SHIFT) + +static inline int is_cpuid_PSE36(void) +{ + return 1; +} + +static inline gfn_t pse36_gfn_delta(u32 gpte) +{ + int shift = 32 - PT32_DIR_PSE36_SHIFT - PAGE_SHIFT; + + return (gpte & PT32_DIR_PSE36_MASK) << shift; +} + #endif /* __KVM_X86_PAGING_TMPL_COMMON_H */ #if PTTYPE == 64 -- 2.32.0.288.g62a8d224e6-goog