From patchwork Tue Oct 15 01:33:31 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: 13835654 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 09249CFC505 for ; Tue, 15 Oct 2024 01:34:30 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8B5FC6B009E; Mon, 14 Oct 2024 21:34:29 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 864C06B009F; Mon, 14 Oct 2024 21:34:29 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6DF186B00A0; Mon, 14 Oct 2024 21:34:29 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 480C26B009E for ; Mon, 14 Oct 2024 21:34:29 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 2DBE61A0525 for ; Tue, 15 Oct 2024 01:34:14 +0000 (UTC) X-FDA: 82674116406.25.ECAFA0C Received: from mail-pg1-f178.google.com (mail-pg1-f178.google.com [209.85.215.178]) by imf18.hostedemail.com (Postfix) with ESMTP id 615FA1C0004 for ; Tue, 15 Oct 2024 01:34:24 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=FgM5OG6q; spf=pass (imf18.hostedemail.com: domain of ritesh.list@gmail.com designates 209.85.215.178 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=1728955878; 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=ww6ZbzhcNbPuRWG0GzwKnAEreEL780mKVa0cmRg0+f0=; b=WMFbJrM4Klfjgjx6x8S7wCuvcHzskyB3GIDsZm1tpenxTd4yb2aQDzO4g1xZHkOYB9Jy0v 6fgCRO7EX/g9RjeCOlMfAAUmE5qkHeBssqsKL2jMrBpujaOd1IZNz0wN7INOIFA7/Xc1xt m4yiH+SqNI65T8A3k9K6MowPVp7r7PU= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=FgM5OG6q; spf=pass (imf18.hostedemail.com: domain of ritesh.list@gmail.com designates 209.85.215.178 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=1728955878; a=rsa-sha256; cv=none; b=3M9lziOI5dnLpAxLgdEelZ+NpdCEdoJ0fW/6Bw0UMShRE4dpsl7DyiCVHBQYof7W9qb5zq OwP91k6fNmWhawq6D0Z9FUYXdDfAFuclWUzHUgkeZvMbjIo58wQRfzgaqyPg27SpeeqJyZ XTrBZFRgqEdtDFQxb7EM+ZjFzS6FBXc= Received: by mail-pg1-f178.google.com with SMTP id 41be03b00d2f7-7cd8803fe0aso3293439a12.0 for ; Mon, 14 Oct 2024 18:34:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728956066; x=1729560866; 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=ww6ZbzhcNbPuRWG0GzwKnAEreEL780mKVa0cmRg0+f0=; b=FgM5OG6qydFerDu9x1JUyc2yzMB3U2LbD1O0YEciLU5fHVyEyf24sBygYXwwS2Ooea O2t413tMs+oLbuB2N34LAi6BeOqV01P+UPqf0yW6bj2GGYBVbZoJxssedKrPCcPnNgnY gwB27++FRGXP5OK256Wp35up0u8p/DrgetsV4gpo0PkUlt+nH7sLtrrJHwU7MEY9QTFz kx9HvtSOHW9E9c7/AjBxmEiinF2LV3ySE5MuA0188OCvh5O1NLREA4Fd9HwliKOhC+HR yG9fQha+mu/whkMX16Q7WD7UgcnGL928GSN7b+IdGuVu62kCOFWdl3GQ1q+oC88JNHjY 5rPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728956066; x=1729560866; 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=ww6ZbzhcNbPuRWG0GzwKnAEreEL780mKVa0cmRg0+f0=; b=r4l+AvhaXRHhERgBjepteqkwhg/be7ZQ436givXtoVu7gx3Llgsv/RQ++bS95i3mOd 8oeUWIyxONENFZLujW7Js6EzfswG9bj2GWOSUMVUwaYw9Zqs510+SZvji5uskajgx9BF +1a7FULs+1wGP8UJJOCb+4Z/DJANS78GFQ3ShWrOwm2yF+MQfqMKI21GmLRs6DYVQkVc rlHnaJ/4GtJvH+bzWblTi841CaZW6d3vQrGoVRpwz9SGwbC/Pmvx2sHHu//F0IgZ0Ovq PYvZopRRyzehJMdAMxjYlqY8koEzCynpOZtgE+5j01d+hS7StRCUur9G3ZZIykdxTmcW jbOw== X-Forwarded-Encrypted: i=1; AJvYcCWkgY4Bx7MT+uX+ZkrlQsZ0L9tdEISHABRIBRi8F6Fa5X873FfL5xVVmasr2eIJhSx0aGbBfZuDeQ==@kvack.org X-Gm-Message-State: AOJu0YwRHevw9LFia5RGrIC6YasAVT+f6QzN+LwaC9nMH1thGZOj3B7V TsDGuTCFoj8J9sWLh2H0Y8NFEw0XvZ5YigQYUr+UJWNoJrvDd1St X-Google-Smtp-Source: AGHT+IHGZTaTUSSUJMjQoBpL1FZpf4KVi65Lqy7OyMEzvzFSJ0mjrxB0rW6XRaLy1i6Ch9oXLcIlMw== X-Received: by 2002:a05:6a20:2d0b:b0:1d8:b060:37c6 with SMTP id adf61e73a8af0-1d8bce4272amr19010970637.0.1728956065840; Mon, 14 Oct 2024 18:34:25 -0700 (PDT) Received: from dw-tp.. ([171.76.80.151]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71e77508562sm189349b3a.186.2024.10.14.18.34.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Oct 2024 18:34:25 -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: [RFC RESEND v2 08/13] book3s64/hash: Make kernel_map_linear_page() generic Date: Tue, 15 Oct 2024 07:03:31 +0530 Message-ID: <0ecad6f4f0d71fd8eb92b437315e981d23a14bca.1728954719.git.ritesh.list@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 615FA1C0004 X-Stat-Signature: 5st81hsj4j63f6x37ediqocrapn5eh55 X-Rspam-User: X-HE-Tag: 1728956064-135502 X-HE-Meta: U2FsdGVkX1/SaHknPp8m9o7BBQZ6dA3/7GwIz3aQ4ey4U5zXl5IcTr2EAJQuVyULHpze5PRETe8trUZjGMhfE6L04v6Es8dktAZxQOpi5Nnsg92bZXSVQapm1dk6UjgLmh3lt0E1xqbQrvXvywVJ7WKzc6ykBr74PxP9knnYjdzA5bpM9v6EgDIEq49TZ7zfU/2PbCMnz9hkYAm5FQ1YT+gOBRYfshP+o16+WfLDGYpM1mE45aLklinfcK+5xy82KJ1Snsz7JRYQcOKlcLQG91aAZqXUuALs5rR8J9lf6noPCM24w5AH60Si2tF9Jkzm/OBLQLLRaCNr6OAbrAbHzc0fztIkjJO0iAi7fg8/XOxXvqYpmtav5H7DBWp2PDyly8ivU4/StavTSKXlxN9iureq8JocWz7/yqEeDfhKab+7fw4FYoFTxpOlbeJTMTI6N6hnUnxK8NxWgHFmV6mXKhPP3Uy7Cfdne8tQITvwinAw1F8s8dig9sAZZWrciD0NvxNO7EltVGwB1OPlbQzHe9KlN+8CaXoVLGj4yoRpE3z7Cm6p+G5CZzW4b6ZWITSfC3sNgshhxBQBH8tWgmXyAbVZMnikvfqZrIcWXP1OjpzPCAqGPUoABhM6br2ZPKb26Dy1UKxAv0eTJ/n9/ZOHtAAhLlYUbTZarGeG5ng6Jl3CO+gHYk+J3n418NQlsoB1LmVujaqVJ4HCkJ7mV0K2ajo2ndw52DOgBfh9hGQhWW/1VEI5jzK23hpcP61jA62ox4r6FdH9qna98m7KLyLbZn7Z25Vh0Tcj1jjXBsibqcUPJRUxTvVfebHjjUYf79EwTsMbjQsduFkkPbEReTzMy0OjRkqR+0fXlvIR63fr09zarVuWBqH3E/2/3KQjSI+9ZYLgdkxjKAVKH9Xw6MK7eauaneVYF5kgNPwY0rucXiC1LzckZoHLLJ2Wc3cvLjfTuFruQdaUSZNSmDCfIz9 zFLE1HNF 7tdsClr4qVeHPWheYXfaQYdrHVVpQMBDN5AAe6zh1+Cj0kcLthIVfrX2OrRuV2AxiSJBehVmW7QR+Aice780QsWtNF75CfbjeYwv0YpJmOq1TF+vT3pbdjoSpQWzqnC9GTo0SyhWrd5EUFnLVx7nwaAzwtMnv5Vffqc2ng7VzGiuxJM7wMYQpigfbgJtsa/4XNl/Gs5ah78iIm5+bjp3xmyiS6XN+4IcbP6zw4pqkarwSTup4rhoZCDx0vzmSKtypjrbZPSdlDSP3lnaiTvBYWyVxp/g2457RmB9kyHh6M1FUttZggbeYQjrYfsrLysvDXPaAVu2oEU7ocdmea4RUWyW+LA== 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: Currently kernel_map_linear_page() function assumes to be working on linear_map_hash_slots array. But since in later patches we need a separate linear map array for kfence, hence make kernel_map_linear_page() take a linear map array and lock in it's function argument. This is needed to separate out kfence from debug_pagealloc infrastructure. Signed-off-by: Ritesh Harjani (IBM) --- arch/powerpc/mm/book3s64/hash_utils.c | 47 ++++++++++++++------------- 1 file changed, 25 insertions(+), 22 deletions(-) diff --git a/arch/powerpc/mm/book3s64/hash_utils.c b/arch/powerpc/mm/book3s64/hash_utils.c index da9b089c8e8b..cc2eaa97982c 100644 --- a/arch/powerpc/mm/book3s64/hash_utils.c +++ b/arch/powerpc/mm/book3s64/hash_utils.c @@ -272,11 +272,8 @@ void hash__tlbiel_all(unsigned int action) } #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 kernel_map_linear_page(unsigned long vaddr, unsigned long lmi) +static void kernel_map_linear_page(unsigned long vaddr, unsigned long idx, + u8 *slots, raw_spinlock_t *lock) { unsigned long hash; unsigned long vsid = get_kernel_vsid(vaddr, mmu_kernel_ssize); @@ -290,7 +287,7 @@ static void kernel_map_linear_page(unsigned long vaddr, unsigned long lmi) if (!vsid) return; - if (linear_map_hash_slots[lmi] & 0x80) + if (slots[idx] & 0x80) return; ret = hpte_insert_repeating(hash, vpn, __pa(vaddr), mode, @@ -298,36 +295,40 @@ static void kernel_map_linear_page(unsigned long vaddr, unsigned long lmi) mmu_linear_psize, mmu_kernel_ssize); BUG_ON (ret < 0); - raw_spin_lock(&linear_map_hash_lock); - BUG_ON(linear_map_hash_slots[lmi] & 0x80); - linear_map_hash_slots[lmi] = ret | 0x80; - raw_spin_unlock(&linear_map_hash_lock); + raw_spin_lock(lock); + BUG_ON(slots[idx] & 0x80); + slots[idx] = ret | 0x80; + raw_spin_unlock(lock); } -static void kernel_unmap_linear_page(unsigned long vaddr, unsigned long lmi) +static void kernel_unmap_linear_page(unsigned long vaddr, unsigned long idx, + u8 *slots, raw_spinlock_t *lock) { - unsigned long hash, hidx, slot; + unsigned long hash, hslot, slot; unsigned long vsid = get_kernel_vsid(vaddr, mmu_kernel_ssize); unsigned long vpn = hpt_vpn(vaddr, vsid, mmu_kernel_ssize); hash = hpt_hash(vpn, PAGE_SHIFT, mmu_kernel_ssize); - raw_spin_lock(&linear_map_hash_lock); - if (!(linear_map_hash_slots[lmi] & 0x80)) { - raw_spin_unlock(&linear_map_hash_lock); + raw_spin_lock(lock); + if (!(slots[idx] & 0x80)) { + raw_spin_unlock(lock); return; } - hidx = linear_map_hash_slots[lmi] & 0x7f; - linear_map_hash_slots[lmi] = 0; - raw_spin_unlock(&linear_map_hash_lock); - if (hidx & _PTEIDX_SECONDARY) + hslot = slots[idx] & 0x7f; + slots[idx] = 0; + raw_spin_unlock(lock); + if (hslot & _PTEIDX_SECONDARY) hash = ~hash; slot = (hash & htab_hash_mask) * HPTES_PER_GROUP; - slot += hidx & _PTEIDX_GROUP_IX; + slot += hslot & _PTEIDX_GROUP_IX; mmu_hash_ops.hpte_invalidate(slot, vpn, mmu_linear_psize, mmu_linear_psize, mmu_kernel_ssize, 0); } +static u8 *linear_map_hash_slots; +static unsigned long linear_map_hash_count; +static DEFINE_RAW_SPINLOCK(linear_map_hash_lock); static inline void hash_debug_pagealloc_alloc_slots(void) { if (!debug_pagealloc_enabled()) @@ -362,9 +363,11 @@ static int hash_debug_pagealloc_map_pages(struct page *page, int numpages, if (lmi >= linear_map_hash_count) continue; if (enable) - kernel_map_linear_page(vaddr, lmi); + kernel_map_linear_page(vaddr, lmi, + linear_map_hash_slots, &linear_map_hash_lock); else - kernel_unmap_linear_page(vaddr, lmi); + kernel_unmap_linear_page(vaddr, lmi, + linear_map_hash_slots, &linear_map_hash_lock); } local_irq_restore(flags); return 0;