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 45D24C77B7C for ; Mon, 17 Apr 2023 20:53:09 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4ECC5280001; Mon, 17 Apr 2023 16:53:05 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 473E1900004; Mon, 17 Apr 2023 16:53:05 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 25167280001; Mon, 17 Apr 2023 16:53:05 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 1679F900004 for ; Mon, 17 Apr 2023 16:53:05 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id E56F716055E for ; Mon, 17 Apr 2023 20:53:04 +0000 (UTC) X-FDA: 80692082688.13.011E9EA Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by imf18.hostedemail.com (Postfix) with ESMTP id 22B991C0005 for ; Mon, 17 Apr 2023 20:53:02 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b="Fq/GP8pc"; spf=pass (imf18.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.214.176 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=1681764783; 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=WrZX7kBoYSlYOsS+wVtDQN8RsK5AFCnoOOzdjwi5Mms=; b=lQfCWXRSMubwFB6VdEvYqheLZzPS1UNWXDksWHmGVkKC9iH44rG1zy0nIINvKavJ8KdvNZ r+QLK6cj/UA+20Zirv148LgTW8mlIK5TjJwhsUCW5A2DLpHsfNFf5E6A6P5aiPtJJ7dA10 DEW/m4fdyWDskpBm3phNRI4vtox8YUA= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b="Fq/GP8pc"; spf=pass (imf18.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.214.176 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=1681764783; a=rsa-sha256; cv=none; b=FqFjgoMB2S6oGaTz3otVCHnnkxD5wP99x0m+WiHOy/e/CAt2xcm5E5aYdZy2sBN/M8k/jj f+C9G7y5uQgjCG2u+Z3M97RYF2E9lnuhGyw9egVbbnxr4pv/Oo9gmefIp30aKuj21ekQ2/ GVDAlvsjraS5J9VLw61q1QLXZ0EDJoI= Received: by mail-pl1-f176.google.com with SMTP id l21so9393475pla.5 for ; Mon, 17 Apr 2023 13:53:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681764782; x=1684356782; 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=WrZX7kBoYSlYOsS+wVtDQN8RsK5AFCnoOOzdjwi5Mms=; b=Fq/GP8pcdLi4I5bPiFEsvLaXpxmzLee60TMK8PZJIeuQRzzOkEw4LNRxem1TjMHkl4 hpoJjh3mkwkBNIc+7ZgY54HKylkrI6wgo3KFZgMqWIFkgvOs6SvSJyDnyNXKU57Vfgni F3o9PaXHz7p6eZRgp/mKtHM6HxVxSp+JnGgjpmMtA2nsWbkEb7dNgfcs3WzKBla+e/KK mEc/vn9ckYnWIktc03O3OhGV7y0sYxPsn1QEH3DBGZVQjs25sE8N0p2VjcijmIU6liuv XPjI1oYrX0OJGyw0BE4l6r4tCUbdIF44UY/L4uGFZKlEP+7PRKuryCCDJJcwRQi8c96H TYTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681764782; x=1684356782; 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=WrZX7kBoYSlYOsS+wVtDQN8RsK5AFCnoOOzdjwi5Mms=; b=VtP2zFhJ52EzAFod8U0HXHJHiYOsBxzBTul7BzfzWZtJlLH+nRHke0OerjXJ83X9rJ GbqZajUOm0CjSihLqp3LXJzk/7jZbyKSVudOmaWC5smaP7RmItOhZNDi9V6JE9bND0cy 7NxLjUezbeOjFzNBdtfEH0q/wOr6Xj7nzepIBHqbPh2qXr52N/uQZAojACpDT79JlAn2 xs9NZXS7x5+rlXwgeMsNZJKvZsYtXeZ/mKMHXxe+NiCP2nCPpTrxY/JNMEUgBSM8xq1Z 7K9WluOuGlA2cuLUJqioJMY7QjVYLaqNFYuyRcixv7tgSdhtLGoK/DgvzWJvhBdwvxaB H23Q== X-Gm-Message-State: AAQBX9fmc66gXrICgxCKYAqw0YmdC9IWRAnATn03eyeY5Gmn7PgIE473 xO9XaclW4b+OekCuNHlYTSI= X-Google-Smtp-Source: AKy350ZKSmY2j825YUr7PKp4UY4ecmOCun/8MK3oszIbqT0tc1tYYx3cO7v8JESnTYGwYaXHIhiESg== X-Received: by 2002:a17:902:ecd2:b0:1a6:9671:253e with SMTP id a18-20020a170902ecd200b001a69671253emr219179plh.47.1681764781984; Mon, 17 Apr 2023 13:53:01 -0700 (PDT) Received: from fedora.hsd1.ca.comcast.net ([2601:644:937f:7f20::c139]) by smtp.googlemail.com with ESMTPSA id h7-20020a17090ac38700b0022335f1dae2sm7609707pjt.22.2023.04.17.13.53.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Apr 2023 13:53:01 -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, "Vishal Moola (Oracle)" Subject: [PATCH 12/33] mm: Create ptdesc equivalents for pgtable_{pte,pmd}_page_{ctor,dtor} Date: Mon, 17 Apr 2023 13:50:27 -0700 Message-Id: <20230417205048.15870-13-vishal.moola@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230417205048.15870-1-vishal.moola@gmail.com> References: <20230417205048.15870-1-vishal.moola@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 22B991C0005 X-Stat-Signature: zy87h38uc9uu3sqab5tr3qagqqjei8ae X-Rspam-User: X-HE-Tag: 1681764782-945206 X-HE-Meta: U2FsdGVkX1/XDxunHW3/frISaOYlhrvz4zlOZACzuHAErGq5+8bknxtYZC4F+d+xrf9cO1stDcJhVNQfGYdZFBWfLh3Pm/nUv8sfiPH1ADfr+8mjGOpooGjK+MdwWumUoCvsI+4Au8sACsi2bbq4ExYhDu6m/f6aYjrJKrKSFnD8EV49/NE36TW0NpgeCsHSChYgXDM7mjrMTNbzDU2F3Xo2ydcgrGyUu8rEr/nHjUO9/tuKwOle5UAJKgNFAiEjIE2Tkhb7b5uwi/gbnVqrjXuWYfFdCjDwlqVEmnbvsThO+amCXzpgy4cKUGnJxNjIzVoOtrhn92fBaEL6Nol94fMpH2H3ziCE6pqJeu0sYYN7KSxHgCnbttCXtrXZCXbit0t5/dtY3N8FPZ7eOfymm4p6d92y80fWetEHH1EG1j0NeXuqE2R3/BzCCUwIXLz0J03h8xfwVCbrk9Az9ow2iHpWuaILBZgQbhJdiMuNAPXfozdFze4SGzZu24Qm0U7Zo6rl9lxiqDajTsd/i1fhWnWNf2CyiAgC9QJFThOUuKzW/YuenoaLZPFGf7QBzbob2wHWYnGOjLzzhMFFtz+ciQ2KTIZA1OK+wecE1q2GdKlAl8RLp+V+0OT2mYYKYfr2eD2ZHCXsjGrh/+viBrxdp0s9XGpXA9zBZXriyjEahi4dOgNQ8GYw1T12+qEot7McapowyBeHqdNgeQfKG+2w5sFVsZgHkQwvCxL0JsfUGH8FVB4DODCX77cFSv4c6iX+FtMudnOc0alKfqFOnbHcTJHlzeIbtfEtbmiEgHutAXUD1J6KNVlm2OSB52P5OGvofSgQ1BcWdS/0gfgJrWhc/o3XGSxW2XJXNLHdBmVIZoG0y3G3hw+OVK+w5RgoNsBINsDR+qhS+dh8ekGOueEwQGXW/0R4rCsvUE8LffxqPra850DVduhBGSLxap4+DQdE6PiqFdtHjihr0XsseL1 43Dlq+9d dungdrP1ogGiwiE2Um5Z/+u4aRBGj7LtBvYwhoAcXmbZyqCigTCgC/3+lOWQkV6xodrFqH2WP9/CV457EQYSZGkzH/Ec9j/+2Me1RkWzZIc9vttk513dDY9muJ3opWtDnb4SOOHNuABUNS8QSvVW/IV89/bthmhh++UvGuEDS2A9fU257lxbTbjxnsiDBfjK6FvyZtE2Q93ZL8+zwPylpYt6lSxjzWbfE51abW+Fut+uLm/ZzjSGup/0YZ+He6q+R6fqznxLfM3KwqvvIbgjXrC+tQAqnS7gkZ1hfOFLdAjKsFQ4h9IIGmGzY0SYuNz/UADV7UhsHnAo3SV1I0YXqX94E/bqVXEjlqxll8ZrvTvn2row67ZbsHfSYNOScd8CalCk8FqMkxA7deKR3dkc2v893vSXlUp1ugC9SMW5bUF+Kmfpe5Ur/yE+Y4SBVoDQX15thXuKI/TcVGus3DvtKPHPdanmbOXHKDUyRzFLp9egJW5l/3zGs+d6qKu8fI2TbyEguol4RNveM8soySkHGHXstvJ/nFZuY4EAeZp1549UKhWNY+wml0WV3KbrBubuMH8y/zQUcybzSaEOBFmjcsma9o5jK1uPOEGbO 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: Creates ptdesc_pte_ctor(), ptdesc_pmd_ctor(), ptdesc_pte_dtor(), and ptdesc_pmd_dtor() and make the original pgtable constructor/destructors wrappers. Signed-off-by: Vishal Moola (Oracle) --- 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 17a64cfd1430..cb136d2fdf74 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2847,20 +2847,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 ptdesc_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); + __SetPageTable(&folio->page); + lruvec_stat_add_folio(folio, NR_PAGETABLE); return true; } +static inline bool pgtable_pte_page_ctor(struct page *page) +{ + return ptdesc_pte_ctor(page_ptdesc(page)); +} + +static inline void ptdesc_pte_dtor(struct ptdesc *ptdesc) +{ + struct folio *folio = ptdesc_folio(ptdesc); + + ptlock_free(ptdesc); + __ClearPageTable(&folio->page); + 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); + ptdesc_pte_dtor(page_ptdesc(page)); } #define pte_offset_map_lock(mm, pmd, address, ptlp) \ @@ -2942,20 +2956,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 ptdesc_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); + __SetPageTable(&folio->page); + lruvec_stat_add_folio(folio, NR_PAGETABLE); return true; } +static inline bool pgtable_pmd_page_ctor(struct page *page) +{ + return ptdesc_pmd_ctor(page_ptdesc(page)); +} + +static inline void ptdesc_pmd_dtor(struct ptdesc *ptdesc) +{ + struct folio *folio = ptdesc_folio(ptdesc); + + pmd_ptlock_free(ptdesc); + __ClearPageTable(&folio->page); + 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); + ptdesc_pmd_dtor(page_ptdesc(page)); } /* -- 2.39.2