From patchwork Tue Jul 25 04:20:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vishal Moola X-Patchwork-Id: 13325721 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 E61B9C04FE2 for ; Tue, 25 Jul 2023 04:21:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5B76F6B0082; Tue, 25 Jul 2023 00:21:26 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 51A166B0083; Tue, 25 Jul 2023 00:21:26 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 36B936B0085; Tue, 25 Jul 2023 00:21:26 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 28F976B0082 for ; Tue, 25 Jul 2023 00:21:26 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id E59EFB2439 for ; Tue, 25 Jul 2023 04:21:25 +0000 (UTC) X-FDA: 81048834930.03.16D6BB6 Received: from mail-yb1-f174.google.com (mail-yb1-f174.google.com [209.85.219.174]) by imf19.hostedemail.com (Postfix) with ESMTP id 16D2D1A0004 for ; Tue, 25 Jul 2023 04:21:23 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=DwndbpJ6; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf19.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.219.174 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=1690258884; 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=iy/rMhqpUcv/05FOZn+4srvOxwPFLEA5us+pK4Rb6lw=; b=sBTDFaymudGGG2HXN+0E9XtFdrV22B8skMuTuRX9aJH9XJcwNCa1EtWMvHr6ceC7RNrfy1 Opb5XrpQs+FGPkCNHtxFsviEG0AB05ZUtf4aE119d69FIdVSxRN42IhZBpRu2amstJCxyU 8H1Gy95Q+bVqxf1gQiTYvnsojGVXgCc= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=DwndbpJ6; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf19.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.219.174 as permitted sender) smtp.mailfrom=vishal.moola@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1690258884; a=rsa-sha256; cv=none; b=7eSo8o5AIuDOrL2BERyqYkIJsq7ZoUUqC25b4yFqHZL8Hm1pSE78hOlA8DvcjPsrzG3z9A 8TQi9xS6IHa9SoTcJVSklwg0LYX97S/ZoFR0IoOpC0t53QFUM6ySj1Bk+DaW4iRN2xHKFu AxYv+eB1RzaaeCGUi6Fs8O+0Smk0X0o= Received: by mail-yb1-f174.google.com with SMTP id 3f1490d57ef6-d13e0bfbbcfso1761724276.0 for ; Mon, 24 Jul 2023 21:21:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1690258883; x=1690863683; 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=iy/rMhqpUcv/05FOZn+4srvOxwPFLEA5us+pK4Rb6lw=; b=DwndbpJ6ZJrYKMHpG4xKikBhk7x+krWdi68yaEUskEkiop40SD81D3SbVY3seOkRYX /kBw1kbEHeLJuAWxODh8wznz3CeaeUpUO4YYOfw0VBoc804gVI4mMhkv5lDO7g/hc/Ox TXEzhNof0Ms0qo0Det2yGSzvCCxAKXVShq3qZYqhwj2d67+5rTird7vmREAL8b8Si8Ac tOq0IFFx/OCdHFNMMX58/9jGd+Cn0j6BluiHfy+sp+cwHgX7LWNmOOEbAbHaR8hHlJNg plgZtGI8EoaWjuEjbu+IQ9bgYRh88XsoYPHoE7Qno7Yp+zMkk++OeXafcS4wt+s+lSyS wNUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690258883; x=1690863683; 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=iy/rMhqpUcv/05FOZn+4srvOxwPFLEA5us+pK4Rb6lw=; b=IUlTFprhnWjZ4l1H301kYnaMq6obI3ciMRBaQ0Zt0+Ln7wII5qZyEgWZKexKE94lIH f7iSQhJ+bAUmtC8Lgyz5JWk1XOcQba1Htkd7BnBCw8OgIV8sAn+NIuGcsMVjzy3w+SS6 f+T9hfJbG12FXEvvn8bu9/KO0Z7oqiBTkDwbXXz3ksqgd0lm0P0TCfYjHgE+ZAqYxARi /xlhiBw6Rriyre5dj8xNxF/zNQsjpDCEAPXWg/vqRnBBsNvPQT1eQEbGFejTBU38KvEh zc+aPNzgsGvQUoyoHoFskLSv/Xl2jmmGTCveNMw4QryX3OkmP5p4nWLNlCFnf5XP2qbT gBlA== X-Gm-Message-State: ABy/qLbFuH+vXGQpamtBhCepNQNS+MXkRVm5VzrVzCGMR8+gicJvzlfl 0eW8lO7nhwiup0mnv18opUU= X-Google-Smtp-Source: APBJJlF+SF4cjauiYcGzSv/LhxAh6sYfbdxhzn585BID5O/OlI17XEMKbBKdqUp1OW6pVPf/RqCKZQ== X-Received: by 2002:a25:908e:0:b0:d07:b677:3349 with SMTP id t14-20020a25908e000000b00d07b6773349mr1259438ybl.25.1690258883131; Mon, 24 Jul 2023 21:21:23 -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.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jul 2023 21:21:22 -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 mm-unstable v7 08/31] mm: Convert ptlock_init() to use ptdescs Date: Mon, 24 Jul 2023 21:20:28 -0700 Message-Id: <20230725042051.36691-9-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-Stat-Signature: m3geqk4counuiqfhn3m1n8swp6iobf8g X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 16D2D1A0004 X-HE-Tag: 1690258883-798659 X-HE-Meta: U2FsdGVkX18AdiQ+PpYFg9122Vned1CYDxBS9onAj9FGDQhhcFgtIBt3E/BHClEIFaS8QYqLXBhP8uS8T53RQmq/QhETLJLlafVPmzlNz6Nw8sbqaI1bEFLshUHehul030jsYP9WfgmxCZNP2aenh160GtY3kuaAsKGD+gGcKAG7Fj+RId1IXbr4yTzOJVZjX1kqh+mOZvjacdvJuyISNebJj7A+x64GJoVn/XK28zfCCRBWuenLIRT9nszu1Ru5Onb6xtyi3u5ftUVa8Wyj4zpJcL3XESi3fWJu7JyJ1qdIUiDtoInkXOtjA7knmb+DBozgNJzgQF9VWnWCmSrAJ+IrO0eQQcoN0lBJ50taKj0ryFbjspPH+GtaV8FF7eeT3NzADJ5n1TLpUYsetCDyIuVqtlDSqoEv6+Cr2Alt6nBpEDOc0Abo2EkOcaxPrV5tyhTIQPR+XPirlufwDTYNyzR/0Wt94JXFBKykzepGR4lDKbPwqESWeMJDH6sJ9Or+rktL11pOGKdkR38/pkIZjtw6l9bV0c9xqNayg17NIG3f9qJb+8nal9fUXTdy7fYTn9beNHBVSEOIKH8THGBj9pkuuZYGjdtfv/RmlOlpQy0r4nAu6JaYAnyqxradYxcODGHeeiSUc2HGHdDFSdCF+SF2BzkBuUxH2goEmHtEfyFhtTiKFvkmyElkUKyCqlWhICZy2TqDqclm1pu6IVhdHvwKsOulcpNYrXeeOTYx9YWWcrf3fg7YTLRwifmy5ipnf4Rxa8wOxZNlMlxdrdr/jteKVfpa+hw+2l8bRKv19h5xS9XjqKGS736FvFBxeyEv2resvMz0tXCRLxutLkQGif9iWzgkcUxQo/WOBeo0cGLfPPqk2PXQUP8dhofD03HHfva2ogiQcxW0oSHNamz0I1UfvKkH3Cx+qfL1PmYeBUlP+RvJJF6NBmYvzRuIUmevhdxf3ElMVsTKP3Tj3KN OsSQ+yNp XrsBMePLJG63+eTxVth7B6T/haqILsslxeVq8a50KwdC/wqBF3wTwU1AOIBUlZLcB0HPgSkQQ82Zz9ZUMRa7+XhtFfA/C6gY59mRnGFJ/8DtFEfqgaovaD6z1UPWqJwyvP5EZmrTYL8+CR3n40rO0nU1Rkolc7nzq+h/r549U324GXd+q9/2LGmNgy+dBOjpOcbM8uSh2o4NInM49rKlxOZkdbgRAD1KBpWNuMfZsKT8j4IOIC6VAo+3jLG2EWisJAa8+NKiK+Eb8HBnnsybDRIy/vm4jh8PTNotidjoaWYWmhmkepb/GY9egdtGw3yJECV+zx0IjvdMLWsPHcxZ8b8LgYvCkTuYeOwjniZe75IgGt8C5ImOnEJbi0rVkUPE+J6vqIC/mVbU2DybhD+gcx2xM4bZTetjUOB9yE/8dnjq7iRTN6aW17w/lDmNxuqZUT3m+nbbJQfvlRqzZ2qyweV10ZQBjxiDeh7oeCn9wBa6x6Fzpm65DPhF/PWw5bTwS7N8u4hQRcqGV9avgGdkW019jGJoPAvDU3vxFZs5M6HMFphI4JwdfmZcFmPjvHpohVNuqYm/fy1zhyPqAsy376dUs0esZyq1Xt+kZRY2c4xI2KURRn9L7wEq0kpEXqQRchrfAEr9BONLC1ro= 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 52ef09c100a2..675972d3f7e4 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2873,7 +2873,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) @@ -2882,10 +2882,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; } @@ -2898,13 +2898,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); @@ -2979,7 +2979,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)