From patchwork Thu Jun 22 20:57:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vishal Moola X-Patchwork-Id: 13289608 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 619C5C001DC for ; Thu, 22 Jun 2023 20:58:22 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E76AD8D000E; Thu, 22 Jun 2023 16:58:21 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E25038D0001; Thu, 22 Jun 2023 16:58:21 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C52978D000E; Thu, 22 Jun 2023 16:58:21 -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 B6F708D0001 for ; Thu, 22 Jun 2023 16:58:21 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 8AD80140225 for ; Thu, 22 Jun 2023 20:58:21 +0000 (UTC) X-FDA: 80931596802.29.714303F Received: from mail-yb1-f181.google.com (mail-yb1-f181.google.com [209.85.219.181]) by imf04.hostedemail.com (Postfix) with ESMTP id B646D40009 for ; Thu, 22 Jun 2023 20:58:19 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b="IkBs/Ppa"; spf=pass (imf04.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.219.181 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=1687467499; 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=bhgUYiKwQSwYMGFv9d1r56wjiuPfdLCT9N5JwdJpvSY=; b=RmhbLiqaKZ9Wnf1AmCmx+2c03xyTgu6Yt4MOYJbobHGJSVHZIFdPz/SkBDmnNBfMtwo1Wl d/XKlcww335UMrU+ti9UAgvYQhBBBPhFxYLuDscDOuCz6rnToopF/cG/M2t5syux4vKPYP Y515PmKJ1xhL9jhKCfwF4ml8kfR9pPY= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1687467499; a=rsa-sha256; cv=none; b=Ch3MmXFcxHMMWrgl6kEUfc0TvcL4N7ovvxG03/EIHzTngo2SlMErN8EpLRxMg3L+YyQ3Ez vU+2jZRKgOHPYgeCYvNzm1lOVdGSbXzJHlQexDZq82Dbc8Z5jO/55Km6i6mM14BjuZ5rZ+ X4pDs/dNETek54TMbzAwG6zpOguGWvM= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b="IkBs/Ppa"; spf=pass (imf04.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.219.181 as permitted sender) smtp.mailfrom=vishal.moola@gmail.com; dmarc=pass (policy=none) header.from=gmail.com Received: by mail-yb1-f181.google.com with SMTP id 3f1490d57ef6-bacf685150cso7078843276.3 for ; Thu, 22 Jun 2023 13:58:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687467498; x=1690059498; 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=bhgUYiKwQSwYMGFv9d1r56wjiuPfdLCT9N5JwdJpvSY=; b=IkBs/PpafQMwMb5+bV+TjhgBJMISrd3r9Ehxv0D4bga5hDCjsodC2JnFe5fw5CuuNh oXzvywchS02bgspv2vVMsLaNaJfhQqRd4zMAT9dIGzvPtgGebpRn3vizNbCCeH4kxu0g TyHgRtXbQw9QJenBGoSSN+LcKZYEWvqLZfshqBtx5IJouxvVity8IJ3BMNOIhoxk8spN JqRw951qgrZvKDiFAsIL9Ao//k8BkssPPj/JxKTcUCZ9IjeC8TdTUdZgtY4aRKAk9cjf OLinZRYVomzL7Or7UYL6bwPiJppfDFOL1vHSgfsuBpqKRMQaWBk81ZwgHtszBi4jTAEe xuMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687467498; x=1690059498; 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=bhgUYiKwQSwYMGFv9d1r56wjiuPfdLCT9N5JwdJpvSY=; b=e2myt8hgCM3b8cqGlmwxgtw4rHFWhgNuYug6a27zNLmkkCCtBO6qtSNUuMSG8pgcV2 yInL/hJ/wrNhBto4bG7D0EiEpxoqRYz6KUf3NifklEFs8aZ/3QeeQdIW+kmE4zLD/WaN AYNgv8F9PeZ3wSysglqFnvqPM38sVGf/EH/GMzs+xee7hLFYf018EPA0ySkHJPn3fGDy eqAqECw+EURyK97HYG5SRmXr9jEOEPnKty4GP1L/YRLM8DW1aa1NxqsBMEwJF0dgw4vf MpNSZswL8FCOBTeSxlP9NK3y+r+HO0V2dIQDzruJeuwRXoaX3hCxr4KafV7anTJRmliP vJ0Q== X-Gm-Message-State: AC+VfDynw2YmQITKwkOHmJKWGwLyqUgWeZfH/Z82il+SPSMudJQzAzEn mdG9GUZNwmeXdpiEhl/9gl8= X-Google-Smtp-Source: ACHHUZ7Pa6VOZ8zc9ZXGMhVrxtFlOQ5CfM1HOMla01BhywdpE01k0n5trNDAUGdHgqy9w/StTvGJbA== X-Received: by 2002:a25:aaa9:0:b0:ba8:66fb:dd86 with SMTP id t38-20020a25aaa9000000b00ba866fbdd86mr17182535ybi.25.1687467498635; Thu, 22 Jun 2023 13:58:18 -0700 (PDT) Received: from unknowna0e70b2ca394.attlocal.net ([2600:1700:2f7d:1800::36]) by smtp.googlemail.com with ESMTPSA id d18-20020a5b0c52000000b00bc501a1b062sm1684937ybr.42.2023.06.22.13.58.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jun 2023 13:58:18 -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)" , Mike Rapoport Subject: [PATCH v5 11/33] mm: Convert ptlock_free() to use ptdescs Date: Thu, 22 Jun 2023 13:57:23 -0700 Message-Id: <20230622205745.79707-12-vishal.moola@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230622205745.79707-1-vishal.moola@gmail.com> References: <20230622205745.79707-1-vishal.moola@gmail.com> MIME-Version: 1.0 X-Stat-Signature: xzdunucsa384gh8zmsa76ykoykbo5fzi X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: B646D40009 X-Rspam-User: X-HE-Tag: 1687467499-265371 X-HE-Meta: U2FsdGVkX1+uE6wKrkIpWjVguGQU8f+YZ8M7SeaeRsrOTDVmJH2aUsEh6m7ad4H3BNScaEg6PeiBY/wjxvnoKQMbRz0m2k4rUoST9lJSNqBvMmanOyd7Efs4kt9C9tvQFQWCGwDoncRGz/d0zWcw3lEbuk/f5yr8op7v76FswtieX3PxaFIXFJGY0xFXXvu447HgDyKKY8jzGyvNPsMU+zx4T6B7unsvXhBhReAzSxQ7dBbMVjN/HCsM87kDTNxQf4kqAfHlZYN34shVxdFc6mW7/+m4ZLsi36xYrdy8C2HXT4tcEW2bsXH1kAMZvd9KU9bQjqVsRGPA9CTLdrOYIuz0tQv5Va6m1tOEmoxzPlcnvluV9eV7c9xxKrScgEIMA4DPdnkcvHBqZzuP3iJWAwhqjo5ND/mKyR3XI65jD3a/y8hE+Te/vVmIQQCdgN4fPDLvds5wGpx4mGkN+xtOwGEZHGZlepbV/QF2QBSuMku8byoKiO20Wysxi/eJsSkf7vKQf0HqY5q4UJRpX4oVTsy+/+2u4pXa+MRLELyxK0wdaOcpDVjIZcsVIsSqCTUF3DygIVjFUlUG165+dJscwKvklGcXtf6GOV3DPsGGxxiqdDt8UDbVgGpLMgW9BxJ7Q3ehlQh1zUBT0vkepMs7Iyg+NyyZwSdt/KAqR0sRx4lfMNMz2L7f+fXXxZuZL7rpLak/JVgWZgOKbT1paOQQfQOWLGeFWgpd8Hb9Wg9rfZe1o4Rf0x+eWL4Qm26EpD9VufmAxz5SRCl0nvzicyANvdLk/hRfHNXZMjZYItyuyBgENUDgUfnyUzt9OlcFVl+VPby5KxY6NuxDF7GynAZvvQpGPEJmWFkj8MdrwcFUaSnEBjVLPAVtSM9K+A8srTcHLeIcFzRjZKtvAbPA5YhWhL+LdgEX6MfS0n6JBVLZYCfh3dizqc4C/v2ewye9oViJmOtB3aaQpuBQkHmcVz0 cgOtc/os ofeUzjFoMnJasYMLnXk4xaD6INOthe1V6R32a+OWZy3UfvrmEy4g0owQ79jr+Z8hpSQJ/iGC5gcHj0hxlJhpoS1frMKOcgyqS15PTpvxJiZuAGwDiDlncqKakeW9m2+3PeyFRngvSgQhq2zco1kiOJYNYzoAMIZOhcZvWTgFyswACKCbFE7tbmSW0iYxnwvZLNnTvHEHSRu85BqEh7gY+8loRIjA8rSOgggX+C/m2rhBQ7vVmtQlyPSkqh2AbOU2/sBpSUsw5D/yai6Rm9wuSmkMOEYtDb3EUk+SpACLmD9DcWcWh3evhEK+HFUEtLuJy/roR0/qezQ2gLPsPXco1ILFs5gtpts5YCz+LmG/K1k23WMeCMsQ9BgtzZ4mvY3tdY2Yr68+6Lr8amuDTWiFws9Q9lKAWJ8Bub4p5bk44/Arxe5lDfY8yyQoaj3nzzSZNfQbKerUcdLS9DkRD1JoANX1ufB+xQtRvcw8/ksgtQwm8jiPTGJdj6AnJNOG/JlAg3v1s6c9LqKHdcEy1sC9HvoALNzN1cnmA2X1NAhsgZ2zp48mUVOmu2UsZ4VFvOUI3FjCrHyGbKr5bsGQsSmJ6agSoagVxLQEceS4SvIgeqtLE6/wCLiPm5n4sbfQ4w2oOxh/nFwcPPB1NjUs= 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) Acked-by: Mike Rapoport (IBM) --- include/linux/mm.h | 10 +++++----- mm/memory.c | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index 0221675e4dc5..69e6d6696c44 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2799,7 +2799,7 @@ static inline void pagetable_free(struct ptdesc *pt) #if ALLOC_SPLIT_PTLOCKS void __init ptlock_cache_init(void); bool ptlock_alloc(struct ptdesc *ptdesc); -extern void ptlock_free(struct page *page); +void ptlock_free(struct ptdesc *ptdesc); static inline spinlock_t *ptlock_ptr(struct ptdesc *ptdesc) { @@ -2815,7 +2815,7 @@ static inline bool ptlock_alloc(struct ptdesc *ptdesc) return true; } -static inline void ptlock_free(struct page *page) +static inline void ptlock_free(struct ptdesc *ptdesc) { } @@ -2856,7 +2856,7 @@ static inline spinlock_t *pte_lockptr(struct mm_struct *mm, pmd_t *pmd) } static inline void ptlock_cache_init(void) {} static inline bool ptlock_init(struct ptdesc *ptdesc) { return true; } -static inline void ptlock_free(struct page *page) {} +static inline void ptlock_free(struct ptdesc *ptdesc) {} #endif /* USE_SPLIT_PTE_PTLOCKS */ static inline bool pgtable_pte_page_ctor(struct page *page) @@ -2870,7 +2870,7 @@ static inline bool pgtable_pte_page_ctor(struct page *page) static inline void pgtable_pte_page_dtor(struct page *page) { - ptlock_free(page); + ptlock_free(page_ptdesc(page)); __ClearPageTable(page); dec_lruvec_page_state(page, NR_PAGETABLE); } @@ -2939,7 +2939,7 @@ static inline void pmd_ptlock_free(struct ptdesc *ptdesc) #ifdef CONFIG_TRANSPARENT_HUGEPAGE VM_BUG_ON_PAGE(ptdesc->pmd_huge_pte, ptdesc_page(ptdesc)); #endif - ptlock_free(ptdesc_page(ptdesc)); + ptlock_free(ptdesc); } #define pmd_huge_pte(mm, pmd) (pmd_ptdesc(pmd)->pmd_huge_pte) diff --git a/mm/memory.c b/mm/memory.c index 2ff14f50c7b3..8743aef6095b 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -5931,8 +5931,8 @@ bool ptlock_alloc(struct ptdesc *ptdesc) return true; } -void ptlock_free(struct page *page) +void ptlock_free(struct ptdesc *ptdesc) { - kmem_cache_free(page_ptl_cachep, page->ptl); + kmem_cache_free(page_ptl_cachep, ptdesc->ptl); } #endif