From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-io1-f42.google.com (mail-io1-f42.google.com [209.85.166.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B696412FB01 for ; Mon, 26 Feb 2024 16:55:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.42 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708966519; cv=none; b=Kcm5Fe6S2OzqIgZ/eWSrb+ouNvt66gu/53MO4EcPlNeYVZbVlRQbpnobJ4vLcP8BAoQECMcZlhVn7J1c/D0yIa8d/dOShZa+gfaByBaVLMyeDHnebkKlYz2GNnH8x3Uj0u8BoEMk9Ot0ZDkSGP1z5G3xQpeo9Z9bOJF1/Qc0JQk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708966519; c=relaxed/simple; bh=efqSYWlmPvvmoW5hTpteGQgbaViN1str2LnrNPJgrD0=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=DoyeW06zcu3+flD3XeGgQTL5DdBViE+MZkeYq2ruGYPnIa8bBmTXHAzJCxkkdS9GwfXs7EvohwWCwn/iaui+EMon5kYhWOsfkax+JAjZR2ZDFJyMizifKx2V34gwlrWSZk8WiUHO0IrLzIwYdjmayZ1tk+XckGbzM0lzsYYC6i4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=sifive.com; spf=pass smtp.mailfrom=sifive.com; dkim=pass (2048-bit key) header.d=sifive.com header.i=@sifive.com header.b=eIpG+p8O; arc=none smtp.client-ip=209.85.166.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=sifive.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sifive.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sifive.com header.i=@sifive.com header.b="eIpG+p8O" Received: by mail-io1-f42.google.com with SMTP id ca18e2360f4ac-7c78573f294so135284039f.0 for ; Mon, 26 Feb 2024 08:55:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; t=1708966516; x=1709571316; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=YapG2Iuz3DeMuojGrZ4IACVCP3buEgPcxL/agJvMeoI=; b=eIpG+p8Ov/rRaNeI6uaoNEoiYBVxOHKyiRlBtWJu2YvdUhbCuZtqkdDm4a56GJy2rl nr1kusUTL0Wl7M9Ji9Ua9DtzmR6hHbt5OlBxcUSmFZCT03axU42bBVhU1HGSMIMyOO0f sbTz+A9TH0p/ARPuqtbkKPLG5u5lynUcIdQiCImUzTN3k9DDK2aJti8Yd8R+nR5lnzZZ tf9Qw7vKBeKHeeYuR5NoWOqRIeWfAXJoR5RBRkvloBlBcjIFPoqjQz0fp/ddbnmPa0Cl JGvzU0+WJVMNaw5gb8FVTL4VrrmUoyB+DXEqhk669C/mUXRYlnP2dLjCxqXojz2F2tpX Uitg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708966516; x=1709571316; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=YapG2Iuz3DeMuojGrZ4IACVCP3buEgPcxL/agJvMeoI=; b=fpz/d6mWX8uTXQ0k/kmi6f+H05/XqwQEnUVfle0zX5UPBZL0/N7WAYWh1GxPMtROqu EZYm/LiIib8NLnx+IXctCpL/10QtYa8nU6Fo72TLEJumqKKyHmDILN/KqytAaKRb514S cocR0dJ+hunszKy+AW/2p1Bga5f++xV6BBqn3mVhRsNSxdkYXPVUvgGkNKM1owsixdQk j9VEf7cqz/DDirwzxjlrxEpSjoZZ55HHds5SeMEMDqOdNGOyFNSvrIESSWcARtVpDZfJ LQRT+eQmIWg1pvwsomvBtkOqkQnj4GIP6w2Pr6sMBZZGU02zCxpFmZ+T6UrqzwvrUDNP Arog== X-Forwarded-Encrypted: i=1; AJvYcCWby80/ZQ0+ZpY5xApxlSes8rgxdl9V7zUlqZqW3lSdoxZ/ZFPv/3bXwie/ll/fVnUgE+yPyn3xotM0T5aDRPye++oAMMBc6LVng5D6Yg== X-Gm-Message-State: AOJu0YzxRE+leK4zbucHKl0LK11QaIIykOjrfRfOCvLyR8SrXIZWppl6 Pn0N1WcSWYdIDO2McPCGPtC418wtmesaaAwI1uR+goiyZwUfqp3h6aF9LYtvBRA= X-Google-Smtp-Source: AGHT+IHuaCs5d/f2oApxcwZJ00c0VtAfeY0TQXQD6OLSfI1tJf749yVYK76BLp2wH1JUJFxCC31KGw== X-Received: by 2002:a5e:c819:0:b0:7c7:247e:34c7 with SMTP id y25-20020a5ec819000000b007c7247e34c7mr9575536iol.9.1708966515786; Mon, 26 Feb 2024 08:55:15 -0800 (PST) Received: from [100.64.0.1] ([170.85.6.200]) by smtp.gmail.com with ESMTPSA id f23-20020a6be817000000b007c7938867adsm1309067ioh.33.2024.02.26.08.55.12 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 26 Feb 2024 08:55:15 -0800 (PST) Message-ID: <764fafb0-2206-4ab1-84ea-ebb7848c8ff2@sifive.com> Date: Mon, 26 Feb 2024 10:55:11 -0600 Precedence: bulk X-Mailing-List: linux-hexagon@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 1/4] arch: consolidate existing CONFIG_PAGE_SIZE_*KB definitions Content-Language: en-US To: Arnd Bergmann , Thomas Gleixner , Vincenzo Frascino , Kees Cook , Anna-Maria Behnsen Cc: Arnd Bergmann , Matt Turner , Vineet Gupta , Russell King , Catalin Marinas , Guo Ren , Brian Cain , Huacai Chen , Geert Uytterhoeven , Michal Simek , Thomas Bogendoerfer , Helge Deller , Michael Ellerman , Christophe Leroy , Palmer Dabbelt , John Paul Adrian Glaubitz , Andreas Larsson , Richard Weinberger , x86@kernel.org, Max Filippov , Andy Lutomirski , Jan Kiszka , Kieran Bingham , Andrew Morton , linux-kernel@vger.kernel.org, linux-alpha@vger.kernel.org, linux-snps-arc@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-csky@vger.kernel.org, linux-hexagon@vger.kernel.org, loongarch@lists.linux.dev, linux-m68k@lists.linux-m68k.org, linux-mips@vger.kernel.org, linux-openrisc@vger.kernel.org, linux-parisc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, linux-sh@vger.kernel.org, sparclinux@vger.kernel.org, linux-um@lists.infradead.org References: <20240226161414.2316610-1-arnd@kernel.org> <20240226161414.2316610-2-arnd@kernel.org> From: Samuel Holland In-Reply-To: <20240226161414.2316610-2-arnd@kernel.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit On 2024-02-26 10:14 AM, Arnd Bergmann wrote: > From: Arnd Bergmann > > These four architectures define the same Kconfig symbols for configuring > the page size. Move the logic into a common place where it can be shared > with all other architectures. > > Signed-off-by: Arnd Bergmann > --- > arch/Kconfig | 58 +++++++++++++++++++++++++++++-- > arch/hexagon/Kconfig | 25 +++---------- > arch/hexagon/include/asm/page.h | 6 +--- > arch/loongarch/Kconfig | 21 ++++------- > arch/loongarch/include/asm/page.h | 10 +----- > arch/mips/Kconfig | 58 +++---------------------------- > arch/mips/include/asm/page.h | 16 +-------- > arch/sh/include/asm/page.h | 13 +------ > arch/sh/mm/Kconfig | 42 +++++++--------------- > 9 files changed, 88 insertions(+), 161 deletions(-) > > diff --git a/arch/Kconfig b/arch/Kconfig > index a5af0edd3eb8..237cea01ed9b 100644 > --- a/arch/Kconfig > +++ b/arch/Kconfig > @@ -1078,17 +1078,71 @@ config HAVE_ARCH_COMPAT_MMAP_BASES > and vice-versa 32-bit applications to call 64-bit mmap(). > Required for applications doing different bitness syscalls. > > +config HAVE_PAGE_SIZE_4KB > + bool > + > +config HAVE_PAGE_SIZE_8KB > + bool > + > +config HAVE_PAGE_SIZE_16KB > + bool > + > +config HAVE_PAGE_SIZE_32KB > + bool > + > +config HAVE_PAGE_SIZE_64KB > + bool > + > +config HAVE_PAGE_SIZE_256KB > + bool > + > +choice > + prompt "MMU page size" Should this have some generic help text (at least a warning about compatibility)? > + > +config PAGE_SIZE_4KB > + bool "4KB pages" > + depends on HAVE_PAGE_SIZE_4KB > + > +config PAGE_SIZE_8KB > + bool "8KB pages" > + depends on HAVE_PAGE_SIZE_8KB > + > +config PAGE_SIZE_16KB > + bool "16KB pages" > + depends on HAVE_PAGE_SIZE_16KB > + > +config PAGE_SIZE_32KB > + bool "32KB pages" > + depends on HAVE_PAGE_SIZE_32KB > + > +config PAGE_SIZE_64KB > + bool "64KB pages" > + depends on HAVE_PAGE_SIZE_64KB > + > +config PAGE_SIZE_256KB > + bool "256KB pages" > + depends on HAVE_PAGE_SIZE_256KB > + > +endchoice > + > config PAGE_SIZE_LESS_THAN_64KB > def_bool y > - depends on !ARM64_64K_PAGES > depends on !PAGE_SIZE_64KB > - depends on !PARISC_PAGE_SIZE_64KB > depends on PAGE_SIZE_LESS_THAN_256KB > > config PAGE_SIZE_LESS_THAN_256KB > def_bool y > depends on !PAGE_SIZE_256KB > > +config PAGE_SHIFT > + int > + default 12 if PAGE_SIZE_4KB > + default 13 if PAGE_SIZE_8KB > + default 14 if PAGE_SIZE_16KB > + default 15 if PAGE_SIZE_32KB > + default 16 if PAGE_SIZE_64KB > + default 18 if PAGE_SIZE_256KB > + > # This allows to use a set of generic functions to determine mmap base > # address by giving priority to top-down scheme only if the process > # is not in legacy mode (compat task, unlimited stack size or > diff --git a/arch/hexagon/Kconfig b/arch/hexagon/Kconfig > index a880ee067d2e..aac46ee1a000 100644 > --- a/arch/hexagon/Kconfig > +++ b/arch/hexagon/Kconfig > @@ -8,6 +8,11 @@ config HEXAGON > select ARCH_HAS_SYNC_DMA_FOR_DEVICE > select ARCH_NO_PREEMPT > select DMA_GLOBAL_POOL > + select FRAME_POINTER Looks like a paste error. > + select HAVE_PAGE_SIZE_4KB > + select HAVE_PAGE_SIZE_16KB > + select HAVE_PAGE_SIZE_64KB > + select HAVE_PAGE_SIZE_256KB > # Other pending projects/to-do items. > # select HAVE_REGS_AND_STACK_ACCESS_API > # select HAVE_HW_BREAKPOINT if PERF_EVENTS > @@ -120,26 +125,6 @@ config NR_CPUS > This is purely to save memory - each supported CPU adds > approximately eight kilobytes to the kernel image. > > -choice > - prompt "Kernel page size" > - default PAGE_SIZE_4KB > - help > - Changes the default page size; use with caution. > - > -config PAGE_SIZE_4KB > - bool "4KB" > - > -config PAGE_SIZE_16KB > - bool "16KB" > - > -config PAGE_SIZE_64KB > - bool "64KB" > - > -config PAGE_SIZE_256KB > - bool "256KB" > - > -endchoice > - > source "kernel/Kconfig.hz" > > endmenu > diff --git a/arch/hexagon/include/asm/page.h b/arch/hexagon/include/asm/page.h > index 10f1bc07423c..65c9bac639fa 100644 > --- a/arch/hexagon/include/asm/page.h > +++ b/arch/hexagon/include/asm/page.h > @@ -13,27 +13,22 @@ > /* This is probably not the most graceful way to handle this. */ > > #ifdef CONFIG_PAGE_SIZE_4KB > -#define PAGE_SHIFT 12 > #define HEXAGON_L1_PTE_SIZE __HVM_PDE_S_4KB > #endif > > #ifdef CONFIG_PAGE_SIZE_16KB > -#define PAGE_SHIFT 14 > #define HEXAGON_L1_PTE_SIZE __HVM_PDE_S_16KB > #endif > > #ifdef CONFIG_PAGE_SIZE_64KB > -#define PAGE_SHIFT 16 > #define HEXAGON_L1_PTE_SIZE __HVM_PDE_S_64KB > #endif > > #ifdef CONFIG_PAGE_SIZE_256KB > -#define PAGE_SHIFT 18 > #define HEXAGON_L1_PTE_SIZE __HVM_PDE_S_256KB > #endif > > #ifdef CONFIG_PAGE_SIZE_1MB > -#define PAGE_SHIFT 20 > #define HEXAGON_L1_PTE_SIZE __HVM_PDE_S_1MB > #endif The corresponding Kconfig option does not exist (and did not exist before this patch). > > @@ -50,6 +45,7 @@ > #define HVM_HUGEPAGE_SIZE 0x5 > #endif > > +#define PAGE_SHIFT CONFIG_PAGE_SHIFT > #define PAGE_SIZE (1UL << PAGE_SHIFT) > #define PAGE_MASK (~((1 << PAGE_SHIFT) - 1)) >