From patchwork Mon May 1 19:28:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Vishal Moola (Oracle)" X-Patchwork-Id: 13227937 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 590BCC7EE24 for ; Mon, 1 May 2023 19:29:09 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EBCC0280011; Mon, 1 May 2023 15:29:02 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E43D528000C; Mon, 1 May 2023 15:29:02 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C1EF9280011; Mon, 1 May 2023 15:29:02 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id A846728000C for ; Mon, 1 May 2023 15:29:02 -0400 (EDT) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 885811A0580 for ; Mon, 1 May 2023 19:29:02 +0000 (UTC) X-FDA: 80742674124.17.8A575BB Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) by imf28.hostedemail.com (Postfix) with ESMTP id AE7C4C001A for ; Mon, 1 May 2023 19:29:00 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=YynIc3MW; spf=pass (imf28.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.214.180 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=1682969340; 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=mrqntkjJd8BO8YfASMnosk0HIl+t/0EXXW8sSx0dJVg=; b=M989wYYpqjQkM6M70gTDsWGHaHzXReFSjfHAAzANT26c/0EZmTeWCzrlp732sFbSi6yHxd IyyESpSi6NYuqrKSRPPgMznMkmEi7zfy+/vVRvwOCToEv9Iv3wbn0GehD9Nzs64aeoGePZ +Zp/RdQBtvBSvNEORdWaqD8NeGdK+uY= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=YynIc3MW; spf=pass (imf28.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.214.180 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=1682969340; a=rsa-sha256; cv=none; b=rp9HclkxfBfJBOyK26AqHH0iJNbTIWm8JjN0WPSiNiy2qCVlhHXA4MJYCYjIiz3G4gCEu6 j8QaDAx9tyE0Ir6cl2gXkXTtLF1dlCAVyyq3XTpfVyGbRj0+d/w/Dd3p0dy4V+AlD+5zQX dzjk2WUjEZNCiYlNwnbIgw0VBPdVr1k= Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-1a6715ee82fso29080395ad.1 for ; Mon, 01 May 2023 12:29:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682969339; x=1685561339; 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=mrqntkjJd8BO8YfASMnosk0HIl+t/0EXXW8sSx0dJVg=; b=YynIc3MWOn+7eKGjmZARCn/IjCANfe8gTHKhI/1ubKTs4ZbiubHG1P9aimD9KzNrIR eunJCIzqiXfZGl0CCMrWEsO+nwpbu9UTA+2coBncf0PpX1ohouYsG2DEdDJZPuTXi/ir yR5oJPT4K2awb6eBfuzacZRfwPXKDUNKWynDv8oNvVCBXhLYj3JhwMiPBRO+Fg6hjdSs FM9xgZDHU6Sc+urW7voaFKEt/7m6LjDuxZZp6qL4zZI9dwEcGtT8oaSDqFIY7TNV4Oop NDnPsASY2UskW6usELO5k/OqVJv807YApzHQHt4bSD2BLXySmWIPAbRFeQIxlm3YwdkY qcpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682969339; x=1685561339; 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=mrqntkjJd8BO8YfASMnosk0HIl+t/0EXXW8sSx0dJVg=; b=Cq31Cs/2rOqssImMRi4nJIBkfgmD1kyMfpPk+NAi3kIs5S4hEAfsYmwnKDDcjKenps mDm21PJa+rQOr6T1gEr7Euh1F/B2+dWbwMesqNpNkHy6zGcSg+BN3pbv0H1VcNdoJiln 6w3uYsv0HLt4REwGta8R2SvXnDYBo3JRSv+TgGVbyL0dbGfr4PaM7Igqn9jnMX0SG83/ YDF4bmgNkzD4pN9mlBEqgD+88f4XrW2V60YuU9HmOwK7hZ+9LvMgdzvrZBTyYxtEfY0B dCIg+e5hIqUuOoYQtCfraVhmkkoEWo7N4LrfQ7vGkPnxFBx8bfyO0BJr44vccBP2F+97 aNgQ== X-Gm-Message-State: AC+VfDxKkKBoD4USKP+L1ZGa/nNZNjmEI18M96jRFJax0e4VDgvL8zW5 QnM9KalJbokPtldmI7hhmq0= X-Google-Smtp-Source: ACHHUZ77ujqEA4Fn1OLOb7e5ecCGVNnJtAoTp2B3mAkadiAfSXyelwvqP5mlNEo41vojA+MW1rmqbg== X-Received: by 2002:a17:902:ce8e:b0:1aa:efad:f2d4 with SMTP id f14-20020a170902ce8e00b001aaefadf2d4mr5633464plg.63.1682969339499; Mon, 01 May 2023 12:28:59 -0700 (PDT) Received: from fedora.hsd1.ca.comcast.net ([2601:644:937f:7f20::9a2c]) by smtp.googlemail.com with ESMTPSA id u8-20020a170902bf4800b0019c13d032d8sm18175622pls.253.2023.05.01.12.28.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 May 2023 12:28:59 -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 v2 18/34] mm: Remove page table members from struct page Date: Mon, 1 May 2023 12:28:13 -0700 Message-Id: <20230501192829.17086-19-vishal.moola@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230501192829.17086-1-vishal.moola@gmail.com> References: <20230501192829.17086-1-vishal.moola@gmail.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: AE7C4C001A X-Stat-Signature: 7wtrgbeu8imnxtzsmyb98ixgd8tyu1tx X-HE-Tag: 1682969340-120939 X-HE-Meta: U2FsdGVkX18aylQu7GCiwKPcb7K13KtSohxIcKwJ2KvWaZiEm5OEZ5d4ibHSFx8W3np0cgC2qiJFim6pm5tAoI0tMq43kTUh6D92YLq1V1KmcYsDD6YeXFHxDF+gkuEI0TmOG53z/STOvkc6BNj7w/S77SOTWeBdiiaIW/5jvDXDIriB58dlWR6Vwfyvec5rxznfDEVVWu/83U7Rc6Ad+oIg4Evde/k+Ug8tMFBLO8bs6D/gTbVqEZHwWRSWbWqDb29WfwSKeB9EXseDSYImMVBFZuXsNSMMPzzDzRJh2hjUJM6FBMMd0vU7oaohlhp2mp+2U9z8J5gul6oA2L1AvBQsXxSTlrTGVtvl8wMEf4E5DnGPxMWlVu+zv1TczjEHcpX2zHJ5C0H/8fMc9Gqjmr35B4BL4S0ac/PJ9ibpMbnBQhazSmkUc87be+sFghElPLh9Od0aKCRW0YqoJW1pDJLozGMSXCzC8sFa6OnxXIsvdjQNjsvqdDyABDy3chjUi/qo/g+TwsHflfpZ+xtmS539QJK4B8p6l8S80db4JF6v8hyo2ux6cuJiPCwfpqmxYqGC/lNsHWrVhlVqaK0YfVlq/2JUHuOtaspY/CiMfjHkL/jTE21hkNtwX/yBrOm9l6QAt9qId6EWO3tBoaRu+35RjUYNmM5FCzhBAqVdOSXuDjHizEAG6ucedXHepxWr0EuhPDhAuhyaXOcwXWeHCJ7PdBJeU+hW3HAYhVwJWctvecIq9pSzz3Q6HabAcaarODA2su6UAJiGmh+sOrmN/6IhPVeYZR5novwJV7oA1Vmc/zBREXTXA/1RIJj+v1xLPiLgJnJvFEz2f8TbcwDds6kmkeTUoiqvXfXwH1EbeSJ3KB5C4MnsNNUpmNKH+0LvAXyQl+3BFN+fZmLvJweoBHv8lk3yLu3RuukZ3hQKne7S9h1jkuJTbghnleIMvkWDeynj4Wlh3EcH8rj3RWz OLxCgfKK XkNP/9Rlmv2GYYLIdr0j5kdZUOpHXupbUM668YMCpLHwZ3FmKbHRkDkhUw2IacghF7Y3Dkl8MJQxP00C7TVtE7FJkRj3cNHVsIl3SdrML/5H1h0FqP6ddblUJKTXHqALieBVjEg9ziyWqVUMXCF2k045SRfgZmjE9AgKxeiWWpysAwqU8fTwwFmw1tN/NR+Cr0cGB3kR1QsLtAzLZWq0Os+CR9tS2ANJ2HQkLC2JDR4cHmLjdRsi3oG5CazdfgoC5wbMS8omdVxaOVtpEp8HR+GaEXOby5y4CZThvfw+KeEsbUCBPsTeZ+8dnQVRJ9YsSJfJjh2bGzKUSqyaFqqcoHmPIw1ClRtAzKJUrcoAAFu2dt/MclyZ8ic4CY8CHfqUjkrWSL15I1J2DJoG+DQDvAxa/TCxjTmAVvFYPWqnt9pyK6aChR9MFKQY1p07ZcFipHd3J2G17coJISGNvfn+v1YvyPT40kg9x4BKaiQRWusIClWVzQlCw6v8KevN94ujn3sI/MrzT+tKEns8c0tqG8z+FFQ== 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 6161fe1ae5b8..31ffa1be21d0 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 b067ac10f3dd..90fa73a896db 100644 --- a/include/linux/pgtable.h +++ b/include/linux/pgtable.h @@ -1034,10 +1034,7 @@ struct ptdesc { TABLE_MATCH(flags, __page_flags); TABLE_MATCH(compound_head, pt_list); TABLE_MATCH(compound_head, _pt_pad_1); -TABLE_MATCH(pmd_huge_pte, pmd_huge_pte); TABLE_MATCH(mapping, _pt_s390_gaddr); -TABLE_MATCH(pt_mm, pt_mm); -TABLE_MATCH(ptl, ptl); #undef TABLE_MATCH static_assert(sizeof(struct ptdesc) <= sizeof(struct page));