From patchwork Tue Jul 25 04:20:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vishal Moola X-Patchwork-Id: 13325723 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 3B859C04A94 for ; Tue, 25 Jul 2023 04:21:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6C9356B0085; Tue, 25 Jul 2023 00:21:30 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6520A6B0087; Tue, 25 Jul 2023 00:21:30 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 47C98900002; Tue, 25 Jul 2023 00:21:30 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 39F276B0085 for ; Tue, 25 Jul 2023 00:21:30 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 1044C1A059C for ; Tue, 25 Jul 2023 04:21:30 +0000 (UTC) X-FDA: 81048835140.11.0F8E724 Received: from mail-yb1-f174.google.com (mail-yb1-f174.google.com [209.85.219.174]) by imf01.hostedemail.com (Postfix) with ESMTP id 2FB6E40008 for ; Tue, 25 Jul 2023 04:21:27 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=RYLJ+HHh; spf=pass (imf01.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.219.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=1690258888; a=rsa-sha256; cv=none; b=Vnv0Rt3g0egIidxIhqPq+pprLM7jsfHQkeCW0asisgLeKigUywGEyg1wLS075lBBtsFlYI 3OnGbVpvKBS1r68VadK/2PTEHAHvEJjxThTE2Y3zWb0bC4eDgM6guP/LlDHKfkKaTYVmFj Nh+Rr2aEin8Dhz65PB45GrXRJA3dB+Q= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=RYLJ+HHh; spf=pass (imf01.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.219.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=1690258888; 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=7EZnRhm4Fj3KaK4sFjI+P1mIVDNOtVXSgVauozi7/LE=; b=6rgimd/5orgpLsudbioHcGDiYUucnoBU3+YXdro7sQ5fYeqJepqb7PAMFXM+sNw6VMMYWe T5o0WPPZXSngN4kkGPrT4Z0yPU3PeHs6gCPEmTPs6cvH0JRAH0ZjdG8Gw0zvW6tZfs7TI7 sBPz3/71BUnfSSHlCTAmaGGD2JG94YY= Received: by mail-yb1-f174.google.com with SMTP id 3f1490d57ef6-d0a8ae5f8a6so2876637276.0 for ; Mon, 24 Jul 2023 21:21:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1690258887; x=1690863687; 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=7EZnRhm4Fj3KaK4sFjI+P1mIVDNOtVXSgVauozi7/LE=; b=RYLJ+HHhZ3SW3XdvMN1AzT9gPBErVqrhuCtcU9fNt2oY7ALxgSJoFkBn6Vm9nhRIfL WiTjjdSQLpNPnjH/5n9WBm6wJTnH8dJRd1NltGEZ286BUnLn7Q2MMvQIs7uIZqTwGdGS eL9nBqdaNLlYe8KWVzFFhBRvhsKclpu6/YA+4Q97+gqJ/tvmMP0hkmlN965zL32r5aWq lGDtyvV+tLl+Z/pogbSTjxnJu1qRtO3WfiwXTUnVp3YPllt2BfK2Izz7z0ivGxPYpzFU UjwvvFWDj18TjEMiWj89EXU3QbdGQMvzZCK7ByPk/vtnFluG2/Q0k/42+A+1E3bms/jl vfTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690258887; x=1690863687; 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=7EZnRhm4Fj3KaK4sFjI+P1mIVDNOtVXSgVauozi7/LE=; b=SKr3XaaGxAevZ9A2dymh2Ff6pHNS4ep/m366spGuh+HkdYB8pE+65hAHHE6cDPXlz9 PJZI9iIKfV43rKzVtrVC6juJT4tAbQ4qgvNVE76/yRlHq4K1kQlaOQRRlanIvWfpXkHn 8zQjt3j/tsOW5nuWBmnWk/9Yx0s2Odmixrd4sfZ3phadNnCl8o+dWLa/hGAjqWpExD1n lC+ww196mLpOvuvx33HwrcJ3Ev2rGpJ83lMGjXWqWdqYt1HCbSLdoGCYokvySrH2u3S0 /2TGR/ZuQ5JXocJGxpIX7RpZgLAwl6BJWWVo2ztGYRRzfHJ5Ek/N82sZAlhA5aSOBJwp D1pw== X-Gm-Message-State: ABy/qLbBL0Kt905GGEs1QWld4m0LHmKuV+g6bf1Xcytbpp5CJwEolRet NCOxQOhMPxS7nA1v9j0Vlak= X-Google-Smtp-Source: APBJJlEDrySQ7FY0Or7EcCMVmcmwbMMbiMSaZShCmPSyL8HtQQZFeTHHFjIo1cF+xzs4edAkc8Gy+Q== X-Received: by 2002:a5b:782:0:b0:c91:cc0e:1aef with SMTP id b2-20020a5b0782000000b00c91cc0e1aefmr9011877ybq.58.1690258887257; Mon, 24 Jul 2023 21:21:27 -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.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jul 2023 21:21:27 -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 10/31] mm: Convert ptlock_free() to use ptdescs Date: Mon, 24 Jul 2023 21:20:30 -0700 Message-Id: <20230725042051.36691-11-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-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 2FB6E40008 X-Stat-Signature: ojkg3jne4yxt9iirc9bubquj3biokiyb X-Rspam-User: X-HE-Tag: 1690258887-541717 X-HE-Meta: U2FsdGVkX1989ot28f3eJivWIZWNt5cY+rGeqbe3axjeMr7bTMC+mtTnLRXa2gMU/SK1qcrt8dHYYjg2ooPJmddHXXDLGEzBD+4kk8C66P4dpN3kSwfGrQ1riRcAUlIngdSIoGjNdzR9d+NsY2vx/BbFUV1VCoCqZpPK+rD8F9k58sbEUCkcmdpufOTQNB6ohgIDOSWXDmWN5ft9jemSiGuDrPOvBQwwu8nzuwbKat9wRLgn/SRsJr8RCQeTu+guYSgCglSvGMEDHnyMOEQ/3o8Z0+n7nc2omREvLRDFJgolDAreznjJyIMJdD44GA53dshglWDAaz5ZBrYOLVvPI47C8MPhzKoCotUTjwX5iwVJx6Tp7tkDXmSMjTbZ51aWS3HYR6qi/cHt8KRq/EEXQXELaVvtV92kzqrxtrVsbWkZwfvuR6qCEacm+K6xgpGgDkg37FDStkDk3r0WMJhSqTV6uDFYF9qdR7ESCwB7VnDBGtBwqroMRB487SwHXnie7kZ10NLUfin55KQZu453InQKCS6SrWTHBLmbPp7D4OItHCyFzGrpmrc8kaQKrVT3/33Bw+htumIB6dJkFezUN0XHrbqYfDoZQ0zzw0VlAypmebPoxxDPiJPElhUwtQs1bNVd2CXR+lNp7wf6G+Sz6BQ/nrW6+FvSNz/yil+8SwuBbhSBrl8IQsik2dbV7j7aCW7FcjEB9df6VESKu/UjM2sFexJy3dD9EVAHrS0UD0+S6cZBdEHJcuA4n3ZZ2tqu6o6kW2vK40BHFTVmhpuwJ5/dOVMIHQxmzXRe5XA7KK5l3X47AanuMFnejV1HRXPt/QYkQAE/F4n3U5YRC1yQL+8GCb3xFMg9lWH/HSLOpFxpedAlUK//0LMJwqR4unQyBBt1ZOORhb8mr6DLn+8ov4Zqr9PZDAONMOlcCnD3Q4I6vStkgvQJBoN+zNtmKoVapQGIhMrpihRK+F9/W4a 1FhIvKU0 n5b+hkLQVRghD8ssOZg51pRJyh9pJFc62pt8PmUmnVCA+gcNsf8QNK8LRkdQfr4t2EfJW4mGzRB347XJgrohbiUKtmvKUAxJC4CStxakA4JkbylRvThbta0tMznHm/IqUBJdT7wsrOCacMVCDgkaqtJf5srnRFkTvkWBDnK2BVncYbKcfLWKJueJoANTeWisuB/vKeHUIMSdQWLmunExZJsr9tmmU1lVEXdkxc0cUJv8+MA2xMfLZumP/pK9JX8J+vMaCjWR+IFIwMvzHDSUtU5MNRWrXZmXEhXE4d9SWXwy+R+sob2PCJKSS2NPq3GFoyOvceeaurSjTjKmQXhdp5ZlPLD0TUgrHwBXt8bPoJFx88CVeb+MT+EzG6cue2XpKVZTmZikDiMNWGEAK05XHyolgKKeHkgBPl+kX2Ly3VvuGIBWlDe1nUyZQvnOPKLEJZcEEi4mYUp/g9uMxiSY6+kE9lYATZZEH0MA+sriXQ/bXjYkW9OE3LvceGqDWi3qW0rO6eeEHCGV0TqGEbZRRtry2RGWk8fNWCQrlH+aO8SfqeGwlpE7AGP2W9MKTw0DQYUsktbOyJGea8eX4ZMvQV8kq8/wxO852yDGFO3qCGNZQlB6pIhYxlQjcAFvLBPGe8lfHv4NPze7z8rM= 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 | 10 +++++----- mm/memory.c | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index 774fe83c0c16..ffddae95af78 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2842,7 +2842,7 @@ static inline void pagetable_free(struct ptdesc *pt) #if ALLOC_SPLIT_PTLOCKS void __init ptlock_cache_init(void); bool ptlock_alloc(struct ptdesc *ptdesc); -extern void ptlock_free(struct page *page); +void ptlock_free(struct ptdesc *ptdesc); static inline spinlock_t *ptlock_ptr(struct ptdesc *ptdesc) { @@ -2858,7 +2858,7 @@ static inline bool ptlock_alloc(struct ptdesc *ptdesc) return true; } -static inline void ptlock_free(struct page *page) +static inline void ptlock_free(struct ptdesc *ptdesc) { } @@ -2899,7 +2899,7 @@ static inline spinlock_t *pte_lockptr(struct mm_struct *mm, pmd_t *pmd) } static inline void ptlock_cache_init(void) {} static inline bool ptlock_init(struct ptdesc *ptdesc) { return true; } -static inline void ptlock_free(struct page *page) {} +static inline void ptlock_free(struct ptdesc *ptdesc) {} #endif /* USE_SPLIT_PTE_PTLOCKS */ static inline bool pgtable_pte_page_ctor(struct page *page) @@ -2913,7 +2913,7 @@ static inline bool pgtable_pte_page_ctor(struct page *page) static inline void pgtable_pte_page_dtor(struct page *page) { - ptlock_free(page); + ptlock_free(page_ptdesc(page)); __ClearPageTable(page); dec_lruvec_page_state(page, NR_PAGETABLE); } @@ -2987,7 +2987,7 @@ static inline void pmd_ptlock_free(struct ptdesc *ptdesc) #ifdef CONFIG_TRANSPARENT_HUGEPAGE VM_BUG_ON_PAGE(ptdesc->pmd_huge_pte, ptdesc_page(ptdesc)); #endif - ptlock_free(ptdesc_page(ptdesc)); + ptlock_free(ptdesc); } #define pmd_huge_pte(mm, pmd) (pmd_ptdesc(pmd)->pmd_huge_pte) diff --git a/mm/memory.c b/mm/memory.c index 4fee273595e2..e5e370cdac23 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -6242,8 +6242,8 @@ bool ptlock_alloc(struct ptdesc *ptdesc) return true; } -void ptlock_free(struct page *page) +void ptlock_free(struct ptdesc *ptdesc) { - kmem_cache_free(page_ptl_cachep, page->ptl); + kmem_cache_free(page_ptl_cachep, ptdesc->ptl); } #endif