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 74107C77B76 for ; Mon, 17 Apr 2023 20:53:01 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 49BEF900006; Mon, 17 Apr 2023 16:52:58 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 44C95900004; Mon, 17 Apr 2023 16:52:58 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2C631900006; Mon, 17 Apr 2023 16:52:58 -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 1E343900004 for ; Mon, 17 Apr 2023 16:52:58 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id E5BE180643 for ; Mon, 17 Apr 2023 20:52:57 +0000 (UTC) X-FDA: 80692082394.30.5B7AC4C Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by imf16.hostedemail.com (Postfix) with ESMTP id 13C16180020 for ; Mon, 17 Apr 2023 20:52:55 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=EY4pAo5d; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf16.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.214.172 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=1681764776; 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=7rEN7TkKGGrS4Nr1e9+VSo1FDhdsaSEXyIULzlMdAE4=; b=d6/XlG1X0K+vQxbGY2BSINtES1OOl6zTVF7XfLWiM18F7R7xqebWPMraXuMvrYUSLWaE7p ZEuP05c4TAubdrFbt746sBzDFPuUeK0OiIllGQQw/5Y10hHlJ5LCr1DB/pCVHK2WUXpCyq wTUKMLT3EjhskwrJQ9DXn0MwHGA7KFo= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=EY4pAo5d; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf16.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.214.172 as permitted sender) smtp.mailfrom=vishal.moola@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1681764776; a=rsa-sha256; cv=none; b=7hkU5pjlNKZOo/wXhVmgVDTjUpyvOwsc0VpENDkaF/AtwMH9yl9p6Hia9ZHW4BI3+cI8nE EKhhbRnBt0AlJeLAN7uEbTBrtUTEYAQF5jm+tvlchiy7qPpBUwaqveDu58fvfm8CYuT8GG arkXMHheIjJENRnZVzx8piZOXtvoVzM= Received: by mail-pl1-f172.google.com with SMTP id w11so27335278plp.13 for ; Mon, 17 Apr 2023 13:52:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681764775; x=1684356775; 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=7rEN7TkKGGrS4Nr1e9+VSo1FDhdsaSEXyIULzlMdAE4=; b=EY4pAo5dPiMdURcOVQM/Apa82VCO0I/XR1aYYt5qSz76HGumyOhUfKwA9+Mr5OFHh6 y4qX3lmzBRH5sE5hiL3G5H7+P1vU90VNiEuutpY92Aii8KdV81S7nJ0QBzccPQA4L2A1 H0r+gFj2e0wYN/AG4aVILv2cjCWqAiomeMPXPkWjszJF01iQ5TmXH8Bsz45QUOgwxoQ4 sHC8DrgU25+a1fsqdhglJSyR11j/cBOYD1x2MxJDA6rfBM+Ci8Y+wWCZicg642iTcaFB y1U70avkZLTukuwNbayq0JR0dDmctnOUY0ghxZuZ1egx4BqGjtzmW9DXZrJYTWGZ5wwv sRpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681764775; x=1684356775; 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=7rEN7TkKGGrS4Nr1e9+VSo1FDhdsaSEXyIULzlMdAE4=; b=RErLrri9efoQ0Vy+CQG5xKBMSTfL54KDulQxP8+hnu3ftxbdP36UWMbjO/43ERWNGz RgbWwZbBt6oO4DjFwEQhAvMyPTo++B0+gcA8kRoGtpz01Jordn5Gp2qj09lCOuW2MU+p zDoCzryhgPIkscqF9xIlm5B/qCuGxZfndwA/bSC/d9/GBo0yc2ma7/RJjb4ohx8/cBqM H8Av+F6gW3k+NKU0ARpCQc6lasM7JZGO5+o/t1oBEIrUyuajrk+crtk5VDDLzOUV5C6k Q6vC7eXl2MlCCR5HIiKPFX8aMEdPo/1PeOP43J5nUBzMzba6psEcn8pSRbm2uq/aGV95 +O9Q== X-Gm-Message-State: AAQBX9ewb76RMlxc4PLLwSjuiqePbnNx91601DTg63rOwm8os99VOI9W jzkd/3zzaqsNaxs7okkgT0c= X-Google-Smtp-Source: AKy350Yghynh+/JYw1Y4OeSQkY97RuGOXV9v1JZPlpoHn0H6WhBdjqt/CneUg+QzYmLvk18Z1w5zNw== X-Received: by 2002:a05:6a20:394f:b0:ef:b02a:b35b with SMTP id r15-20020a056a20394f00b000efb02ab35bmr6833020pzg.0.1681764775054; Mon, 17 Apr 2023 13:52:55 -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.52.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Apr 2023 13:52:54 -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 07/33] mm: Convert ptlock_ptr() to use ptdescs Date: Mon, 17 Apr 2023 13:50:22 -0700 Message-Id: <20230417205048.15870-8-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-Queue-Id: 13C16180020 X-Rspamd-Server: rspam09 X-Rspam-User: X-Stat-Signature: w8fst1jmq97n77kxqpomqtue3rnhhjwh X-HE-Tag: 1681764775-35724 X-HE-Meta: U2FsdGVkX1+U4ajRsnwh2f2bPFnLx6QgL7wuzGV99Mt0D2mIuOmKZ+s1s17hSxzg2M4DtzHkypWo8/N53azZfqiGtBk01Js6okwbM8JvvuwWzITec257+oadWc0MMh2rGb4QwMJwfXGU4L6ESx9lNHRopMTEerBhXMJrzo1PFcovuaQ0Juj/eeYtwzsBUfbmgf7m6j0wAN9N2JqeEvUP4Dn3uJHoSa1t+B7g/wgVOsNcsIjTJoElZ8Qao9XchU317ogQXrHyBDavOTwyNB78csqLBvlRFL9Pv/0HoNHJMhh1biF3i4nq22bx54gQn7LXRHy5tiXpJG82bB8l5KrLH4Ly6z3RaxMSK1W/5fvVqF9wgEcisY6++/5qPGEYfe1M6dpi1PjHaModOP1x5YjpfCFXo+GrwAMLPGOFHpTfg5a3GMrv7ltIf+dXCUw5J2+22FWLji+7uuJ2hh6UJJZQF0fUdC+i79phE26GdiF6jPoY0OwbiqrIJLJd1XfJIUIYHYoO95Kp4yY2vRbsSXEwLTIop2dZX055VLt4aUiK+elpV6vBJ/oAA/78c6PqqIYkuOJx8ZGsczHHzjbnos9sBTpLQXhCJPMqCbbHn4GUxSjGbzPKSpWOZ6h83F0PSDQCMMFUKUrzFauwwYO9kJqDt8mZQhJ3LgEQ1hqBz4YXKdd99Xbz6sumWuRDhjoXVN+hgymC4cescviqieaI5Zb4atK1aiUfcLuo/LVzIOabMqLro9wO7whQ23HkU6+gjvDgQoSA+0qHx7EciQT9Lx03r1I5KKgELmdDynSLsWHR6U0Awnmx1kVckxCnXr7nwoYYZy4MwGSPPd7agaSABx+CCeQALFL984lqeVHxBHCNU6M1w2BP6ocQYWe5vy3roSml48t+5GGmJICF3uiSlIrkwI1Iu9ejPeQXdMfzDtLeXqVscxrs+5zr++5QPuwL2UIjhaI6yz1bvfSXK26G9nG vMxYyzyY ZSGUCBvg+0AIW9C+ne6bC2w2hze88nFoD+JyxGaUztjwISlwlxg5i+c8mQSn7kCNGmVsAu/dG1jpBJDv4yx7NYevUv0nYKvV409bZUlN8EvW3J/LFhS3Wm9GyQdzj9JCHKn8NGAoXQalFj8C5n+GpHblxLruAaagYXEmbjatLNfHBgD5LXR3sw1IvFQ1rVlMkS3Eyus8/02qpPje/WVCzFIwAz0vBZEIbjISDOwQGPBQJTqtbb4aEt/j40t19lQomnzigbOUjdh94N/8W5oTJ+vB40GXwEWaRcslt9VEnoOYBylrsVwoqmhuK96KQ+ioiHpUMObJ3rAM5/7mGyPrM5bUGXUZhn2620mjCbVr7g1W1U0+WZH4UtE/8ruEyA/hQQpbuRXaU01LlRN63//PVVvb5qxEeM/YFLyRWdFjb2INGPQsuK/rCGLaAIouDMrybLXib0SALFxUGGCU+RiwLtWAWhYNUY85TVDdj6RhK3kwfKeM1FK6OBpGix/EEiHY1jwTCFcDrf51ocjtKq+1i6MJo32KIwgOVh6wSuWXML/gQNfw0vYWqQJMAcrfgupYjkNGIWjRjzGhsslZoxCoBEij8Jg== 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) --- 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 fdc91deece7e..a1c9f8dcbb5a 100644 --- a/arch/x86/xen/mmu_pv.c +++ b/arch/x86/xen/mmu_pv.c @@ -651,7 +651,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 17dc6e37ea03..ed8dd0464841 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2789,9 +2789,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) @@ -2807,15 +2807,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) @@ -2830,7 +2830,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; } @@ -2900,7 +2900,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) -- 2.39.2