From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753596AbeBULDB (ORCPT ); Wed, 21 Feb 2018 06:03:01 -0500 Received: from terminus.zytor.com ([198.137.202.136]:48487 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751656AbeBULDA (ORCPT ); Wed, 21 Feb 2018 06:03:00 -0500 Date: Wed, 21 Feb 2018 02:51:21 -0800 From: "tip-bot for Kirill A. Shutemov" Message-ID: Cc: tglx@linutronix.de, luto@amacapital.net, dave.hansen@linux.intel.com, dan.j.williams@intel.com, arjan@linux.intel.com, dwmw2@infradead.org, torvalds@linux-foundation.org, bp@alien8.de, kirill.shutemov@linux.intel.com, peterz@infradead.org, mingo@kernel.org, linux-kernel@vger.kernel.org, hpa@zytor.com, bp@suse.de, jpoimboe@redhat.com, luto@kernel.org Reply-To: hpa@zytor.com, jpoimboe@redhat.com, luto@kernel.org, bp@suse.de, dan.j.williams@intel.com, arjan@linux.intel.com, tglx@linutronix.de, luto@amacapital.net, dave.hansen@linux.intel.com, linux-kernel@vger.kernel.org, dwmw2@infradead.org, bp@alien8.de, kirill.shutemov@linux.intel.com, torvalds@linux-foundation.org, mingo@kernel.org, peterz@infradead.org In-Reply-To: <20180216114948.68868-3-kirill.shutemov@linux.intel.com> References: <20180216114948.68868-3-kirill.shutemov@linux.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/mm] x86/mm: Redefine some of page table helpers as macros Git-Commit-ID: 92e1c5b3f7bf5407cfdbf13613e7101831216dc5 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 92e1c5b3f7bf5407cfdbf13613e7101831216dc5 Gitweb: https://git.kernel.org/tip/92e1c5b3f7bf5407cfdbf13613e7101831216dc5 Author: Kirill A. Shutemov AuthorDate: Fri, 16 Feb 2018 14:49:47 +0300 Committer: Ingo Molnar CommitDate: Wed, 21 Feb 2018 10:19:18 +0100 x86/mm: Redefine some of page table helpers as macros This is preparation for the next patch, which would change pgtable_l5_enabled to be cpu_feature_enabled(X86_FEATURE_LA57). The change makes few helpers in paravirt.h dependent on cpu_feature_enabled() definition from cpufeature.h. And cpufeature.h is dependent on paravirt.h. Let's re-define some of helpers as macros to break this dependency loop. Signed-off-by: Kirill A. Shutemov Cc: Andy Lutomirski Cc: Andy Lutomirski Cc: Arjan van de Ven Cc: Borislav Petkov Cc: Borislav Petkov Cc: Dan Williams Cc: Dave Hansen Cc: David Woodhouse Cc: Josh Poimboeuf Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: linux-mm@kvack.org Link: http://lkml.kernel.org/r/20180216114948.68868-3-kirill.shutemov@linux.intel.com Signed-off-by: Ingo Molnar --- arch/x86/include/asm/paravirt.h | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h index 3fbaad2..2c0c8c9 100644 --- a/arch/x86/include/asm/paravirt.h +++ b/arch/x86/include/asm/paravirt.h @@ -567,19 +567,22 @@ static inline p4dval_t p4d_val(p4d_t p4d) return PVOP_CALLEE1(p4dval_t, pv_mmu_ops.p4d_val, p4d.p4d); } -static inline void set_pgd(pgd_t *pgdp, pgd_t pgd) +static inline void __set_pgd(pgd_t *pgdp, pgd_t pgd) { - if (pgtable_l5_enabled) - PVOP_VCALL2(pv_mmu_ops.set_pgd, pgdp, native_pgd_val(pgd)); - else - set_p4d((p4d_t *)(pgdp), (p4d_t) { pgd.pgd }); + PVOP_VCALL2(pv_mmu_ops.set_pgd, pgdp, native_pgd_val(pgd)); } -static inline void pgd_clear(pgd_t *pgdp) -{ - if (pgtable_l5_enabled) - set_pgd(pgdp, __pgd(0)); -} +#define set_pgd(pgdp, pgdval) do { \ + if (pgtable_l5_enabled) \ + __set_pgd(pgdp, pgdval); \ + else \ + set_p4d((p4d_t *)(pgdp), (p4d_t) { (pgdval).pgd }); \ +} while (0) + +#define pgd_clear(pgdp) do { \ + if (pgtable_l5_enabled) \ + set_pgd(pgdp, __pgd(0)); \ +} while (0) #endif /* CONFIG_PGTABLE_LEVELS == 5 */