From patchwork Fri Oct 18 17:29:43 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: 13842084 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 AB35ED3DEA0 for ; Fri, 18 Oct 2024 17:30:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 32CEF6B0095; Fri, 18 Oct 2024 13:30:33 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2DE156B0096; Fri, 18 Oct 2024 13:30:33 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 12DAA6B0098; Fri, 18 Oct 2024 13:30:33 -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 E4B026B0095 for ; Fri, 18 Oct 2024 13:30:32 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id A90EB1A085B for ; Fri, 18 Oct 2024 17:30:10 +0000 (UTC) X-FDA: 82687411842.19.B8FCDC4 Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) by imf10.hostedemail.com (Postfix) with ESMTP id A799DC0023 for ; Fri, 18 Oct 2024 17:30:25 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=FOgoPr1H; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf10.hostedemail.com: domain of ritesh.list@gmail.com designates 209.85.210.178 as permitted sender) smtp.mailfrom=ritesh.list@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1729272596; a=rsa-sha256; cv=none; b=LQVItjyPTHh4QEQBeTlvlzG0MMCt7e0P5RGqSr3t5LWjqV3qLxuU3dxvVzuUUkJRenlHCr BoK08W5pmjBn3YHPMdPdO1vmun+nIXphKhNPwdas5oaRhAx+TCO1tbhxQIv29OJA0P1Qsq 50dDXxxqu6e83N9huFjY5hxW6pDgKIs= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=FOgoPr1H; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf10.hostedemail.com: domain of ritesh.list@gmail.com designates 209.85.210.178 as permitted sender) smtp.mailfrom=ritesh.list@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1729272596; 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=Y7m6nw0SlLNWzWwVTYubL573BHmMjcLP6yP7O1snSbI=; b=uEgANZ3fBjGJQ/tq0qSlBSUJBDjUjx1skvI2r+Z+9O4c5594a0PeR6ZefpdL2ds8WZxRxx jd0OzeSI8wButW5HRfOjM3Ms+B5fuDD5T5zMDQEyZUrl4chBpyMwMsmrImQX6geTENJd5H pzymMaGCEtqS/RCD/OSvovVzc5Et74M= Received: by mail-pf1-f178.google.com with SMTP id d2e1a72fcca58-71e4e481692so2056446b3a.1 for ; Fri, 18 Oct 2024 10:30:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1729272629; x=1729877429; 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=Y7m6nw0SlLNWzWwVTYubL573BHmMjcLP6yP7O1snSbI=; b=FOgoPr1H+lIYDWZdUHp6L1rWEv+ND+A+0nfzOYHRbFY+w6i0UFZFhf3ZeW5xo2Upn1 ku3xkctpdRwKATSmwlZ/P5whflsPLIIYGMb9Lx/rglhcTLwVXI7+x2i09YFdApFrwKHE odHR3n5D1BjoxNopgVfN0JMT24tN/vcrlzQx1KC5zqqE20VavxLwUyEur3b8I81vjY48 FIoO93B2JEW+jsGnz4eS8RrKPY9mtELVfSaLZK9mbCfxk5nrb+DokZ3/m3+e0dvQkiOh O6OrpdrSOAEc4rCBvv4thGxbjEuj0BYsOtKBpWFNw8bPde704itfybx2j6fNU8Okwt7V GWpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729272629; x=1729877429; 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=Y7m6nw0SlLNWzWwVTYubL573BHmMjcLP6yP7O1snSbI=; b=cyU3os1jveOegFKV5cbLBOdFChzcyLMqkWqmK5yOsbXmXWh+BFWUWHZR1vaLF4hJHM kK+RGUlddJHnbHyEb7Eqbp/h8oEWFRqBom68WKocbUBJdbgyZgnpIAWxbp+6C0uX88lS cuDcsWkEZwiOWRZ+ie4Z99UruYczEZAEKlXhrhc0zNcioD6qVlNJCSw/Jy0o5m/zT+48 /YJH5HUzkU2XG0XiIOHhIFQ8sLrsapzK4cNKW9NtN22wTqxdbzjzYwKmzN4HeQw3rcB9 J+oayoRZd2F64Ehrs/sSnwQUbqRdYgb14ewT9BENRiC2c3Ddo8rtpCl8bWwG6HqUb8rB KooA== X-Forwarded-Encrypted: i=1; AJvYcCWRTl9vm7gH8YXRjZi9GoZwGDZ7Bx30Ej5eZtTECdXXvBNPWhVBgWMmJ2o0/IZxJ1U8GWDp1xv5xQ==@kvack.org X-Gm-Message-State: AOJu0YygXtbyAOm6GEQBAJ//90ipZ67AX5mzhMwDsFlb3CHrEO/uVWUV LNY30IXWrks9eGQ4inb5uLAxJNAvHtlH/32JpA7aNj6vM71pAhag X-Google-Smtp-Source: AGHT+IH29uhXoWddJW63rmOfdUmm3F60bMAd8Lb1nxktQLiJXibpBjYFtPZvdFulLgU3PQV9sp2ESA== X-Received: by 2002:a05:6a00:3e0f:b0:71e:4a1b:2204 with SMTP id d2e1a72fcca58-71ea331b398mr4152501b3a.25.1729272629392; Fri, 18 Oct 2024 10:30:29 -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.30.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Oct 2024 10:30:28 -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 02/12] book3s64/hash: Remove kfence support temporarily Date: Fri, 18 Oct 2024 22:59:43 +0530 Message-ID: <1761bc39674473c8878dedca15e0d9a0d3a1b528.1729271995.git.ritesh.list@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 X-Rspam-User: X-Stat-Signature: dt1io4fhju4zckskwt3hdubzibechf76 X-Rspamd-Queue-Id: A799DC0023 X-Rspamd-Server: rspam02 X-HE-Tag: 1729272625-887611 X-HE-Meta: U2FsdGVkX18KSJTFsBaFaDbueczk/HiylecAfdm6CHE5wBV1Z53xXFh91bcG/fLWqHuXLNW7OaAcaNwoYjRG5slnwdET6jnUVyH7KztZ1MOilKa/MeQLwlEnbynkRVoeVfZktvLTgKz0uGFsEXI1KeN/YWclImFxZwjkr3MGwn4ew4fvm00wMC3OG1/D78QmuMRPShZezXeWqFzaTc87s0axubmC816kYQSoX12nnSHOLT9g5HMynPsa3U+hIjcqQC42N1JPMQI7fA+VrrBgnFpDkQYBearNFutAMxCB2QHfoNJWVZQuZJB/MA2CE9xn/gJKE/gIXPfPAxWds3NAjD4Ws+77/9+zK4WP83CAKs63ouyd5J01MQjJXUxRQfxlkZzoQ2/CAV575+/eAMf2RVFEhLgHpfuDtMtgS6VMsXnH+1wdLS57jwXBg+3/oKE206hhcitquBrYG1nxQnow0or7gb5Fd0m4EtUKE0sbzTU+SgvtTJy1cTOlGqOZLX/hK8bBnHtopbgmcLuYwRj/jhyvx5qxbP73t7pvXH4jUdCysruGEj5KGctZXVLRaFdUOc8hhGfzBsMpLeY38f3Wiw16tf7Jwb+J9C9LsKXqoUJQJoiwWek+cQlRbGYPU+kESPmXzXUqw6RWtIR+xeoYFI6itywO2u0RRUX6leMV/fRaWnAhYlJQAh0qaK5vOMc5F/CHljBe0vzwt1T/JtAfY4yGmpEL/8CeSNY12WOXvmN4O1fR7v82bhm4q75Vz0IqqBPsKI6sCy2GfutT1uDysYE4PrgA6Jf22JHlSg5yBkZvHWd4l1ZxvBwxeyZNQsjHafp6yN8Epq+/1NopeiyqMCSk6FGKSnFGOmtZPlWNX6qSR9UJHNQaT+YGiu78S6NsIr7hKoe4rdNGJIOkPL59OGsMf2kWQNt/SLz4/aUCbeqLH4W6Yha2h7cCuPl0H2ReWJljxG4EVzA08Qhbgx3 Hi74jyYG 1oIvv3T9yn/0hJ2G1BTYupATAmgCRv+RD5hcHMpdWo8Pp1nxX70aiBxBGfKpEm5/w/GdxmgB5xLWSBnXRxwmc+U3hXmIBeDCQvI67BIYnhFsr39uRZzQFK068Raurrv5dnffbAh1Cqg6TLj7e9HpHEdc4+XGvQ4V7hl1A6X5Bp6LuYPEJWMZyN6Iy4FWBthWplxeV5ppqE2cmc7h0dJxR4zoTVFm7AdjN0C1yIHFsgh4DX0ymINwXPUGvSPkFNT7CjO9abEjRQqQfzp6Y9Ire49gbAY1fEgrK3sKy 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: Kfence on book3s Hash on pseries is anyways broken. It fails to boot due to RMA size limitation. That is because, kfence with Hash uses debug_pagealloc infrastructure. debug_pagealloc allocates linear map for entire dram size instead of just kfence relevant objects. This means for 16TB of DRAM it will require (16TB >> PAGE_SHIFT) which is 256MB which is half of RMA region on P8. crash kernel reserves 256MB and we also need 2048 * 16KB * 3 for emergency stack and some more for paca allocations. That means there is not enough memory for reserving the full linear map in the RMA region, if the DRAM size is too big (>=16TB) (The issue is seen above 8TB with crash kernel 256 MB reservation). Now Kfence does not require linear memory map for entire DRAM. It only needs for kfence objects. So this patch temporarily removes the kfence functionality since debug_pagealloc code needs some refactoring. We will bring in kfence on Hash support in later patches. Signed-off-by: Ritesh Harjani (IBM) --- arch/powerpc/include/asm/kfence.h | 5 +++++ arch/powerpc/mm/book3s64/hash_utils.c | 16 +++++++++++----- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/arch/powerpc/include/asm/kfence.h b/arch/powerpc/include/asm/kfence.h index fab124ada1c7..f3a9476a71b3 100644 --- a/arch/powerpc/include/asm/kfence.h +++ b/arch/powerpc/include/asm/kfence.h @@ -10,6 +10,7 @@ #include #include +#include #ifdef CONFIG_PPC64_ELF_ABI_V1 #define ARCH_FUNC_PREFIX "." @@ -25,6 +26,10 @@ static inline void disable_kfence(void) static inline bool arch_kfence_init_pool(void) { +#ifdef CONFIG_PPC64 + if (!radix_enabled()) + return false; +#endif return !kfence_disabled; } #endif diff --git a/arch/powerpc/mm/book3s64/hash_utils.c b/arch/powerpc/mm/book3s64/hash_utils.c index a408ef7d850e..e22a8f540193 100644 --- a/arch/powerpc/mm/book3s64/hash_utils.c +++ b/arch/powerpc/mm/book3s64/hash_utils.c @@ -431,7 +431,7 @@ int htab_bolt_mapping(unsigned long vstart, unsigned long vend, break; cond_resched(); - if (debug_pagealloc_enabled_or_kfence() && + if (debug_pagealloc_enabled() && (paddr >> PAGE_SHIFT) < linear_map_hash_count) linear_map_hash_slots[paddr >> PAGE_SHIFT] = ret | 0x80; } @@ -814,7 +814,7 @@ static void __init htab_init_page_sizes(void) bool aligned = true; init_hpte_page_sizes(); - if (!debug_pagealloc_enabled_or_kfence()) { + if (!debug_pagealloc_enabled()) { /* * Pick a size for the linear mapping. Currently, we only * support 16M, 1M and 4K which is the default @@ -1134,7 +1134,7 @@ static void __init htab_initialize(void) prot = pgprot_val(PAGE_KERNEL); - if (debug_pagealloc_enabled_or_kfence()) { + if (debug_pagealloc_enabled()) { 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, @@ -2120,7 +2120,7 @@ void hpt_do_stress(unsigned long ea, unsigned long hpte_group) } } -#if defined(CONFIG_DEBUG_PAGEALLOC) || defined(CONFIG_KFENCE) +#ifdef CONFIG_DEBUG_PAGEALLOC static DEFINE_RAW_SPINLOCK(linear_map_hash_lock); static void kernel_map_linear_page(unsigned long vaddr, unsigned long lmi) @@ -2194,7 +2194,13 @@ int hash__kernel_map_pages(struct page *page, int numpages, int enable) local_irq_restore(flags); return 0; } -#endif /* CONFIG_DEBUG_PAGEALLOC || CONFIG_KFENCE */ +#else /* CONFIG_DEBUG_PAGEALLOC */ +int hash__kernel_map_pages(struct page *page, int numpages, + int enable) +{ + return 0; +} +#endif /* CONFIG_DEBUG_PAGEALLOC */ void hash__setup_initial_memory_limit(phys_addr_t first_memblock_base, phys_addr_t first_memblock_size)