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=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS 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 3072DC64EBC for ; Thu, 4 Oct 2018 08:20:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C05EB21473 for ; Thu, 4 Oct 2018 08:20:52 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C05EB21473 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=c-s.fr Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727394AbeJDPMy (ORCPT ); Thu, 4 Oct 2018 11:12:54 -0400 Received: from pegase1.c-s.fr ([93.17.236.30]:2389 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726852AbeJDPMy (ORCPT ); Thu, 4 Oct 2018 11:12:54 -0400 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 42Qm6k0clfz9ttCM; Thu, 4 Oct 2018 10:20:46 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at c-s.fr Received: from pegase1.c-s.fr ([192.168.12.234]) by localhost (pegase1.c-s.fr [192.168.12.234]) (amavisd-new, port 10024) with ESMTP id 2Wnz-K94dzA7; Thu, 4 Oct 2018 10:20:46 +0200 (CEST) Received: from messagerie.si.c-s.fr (messagerie.si.c-s.fr [192.168.25.192]) by pegase1.c-s.fr (Postfix) with ESMTP id 42Qm6k05Dpz9ttBv; Thu, 4 Oct 2018 10:20:46 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 6C3458B90B; Thu, 4 Oct 2018 10:20:48 +0200 (CEST) X-Virus-Scanned: amavisd-new at c-s.fr Received: from messagerie.si.c-s.fr ([127.0.0.1]) by localhost (messagerie.si.c-s.fr [127.0.0.1]) (amavisd-new, port 10023) with ESMTP id 99vJ-2qz5Eka; Thu, 4 Oct 2018 10:20:48 +0200 (CEST) Received: from PO15451 (unknown [192.168.232.3]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 8393E8B907; Thu, 4 Oct 2018 10:20:47 +0200 (CEST) Subject: Re: [RFC PATCH v3 1/7] book3s/64: avoid circular header inclusion in mmu-hash.h To: Nicholas Piggin Cc: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , aneesh.kumar@linux.vnet.ibm.com, linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org References: <20181003142400.490fd38a@roar.ozlabs.ibm.com> From: Christophe LEROY Message-ID: Date: Thu, 4 Oct 2018 10:20:47 +0200 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <20181003142400.490fd38a@roar.ozlabs.ibm.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: fr Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Le 03/10/2018 à 06:24, Nicholas Piggin a écrit : > On Mon, 1 Oct 2018 12:30:19 +0000 (UTC) > Christophe Leroy wrote: > >> When activating CONFIG_THREAD_INFO_IN_TASK, linux/sched.h >> includes asm/current.h. This generates a circular dependency. >> To avoid that, asm/processor.h shall not be included in mmu-hash.h >> >> In order to do that, this patch moves into a new header called >> asm/task_size.h the information from asm/processor.h requires by >> mmu-hash.h > > Doesn't look like you use this header in 32-bit code. Put task_size.h > in asm/64/ maybe? There is no asm/64/ dir at the time being, only book3s/64/ and nohash/64/ I'm thinking about leaving it in asm/ but renaming it task_size_user64.h Christophe > > Reviewed-by: Nicholas Piggin > >> >> Signed-off-by: Christophe Leroy >> --- >> arch/powerpc/include/asm/book3s/64/mmu-hash.h | 2 +- >> arch/powerpc/include/asm/processor.h | 34 +--------------------- >> arch/powerpc/include/asm/task_size.h | 42 +++++++++++++++++++++++++++ >> arch/powerpc/kvm/book3s_hv_hmi.c | 1 + >> 4 files changed, 45 insertions(+), 34 deletions(-) >> create mode 100644 arch/powerpc/include/asm/task_size.h >> >> diff --git a/arch/powerpc/include/asm/book3s/64/mmu-hash.h b/arch/powerpc/include/asm/book3s/64/mmu-hash.h >> index bbeaf6adf93c..7788e35f19f0 100644 >> --- a/arch/powerpc/include/asm/book3s/64/mmu-hash.h >> +++ b/arch/powerpc/include/asm/book3s/64/mmu-hash.h >> @@ -23,7 +23,7 @@ >> */ >> #include >> #include >> -#include >> +#include >> #include >> >> /* >> diff --git a/arch/powerpc/include/asm/processor.h b/arch/powerpc/include/asm/processor.h >> index 350c584ca179..353879db3e98 100644 >> --- a/arch/powerpc/include/asm/processor.h >> +++ b/arch/powerpc/include/asm/processor.h >> @@ -101,40 +101,8 @@ void release_thread(struct task_struct *); >> #endif >> >> #ifdef CONFIG_PPC64 >> -/* >> - * 64-bit user address space can have multiple limits >> - * For now supported values are: >> - */ >> -#define TASK_SIZE_64TB (0x0000400000000000UL) >> -#define TASK_SIZE_128TB (0x0000800000000000UL) >> -#define TASK_SIZE_512TB (0x0002000000000000UL) >> -#define TASK_SIZE_1PB (0x0004000000000000UL) >> -#define TASK_SIZE_2PB (0x0008000000000000UL) >> -/* >> - * With 52 bits in the address we can support >> - * upto 4PB of range. >> - */ >> -#define TASK_SIZE_4PB (0x0010000000000000UL) >> >> -/* >> - * For now 512TB is only supported with book3s and 64K linux page size. >> - */ >> -#if defined(CONFIG_PPC_BOOK3S_64) && defined(CONFIG_PPC_64K_PAGES) >> -/* >> - * Max value currently used: >> - */ >> -#define TASK_SIZE_USER64 TASK_SIZE_4PB >> -#define DEFAULT_MAP_WINDOW_USER64 TASK_SIZE_128TB >> -#define TASK_CONTEXT_SIZE TASK_SIZE_512TB >> -#else >> -#define TASK_SIZE_USER64 TASK_SIZE_64TB >> -#define DEFAULT_MAP_WINDOW_USER64 TASK_SIZE_64TB >> -/* >> - * We don't need to allocate extended context ids for 4K page size, because >> - * we limit the max effective address on this config to 64TB. >> - */ >> -#define TASK_CONTEXT_SIZE TASK_SIZE_64TB >> -#endif >> +#include >> >> /* >> * 32-bit user address space is 4GB - 1 page >> diff --git a/arch/powerpc/include/asm/task_size.h b/arch/powerpc/include/asm/task_size.h >> new file mode 100644 >> index 000000000000..ca45638617b0 >> --- /dev/null >> +++ b/arch/powerpc/include/asm/task_size.h >> @@ -0,0 +1,42 @@ >> +/* SPDX-License-Identifier: GPL-2.0 */ >> +#ifndef _ASM_POWERPC_TASK_SIZE_H >> +#define _ASM_POWERPC_TASK_SIZE_H >> + >> +#ifdef CONFIG_PPC64 >> +/* >> + * 64-bit user address space can have multiple limits >> + * For now supported values are: >> + */ >> +#define TASK_SIZE_64TB (0x0000400000000000UL) >> +#define TASK_SIZE_128TB (0x0000800000000000UL) >> +#define TASK_SIZE_512TB (0x0002000000000000UL) >> +#define TASK_SIZE_1PB (0x0004000000000000UL) >> +#define TASK_SIZE_2PB (0x0008000000000000UL) >> +/* >> + * With 52 bits in the address we can support >> + * upto 4PB of range. >> + */ >> +#define TASK_SIZE_4PB (0x0010000000000000UL) >> + >> +/* >> + * For now 512TB is only supported with book3s and 64K linux page size. >> + */ >> +#if defined(CONFIG_PPC_BOOK3S_64) && defined(CONFIG_PPC_64K_PAGES) >> +/* >> + * Max value currently used: >> + */ >> +#define TASK_SIZE_USER64 TASK_SIZE_4PB >> +#define DEFAULT_MAP_WINDOW_USER64 TASK_SIZE_128TB >> +#define TASK_CONTEXT_SIZE TASK_SIZE_512TB >> +#else >> +#define TASK_SIZE_USER64 TASK_SIZE_64TB >> +#define DEFAULT_MAP_WINDOW_USER64 TASK_SIZE_64TB >> +/* >> + * We don't need to allocate extended context ids for 4K page size, because >> + * we limit the max effective address on this config to 64TB. >> + */ >> +#define TASK_CONTEXT_SIZE TASK_SIZE_64TB >> +#endif >> + >> +#endif /* CONFIG_PPC64 */ >> +#endif /* _ASM_POWERPC_TASK_SIZE_H */ >> diff --git a/arch/powerpc/kvm/book3s_hv_hmi.c b/arch/powerpc/kvm/book3s_hv_hmi.c >> index e3f738eb1cac..64b5011475c7 100644 >> --- a/arch/powerpc/kvm/book3s_hv_hmi.c >> +++ b/arch/powerpc/kvm/book3s_hv_hmi.c >> @@ -24,6 +24,7 @@ >> #include >> #include >> #include >> +#include >> >> void wait_for_subcore_guest_exit(void) >> { >> -- >> 2.13.3 >>