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 E5949E77188 for ; Mon, 30 Dec 2024 09:11:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7CBFD6B00A5; Mon, 30 Dec 2024 04:11:13 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 7544E6B00A6; Mon, 30 Dec 2024 04:11:13 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5F5056B00A7; Mon, 30 Dec 2024 04:11:13 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 3EED66B00A5 for ; Mon, 30 Dec 2024 04:11:13 -0500 (EST) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 002041A0552 for ; Mon, 30 Dec 2024 09:11:12 +0000 (UTC) X-FDA: 82951054956.10.AC3F457 Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by imf21.hostedemail.com (Postfix) with ESMTP id F39881C0004 for ; Mon, 30 Dec 2024 09:09:41 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=MrYqCF61; spf=pass (imf21.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.214.174 as permitted sender) smtp.mailfrom=zhengqi.arch@bytedance.com; dmarc=pass (policy=quarantine) header.from=bytedance.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1735549849; 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=jyEzElX2/Cl2Hb0vACePBo9dDp7jwROhL3d0Mq9f7ig=; b=UAiD6mcZgwqQzEHy4/BbhW8xsPRM8JrjEdYw0oXsu4E/tyAXhgh7bDdSRnvtAsj4c98Vw6 3Aw673S4Vegmb8Ea2OE6gsYEXlmBPqUq84fYa0YBVgO/BlXYwN0CtpDYfwkprVwhZPGf6h EOKsLOpfpOInvYrcDlHZHy8tuNDZlrc= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1735549849; a=rsa-sha256; cv=none; b=o+tVuzsRG+GWTD/l53Vh/S3r5crHB0P9BdxpmcwO56sS6654OwMVoq+B+N1Ry/4uFoIU1k uQAKFy+lAL7Y6+L6lMn2RWRrsmZAZuEEqc7TiJrCOSDDGGjnseUjxXQ93+m5IaTtEwR09z rTZUTzD396c7dbmW9cPeYuS5OaXBZAA= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=MrYqCF61; spf=pass (imf21.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.214.174 as permitted sender) smtp.mailfrom=zhengqi.arch@bytedance.com; dmarc=pass (policy=quarantine) header.from=bytedance.com Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-2165448243fso138922315ad.1 for ; Mon, 30 Dec 2024 01:11:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1735549870; x=1736154670; darn=kvack.org; 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=jyEzElX2/Cl2Hb0vACePBo9dDp7jwROhL3d0Mq9f7ig=; b=MrYqCF61Aq4VJM9IWW3+hlH8UAg5t/UlkGbPaag+y0mjGLYxUtseU/WOnpuvVp6pLi +6BZUrGcIxStxNjJn3tEjoSdZINJz0sXFw5q4e+LC1HoABejVT3+hbXn3IAPfFkZZCXf VXwY/3eFPdqbARfmBAcp8uGyftn8/EfQGGq5KCqKEQrkHjmljnsC/qD9MmYDQ6LpSuwu Rk8w/jbtetW3yGSzVf1HMSs4+8Q+5I32AnL1PFmyjWCsAT1GZdul87qeSQgMEQZN+Eyf t185qvjDb9YqXtt5jPdEquKSLG67MCo1sMI6Ovr6N5bP0HQGrY4Ydz70gykh2XcjK0qI aM6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735549870; x=1736154670; 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=jyEzElX2/Cl2Hb0vACePBo9dDp7jwROhL3d0Mq9f7ig=; b=NMREoIT5Wzzp2v6CWNxQ4SveDEK/ZPQeyNNGFIhtswKbhfB9chw4Vrq8TpNHRTwVbO Zu0RHChAuQausGqwYwsob3lkGcxV48VMpsLIXGrZ6tGdKgVtBvUD1hbXdjbyrJ1dOGY1 kHrk4ExL8L+NKL7/vE3NeDmSXQyogbIQAY93JUpL3DwbeHOQLo1yjm813KCcE78qyPLr 9lQ65OeCDolJ2Zgrv9ULk+Q2JAQxAC7ub+urecEtLBluk70/bnE0AzlDTUulG4V+t9Ax y6roYiShsbbp7DYK3nCco34fi8w40RpzJjTiZrDQh8fxAtwHJAVKySS/zIDW/dXZ83lK tq7g== X-Gm-Message-State: AOJu0YwOATWan3wdEsNpJRRwnhigmxqKG5PLelPw/xz8RHT27so3/56A eacnkcZUbi0A4kswUtpxWfcb8ZLDokzyQpgOjPE0VCkr45tUJiFVJ9QhB0D+1PE= X-Gm-Gg: ASbGncupJJe8Y94HMy+7rDSbUxelHYcxqpr074OK45MrtW7fHgSCOjBwIZrz7Tze6fp swCWQqeojxtA2pl1HYGyne87oLSGMrbFpk2aFnGqGoeLrf9BI/xmJP2qo/9AxdtkO8Q7VdU+6Ag 8SV9NPfY+yEZ8W/n8uno3RrgnJioEBJbn9qPt946Qi6ffWu6qXSu/Sjcy6Qoh6ky5v8gsjFOhOY +d1z49o3IUu9ka96JwZYrsLpilipIfCGrZuLo7pVgckxrfO1T4tSZaaGpp3vQzepaVJqx30fFLG cwCcVDzy3GgdKh6sun2IJg== X-Google-Smtp-Source: AGHT+IHPMMlkiFtH678yJhisFXpRpeLbEmYMWQPlXwvGfvt1NUv1TR7XGzXk5FcrgJpzIcDaQ0LX6w== X-Received: by 2002:a05:6a20:7351:b0:1e0:cadd:f670 with SMTP id adf61e73a8af0-1e5e044c8ebmr53183808637.5.1735549869780; Mon, 30 Dec 2024 01:11:09 -0800 (PST) Received: from C02DW0BEMD6R.bytedance.net ([203.208.167.150]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-842aba72f7csm17057841a12.4.2024.12.30.01.10.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Dec 2024 01:11:09 -0800 (PST) From: Qi Zheng To: peterz@infradead.org, agordeev@linux.ibm.com, kevin.brodsky@arm.com, palmer@dabbelt.com, tglx@linutronix.de, david@redhat.com, jannh@google.com, hughd@google.com, yuzhao@google.com, willy@infradead.org, muchun.song@linux.dev, vbabka@kernel.org, lorenzo.stoakes@oracle.com, akpm@linux-foundation.org, rientjes@google.com, vishal.moola@gmail.com, arnd@arndb.de, will@kernel.org, aneesh.kumar@kernel.org, npiggin@gmail.com, dave.hansen@linux.intel.com, rppt@kernel.org, ryan.roberts@arm.com Cc: linux-mm@kvack.org, linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, sparclinux@vger.kernel.org, linux-kernel@vger.kernel.org, x86@kernel.org, linux-arch@vger.kernel.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, linux-sh@vger.kernel.org, linux-um@lists.infradead.org, Qi Zheng Subject: [PATCH v4 12/15] s390: pgtable: also move pagetable_dtor() of PxD to __tlb_remove_table() Date: Mon, 30 Dec 2024 17:07:47 +0800 Message-Id: X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: F39881C0004 X-Stat-Signature: y94xpuaru3i8e4nrarhyg8po3neunr38 X-Rspam-User: X-HE-Tag: 1735549781-206217 X-HE-Meta: U2FsdGVkX1/2r/mcYZ3dZH64xZl7tufciTg/UOHCiB77HPtDCUXA3SKIjyEaT2ds2oz0vPt3lQHW4dJTVJxihekbODwRrKPAcYU9TvdexAvLqd6N0oKI0RszTVn1FcJFl7BwN/rB8eg8nlyLJNXR5qEKDECf6hwqSQ/U6xkXbFpoNqn+UXZ4C+J5eg5y99cgbYPWtLBPc9ycERMjjJZQfdHEyWcozEgIqUTJjhi03ACcwbach1bNpC68vr8M/aQf4DEHQnDygBQXZj8QUIXEWix3pUOL9uvt6sUKgqzu4G50iO/aDw/H2oGZnHLqEhq3++FvtUwlWG1DivXKBUbMAjJJX4SHm+MWMdc0/zwpQV0kOCCnM9uG7zT6P6pYoN2gisnB6scgR7E1qna3CZ6SekIpbCzmpunApDpVG85FTCVqpmjsjQZbMjocDAN2oYqVycq4XWyaww8lUctrD+SBg2eQRgnML1tGkxL4nG+mvcJgRsAETg6kcVjAhUpgT3yTR/ylxlO7Za4GF+Z6z8Yb8ng92lbkph95az+Fv5AFC7J+xjbDNQUxmP3hJ8jSp9sDaIHumy7mSk39SwvKcVdP9Zm5hvht2fNEf0u3UmsCD/CtGnmf1/OFUFntDDXYFAoirLdYFszD+MlqiRuGbg7KM/b6q4na4Adxx3OPYiLTy9mKYIzlQdjaky09uRJEe4WVI+oCzR/kbH7c8PMi+GoghvDk9IDY4EoyOLzEjkj8yhb/oZzln6hR5E6TFm0RibBeLT3jzgvZwa4ehJV/AB/C+2g+dmI1/Arch3TSkM8zVJIMOPTtOhf+FVWaJrJgXI39CiupKXMROpDZXdBO2eNQLUYH2RWYhGcQbzu9jn9YkxrZwyW6P8uhy9m2YN8PS7YC7WbKYukA00Ou2VuLNvgKQO0aOW7e6RAiiauNXBN0n1GoLTmd2tTrsq4jQwEvFXcjMT4Qd+vDtqkyNkCnvFu pT7rsu8o CIpVjMLfDc9BBG0KKBZH2Mo2Zu2YlB5nuIGQtEPxtH652RWkiTrLDh60YQM/BsizrqM72gFn8bq+7x4WkowRhciGEa6fOhO671+mFcVktUw+TwoUf3GY1w5unUZAEktVLKKZ4by+z7TiwpIv4ZAzUtVmB196zOaVt3ldxZqnNuAnr1GySCCsnQyWZihMIiqhvvmMekLgN2Kf01dbDVFxjMt1SiOJ39y8Hm3bfLh00HYZJjweU7+I+ai8sKC7G7gJLIMRfu95KZW6I2HYsLwydnITXyxUAAKrgdKuAslxt4b6bJinhFsn52QdwuWWU7keaJBfqaAs9Zor9fSPShqjEgp1EZArOhs3S5LVfOCSw1TpmPu/xyldj+MF7BJMv8KlYW4o+SaMEOLzRO0ibgTm7oMB+yhCh3+88/3CaCYP5uaQBrtb4VTQCbc0TDPpaLJw06rDDE1x0Z6CK/ezJ/wPs7O/B0Ug1AymAxalw2D5lls2qgl60DaWbHHTXUWcxH2vtuDST 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: List-Subscribe: List-Unsubscribe: To unify the PxD and PTE TLB free path, also move the pagetable_dtor() of PMD|PUD|P4D to __tlb_remove_table(). Signed-off-by: Qi Zheng Suggested-by: Peter Zijlstra (Intel) Cc: linux-s390@vger.kernel.org --- arch/s390/include/asm/tlb.h | 3 --- arch/s390/mm/pgalloc.c | 14 ++++---------- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/arch/s390/include/asm/tlb.h b/arch/s390/include/asm/tlb.h index 74b6fba4c2ee3..79df7c0932c56 100644 --- a/arch/s390/include/asm/tlb.h +++ b/arch/s390/include/asm/tlb.h @@ -102,7 +102,6 @@ static inline void pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd, { if (mm_pmd_folded(tlb->mm)) return; - pagetable_dtor(virt_to_ptdesc(pmd)); __tlb_adjust_range(tlb, address, PAGE_SIZE); tlb->mm->context.flush_mm = 1; tlb->freed_tables = 1; @@ -122,7 +121,6 @@ static inline void pud_free_tlb(struct mmu_gather *tlb, pud_t *pud, { if (mm_pud_folded(tlb->mm)) return; - pagetable_dtor(virt_to_ptdesc(pud)); tlb->mm->context.flush_mm = 1; tlb->freed_tables = 1; tlb->cleared_p4ds = 1; @@ -141,7 +139,6 @@ static inline void p4d_free_tlb(struct mmu_gather *tlb, p4d_t *p4d, { if (mm_p4d_folded(tlb->mm)) return; - pagetable_dtor(virt_to_ptdesc(p4d)); __tlb_adjust_range(tlb, address, PAGE_SIZE); tlb->mm->context.flush_mm = 1; tlb->freed_tables = 1; diff --git a/arch/s390/mm/pgalloc.c b/arch/s390/mm/pgalloc.c index 569de24d33761..c73b89811a264 100644 --- a/arch/s390/mm/pgalloc.c +++ b/arch/s390/mm/pgalloc.c @@ -180,7 +180,7 @@ unsigned long *page_table_alloc(struct mm_struct *mm) return table; } -static void pagetable_pte_dtor_free(struct ptdesc *ptdesc) +static void pagetable_dtor_free(struct ptdesc *ptdesc) { pagetable_dtor(ptdesc); pagetable_free(ptdesc); @@ -190,20 +190,14 @@ void page_table_free(struct mm_struct *mm, unsigned long *table) { struct ptdesc *ptdesc = virt_to_ptdesc(table); - pagetable_pte_dtor_free(ptdesc); + pagetable_dtor_free(ptdesc); } void __tlb_remove_table(void *table) { struct ptdesc *ptdesc = virt_to_ptdesc(table); - struct page *page = ptdesc_page(ptdesc); - if (compound_order(page) == CRST_ALLOC_ORDER) { - /* pmd, pud, or p4d */ - pagetable_free(ptdesc); - return; - } - pagetable_pte_dtor_free(ptdesc); + pagetable_dtor_free(ptdesc); } #ifdef CONFIG_TRANSPARENT_HUGEPAGE @@ -211,7 +205,7 @@ static void pte_free_now(struct rcu_head *head) { struct ptdesc *ptdesc = container_of(head, struct ptdesc, pt_rcu_head); - pagetable_pte_dtor_free(ptdesc); + pagetable_dtor_free(ptdesc); } void pte_free_defer(struct mm_struct *mm, pgtable_t pgtable) -- 2.20.1