From patchwork Tue Jun 27 03:14:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vishal Moola X-Patchwork-Id: 13293726 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 77FA2C04FE0 for ; Tue, 27 Jun 2023 03:15:30 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D69B68E0003; Mon, 26 Jun 2023 23:15:29 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D17858E0002; Mon, 26 Jun 2023 23:15:29 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C06398E0003; Mon, 26 Jun 2023 23:15:29 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id ABB668E0002 for ; Mon, 26 Jun 2023 23:15:29 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 8BD3AB0056 for ; Tue, 27 Jun 2023 03:15:29 +0000 (UTC) X-FDA: 80947062378.20.E039BC9 Received: from mail-yw1-f174.google.com (mail-yw1-f174.google.com [209.85.128.174]) by imf22.hostedemail.com (Postfix) with ESMTP id AF124C0005 for ; Tue, 27 Jun 2023 03:15:27 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b="pvA/vO4M"; spf=pass (imf22.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.128.174 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=1687835727; a=rsa-sha256; cv=none; b=QJelwAWwETwpC8wYNtTC6xycgH6M9pbs95OVYSwoT6M9nGOzs9A+FnXRzMjg512UtPB5nN P7EI/KPKBKRVDJOrdqvvxr9vgNcS61jwTgN2JxpWzBbG+rKBwgcyZxzYruh6WwV+aqiDdb lxDfog5RJQF+1rLHLgJ1DT2refQOUIY= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b="pvA/vO4M"; spf=pass (imf22.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.128.174 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=1687835727; 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=uRcW1jW+95PozpJhE7MOWGztyyXp9a8KAqI8T3AvQGQ=; b=tFYza1jpg98PG/yM29QzxmzW6SnMWScUqSkAaGnr0dp8GXWsjl/BSXDO0zqvdXmlGbG2QL iUk4vgVDk5USv9V1AuGIX5QnLU2ShgjJDzpB++p2q/FyE7Of/lmOxLM3/goOOMJFmEGUd6 0FUdMOvVrh+AHS1QxzR3zNGmOS37nvk= Received: by mail-yw1-f174.google.com with SMTP id 00721157ae682-570877f7838so42432517b3.0 for ; Mon, 26 Jun 2023 20:15:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687835727; x=1690427727; 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=uRcW1jW+95PozpJhE7MOWGztyyXp9a8KAqI8T3AvQGQ=; b=pvA/vO4MDeq4kIIhsE3yrV9+ALefWilKkLuNIgHhecd9VDeKpQ3CrB44RRLXN/wH9a v+3v6EJOL2IcXShzxOvXaOjl2qaDyEgyn03s8SsAgafbqCa5mGXGEFvhH716JQIAT0SC QEIWs35jWLlJpDE0C433qu5q7ESJ8UkDS3w921ZCRctPmdDsHkPUrtmlpYzw5VwqW3do SQRdIAIjkZikdiXvEEkKtp7sFgpQSLF0GRJH1HdPtksJU7st37GWKQiDw1MyawGMKHo0 s5ztl+d6CGvn0kzD8aZyh2iX1osumXcuHPhisUrTXBEX0Rdvq7Iup64Z2b22TeYu/gRr mzYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687835727; x=1690427727; 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=uRcW1jW+95PozpJhE7MOWGztyyXp9a8KAqI8T3AvQGQ=; b=LrwdVowL0oY1ipbzQZk2/dC6x7H+15wXEUv9DpsLpPrFHEfCLfkNkEc7RHJeV9Kz6m gtrucbUc/Pso8foggKV1VlN6LMUVoBoFaDB4Um7ku6TkGE/XWSyVq7M+DHSfvXWgPWeh oBdSNbgZteSu9pujj06KKvjBP2Trw0aGTJeBQicBcCuY44Eqy8iW+ro7+85XuPzugrvg ZYHlDEdQ3VuNfW6KXm+FgqslqFx17oCAEvE70ytaKCAu9TyIsaM24LlcUcx4YS8Z/91+ Iqs0msBiiEySpE5mBL9yp5j23Ve9UgK/uZNkyzEzUdAQB5ljSIbOHKZm8aotFdrm483A CBtg== X-Gm-Message-State: AC+VfDy56BQ2dh9iw7jpY8hM7Dffqb46B2VJq2J7MBgrOmUBgGFGjWMb lvWrCW2glQpRjpuM1ST0Wwc= X-Google-Smtp-Source: ACHHUZ44nBppmQGdd8zdkRU4D5yhqKKKAoy0EjGlUrIReqb1/1yiuyQcU5hRXay6VI94GfMmMF8RKg== X-Received: by 2002:a81:c203:0:b0:561:da0d:6488 with SMTP id z3-20020a81c203000000b00561da0d6488mr27417977ywc.50.1687835726781; Mon, 26 Jun 2023 20:15:26 -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.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jun 2023 20:15:26 -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 09/33] mm: Convert ptlock_init() to use ptdescs Date: Mon, 26 Jun 2023 20:14:07 -0700 Message-Id: <20230627031431.29653-10-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 X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: AF124C0005 X-Stat-Signature: zqkmkkhacgphj8irum78xnqxuorbby4k X-Rspam-User: X-HE-Tag: 1687835727-360062 X-HE-Meta: U2FsdGVkX18YjYf90BiesHweqKITKVX/xHawJ/N8tBVo8pjZN32yTKLdSD1woj/g8XNAqg2s9kX734lN/7DtVufCArg/I3Y+2MKESn7LXXvr99aovZHCVJts+2FJV2tHZRzTa2/j9YIxylvHm6yXrQUIsP3V6fzyLmQh+Fr5uB3laL+1t1e5MmijQl+OIsiPeL/iiZpOdTNX9uBv81VeqtXVbY7Oe8g8FjHaZQAyF9Irf+FngiOHXs9AAWJ9KhzVuBROOCvah8+22YOxt/OURHtIwHCWPioG5jA2kRLL19zwk4/bOjaD7mKgnft6MWthlVldxgLY70RCSEmJflAg6S8nxfAmk4CQxW1tEbhYAH8HnRSx1MQuZN2AzKSqZp4HC5pxTQL+MA93PkiY7C5Eat5x5s6EB/kW5kKq5cvHiLgbOVx9r+xy4bCfjGUUaGU31ikeNHUUCn1i5sdQl0LuaURS6eT1R4HInasRoD3mMslpRe3MeiO6aAcI1fyUhel42nA1yjZILUR6ElKl8HQqqY4BYyTUVMKSoUS3LlIsmZY0iC/I2Af82AXhLfwyIQwyROYdY3b+e0Dnm83nllmLhkWeI4N2Z3DNnHcSH6Ij7yLm0/LJ6hlFqWUIaSKCMw2RCnENpR8L4FSxdBMX/p2pWSfi6kGY1X/pcKIWcfSxkjqnsd3TRJY/0+P3mfocW5BxDy32QoYsCUPSAJ5E1a/bueMvJ2aVL1L4AbOtwsTdjIMMHKaTwrHFeNds8TyYOM79c7UK85ZYKcft9fFWksi91cWKhDAxKw/M7IR1xKCPvH/whmzDose0HW1nh78hizrCg6js4wDDzdSQuOZHiSRiYOrWBZUDrkC9W6u8/EERj2QQQ/fOvXO7Xopp3D0wxkFSrd6zUpyS86rr+CF5K/1jjn8M1dwQjb9cLihrcWhWDg2gVOt8q9uzpwCToSrgolVq1aT5+04/H4VhwNAG4Fm e0DhMfte gmpnnXjvxPE1bDkblsiroNTTr1nuikkpQdbi8MOpCB02/qSYkIOqjDOvSrDmaZp7RkfNKnHBVLq6RepPyXop9Db0z+rEHKMq2znQhx+jeCPyQaXYX27JpKVI3NlfrQ1AiWlDE5ZqkKXSXc8x3KaJRVYnSbzcWRW6mN4/1qrqeZtxt0y96QwlwjonJfi4tiHakS/21Zf0WskT7LpHIIkWPRsURmErnEDYg4u5iCN5uQ0tvIuQVK6ViIXVDGXr6cwlqTs1vwz/Hj6Z4mH7QJwuK2xYWQwnEjm4A9XpRG0mAkLwQkLuiomS31w/csES3F4XE2V7b77nNeyVN6zVsMaFlymrfQHKbN5/JoBjlBQuE3uKl9DEaCihn1+6rwANnjEM3MTw0HEtQvC+nHnEa2+WFcoN0P6sIWwfKHfpIHH12i2A/6NWWsEx5CWcESk/WtUFvnvzyLqaKosOI5PqlvNqpvN7fYl7oCN4hRVSNRKMA6A6udouy1OzOTLKkc2PiYgvzjcRaDkaV60Mv/AnAl9/RcIn8aKOp1NfmMeizKZhBLRuGOTabw3EP8dCJRHjaC6WcxjhFpFlhl15WXL+XndjtSGw5LOwiitCMJQWKNRrU3Vofm2p3tjakcUPpIAqtgleYCkTEDbvZbC+Nb3Xqgj/BrzwLrLr8mLqEXfxJPfUliK7zDk9ApXOfGKoPjUQslhceh6zKd4+F/QL5uEbFM+GVWPKNIA== 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 | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index 1c4c6a7b69b3..4af424e4015a 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2830,7 +2830,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) @@ -2839,10 +2839,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; } @@ -2855,13 +2855,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); @@ -2931,7 +2931,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)