From patchwork Fri Apr 28 15:36:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Forbes X-Patchwork-Id: 13226595 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2EC02C7EE21 for ; Fri, 28 Apr 2023 15:38:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=j3SkkTzyMpvqAsCd88wWE5xzllSkA+LaGXeLUBM4uUs=; b=CZOejqLBT3qPt8 9HADM5PwciYdlP7Mvjt2v52VK08zKVPWYJkBAHZie9q7pvrysy+t1rtS4mBbo++AD/8/Kh4ezeZL4 hcE6Ibh3GQxie07NVYVizeHr1j3ZlVA2YvpOnZLh9+59BYr1rhJblEujBWK/HMoZGB4uApD37KngZ js0cMiJ/S2VLpNmKAailUouhVYI4UoXybteuQ0kbQuY+ML+gsJHMQhGmWHfoYGgcsERKNi7Nb++MF 8CAeOsCfVs3Vsf77wXgieCeDa3PMNEN1d/urdv8cTUosPjSnHig3BUAh9hmSwRzmPTCRKY9HlxMDi xff8Toj7sBoVp94y+o1Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1psQAH-00B8DY-0z; Fri, 28 Apr 2023 15:37:41 +0000 Received: from mail-oa1-x2c.google.com ([2001:4860:4864:20::2c]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1psQAB-00B8CK-38 for linux-arm-kernel@lists.infradead.org; Fri, 28 Apr 2023 15:37:39 +0000 Received: by mail-oa1-x2c.google.com with SMTP id 586e51a60fabf-18e8a69094dso69896fac.0 for ; Fri, 28 Apr 2023 08:37:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxtx.org; s=google; t=1682696253; x=1685288253; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:from:to:cc:subject:date:message-id:reply-to; bh=CyDKyhnwLuSHe3Pt1oWnnqhaliuSPXZ8kkqT+VPebrc=; b=BIkkKaRpFBd3urV+vSawOBTZX0bQR+BkkO8Rd/Jc1KN8j6qLxKSPPaSXZC3n6DgAgO 3Z+RmiHURS6ePvEOciMI/4oYVrE6dBzt6/4OtSwawXyqKobp5qMnViycUzl4HjnK4ers Lm0Fi45mAn83WaArPNfo9yHfPPs3SYD58Dj0c= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682696253; x=1685288253; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=CyDKyhnwLuSHe3Pt1oWnnqhaliuSPXZ8kkqT+VPebrc=; b=F0xu8/emUwPYpAN4G3xmkqc3+hZr+abSZod8GAq4oxW6+xOTzdCWEnIPPlSzAa/TcQ fyTKV8Jq18EoxExHjj8/wD4MM+PZeFyF2w/5PwRPVC+kL/WKDJJX3nCoEoxm77QLZoDy 0w7XlMb2nIe1hizb2lH2n7skI7xRqWB5BLvJfZRk1Et2sCTdQkrXc0y2hQwsRybxZEuA WW/B5Go7KB7YyF0kMw3GNfdJGg7ZqXE5332L3ErTzij/CXf+Ex5L58hrXNWdicpQ33nt em5qe0xDShLQDq8dsgT1cxLSiWFkPqSci+UBXjrmsdQjYzSHW1tq8RaK+vaCaTDPU2Ds Bw6Q== X-Gm-Message-State: AC+VfDyCefZ5GsoyTygrSWvRGKBEbVrowHjVWYKQ+QQRy74WTTOWlMYh ik7DKwRVI1KCdUSICTzcQyok8g== X-Google-Smtp-Source: ACHHUZ54opno+yARwWVbpo8L/9U+XgM/pv7bJFIToQYYsPlIB8FVH7oJ7hmf+fPqy09NmlP8CbmfmQ== X-Received: by 2002:a05:6870:a3c3:b0:187:7c2b:edc7 with SMTP id h3-20020a056870a3c300b001877c2bedc7mr2792041oak.15.1682696253315; Fri, 28 Apr 2023 08:37:33 -0700 (PDT) Received: from fedora64.linuxtx.org ([99.47.93.78]) by smtp.gmail.com with ESMTPSA id w22-20020a056870a2d600b00172428894e0sm8874479oak.28.2023.04.28.08.37.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Apr 2023 08:37:32 -0700 (PDT) From: "Justin M. Forbes" To: Catalin Marinas , Will Deacon , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: jmforbes@linuxtx.org, "Justin M. Forbes" Subject: [PATCH] Revert arm64: drop ranges in definition of ARCH_FORCE_MAX_ORDER Date: Fri, 28 Apr 2023 10:36:45 -0500 Message-Id: <20230428153646.823736-1-jforbes@fedoraproject.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230428_083736_197681_1FEBB109 X-CRM114-Status: GOOD ( 13.59 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org While the ARCH_FORCE_MAX_ORDER changes clarified the descriptions quite a bit, the aarch64 specific change moved this config to sit behind CONFIG_EXPERT. This becomes problematic when distros are setting this to a non default value already. Pushing it behind EXPERT where it was not before will silently change the configuration for users building with oldconfig. If distros patch out if EXPERT downstream, it still creates problems for users testing out upstream patches, or trying to bisect to find the root of problem, as the configuration will change unexpectedly, possibly leading to different behavior and false results. Whem I asked about reverting the EXPERT, dependency, I was asked to add the ranges back. This essentially reverts commit 34affcd7577a232803f729d1870ba475f294e4ea Signed-off-by: Justin M. Forbes Cc: Catalin Marinas Acked-by: Catalin Marinas --- arch/arm64/Kconfig | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index b1201d25a8a4..dae18ac01e94 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -1516,9 +1516,11 @@ config XEN # 16K | 27 | 14 | 13 | 11 | # 64K | 29 | 16 | 13 | 13 | config ARCH_FORCE_MAX_ORDER - int "Order of maximal physically contiguous allocations" if EXPERT && (ARM64_4K_PAGES || ARM64_16K_PAGES) + int "Order of maximal physically contiguous allocations" if ARM64_4K_PAGES || ARM64_16K_PAGES default "13" if ARM64_64K_PAGES + range 11 13 if ARM64_16K_PAGES default "11" if ARM64_16K_PAGES + range 10 15 if ARM64_4K_PAGES default "10" help The kernel page allocator limits the size of maximal physically