From patchwork Mon Apr 17 20:50:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vishal Moola X-Patchwork-Id: 13214575 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 B8838C77B7A for ; Mon, 17 Apr 2023 20:53:19 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B07C590000C; Mon, 17 Apr 2023 16:53:12 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A688F900003; Mon, 17 Apr 2023 16:53:12 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 75B3590000C; Mon, 17 Apr 2023 16:53:12 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 5C0D2900003 for ; Mon, 17 Apr 2023 16:53:12 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 1AD4B160149 for ; Mon, 17 Apr 2023 20:53:12 +0000 (UTC) X-FDA: 80692083024.23.954F33A Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by imf27.hostedemail.com (Postfix) with ESMTP id 3193840018 for ; Mon, 17 Apr 2023 20:53:10 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b="r15/y1KD"; spf=pass (imf27.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.214.177 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=1681764790; 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=ySUR2NhNYIi45iieMc0XGAHKG7J++HPTQWlVu2Tasao=; b=zVEkvX/nM0zZ7Vd8hAr/iQZQMenzO7KBCYQNpunBgtBxOc+kQOQf6XvMGNotr301+lNLAT B4xDsvoTuajWhokqA41g6kKHqEka9X92G5ICew0iA1uC8J36S5CTLKBBKHH0zjJfXmZ0Pp +pghpOO9qsXGdkIC2ZJ6SWqdunoyCkA= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b="r15/y1KD"; spf=pass (imf27.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.214.177 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=1681764790; a=rsa-sha256; cv=none; b=Dt44rj1imT48/P1UDIVsiUijSx4IMnnFzf2NNutQSx2dRbtg1iCDFk0iLlpuYlBzgj2Wvy V93l6A/N5aNkbxA9UFFN+VhU9p988dDFmoy2J/3ZBoNBPPSr8Gc5/jCmFZbi3KJcq7crYw UlyyjnQ0+HRKDAzUXl1fLHGkGqw1sUo= Received: by mail-pl1-f177.google.com with SMTP id d15so10119575pll.12 for ; Mon, 17 Apr 2023 13:53:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681764789; x=1684356789; 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=ySUR2NhNYIi45iieMc0XGAHKG7J++HPTQWlVu2Tasao=; b=r15/y1KDif+Drf/4AN1jpq4aAvcL2g0C6yBlVejRZjViwAKdx4tN5lVxRrilW72t8W lxYrwwZ1V+6OuCBWGNjnVnFHs9fxA0+y+Hq/T2Xun9HaX6uevRtPhFT+6Fyn6rL6cuxl Z3/9OHOOCrjsch5rq9oWYEod7RCMO4fFtyd7gUBrmXZG32pCnlsISiWWId2b7LrGrhST kpDrkb186Ifgo7UoD/Ti/tLM6Mv74UfKgE7j3u4BhSVZUj1yrtlCsZDlhuTy+CmGW1TT t+a+qaRd0Bf5+Wl/CDmlKFz2wUcV2Pe9TbKsnSy3YV2N+zpAWDFA5l3JzNu+kIHHm1Jf 2puA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681764789; x=1684356789; 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=ySUR2NhNYIi45iieMc0XGAHKG7J++HPTQWlVu2Tasao=; b=bhS3ZQ+wTKMS0UNQktk6tPoBVDKjpa9OtCtv4lwDIYsuga2/kIBMARfQjQEIU+AmKL r20YgxQr1b2sKG7LC4MuMWJ0aBf+hlzbPcguSjff+HJqnGq/zqmQRImjTT2K/7qceHZv wm4dnqWuoGqpPyVR2fAsnSnN/JJnolF9WQaduuip6VquSZppQRdavmltVUlJPqsx1xcK M/p3d+jqjN308XAWoQ0lBXxddFtihAakGSJW0B/LC81HApjd2Panh6+YThs5K9OOokb6 V0VMBHfGKeymyTd0bFpSIU5FTfRYbGBDP4Az/KHCSbn2ikxFm91/XkS3EcE21oaoDXLS 4xdg== X-Gm-Message-State: AAQBX9cOkrjDhQWdGXliYj5C+Joq7IgxBYksYwnMv6vAG9R+xccPPiT9 4yDXF+EYTyjD11upC2610IA= X-Google-Smtp-Source: AKy350ZVl3PNdJ0+nN/Rb9LpMw5+uyjbe8u9t4N4aIteNFpQkEwBCpgg7+YRGDc+SZWH4x4d964lpw== X-Received: by 2002:a17:90a:d205:b0:234:409:9752 with SMTP id o5-20020a17090ad20500b0023404099752mr15223725pju.25.1681764789129; Mon, 17 Apr 2023 13:53:09 -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.53.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Apr 2023 13:53:08 -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 17/33] mm: Remove page table members from struct page Date: Mon, 17 Apr 2023 13:50:32 -0700 Message-Id: <20230417205048.15870-18-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 X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 3193840018 X-Stat-Signature: dmi39fkxhy7bwdueg1wc4bj4cpesmyh7 X-HE-Tag: 1681764790-963572 X-HE-Meta: U2FsdGVkX18VRsAuChWLPP42etUviWr1Wo3byWm4VPOCOSfeGvz0mOJz7c5K+I+1Obo0Lwc8m4m1D6mhsjL7gh7NQGjn1IsR7a9TfG9yL/bt9r1WspnfFB5IBNWZa8qS5quunrILOg+Sy9LxrAIN9D005It3EPTa4o2YNGnoHj5gfYlH/gpZc0CngU8Ty80wNdSmLGGZvxw2rzTGFLARL4lMKalfBfr1Llgd73f8M/WqLnidxchHz8I3I73LWoTjNzU83WrevbJRy3gn2HdT9oR5H7WpW2GY6JUnAoBQJKn0Fgf8kZG+RIckY4n4v7pvb78lvNMRpAZswCGoDZcDf+200TMZMt09ze61rCZxKY7e2oKTKlUSJaTxXsttAUaon11EhGhqqOwwBfXMzJjKGneZ02pyq+CQM26MlVGjrPihbo9L6/RvqrUZB2cV0t/LQThy/Wa6BdtTL6LYs2zeQ/1SXHclhYsb8hZcYtyXJxdfTfYqIbCNYPruoXMZ50zD8eqlH2rCsLCc/8u+mtnaSOvfY6lI5rrFswx+IoHFnIICLQUlZ8e9YSMRfA6GNSBflIGEl1X3fRORjYa6bcWVPULwJXnqZy5J3CbwFlwv3WJP2peeaiE9Rpr+9xgUlaWvKYHw2GcxnM7OPVpclet+CbkeyyWR2TTFayAQoM+iM+Oe4t0fdOytaiSiDTwXkkkF5U0Fd/w76WnLKeCcxl6Nyk5xKowmAgsHtgOictUyOO+znSTSioRYA6x+16bjHMGdcrsjhzQt01PRhAMgMwRKaFINVZTxv80DPM7rLwgf3YPa/PuNZzNJuupSlNNUK5Fij/NxqvsQ9hHZRTETFVW9QQVuXWOLEbzGQyqTai7T+HEUp9IINT+7RpilIKdFGdSrLDZJ0ciAi0HGXCrljHbizOUlxaUgqnAV9hGxqmUX+260XWpWXdXj1y0iFPIh5zuGGeb7TDiXe6xfyUJPeNW pZljmGaz 48wLLmF38C6rpOw981PDV5R7ggxCkmKcTJHV4ZUqULulV5iYbX2qJTrligcWym3MJBgQ5ITddKjB9vJTSPBNNQHaqy4UXThHd00+ihon3f+XKcb0/iDf/z6rwjK+xH16pokfRS2oZiHh0gr3AuRyMkJPzrSVIFdABaP06CfV4sQrtatiq7hcD8f9MTG227pVB+uBxB5r9gfZSmmN203jf+P1dUUWc/iiDmP0lN79Q+0JDly5uL9nWFWbuwQ5vpJPLJYRsAGPyNJfKifFj12kwY4xeteG7E/sMW63CGiqhDopiG/S3TbiDzcGKmfPcX8DoGBMTNjVmLeXOMXPAjIy8WJTYA0Ups+7jZEWs0v/xlLBCN8CUEWQjX4rWEwdqeWQAnZUIi9A/qfPRMLy8M49yqng9/dJYG1RYQbugJiJ/Y8LgHp7dLJuVHn81D9hFWVcW6srgUikSIaQQ2cZEinrjl1qMUUltvRMQO918fKHK6TknbImznpRv7UAGPtmdL4UI/Bz9SjvUFZR8fzA341fxW7oQWIK+dxB6lg2Q0mteImET37g= 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: The page table members are now split out into their own ptdesc struct. Remove them from struct page. Signed-off-by: Vishal Moola (Oracle) --- include/linux/mm_types.h | 14 -------------- include/linux/pgtable.h | 3 --- 2 files changed, 17 deletions(-) diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h index 2616d64c0e8c..4355f95abc5a 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -141,20 +141,6 @@ struct page { struct { /* Tail pages of compound page */ unsigned long compound_head; /* Bit zero is set */ }; - struct { /* Page table pages */ - unsigned long _pt_pad_1; /* compound_head */ - pgtable_t pmd_huge_pte; /* protected by page->ptl */ - unsigned long _pt_s390_gaddr; /* mapping */ - union { - struct mm_struct *pt_mm; /* x86 pgds only */ - atomic_t pt_frag_refcount; /* powerpc */ - }; -#if ALLOC_SPLIT_PTLOCKS - spinlock_t *ptl; -#else - spinlock_t ptl; -#endif - }; struct { /* ZONE_DEVICE pages */ /** @pgmap: Points to the hosting device page map. */ struct dev_pagemap *pgmap; diff --git a/include/linux/pgtable.h b/include/linux/pgtable.h index 7cd803aa38eb..8cacdf1fc411 100644 --- a/include/linux/pgtable.h +++ b/include/linux/pgtable.h @@ -91,9 +91,6 @@ TABLE_MATCH(flags, __page_flags); TABLE_MATCH(compound_head, pt_list); TABLE_MATCH(compound_head, _pt_pad_1); TABLE_MATCH(mapping, _pt_s390_gaddr); -TABLE_MATCH(pmd_huge_pte, pmd_huge_pte); -TABLE_MATCH(pt_mm, pt_mm); -TABLE_MATCH(ptl, ptl); #undef TABLE_MATCH static_assert(sizeof(struct ptdesc) <= sizeof(struct page));