From patchwork Mon Aug 20 20:37:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andi Kleen X-Patchwork-Id: 10570775 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 663841390 for ; Mon, 20 Aug 2018 20:37:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 563DE28CA7 for ; Mon, 20 Aug 2018 20:37:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4976428DD9; Mon, 20 Aug 2018 20:37:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=unavailable version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BD3AD28CA7 for ; Mon, 20 Aug 2018 20:37:25 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 63DAC6B1AF6; Mon, 20 Aug 2018 16:37:24 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 5CF886B1AF7; Mon, 20 Aug 2018 16:37:24 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 441CF6B1AF8; Mon, 20 Aug 2018 16:37:24 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl0-f72.google.com (mail-pl0-f72.google.com [209.85.160.72]) by kanga.kvack.org (Postfix) with ESMTP id 0342C6B1AF6 for ; Mon, 20 Aug 2018 16:37:24 -0400 (EDT) Received: by mail-pl0-f72.google.com with SMTP id l4-v6so2785483plt.12 for ; Mon, 20 Aug 2018 13:37:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=FJCmJR+/2LFj8rbmgm3L6E6OhBqhU0t0YP0eqRwhYkM=; b=FzO/fed1DNipVYUdFgvI73nxMhEWaR9dtL3RI9i+Scn5GhyVPsoHHi7e1ejGwQw0Rm hDADbZffbyONxs/lMrxMRtrFqW9P9jRQMXItAk28GVu7I08B8lGsXWG5S24ga6IC9wRZ yku0nyeohYiMYZyVBkEjq1OU8ddAh2G2jtVVS+Mxw/5MnjKD7Z28PO9HAFsWC0wpM9sm ZckLEkgip3MQGXZ+Ggo05s42l/mBnKzY5abQPUBD8SSXUxlSx0vyEvvvVnAszp7/jhOg NCq/e/VsY2Jz10abvx3kDYGclGeIJ/Ez+sbfC8LsnkHisOsjyaKt/1/1byP2O7mFfN2+ CF1A== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of ak@linux.intel.com designates 134.134.136.31 as permitted sender) smtp.mailfrom=ak@linux.intel.com X-Gm-Message-State: AOUpUlGvCZ53DgL275LeO1sRu9F36ZbgtinRBYlMexd346yc0lLLuaV6 oi+Ktx1ufsM9SCg/qOA9oZaGLLgypc/vHeTAuKhGQrpdbCfpfni8pLRbyYzdCuP0n0ZuWnIKnCf XjEQINzCB0DN+V+Gi4B5YxKUluJiGGAHBUaxOfc0Bq5Ey3G2hIIb7eVNbY2iwDKw= X-Received: by 2002:a65:5784:: with SMTP id b4-v6mr45274461pgr.315.1534797443640; Mon, 20 Aug 2018 13:37:23 -0700 (PDT) X-Google-Smtp-Source: AA+uWPw90G1YTxb1qIwJ5JthCqgC8tKRki/lDDxUU4UsplfRhCD//+yX1v0QrmhAw1ziH/SzlUsP X-Received: by 2002:a65:5784:: with SMTP id b4-v6mr45274387pgr.315.1534797442673; Mon, 20 Aug 2018 13:37:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1534797442; cv=none; d=google.com; s=arc-20160816; b=INX2o6AqxVhcbd4j92RayTrfT8kQqvEi8+UtAHfSm5zQtxR1GMt4O1iQFpdQTcT8L7 sdMArZbcFynO0l1xF93a3Mphmi5SqUUchvhlFgVNvxH3jBzTYDZAp1IxAlHY179Cz2sa f7aO2DYLG7lSJWuNZ+H5ivLIjvdTINyftm5scX8fSpQJ6vg/snMIkv/hqd0eAYSFNkG0 w7Pc7EP8Uof852/O8OCDOoOjkajVx3tN6pVpYkFBZ72/DiioOc7IU8Ufq8/rMHGkrlSh 2R3/zuV32WjO298x4LyVI6hdJjwdKi1CG0p9mrmwTteHSXxCXXiF+shRRh7QPWQOlMqf o9eA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:arc-authentication-results; bh=FJCmJR+/2LFj8rbmgm3L6E6OhBqhU0t0YP0eqRwhYkM=; b=ygSpjqLCr2SZlwlePyUPHwoD32sWBAnhqkFhoNuEDyrt5UZRAttcp2aaXuC3I7Dy7u NIavcSk+HM9tUS8pnaGnnqkS9zTrUL9NvrfRClA3L/yHcWka9PUzI5ovd1BBdP1xcoXA vQKawz33EehMKU+jxkadefE7SsODFyPdrDwUhCUmnDusSUXCWEy6A70rA5WB8CW6MZA9 H1gxy/HRj+Zs5+B0UOx8YQa0INMC9mNymlSfVci/y/tlqYgYfX/ogVVlFnA25QnfmVrW TnOjdZI7eDY5X6fv8mMsGaL+ARXjyd0IU2DWxAtKncFz5rSFmRd/97+LIIMvZS+Z2mYV CBmA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of ak@linux.intel.com designates 134.134.136.31 as permitted sender) smtp.mailfrom=ak@linux.intel.com Received: from mga06.intel.com (mga06.intel.com. [134.134.136.31]) by mx.google.com with ESMTPS id g16-v6si9693656pgv.78.2018.08.20.13.37.22 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Aug 2018 13:37:22 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of ak@linux.intel.com designates 134.134.136.31 as permitted sender) client-ip=134.134.136.31; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of ak@linux.intel.com designates 134.134.136.31 as permitted sender) smtp.mailfrom=ak@linux.intel.com X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 20 Aug 2018 13:37:21 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.53,266,1531810800"; d="scan'208";a="83409056" Received: from tassilo.jf.intel.com (HELO tassilo.localdomain) ([10.7.201.126]) by orsmga001.jf.intel.com with ESMTP; 20 Aug 2018 13:37:21 -0700 Received: by tassilo.localdomain (Postfix, from userid 1000) id BBA6E30105D; Mon, 20 Aug 2018 13:37:21 -0700 (PDT) From: Andi Kleen To: stable@vger.kernel.org Cc: Andi Kleen , Tom Lendacky , Alexander Potapenko , Andrey Ryabinin , Andy Lutomirski , Arnd Bergmann , Borislav Petkov , Brijesh Singh , Dave Young , Dmitry Vyukov , Jonathan Corbet , Konrad Rzeszutek Wilk , Larry Woodman , Linus Torvalds , Matt Fleming , "Michael S . Tsirkin" , Paolo Bonzini , Peter Zijlstra , =?utf-8?b?UmFkaW0gS3LEjW3DocWZ?= , Rik van Riel , Toshimitsu Kani , kasan-dev@googlegroups.com, kvm@vger.kernel.org, linux-arch@vger.kernel.org, linux-doc@vger.kernel.org, linux-efi@vger.kernel.org, linux-mm@kvack.org, Ingo Molnar Subject: [PATCH] x86/mm: Simplify p[g4um]d_page() macros Date: Mon, 20 Aug 2018 13:37:05 -0700 Message-Id: <20180820203705.16212-2-andi@firstfloor.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180820203705.16212-1-andi@firstfloor.org> References: <20180820203705.16212-1-andi@firstfloor.org> MIME-Version: 1.0 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP From: Andi Kleen Create a pgd_pfn() macro similar to the p[4um]d_pfn() macros and then use the p[g4um]d_pfn() macros in the p[g4um]d_page() macros instead of duplicating the code. Signed-off-by: Tom Lendacky Reviewed-by: Thomas Gleixner Reviewed-by: Borislav Petkov Cc: Alexander Potapenko Cc: Andrey Ryabinin Cc: Andy Lutomirski Cc: Arnd Bergmann Cc: Borislav Petkov Cc: Brijesh Singh Cc: Dave Young Cc: Dmitry Vyukov Cc: Jonathan Corbet Cc: Konrad Rzeszutek Wilk Cc: Larry Woodman Cc: Linus Torvalds Cc: Matt Fleming Cc: Michael S. Tsirkin Cc: Paolo Bonzini Cc: Peter Zijlstra Cc: Radim Krčmář Cc: Rik van Riel Cc: Toshimitsu Kani Cc: kasan-dev@googlegroups.com Cc: kvm@vger.kernel.org Cc: linux-arch@vger.kernel.org Cc: linux-doc@vger.kernel.org Cc: linux-efi@vger.kernel.org Cc: linux-mm@kvack.org Link: http://lkml.kernel.org/r/e61eb533a6d0aac941db2723d8aa63ef6b882dee.1500319216.git.thomas.lendacky@amd.com [Backported to 4.9 stable by AK, suggested by Michael Hocko] Signed-off-by: Ingo Molnar Signed-off-by: Andi Kleen --- arch/x86/include/asm/pgtable.h | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h index 4de6c282c02a..68a55273ce0f 100644 --- a/arch/x86/include/asm/pgtable.h +++ b/arch/x86/include/asm/pgtable.h @@ -173,6 +173,11 @@ static inline unsigned long pud_pfn(pud_t pud) return (pfn & pud_pfn_mask(pud)) >> PAGE_SHIFT; } +static inline unsigned long pgd_pfn(pgd_t pgd) +{ + return (pgd_val(pgd) & PTE_PFN_MASK) >> PAGE_SHIFT; +} + #define pte_page(pte) pfn_to_page(pte_pfn(pte)) static inline int pmd_large(pmd_t pte) @@ -578,8 +583,7 @@ static inline unsigned long pmd_page_vaddr(pmd_t pmd) * Currently stuck as a macro due to indirect forward reference to * linux/mmzone.h's __section_mem_map_addr() definition: */ -#define pmd_page(pmd) \ - pfn_to_page((pmd_val(pmd) & pmd_pfn_mask(pmd)) >> PAGE_SHIFT) +#define pmd_page(pmd) pfn_to_page(pmd_pfn(pmd)) /* * the pmd page can be thought of an array like this: pmd_t[PTRS_PER_PMD] @@ -647,8 +651,7 @@ static inline unsigned long pud_page_vaddr(pud_t pud) * Currently stuck as a macro due to indirect forward reference to * linux/mmzone.h's __section_mem_map_addr() definition: */ -#define pud_page(pud) \ - pfn_to_page((pud_val(pud) & pud_pfn_mask(pud)) >> PAGE_SHIFT) +#define pud_page(pud) pfn_to_page(pud_pfn(pud)) /* Find an entry in the second-level page table.. */ static inline pmd_t *pmd_offset(pud_t *pud, unsigned long address) @@ -688,7 +691,7 @@ static inline unsigned long pgd_page_vaddr(pgd_t pgd) * Currently stuck as a macro due to indirect forward reference to * linux/mmzone.h's __section_mem_map_addr() definition: */ -#define pgd_page(pgd) pfn_to_page(pgd_val(pgd) >> PAGE_SHIFT) +#define pgd_page(pgd) pfn_to_page(pgd_pfn(pgd)) /* to find an entry in a page-table-directory. */ static inline unsigned long pud_index(unsigned long address)