From patchwork Tue Jul 25 04:20:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vishal Moola X-Patchwork-Id: 13325725 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 50080C10F19 for ; Tue, 25 Jul 2023 04:21:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DF5D76B0089; Tue, 25 Jul 2023 00:21:36 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DA6766B008A; Tue, 25 Jul 2023 00:21:36 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C4554900002; Tue, 25 Jul 2023 00:21: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 B53CE6B0089 for ; Tue, 25 Jul 2023 00:21:36 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 88080809E6 for ; Tue, 25 Jul 2023 04:21:36 +0000 (UTC) X-FDA: 81048835392.11.FE73748 Received: from mail-yb1-f179.google.com (mail-yb1-f179.google.com [209.85.219.179]) by imf19.hostedemail.com (Postfix) with ESMTP id B62691A0004 for ; Tue, 25 Jul 2023 04:21:34 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=OoN3UWmL; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf19.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.219.179 as permitted sender) smtp.mailfrom=vishal.moola@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1690258894; 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=sltDOqqNfHEtvz8jLXUjW/r74sJCuRKUMVTEbSHBWCo=; b=TbMqrw/0dxLYAeu0sJ06+G+nxu7/t8p2lBdhWZyFn31W4SEXKAHl8krcxa0owmKjadteVp 7TgkmJO6iXyrh/0zan0QfWJixz7+FrYnc6BwaWKtzuIe3Am+IVX30ONFfs2Dym14cZaHHq zIkb01nFsdPGPtWcCIaWesQVcEHaq8E= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=OoN3UWmL; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf19.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.219.179 as permitted sender) smtp.mailfrom=vishal.moola@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1690258894; a=rsa-sha256; cv=none; b=qfyNcOPwumgwE0HQu9lEHZRa9LVbuDIVmEqhAQX0X1nIFf3F50O6tUbXH2pElGbcRDSsk+ lCHkgNKZV8OBuHUJCJLkLtc21LUi05goblqXFYI1Vl78a1Lxb/3bPZ+nYGiwIuuxpzOGAv W+HDv2trNBMtIIEZnujHwrpXWESEe7Q= Received: by mail-yb1-f179.google.com with SMTP id 3f1490d57ef6-cfd4ea89978so5442764276.2 for ; Mon, 24 Jul 2023 21:21:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1690258894; x=1690863694; 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=sltDOqqNfHEtvz8jLXUjW/r74sJCuRKUMVTEbSHBWCo=; b=OoN3UWmLSCjyxYbzaa/VyreR9Zp9zZE7q4yjWoRCcej2BHg4aQ044HHkVDn/SawDGs xygKZwOWRrg9shT9yAucyLF6JUhOidpReQLO08WoWlOww74TOvMA9ViH1KwkS5HDFQJa y+AyGlFm7eQ/xHxPvinfJ1GONUFKOJqagJ2BY2uxKaAzYfrmCGsCa4yr7xv8/m49BRfU KlXVshXWDHbntXMlZI7+vEacDxTrUH1emR9hZmFm4q/PkdnrRRqZ8ALZY/gtIumGa75s 4tL6H+cr1eSITvTUPxxUzr3WyxhZ30248GorV0XuK4prnVd3rVvMT55DDWK1kXMXlQb2 U/Ig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690258894; x=1690863694; 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=sltDOqqNfHEtvz8jLXUjW/r74sJCuRKUMVTEbSHBWCo=; b=ZhxVF0OufHk9D8btZpeilYKkNzBPzfjReKQ6cvrkaS8HTRADj04CfrVEEqhiJkQt1Y RI61bHUf7Let0MbvfR5ZCoz04EznL+xYfB8wpnLi3zbka+bg5dw0JPT4wVXY0yW9HsUx EjLHNUs/0Ez+RoR20mubE/Y/HOUiCV/y6DPhpcNheYwCIhu2qNYXrcPBSNmMqeok5nfQ B5VeGyENl7irGvsFdohqEBxLdFMVNtug++hx2pNKFTxLixWOUgBXf9eKmwioqiqNkHzd 8oUo6NXC0qqcbo1drClgXiyhDydWZ7BNWTRw9ja3i4DbzalapRD+aLxOk+pUvPersO6y e6AA== X-Gm-Message-State: ABy/qLYGvyZCe9/qHW++ApoOpM3NwG85TqUj0BiGMyF3QSqNfs4+eDOM FWeH8BpLSVHtSGDvO0nl+S4= X-Google-Smtp-Source: APBJJlHsEM8PJvWhxaYGxDCv9CFh7IDA0XQcYTrJ3snbNygB4DE40wKDxkk+qw9NHN2b60Di5RWY+Q== X-Received: by 2002:a25:f908:0:b0:d08:7ffc:c0eb with SMTP id q8-20020a25f908000000b00d087ffcc0ebmr6392710ybe.19.1690258893793; Mon, 24 Jul 2023 21:21:33 -0700 (PDT) Received: from unknowna0e70b2ca394.attlocal.net ([2600:1700:2f7d:1800::16]) by smtp.googlemail.com with ESMTPSA id h9-20020a25b189000000b00d0db687ef48sm1175540ybj.61.2023.07.24.21.21.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jul 2023 21:21:33 -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)" , Dave Hansen Subject: [PATCH mm-unstable v7 13/31] x86: Convert various functions to use ptdescs Date: Mon, 24 Jul 2023 21:20:33 -0700 Message-Id: <20230725042051.36691-14-vishal.moola@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230725042051.36691-1-vishal.moola@gmail.com> References: <20230725042051.36691-1-vishal.moola@gmail.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: B62691A0004 X-Stat-Signature: 8hf6oy43yqubrrdhqcgcjiasxpwzoh6x X-HE-Tag: 1690258894-514519 X-HE-Meta: U2FsdGVkX18q6/gZ2DhsmJIFK6xhhehV1rLto0Lrk3x/wYGQ+plNIuJPq290PijGa53rbO7ooZjqR3qHHDTJtKB3mAsAhlkvuWhiUpfuWcE72s0DdbKAVa4RdjBih2m4V5Pl2+EzPkhiajak8kXk1Qz07DzYjL1+G2MwxtdvIbpBMepg+AdKVou52ldVvBRPgKUpbZKwtv5i6DDMJ23I+v/ag1aILKxpPqT6/wQOoHIOpk4qEg9Ef4pP2skwydaqvq3EZsFAsp67FFX1TJWUBz/orP65006XJ36zPENzq5DKX/Y5cF0CR/MJMfuKS8TLHxSdvEWaQcmRy+nM0KeVYSlmnSXyvGOthqqTWn7T2hNSHco48n/uEo3OqwUy8PxZSE8kZkv7sZLFGlBJBcBs5VybCvqiSOGkIE30Lp7P+YJyH6I5p+yjvd1eR2wZaQjpd56pGGN1N8MbufBWdYKChKM446RfxvOxIfMT4xx8wKGfdtegFBBYmZZuFFM823tgTt2xyZ6C6ozfasHALh4EL46k/32/DP4tHhyThRpgJxjemM/qUHFAnAeqxqFiVsHwUtOtW+BkHIAVMzv0wuwXxcy+WsZInL2rvby3SMIaOIOkIip382EqooUNSDigYUZGKf+P6mU4c7rptLc7WJq6ObkQ+ET7wMmSVf7tZDU4Ko8DEEN58YWqY7eCq/HC+HwlgwEZT9E/V3xLigRxIo7DEGzUU1yGt6f745rErJ70cb100Cz6Y7OFsHejWjIdK16eg6KuM1r/v52rDcqROiNEl0d/mTstpH4TQgXNxVHQR1yfY3KLuf9Ct/WLgTMEED4PUlrK3VNcMnyJDRBV8oyRkYeI6js2Aij0BjRptnNU+DtbV8a018WhSfNmvWF97YFM1Yi3UY/O9vQ3i6uWCjIPlQe7ZNJ17+t1FrnAxh4zXEZqBYr9Ublabh8MP5ovImObIBMDSZKUYpFrFhEZWL+ aJvG9op7 +euBmUr0kgsIBvWc0gsd4z6w70iOq3lnE1XwYQWoyPG3NOtCUebtDZYHYmyu6gFgw1UWCYfY2NsxaFk40AS6ONFkGcUyCmnIvXIi0TyZOUTLx30e4FQOtjBeCBGMUu6Or/NhqD/SxhiIpj0Qk5hxr4zKfG373ljLGiwWeOk786WPRRZ16QXXq82NZz6CZpQLxKNVp2pLqa8p6sG6bqhOPmP2TW+PoUw85ukUS8GRlO/n7m65kHjkTrrpLoz8qM1gqg71FeikyGvQZNFDTUfcTaAbte+C66/N1tAXDO25g+5gNQ2NYJVYsMQ+SnCrordurs9r1kWflc/8qaSya+iiEksavo3/H1fpuEqLfBL8qnTlcxn6nY4m2nhdLu8LrDmXN8CsxdGXYBMI4fGyOdcq83edtlGwZnl9LGKszpJHtMgjFvNlU+Jibc7U4Lxb2oad9Eul5Yv7Sh9xVkCyBw2bN4l/L00XPT01HdMygH3SHmMPJVkRpfWyE+VRCvi3DOqm2TsdJ0WUOtIRFCcTdMY5MjEPC0g== 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: In order to split struct ptdesc from struct page, convert various functions to use ptdescs. Some of the functions use the *get*page*() helper functions. Convert these to use pagetable_alloc() and ptdesc_address() instead to help standardize page tables further. Signed-off-by: Vishal Moola (Oracle) --- arch/x86/mm/pgtable.c | 47 ++++++++++++++++++++++++++----------------- 1 file changed, 28 insertions(+), 19 deletions(-) diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c index 15a8009a4480..d3a93e8766ee 100644 --- a/arch/x86/mm/pgtable.c +++ b/arch/x86/mm/pgtable.c @@ -52,7 +52,7 @@ early_param("userpte", setup_userpte); void ___pte_free_tlb(struct mmu_gather *tlb, struct page *pte) { - pgtable_pte_page_dtor(pte); + pagetable_pte_dtor(page_ptdesc(pte)); paravirt_release_pte(page_to_pfn(pte)); paravirt_tlb_remove_table(tlb, pte); } @@ -60,7 +60,7 @@ void ___pte_free_tlb(struct mmu_gather *tlb, struct page *pte) #if CONFIG_PGTABLE_LEVELS > 2 void ___pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd) { - struct page *page = virt_to_page(pmd); + struct ptdesc *ptdesc = virt_to_ptdesc(pmd); paravirt_release_pmd(__pa(pmd) >> PAGE_SHIFT); /* * NOTE! For PAE, any changes to the top page-directory-pointer-table @@ -69,8 +69,8 @@ void ___pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd) #ifdef CONFIG_X86_PAE tlb->need_flush_all = 1; #endif - pgtable_pmd_page_dtor(page); - paravirt_tlb_remove_table(tlb, page); + pagetable_pmd_dtor(ptdesc); + paravirt_tlb_remove_table(tlb, ptdesc_page(ptdesc)); } #if CONFIG_PGTABLE_LEVELS > 3 @@ -92,16 +92,16 @@ void ___p4d_free_tlb(struct mmu_gather *tlb, p4d_t *p4d) static inline void pgd_list_add(pgd_t *pgd) { - struct page *page = virt_to_page(pgd); + struct ptdesc *ptdesc = virt_to_ptdesc(pgd); - list_add(&page->lru, &pgd_list); + list_add(&ptdesc->pt_list, &pgd_list); } static inline void pgd_list_del(pgd_t *pgd) { - struct page *page = virt_to_page(pgd); + struct ptdesc *ptdesc = virt_to_ptdesc(pgd); - list_del(&page->lru); + list_del(&ptdesc->pt_list); } #define UNSHARED_PTRS_PER_PGD \ @@ -112,12 +112,12 @@ static inline void pgd_list_del(pgd_t *pgd) static void pgd_set_mm(pgd_t *pgd, struct mm_struct *mm) { - virt_to_page(pgd)->pt_mm = mm; + virt_to_ptdesc(pgd)->pt_mm = mm; } struct mm_struct *pgd_page_get_mm(struct page *page) { - return page->pt_mm; + return page_ptdesc(page)->pt_mm; } static void pgd_ctor(struct mm_struct *mm, pgd_t *pgd) @@ -213,11 +213,14 @@ void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd) static void free_pmds(struct mm_struct *mm, pmd_t *pmds[], int count) { int i; + struct ptdesc *ptdesc; for (i = 0; i < count; i++) if (pmds[i]) { - pgtable_pmd_page_dtor(virt_to_page(pmds[i])); - free_page((unsigned long)pmds[i]); + ptdesc = virt_to_ptdesc(pmds[i]); + + pagetable_pmd_dtor(ptdesc); + pagetable_free(ptdesc); mm_dec_nr_pmds(mm); } } @@ -230,18 +233,24 @@ static int preallocate_pmds(struct mm_struct *mm, pmd_t *pmds[], int count) if (mm == &init_mm) gfp &= ~__GFP_ACCOUNT; + gfp &= ~__GFP_HIGHMEM; for (i = 0; i < count; i++) { - pmd_t *pmd = (pmd_t *)__get_free_page(gfp); - if (!pmd) + pmd_t *pmd = NULL; + struct ptdesc *ptdesc = pagetable_alloc(gfp, 0); + + if (!ptdesc) failed = true; - if (pmd && !pgtable_pmd_page_ctor(virt_to_page(pmd))) { - free_page((unsigned long)pmd); - pmd = NULL; + if (ptdesc && !pagetable_pmd_ctor(ptdesc)) { + pagetable_free(ptdesc); + ptdesc = NULL; failed = true; } - if (pmd) + if (ptdesc) { mm_inc_nr_pmds(mm); + pmd = ptdesc_address(ptdesc); + } + pmds[i] = pmd; } @@ -830,7 +839,7 @@ int pud_free_pmd_page(pud_t *pud, unsigned long addr) free_page((unsigned long)pmd_sv); - pgtable_pmd_page_dtor(virt_to_page(pmd)); + pagetable_pmd_dtor(virt_to_ptdesc(pmd)); free_page((unsigned long)pmd); return 1;