From mboxrd@z Thu Jan 1 00:00:00 1970 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 24D91C88CB5 for ; Mon, 12 Jun 2023 21:05:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7EBAB940013; Mon, 12 Jun 2023 17:05:09 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 725F794000B; Mon, 12 Jun 2023 17:05:09 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 57A17940013; Mon, 12 Jun 2023 17:05:09 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 43EE394000B for ; Mon, 12 Jun 2023 17:05:09 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 0F70DA0336 for ; Mon, 12 Jun 2023 21:05:09 +0000 (UTC) X-FDA: 80895325938.21.DA4FF53 Received: from mail-oa1-f45.google.com (mail-oa1-f45.google.com [209.85.160.45]) by imf09.hostedemail.com (Postfix) with ESMTP id 2B60D14001C for ; Mon, 12 Jun 2023 21:05:06 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=bBBhxHhw; spf=pass (imf09.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.160.45 as permitted sender) smtp.mailfrom=vishal.moola@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1686603907; a=rsa-sha256; cv=none; b=wd/anRCCKIo5bd4zGm/CWsG/w6cfbcYJLPXPWfkiXjSafqEnE3kYfDUx8jRedZ+NdWd8dN yFDuH0PucR4lqehYGp1oiYm85cODoWBglY6clEVKBckiEYKW1b+5NCyNps8tUmNOnoIkqx z0SQLALndgCokVJ/hXmHvtvzQLMfJ1g= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=bBBhxHhw; spf=pass (imf09.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.160.45 as permitted sender) smtp.mailfrom=vishal.moola@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=1686603907; 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=8r19jukxjbsIB2/Mx0wfUFI2Md2D0Tal9unGSXZoJa8=; b=tRPPW249Z21vm4hNwrkI0ajkCFThN/M6Ab+Du/U228OZW5zWv6Q6jNjTgGCaCg6az/o2f/ 4q89vxNDZyZeEdrg+l9xW7smeM3Vde/pMuaX2eqWK9PoMLWOukzjW0eiCRQ/21jd7f3HpL 0nlT1JFveZ4jXt2pc8Q3EezEECsEQZ0= Received: by mail-oa1-f45.google.com with SMTP id 586e51a60fabf-1a3897d9697so3578996fac.2 for ; Mon, 12 Jun 2023 14:05:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686603906; x=1689195906; 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=8r19jukxjbsIB2/Mx0wfUFI2Md2D0Tal9unGSXZoJa8=; b=bBBhxHhwNc0dlcaV8h2a4XYBtWHGe22hvKvpniF7KzCYgALGdtw6ZDxkDC9x8Aeb3u L7SfltNSUTPpMMAZAPZwSuq1VjJBBWwWiBaC+Bz46NWJJnZ6VvwLLTRGFLrpelYb2La+ Z5XBEGo2Lx+4Q4s65Lii1xiAS9gXRmCdJj9fBmU+7pl8WPQzciZNN9tEea4s2EymiOfj uSb7iAfMXBR2nKnU1BBVn2AVnOIW9drJ/7GGkqivFyyrk3Sd/OJyxdPtL4bbaX3dpY3E iXz0Nc/l9PDCGRHW4+I9NS6xogIi8lZKNWODyR8ULfa6yt07nj/HtSeI3w5uor1wLjvR igBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686603906; x=1689195906; 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=8r19jukxjbsIB2/Mx0wfUFI2Md2D0Tal9unGSXZoJa8=; b=EEouPmSHM/ZLLnPZIfQYzO5Syyin4D8vrC4FqMyYTbdcRLhCQovFXB3TfxfkAGaV6O 5IgSwtWpdQuhZVe5pAXRaAB4xYjTkun/P1RpC9fwwAH7btkWY0EdIwRTG9hOpqQuHFIr lSOPVgJ4TVNrnH635tE6F5tf8ikGsDCx/8oisQEDcoD2NeRHkx4SLcNtP/kn6/Z339eH GQR3xZ1JWFemOU8XBF3cEfTlt8yfkBkjCEJdShlatf7KTziDJI6qNB1QFWQgpO5t+SkJ uNqhWVbDDnqGsmG3FxYW80lgW6SfLx/u1A/Z2bjhqi1fFWUhzrilNfo445+P/n1a2/NP 5k0Q== X-Gm-Message-State: AC+VfDyXXVqSDw3HXYpnZWTlQlFf2qwwS0KzIrEJ8ZuKAN18M6fQZPen 0+RRNE+frbRetOEE6NwaY6o= X-Google-Smtp-Source: ACHHUZ6a/96wj8UsR1eewejCsUK79jNNmW6NRKVRY6WskMtRjwMJM0HWL1CF60/WviLDJygSxMchcw== X-Received: by 2002:a05:6870:989c:b0:1a3:4072:58f1 with SMTP id eg28-20020a056870989c00b001a3407258f1mr7318868oab.6.1686603906371; Mon, 12 Jun 2023 14:05:06 -0700 (PDT) Received: from unknowna0e70b2ca394.attlocal.net ([2600:1700:2f7d:1800::16]) by smtp.googlemail.com with ESMTPSA id s125-20020a817783000000b00569eb609458sm2757115ywc.81.2023.06.12.14.05.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jun 2023 14:05:06 -0700 (PDT) From: "Vishal Moola (Oracle)" To: Andrew Morton , Matthew Wilcox Cc: linux-mm@kvack.org, linux-arch@vger.kernel.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, 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, xen-devel@lists.xenproject.org, kvm@vger.kernel.org, Hugh Dickins , "Vishal Moola (Oracle)" Subject: [PATCH v4 10/34] mm: Convert ptlock_init() to use ptdescs Date: Mon, 12 Jun 2023 14:03:59 -0700 Message-Id: <20230612210423.18611-11-vishal.moola@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230612210423.18611-1-vishal.moola@gmail.com> References: <20230612210423.18611-1-vishal.moola@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 2B60D14001C X-Stat-Signature: sfhnxjq68mce11wrhmweccbo4eeno4de X-Rspam-User: X-HE-Tag: 1686603906-662556 X-HE-Meta: U2FsdGVkX1+Gs2caw5q2DWfYnC5XRUWYu1XCiuG/tpFmExREAiINvMxzAnd19nWxJd1N1JLeYy9ufp2uHDTLchc2/5kR/lGF9OEYyJRCYtmosTZ9ranq3OStQevibhPtvhegRm4tcpYzbY4t6JffiVAECPrlJWb0e29f6dyFac0ilYvz5Vi1TAEN8kgdWRevm+vOeBp1bCNBiwhbfxwCkJic4WEy84vrgKKTuHdQTx0gUmeqnXLdzdjiV5h4zB8sQVk+IUzVVMBF/unQnPIlWVK7FVLCEkHRib2eHLDPuLg5PPF6zHJjMbBT9q4JeZJkQNuEM7y8VEAob1B8upXQ8Tj++UJn3wflfNiM9k058/tpQbPHYDOlrJKiQouZ76+9fVfCibeVApB8kxXb3G5v+ZrYcOM37YSbZsci2WN3wAcTq5+JvS0cKYXN/w70CpjhhrHs9zegl3fSSOdHGSnmZKdzhSqbIbYX9tiNGDcbaz2PxJ3DU+ov2wyK9mulipAQo6iP9HXSQ2LdOGgB6m+eerXb/zJf4IWn2fAZmVhbJxWauLya2A6bYZPBtjsRUkKSxzC1e8ppLlorZF8bnH5vBICWrkxigOw5NfDqX4d2wLv19z0E7y5c27IVBHHgcKaazUEhxc+WHdCv0BftLvNDK/EXYA5PLJGtRwgeaq5thV36F3mgl7HoTiHuzGefF5RayoUmzss23ztYf4tHECr4FjIOaHGMKClyjq1wABLB36QN+bgJ3zsGNR6wYBKFujaa+5uaIMeimTDr79sPzLdTf1q04WhDu+tUprphywGQxUnW3yYKrILd5r8vrWVFJ+JezDHNdO2hJZ4dXm3GIYYSnTEu5bLcIgieZC/h7v64T6RwyUkIlqX8Z+Hu0gQcoWBoG1FdLhJCad0E80yG+O+JEkMYppSTUPOZOzY1kLYZ4IT2ft54R00wH/KJ52Jg09nw+fofiA2P9/frlLRnwMq Bpd718Yb ft6kKDjQKZYHcCQ2UnRBlaekDBI1H3QUH4qQU6DGocOwQSvwQT/ErEzYNleu7DWQmXHUebXCeXlHlXe05nkvb2rV26fnf/qdM+aKASfDZZW3SUDMuxgkCsgQEW83IdQaVXAZk7RMF5dpeyrJcFuTRfHgk01THopeTXGXcvkjAMaVHdm2zN0yuf2eiBRXQOutfrftEiZQwwwhqesBu+MaCrqsIdwZtnC66KEhLy0/taXbuE/IaGMUkUyUPjHiuNb+Zz1bPhnzdEXfxMrHMjqffk4AemJxqdgCEiZfmCOCt1dVLtJwkJRFSglaG8Csgmcy2hQ3ptG7dxqWuVfTdxULNjkIuWl5VBZxlRUIUDF5GXA6ULTFN3W/HQXNUqt+HEKEE/KCRAw7TczKghCyVxs2/k7tG5vrmt/gYlAYAQmhDiKU5XzC/QIBEa+EnH4muq+95anG/2IdMiecGJ1cwNiaXnpA3jYodLcWX2wH1x5aGbklOt3VFwPadElGW7IddZVrjh02hjOinNWdqJNnzXrgER7dq8xhbRkmrmafu 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: This removes some direct accesses to struct page, working towards splitting out struct ptdesc from struct page. Signed-off-by: Vishal Moola (Oracle) --- include/linux/mm.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index daecf1db6cf1..f48e626d9c98 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2857,7 +2857,7 @@ static inline spinlock_t *pte_lockptr(struct mm_struct *mm, pmd_t *pmd) return ptlock_ptr(page_ptdesc(pmd_page(*pmd))); } -static inline bool ptlock_init(struct page *page) +static inline bool ptlock_init(struct ptdesc *ptdesc) { /* * prep_new_page() initialize page->private (and therefore page->ptl) @@ -2866,10 +2866,10 @@ static inline bool ptlock_init(struct page *page) * It can happen if arch try to use slab for page table allocation: * slab code uses page->slab_cache, which share storage with page->ptl. */ - VM_BUG_ON_PAGE(*(unsigned long *)&page->ptl, page); - if (!ptlock_alloc(page_ptdesc(page))) + VM_BUG_ON_PAGE(*(unsigned long *)&ptdesc->ptl, ptdesc_page(ptdesc)); + if (!ptlock_alloc(ptdesc)) return false; - spin_lock_init(ptlock_ptr(page_ptdesc(page))); + spin_lock_init(ptlock_ptr(ptdesc)); return true; } @@ -2882,13 +2882,13 @@ static inline spinlock_t *pte_lockptr(struct mm_struct *mm, pmd_t *pmd) return &mm->page_table_lock; } static inline void ptlock_cache_init(void) {} -static inline bool ptlock_init(struct page *page) { return true; } +static inline bool ptlock_init(struct ptdesc *ptdesc) { return true; } static inline void ptlock_free(struct page *page) {} #endif /* USE_SPLIT_PTE_PTLOCKS */ static inline bool pgtable_pte_page_ctor(struct page *page) { - if (!ptlock_init(page)) + if (!ptlock_init(page_ptdesc(page))) return false; __SetPageTable(page); inc_lruvec_page_state(page, NR_PAGETABLE); @@ -2947,7 +2947,7 @@ static inline bool pmd_ptlock_init(struct ptdesc *ptdesc) #ifdef CONFIG_TRANSPARENT_HUGEPAGE ptdesc->pmd_huge_pte = NULL; #endif - return ptlock_init(ptdesc_page(ptdesc)); + return ptlock_init(ptdesc); } static inline void pmd_ptlock_free(struct page *page) -- 2.40.1