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=-0.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_PASS,URIBL_BLOCKED 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 6BA14C64EBC for ; Thu, 4 Oct 2018 08:32:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3738A21470 for ; Thu, 4 Oct 2018 08:32:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3738A21470 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 S1727354AbeJDPYv (ORCPT ); Thu, 4 Oct 2018 11:24:51 -0400 Received: from pegase1.c-s.fr ([93.17.236.30]:3798 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727167AbeJDPYv (ORCPT ); Thu, 4 Oct 2018 11:24:51 -0400 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 42QmNR3NjPz9ttFL; Thu, 4 Oct 2018 10:32:39 +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 uLuFNDXyu5rK; Thu, 4 Oct 2018 10:32:39 +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 42QmNR2sgdz9ttBv; Thu, 4 Oct 2018 10:32:39 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 919438B90F; Thu, 4 Oct 2018 10:32:41 +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 T3xQxRH_8etP; Thu, 4 Oct 2018 10:32:41 +0200 (CEST) Received: from PO15451 (unknown [192.168.232.3]) by messagerie.si.c-s.fr (Postfix) with ESMTP id A72CA8B907; Thu, 4 Oct 2018 10:32:40 +0200 (CEST) Subject: Re: [RFC PATCH v3 1/7] book3s/64: avoid circular header inclusion in mmu-hash.h To: "Aneesh Kumar K.V" , 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> <1516af9d-bb0b-4a2c-71f8-554a3f830281@linux.ibm.com> From: Christophe LEROY Message-ID: Date: Thu, 4 Oct 2018 10:32:40 +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: <1516af9d-bb0b-4a2c-71f8-554a3f830281@linux.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 04/10/2018 à 10:23, Aneesh Kumar K.V a écrit : > On 10/4/18 1:50 PM, Christophe LEROY wrote: >> >> >> 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 >> > > Quiet a lot of that is book3s 64 specifi because we have there. > > #if defined(CONFIG_PPC_BOOK3S_64) && defined(CONFIG_PPC_64K_PAGES) > /* >  * Max value currently used: >  */ We have an #if / #else #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 And processor .h derives several other consts applying to both BOOK3S64 et BOOK3E64 from that. And arch/powerpc/mm/pgtable-book3e.c has: BUILD_BUG_ON(TASK_SIZE_USER64 > PGTABLE_RANGE); Christophe