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 2D0CAC001DF for ; Tue, 27 Jun 2023 03:15:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EA1FD8E0006; Mon, 26 Jun 2023 23:15:33 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E029E8E0002; Mon, 26 Jun 2023 23:15:33 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C7D118E0006; Mon, 26 Jun 2023 23:15:33 -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 B5D3B8E0002 for ; Mon, 26 Jun 2023 23:15:33 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 8C943B0056 for ; Tue, 27 Jun 2023 03:15:33 +0000 (UTC) X-FDA: 80947062546.02.2055122 Received: from mail-yw1-f182.google.com (mail-yw1-f182.google.com [209.85.128.182]) by imf09.hostedemail.com (Postfix) with ESMTP id BFA0D140005 for ; Tue, 27 Jun 2023 03:15:31 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=NN6JuQbc; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf09.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.128.182 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=1687835731; 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=bhgUYiKwQSwYMGFv9d1r56wjiuPfdLCT9N5JwdJpvSY=; b=4qPTbuKdHt41agmUNJXriapJo8p7AJuN2w2YCMNOgfJXPclXlkLdf2n7+PrAhd5MKD/6gM 51dqhPHXeITV3ESUlh7jjUCNuMA3FNUwJ+81XsSkZZJrVEs+AiqzOLh0HlcbldNSY4opGN 9nfl55W5EXDNOY2y5gJLIgnr9LrGjz0= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=NN6JuQbc; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf09.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.128.182 as permitted sender) smtp.mailfrom=vishal.moola@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1687835731; a=rsa-sha256; cv=none; b=lL70++9m25w4nQHwpKjNmsKOjo/l7WuPRJM6hUztGxUHlwQXbpHREXossKI+QPg3EctUOn D/fJ/Xi/B1BLpOGg+fOoM9klXjSb6l/vVFE3kESIEav2ZR1RMkZXaHXSi9dVe8mLQaipiS FSa826e8kgd7EnLFTRAgJ46/+PFzpPU= Received: by mail-yw1-f182.google.com with SMTP id 00721157ae682-5702116762fso43159227b3.3 for ; Mon, 26 Jun 2023 20:15:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687835731; x=1690427731; 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=bhgUYiKwQSwYMGFv9d1r56wjiuPfdLCT9N5JwdJpvSY=; b=NN6JuQbcJSEhuQl119fqyrzmvfTJLSgZNGPIizHO44moV6zy7vRkkkGbpzNnm+T/zk LfpssTQxYHLCLcRT6ur03GhfUH0PR3hr1gEAZWn4KlOVQ/bRaXKu0XwyzIXh7FK2T78w GV5aBHngJRtwmpryMrqg1wnpyNcK63Z6rXozTP8pqdze8wtkdCn+4d6Nxd1VmHHTwiSp Hj2gVskjJaa7d3mxLgebdTWNoaiyWHEkTnVETMwzQNfFNqae/PKVEKJL0sEqbBCs/7Gc Lg3rR1WUfvzFXQfsjuyOG1PSX82wJS5wL2NRG2ks6qk/cPnX1GTuY36dOOOiPPB0JsGq 3KdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687835731; x=1690427731; 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=bhgUYiKwQSwYMGFv9d1r56wjiuPfdLCT9N5JwdJpvSY=; b=HFXS4owITNOCLKmNHrCHZI+UWU2XeoMOAq6JliAv4aQvvx3Ba7fDHoGSnWssFTUJ/x gxd+YHp+w6CeCGf5LT9/gu57Kl/vrPIEE4bkuWVrruH44a0sh7Jw1cXiD8cCOjNcGUEV foIxV+pP7+N/JoGo6hd5H5WStfU0DspXJbhx5v6as/9L5gKPMLGlh91o1H8EO/t1mTYq 43iyYYP8g4Rhn2nbs7PzvJ8alj1INfkEG9+WsB1wBN5f5Wsc7CY5eP7s2MiV6Lz6bsSc KzgeQI0g4ENLNDP08KYr7quXo4O1mKmnLHls65XSZsDjtoxdIUvVLfmyJICN80ryWKOE 6nKg== X-Gm-Message-State: AC+VfDwNvLx7yaSMhhaEL7nEo6ORfkKpgqs1vlsXVGNSTIScc4WnXQOB wZpbuHdYkHIrQ7psPfwK/5k= X-Google-Smtp-Source: ACHHUZ77IlfDYtyaiNtbQBvQ+hst+uMDswEhJokbRedTnkaskK+XBmCINjFgoTdvnk/TaS9G8YnT8Q== X-Received: by 2002:a81:6cc3:0:b0:56f:fcb0:26f6 with SMTP id h186-20020a816cc3000000b0056ffcb026f6mr25623334ywc.52.1687835730840; Mon, 26 Jun 2023 20:15:30 -0700 (PDT) Received: from unknowna0e70b2ca394.attlocal.net ([2600:1700:2f7d:1800::16]) by smtp.googlemail.com with ESMTPSA id s4-20020a0dd004000000b0057399b3bd26sm1614798ywd.33.2023.06.26.20.15.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jun 2023 20:15:30 -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 v6 11/33] mm: Convert ptlock_free() to use ptdescs Date: Mon, 26 Jun 2023 20:14:09 -0700 Message-Id: <20230627031431.29653-12-vishal.moola@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230627031431.29653-1-vishal.moola@gmail.com> References: <20230627031431.29653-1-vishal.moola@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Stat-Signature: zfonkrbhwd3zgzhs9zag6bonedur347e X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: BFA0D140005 X-HE-Tag: 1687835731-163839 X-HE-Meta: U2FsdGVkX1/I68Ic5N28KGdHLTaMTyFZQ4FzGb35a4dAK9vOvxJZ47UJF/VxpBUFgrixbdXGyF1LHbFNS2WpMLu4Z105iHxiMIHQkI/3KyeoHT/kKJLvifml6xQ3mhdqWwiTbqR7xYgpl9ks5j6g6jFeiaW6jXhud3NpOCB3sGhEsmAOU9la/IPJ6Bx9J/Ce8VZ6cq/4aTjwWJfLlH3li8MVopehrhcqegxIgbjeT2iVVrL6wpXdAPfnZrWU4mI9E+nZw+ArrOAR5/m9BXF1GRby7lDVR9qQS3XdvupJI0P+bEpO5w2dSg6SniJzFt27enBm8NrrrA9CHiwsNk2gSLQcqr79Br1ZAA9R1LQgD3KQnmceCQ/gMQXbQQsJL8XgumKiCxRJvOlSEbFHvn0SuWtkzq/YnPqyDYO3VFXFlg+hjiU8fY7g2I2vGdDgFmbzpT3BKR1LEBPlqMAj4DL66ALj2YgC1Db56wNbvS7cOHWB6fppyRAFsENoV6szml8z7YSlPxg2XhMcWuHf9rJVfgTHqNFY/IAthpxInCPtOePM0xmwGtfRrPIkzQa8Ud+8IVcw6L1PvNNqdkL5m5baHbKIFBcwnCZYXmHCTB4ATsMdF2z2hDabfAaGjFLCUvvxWY7mBnNgXQgvCbRjLWW0ML3XH1xZwi3p3JGxcaHkACh8/OAYqsWg5qqsgSyUbxWCnOHAQ6dV0NEb4Yhq2z3PidmSGH1UdVjp7c7zbqYElWcUntYvtgRH4DMO9hsQyBLOI5tpbCB8Xii5pvRk3r0gnlAxslTQ34E5Eau4sQftDnaNNlkBi6GME4Q3LtKhgVUBBLOo427ydZLfNnhoi9nLSVH6fY304CVmmHV4lLlsUwy6xyThXmMpsUp9W09pOq30sMww0S260v4ZiOgZbVrSwXVvka7OhhnvGPKR8dau7cZ6JHgwi+uBvZZJQ/eNsiJHNbwt5ikrWwi+8c0NnpC TC2a4h+W 4D6XxlTO6Q09PJyWhzF3jgIc0xxsXLzaORPxrjMEJSqhhEee4/ii16T5+zlXdFOnWVlQ2Tq64xAoFY+uI7yog+40Z0wM9M27c3m8ICspCC1pxA1iYdB/J6+HBdJpwKmG+G8zfR/fNtF2EEdvJRt65hr0qWf0sUwyBjdw0e4PaBoBlgWGTwG6uvJiSOFcddDYiIVR/NXO8FBjdDx1nnBA5yjqaG6kgIhoLqHOTPmUf8dx7MkexbryjMZ0izQWf9+BTCvDf81RMx8pG1B/wVKbJtOzqjme1BuaJqzYM7elDEVdf38fHrhM9deI2wHRI3ZIbVRz9Tyofkfi6yN4xGXl3YM6Rdu3SKlBma1Yn626oVo97DIZPVp/DxvBRNOXofqAFGWs3FcYPuw0fUJFaceZqird4+A43YcteeWxBUroSfnm+jj+0eLP3JxzXR0wfS+eCfH/uuymc1ytCuJEKZGt8fpFIi+vCQfEXgOUQmIdagE+WmgeFOjPp0vp/G8MroJusJfyd2/NHsHOkyvGttkcbriYBJRBYWUt0HtbJO465ivYHkMViJJX5B1/X7C5I5ElObh+Th2+Neni30hWsg5E4UZi/NLWqwwWUZwnUGvTJqZk5STJNXIK53C8Sl57OS0mXGx+VKwtY+AZ7mxM= 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 0221675e4dc5..69e6d6696c44 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2799,7 +2799,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) { @@ -2815,7 +2815,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) { } @@ -2856,7 +2856,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) @@ -2870,7 +2870,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); } @@ -2939,7 +2939,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 2ff14f50c7b3..8743aef6095b 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -5931,8 +5931,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 -- 2.40.1