From patchwork Fri Oct 18 17:29:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ritesh Harjani (IBM)" X-Patchwork-Id: 13842094 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6C8BAD3DEA3 for ; Fri, 18 Oct 2024 17:31:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C53F06B00AB; Fri, 18 Oct 2024 13:31:25 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C03556B00AC; Fri, 18 Oct 2024 13:31:25 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A7D296B00AD; Fri, 18 Oct 2024 13:31:25 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 83ED06B00AB for ; Fri, 18 Oct 2024 13:31:25 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 27A80121B22 for ; Fri, 18 Oct 2024 17:31:14 +0000 (UTC) X-FDA: 82687414194.24.AC1D61A Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) by imf27.hostedemail.com (Postfix) with ESMTP id 064784001B for ; Fri, 18 Oct 2024 17:31:11 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=Ng6bUMdJ; spf=pass (imf27.hostedemail.com: domain of ritesh.list@gmail.com designates 209.85.210.179 as permitted sender) smtp.mailfrom=ritesh.list@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1729272634; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=1QLaMyzhWv0h56bpJNLe2thoYBckgfAdM8HvqGdr41M=; b=2euNsQLtbm48+3IgNT/WHTF4y87F0S0ePscdlAzcybfLQ6K7tApm9vi6Ki9j4JMI3C1XzR DH46k6olN91NVz123JIFor+SakG/YkkPwx/QwHTd+tPXMCay+O9ihRVMLroIqb+8EC9B/8 RgTLq1xe4kT/6eEUyajlDNYveh7U+WI= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=Ng6bUMdJ; spf=pass (imf27.hostedemail.com: domain of ritesh.list@gmail.com designates 209.85.210.179 as permitted sender) smtp.mailfrom=ritesh.list@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1729272634; a=rsa-sha256; cv=none; b=KIyqJxbQbCq1pb+w9n9zRZlq0ntBMDFCm87pBmMKYSdLW/ebJ6SMbCFw6cM3qxvoWVySvD nZ1cgk+Ko/vj/gLuI1ZSqDIZIobL0SWvh/dDCojJErWK4oDRj0kWeR2AF4Ch/buSHuB02g UDdxLD8A7e2t7ANT5aYVFCCVQfHxm7c= Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-71eb1d0e3c2so29613b3a.2 for ; Fri, 18 Oct 2024 10:31:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1729272682; x=1729877482; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=1QLaMyzhWv0h56bpJNLe2thoYBckgfAdM8HvqGdr41M=; b=Ng6bUMdJ7scoPtOI2WxXMmDkNAxzyyJDDpnGj1GZTxsZ+mGwecfJgBQ+xs2m33EBay 6iBSx/jh96kfaT3caeXL6AQX6b17S7M/mpL1FsFCim+G9YhKHymQkktElkknaFWaYr16 N4F8z9PgtAOLHA5x7yv+edPn1jX39zCJ8VlFF/+1cSVIxgXGWfgKZK2nh1OorLET4PFE MQajy8wQPeMxvnYsPDEYvd4rhrYP5g6QOR/dUl5YYl7V24k9zEC24ESJQBnMrGq2SaxW 9kC9Xa5LPafT+Umdhg8tZaMJviOcy1YbHLzFFG8lHNcxmnkChtYMLBW5+XnTKWHCHBwM 7CBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729272682; x=1729877482; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1QLaMyzhWv0h56bpJNLe2thoYBckgfAdM8HvqGdr41M=; b=awvi8rvpjvsALxBcoB9v4HqZpALXFd1aP9jfbxc9yU7KAdGXPUZLmhB8mI1mFy4DGL eNjYjKw9pw/NlqrgvskZi6SdZOjSARfLGGJEan6HLWQglhjUNmUGH7hs3hn1I3ngG/cw JT+yVOGyTeeTq/VhErPKLnvfWH6Bj8jU11WZfcN34lcbIQlCYXTXfP0G8sBPC8o50m5f 2j+HB0tfCnzRa7E9xtIScyfuJnmTbn5fCCMEVp7k/9wjWcv0ll0E/P8t13r6HWINaduZ WUp+c2pyQmP5+wppJA+2s+ypUVD6xrFNlHCex+3C7kg5JI2VxBRZD917ZuzFgcAuZuQt ubRA== X-Forwarded-Encrypted: i=1; AJvYcCVNiyF9qfSOWi8bK+bdstfyDlD61hsOftc1cAkYQZ2Jb8uM5ThmpJfgkk9FLFI9SxmYnlwr0hKjSA==@kvack.org X-Gm-Message-State: AOJu0YyHh4mVeQ8NdSptt8HPF3zmBCJu6CDENyZLSvCI1GHNKH9nQibq Xdr5gwdDyv0o9d8m616JnE0Zg0WkZdW3S8r1gA+gxV24dcmlq1hskaNi5r3z X-Google-Smtp-Source: AGHT+IFTSMl8QW5ycN4XEBU+MJ3K9NfWvdEojOEp7QlJ+1fDl8flZ96NMrdY+IbWH9uWHYWgBiWu4A== X-Received: by 2002:a05:6a00:cd4:b0:71e:cf8:d6f1 with SMTP id d2e1a72fcca58-71ea316bf4emr3925702b3a.14.1729272682003; Fri, 18 Oct 2024 10:31:22 -0700 (PDT) Received: from dw-tp.ibmuc.com ([171.76.80.151]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71ea3311f51sm1725242b3a.36.2024.10.18.10.31.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Oct 2024 10:31:21 -0700 (PDT) From: "Ritesh Harjani (IBM)" To: linuxppc-dev@lists.ozlabs.org Cc: kasan-dev@googlegroups.com, linux-mm@kvack.org, Marco Elver , Alexander Potapenko , Heiko Carstens , Michael Ellerman , Nicholas Piggin , Madhavan Srinivasan , Christophe Leroy , Hari Bathini , "Aneesh Kumar K . V" , Donet Tom , Pavithra Prakash , LKML , "Ritesh Harjani (IBM)" Subject: [PATCH v3 12/12] book3s64/hash: Early detect debug_pagealloc size requirement Date: Fri, 18 Oct 2024 22:59:53 +0530 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 X-Rspam-User: X-Stat-Signature: o43sb3hedidf384nhktq3q479tn378ey X-Rspamd-Queue-Id: 064784001B X-Rspamd-Server: rspam11 X-HE-Tag: 1729272671-251274 X-HE-Meta: U2FsdGVkX197JJFgEJZwYShuoDyjMqz5huWvHJeuR1S7dQSRKmqlO1W5GvQc6gunZrK5HJw2EPWVekvpQeXA3ahpCXDvP0rOLNtQsZ1vYgKlQ8ghj20Tp9UqK6/IThnAc9YhxvY5hKFWzBDKbM/nvZWgG9WiBTW4/M+VdZW0y0ZPMUIfQLjcu+T2fDc1iGI9dbY00hE2YcW4DQtCcEtWSXkiiMOe9lUGim2VtRyNgh4Ur9qvxzfsDJFzroi92j2hTh0VuLoJWjnfT+Ge6aB9DZ1HlIiqwUOXvsGDGoF/zcmmzQFyQMUJIVxAz4d0ZVLISR+EhY72IJbkcsOVDYjmjshdjsv8KxmUNwamypqh+OWJnN/IPczmrciR50+u4Yl7K1OfW5hRZ1Atk5xSbGRe7UKkjAkcAXvEPKxo9l2eoF4purjM4YJE3ZkIjU9el0+SY0Lu0fSwgol+4YhHdccHC2RdZPaoHZbc+osSvm43eg1FgDhIinR8u2VwxZyaX/+a3vNkYgbZ3SFyWKwtLWzowTymz287uCSv3BLIKmO/cJ/+npWlxLA7EnVqPFFUyrm4N8NMJUVaPPi6x391q7yqt9UZcn040ZY++1EGuYAV/3KWlnz7CwBKHJrw7SgOuiTAbcCJm8aM1GLHuF2J2xrrkm8XUwTKMYc2Mv/0r5Sj28jmrVCOurfTvNacJCQAMpButrd2ezSs3ilcYttj4xSPdDISaZiWxrjvn5TKBOCusM/Q7UwiNQNIUOGF9HDmBYayXFzW0hUU8nJYrhx5QGl6oCUTnWw6qkLIEOxU+TVVU8AyMqPhPn6esXBGWKLbOMCRXIKD6D3lnRl7EDyxfHTVQuVqCvlx6WjT+JYBDu2MsqZ5zYq+L3WF85QznnvwWBIa/GcqZ8Nv0EvUd5tKQrqfRPGixJ0VS45MfUfvvxgPBF6+/tuJZPk2m0fx6Z5rC13pKPK7AabzFZ1C75uy/mU 3lCsrxSt H64tIKF6/dRMCAjyAXnO1xUOeQjrzqF3rHbexCw4n5UjkPUBQ9Cdkrp6RA2ryRftVDnIlODlPKfBYQKen09X0uY+PIyzZ3q8T9D0RU8YtzSBEIZuCVQKdTQpTwS91VcousVSXduUTnnjId4EdoXfgx12G9LaGly6GW/zvzj/R4+ax23jkICYVhC2n9H3oea7ZPkCBY96P+dkWGRyxGbL4O96KO4PCCZLHPuGxDQgeolmgF/3ofbGEnCdaTOWwZOUlJHGA4Vllll3d+Q3ZCpUde37cgXa5JCxVhLccs9lCL+rnmdrPXVZgIoaiQfzN4NVEqmwsylts7TWjWhOln9FbQFZuxA== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Add hash_supports_debug_pagealloc() helper to detect whether debug_pagealloc can be supported on hash or not. This checks for both, whether debug_pagealloc config is enabled and the linear map should fit within rma_size/4 region size. This can then be used early during htab_init_page_sizes() to decide linear map pagesize if hash supports either debug_pagealloc or kfence. Signed-off-by: Ritesh Harjani (IBM) --- arch/powerpc/mm/book3s64/hash_utils.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/arch/powerpc/mm/book3s64/hash_utils.c b/arch/powerpc/mm/book3s64/hash_utils.c index 2f5dd6310a8f..2674f763f5db 100644 --- a/arch/powerpc/mm/book3s64/hash_utils.c +++ b/arch/powerpc/mm/book3s64/hash_utils.c @@ -329,25 +329,26 @@ static void kernel_unmap_linear_page(unsigned long vaddr, unsigned long idx, } #endif +static inline bool hash_supports_debug_pagealloc(void) +{ + unsigned long max_hash_count = ppc64_rma_size / 4; + unsigned long linear_map_count = memblock_end_of_DRAM() >> PAGE_SHIFT; + + if (!debug_pagealloc_enabled() || linear_map_count > max_hash_count) + return false; + return true; +} + #ifdef CONFIG_DEBUG_PAGEALLOC static u8 *linear_map_hash_slots; static unsigned long linear_map_hash_count; static DEFINE_RAW_SPINLOCK(linear_map_hash_lock); static void hash_debug_pagealloc_alloc_slots(void) { - unsigned long max_hash_count = ppc64_rma_size / 4; - - if (!debug_pagealloc_enabled()) - return; - linear_map_hash_count = memblock_end_of_DRAM() >> PAGE_SHIFT; - if (unlikely(linear_map_hash_count > max_hash_count)) { - pr_info("linear map size (%llu) greater than 4 times RMA region (%llu). Disabling debug_pagealloc\n", - ((u64)linear_map_hash_count << PAGE_SHIFT), - ppc64_rma_size); - linear_map_hash_count = 0; + if (!hash_supports_debug_pagealloc()) return; - } + linear_map_hash_count = memblock_end_of_DRAM() >> PAGE_SHIFT; linear_map_hash_slots = memblock_alloc_try_nid( linear_map_hash_count, 1, MEMBLOCK_LOW_LIMIT, ppc64_rma_size, NUMA_NO_NODE); @@ -1076,7 +1077,7 @@ static void __init htab_init_page_sizes(void) bool aligned = true; init_hpte_page_sizes(); - if (!debug_pagealloc_enabled() && !kfence_early_init_enabled()) { + if (!hash_supports_debug_pagealloc() && !kfence_early_init_enabled()) { /* * Pick a size for the linear mapping. Currently, we only * support 16M, 1M and 4K which is the default