From patchwork Mon Jun 12 21:04:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vishal Moola X-Patchwork-Id: 13277356 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 4B221C7EE43 for ; Mon, 12 Jun 2023 21:05:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CA566940015; Mon, 12 Jun 2023 17:05:13 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BBCC294000B; Mon, 12 Jun 2023 17:05:13 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9C0ED940015; Mon, 12 Jun 2023 17:05:13 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 86B8694000B for ; Mon, 12 Jun 2023 17:05:13 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 3DBCDA030A for ; Mon, 12 Jun 2023 21:05:13 +0000 (UTC) X-FDA: 80895326106.07.5931BE0 Received: from mail-yb1-f174.google.com (mail-yb1-f174.google.com [209.85.219.174]) by imf08.hostedemail.com (Postfix) with ESMTP id 6B503160026 for ; Mon, 12 Jun 2023 21:05:11 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=RjdfKdwo; spf=pass (imf08.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=1686603911; 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=L3tBY7hT3/idMeTvV/y5HT5RaeYwytDxSu3wHZHQdRM=; b=vW7LehbTioP8gVVLkGL7Egn3cDvEgMrViBAKrI5R3KV+5I9v5B4V3Klb5isden7vIsDucC ZafD//60Ofx69KFgJ7jBEESUy2Jw6bMy4jIg0js5JrBNI9zPqKnYICDfkxwneFT5f1H/lQ zks7aD0ycN41QBBvsfzYIDlb+W11z5Y= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1686603911; a=rsa-sha256; cv=none; b=sGhUtiALXrsCEKbUIMnOvyN/wi2J9QG3Jd93TtSPBed3jl24Cd215wBXj3Agr3ngCIrFin gakIA1AKDxVvzIzm4W345Uh9+hn3QF7BjI3fEwUcY+yER5oBIyrZAhDEkaDmrX8ZV+CZj6 egiGe6h/Q3HZ5r1QMoNNYCg/v7D+iVE= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=RjdfKdwo; spf=pass (imf08.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 Received: by mail-yb1-f174.google.com with SMTP id 3f1490d57ef6-bcde2b13fe2so878571276.3 for ; Mon, 12 Jun 2023 14:05:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686603910; x=1689195910; 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=L3tBY7hT3/idMeTvV/y5HT5RaeYwytDxSu3wHZHQdRM=; b=RjdfKdwo6GGvbEWocjhzyfrIG+s4yeNfDttrrqwnEGORQ/YPC7ZVmdyS10JF0LYqJm b6bU5xmGwzXI5ZQkTCKkSHLlY6xUp5TM7mFPqEQ9UqdLvwpNas5BJtZzv+iakqyWNnr7 ZbUjNLXHM5JpGCASroX3mIknKspaiVxCKS4EWppAxztT7eGSIBBwCNu77Cy7Q7mvbAeg nTWfF3Iwgf3p1K6E3gymTY1cP1wx9AawPcYyp7n9Z4TFzq2NVk0pgr/BAa6wSZIWoNVz 1+4z+b7cL83but8FZFxeoUPYZLJOz76q6IoC2hSwlZOG2NbQ38EQV2G66LjHRDN0bxiF BZ7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686603910; x=1689195910; 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=L3tBY7hT3/idMeTvV/y5HT5RaeYwytDxSu3wHZHQdRM=; b=JEa9rVp7AZcgWnDDClX5FoRQ/ZOCHECbnegEElFxDTSYtzOR+vZpm7e5J0E4DLvaei WIwhv9ECYmh+Wl/92yH/e0tQR6pui0tNrJmjY4NMWl9RkgBgBPYsze3UAXYpO1gozqpU upV2HoONpMjIyNUcFbV3hQ3gncEsHovWhaAG7ItLNsii/7upTOpVLNptAZjDNv2RhP3L 4uT2MOTrOXeSkgJE11WnmGdO0rpVzGRGGxuRGHKaWAJi5rJEgjXQ7LcGtJ9zNtZiIfoq urB0ZAndGrOX1uk0wFhNbk296UapkuheRQ7X0RBbjf/9npM7q6XIds3xq8KK3EyLEfZr MlRg== X-Gm-Message-State: AC+VfDwo7FCTTcSWrdvoMuaz2bP4+YOhPJoniMJob9yt+bjwZVovqDGw dmfFd9yYy2jg4sCq8spX24E= X-Google-Smtp-Source: ACHHUZ7G4LX/rzVzMPXBxUvcWoM4NVaiAOMXANZTQdr/GK3rhr2fg9ZSIMvpPffGov7SQ8stbPFS3w== X-Received: by 2002:a05:6902:2c7:b0:ba6:e17a:abc2 with SMTP id w7-20020a05690202c700b00ba6e17aabc2mr8959494ybh.63.1686603910188; Mon, 12 Jun 2023 14:05:10 -0700 (PDT) Received: from unknowna0e70b2ca394.attlocal.net ([2600:1700:2f7d:1800::16]) by smtp.googlemail.com with ESMTPSA id s125-20020a817783000000b00569eb609458sm2757115ywc.81.2023.06.12.14.05.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jun 2023 14:05:09 -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)" Subject: [PATCH v4 12/34] mm: Convert ptlock_free() to use ptdescs Date: Mon, 12 Jun 2023 14:04:01 -0700 Message-Id: <20230612210423.18611-13-vishal.moola@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230612210423.18611-1-vishal.moola@gmail.com> References: <20230612210423.18611-1-vishal.moola@gmail.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 6B503160026 X-Rspam-User: X-Stat-Signature: x5oxjhrxm6kcwgsgejryed91bauft9h8 X-Rspamd-Server: rspam03 X-HE-Tag: 1686603911-684743 X-HE-Meta: U2FsdGVkX1/x1rjjPEQ1M/cpNsglT3aNVlMNGtZAfxENJg1ej/fkLPxQ3MD42NTCcuUTr6ztGcwGHqJ5M5kINZfaK0yAiotTsWf5uYsDbauB/O56aCG/IqtGJclUIN8BRfQuQVDZ7KHY0fXlG/FW8s6hvhO6h9pK7hoRCSyyjD560DbhWVhru7hl5l4Nk/Ef4Yu9GXQI16JHFFJ+qtX8/oVsDI6q5eHgAj4vt1RY04HIblFLRXotzKkqf/0JRntzbdC69mGGU1nAYIrWJToS2es45zjShWWn+WyyZTD63N/63PGnYykxrCrU/C31nbQuj8MX37f7xpKHqnPx3uHPaGS+SUrrvnGtxUkHXrnQ+/f4gDlq13aoFuTYrZXeww6fTYu8OWmV1RF393XLH6Uw4QcFaQIkqMWJ9EbwDNqUsNTH/zXbH4i6zHiGd/3gdN7l1Pm0zrmzRKfgbelfLzXeAsuCKFmB+ctKIvOvJk5C4MHNTpFtjzJBSwQht39BUSZ02vG3MMJiriUZ0eN5yXsXoZuzb5tJJoEfVZLevz3coeu70Ag6y1K0qUYBPVcy0FfXJydx4Vg4lwXMWsOwaj6eHl2JZ5sqUl9m2lHaKZ0YNTZ8/M507mG8mAmojGcrnGl7bK3xP5eu5+wAY9wUb2qqKjyoPadLLlQbdrVQpP4BXuQQxqaQoed6yPp7GBmbUH4tjCVnNuw+ttat/MCyEsaAa1ZH8jvirI1F6LSCTh/gaayTxf/2myPPtrvFGpcGRpm/47DcPeWVjNbmXUn9PXuGvV9TAR46VZuo3foMkP7JyEvHnyRMRHk1SgPVW6nY9azw7sgEKu6WI60vaUWaMq4u8AD9EYuXpZxAX8YbgrZPAaEk2BYtihprI20IcOyZEFDxXvXQa4DActE3UCz1ZFII+Dbub2Xfz8wKBlNQaL+t5RZmWFdTuMDTCB86VM64DF2Mn+98jWQWxZMbBscSEEh LFANX7dj NQUzgSqyx3BpGOs/R36suNfrTjHKVJu3v+H/2Cuz/rmYEen8aQRZtmccswgJ80L70A6IrnYNPdKIxYY6LlPpjLBm0rqANIPIuVlltqy2ewch1Eyui/l3FJkxJEWmXq+Zz/vvY3QoA90SAbH66cgpffVgBlEaAdtuk0vNe3pewQlUvTSuGvG93l5GonKQ8Xla1Vxc/L/oJGaZo3OZFyNAg/ZaLE+dgIhR2I0dr/02bPPyAH0squv/JT9UL+p9Uoi2xplkQx0/ujNo1x6HGdAIP46DPL5ouViGSKxNNsHMETdDABcBd/Td48B3kaBQ3aMhue3+FYzf8xCbaeRuazAGTyHS5olrLvPA7MmEZDFyt+/zMfsveR/OqFKtOMEXD61eC8gMSrIXU+eaRSU7XC3iRbT0VgZpvvyb+/VgT1A54h1t6rfIzge1m56hzZqZ0eovNpFkLu6hz3m1qKLplpDjgMRzM9SNYPYgaAZohZGLLZvCrRLFF9vacAQmtpdd/56GhUrrLYypUA5WzhvscXvk7+su+M9DJKBht+LCEMrjvHBivh34KB8bVI8zzAf/ekxtapiqC/QE45V4OA9c= 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 3b54bb4c9753..a1af7983e1bd 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2826,7 +2826,7 @@ static inline void pagetable_clear(void *x) #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) { @@ -2842,7 +2842,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) { } @@ -2883,7 +2883,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) @@ -2897,7 +2897,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); } @@ -2955,7 +2955,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 ba9579117686..d4d2ea5cf0fd 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -5945,8 +5945,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