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 BBBABC04A94 for ; Tue, 27 Jun 2023 03:15:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 37BBD8E0002; Mon, 26 Jun 2023 23:15:37 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2DED38D0008; Mon, 26 Jun 2023 23:15:37 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F13238E0002; Mon, 26 Jun 2023 23:15:36 -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 D90BC8D0008 for ; Mon, 26 Jun 2023 23:15:36 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id B0EB5A0877 for ; Tue, 27 Jun 2023 03:15:36 +0000 (UTC) X-FDA: 80947062672.14.14673E9 Received: from mail-yw1-f172.google.com (mail-yw1-f172.google.com [209.85.128.172]) by imf30.hostedemail.com (Postfix) with ESMTP id E176280004 for ; Tue, 27 Jun 2023 03:15:33 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=GTe2EUys; spf=pass (imf30.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.128.172 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=1687835733; 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=RnNdr5PDFTKJu1h5zX1p1xVUKJvhUfKvVUh/w7ZbrdI=; b=T2+kty19NnC7Y+HHHRNgBuy9UfXxtzMcFwB3XVBXAsoqtS6ppER9hSvAV/g8v002W6ZzrM imjTDeMOg7755raTS6+7ogYp6HueXYddo0JWiR5qx1SSKyI8G6UfE5BMIBLCwMa1FpGvnp NIao+WrjS7/yKEtlzEwYdSk90YH5i7s= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1687835733; a=rsa-sha256; cv=none; b=8Kx3FXrH5VYSkK+x2apmipB7IUQytuZcD58AWeTzg7uZc3auEQvGmDGi5APnoeY7LCrwbE B+d3k8Y3xA4l+jUHYa2G7uD7lWzTUejRbIROPOhmRURMPmoHjvhmYQIOK+oFBBe/Zyuepv noqS/9XLXNnRE9+T4DfE+hRwbR4Ngr4= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=GTe2EUys; spf=pass (imf30.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.128.172 as permitted sender) smtp.mailfrom=vishal.moola@gmail.com; dmarc=pass (policy=none) header.from=gmail.com Received: by mail-yw1-f172.google.com with SMTP id 00721157ae682-5702415be17so30769927b3.2 for ; Mon, 26 Jun 2023 20:15:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687835733; x=1690427733; 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=RnNdr5PDFTKJu1h5zX1p1xVUKJvhUfKvVUh/w7ZbrdI=; b=GTe2EUys5qOsmL9h+39HkmdbRnOOR/ecm3IZWO97nmipqYf9WxPQOFqim+diknH7FN cktZXimy2BTWcqn/5d10bb15uuq3PUdsia+9j36BiOqVzXj30Geeor6rYSL1Rhj9WqCn LmJ9N5OLeEYa/H4vUyKvc7Otfz8SqaPNrXVtQODdE9ilutCJ24KAZJChe9ZmvWB1bUx1 7bpUWrAZkpPXIiT5JcrWxhsn1qZ9K0WItSWhparWMs+/rm9Q3PdTkYO+KF0D1GfwN1hv 0eQBee2svyGNdGSpwEO15WqpXr0WlpHBW3JMLWAP0NGZGcgLzbwqXYAJu19e1eeZo9JE G7Dw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687835733; x=1690427733; 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=RnNdr5PDFTKJu1h5zX1p1xVUKJvhUfKvVUh/w7ZbrdI=; b=KN9i3t7jOLlrqSYXfE53xQnSb9t024HSlP3XmRsL4aa7EVKr0BCicPUBfEZzABsvcN fsTqEO1N4uR6ymRKLmIBxoNj4CCvljtCzhb3kq3E5MstKvJ7qNziUu8d2IbeGuNI1481 tK0UK+rU4mf//uwCuLenqLEgF+mAYihK3ZgSe3xXx8aujFKxMZxEAZPMzms6hJnZQg5L usY75VDaeZ8kQQvUPV8HAFsOynEu4CR7CKlsc39EcnnWy1Xgwzk8DzCEcPU+JLESPIL5 skbLv51vqmX1bDGVLYvygjV4OTO1f2Y92CvsDvfz5cblzqAbos7napDBms1O+E5Hsdj4 QR/A== X-Gm-Message-State: AC+VfDzcublZsoE7Ldkl2UhX+6c9Ao0XmLkpIsjIlLs0BmUgMW1u949p ibSAYUV4cc12RKsSL9rja1o= X-Google-Smtp-Source: ACHHUZ42Y/0xAZG9OHSM8VrbwgLQ6VZ3weOziZPodRcVkI1essgSTHJwJyadoUyqzcMtcD2kr7P2zg== X-Received: by 2002:a0d:e005:0:b0:573:4d89:ecb5 with SMTP id j5-20020a0de005000000b005734d89ecb5mr19780303ywe.39.1687835732948; Mon, 26 Jun 2023 20:15:32 -0700 (PDT) Received: from unknowna0e70b2ca394.attlocal.net ([2600:1700:2f7d:1800::16]) by smtp.googlemail.com with ESMTPSA id s4-20020a0dd004000000b0057399b3bd26sm1614798ywd.33.2023.06.26.20.15.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jun 2023 20:15:32 -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 v6 12/33] mm: Create ptdesc equivalents for pgtable_{pte,pmd}_page_{ctor,dtor} Date: Mon, 26 Jun 2023 20:14:10 -0700 Message-Id: <20230627031431.29653-13-vishal.moola@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230627031431.29653-1-vishal.moola@gmail.com> References: <20230627031431.29653-1-vishal.moola@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: E176280004 X-Rspam-User: X-Stat-Signature: 6mh8w9odsr7k9tdn3at13h6t6nc4ziz3 X-Rspamd-Server: rspam03 X-HE-Tag: 1687835733-285870 X-HE-Meta: U2FsdGVkX19OFZhx929N42+xTrJ9GX+NvghnoSWdrRBgz0MKzE2qjkxYrq3mW9ch4HkYFFxeHNe4DdOxidToYH987t+Yu01gxwgsQ3ZdMjC4R0x6M+5bUm5cXiW/qQESL1+1vh16OfTgEOc2Z1s94E/m5+7Pwjbk/JLT4/rvD/r9+W9fDt+amgIphTd02nxZe+3ELj6rJmJvF2HEe3en5FLHElv54GU2sz81KRvaajwzMnNh5HBezfxVUrrhnMPOA39oA+03YQ9vV24ZsnzrfXzBtA1bAAQKcHXNWnGGXJSigPXniFJRb2CPXps2XxiadETlANxLu7mxldMIVl8lq2Ks1nIFyvjLusDGpnumfnbdts9o5cZkQpd8nFE0m4SiPs45s+sa9OAjK++YyvfT0XrehOtZ2vjO5AxKDs26OvcAIgHSEJjHPMyfFxWdl2N5we6QxujEenohzoxa3dbtB6oQrFWZuR0DzTdfJCXYq5yGY4niF7F6AuMSWF8jMXN5R4ns2wI4luyDPM/pD/uiEvklDCQjNLsgWRVHvTyUHlf8HehZlREA/PEiH4vFGaqs5++BIh+2QFY2zSFG3LqgB0617y8/owwqGCzg/sMN66gdK2ctImfupNWgYoyjn+5/Z8bt01SurOsKVhDeTXp0EG+lt/ikHVxKn5q5LLKgZJRNGZhR3/krjwClA+94G6p8LHWH+lR5AoLSTeANYBDFI5rM6fL4jpOngkvoPCyOeiAMTzOD7354GQv3ptIdvpywmwjg/nU25KVE6SdfiAjqp+vZrReU5y5hVPhegT48qrkOW1bcLtoT1Fn9UhiQzJcBy8xyMF3k0eTkCNBNzaxfCQi4nUpzNXK2EK47vk9GqavvlROr2cunh/ijWAThXVryZWQ1QVlRBQeuYBL2GBItPszOhoIwMuoLnJweMUGTbOEx0YMphYsC5uNo1ryQsxuT9gFM7TnkhPqP9kZ2lxE 9hh/DyUg FgIR9YEdmVSEo5e0F5l003WS347oXAsHmGcv6OkiHujmp7RNFuVFz3aejek02zoGysSsKJhR235cmU/MTR5vZyimNEEVFdLoZHFVzzuFvrkhLH9UYatbTwAX8Zzhh92dX+s/A89+WIl7A2nwS0zFH6/ul9Q+OIFuwNluJb6EAVzp9rKKcqTZMv5cNYG0aWTyqvmwZi6p1HkfGckuwSsANV/vdkv+HfoRzx483LQRAqf5HKjr94iyF4Hc6JvNMCgWPP81tI3u88mdJcYFDYjBxUDrseljgAg1Jm6WNJYGV+pJxKxSv9yP1zEt8F1LMJsBeDCeXu7z0CKOYfYwbfyBroOOKB6Rpe6Omr4SIkZnJ/gIcNVz7ahufTf/XCgDPyRlmUyCyW2RzCI3bYH/hgUeatkYboeGHIrmoO6osIBdgIHY5DSCNI2LbiV73wp8mNEraHugfLRKj7d9P+nofqxLCWnRpTwTSwcFm9tQC4WNUB7qJEGGZD2fX5+MjZ0hGSEQN2j8bghLzXRQwyqQaaaso/NRSU/ytu0IcYai07IVBeCmb1ptgZrBp3O+MpgGGwetxGN+3+p6vYpKffPhXQQUqmAz9OcGDZqO5lHzg3GgGRCJyIJs24LgZZtIOho27Ip72JFYUnuDKorL6n8M= 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: Create pagetable_pte_ctor(), pagetable_pmd_ctor(), pagetable_pte_dtor(), and pagetable_pmd_dtor() and make the original pgtable constructor/destructors wrappers. Signed-off-by: Vishal Moola (Oracle) Acked-by: Mike Rapoport (IBM) --- include/linux/mm.h | 56 ++++++++++++++++++++++++++++++++++------------ 1 file changed, 42 insertions(+), 14 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index 69e6d6696c44..356e79984cf9 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2859,20 +2859,34 @@ static inline bool ptlock_init(struct ptdesc *ptdesc) { return true; } static inline void ptlock_free(struct ptdesc *ptdesc) {} #endif /* USE_SPLIT_PTE_PTLOCKS */ -static inline bool pgtable_pte_page_ctor(struct page *page) +static inline bool pagetable_pte_ctor(struct ptdesc *ptdesc) { - if (!ptlock_init(page_ptdesc(page))) + struct folio *folio = ptdesc_folio(ptdesc); + + if (!ptlock_init(ptdesc)) return false; - __SetPageTable(page); - inc_lruvec_page_state(page, NR_PAGETABLE); + __folio_set_pgtable(folio); + lruvec_stat_add_folio(folio, NR_PAGETABLE); return true; } +static inline bool pgtable_pte_page_ctor(struct page *page) +{ + return pagetable_pte_ctor(page_ptdesc(page)); +} + +static inline void pagetable_pte_dtor(struct ptdesc *ptdesc) +{ + struct folio *folio = ptdesc_folio(ptdesc); + + ptlock_free(ptdesc); + __folio_clear_pgtable(folio); + lruvec_stat_sub_folio(folio, NR_PAGETABLE); +} + static inline void pgtable_pte_page_dtor(struct page *page) { - ptlock_free(page_ptdesc(page)); - __ClearPageTable(page); - dec_lruvec_page_state(page, NR_PAGETABLE); + pagetable_pte_dtor(page_ptdesc(page)); } pte_t *__pte_offset_map(pmd_t *pmd, unsigned long addr, pmd_t *pmdvalp); @@ -2965,20 +2979,34 @@ static inline spinlock_t *pmd_lock(struct mm_struct *mm, pmd_t *pmd) return ptl; } -static inline bool pgtable_pmd_page_ctor(struct page *page) +static inline bool pagetable_pmd_ctor(struct ptdesc *ptdesc) { - if (!pmd_ptlock_init(page_ptdesc(page))) + struct folio *folio = ptdesc_folio(ptdesc); + + if (!pmd_ptlock_init(ptdesc)) return false; - __SetPageTable(page); - inc_lruvec_page_state(page, NR_PAGETABLE); + __folio_set_pgtable(folio); + lruvec_stat_add_folio(folio, NR_PAGETABLE); return true; } +static inline bool pgtable_pmd_page_ctor(struct page *page) +{ + return pagetable_pmd_ctor(page_ptdesc(page)); +} + +static inline void pagetable_pmd_dtor(struct ptdesc *ptdesc) +{ + struct folio *folio = ptdesc_folio(ptdesc); + + pmd_ptlock_free(ptdesc); + __folio_clear_pgtable(folio); + lruvec_stat_sub_folio(folio, NR_PAGETABLE); +} + static inline void pgtable_pmd_page_dtor(struct page *page) { - pmd_ptlock_free(page_ptdesc(page)); - __ClearPageTable(page); - dec_lruvec_page_state(page, NR_PAGETABLE); + pagetable_pmd_dtor(page_ptdesc(page)); } /* -- 2.40.1