From patchwork Thu Jun 22 20:57:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vishal Moola X-Patchwork-Id: 13289604 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 64BB4EB64DD for ; Thu, 22 Jun 2023 20:58:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 01DE38D000A; Thu, 22 Jun 2023 16:58:14 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E9A608D0001; Thu, 22 Jun 2023 16:58:13 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D3B7C8D000A; Thu, 22 Jun 2023 16:58:13 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id BDD108D0001 for ; Thu, 22 Jun 2023 16:58:13 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 76F98A0218 for ; Thu, 22 Jun 2023 20:58:13 +0000 (UTC) X-FDA: 80931596466.15.76E59DA Received: from mail-yb1-f170.google.com (mail-yb1-f170.google.com [209.85.219.170]) by imf01.hostedemail.com (Postfix) with ESMTP id 735A840009 for ; Thu, 22 Jun 2023 20:58:11 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=SXnr3kTV; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf01.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.219.170 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=1687467491; 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=Z9Q71kHk0zB6vt5ahL9ZHs7069+SCA/PofhBzVdlAuY=; b=AOOrIC6sqEWFHuc3oHxBMcmZZIF4zSlVOIyHJ1sNQh2wCwTJWCwIw1gfF1CqAOUlbOMj5o wJNybBDnLCXwvGCYnE+icWWcZJQPR/XyYJUA7Bt4KbXQCwJXYUXav0ilb/rLmCEA1fJwCJ 4hwumSuAG1VUxKxa46ErgEparKnKSBo= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=SXnr3kTV; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf01.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.219.170 as permitted sender) smtp.mailfrom=vishal.moola@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1687467491; a=rsa-sha256; cv=none; b=2p5I3AZThe4uXgQiXTMuARzyuN5yqeZzLyGhvPQ/BIq4xKJlhbuEiY2Yov0+/oFusXfahD Ws9MI31IZ5CWbiak0/RlAAcmYDacsfKuNq0fwSm+vIrb4s+iy0PNY9qP9Ad03trF920Bou kVkCC4ERWMK25yUGrBAvXXrtwzkuLVg= Received: by mail-yb1-f170.google.com with SMTP id 3f1490d57ef6-bc43a73ab22so22986276.0 for ; Thu, 22 Jun 2023 13:58:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687467490; x=1690059490; 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=Z9Q71kHk0zB6vt5ahL9ZHs7069+SCA/PofhBzVdlAuY=; b=SXnr3kTV6njYUvauamdMyIGRqi3Z41OxkG9JlPzJUx0NriTeoHWuqaMEo3l+9h8t2a VYkat48qctNxV1/ppcRnfQARZuWAzrRCUbykSbsoBMp8966TwG20r91mIMZZWqpjcTmW hdpH7DDiGoYlRwkaTlsQfcolxJPdgdCgC9/4W8c/dT4apJrOeLX3lj0oWu+YQP0DxUAd osWDaPCIsD5h/hDouYKm/GWbJh0+G1rOXddszwPTKiRotQWqfvXUbSh9a+2twyPuDXpa FZNLCmQA2AiifhKNd54UF2voysI7AeqYSwKdAxxqSAv3Uf/qcrBy28RD1vznPZVN3aBc SnyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687467490; x=1690059490; 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=Z9Q71kHk0zB6vt5ahL9ZHs7069+SCA/PofhBzVdlAuY=; b=BRZsqA5WL2UAaINDa+JD0wHpTezf1bkkEWYc+6XFvhQ4LCpERGuTV9sDfoTnMwFHBD iJoJGanOJiNgdW5MUplsZrbT63f74zt6ydLO6XVA/Rmxw72OxfSPOrDuyG1Vpz0LsEWp kTD7m5I1V3c3FMMHhQdNQSeIffDdwn8j9cChVZmRKmInP1GZCyO95mikGUlKSlOswfrR t69m5co+gn8lwZuLH8zbURA5aV6QePvvEQDT5LDlse+KRtBKbaD7ZyGY8YKl3jFmYSX/ DG8aHntjj8Jo3PQGNksl6ZwFvD8SfqIgFn3B3kP4QxZPtPNbSwBcGu/nHutJQIHPvvpm Ptqw== X-Gm-Message-State: AC+VfDzw9lLH2R1BUXGaXV8n5+yP0wpOCdqj1IhejXvuqKO88nk20w2u b4Qk5L4EcSNIzOOn4Dau6nE= X-Google-Smtp-Source: ACHHUZ6BwDtDcu2DafE0mELxOK/IzeJcBBP6EuYjmA8bqRWBwzcd6lelREQA4aNwT3EjfCEygFsIlw== X-Received: by 2002:a25:2144:0:b0:bce:5e08:c330 with SMTP id h65-20020a252144000000b00bce5e08c330mr18770867ybh.29.1687467490539; Thu, 22 Jun 2023 13:58:10 -0700 (PDT) Received: from unknowna0e70b2ca394.attlocal.net ([2600:1700:2f7d:1800::36]) by smtp.googlemail.com with ESMTPSA id d18-20020a5b0c52000000b00bc501a1b062sm1684937ybr.42.2023.06.22.13.58.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jun 2023 13:58:10 -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 v5 07/33] mm: Convert ptlock_ptr() to use ptdescs Date: Thu, 22 Jun 2023 13:57:19 -0700 Message-Id: <20230622205745.79707-8-vishal.moola@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230622205745.79707-1-vishal.moola@gmail.com> References: <20230622205745.79707-1-vishal.moola@gmail.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 735A840009 X-Stat-Signature: 36ihimncsq86s6u3kgee4nh5jy974sm6 X-HE-Tag: 1687467491-313496 X-HE-Meta: U2FsdGVkX1/m8P285NnUSm5oyQmcQxfhdVMBrrDWfbzzs0dW00y1XC4IB+pJ8j0ri/PKw3LlrXDYz659IKh7gudX3B678EG2Lx9/5La/oCA24HoJp+vBgiwaRGXCqOKtzdtvFgbJNURF8qdYglUXZN/nIgadRu+qSh6YfiP31UtGMTBmtNzsfNaxag4SBS5FRpWXk0Jq7ftAlsN4hWSYAQqt/R+yWfUasBLY8rvS10q+txMZVMEu+7XEohqAYRLBAPTJbmTFUZ/sNc68sERruSQSGuSXATr4NePAmgCsddk6FtxZRkj8DdCpCuCMalJ5TM5NSes9mrr52gTXR2wgyM5ReOxilvweFHGtfCPEHFJw9eQBWE02KB44SuHBbOLPdgS71HdOaihT2RzK4dLn4rZw6oirv7cJOB9YZcDmdep5Mq84OURbaI/7n4CDS0utRLeaxGBrjD0zL4t1fZ3OO0Lbv3097v9bA63WLE6ZDXRtnKwaAk0CoveNMVhtIpLreLdYhqpHRHd0i1xHzpqE1sTqexdMIeTfwQNrthlL5hELBbsuzNnnH5xUwiVWGso9o4bbZXu6tPD+/0hkSjCiLqTgheqOl4OYDyG5EEkv8PKhKgObtXyG0GVi1QAg+I+QAa3bLOYSn3Kkol4yhKuP7oq99Je+wgENnRJgD/W97dEsVLB5h07DDnRAfSKaxTJVxCc2sgcyVLR98H7H4P2fcDnx4lZbvHALBWyChv2T8mvD2TJMRDTm7V2BZj5rYkR6GI5bdsX4iHOu2OuPgBtncYUyjDgZk7vi9hX9LnlNGVP9GspbsZausglt4PJMWzTDHbXYauh430XVHsXXqzlGUKOL3sLCwcthoec6d45OrpbPMXovHvSHVxnsSjiJYjETXIX8PIPJ5Yq72xGtkIKRD33CoVPvKWdrtVYPLKxzA9ul+O9/Tn0HHx4YPAfnvQt/OfE8VMvRBo9bMBgeU/C i++ZdGaW 4XDE3XIyHcagX8AYqYeevXZ/SOvgzirAZqlPSFO57MeakVe9Fed7fq7MpfUdsHKHG7c9q1ah66q11ASIgYmy+kEGJ0RB9+jq0pX/X55ZB74z0tv6hz1u8HFt5VJ/TmFH15ipi0cZoY1Bq2JlMLLw7vJ0onUDD2ZPuQAFNQurwm5wR6S4p/82LUIiK2OgCnrHsAJh5+9z1ZBDm3kFxSjcLz7V+3VNSbGvRPTHZPwvMIgxENgD7U/JQhfWpx5naVrgdRCDp5ZYX1VXDsZkWW5OPCd3+ZDVjf6OP/zcBXnogrichh9xgt+FZ17XRJrEQe28jKucQHrXxM5zBJP0PQlhz1bzHdiwULbyRWSViCWQwqsk0WkMWfZbLgDu7ot/GHbQYttF/MhGvSsR1sNSguuHauVCDgdHyG9YE9G+EwG3hPsBiNVnDm+4pp4tXv0U9zX+6SkA7qrPJfr3hVOprpvgMjRlj6bkqBWVnuNLluMQ7SlFrRpGcNUtUihXJyJr0w1ddt3satvL1vZ9tFwhyxee1O7IbvTwIY8ty2cWk5jqyOr6tbB2mU0JmDyWVVs+APEHYyHhX/zRDhGLm9cdKc896/1yjrnMGgaOWQlUb/C4/QjIaG+YXQ2F4ds9Ds32tPlPuI2oJV05ZrOBXd9Y= 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) --- arch/x86/xen/mmu_pv.c | 2 +- include/linux/mm.h | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/x86/xen/mmu_pv.c b/arch/x86/xen/mmu_pv.c index e0a975165de7..8796ec310483 100644 --- a/arch/x86/xen/mmu_pv.c +++ b/arch/x86/xen/mmu_pv.c @@ -667,7 +667,7 @@ static spinlock_t *xen_pte_lock(struct page *page, struct mm_struct *mm) spinlock_t *ptl = NULL; #if USE_SPLIT_PTE_PTLOCKS - ptl = ptlock_ptr(page); + ptl = ptlock_ptr(page_ptdesc(page)); spin_lock_nest_lock(ptl, &mm->page_table_lock); #endif diff --git a/include/linux/mm.h b/include/linux/mm.h index 39b0a4661e44..0b230d5d229a 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2801,9 +2801,9 @@ void __init ptlock_cache_init(void); bool ptlock_alloc(struct ptdesc *ptdesc); extern void ptlock_free(struct page *page); -static inline spinlock_t *ptlock_ptr(struct page *page) +static inline spinlock_t *ptlock_ptr(struct ptdesc *ptdesc) { - return page->ptl; + return ptdesc->ptl; } #else /* ALLOC_SPLIT_PTLOCKS */ static inline void ptlock_cache_init(void) @@ -2819,15 +2819,15 @@ static inline void ptlock_free(struct page *page) { } -static inline spinlock_t *ptlock_ptr(struct page *page) +static inline spinlock_t *ptlock_ptr(struct ptdesc *ptdesc) { - return &page->ptl; + return &ptdesc->ptl; } #endif /* ALLOC_SPLIT_PTLOCKS */ static inline spinlock_t *pte_lockptr(struct mm_struct *mm, pmd_t *pmd) { - return ptlock_ptr(pmd_page(*pmd)); + return ptlock_ptr(page_ptdesc(pmd_page(*pmd))); } static inline bool ptlock_init(struct page *page) @@ -2842,7 +2842,7 @@ static inline bool ptlock_init(struct page *page) VM_BUG_ON_PAGE(*(unsigned long *)&page->ptl, page); if (!ptlock_alloc(page_ptdesc(page))) return false; - spin_lock_init(ptlock_ptr(page)); + spin_lock_init(ptlock_ptr(page_ptdesc(page))); return true; } @@ -2923,7 +2923,7 @@ static inline struct ptdesc *pmd_ptdesc(pmd_t *pmd) static inline spinlock_t *pmd_lockptr(struct mm_struct *mm, pmd_t *pmd) { - return ptlock_ptr(ptdesc_page(pmd_ptdesc(pmd))); + return ptlock_ptr(pmd_ptdesc(pmd)); } static inline bool pmd_ptlock_init(struct page *page)